12 files changed, 54 insertions, 183 deletions

diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index 6154bfe4bed4..0dea7699e6a9 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	gaim
-# Version required:		0.1
+# Version required:		0.8.0
 # Date created:			26 Mar 1999
 # Whom:				Jim Mock <jim@phrantic.phear.net>
 #
-# $Id: Makefile,v 1.2 1999/04/20 02:31:21 mharo Exp $
+# $Id: Makefile,v 1.3 1999/04/20 03:06:01 mharo Exp $
 #
 
-DISTNAME=	gaim-19990311
-PKGNAME=	gaim-0.1
+DISTNAME=	gaim-0.8.0
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.marko.net/pub/gaim/ \
 		http://www.freebsd.org/~mharo/distfiles/ \
@@ -17,13 +16,15 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	jim@phrantic.phear.net
 
-LIB_DEPENDS=	gtk12.1:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS=	gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \
+		glib12.1:${PORTSDIR}/devel/glib12
 
-ALL_TARGET=	gaim
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 
-CONFIGURE_ENV=	GTK_CONFIG="${X11BASE}/bin/gtk12-config"
+CONFIGURE_ENV=	GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
+		GLIB_CONFIG="${LOCALBASE}/bin/glib12-config"
 
 post-patch:
 	${CP} ${DISTDIR}/logo.xpm.gz ${WRKSRC}/pixmaps
diff --git a/net-im/gaim/distinfo b/net-im/gaim/distinfo
index 702c8b243385..64e64b9fdae2 100644
--- a/net-im/gaim/distinfo
+++ b/net-im/gaim/distinfo
@@ -1,2 +1,2 @@
-MD5 (gaim-19990311.tar.gz) = b7e8e67123b8a18091296fc06b5908b7
+MD5 (gaim-0.8.0.tar.gz) = e13fd5527da4ff1af0fc237544584145
 MD5 (logo.xpm.gz) = 0ae9c355e316e941e3f494602ec8addf
diff --git a/net-im/gaim/files/patch-aa b/net-im/gaim/files/patch-aa
deleted file mode 100644
index c6c6238e6d9a..000000000000
--- a/net-im/gaim/files/patch-aa
+++ /dev/null
@@ -1,53 +0,0 @@
---- Makefile.orig	Sun Feb 21 15:36:06 1999
-+++ Makefile	Sun Apr 18 17:00:54 1999
-@@ -5,7 +5,7 @@
- # USE_XMHTML=1
- #
- # Uncomment USE_THEMES for gtk-themes _OR_ USE_APPLET to build as a gnome-applet
--# USE_THEMES=1
-+USE_THEMES=1
- # USE_APPLET=1
- #
- # Uncomment USE_GHTTP for GHTTP stuff.  Its not finished yet, but a very, 
-@@ -18,34 +18,26 @@
- ifdef DEBUG
-  CFLAGS+=-d -g
- endif
--CFLAGS+=-Wall -g
-+CFLAGS+=-Wall
- ifdef USE_GHTTP
-  CFLAGS+=-DUSE_GHTTP
-  LIBS+=-lghttp
- endif
--ifdef USE_APPLET
-- CFLAGS+=`gnome-config --cflags gnome gnomeui gtk gnorba` -DUSE_APPLET
-- LIBS+=`gnome-config --libs gnome gnomeui gtk gnorba` -lpanel_applet
--else
-- ifdef USE_THEMES
--  CFLAGS+=`gnome-config --cflags gnome gnomeui gtk` -DUSE_THEMES
--  LIBS+=`gnome-config --libs gnome gnomeui gtk`
-- else
--  CFLAGS+=`gtk-config --cflags`
--  LIBS+=`gtk-config --libs`
-- endif
-+ifdef USE_THEMES
-+ CFLAGS+=`gtk12-config --cflags`
-+ LIBS+=`gtk12-config --libs`
- endif
- ifdef USE_XMHTML
-  CFLAGS+=-DUSE_XMHTML
-  LIBS+=-lgtkxmhtml -ljpeg -lXpm -lpng -lz
- endif
--CC=gcc
-+CC?=gcc
- AU2H=./au2h
- SOUNDS=BuddyArrive.h BuddyLeave.h Receive.h Send.h
- OBJS=aim.o buddy.o toc.o im.o conversation.o buddy_chat.o html.o prefs.o sound.o about.o
- 
--aim: $(OBJS)
--	$(CC) -o aim $(CFLAGS) $(OBJS) $(LIBS)
-+gaim: $(OBJS)
-+	$(CC) -o gaim $(CFLAGS) $(OBJS) $(LIBS)
- 
- BuddyArrive.h: au2h BuddyArrive.au
- 	$(AU2H) BuddyArrive.au BuddyArrive.h
diff --git a/net-im/gaim/pkg-plist b/net-im/gaim/pkg-plist
index 7f29828f2bc2..65cc2bc25b92 100644
--- a/net-im/gaim/pkg-plist
+++ b/net-im/gaim/pkg-plist
@@ -5,15 +5,24 @@ share/gaim/pixmaps/aimicon2.xpm
 share/gaim/pixmaps/aol_icon.xpm
 share/gaim/pixmaps/big.xpm
 share/gaim/pixmaps/bold.xpm
