Merge changes in the main trunk into the buildlink2 branch for thosebuildlink2

packages that have been converted to USE_BUILDLINK2.

7 files changed, 193 insertions, 80 deletions

diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index 6a78dd1ba14..283beafe0e2 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,33 +1,16 @@
-# $NetBSD: Makefile,v 1.16.2.3 2002/06/23 18:40:37 jlam Exp $
+# $NetBSD: Makefile,v 1.16.2.4 2002/08/25 21:19:52 jlam Exp $
 #
 
-DISTNAME=	gaim-0.58
-CATEGORIES=	chat x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaim/} \
-		ftp://ftp.marko.net/pub/gaim/
+.include "Makefile.common"
 
-MAINTAINER=	hubertf@netbsd.org
-HOMEPAGE=	http://gaim.sourceforge.net/
-COMMENT=	GTK+-based client for AOL's Instant Messenger chat system
+CONFLICTS+=		gaim-gnome-[0-9]*
 
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
-USE_X11BASE=		YES
 
-USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
-GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--disable-artsc
 CONFIGURE_ARGS+=	--disable-gnome
-CONFIGURE_ARGS+=	--disable-nas
 CONFIGURE_ARGS+=	--disable-panel
-CONFIGURE_ARGS+=	--disable-perl
-CONFIGURE_ARGS+=	--disable-screensaver
 
-CONFIGURE_ARGS+=	--enable-esd
-CONFIGURE_ARGS+=	--enable-perl
-CONFIGURE_ARGS+=	--enable-pixbuf
+PLIST_SRC+=		${.CURDIR}/../gaim/PLIST
 
 .include "../../audio/esound/buildlink2.mk"
 .include "../../graphics/gdk-pixbuf/buildlink2.mk"
diff --git a/chat/gaim/Makefile.common b/chat/gaim/Makefile.common
new file mode 100644
index 00000000000..ba5fdc4b5fe
--- /dev/null
+++ b/chat/gaim/Makefile.common
@@ -0,0 +1,33 @@
+# $NetBSD: Makefile.common,v 1.1.4.2 2002/08/25 21:19:53 jlam Exp $
+#
+
+DISTNAME=	gaim-0.59
+CATEGORIES=	chat x11
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaim/} \
+		ftp://ftp.marko.net/pub/gaim/
+
+MAINTAINER=	rafal@netbsd.org
+HOMEPAGE=	http://gaim.sourceforge.net/
+COMMENT=	GTK+-based client for AOL's Instant Messenger chat system
+
+DISTINFO_FILE=	${.CURDIR}/../gaim/distinfo
+FILESDIR=	${.CURDIR}/../gaim/files
+PATCHDIR=	${.CURDIR}/../gaim/patches
+PKGDIR=		${.CURDIR}/../gaim
+PLIST_SRC=      ${.CURDIR}/../gaim/PLIST.common
+
+USE_GMAKE=		YES
+USE_X11BASE=		YES
+
+USE_LIBTOOL=		YES
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+
+GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--disable-artsc
+CONFIGURE_ARGS+=	--disable-nas
+CONFIGURE_ARGS+=	--disable-perl
+CONFIGURE_ARGS+=	--disable-screensaver
+
+CONFIGURE_ARGS+=	--enable-esd
+CONFIGURE_ARGS+=	--enable-perl
+CONFIGURE_ARGS+=	--enable-pixbuf
diff --git a/chat/gaim/PLIST b/chat/gaim/PLIST
index 1a1ebd6570b..4ce0c475c55 100644
--- a/chat/gaim/PLIST
+++ b/chat/gaim/PLIST
@@ -1,52 +1,2 @@
-@comment $NetBSD: PLIST,v 1.6.2.1 2002/06/23 18:40:37 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6.2.2 2002/08/25 21:19:54 jlam Exp $
 bin/gaim
