Update to 0.9.6

PR:		13011
Submitted by:	maintainer

6 files changed, 44 insertions, 40 deletions

diff --git a/net/gaim-snapshot/Makefile b/net/gaim-snapshot/Makefile
index 0a944c0c5e0f..4870634425a1 100644
--- a/net/gaim-snapshot/Makefile
+++ b/net/gaim-snapshot/Makefile
@@ -1,20 +1,16 @@
 # New ports collection makefile for:	gaim
-# Version required:		0.8.0
+# Version required:		0.9.6
 # Date created:			26 Mar 1999
-# Whom:				Jim Mock <jim@phrantic.phear.net>
+# Whom:				Jim Mock <jim@blues.ghis.net>
 #
-# $Id: Makefile,v 1.4 1999/05/05 14:13:41 flathill Exp $
+# $Id: Makefile,v 1.5 1999/05/29 03:55:14 steve Exp $
 #
 
-DISTNAME=	gaim-0.8.0
+DISTNAME=	gaim-0.9.6
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.marko.net/pub/gaim/ \
-		http://www.freebsd.org/~mharo/distfiles/ \
-		ftp://ftp.netmug.org/pub/FreeBSD/distfiles/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} logo.xpm.gz
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=	ftp://ftp.marko.net/pub/gaim/
 
-MAINTAINER=	jim@phrantic.phear.net
+MAINTAINER=	jim@blues.ghis.net
 
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		glib12.2:${PORTSDIR}/devel/glib12
@@ -28,14 +24,10 @@ USE_X_PREFIX=	yes
 CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
 		GLIB_CONFIG="${GLIB_CONFIG}"
 