+share/gaim/pixmaps/buddyadd.xpm
+share/gaim/pixmaps/buddychat.xpm
+share/gaim/pixmaps/buddydel.xpm
 share/gaim/pixmaps/dt_icon.xpm
 share/gaim/pixmaps/free_icon.xpm
+share/gaim/pixmaps/im.xpm
+share/gaim/pixmaps/info.xpm
 share/gaim/pixmaps/italic.xpm
 share/gaim/pixmaps/login_icon.xpm
 share/gaim/pixmaps/logo.xpm
 share/gaim/pixmaps/logout_icon.xpm
 share/gaim/pixmaps/no_icon.xpm
 share/gaim/pixmaps/normal.xpm
+share/gaim/pixmaps/palette.xpm
+share/gaim/pixmaps/permadd.xpm
+share/gaim/pixmaps/permdel.xpm
 share/gaim/pixmaps/small.xpm
 share/gaim/pixmaps/speaker.xpm
+share/gaim/pixmaps/wood.xpm
 @dirrm share/gaim/pixmaps
 @dirrm share/gaim
diff --git a/net/gaim-snapshot/Makefile b/net/gaim-snapshot/Makefile
index 6154bfe4bed4..0dea7699e6a9 100644
--- a/net/gaim-snapshot/Makefile
+++ b/net/gaim-snapshot/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	gaim
-# Version required:		0.1
+# Version required:		0.8.0
 # Date created:			26 Mar 1999
 # Whom:				Jim Mock <jim@phrantic.phear.net>
 #
-# $Id: Makefile,v 1.2 1999/04/20 02:31:21 mharo Exp $
+# $Id: Makefile,v 1.3 1999/04/20 03:06:01 mharo Exp $
 #
 
-DISTNAME=	gaim-19990311
-PKGNAME=	gaim-0.1
+DISTNAME=	gaim-0.8.0
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.marko.net/pub/gaim/ \
 		http://www.freebsd.org/~mharo/distfiles/ \
@@ -17,13 +16,15 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	jim@phrantic.phear.net
 
-LIB_DEPENDS=	gtk12.1:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS=	gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \
+		glib12.1:${PORTSDIR}/devel/glib12
 
-ALL_TARGET=	gaim
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 
-CONFIGURE_ENV=	GTK_CONFIG="${X11BASE}/bin/gtk12-config"
+CONFIGURE_ENV=	GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
+		GLIB_CONFIG="${LOCALBASE}/bin/glib12-config"
 
 post-patch:
 	${CP} ${DISTDIR}/logo.xpm.gz ${WRKSRC}/pixmaps
diff --git a/net/gaim-snapshot/distinfo b/net/gaim-snapshot/distinfo
index 702c8b243385..64e64b9fdae2 100644
--- a/net/gaim-snapshot/distinfo
+++ b/net/gaim-snapshot/distinfo
@@ -1,2 +1,2 @@
-MD5 (gaim-19990311.tar.gz) = b7e8e67123b8a18091296fc06b5908b7
+MD5 (gaim-0.8.0.tar.gz) = e13fd5527da4ff1af0fc237544584145
 MD5 (logo.xpm.gz) = 0ae9c355e316e941e3f494602ec8addf