-lib/gaim/autorecon.so
-lib/gaim/chatlist.so
-lib/gaim/iconaway.so
-lib/gaim/libgg.a
-lib/gaim/libgg.la
-lib/gaim/libgg.so
-lib/gaim/libicq.a
-lib/gaim/libicq.la
-lib/gaim/libicq.so
-lib/gaim/libirc.a
-lib/gaim/libirc.la
-lib/gaim/libirc.so
-lib/gaim/libjabber.a
-lib/gaim/libjabber.la
-lib/gaim/libjabber.so
-lib/gaim/libmsn.a
-lib/gaim/libmsn.la
-lib/gaim/libmsn.so
-lib/gaim/libnapster.a
-lib/gaim/libnapster.la
-lib/gaim/libnapster.so
-lib/gaim/libyahoo.a
-lib/gaim/libyahoo.la
-lib/gaim/libyahoo.so
-lib/gaim/libzephyr.a
-lib/gaim/libzephyr.la
-lib/gaim/libzephyr.so
-lib/gaim/notify.so
-lib/gaim/spellchk.so
-man/man1/gaim.1
-${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gaim.mo
-share/gnome/apps/Internet/gaim.desktop
-share/pixmaps/gaim.xpm
-@unexec ${RMDIR} -p %D/share/gnome/apps/Internet 2>/dev/null || ${TRUE}
-@dirrm lib/gaim
diff --git a/chat/gaim/PLIST.common b/chat/gaim/PLIST.common
new file mode 100644
index 00000000000..f0c7d3a0bd4
--- /dev/null
+++ b/chat/gaim/PLIST.common
@@ -0,0 +1,52 @@
+@comment $NetBSD: PLIST.common,v 1.1.4.2 2002/08/25 21:19:55 jlam Exp $
+lib/gaim/autorecon.so
+lib/gaim/chatlist.so
+lib/gaim/iconaway.so
+lib/gaim/libgg.a
+lib/gaim/libgg.la
+lib/gaim/libgg.so
+lib/gaim/libicq.a
+lib/gaim/libicq.la
+lib/gaim/libicq.so
+lib/gaim/libirc.a
+lib/gaim/libirc.la
+lib/gaim/libirc.so
+lib/gaim/libjabber.a
+lib/gaim/libjabber.la
+lib/gaim/libjabber.so
+lib/gaim/libmsn.a
+lib/gaim/libmsn.la
+lib/gaim/libmsn.so
+lib/gaim/libnapster.a
+lib/gaim/libnapster.la
+lib/gaim/libnapster.so
+lib/gaim/libyahoo.a
+lib/gaim/libyahoo.la
+lib/gaim/libyahoo.so
+lib/gaim/libzephyr.a
+lib/gaim/libzephyr.la
+lib/gaim/libzephyr.so
+lib/gaim/notify.so
+lib/gaim/spellchk.so
+man/man1/gaim.1
+share/gnome/apps/Internet/gaim.desktop
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gaim.mo
+share/pixmaps/gaim.xpm
+@dirrm lib/gaim
diff --git a/chat/gaim/distinfo b/chat/gaim/distinfo
index cfc12e98cff..5a86381983a 100644
--- a/chat/gaim/distinfo
+++ b/chat/gaim/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.9.2.1 2002/06/23 18:40:38 jlam Exp $
+$NetBSD: distinfo,v 1.9.2.2 2002/08/25 21:19:56 jlam Exp $
 
-SHA1 (gaim-0.58.tar.gz) = 5fd319a8de5f13efd646d7fe2d66ec6e9fb09eec
-Size (gaim-0.58.tar.gz) = 1928057 bytes
-SHA1 (patch-aa) = d4ad7522469c6f73c5497635f32acbabae9b89b9
+SHA1 (gaim-0.59.tar.gz) = 0a74bc3b48810291adf9725966efc4a6de28fa3f
+Size (gaim-0.59.tar.gz) = 2047105 bytes
+SHA1 (patch-aa) = f56e9e5ee36db05adc1ba34294cf088a335117fe
+SHA1 (patch-ab) = c15b6d79f8129eee9298f0aae6d0ca4e39983655
diff --git a/chat/gaim/patches/patch-aa b/chat/gaim/patches/patch-aa
index 59ff2083f73..92af147bd5f 100644
--- a/chat/gaim/patches/patch-aa
+++ b/chat/gaim/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.4.2.1 2002/06/23 18:40:39 jlam Exp $
+$NetBSD: patch-aa,v 1.4.2.2 2002/08/25 21:19:56 jlam Exp $
 
---- configure.orig	Tue May 14 04:40:41 2002
+--- configure.orig	Tue Jun 25 06:23:07 2002
 +++ configure
-@@ -10792,8 +10792,6 @@
+@@ -7762,8 +7762,6 @@
  fi
- rm -f conftest.$ac_objext conftest.$ac_ext
+ rm -f conftest*
  
 -CFLAGS="$CFLAGS -I/usr/local/include -I/opt/include -I\$(top_srcdir)"
 -
diff --git a/chat/gaim/patches/patch-ab b/chat/gaim/patches/patch-ab
new file mode 100644
index 00000000000..f7bb8a83887
--- /dev/null
+++ b/chat/gaim/patches/patch-ab
@@ -0,0 +1,94 @@
+$NetBSD: patch-ab,v 1.1.4.2 2002/08/25 21:19:58 jlam Exp $
+
+--- src/perl.c.orig	Fri May 31 05:13:02 2002
++++ src/perl.c	Fri Jul 19 05:07:30 2002
+@@ -289,7 +289,7 @@
+ XS (XS_GAIM_register)
+ {
+ 	char *name, *ver, *callback, *unused; /* exactly like X-Chat, eh? :) */
+-	unsigned int junk;
++	STRLEN junk;
+ 	struct perlscript *scp;
+ 	dXSARGS;
+ 	items = 0;
+@@ -400,7 +400,7 @@
+ {
+ 	char *title;
+ 	char *message;
+-	unsigned int junk;
++	STRLEN junk;
+ 	dXSARGS;
+ 	items = 0;
+ 
+@@ -468,7 +468,7 @@
+ 
+ XS (XS_GAIM_command)
+ {
+-	unsigned int junk;
++	STRLEN junk;
+ 	char *command = NULL;
+ 	dXSARGS;
+ 	items = 0;
+@@ -520,7 +520,7 @@
+ XS (XS_GAIM_user_info)
+ {
+ 	struct gaim_connection *gc;
+-	unsigned int junk;
++	STRLEN junk;
+ 	struct buddy *buddy = NULL;
+ 	dXSARGS;
+ 	items = 0;
+@@ -546,7 +546,7 @@
+ {
+ 	char *nick, *who, *what;
+ 	struct conversation *c;
+-	int junk;
++	STRLEN junk;
+ 	int send, wflags;
+ 	dXSARGS;
+ 	items = 0;
+@@ -578,7 +578,7 @@
+ 	struct gaim_connection *gc;
+ 	char *nick, *what;
+ 	int isauto;
+-	int junk;
++	STRLEN junk;
+ 	dXSARGS;
+ 	items = 0;
+ 
+@@ -601,7 +601,7 @@
+ 	char *nick, *what;
+ 	int isauto;
+ 	struct conversation *c;
+-	unsigned int junk;
++	STRLEN junk;
+ 	dXSARGS;
+ 	items = 0;
+ 
+@@ -631,7 +631,7 @@
+ 	char *what;
+ 	struct conversation *b = NULL;
+ 	GSList *bcs;
+-	unsigned int junk;
++	STRLEN junk;
+ 	dXSARGS;
+ 	items = 0;
+ 
+@@ -797,7 +797,7 @@
+ 
+ XS (XS_GAIM_add_event_handler)
+ {
+-	unsigned int junk;
++	STRLEN junk;
+ 	struct _perl_event_handlers *handler;
+ 	dXSARGS;
+ 	items = 0;
+@@ -824,7 +824,7 @@
+ 
+ XS (XS_GAIM_add_timeout_handler)
+ {
+-	unsigned int junk;
++	STRLEN junk;
+ 	long timeout;
+ 	struct _perl_timeout_handlers *handler;
+ 	dXSARGS;