Split out Makefile/PLIST common between this package and the (forthcoming)

gaim-gnome, which will install the GNOME panel applet instead of the stand-
alone client.  Based in part on PR 16835 from Julio Merino, with differences
mainly due to the fact that I started this before I was pointed at his PR.

Reviewed by Hubert.

4 files changed, 93 insertions, 80 deletions

diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index 7dbda1065fe..a373795bf87 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,35 +1,14 @@
-# $NetBSD: Makefile,v 1.18 2002/07/01 17:16:20 hubertf Exp $
+# $NetBSD: Makefile,v 1.19 2002/07/09 02:10:50 rafal Exp $
 #
 
-DISTNAME=	gaim-0.59
-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
-
-USE_BUILDLINK_ONLY=	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
 
-CONFIGURE_ENV+=		pixbufcfg="${GDK_PIXBUF_CONFIG}"
+CONFLICTS+=	gaim-gnome-[0-9]*
 
 .include "../../audio/esound/buildlink.mk"
 .include "../../graphics/gdk-pixbuf/buildlink.mk"
diff --git a/chat/gaim/Makefile.common b/chat/gaim/Makefile.common
new file mode 100644
index 00000000000..793be91f075
--- /dev/null
+++ b/chat/gaim/Makefile.common
@@ -0,0 +1,36 @@
+# $NetBSD: Makefile.common,v 1.1 2002/07/09 02:10:51 rafal 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_BUILDLINK_ONLY=	YES
+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
+
+CONFIGURE_ENV+=		pixbufcfg="${GDK_PIXBUF_CONFIG}"
diff --git a/chat/gaim/PLIST b/chat/gaim/PLIST
index 9d7b1e62cac..adef85ac27a 100644
--- a/chat/gaim/PLIST
+++ b/chat/gaim/PLIST
@@ -1,56 +1,2 @@
-@comment $NetBSD: PLIST,v 1.8 2002/07/01 17:16:21 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.9 2002/07/09 02:10:51 rafal 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
-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 share/gnome/apps/Internet
-@dirrm share/gnome/apps
-@dirrm share/gnome
-@dirrm lib/gaim
diff --git a/chat/gaim/PLIST.common b/chat/gaim/PLIST.common
new file mode 100644
index 00000000000..091f5976978
--- /dev/null
+++ b/chat/gaim/PLIST.common
@@ -0,0 +1,52 @@
+@comment $NetBSD: PLIST.common,v 1.1 2002/07/09 02:10:51 rafal 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