diff --git a/net/gaim-snapshot/files/patch-aa b/net/gaim-snapshot/files/patch-aa
deleted file mode 100644
index c6c6238e6d9a..000000000000
--- a/net/gaim-snapshot/files/patch-aa
+++ /dev/null
@@ -1,53 +0,0 @@
---- Makefile.orig	Sun Feb 21 15:36:06 1999
-+++ Makefile	Sun Apr 18 17:00:54 1999
-@@ -5,7 +5,7 @@
- # USE_XMHTML=1
- #
- # Uncomment USE_THEMES for gtk-themes _OR_ USE_APPLET to build as a gnome-applet
--# USE_THEMES=1
-+USE_THEMES=1
- # USE_APPLET=1
- #
- # Uncomment USE_GHTTP for GHTTP stuff.  Its not finished yet, but a very, 
-@@ -18,34 +18,26 @@
- ifdef DEBUG
-  CFLAGS+=-d -g
- endif
--CFLAGS+=-Wall -g
-+CFLAGS+=-Wall
- ifdef USE_GHTTP
-  CFLAGS+=-DUSE_GHTTP
-  LIBS+=-lghttp
- endif
--ifdef USE_APPLET
-- CFLAGS+=`gnome-config --cflags gnome gnomeui gtk gnorba` -DUSE_APPLET
-- LIBS+=`gnome-config --libs gnome gnomeui gtk gnorba` -lpanel_applet
--else
-- ifdef USE_THEMES
--  CFLAGS+=`gnome-config --cflags gnome gnomeui gtk` -DUSE_THEMES
--  LIBS+=`gnome-config --libs gnome gnomeui gtk`
-- else
--  CFLAGS+=`gtk-config --cflags`
--  LIBS+=`gtk-config --libs`
-- endif
-+ifdef USE_THEMES
-+ CFLAGS+=`gtk12-config --cflags`
-+ LIBS+=`gtk12-config --libs`
- endif
- ifdef USE_XMHTML
-  CFLAGS+=-DUSE_XMHTML
-  LIBS+=-lgtkxmhtml -ljpeg -lXpm -lpng -lz
- endif
--CC=gcc
-+CC?=gcc
- AU2H=./au2h
- SOUNDS=BuddyArrive.h BuddyLeave.h Receive.h Send.h
- OBJS=aim.o buddy.o toc.o im.o conversation.o buddy_chat.o html.o prefs.o sound.o about.o
- 
--aim: $(OBJS)
--	$(CC) -o aim $(CFLAGS) $(OBJS) $(LIBS)
-+gaim: $(OBJS)
-+	$(CC) -o gaim $(CFLAGS) $(OBJS) $(LIBS)
- 
- BuddyArrive.h: au2h BuddyArrive.au
- 	$(AU2H) BuddyArrive.au BuddyArrive.h
diff --git a/net/gaim-snapshot/pkg-plist b/net/gaim-snapshot/pkg-plist
index 7f29828f2bc2..65cc2bc25b92 100644
--- a/net/gaim-snapshot/pkg-plist
+++ b/net/gaim-snapshot/pkg-plist
@@ -5,15 +5,24 @@ share/gaim/pixmaps/aimicon2.xpm
 share/gaim/pixmaps/aol_icon.xpm
 share/gaim/pixmaps/big.xpm
 share/gaim/pixmaps/bold.xpm
+share/gaim/pixmaps/buddyadd.xpm
+share/gaim/pixmaps/buddychat.xpm
+share/gaim/pixmaps/buddydel.xpm
 share/gaim/pixmaps/dt_icon.xpm
 share/gaim/pixmaps/free_icon.xpm
+share/gaim/pixmaps/im.xpm
+share/gaim/pixmaps/info.xpm
 share/gaim/pixmaps/italic.xpm
 share/gaim/pixmaps/login_icon.xpm
 share/gaim/pixmaps/logo.xpm
 share/gaim/pixmaps/logout_icon.xpm
 share/gaim/pixmaps/no_icon.xpm
 share/gaim/pixmaps/normal.xpm
+share/gaim/pixmaps/palette.xpm
+share/gaim/pixmaps/permadd.xpm
+share/gaim/pixmaps/permdel.xpm
 share/gaim/pixmaps/small.xpm
 share/gaim/pixmaps/speaker.xpm
+share/gaim/pixmaps/wood.xpm
 @dirrm share/gaim/pixmaps
 @dirrm share/gaim
diff --git a/net/gaim/Makefile b/net/gaim/Makefile
index 6154bfe4bed4..0dea7699e6a9 100644
--- a/net/gaim/Makefile
+++ b/net/gaim/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	gaim
-# Version required:		0.1
+# Version required:		0.8.0
 # Date created:			26 Mar 1999
 # Whom:				Jim Mock <jim@phrantic.phear.net>
 #
-# $Id: Makefile,v 1.2 1999/04/20 02:31:21 mharo Exp $
+# $Id: Makefile,v 1.3 1999/04/20 03:06:01 mharo Exp $
 #
 
-DISTNAME=	gaim-19990311
-PKGNAME=	gaim-0.1
+DISTNAME=	gaim-0.8.0
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.marko.net/pub/gaim/ \
 		http://www.freebsd.org/~mharo/distfiles/ \
@@ -17,13 +16,15 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	jim@phrantic.phear.net
 
-LIB_DEPENDS=	gtk12.1:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS=	gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \
+		glib12.1:${PORTSDIR}/devel/glib12
 
-ALL_TARGET=	gaim
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 
-CONFIGURE_ENV=	GTK_CONFIG="${X11BASE}/bin/gtk12-config"
+CONFIGURE_ENV=	GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
+		GLIB_CONFIG="${LOCALBASE}/bin/glib12-config"
 
 post-patch:
 	${CP} ${DISTDIR}/logo.xpm.gz ${WRKSRC}/pixmaps
