Fix the libtool problem (thanks sobomax :-) and pkg-plist.

libtool fix submitted by:	sobomax

3 files changed, 29 insertions, 47 deletions

diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index 2ad32809b294..e23fe4bc0c0e 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		gaim
 PORTVERSION=		0.11.0p15
+PORTREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.marko.net/pub/gaim/ \
 			${MASTER_SITE_SOURCEFORGE}
@@ -21,9 +22,10 @@ USE_GMAKE=		yes
 USE_GTK=		yes
 WANT_ESOUND=		yes
 WANT_GNOME=		yes
-USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=			gaim.1
 
@@ -44,12 +46,9 @@ CONFIGURE_ARGS+=	--disable-esd
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|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
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
 		's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
-		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g ; \
-		 s|\@LIBTOOL\@|\${LOCALBASE}/bin/libtool|g'
+		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
 
 .include <bsd.port.post.mk>
diff --git a/net-im/gaim/files/patch-ltmain.sh b/net-im/gaim/files/patch-ltmain.sh
new file mode 100644
index 000000000000..293fce173a52
--- /dev/null
+++ b/net-im/gaim/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/08/31 17:32:22	1.1
++++ ltmain.sh	2001/08/31 17:32:44
+@@ -4673,10 +4673,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/net-im/gaim/pkg-plist b/net-im/gaim/pkg-plist
index 16f5833e1426..2b30af064415 100644
--- a/net-im/gaim/pkg-plist
+++ b/net-im/gaim/pkg-plist
@@ -3,19 +3,21 @@ bin/gaim
 %%GNOME:%%etc/CORBA/servers/gaim_applet.gnorba
 lib/gaim/autorecon.so
 lib/gaim/iconaway.so
-lib/gaim/irc.so
 lib/gaim/lagmeter.so
-lib/gaim/libgaimicq.so
-lib/gaim/libgaimicq.so.0
+lib/gaim/libicq.so
+lib/gaim/libicq.so.0
+lib/gaim/libirc.so
+lib/gaim/libirc.so.0
 lib/gaim/libjabber.so
 lib/gaim/libjabber.so.0
+lib/gaim/libnapster.so
+lib/gaim/libnapster.so.0
 lib/gaim/libyahoo.so
 lib/gaim/libyahoo.so.0
 lib/gaim/libmsn.so
 lib/gaim/libmsn.so.0
 lib/gaim/libzephyr.so
 lib/gaim/libzephyr.so.0
-lib/gaim/napster.so
 lib/gaim/notify.so
 lib/gaim/spellchk.so
 %%DATADIR%%/pixmaps/gaim/about_small.xpm
@@ -23,7 +25,6 @@ lib/gaim/spellchk.so
 %%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/available-away.xpm
@@ -31,7 +32,6 @@ lib/gaim/spellchk.so
 %%DATADIR%%/pixmaps/gaim/available-dnd.xpm
 %%DATADIR%%/pixmaps/gaim/available-xa.xpm
 %%DATADIR%%/pixmaps/gaim/available.xpm
-%%DATADIR%%/pixmaps/gaim/away.xpm
 %%DATADIR%%/pixmaps/gaim/away_big.xpm
 %%DATADIR%%/pixmaps/gaim/away_icon.xpm
 %%DATADIR%%/pixmaps/gaim/away_small.xpm
@@ -40,10 +40,6 @@ lib/gaim/spellchk.so
 %%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
@@ -51,29 +47,14 @@ lib/gaim/spellchk.so
 %%DATADIR%%/pixmaps/gaim/crazy4.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/gnomeicu-away.xpm
 %%DATADIR%%/pixmaps/gaim/gnomeicu-dnd.xpm
 %%DATADIR%%/pixmaps/gaim/gnomeicu-ffc.xpm
@@ -81,13 +62,10 @@ lib/gaim/spellchk.so
 %%DATADIR%%/pixmaps/gaim/gnomeicu-occ.xpm
 %%DATADIR%%/pixmaps/gaim/gnomeicu-online.xpm
 %%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
@@ -98,22 +76,13 @@ lib/gaim/spellchk.so
 %%DATADIR%%/pixmaps/gaim/luke03.xpm
 %%DATADIR%%/pixmaps/gaim/moneymouth.xpm
 %%DATADIR%%/pixmaps/gaim/mrt.xpm
-%%DATADIR%%/pixmaps/gaim/msg_pending.xpm
 %%DATADIR%%/pixmaps/gaim/msn_away.xpm
 %%DATADIR%%/pixmaps/gaim/msn_online.xpm
 %%DATADIR%%/pixmaps/gaim/napster.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
@@ -125,14 +94,10 @@ lib/gaim/spellchk.so
 %%DATADIR%%/pixmaps/gaim/scream.xpm
 %%DATADIR%%/pixmaps/gaim/search_small.xpm
 %%DATADIR%%/pixmaps/gaim/send_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/status-away.xpm
 %%DATADIR%%/pixmaps/gaim/status-here.xpm