>Number:         16835
>Category:       pkg
>Synopsis:       chat/gaim splitted to chat/gaim and chat/gaim-gnome
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed May 15 13:40:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Julio Merino
>Release:        NetBSD 1.5ZC
>Organization:
HispaBSD
>Environment:
	
	
System: NetBSD darkstar.local 1.5ZC NetBSD 1.5ZC (DARKSTAR) #37: Sun May 12 13:28:55 CEST 2002 juli@darkstar.local:/home/pub/NetBSD/src/sys/arch/i386/compile/DARKSTAR i386
Architecture: i386
Machine: i386
>Description:
	The following patches are meant to create a separate chat/gaim-gnome,
	which is a gnome pannel applet. I've splitted chat/gaim's files,
	like Makefile and PLIST into some .common. They are included from
	both packages.
>How-To-Repeat:
	
>Fix:
	First patch is gaim-gnome.tar.gz, uuencoded, which includes
	all chat/gaim-gnome files.

begin 644 gaim-gnome.tar.gz
M'XL(`$+`XCP``^V6;6_:,!#'>=M\BE/'BVU=GD@@6J5*I90AM`(3T!?3-%4F
M,<&+8T=.,HJF?O<Y!%K6EB%5M%,U_X24R'?V&=_]+PX1B?60\1B;E><"7,NK
MUZ$"8'MU:_.YQ@+P7,^JNY;E.-)LUVRW`O5GV]$&>9HA`5#YD5/R-[]=]E=*
M>)?_'HKPE%"\]QBV935<=WO^/7N=?\=Q'?ENUSRG5@%K[SMYA/\\_V^@VL?9
MV>B\JFD&83[-`PR'AF$6A7%;$H;/XYBS0TW[\KG3;_;:)P?57^?=T;AX/QZ9
MNEG6D&[>:*U!_]-%MS4>'9T<+*OKFZ5__/Y>CO=Z[?Y8CK[M]`>]-J`DH3A[
MIRUG=#N7P_95<]@IINDZ9FA"L9X@AJD,>B%#78V&K:,BKM&Z')YWAS?F:I>K
M\ETZW?L3\H?R@'`3ISQG@3G)"0TH89$11X</7$.!DAGQ4S,,(CTAUY-\NF,&
M12PT$RQH?8?CM6V;Y0GY7.`=SG%4^!L[G29I8"11N#0_-?_W#W"?M;5FE_Y=
MU[G5?Z/N%?JW:PVE_Y?@M%`V9MFZ#1Q7M0EA2UU=E0+5<.:;K<'PK&FF6/S$
M(MVT&K)VQ`1IZ0S)NB['4E.N-><B^L,QP&F4\63E*>45HZ1<RD1SM#`2%CYF
M\SECV,^VF>,T3#`+MIGY="H5A+>:V:WU-"!"Q/#0Z<G2>A5L?O_;HU&ST]Y_
MC%WZ;]0::_U[7JE_I^8I_;\$)WM!N[M$C&<DA03Y$0HQ!!RGP'@&A,ECIA00
MR"<+$.4,0U%[(+L-$@L#OO(<8ID,0$&@9;.5M>P=D'%8\%Q`>7&0MP)Y+8#)
M`@0)9QGXE/@182%P!L7,TJ[).)!B*IM'82,93`6/EP[-LDV!;'RY`0,Y).8D
MQ1^*(.`C!A3ES)_).5H1)&>L6&&CF=TM5;3/(M"RCVC:GH[S7U>%0J%0*!0*
;A4*A4"@4"H5"H5`H%`J%XK7R&W;^!'(`*```
`
end




	The following diff file is a cvs diff from chat/gaim against the
	cvs version. Most stuff is removed in favour of .common files.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/chat/gaim/Makefile,v
retrieving revision 1.16
diff -u -b -u -r1.16 Makefile
--- Makefile	2002/03/30 23:43:03	1.16
+++ Makefile	2002/05/15 20:11:23
@@ -1,35 +1,16 @@
 # $NetBSD: Makefile,v 1.16 2002/03/30 23:43:03 reinoud Exp $
 #
 
-DISTNAME=	gaim-0.55
-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
+PKGREVISION=	1
 
-USE_BUILDLINK_ONLY=	YES
-USE_GMAKE=		YES
-USE_X11BASE=		YES
+CONFLICTS+=	gaim-gnome-[0-9]*
 
-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
 
-CONFIGURE_ENV+=		pixbufcfg="${GDK_PIXBUF_CONFIG}"
+PLIST_SRC+=	${.CURDIR}/../gaim/PLIST
 
 .include "../../audio/esound/buildlink.mk"
 .include "../../graphics/gdk-pixbuf/buildlink.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/chat/gaim/PLIST,v
retrieving revision 1.6
diff -u -b -u -r1.6 PLIST
--- PLIST	2002/03/30 23:43:03	1.6
+++ PLIST	2002/05/15 20:11:23
@@ -1,48 +1,2 @@
 @comment $NetBSD: PLIST,v 1.6 2002/03/30 23:43:03 reinoud 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
-${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/it/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
-share/gnome/apps/Internet/gaim.desktop
-share/pixmaps/gaim.xpm
-@unexec ${RMDIR} -p %D/share/gnome/apps/Internet 2>/dev/null || ${TRUE}
-@dirrm lib/gaim




	And now, there are Makefile.common and PLIST.common, which go
	inside chat/gaim.

# $NetBSD$
#

DISTNAME=	gaim-0.55
CATEGORIES=	chat x11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaim/} \
		ftp://ftp.marko.net/pub/gaim/

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

DISTINFO_FILE=  ${.CURDIR}/../gaim/distinfo
FILESDIR=       ${.CURDIR}/../gaim/files
PATCHDIR=       ${.CURDIR}/../gaim/patches
PKGDIR=         ${.CURDIR}/../gaim
PLIST_SRC=	${.CURDIR}/../gaim/PLIST.common

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}"




@comment $NetBSD$
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
${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/it/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
share/gnome/apps/Internet/gaim.desktop
share/pixmaps/gaim.xpm
@unexec ${RMDIR} -p %D/share/gnome/apps/Internet 2>/dev/null || ${TRUE}
@dirrm lib/gaim
>Release-Note:
>Audit-Trail:
>Unformatted: