Implement WANT_GNOME.

13 files changed, 553 insertions, 282 deletions

diff --git a/net/gaim-snapshot/Makefile b/net/gaim-snapshot/Makefile
index 7a5e6e776000..7c6d698f0fab 100644
--- a/net/gaim-snapshot/Makefile
+++ b/net/gaim-snapshot/Makefile
@@ -5,44 +5,50 @@
 # $FreeBSD$
 #
 
-PORTNAME=		gaim
-PORTVERSION=		0.10.1
-PORTREVISION=		1
-CATEGORIES=		net
-MASTER_SITES=		ftp://ftp.marko.net/pub/gaim/ \
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
+PORTNAME=	gaim
+PORTVERSION=	0.10.1
+PORTREVISION=	1
+CATEGORIES=	net
+MASTER_SITES=	ftp://ftp.marko.net/pub/gaim/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=		jim@FreeBSD.org
+MAINTAINER=	jim@FreeBSD.org
 
-LIB_DEPENDS=		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+USE_BZIP2=	yes
+USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+USE_GTK=	yes
+WANT_ESOUND=	yes
+WANT_GNOME=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
 
-.if defined(WITH_GNOME)
-LIB_DEPENDS+=		gnome.4:${PORTSDIR}/x11/gnomelibs
-.endif
-
-GLIB_CONFIG?=		${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=		${X11BASE}/bin/gtk12-config
+MAN1=		gaim.1
 
-GNU_CONFIGURE=		yes
-USE_BZIP2=		yes
-USE_GMAKE=		yes
-USE_X_PREFIX=		yes
-CONFIGURE_ARGS=		--disable-esd
+.include <bsd.port.pre.mk>
 
-.if defined(WITH_GNOME)
-CONFIGURE_ARGS+=	--enable-gnome
+.if defined(HAVE_GNOME)
+USE_GNOME=	yes
+CONFIGURE_ARGS+=--enable-gnome --enable-panel
 .else
-CONFIGURE_ARGS+=	--disable-gnome
+CONFIGURE_ARGS+=--disable-gnome
+.endif
+.if defined(HAVE_ESOUND)
+USE_ESOUND=	yes
+CONFIGURE_ARGS+=--enable-esd
+.else
+CONFIGURE_ARGS+=--disable-esd
 .endif
 
-CONFIGURE_ENV=		GTK_CONFIG="${GTK_CONFIG}" \
-			GLIB_CONFIG="${GLIB_CONFIG}"
-
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/gaim ${PREFIX}/bin
-	@${MKDIR} ${PREFIX}/share/gaim/pixmaps && ${CHMOD} a+rx ${PREFIX}/share/gaim/pixmaps
-	@${ECHO} "===>   Installing pixmaps"
-	@${INSTALL_DATA} ${WRKSRC}/pixmaps/*.xpm ${PREFIX}/share/gaim/pixmaps
+pre-patch:
+	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
+		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
+		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
+		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/gaim-snapshot/files/patch-aa b/net/gaim-snapshot/files/patch-aa
new file mode 100644
index 000000000000..e01484100cf3
--- /dev/null
+++ b/net/gaim-snapshot/files/patch-aa
@@ -0,0 +1,13 @@
+--- Makefile.in.orig	Tue Oct  3 03:12:14 2000
++++ Makefile.in	Tue Oct  3 03:13:14 2000
+@@ -156,8 +156,8 @@
+ @GNOMEBITS_TRUE@bitssounddir = $(bitssysconf)/sound/events
+ @GNOMEBITS_TRUE@bitssound_DATA = gaim.soundlist
+ 
+-pixmapdir = $(datadir)/apps/Internet
+-pixmap_DATA = gaim.desktop
++@GNOMEAPPLET_TRUE@pixmapdir = $(datadir)/apps/Internet
++@GNOMEAPPLET_TRUE@pixmap_DATA = gaim.desktop
+ 
+ SUBDIRS = m4 libfaim sounds plugins pixmaps doc po intl src
+ ACLOCAL_AMFLAGS = -I m4
diff --git a/net/gaim-snapshot/files/patch-ab b/net/gaim-snapshot/files/patch-ab
new file mode 100644
index 000000000000..716dfc9761b5
--- /dev/null
+++ b/net/gaim-snapshot/files/patch-ab
@@ -0,0 +1,22 @@
+--- pixmaps/Makefile.in.orig	Tue Oct  3 02:42:15 2000
++++ pixmaps/Makefile.in	Tue Oct  3 02:48:38 2000
+@@ -128,8 +128,8 @@
+ EXTRA_DIST = about_small.xpm					add.xpm						add_small.xpm					admin_icon.xpm					aimicon.xpm					aimicon2.xpm					angel.xpm					aol_icon.xpm					away.xpm					away_icon.xpm					away_small.xpm					bgcolor.xpm					big.xpm						bigsmile.xpm					block.xpm					bold.xpm					bsmile.xpm					buddyadd.xpm					buddychat.xpm					buddydel.xpm					burp.xpm					cancel.xpm					close.xpm					close_small.xpm					crossedlips.xpm					cry.xpm						daemon-buddyadd.xpm				daemon-buddychat.xpm				daemon-buddydel.xpm				daemon-im.xpm					daemon-info.xpm					daemon-permadd.xpm				daemon-permdel.xpm				daemon.xpm					dt_icon.xpm					embarrassed.xpm					exit_small.xpm					export_small.xpm				fgcolor.xpm					fontface.xpm					fontface2.xpm					free_icon.xpm					gaim.xpm					gnome_add.xpm					gnome_close.xpm					gnome_preferences.xpm				gnome_remove.xpm 				gnome/devil-connect.png				gnome/devil-offline.png				gnome/devil-online.png				gnome/penguin-connect.png			gnome/penguin-offline.png			gnome/penguin-online.png			group.xpm					im.xpm						import_small.xpm				info.xpm					italic.xpm					join.xpm					kiss.xpm					link.xpm					login_icon.xpm					logo.xpm					logout_icon.xpm					luke03.xpm					moneymouth.xpm					msg_pending.xpm					no_icon.xpm					normal.xpm					offline.xpm					ok.xpm						oneeye.xpm					online.xpm					palette.xpm					peng_frown.xpm					peng_smile.xpm					peng_wink.xpm					permadd.xpm					permdel.xpm					plugins_small.xpm				pounce_small.xpm				prefs_small.xpm					refresh.xpm					sad.xpm						save.xpm					scream.xpm					search_small.xpm				signing_on.xpm					small.xpm					smile.xpm					smile8.xpm					smile_happy.xpm					smile_icon.xpm					smile_sad.xpm					smile_wink.xpm					speaker.xpm					strike.xpm					tb_forward.xpm					tb_search.xpm					think.xpm					tmp_send.xpm					tongue.xpm					underline.xpm					warn.xpm					wink.xpm					wood.xpm					yell.xpm			
+ 
+ 
+-pixmapdir = $(datadir)/pixmaps
+-pixmap_DATA = gaim.xpm
++pixmapdir = $(datadir)/pixmaps/gaim
++pixmap_DATA = $(EXTRA_DIST)
+ 
+ #gnomesysconf = `@GNOME_CONFIG@ --sysconfdir`
+ @GNOMEAPPLET_TRUE@gnomedata = `@GNOME_CONFIG@ --datadir`
+@@ -187,7 +187,7 @@
+ 
+ install-pixmapDATA: $(pixmap_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(pixmapdir)
++	$(mkinstalldirs) $(DESTDIR)$(pixmapdir) $(DESTDIR)$(pixmapdir)/gnome
+ 	@list='$(pixmap_DATA)'; for p in $$list; do \
+ 	  if test -f $(srcdir)/$$p; then \
+ 	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$p"; \
diff --git a/net/gaim-snapshot/files/patch-ac b/net/gaim-snapshot/files/patch-ac
new file mode 100644
index 000000000000..6c5b292aa4ad
--- /dev/null
+++ b/net/gaim-snapshot/files/patch-ac
@@ -0,0 +1,53 @@
+--- src/Makefile.in.orig	Tue Oct  3 16:00:11 2000
++++ src/Makefile.in	Tue Oct  3 16:05:56 2000
+@@ -123,12 +123,12 @@
+ l = @l@
+ perlpath = @perlpath@
+ sedpath = @sedpath@
+-@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet
++@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet gaim
+ @GNOMEAPPLET_FALSE@bin_PROGRAMS = gaim
+-@GNOMEAPPLET_TRUE@gaim_applet_SOURCES = about.c 			aim.c 			away.c 			browser.c 			buddy.c 			buddy_chat.c 			conversation.c 			dialogs.c 			gaimrc.c 			gnome_applet_mgr.c 			gtkhtml.c 			gtkticker.c 			html.c 			idle.c 			network.c 			oscar.c 			perl.c 			plugins.c 			prefs.c 			proxy.c 			rvous.c 			server.c 			sound.c 			ticker.c 			toc.c 			util.c
+-@GNOMEAPPLET_TRUE@gaim_applet_DEPENDENCIES = ../libfaim/libfaim.a
+-@GNOMEAPPLET_FALSE@gaim_SOURCES = about.c 		aim.c 		away.c 		browser.c 		buddy.c 		buddy_chat.c 		conversation.c 		dialogs.c 		gaimrc.c 		gnome_applet_mgr.c 		gtkhtml.c 		gtkticker.c 		html.c 		idle.c 		network.c 		oscar.c 		perl.c 		plugins.c 		prefs.c 		proxy.c 		rvous.c 		server.c 		sound.c 		ticker.c 		toc.c 		util.c
+-@GNOMEAPPLET_FALSE@gaim_DEPENDENCIES = ../libfaim/libfaim.a
++gaim_applet_SOURCES = about.c 			aim.c 			away.c 			browser.c 			buddy.c 			buddy_chat.c 			conversation.c 			dialogs.c 			gaimrc.c 			gnome_applet_mgr.c 			gtkhtml.c 			gtkticker.c 			html.c 			idle.c 			network.c 			oscar.c 			perl.c 			plugins.c 			prefs.c 			proxy.c 			rvous.c 			server.c 			sound.c 			ticker.c 			toc.c 			util.c
++gaim_applet_DEPENDENCIES = ../libfaim/libfaim.a
++gaim_SOURCES = about.c 		aim.c 		away.c 		browser.c 		buddy.c 		buddy_chat.c 		conversation.c 		dialogs.c 		gaimrc.c 		gnome_applet_mgr.c 		gtkhtml.c 		gtkticker.c 		html.c 		idle.c 		network.c 		oscar.c 		perl.c 		plugins.c 		prefs.c 		proxy.c 		rvous.c 		server.c 		sound.c 		ticker.c 		toc.c 		util.c
++gaim_DEPENDENCIES = ../libfaim/libfaim.a
+ 
+ CFLAGS = @CFLAGS@ -DLOCALEDIR=\"$(prefix)/share/locale\"
+ 
+@@ -142,20 +142,20 @@
+ DEFS = @DEFS@ -I. -I$(srcdir) -I..
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+-@GNOMEAPPLET_TRUE@gaim_applet_OBJECTS =  about.o aim.o away.o browser.o \
+-@GNOMEAPPLET_TRUE@buddy.o buddy_chat.o conversation.o dialogs.o \
+-@GNOMEAPPLET_TRUE@gaimrc.o gnome_applet_mgr.o gtkhtml.o gtkticker.o \
+-@GNOMEAPPLET_TRUE@html.o idle.o network.o oscar.o perl.o plugins.o \
+-@GNOMEAPPLET_TRUE@prefs.o proxy.o rvous.o server.o sound.o ticker.o \
+-@GNOMEAPPLET_TRUE@toc.o util.o
++gaim_applet_OBJECTS =  about.o aim.o away.o browser.o \
++buddy.o buddy_chat.o conversation.o dialogs.o \
++gaimrc.o gnome_applet_mgr.o gtkhtml.o gtkticker.o \
++html.o idle.o network.o oscar.o perl.o plugins.o \
++prefs.o proxy.o rvous.o server.o sound.o ticker.o \
++toc.o util.o
+ gaim_applet_LDADD = $(LDADD)
+ gaim_applet_LDFLAGS = 
+-@GNOMEAPPLET_FALSE@gaim_OBJECTS =  about.o aim.o away.o browser.o \
+-@GNOMEAPPLET_FALSE@buddy.o buddy_chat.o conversation.o dialogs.o \
+-@GNOMEAPPLET_FALSE@gaimrc.o gnome_applet_mgr.o gtkhtml.o gtkticker.o \
+-@GNOMEAPPLET_FALSE@html.o idle.o network.o oscar.o perl.o plugins.o \
+-@GNOMEAPPLET_FALSE@prefs.o proxy.o rvous.o server.o sound.o ticker.o \
+-@GNOMEAPPLET_FALSE@toc.o util.o
++gaim_OBJECTS =  about.o aim.o away.o browser.o \
++buddy.o buddy_chat.o conversation.o dialogs.o \
++gaimrc.o gnome_applet_mgr.o gtkhtml.o gtkticker.o \
++html.o idle.o network.o oscar.o perl.o plugins.o \
++prefs.o proxy.o rvous.o server.o sound.o ticker.o \
++toc.o util.o
+ gaim_LDADD = $(LDADD)
+ gaim_LDFLAGS = 
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/net/gaim-snapshot/pkg-plist b/net/gaim-snapshot/pkg-plist
index cd47b44d7c0c..604be8cc7416 100644
--- a/net/gaim-snapshot/pkg-plist
+++ b/net/gaim-snapshot/pkg-plist
@@ -1,104 +1,133 @@
+bin/au2h
 bin/gaim
-share/gaim/pixmaps/about_small.xpm
-share/gaim/pixmaps/add.xpm
-share/gaim/pixmaps/add_small.xpm
-share/gaim/pixmaps/admin_icon.xpm
-share/gaim/pixmaps/aimicon.xpm
-share/gaim/pixmaps/aimicon2.xpm
-share/gaim/pixmaps/angel.xpm
-share/gaim/pixmaps/aol_icon.xpm
-share/gaim/pixmaps/away.xpm
-share/gaim/pixmaps/away_icon.xpm
-share/gaim/pixmaps/away_small.xpm
-share/gaim/pixmaps/bgcolor.xpm
-share/gaim/pixmaps/big.xpm
-share/gaim/pixmaps/bigsmile.xpm
-share/gaim/pixmaps/block.xpm
-share/gaim/pixmaps/bold.xpm
-share/gaim/pixmaps/bsmile.xpm
-share/gaim/pixmaps/buddyadd.xpm
-share/gaim/pixmaps/buddychat.xpm
-share/gaim/pixmaps/buddydel.xpm
-share/gaim/pixmaps/burp.xpm
-share/gaim/pixmaps/cancel.xpm
-share/gaim/pixmaps/close.xpm
-share/gaim/pixmaps/close_small.xpm
-share/gaim/pixmaps/crossedlips.xpm
-share/gaim/pixmaps/cry.xpm
-share/gaim/pixmaps/daemon-buddyadd.xpm
-share/gaim/pixmaps/daemon-buddychat.xpm
-share/gaim/pixmaps/daemon-buddydel.xpm
-share/gaim/pixmaps/daemon-im.xpm
-share/gaim/pixmaps/daemon-info.xpm
-share/gaim/pixmaps/daemon-permadd.xpm
-share/gaim/pixmaps/daemon-permdel.xpm
-share/gaim/pixmaps/daemon.xpm
-share/gaim/pixmaps/dt_icon.xpm
-share/gaim/pixmaps/embarrassed.xpm
-share/gaim/pixmaps/exit_small.xpm
-share/gaim/pixmaps/export_small.xpm
-share/gaim/pixmaps/fgcolor.xpm
-share/gaim/pixmaps/fontface.xpm
-share/gaim/pixmaps/fontface2.xpm
-share/gaim/pixmaps/free_icon.xpm
-share/gaim/pixmaps/gaim.xpm
-share/gaim/pixmaps/gnome_add.xpm
-share/gaim/pixmaps/gnome_close.xpm
-share/gaim/pixmaps/gnome_preferences.xpm
-share/gaim/pixmaps/gnome_remove.xpm
-share/gaim/pixmaps/group.xpm
-share/gaim/pixmaps/im.xpm
-share/gaim/pixmaps/import_small.xpm
-share/gaim/pixmaps/info.xpm
-share/gaim/pixmaps/italic.xpm
-share/gaim/pixmaps/join.xpm
-share/gaim/pixmaps/kiss.xpm
-share/gaim/pixmaps/link.xpm
-share/gaim/pixmaps/login_icon.xpm
-share/gaim/pixmaps/logo.xpm
-share/gaim/pixmaps/logout_icon.xpm
-share/gaim/pixmaps/luke03.xpm
-share/gaim/pixmaps/moneymouth.xpm
-share/gaim/pixmaps/msg_pending.xpm
-share/gaim/pixmaps/no_icon.xpm
-share/gaim/pixmaps/normal.xpm
-share/gaim/pixmaps/offline.xpm
-share/gaim/pixmaps/ok.xpm
-share/gaim/pixmaps/oneeye.xpm
-share/gaim/pixmaps/online.xpm
-share/gaim/pixmaps/palette.xpm
-share/gaim/pixmaps/peng_frown.xpm
-share/gaim/pixmaps/peng_smile.xpm
-share/gaim/pixmaps/peng_wink.xpm
-share/gaim/pixmaps/permadd.xpm
-share/gaim/pixmaps/permdel.xpm
-share/gaim/pixmaps/plugins_small.xpm
-share/gaim/pixmaps/pounce_small.xpm
-share/gaim/pixmaps/prefs_small.xpm
-share/gaim/pixmaps/refresh.xpm
-share/gaim/pixmaps/sad.xpm
-share/gaim/pixmaps/save.xpm
-share/gaim/pixmaps/scream.xpm
-share/gaim/pixmaps/search_small.xpm
-share/gaim/pixmaps/signing_on.xpm
-share/gaim/pixmaps/small.xpm
-share/gaim/pixmaps/smile.xpm
-share/gaim/pixmaps/smile8.xpm
-share/gaim/pixmaps/smile_happy.xpm
-share/gaim/pixmaps/smile_icon.xpm
-share/gaim/pixmaps/smile_sad.xpm
-share/gaim/pixmaps/smile_wink.xpm
-share/gaim/pixmaps/speaker.xpm
-share/gaim/pixmaps/strike.xpm
-share/gaim/pixmaps/tb_forward.xpm
-share/gaim/pixmaps/tb_search.xpm
-share/gaim/pixmaps/think.xpm
-share/gaim/pixmaps/tmp_send.xpm
-share/gaim/pixmaps/tongue.xpm
-share/gaim/pixmaps/underline.xpm
-share/gaim/pixmaps/warn.xpm
-share/gaim/pixmaps/wink.xpm
-share/gaim/pixmaps/wood.xpm
-share/gaim/pixmaps/yell.xpm
-@dirrm share/gaim/pixmaps
-@dirrm share/gaim
+%%GNOME:%%bin/gaim_applet
+%%GNOME:%%etc/CORBA/servers/gaim_applet.gnorba
+%%GNOME:%%etc/sound/events/gaim.soundlist
+lib/gaim/autorecon.so
+lib/gaim/iconaway.so
+lib/gaim/lagmeter.so
+lib/gaim/notify.so
+lib/gaim/spellchk.so
+%%DATADIR%%/pixmaps/gaim/about_small.xpm
+%%DATADIR%%/pixmaps/gaim/add.xpm
+%%DATADIR%%/pixmaps/gaim/add_small.xpm
+%%DATADIR%%/pixmaps/gaim/admin_icon.xpm
+%%DATADIR%%/pixmaps/gaim/aimicon.xpm
+%%DATADIR%%/pixmaps/gaim/aimicon2.xpm
+%%DATADIR%%/pixmaps/gaim/angel.xpm
+%%DATADIR%%/pixmaps/gaim/aol_icon.xpm
+%%DATADIR%%/pixmaps/gaim/away.xpm
+%%DATADIR%%/pixmaps/gaim/away_icon.xpm
+%%DATADIR%%/pixmaps/gaim/away_small.xpm
+%%DATADIR%%/pixmaps/gaim/bgcolor.xpm
+%%DATADIR%%/pixmaps/gaim/big.xpm
+%%DATADIR%%/pixmaps/gaim/bigsmile.xpm
+%%DATADIR%%/pixmaps/gaim/block.xpm
+%%DATADIR%%/pixmaps/gaim/bold.xpm
+%%DATADIR%%/pixmaps/gaim/bsmile.xpm
+%%DATADIR%%/pixmaps/gaim/buddyadd.xpm
+%%DATADIR%%/pixmaps/gaim/buddychat.xpm
+%%DATADIR%%/pixmaps/gaim/buddydel.xpm
+%%DATADIR%%/pixmaps/gaim/burp.xpm
+%%DATADIR%%/pixmaps/gaim/cancel.xpm
+%%DATADIR%%/pixmaps/gaim/close.xpm
+%%DATADIR%%/pixmaps/gaim/close_small.xpm
+%%DATADIR%%/pixmaps/gaim/crossedlips.xpm
+%%DATADIR%%/pixmaps/gaim/cry.xpm
+%%DATADIR%%/pixmaps/gaim/daemon-buddyadd.xpm
+%%DATADIR%%/pixmaps/gaim/daemon-buddychat.xpm
+%%DATADIR%%/pixmaps/gaim/daemon-buddydel.xpm
+%%DATADIR%%/pixmaps/gaim/daemon-im.xpm
+%%DATADIR%%/pixmaps/gaim/daemon-info.xpm
+%%DATADIR%%/pixmaps/gaim/daemon-permadd.xpm
+%%DATADIR%%/pixmaps/gaim/daemon-permdel.xpm
+%%DATADIR%%/pixmaps/gaim/daemon.xpm
+%%DATADIR%%/pixmaps/gaim/dt_icon.xpm
+%%DATADIR%%/pixmaps/gaim/embarrassed.xpm
+%%DATADIR%%/pixmaps/gaim/exit_small.xpm
+%%DATADIR%%/pixmaps/gaim/export_small.xpm
+%%DATADIR%%/pixmaps/gaim/fgcolor.xpm
+%%DATADIR%%/pixmaps/gaim/fontface.xpm
+%%DATADIR%%/pixmaps/gaim/fontface2.xpm
+%%DATADIR%%/pixmaps/gaim/free_icon.xpm
+%%DATADIR%%/pixmaps/gaim/gaim.xpm
+%%DATADIR%%/pixmaps/gaim/gnome/devil-connect.png
+%%DATADIR%%/pixmaps/gaim/gnome/devil-offline.png
+%%DATADIR%%/pixmaps/gaim/gnome/devil-online.png
+%%DATADIR%%/pixmaps/gaim/gnome/penguin-connect.png
+%%DATADIR%%/pixmaps/gaim/gnome/penguin-offline.png
+%%DATADIR%%/pixmaps/gaim/gnome/penguin-online.png
+%%DATADIR%%/pixmaps/gaim/gnome_add.xpm
+%%DATADIR%%/pixmaps/gaim/gnome_close.xpm
+%%DATADIR%%/pixmaps/gaim/gnome_preferences.xpm
+%%DATADIR%%/pixmaps/gaim/gnome_remove.xpm
+%%DATADIR%%/pixmaps/gaim/group.xpm
+%%DATADIR%%/pixmaps/gaim/im.xpm
+%%DATADIR%%/pixmaps/gaim/import_small.xpm
+%%DATADIR%%/pixmaps/gaim/info.xpm
+%%DATADIR%%/pixmaps/gaim/italic.xpm
+%%DATADIR%%/pixmaps/gaim/join.xpm
+%%DATADIR%%/pixmaps/gaim/kiss.xpm
+%%DATADIR%%/pixmaps/gaim/link.xpm
+%%DATADIR%%/pixmaps/gaim/login_icon.xpm
+%%DATADIR%%/pixmaps/gaim/logo.xpm
+%%DATADIR%%/pixmaps/gaim/logout_icon.xpm
+%%DATADIR%%/pixmaps/gaim/luke03.xpm
+%%DATADIR%%/pixmaps/gaim/moneymouth.xpm
+%%DATADIR%%/pixmaps/gaim/msg_pending.xpm
+%%DATADIR%%/pixmaps/gaim/no_icon.xpm
+%%DATADIR%%/pixmaps/gaim/normal.xpm
+%%DATADIR%%/pixmaps/gaim/offline.xpm
+%%DATADIR%%/pixmaps/gaim/ok.xpm
+%%DATADIR%%/pixmaps/gaim/oneeye.xpm
+%%DATADIR%%/pixmaps/gaim/online.xpm
+%%DATADIR%%/pixmaps/gaim/palette.xpm
+%%DATADIR%%/pixmaps/gaim/peng_frown.xpm
+%%DATADIR%%/pixmaps/gaim/peng_smile.xpm
+%%DATADIR%%/pixmaps/gaim/peng_wink.xpm
+%%DATADIR%%/pixmaps/gaim/permadd.xpm
+%%DATADIR%%/pixmaps/gaim/permdel.xpm
+%%DATADIR%%/pixmaps/gaim/plugins_small.xpm
+%%DATADIR%%/pixmaps/gaim/pounce_small.xpm
+%%DATADIR%%/pixmaps/gaim/prefs_small.xpm
+%%DATADIR%%/pixmaps/gaim/refresh.xpm
+%%DATADIR%%/pixmaps/gaim/sad.xpm
+%%DATADIR%%/pixmaps/gaim/save.xpm
+%%DATADIR%%/pixmaps/gaim/scream.xpm
+%%DATADIR%%/pixmaps/gaim/search_small.xpm
+%%DATADIR%%/pixmaps/gaim/signing_on.xpm
+%%DATADIR%%/pixmaps/gaim/small.xpm
+%%DATADIR%%/pixmaps/gaim/smile.xpm
+%%DATADIR%%/pixmaps/gaim/smile8.xpm
+%%DATADIR%%/pixmaps/gaim/smile_happy.xpm
+%%DATADIR%%/pixmaps/gaim/smile_icon.xpm
+%%DATADIR%%/pixmaps/gaim/smile_sad.xpm
+%%DATADIR%%/pixmaps/gaim/smile_wink.xpm
+%%DATADIR%%/pixmaps/gaim/speaker.xpm
+%%DATADIR%%/pixmaps/gaim/strike.xpm
+%%DATADIR%%/pixmaps/gaim/tb_forward.xpm
+%%DATADIR%%/pixmaps/gaim/tb_search.xpm
+%%DATADIR%%/pixmaps/gaim/think.xpm
+%%DATADIR%%/pixmaps/gaim/tmp_send.xpm
+%%DATADIR%%/pixmaps/gaim/tongue.xpm
+%%DATADIR%%/pixmaps/gaim/underline.xpm
+%%DATADIR%%/pixmaps/gaim/warn.xpm
+%%DATADIR%%/pixmaps/gaim/wink.xpm
+%%DATADIR%%/pixmaps/gaim/wood.xpm
+%%DATADIR%%/pixmaps/gaim/yell.xpm
+%%GNOME:%%share/gnome/applets/Network/gaim_applet.desktop
+%%GNOME:%%share/gnome/apps/Internet/gaim.desktop
+%%GNOME:%%share/gnome/pixmaps/gaim.xpm
+%%GNOME:%%share/gnome/sounds/gaim/BuddyArrive.au
+%%GNOME:%%share/gnome/sounds/gaim/BuddyLeave.au
+%%GNOME:%%share/gnome/sounds/gaim/Receive.au
+%%GNOME:%%share/gnome/sounds/gaim/Send.au
+share/locale/de/LC_MESSAGES/gaim.mo
+share/locale/es/LC_MESSAGES/gaim.mo
+share/locale/fr/LC_MESSAGES/gaim.mo
+share/locale/ko/LC_MESSAGES/gaim.mo
+share/locale/zh_CN/LC_MESSAGES/gaim.mo
+%%GNOME:%%@dirrm share/gnome/sounds/gaim
+@dirrm %%DATADIR%%/pixmaps/gaim/gnome
+@dirrm %%DATADIR%%/pixmaps/gaim
+@dirrm lib/gaim
diff --git a/net/gaim/Makefile b/net/gaim/Makefile
index 7a5e6e776000..7c6d698f0fab 100644
--- a/net/gaim/Makefile
+++ b/net/gaim/Makefile
@@ -5,44 +5,50 @@
 # $FreeBSD$
 #
 
-PORTNAME=		gaim
-PORTVERSION=		0.10.1
-PORTREVISION=		1
-CATEGORIES=		net
-MASTER_SITES=		ftp://ftp.marko.net/pub/gaim/ \
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
+PORTNAME=	gaim
+PORTVERSION=	0.10.1
+PORTREVISION=	1
+CATEGORIES=	net
+MASTER_SITES=	ftp://ftp.marko.net/pub/gaim/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=		jim@FreeBSD.org
+MAINTAINER=	jim@FreeBSD.org
 
-LIB_DEPENDS=		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+USE_BZIP2=	yes
+USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+USE_GTK=	yes
+WANT_ESOUND=	yes
+WANT_GNOME=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
 
-.if defined(WITH_GNOME)
-LIB_DEPENDS+=		gnome.4:${PORTSDIR}/x11/gnomelibs
-.endif
-
-GLIB_CONFIG?=		${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=		${X11BASE}/bin/gtk12-config
+MAN1=		gaim.1
 
-GNU_CONFIGURE=		yes
-USE_BZIP2=		yes
-USE_GMAKE=		yes
-USE_X_PREFIX=		yes
-CONFIGURE_ARGS=		--disable-esd
+.include <bsd.port.pre.mk>
 
-.if defined(WITH_GNOME)
-CONFIGURE_ARGS+=	--enable-gnome
+.if defined(HAVE_GNOME)
+USE_GNOME=	yes
+CONFIGURE_ARGS+=--enable-gnome --enable-panel
 .else
-CONFIGURE_ARGS+=	--disable-gnome
+CONFIGURE_ARGS+=--disable-gnome
+.endif
+.if defined(HAVE_ESOUND)
+USE_ESOUND=	yes
+CONFIGURE_ARGS+=--enable-esd
+.else
+CONFIGURE_ARGS+=--disable-esd
 .endif
 
-CONFIGURE_ENV=		GTK_CONFIG="${GTK_CONFIG}" \
-			GLIB_CONFIG="${GLIB_CONFIG}"
-
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/gaim ${PREFIX}/bin
-	@${MKDIR} ${PREFIX}/share/gaim/pixmaps && ${CHMOD} a+rx ${PREFIX}/share/gaim/pixmaps
-	@${ECHO} "===>   Installing pixmaps"
-	@${INSTALL_DATA} ${WRKSRC}/pixmaps/*.xpm ${PREFIX}/share/gaim/pixmaps
+pre-patch:
+	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
+		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
+		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
+		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/gaim/files/patch-aa b/net/gaim/files/patch-aa
new file mode 100644
index 000000000000..e01484100cf3
--- /dev/null
+++ b/net/gaim/files/patch-aa
@@ -0,0 +1,13 @@
+--- Makefile.in.orig	Tue Oct  3 03:12:14 2000
++++ Makefile.in	Tue Oct  3 03:13:14 2000
+@@ -156,8 +156,8 @@
+ @GNOMEBITS_TRUE@bitssounddir = $(bitssysconf)/sound/events
+ @GNOMEBITS_TRUE@bitssound_DATA = gaim.soundlist
+ 
+-pixmapdir = $(datadir)/apps/Internet
+-pixmap_DATA = gaim.desktop
++@GNOMEAPPLET_TRUE@pixmapdir = $(datadir)/apps/Internet
++@GNOMEAPPLET_TRUE@pixmap_DATA = gaim.desktop
+ 
+ SUBDIRS = m4 libfaim sounds plugins pixmaps doc po intl src
+ ACLOCAL_AMFLAGS = -I m4
diff --git a/net/gaim/files/patch-ab b/net/gaim/files/patch-ab
new file mode 100644
index 000000000000..716dfc9761b5
--- /dev/null
+++ b/net/gaim/files/patch-ab
@@ -0,0 +1,22 @@
+--- pixmaps/Makefile.in.orig	Tue Oct  3 02:42:15 2000
++++ pixmaps/Makefile.in	Tue Oct  3 02:48:38 2000
+@@ -128,8 +128,8 @@
+ EXTRA_DIST = about_small.xpm					add.xpm						add_small.xpm					admin_icon.xpm					aimicon.xpm					aimicon2.xpm					angel.xpm					aol_icon.xpm					away.xpm					away_icon.xpm					away_small.xpm					bgcolor.xpm					big.xpm						bigsmile.xpm					block.xpm					bold.xpm					bsmile.xpm					buddyadd.xpm					buddychat.xpm					buddydel.xpm					burp.xpm					cancel.xpm					close.xpm					close_small.xpm					crossedlips.xpm					cry.xpm						daemon-buddyadd.xpm				daemon-buddychat.xpm				daemon-buddydel.xpm				daemon-im.xpm					daemon-info.xpm					daemon-permadd.xpm				daemon-permdel.xpm				daemon.xpm					dt_icon.xpm					embarrassed.xpm					exit_small.xpm					export_small.xpm				fgcolor.xpm					fontface.xpm					fontface2.xpm					free_icon.xpm					gaim.xpm					gnome_add.xpm					gnome_close.xpm					gnome_preferences.xpm				gnome_remove.xpm 				gnome/devil-connect.png				gnome/devil-offline.png				gnome/devil-online.png				gnome/penguin-connect.png			gnome/penguin-offline.png			gnome/penguin-online.png			group.xpm					im.xpm						import_small.xpm				info.xpm					italic.xpm					join.xpm					kiss.xpm					link.xpm					login_icon.xpm					logo.xpm					logout_icon.xpm					luke03.xpm					moneymouth.xpm					msg_pending.xpm					no_icon.xpm					normal.xpm					offline.xpm					ok.xpm						oneeye.xpm					online.xpm					palette.xpm					peng_frown.xpm					peng_smile.xpm					peng_wink.xpm					permadd.xpm					permdel.xpm					plugins_small.xpm				pounce_small.xpm				prefs_small.xpm					refresh.xpm					sad.xpm						save.xpm					scream.xpm					search_small.xpm				signing_on.xpm					small.xpm					smile.xpm					smile8.xpm					smile_happy.xpm					smile_icon.xpm					smile_sad.xpm					smile_wink.xpm					speaker.xpm					strike.xpm					tb_forward.xpm					tb_search.xpm					think.xpm					tmp_send.xpm					tongue.xpm					underline.xpm					warn.xpm					wink.xpm					wood.xpm					yell.xpm			
+ 
+ 
+-pixmapdir = $(datadir)/pixmaps
+-pixmap_DATA = gaim.xpm
++pixmapdir = $(datadir)/pixmaps/gaim
++pixmap_DATA = $(EXTRA_DIST)
+ 
+ #gnomesysconf = `@GNOME_CONFIG@ --sysconfdir`
+ @GNOMEAPPLET_TRUE@gnomedata = `@GNOME_CONFIG@ --datadir`
+@@ -187,7 +187,7 @@
+ 
+ install-pixmapDATA: $(pixmap_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(pixmapdir)
++	$(mkinstalldirs) $(DESTDIR)$(pixmapdir) $(DESTDIR)$(pixmapdir)/gnome
+ 	@list='$(pixmap_DATA)'; for p in $$list; do \
+ 	  if test -f $(srcdir)/$$p; then \
+ 	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$p"; \
diff --git a/net/gaim/files/patch-ac b/net/gaim/files/patch-ac
new file mode 100644
index 000000000000..6c5b292aa4ad
--- /dev/null
+++ b/net/gaim/files/patch-ac
@@ -0,0 +1,53 @@
+--- src/Makefile.in.orig	Tue Oct  3 16:00:11 2000
++++ src/Makefile.in	Tue Oct  3 16:05:56 2000
+@@ -123,12 +123,12 @@
+ l = @l@
+ perlpath = @perlpath@
+ sedpath = @sedpath@
+-@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet
++@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet gaim
+ @GNOMEAPPLET_FALSE@bin_PROGRAMS = gaim
+-@GNOMEAPPLET_TRUE@gaim_applet_SOURCES = about.c 			aim.c 			away.c 			browser.c 			buddy.c 			buddy_chat.c 			conversation.c 			dialogs.c 			gaimrc.c 			gnome_applet_mgr.c 			gtkhtml.c 			gtkticker.c 			html.c 			idle.c 			network.c 			oscar.c 			perl.c 			plugins.c 			prefs.c 			proxy.c 			rvous.c 			server.c 			sound.c 			ticker.c 			toc.c 			util.c
+-@GNOMEAPPLET_TRUE@gaim_applet_DEPENDENCIES = ../libfaim/libfaim.a
+-@GNOMEAPPLET_FALSE@gaim_SOURCES = about.c 		aim.c 		away.c 		browser.c 		buddy.c 		buddy_chat.c 		conversation.c 		dialogs.c 		gaimrc.c 		gnome_applet_mgr.c 		gtkhtml.c 		gtkticker.c 		html.c 		idle.c 		network.c 		oscar.c 		perl.c 		plugins.c 		prefs.c 		proxy.c 		rvous.c 		server.c 		sound.c 		ticker.c 		toc.c 		util.c
+-@GNOMEAPPLET_FALSE@gaim_DEPENDENCIES = ../libfaim/libfaim.a
++gaim_applet_SOURCES = about.c 			aim.c 			away.c 			browser.c 			buddy.c 			buddy_chat.c 			conversation.c 			dialogs.c 			gaimrc.c 			gnome_applet_mgr.c 			gtkhtml.c 			gtkticker.c 			html.c 			idle.c 			network.c 			oscar.c 			perl.c 			plugins.c 			prefs.c 			proxy.c 			rvous.c 			server.c 			sound.c 			ticker.c 			toc.c 			util.c
++gaim_applet_DEPENDENCIES = ../libfaim/libfaim.a
++gaim_SOURCES = about.c 		aim.c 		away.c 		browser.c 		buddy.c 		buddy_chat.c 		conversation.c 		dialogs.c 		gaimrc.c 		gnome_applet_mgr.c 		gtkhtml.c 		gtkticker.c 		html.c 		idle.c 		network.c 		oscar.c 		perl.c 		plugins.c 		prefs.c 		proxy.c 		rvous.c 		server.c 		sound.c 		ticker.c 		toc.c 		util.c
++gaim_DEPENDENCIES = ../libfaim/libfaim.a
+ 
+ CFLAGS = @CFLAGS@ -DLOCALEDIR=\"$(prefix)/share/locale\"
+ 
+@@ -142,20 +142,20 @@
+ DEFS = @DEFS@ -I. -I$(srcdir) -I..
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+-@GNOMEAPPLET_TRUE@gaim_applet_OBJECTS =  about.o aim.o away.o browser.o \
+-@GNOMEAPPLET_TRUE@buddy.o buddy_chat.o conversation.o dialogs.o \
+-@GNOMEAPPLET_TRUE@gaimrc.o gnome_applet_mgr.o gtkhtml.o gtkticker.o \
+-@GNOMEAPPLET_TRUE@html.o idle.o network.o oscar.o perl.o plugins.o \
+-@GNOMEAPPLET_TRUE@prefs.o proxy.o rvous.o server.o sound.o ticker.o \
+-@GNOMEAPPLET_TRUE@toc.o util.o
++gaim_applet_OBJECTS =  about.o aim.o away.o browser.o \
++buddy.o buddy_chat.o conversation.o dialogs.o \
++gaimrc.o gnome_applet_mgr.o gtkhtml.o gtkticker.o \
++html.o idle.o network.o oscar.o perl.o plugins.o \
++prefs.o proxy.o rvous.o server.o sound.o ticker.o \
++toc.o util.o
+ gaim_applet_LDADD = $(LDADD)
+ gaim_applet_LDFLAGS = 
+-@GNOMEAPPLET_FALSE@gaim_OBJECTS =  about.o aim.o away.o browser.o \
+-@GNOMEAPPLET_FALSE@buddy.o buddy_chat.o conversation.o dialogs.o \
+-@GNOMEAPPLET_FALSE@gaimrc.o gnome_applet_mgr.o gtkhtml.o gtkticker.o \
+-@GNOMEAPPLET_FALSE@html.o idle.o network.o oscar.o perl.o plugins.o \
+-@GNOMEAPPLET_FALSE@prefs.o proxy.o rvous.o server.o sound.o ticker.o \
+-@GNOMEAPPLET_FALSE@toc.o util.o
++gaim_OBJECTS =  about.o aim.o away.o browser.o \
++buddy.o buddy_chat.o conversation.o dialogs.o \
++gaimrc.o gnome_applet_mgr.o gtkhtml.o gtkticker.o \
++html.o idle.o network.o oscar.o perl.o plugins.o \
++prefs.o proxy.o rvous.o server.o sound.o ticker.o \
++toc.o util.o
+ gaim_LDADD = $(LDADD)
+ gaim_LDFLAGS = 
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/net/gaim/pkg-plist b/net/gaim/pkg-plist
index cd47b44d7c0c..604be8cc7416 100644
--- a/net/gaim/pkg-plist
+++ b/net/gaim/pkg-plist
@@ -1,104 +1,133 @@
+bin/au2h
 bin/gaim
-share/gaim/pixmaps/about_small.xpm
-share/gaim/pixmaps/add.xpm
-share/gaim/pixmaps/add_small.xpm
-share/gaim/pixmaps/admin_icon.xpm
-share/gaim/pixmaps/aimicon.xpm
-share/gaim/pixmaps/aimicon2.xpm
-share/gaim/pixmaps/angel.xpm
-share/gaim/pixmaps/aol_icon.xpm
-share/gaim/pixmaps/away.xpm
-share/gaim/pixmaps/away_icon.xpm
-share/gaim/pixmaps/away_small.xpm
-share/gaim/pixmaps/bgcolor.xpm
-share/gaim/pixmaps/big.xpm
-share/gaim/pixmaps/bigsmile.xpm
-share/gaim/pixmaps/block.xpm
-share/gaim/pixmaps/bold.xpm
-share/gaim/pixmaps/bsmile.xpm
-share/gaim/pixmaps/buddyadd.xpm
-share/gaim/pixmaps/buddychat.xpm
-share/gaim/pixmaps/buddydel.xpm
-share/gaim/pixmaps/burp.xpm
-share/gaim/pixmaps/cancel.xpm
-share/gaim/pixmaps/close.xpm
-share/gaim/pixmaps/close_small.xpm
-share/gaim/pixmaps/crossedlips.xpm
-share/gaim/pixmaps/cry.xpm
-share/gaim/pixmaps/daemon-buddyadd.xpm
-share/gaim/pixmaps/daemon-buddychat.xpm
-share/gaim/pixmaps/daemon-buddydel.xpm
-share/gaim/pixmaps/daemon-im.xpm
-share/gaim/pixmaps/daemon-info.xpm
-share/gaim/pixmaps/daemon-permadd.xpm
-share/gaim/pixmaps/daemon-permdel.xpm
-share/gaim/pixmaps/daemon.xpm
-share/gaim/pixmaps/dt_icon.xpm
-share/gaim/pixmaps/embarrassed.xpm
-share/gaim/pixmaps/exit_small.xpm
-share/gaim/pixmaps/export_small.xpm
-share/gaim/pixmaps/fgcolor.xpm
-share/gaim/pixmaps/fontface.xpm
-share/gaim/pixmaps/fontface2.xpm
-share/gaim/pixmaps/free_icon.xpm
-share/gaim/pixmaps/gaim.xpm
-share/gaim/pixmaps/gnome_add.xpm
-share/gaim/pixmaps/gnome_close.xpm
-share/gaim/pixmaps/gnome_preferences.xpm
-share/gaim/pixmaps/gnome_remove.xpm
-share/gaim/pixmaps/group.xpm
-share/gaim/pixmaps/im.xpm
-share/gaim/pixmaps/import_small.xpm
-share/gaim/pixmaps/info.xpm
-share/gaim/pixmaps/italic.xpm
-share/gaim/pixmaps/join.xpm
-share/gaim/pixmaps/kiss.xpm
-share/gaim/pixmaps/link.xpm
-share/gaim/pixmaps/login_icon.xpm
-share/gaim/pixmaps/logo.xpm
-share/gaim/pixmaps/logout_icon.xpm
-share/gaim/pixmaps/luke03.xpm
-share/gaim/pixmaps/moneymouth.xpm
-share/gaim/pixmaps/msg_pending.xpm
-share/gaim/pixmaps/no_icon.xpm
-share/gaim/pixmaps/normal.xpm
-share/gaim/pixmaps/offline.xpm
-share/gaim/pixmaps/ok.xpm
-share/gaim/pixmaps/oneeye.xpm
-share/gaim/pixmaps/online.xpm
-share/gaim/pixmaps/palette.xpm
-share/gaim/pixmaps/peng_frown.xpm
-share/gaim/pixmaps/peng_smile.xpm
-share/gaim/pixmaps/peng_wink.xpm
-share/gaim/pixmaps/permadd.xpm
-share/gaim/pixmaps/permdel.xpm
-share/gaim/pixmaps/plugins_small.xpm
-share/gaim/pixmaps/pounce_small.xpm
-share/gaim/pixmaps/prefs_small.xpm
-share/gaim/pixmaps/refresh.xpm
-share/gaim/pixmaps/sad.xpm
-share/gaim/pixmaps/save.xpm
-share/gaim/pixmaps/scream.xpm
-share/gaim/pixmaps/search_small.xpm
-share/gaim/pixmaps/signing_on.xpm
-share/gaim/pixmaps/small.xpm
-share/gaim/pixmaps/smile.xpm
-share/gaim/pixmaps/smile8.xpm
-share/gaim/pixmaps/smile_happy.xpm
-share/gaim/pixmaps/smile_icon.xpm
-share/gaim/pixmaps/smile_sad.xpm
-share/gaim/pixmaps/smile_wink.xpm
-share/gaim/pixmaps/speaker.xpm
-share/gaim/pixmaps/strike.xpm
-share/gaim/pixmaps/tb_forward.xpm
-share/gaim/pixmaps/tb_search.xpm
-share/gaim/pixmaps/think.xpm
-share/gaim/pixmaps/tmp_send.xpm
-share/gaim/pixmaps/tongue.xpm
-share/gaim/pixmaps/underline.xpm
-share/gaim/pixmaps/warn.xpm
-share/gaim/pixmaps/wink.xpm
-share/gaim/pixmaps/wood.xpm
-share/gaim/pixmaps/yell.xpm
-@dirrm share/gaim/pixmaps
-@dirrm share/gaim
+%%GNOME:%%bin/gaim_applet
+%%GNOME:%%etc/CORBA/servers/gaim_applet.gnorba
+%%GNOME:%%etc/sound/events/gaim.soundlist
+lib/gaim/autorecon.so
+lib/gaim/iconaway.so
+lib/gaim/lagmeter.so
+lib/gaim/notify.so
+lib/gaim/spellchk.so
+%%DATADIR%%/pixmaps/gaim/about_small.xpm
+%%DATADIR%%/pixmaps/gaim/add.xpm
+%%DATADIR%%/pixmaps/gaim/add_small.xpm
+%%DATADIR%%/pixmaps/gaim/admin_icon.xpm
+%%DATADIR%%/pixmaps/gaim/aimicon.xpm
+%%DATADIR%%/pixmaps/gaim/aimicon2.xpm
+%%DATADIR%%/pixmaps/gaim/angel.xpm
+%%DATADIR%%/pixmaps/gaim/aol_icon.xpm
+%%DATADIR%%/pixmaps/gaim/away.xpm
+%%DATADIR%%/pixmaps/gaim/away_icon.xpm
+%%DATADIR%%/pixmaps/gaim/away_small.xpm
+%%DATADIR%%/pixmaps/gaim/bgcolor.xpm
+%%DATADIR%%/pixmaps/gaim/big.xpm
+%%DATADIR%%/pixmaps/gaim/bigsmile.xpm
+%%DATADIR%%/pixmaps/gaim/block.xpm
+%%DATADIR%%/pixmaps/gaim/bold.xpm
+%%DATADIR%%/pixmaps/gaim/bsmile.xpm
+%%DATADIR%%/pixmaps/gaim/buddyadd.xpm
+%%DATADIR%%/pixmaps/gaim/buddychat.xpm
+%%DATADIR%%/pixmaps/gaim/buddydel.xpm
+%%DATADIR%%/pixmaps/gaim/burp.xpm
+%%DATADIR%%/pixmaps/gaim/cancel.xpm
+%%DATADIR%%/pixmaps/gaim/close.xpm
+%%DATADIR%%/pixmaps/gaim/close_small.xpm
+%%DATADIR%%/pixmaps/gaim/crossedlips.xpm
+%%DATADIR%%/pixmaps/gaim/cry.xpm
+%%DATADIR%%/pixmaps/gaim/daemon-buddyadd.xpm
+%%DATADIR%%/pixmaps/gaim/daemon-buddychat.xpm
+%%DATADIR%%/pixmaps/gaim/daemon-buddydel.xpm
+%%DATADIR%%/pixmaps/gaim/daemon-im.xpm
+%%DATADIR%%/pixmaps/gaim/daemon-info.xpm
+%%DATADIR%%/pixmaps/gaim/daemon-permadd.xpm
+%%DATADIR%%/pixmaps/gaim/daemon-permdel.xpm
+%%DATADIR%%/pixmaps/gaim/daemon.xpm
+%%DATADIR%%/pixmaps/gaim/dt_icon.xpm
+%%DATADIR%%/pixmaps/gaim/embarrassed.xpm
+%%DATADIR%%/pixmaps/gaim/exit_small.xpm
+%%DATADIR%%/pixmaps/gaim/export_small.xpm
+%%DATADIR%%/pixmaps/gaim/fgcolor.xpm
+%%DATADIR%%/pixmaps/gaim/fontface.xpm
+%%DATADIR%%/pixmaps/gaim/fontface2.xpm
+%%DATADIR%%/pixmaps/gaim/free_icon.xpm
+%%DATADIR%%/pixmaps/gaim/gaim.xpm
+%%DATADIR%%/pixmaps/gaim/gnome/devil-connect.png
+%%DATADIR%%/pixmaps/gaim/gnome/devil-offline.png
+%%DATADIR%%/pixmaps/gaim/gnome/devil-online.png
+%%DATADIR%%/pixmaps/gaim/gnome/penguin-connect.png
+%%DATADIR%%/pixmaps/gaim/gnome/penguin-offline.png
+%%DATADIR%%/pixmaps/gaim/gnome/penguin-online.png
+%%DATADIR%%/pixmaps/gaim/gnome_add.xpm
+%%DATADIR%%/pixmaps/gaim/gnome_close.xpm
+%%DATADIR%%/pixmaps/gaim/gnome_preferences.xpm
+%%DATADIR%%/pixmaps/gaim/gnome_remove.xpm
+%%DATADIR%%/pixmaps/gaim/group.xpm
+%%DATADIR%%/pixmaps/gaim/im.xpm
+%%DATADIR%%/pixmaps/gaim/import_small.xpm
+%%DATADIR%%/pixmaps/gaim/info.xpm
+%%DATADIR%%/pixmaps/gaim/italic.xpm
+%%DATADIR%%/pixmaps/gaim/join.xpm
+%%DATADIR%%/pixmaps/gaim/kiss.xpm
+%%DATADIR%%/pixmaps/gaim/link.xpm
+%%DATADIR%%/pixmaps/gaim/login_icon.xpm
+%%DATADIR%%/pixmaps/gaim/logo.xpm
+%%DATADIR%%/pixmaps/gaim/logout_icon.xpm
+%%DATADIR%%/pixmaps/gaim/luke03.xpm
+%%DATADIR%%/pixmaps/gaim/moneymouth.xpm
+%%DATADIR%%/pixmaps/gaim/msg_pending.xpm
+%%DATADIR%%/pixmaps/gaim/no_icon.xpm
+%%DATADIR%%/pixmaps/gaim/normal.xpm
+%%DATADIR%%/pixmaps/gaim/offline.xpm
+%%DATADIR%%/pixmaps/gaim/ok.xpm
+%%DATADIR%%/pixmaps/gaim/oneeye.xpm
+%%DATADIR%%/pixmaps/gaim/online.xpm
+%%DATADIR%%/pixmaps/gaim/palette.xpm
+%%DATADIR%%/pixmaps/gaim/peng_frown.xpm
+%%DATADIR%%/pixmaps/gaim/peng_smile.xpm
+%%DATADIR%%/pixmaps/gaim/peng_wink.xpm
+%%DATADIR%%/pixmaps/gaim/permadd.xpm
+%%DATADIR%%/pixmaps/gaim/permdel.xpm
+%%DATADIR%%/pixmaps/gaim/plugins_small.xpm
+%%DATADIR%%/pixmaps/gaim/pounce_small.xpm
+%%DATADIR%%/pixmaps/gaim/prefs_small.xpm
+%%DATADIR%%/pixmaps/gaim/refresh.xpm
+%%DATADIR%%/pixmaps/gaim/sad.xpm
+%%DATADIR%%/pixmaps/gaim/save.xpm
+%%DATADIR%%/pixmaps/gaim/scream.xpm
+%%DATADIR%%/pixmaps/gaim/search_small.xpm
+%%DATADIR%%/pixmaps/gaim/signing_on.xpm
+%%DATADIR%%/pixmaps/gaim/small.xpm
+%%DATADIR%%/pixmaps/gaim/smile.xpm
+%%DATADIR%%/pixmaps/gaim/smile8.xpm
+%%DATADIR%%/pixmaps/gaim/smile_happy.xpm
+%%DATADIR%%/pixmaps/gaim/smile_icon.xpm
+%%DATADIR%%/pixmaps/gaim/smile_sad.xpm
+%%DATADIR%%/pixmaps/gaim/smile_wink.xpm
+%%DATADIR%%/pixmaps/gaim/speaker.xpm
+%%DATADIR%%/pixmaps/gaim/strike.xpm
+%%DATADIR%%/pixmaps/gaim/tb_forward.xpm
+%%DATADIR%%/pixmaps/gaim/tb_search.xpm
+%%DATADIR%%/pixmaps/gaim/think.xpm
+%%DATADIR%%/pixmaps/gaim/tmp_send.xpm
+%%DATADIR%%/pixmaps/gaim/tongue.xpm
+%%DATADIR%%/pixmaps/gaim/underline.xpm
+%%DATADIR%%/pixmaps/gaim/warn.xpm
+%%DATADIR%%/pixmaps/gaim/wink.xpm
+%%DATADIR%%/pixmaps/gaim/wood.xpm
+%%DATADIR%%/pixmaps/gaim/yell.xpm
+%%GNOME:%%share/gnome/applets/Network/gaim_applet.desktop
+%%GNOME:%%share/gnome/apps/Internet/gaim.desktop
+%%GNOME:%%share/gnome/pixmaps/gaim.xpm
+%%GNOME:%%share/gnome/sounds/gaim/BuddyArrive.au
+%%GNOME:%%share/gnome/sounds/gaim/BuddyLeave.au
+%%GNOME:%%share/gnome/sounds/gaim/Receive.au
+%%GNOME:%%share/gnome/sounds/gaim/Send.au
+share/locale/de/LC_MESSAGES/gaim.mo
+share/locale/es/LC_MESSAGES/gaim.mo
+share/locale/fr/LC_MESSAGES/gaim.mo
+share/locale/ko/LC_MESSAGES/gaim.mo
+share/locale/zh_CN/LC_MESSAGES/gaim.mo
+%%GNOME:%%@dirrm share/gnome/sounds/gaim
+@dirrm %%DATADIR%%/pixmaps/gaim/gnome
+@dirrm %%DATADIR%%/pixmaps/gaim
+@dirrm lib/gaim
diff --git a/net/gicq/Makefile b/net/gicq/Makefile
index e51496425fda..c51c4e9ec43d 100644
--- a/net/gicq/Makefile
+++ b/net/gicq/Makefile
@@ -14,18 +14,30 @@ MASTER_SITE_SUBDIR=	flathill
 
 MAINTAINER=	flathill@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12	\
-		icq.0:${PORTSDIR}/net/libicq
-
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+LIB_DEPENDS=	icq.0:${PORTSDIR}/net/libicq
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-gnome --disable-nls
+USE_GTK=	yes
+WANT_GNOME=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GNOME)
+USE_GNOME=	yes
+.else
+CONFIGURE_ARGS+=--without-gnome
+.endif
+
+pre-patch:
+	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
+		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
+		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
+		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
+
+.include <bsd.port.post.mk>
diff --git a/net/gicq/files/patch-ac b/net/gicq/files/patch-ac
new file mode 100644
index 000000000000..92a26e88bd61
--- /dev/null
+++ b/net/gicq/files/patch-ac
@@ -0,0 +1,13 @@
+--- Makefile.in.orig	Mon Sep  6 23:36:43 1999
++++ Makefile.in	Mon Sep  6 23:37:18 1999
+@@ -116,8 +116,10 @@
+ 
+ SUBDIRS = macros intl po pixmaps src doc
+
++.ifdef HAVE_GNOME
+ sysdir   = $(datadir)/apps/Applications
+ sys_DATA = gicq.desktop
++.endif
+ 
+ EXTRA_DIST = gicq.desktop
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/net/gicq/pkg-plist b/net/gicq/pkg-plist
index ec71b337f897..67b051623192 100644
--- a/net/gicq/pkg-plist
+++ b/net/gicq/pkg-plist
@@ -1,6 +1,6 @@
 bin/gicq
-share/gnome/apps/Applications/gicq.desktop
-share/gnome/help/gicq/C/index.html
-share/gnome/help/gicq/C/topic.dat
-@dirrm share/gnome/help/gicq/C
-@dirrm share/gnome/help/gicq
+%%GNOME:%%share/gnome/apps/Applications/gicq.desktop
+%%DATADIR%%/help/gicq/C/index.html
+%%DATADIR%%/help/gicq/C/topic.dat
+@dirrm %%DATADIR%%/help/gicq/C
+@dirrm %%DATADIR%%/help/gicq