Convert to buildlink3. patch-a[cd] provided by wiz@.

6 files changed, 41 insertions, 14 deletions

diff --git a/chat/gaim-gnome/Makefile b/chat/gaim-gnome/Makefile
index bf5ec203488..202ec80bf9e 100644
--- a/chat/gaim-gnome/Makefile
+++ b/chat/gaim-gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/04/25 04:16:43 xtraeme Exp $
+# $NetBSD: Makefile,v 1.14 2004/05/03 22:38:40 snj Exp $
 
 .include "../gaim-gtk1/Makefile.common"
 
@@ -13,10 +13,10 @@ MESSAGE_SRC=	${.CURDIR}/../gaim-gnome/MESSAGE
 CONFIGURE_ARGS+= --enable-gnome
 CONFIGURE_ARGS+= --enable-panel
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 
-.include "../../audio/esound/buildlink2.mk"
-.include "../../graphics/gdk-pixbuf/buildlink2.mk"
-.include "../../lang/perl5/buildlink2.mk"
-.include "../../x11/gnome-core/buildlink2.mk"
+.include "../../audio/esound/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf/buildlink3.mk"
+.include "../../lang/perl5/buildlink3.mk"
+.include "../../x11/gnome-core/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/gaim-gtk1/Makefile b/chat/gaim-gtk1/Makefile
index d064d4058df..f7212381440 100644
--- a/chat/gaim-gtk1/Makefile
+++ b/chat/gaim-gtk1/Makefile
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.4 2003/04/24 21:18:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/05/03 22:38:40 snj Exp $
 #
 
 .include "Makefile.common"
 
 CONFLICTS+=		gaim-gnome-[0-9]*
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 
 CONFIGURE_ARGS+=	--disable-gnome
 CONFIGURE_ARGS+=	--disable-panel
 
 PLIST_SRC+=		${.CURDIR}/PLIST
 
-.include "../../audio/esound/buildlink2.mk"
-.include "../../graphics/gdk-pixbuf/buildlink2.mk"
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../audio/esound/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf/buildlink3.mk"
+.include "../../lang/perl5/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/gaim-gtk1/Makefile.common b/chat/gaim-gtk1/Makefile.common
index 51dfedc6068..4aa82c54bf5 100644
--- a/chat/gaim-gtk1/Makefile.common
+++ b/chat/gaim-gtk1/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2004/04/26 20:51:57 snj Exp $
+# $NetBSD: Makefile.common,v 1.12 2004/05/03 22:38:40 snj Exp $
 #
 
 DISTNAME=	gaim-0.59.8
@@ -45,4 +45,4 @@ CONFIGURE_ARGS+=	--disable-screensaver
 CONFIGURE_ARGS+=	--without-included-gettext
 CONFIGURE_ENV+=		gt_cv_func_gnugettext1_libc=yes
 
-.include "../../converters/libiconv/buildlink2.mk"
+.include "../../converters/libiconv/buildlink3.mk"
diff --git a/chat/gaim-gtk1/distinfo b/chat/gaim-gtk1/distinfo
index a1cdabeeb3a..73728e98c4e 100644
--- a/chat/gaim-gtk1/distinfo
+++ b/chat/gaim-gtk1/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/04/11 15:39:03 jmmv Exp $
+$NetBSD: distinfo,v 1.2 2004/05/03 22:38:40 snj Exp $
 
 SHA1 (gaim-0.59.8.tar.gz) = d1d81fd634bc206433982eb19cd76492a79a1834
 Size (gaim-0.59.8.tar.gz) = 2126403 bytes
 SHA1 (patch-aa) = d1eba622e65507f657d602e497601e38140c5963
 SHA1 (patch-ab) = 0a635d9c7b89b5ce87c3a0bb37fa05280c66c6c2
+SHA1 (patch-ac) = bf8bcb89d474db730c33e0d9d5fd1feccfeedb78
+SHA1 (patch-ad) = 74603f8d139a91ca5f886edb411a9a041c7011ba
diff --git a/chat/gaim-gtk1/patches/patch-ac b/chat/gaim-gtk1/patches/patch-ac
new file mode 100644
index 00000000000..9cbb4743c4b
--- /dev/null
+++ b/chat/gaim-gtk1/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2004/05/03 22:38:40 snj Exp $
+
+--- configure.orig	2003-01-08 03:21:24.000000000 +0100
++++ configure
+@@ -12479,7 +12479,6 @@ rm -f conftest.$ac_objext conftest.$ac_e
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+-CFLAGS="$CFLAGS -I/usr/local/include -I/opt/include -I\$(top_srcdir)"
+ 
+ # Check whether --enable-distrib or --disable-distrib was given.
+ if test "${enable_distrib+set}" = set; then
diff --git a/chat/gaim-gtk1/patches/patch-ad b/chat/gaim-gtk1/patches/patch-ad
new file mode 100644
index 00000000000..3992633e742
--- /dev/null
+++ b/chat/gaim-gtk1/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2004/05/03 22:38:40 snj Exp $
+
+--- Makefile.in.orig	2003-01-08 03:21:47.000000000 +0100
++++ Makefile.in
+@@ -66,7 +66,7 @@ AS = @AS@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CATOBJEXT = @CATOBJEXT@
+ CC = @CC@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -I$(top_srcdir)
+ DATADIRNAME = @DATADIRNAME@
+ DLLTOOL = @DLLTOOL@
+ ECHO = @ECHO@