diff options
author | jlam <jlam> | 2002-08-25 21:48:57 +0000 |
---|---|---|
committer | jlam <jlam> | 2002-08-25 21:48:57 +0000 |
commit | bae2639e49cd3cf3ee78c2ed8e82c3a277c91404 (patch) | |
tree | c8d09a03adeac7a950080d8040f6c9ceb10ef9d2 /chat/gaim | |
parent | cd541833a6d47d522a3c2b271309abd492b2464c (diff) | |
download | pkgsrc-bae2639e49cd3cf3ee78c2ed8e82c3a277c91404.tar.gz |
Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
Diffstat (limited to 'chat/gaim')
-rw-r--r-- | chat/gaim/Makefile | 17 | ||||
-rw-r--r-- | chat/gaim/Makefile.common | 5 | ||||
-rw-r--r-- | chat/gaim/PLIST | 2 | ||||
-rw-r--r-- | chat/gaim/PLIST.common | 2 | ||||
-rw-r--r-- | chat/gaim/distinfo | 2 | ||||
-rw-r--r-- | chat/gaim/patches/patch-aa | 2 | ||||
-rw-r--r-- | chat/gaim/patches/patch-ab | 2 |
7 files changed, 15 insertions, 17 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 |