Convert gaim-gnome to buildlink2, and fix PLIST.

4 files changed, 23 insertions, 24 deletions

diff --git a/chat/gaim-gnome/Makefile b/chat/gaim-gnome/Makefile
index 502b0d74ce7..abe977e7e06 100644
--- a/chat/gaim-gnome/Makefile
+++ b/chat/gaim-gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/09/10 16:06:34 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/10/05 17:11:45 wiz Exp $
 
 .include "../gaim/Makefile.common"
 
@@ -13,9 +13,11 @@ MESSAGE_SRC=	${.CURDIR}/../gaim-gnome/MESSAGE
 CONFIGURE_ARGS+= --enable-gnome
 CONFIGURE_ARGS+= --enable-panel
 
-.include "../../x11/gnome-core/buildlink.mk"
-.include "../../audio/esound/buildlink.mk"
-.include "../../graphics/gdk-pixbuf/buildlink.mk"
-.include "../../lang/perl5/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+USE_BUILDLINK2=	YES
+
+.include "../../audio/esound/buildlink2.mk"
+.include "../../converters/libiconv/buildlink2.mk"
+.include "../../graphics/gdk-pixbuf/buildlink2.mk"
+.include "../../lang/perl5/buildlink2.mk"
+.include "../../x11/gnome-core/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/gaim-gnome/PLIST b/chat/gaim-gnome/PLIST
index f82df7d528c..f61acdb90fb 100644
--- a/chat/gaim-gnome/PLIST
+++ b/chat/gaim-gnome/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2002/07/09 02:13:27 rafal Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/10/05 17:11:45 wiz Exp $
 bin/gaim_applet
 etc/CORBA/servers/gaim_applet.gnorba
 share/applets/Network/gaim_applet.desktop
@@ -7,6 +7,4 @@ share/pixmaps/gaim/connect.png
 share/pixmaps/gaim/msgpend.png
 share/pixmaps/gaim/offline.png
 share/pixmaps/gaim/online.png
-@dirrm share/applets/Network
-@dirrm share/applets
 @dirrm share/pixmaps/gaim
diff --git a/chat/gaim/distinfo b/chat/gaim/distinfo
index d2396d1ba54..6df0a738489 100644
--- a/chat/gaim/distinfo
+++ b/chat/gaim/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.15 2002/09/28 03:49:18 hubertf Exp $
+$NetBSD: distinfo,v 1.16 2002/10/05 17:11:44 wiz Exp $
 
 SHA1 (gaim-0.59.3.tar.gz) = 458f671d1c03769183ed580a6db7af17cd6be943
 Size (gaim-0.59.3.tar.gz) = 2116775 bytes
-SHA1 (patch-ac.BAK) = 5a86eb569c058136b4d7e361672f381b84dad30d
-SHA1 (patch-aa) = a00df71e75866d1afb4784fe6f27bc1f4ac38f5a
+SHA1 (patch-aa) = 4995dccc8098754264ddc33ba4efe8b73c0bd30f
 SHA1 (patch-ab) = b085e043c5cb5b66e0540fd21ea86908d777d37c
diff --git a/chat/gaim/patches/patch-aa b/chat/gaim/patches/patch-aa
index d4e2a99514a..e3c1b5e6b8a 100644
--- a/chat/gaim/patches/patch-aa
+++ b/chat/gaim/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.9 2002/09/28 03:49:19 hubertf Exp $
+$NetBSD: patch-aa,v 1.10 2002/10/05 17:11:45 wiz Exp $
 
---- configure.orig	Sun Sep 15 00:28:06 2002
-+++ configure
-@@ -10798,8 +10798,6 @@
- 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
-   enableval="$enable_distrib"
+--- src/Makefile.in.orig	Sat Oct  5 07:07:29 2002
++++ src/Makefile.in
+@@ -150,7 +150,7 @@ SUBDIRS = protocols
+ @GNOMEAPPLET_TRUE@gaim_applet_SOURCES = about.c 			aim.c 			applet.c 			away.c 			browser.c 			buddy.c 			buddy_chat.c 			conversation.c 			core.c 			dialogs.c 			gaimrc.c 			gtkimhtml.c 			gtkspell.c 			gtkticker.c 			html.c 			idle.c 			list.c 			md5.c 			module.c 			multi.c 			perl.c 			plugins.c 			prefs.c 			proxy.c 			prpl.c 			server.c 			sound.c 			ticker.c 			util.c
+ @GNOMEAPPLET_TRUE@gaim_applet_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
+ @GNOMEAPPLET_TRUE@gaim_applet_LDFLAGS = -export-dynamic
+-@GNOMEAPPLET_TRUE@gaim_applet_LDADD = @LDADD@ @LIBOBJS@
++@GNOMEAPPLET_TRUE@gaim_applet_LDADD = @LDADD@ @LIBOBJS@ -liconv
+ @GNOMEAPPLET_FALSE@gaim_SOURCES = about.c 		aim.c 		applet.c 		away.c 		browser.c 		buddy.c 		buddy_chat.c 		conversation.c 		core.c 		dialogs.c 		gaimrc.c 		gtkimhtml.c 		gtkspell.c 		gtkticker.c 		html.c 		idle.c 		list.c 		md5.c 		module.c 		multi.c 		perl.c 		plugins.c 		prefs.c 		proxy.c 		prpl.c 		server.c 		sound.c 		ticker.c 		util.c
+ @GNOMEAPPLET_FALSE@gaim_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
+ @GNOMEAPPLET_FALSE@gaim_LDFLAGS = -export-dynamic