-post-patch:
-	${CP} ${DISTDIR}/logo.xpm.gz ${WRKSRC}/pixmaps
-	${GUNZIP_CMD} ${WRKSRC}/pixmaps/logo.xpm.gz
-
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gaim ${PREFIX}/bin
-	@ ${MKDIR} ${PREFIX}/share/gaim/pixmaps && chmod a+rx ${PREFIX}/share/gaim/pixmaps
-	@ ${ECHO} "===>   Installing pixmaps"
-	${INSTALL_DATA} ${WRKSRC}/pixmaps/*.xpm ${PREFIX}/share/gaim/pixmaps
+	@${INSTALL_PROGRAM} ${WRKSRC}/src/gaim ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/share/gaim/pixmaps && chmod a+rx ${PREFIX}/share/gaim/pixmaps
+	@${ECHO} "===>   Installing pixmaps"
+	@${INSTALL_DATA} ${WRKSRC}/pixmaps/*.xpm ${PREFIX}/share/gaim/pixmaps
 
 .include <bsd.port.mk>
diff --git a/net/gaim-snapshot/distinfo b/net/gaim-snapshot/distinfo
index 64e64b9fdae2..6f514dd18a69 100644
--- a/net/gaim-snapshot/distinfo
+++ b/net/gaim-snapshot/distinfo
@@ -1,2 +1 @@
-MD5 (gaim-0.8.0.tar.gz) = e13fd5527da4ff1af0fc237544584145
-MD5 (logo.xpm.gz) = 0ae9c355e316e941e3f494602ec8addf
+MD5 (gaim-0.9.6.tar.gz) = 6036d5b77626bfdb9708281dabcb6c6c
diff --git a/net/gaim-snapshot/pkg-plist b/net/gaim-snapshot/pkg-plist
index 65cc2bc25b92..1f7cea337885 100644
--- a/net/gaim-snapshot/pkg-plist
+++ b/net/gaim-snapshot/pkg-plist
@@ -3,6 +3,8 @@ share/gaim/pixmaps/admin_icon.xpm
 share/gaim/pixmaps/aimicon.xpm
 share/gaim/pixmaps/aimicon2.xpm
 share/gaim/pixmaps/aol_icon.xpm
+share/gaim/pixmaps/away.xpm
+share/gaim/pixmaps/away_icon.xpm
 share/gaim/pixmaps/big.xpm
 share/gaim/pixmaps/bold.xpm
 share/gaim/pixmaps/buddyadd.xpm
@@ -13,16 +15,25 @@ share/gaim/pixmaps/free_icon.xpm
 share/gaim/pixmaps/im.xpm
 share/gaim/pixmaps/info.xpm
 share/gaim/pixmaps/italic.xpm
+share/gaim/pixmaps/link.xpm
 share/gaim/pixmaps/login_icon.xpm
 share/gaim/pixmaps/logo.xpm
 share/gaim/pixmaps/logout_icon.xpm
+share/gaim/pixmaps/msg_pending.xpm
 share/gaim/pixmaps/no_icon.xpm
 share/gaim/pixmaps/normal.xpm
+share/gaim/pixmaps/offline.xpm
+share/gaim/pixmaps/online.xpm
 share/gaim/pixmaps/palette.xpm
+share/gaim/pixmaps/peng_frown.xpm
+share/gaim/pixmaps/peng_smile.xpm
+share/gaim/pixmaps/peng_wink.xpm
 share/gaim/pixmaps/permadd.xpm
 share/gaim/pixmaps/permdel.xpm
+share/gaim/pixmaps/signing_on.xpm
 share/gaim/pixmaps/small.xpm
 share/gaim/pixmaps/speaker.xpm
+share/gaim/pixmaps/underline.xpm
 share/gaim/pixmaps/wood.xpm
 @dirrm share/gaim/pixmaps
 @dirrm share/gaim
diff --git a/net/gaim/Makefile b/net/gaim/Makefile
index 0a944c0c5e0f..4870634425a1 100644
--- a/net/gaim/Makefile
+++ b/net/gaim/Makefile
@@ -1,20 +1,16 @@
 # New ports collection makefile for:	gaim
-# Version required:		0.8.0
+# Version required:		0.9.6
 # Date created:			26 Mar 1999
-# Whom:				Jim Mock <jim@phrantic.phear.net>
+# Whom:				Jim Mock <jim@blues.ghis.net>
 #
-# $Id: Makefile,v 1.4 1999/05/05 14:13:41 flathill Exp $
+# $Id: Makefile,v 1.5 1999/05/29 03:55:14 steve Exp $
 #
 
-DISTNAME=	gaim-0.8.0
+DISTNAME=	gaim-0.9.6
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.marko.net/pub/gaim/ \
-		http://www.freebsd.org/~mharo/distfiles/ \
-		ftp://ftp.netmug.org/pub/FreeBSD/distfiles/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} logo.xpm.gz
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=	ftp://ftp.marko.net/pub/gaim/
 
-MAINTAINER=	jim@phrantic.phear.net
+MAINTAINER=	jim@blues.ghis.net
 
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		glib12.2:${PORTSDIR}/devel/glib12
@@ -28,14 +24,10 @@ USE_X_PREFIX=	yes
 CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
 		GLIB_CONFIG="${GLIB_CONFIG}"
 
-post-patch:
-	${CP} ${DISTDIR}/logo.xpm.gz ${WRKSRC}/pixmaps
-	${GUNZIP_CMD} ${WRKSRC}/pixmaps/logo.xpm.gz
-
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gaim ${PREFIX}/bin
-	@ ${MKDIR} ${PREFIX}/share/gaim/pixmaps && chmod a+rx ${PREFIX}/share/gaim/pixmaps
-	@ ${ECHO} "===>   Installing pixmaps"
-	${INSTALL_DATA} ${WRKSRC}/pixmaps/*.xpm ${PREFIX}/share/gaim/pixmaps
+	@${INSTALL_PROGRAM} ${WRKSRC}/src/gaim ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/share/gaim/pixmaps && chmod a+rx ${PREFIX}/share/gaim/pixmaps
+	@${ECHO} "===>   Installing pixmaps"
+	@${INSTALL_DATA} ${WRKSRC}/pixmaps/*.xpm ${PREFIX}/share/gaim/pixmaps
 
 .include <bsd.port.mk>
diff --git a/net/gaim/distinfo b/net/gaim/distinfo
index 64e64b9fdae2..6f514dd18a69 100644
--- a/net/gaim/distinfo
+++ b/net/gaim/distinfo
@@ -1,2 +1 @@
-MD5 (gaim-0.8.0.tar.gz) = e13fd5527da4ff1af0fc237544584145
-MD5 (logo.xpm.gz) = 0ae9c355e316e941e3f494602ec8addf
+MD5 (gaim-0.9.6.tar.gz) = 6036d5b77626bfdb9708281dabcb6c6c
diff --git a/net/gaim/pkg-plist b/net/gaim/pkg-plist
index 65cc2bc25b92..1f7cea337885 100644
--- a/net/gaim/pkg-plist
+++ b/net/gaim/pkg-plist
@@ -3,6 +3,8 @@ share/gaim/pixmaps/admin_icon.xpm
 share/gaim/pixmaps/aimicon.xpm
 share/gaim/pixmaps/aimicon2.xpm
 share/gaim/pixmaps/aol_icon.xpm
+share/gaim/pixmaps/away.xpm
+share/gaim/pixmaps/away_icon.xpm
 share/gaim/pixmaps/big.xpm
 share/gaim/pixmaps/bold.xpm
 share/gaim/pixmaps/buddyadd.xpm
@@ -13,16 +15,25 @@ share/gaim/pixmaps/free_icon.xpm
 share/gaim/pixmaps/im.xpm
 share/gaim/pixmaps/info.xpm
 share/gaim/pixmaps/italic.xpm
+share/gaim/pixmaps/link.xpm
 share/gaim/pixmaps/login_icon.xpm
 share/gaim/pixmaps/logo.xpm
 share/gaim/pixmaps/logout_icon.xpm
+share/gaim/pixmaps/msg_pending.xpm
 share/gaim/pixmaps/no_icon.xpm
 share/gaim/pixmaps/normal.xpm
+share/gaim/pixmaps/offline.xpm
+share/gaim/pixmaps/online.xpm
 share/gaim/pixmaps/palette.xpm
+share/gaim/pixmaps/peng_frown.xpm
+share/gaim/pixmaps/peng_smile.xpm
+share/gaim/pixmaps/peng_wink.xpm
 share/gaim/pixmaps/permadd.xpm
 share/gaim/pixmaps/permdel.xpm
+share/gaim/pixmaps/signing_on.xpm
 share/gaim/pixmaps/small.xpm
 share/gaim/pixmaps/speaker.xpm
+share/gaim/pixmaps/underline.xpm
 share/gaim/pixmaps/wood.xpm
 @dirrm share/gaim/pixmaps
 @dirrm share/gaim