Merge packages from the buildlink2 branch back into the main trunk that

have been converted to USE_BUILDLINK2.

10 files changed, 31 insertions, 52 deletions

diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index a373795bf87..a1088dd5d3a 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.19 2002/07/09 02:10:50 rafal Exp $
+# $NetBSD: Makefile,v 1.20 2002/08/25 21:49:30 jlam Exp $
 #
 
 .include "Makefile.common"
 
+CONFLICTS+=		gaim-gnome-[0-9]*
+
+USE_BUILDLINK2=		YES
+
 CONFIGURE_ARGS+=	--disable-gnome
 CONFIGURE_ARGS+=	--disable-panel
 
-PLIST_SRC+=    ${.CURDIR}/../gaim/PLIST
-
-CONFLICTS+=	gaim-gnome-[0-9]*
+PLIST_SRC+=		${.CURDIR}/../gaim/PLIST
 
-.include "../../audio/esound/buildlink.mk"
-.include "../../graphics/gdk-pixbuf/buildlink.mk"
-.include "../../lang/perl5/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../audio/esound/buildlink2.mk"
+.include "../../graphics/gdk-pixbuf/buildlink2.mk"
+.include "../../lang/perl5/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/gaim/Makefile.common b/chat/gaim/Makefile.common
index 793be91f075..9140887bbd8 100644
--- a/chat/gaim/Makefile.common
+++ b/chat/gaim/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2002/07/09 02:10:51 rafal Exp $
+# $NetBSD: Makefile.common,v 1.2 2002/08/25 21:49:31 jlam Exp $
 #
 
 DISTNAME=	gaim-0.59
@@ -16,7 +16,6 @@ PATCHDIR=	${.CURDIR}/../gaim/patches
 PKGDIR=		${.CURDIR}/../gaim
 PLIST_SRC=      ${.CURDIR}/../gaim/PLIST.common
 
-USE_BUILDLINK_ONLY=	YES
 USE_GMAKE=		YES
 USE_X11BASE=		YES
 
@@ -32,5 +31,3 @@ CONFIGURE_ARGS+=	--disable-screensaver
 CONFIGURE_ARGS+=	--enable-esd
 CONFIGURE_ARGS+=	--enable-perl
 CONFIGURE_ARGS+=	--enable-pixbuf
-
-CONFIGURE_ENV+=		pixbufcfg="${GDK_PIXBUF_CONFIG}"
diff --git a/chat/gaim/PLIST b/chat/gaim/PLIST
index adef85ac27a..57b9d4c6815 100644
--- a/chat/gaim/PLIST
+++ b/chat/gaim/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.9 2002/07/09 02:10:51 rafal Exp $
+@comment $NetBSD: PLIST,v 1.10 2002/08/25 21:49:31 jlam Exp $
 bin/gaim
diff --git a/chat/gaim/PLIST.common b/chat/gaim/PLIST.common
index 091f5976978..586440be0bf 100644
--- a/chat/gaim/PLIST.common
+++ b/chat/gaim/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1 2002/07/09 02:10:51 rafal Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2002/08/25 21:49:31 jlam Exp $
 lib/gaim/autorecon.so
 lib/gaim/chatlist.so
 lib/gaim/iconaway.so
diff --git a/chat/gaim/distinfo b/chat/gaim/distinfo
index 2d90f391a3e..4c187b65895 100644
--- a/chat/gaim/distinfo
+++ b/chat/gaim/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2002/07/19 05:13:33 mycroft Exp $
+$NetBSD: distinfo,v 1.13 2002/08/25 21:49:32 jlam Exp $
 
 SHA1 (gaim-0.59.tar.gz) = 0a74bc3b48810291adf9725966efc4a6de28fa3f
 Size (gaim-0.59.tar.gz) = 2047105 bytes
diff --git a/chat/gaim/patches/patch-aa b/chat/gaim/patches/patch-aa
index bdfd9877e34..9ad60381cc8 100644
--- a/chat/gaim/patches/patch-aa
+++ b/chat/gaim/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2002/07/01 17:16:21 hubertf Exp $
+$NetBSD: patch-aa,v 1.7 2002/08/25 21:49:32 jlam Exp $
 
 --- configure.orig	Tue Jun 25 06:23:07 2002
 +++ configure
diff --git a/chat/gaim/patches/patch-ab b/chat/gaim/patches/patch-ab
index ed309a6e957..03817b3a04f 100644
--- a/chat/gaim/patches/patch-ab
+++ b/chat/gaim/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2002/07/19 05:13:35 mycroft Exp $
+$NetBSD: patch-ab,v 1.2 2002/08/25 21:49:33 jlam Exp $
 
 --- src/perl.c.orig	Fri May 31 05:13:02 2002
 +++ src/perl.c	Fri Jul 19 05:07:30 2002