diff --git a/net/gaim/distinfo b/net/gaim/distinfo
index 702c8b243385..64e64b9fdae2 100644
--- a/net/gaim/distinfo
+++ b/net/gaim/distinfo
@@ -1,2 +1,2 @@
-MD5 (gaim-19990311.tar.gz) = b7e8e67123b8a18091296fc06b5908b7
+MD5 (gaim-0.8.0.tar.gz) = e13fd5527da4ff1af0fc237544584145
 MD5 (logo.xpm.gz) = 0ae9c355e316e941e3f494602ec8addf
diff --git a/net/gaim/files/patch-aa b/net/gaim/files/patch-aa
deleted file mode 100644
index c6c6238e6d9a..000000000000
--- a/net/gaim/files/patch-aa
+++ /dev/null
@@ -1,53 +0,0 @@
---- Makefile.orig	Sun Feb 21 15:36:06 1999
-+++ Makefile	Sun Apr 18 17:00:54 1999
-@@ -5,7 +5,7 @@
- # USE_XMHTML=1
- #
- # Uncomment USE_THEMES for gtk-themes _OR_ USE_APPLET to build as a gnome-applet
--# USE_THEMES=1
-+USE_THEMES=1
- # USE_APPLET=1
- #
- # Uncomment USE_GHTTP for GHTTP stuff.  Its not finished yet, but a very, 
-@@ -18,34 +18,26 @@
- ifdef DEBUG
-  CFLAGS+=-d -g
- endif
--CFLAGS+=-Wall -g
-+CFLAGS+=-Wall
- ifdef USE_GHTTP
-  CFLAGS+=-DUSE_GHTTP
-  LIBS+=-lghttp
- endif
--ifdef USE_APPLET
-- CFLAGS+=`gnome-config --cflags gnome gnomeui gtk gnorba` -DUSE_APPLET
-- LIBS+=`gnome-config --libs gnome gnomeui gtk gnorba` -lpanel_applet
--else
-- ifdef USE_THEMES
--  CFLAGS+=`gnome-config --cflags gnome gnomeui gtk` -DUSE_THEMES
--  LIBS+=`gnome-config --libs gnome gnomeui gtk`
-- else
--  CFLAGS+=`gtk-config --cflags`
--  LIBS+=`gtk-config --libs`
-- endif
-+ifdef USE_THEMES
-+ CFLAGS+=`gtk12-config --cflags`
-+ LIBS+=`gtk12-config --libs`
- endif
- ifdef USE_XMHTML
-  CFLAGS+=-DUSE_XMHTML
-  LIBS+=-lgtkxmhtml -ljpeg -lXpm -lpng -lz
- endif
--CC=gcc
-+CC?=gcc
- AU2H=./au2h
- SOUNDS=BuddyArrive.h BuddyLeave.h Receive.h Send.h
- OBJS=aim.o buddy.o toc.o im.o conversation.o buddy_chat.o html.o prefs.o sound.o about.o
- 
--aim: $(OBJS)
--	$(CC) -o aim $(CFLAGS) $(OBJS) $(LIBS)
-+gaim: $(OBJS)
-+	$(CC) -o gaim $(CFLAGS) $(OBJS) $(LIBS)
- 
- BuddyArrive.h: au2h BuddyArrive.au
- 	$(AU2H) BuddyArrive.au BuddyArrive.h
diff --git a/net/gaim/pkg-plist b/net/gaim/pkg-plist
index 7f29828f2bc2..65cc2bc25b92 100644
--- a/net/gaim/pkg-plist
+++ b/net/gaim/pkg-plist
@@ -5,15 +5,24 @@ share/gaim/pixmaps/aimicon2.xpm
 share/gaim/pixmaps/aol_icon.xpm
 share/gaim/pixmaps/big.xpm
 share/gaim/pixmaps/bold.xpm
+share/gaim/pixmaps/buddyadd.xpm
+share/gaim/pixmaps/buddychat.xpm
+share/gaim/pixmaps/buddydel.xpm
 share/gaim/pixmaps/dt_icon.xpm
 share/gaim/pixmaps/free_icon.xpm
+share/gaim/pixmaps/im.xpm
+share/gaim/pixmaps/info.xpm
 share/gaim/pixmaps/italic.xpm
 share/gaim/pixmaps/login_icon.xpm
 share/gaim/pixmaps/logo.xpm
 share/gaim/pixmaps/logout_icon.xpm
 share/gaim/pixmaps/no_icon.xpm
 share/gaim/pixmaps/normal.xpm
+share/gaim/pixmaps/palette.xpm
+share/gaim/pixmaps/permadd.xpm
+share/gaim/pixmaps/permdel.xpm
 share/gaim/pixmaps/small.xpm
 share/gaim/pixmaps/speaker.xpm
+share/gaim/pixmaps/wood.xpm
 @dirrm share/gaim/pixmaps
 @dirrm share/gaim