diff --git a/chat/ircII/Makefile b/chat/ircII/Makefile
index 0d0a4a10a55..563c5715588 100644
--- a/chat/ircII/Makefile
+++ b/chat/ircII/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2002/04/03 14:00:49 mrg Exp $
+# $NetBSD: Makefile,v 1.18 2002/08/25 21:49:34 jlam Exp $
 
 DISTNAME=		ircii-${VERS}
 PKGNAME=		ircII-${VERS}
@@ -17,7 +17,7 @@ PLIST_SUBST+= 		VERS=${VERS}
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 .if defined(DEFAULT_IRC_SERVER)
 CONFIGURE_ARGS+=	--with-default-server=${DEFAULT_IRC_SERVER}
@@ -34,20 +34,18 @@ BUILD_DEFS+=		USE_SOCKS
 
 # Include SOCKS firewall support
 .if defined(USE_SOCKS) && (${USE_SOCKS} == 4 || ${USE_SOCKS} == 5)
-CONFIGURE_ARGS+=	--with-socks${USE_SOCKS}=${BUILDLINK_DIR}
-.if ${USE_SOCKS} == 4
-.include "../../net/socks4/buildlink.mk"
-.else
-.include "../../net/socks5/buildlink.mk"
-.endif
+.  if ${USE_SOCKS} == 4
+.    include "../../net/socks4/buildlink2.mk"
+CONFIGURE_ARGS+=	--with-socks4=${BUILDLINK_PREFIX.socks4}
+.  elif ${USE_SOCKS} == 5
+.    include "../../net/socks5/buildlink2.mk"
+CONFIGURE_ARGS+=	--with-socks5=${BUILDLINK_PREFIX.socks5}
+.  endif
 .endif
 
-.if defined(IRCII_CONFIGURE_ARGS)
+# Allow customizations from /etc/mk.conf.
 CONFIGURE_ARGS+=	${IRCII_CONFIGURE_ARGS}
-.endif
-.if defined(IRCII_CONFIGURE_ENV)
 CONFIGURE_ENV+=		${IRCII_CONFIGURE_ENV}
-.endif
 
 pre-install:
 	@(if [ "X${MANZ}" != X"" ]; then \
diff --git a/chat/ircII/distinfo b/chat/ircII/distinfo
index 7a56eee0047..56365df494f 100644
--- a/chat/ircII/distinfo
+++ b/chat/ircII/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2002/04/03 13:42:01 mrg Exp $
+$NetBSD: distinfo,v 1.13 2002/08/25 21:49:34 jlam Exp $
 
 SHA1 (ircii-20020403.tar.bz2) = e6492a796dc068eafe34c60b4ad503b36c4dc198
 Size (ircii-20020403.tar.bz2) = 537289 bytes
-SHA1 (patch-aa) = 80aa471bcb6f864bed32117ed437d9d1ca9aa1ee
+SHA1 (patch-aa) = aff3a8c5ff05797b8617be2b4b57920913ae9ca2
 SHA1 (patch-ac) = 0afd36f3ad2247b0d42dfebab210822dd5dfe151
diff --git a/chat/ircII/patches/patch-aa b/chat/ircII/patches/patch-aa
index d6ba25ee00b..48978813371 100644
--- a/chat/ircII/patches/patch-aa
+++ b/chat/ircII/patches/patch-aa
@@ -1,25 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2001/07/15 12:22:17 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2002/08/25 21:49:35 jlam Exp $
 
---- configure.orig	Mon Feb 12 07:46:44 2001
-+++ configure
-@@ -538,16 +538,6 @@
- 
- 
- 
--# So many systems seem to need this that it is better do it here automatically.
--if test "x$prefix" != xNONE; then
--  if test -d "$prefix/lib"; then
--    LIBS="-L${prefix}/lib $LIBS"
--  fi
--else
--  if test -d "$ac_default_prefix/lib"; then
--    LIBS="-L${ac_default_prefix}/lib $LIBS"
--  fi
--fi
- 
- 
- VERSION=`sed -n -e 's/"[^"]*$//' -e '/#define[ 	]*IRCII_VERSION[ 	]*"/s///p' -e '/#define IRCII_VERSION/q' < ${srcdir}/source/irc.c` 
-@@ -5499,7 +5489,7 @@
+--- configure.orig	Wed Mar 27 09:20:46 2002
++++ configure	Wed May  8 05:34:40 2002
+@@ -5578,7 +5578,7 @@
  fi
  if test "x$COPY_DIRECTORY" = "xpax";
  then