15 files changed, 45 insertions, 93 deletions

diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index b2296b908534..be4abc0eb9cd 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gaim
-PORTVERSION=	0.56
+PORTVERSION=	0.57
 CATEGORIES?=	net
 MASTER_SITES=	ftp://ftp.marko.net/pub/gaim/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -20,7 +20,7 @@ USE_GMAKE=	yes
 USE_GTK=	yes
 WANT_ESOUND=	yes
 WANT_GNOME=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/net-im/gaim/distinfo b/net-im/gaim/distinfo
index 6a642978b1d5..6fa2938c3062 100644
--- a/net-im/gaim/distinfo
+++ b/net-im/gaim/distinfo
@@ -1 +1 @@
-MD5 (gaim-0.56.tar.bz2) = fd7c5cbea0a862d0bcefbf16e4a27db1
+MD5 (gaim-0.57.tar.bz2) = c3b60e140e76b02f600075671ae745fb
diff --git a/net-im/gaim/files/patch-configure b/net-im/gaim/files/patch-configure
new file mode 100644
index 000000000000..61019f6818c5
--- /dev/null
+++ b/net-im/gaim/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Fri Apr 26 19:31:31 2002
++++ configure	Fri Apr 26 19:31:57 2002
+@@ -5165,6 +5165,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/net-im/gaim/files/patch-ltmain.sh b/net-im/gaim/files/patch-ltmain.sh
deleted file mode 100644
index 98cb05e4ddb3..000000000000
--- a/net-im/gaim/files/patch-ltmain.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,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 83cabdde212a..2b21e23237ce 100644
--- a/net-im/gaim/pkg-plist
+++ b/net-im/gaim/pkg-plist
@@ -23,11 +23,13 @@ lib/gaim/spellchk.so
 %%GNOME:%%share/gnome/pixmaps/gaim/msgpend.png
 %%GNOME:%%share/gnome/pixmaps/gaim/offline.png
 %%GNOME:%%share/gnome/pixmaps/gaim/online.png
+share/locale/da/LC_MESSAGES/gaim.mo
 share/locale/de/LC_MESSAGES/gaim.mo
 share/locale/es/LC_MESSAGES/gaim.mo
 share/locale/fi/LC_MESSAGES/gaim.mo
 share/locale/fr/LC_MESSAGES/gaim.mo
 share/locale/it/LC_MESSAGES/gaim.mo
+share/locale/ja/LC_MESSAGES/gaim.mo
 share/locale/ko/LC_MESSAGES/gaim.mo
 share/locale/nl/LC_MESSAGES/gaim.mo
 share/locale/pl/LC_MESSAGES/gaim.mo
diff --git a/net/gaim-snapshot/Makefile b/net/gaim-snapshot/Makefile
index b2296b908534..be4abc0eb9cd 100644
--- a/net/gaim-snapshot/Makefile
+++ b/net/gaim-snapshot/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gaim
-PORTVERSION=	0.56
+PORTVERSION=	0.57
 CATEGORIES?=	net
 MASTER_SITES=	ftp://ftp.marko.net/pub/gaim/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -20,7 +20,7 @@ USE_GMAKE=	yes
 USE_GTK=	yes
 WANT_ESOUND=	yes
 WANT_GNOME=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/net/gaim-snapshot/distinfo b/net/gaim-snapshot/distinfo
index 6a642978b1d5..6fa2938c3062 100644
--- a/net/gaim-snapshot/distinfo
+++ b/net/gaim-snapshot/distinfo
@@ -1 +1 @@
-MD5 (gaim-0.56.tar.bz2) = fd7c5cbea0a862d0bcefbf16e4a27db1
+MD5 (gaim-0.57.tar.bz2) = c3b60e140e76b02f600075671ae745fb
diff --git a/net/gaim-snapshot/files/patch-configure b/net/gaim-snapshot/files/patch-configure
new file mode 100644
index 000000000000..61019f6818c5
--- /dev/null
+++ b/net/gaim-snapshot/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Fri Apr 26 19:31:31 2002
++++ configure	Fri Apr 26 19:31:57 2002
+@@ -5165,6 +5165,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/net/gaim-snapshot/files/patch-ltmain.sh b/net/gaim-snapshot/files/patch-ltmain.sh
deleted file mode 100644
index 98cb05e4ddb3..000000000000
--- a/net/gaim-snapshot/files/patch-ltmain.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,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/gaim-snapshot/pkg-plist b/net/gaim-snapshot/pkg-plist
index 83cabdde212a..2b21e23237ce 100644
--- a/net/gaim-snapshot/pkg-plist
+++ b/net/gaim-snapshot/pkg-plist
@@ -23,11 +23,13 @@ lib/gaim/spellchk.so
 %%GNOME:%%share/gnome/pixmaps/gaim/msgpend.png
 %%GNOME:%%share/gnome/pixmaps/gaim/offline.png
 %%GNOME:%%share/gnome/pixmaps/gaim/online.png
+share/locale/da/LC_MESSAGES/gaim.mo
 share/locale/de/LC_MESSAGES/gaim.mo
 share/locale/es/LC_MESSAGES/gaim.mo
 share/locale/fi/LC_MESSAGES/gaim.mo
 share/locale/fr/LC_MESSAGES/gaim.mo
 share/locale/it/LC_MESSAGES/gaim.mo
+share/locale/ja/LC_MESSAGES/gaim.mo
 share/locale/ko/LC_MESSAGES/gaim.mo
 share/locale/nl/LC_MESSAGES/gaim.mo
 share/locale/pl/LC_MESSAGES/gaim.mo
diff --git a/net/gaim/Makefile b/net/gaim/Makefile
index b2296b908534..be4abc0eb9cd 100644
--- a/net/gaim/Makefile
+++ b/net/gaim/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gaim
-PORTVERSION=	0.56
+PORTVERSION=	0.57
 CATEGORIES?=	net
 MASTER_SITES=	ftp://ftp.marko.net/pub/gaim/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -20,7 +20,7 @@ USE_GMAKE=	yes
 USE_GTK=	yes
 WANT_ESOUND=	yes
 WANT_GNOME=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/net/gaim/distinfo b/net/gaim/distinfo
index 6a642978b1d5..6fa2938c3062 100644
--- a/net/gaim/distinfo
+++ b/net/gaim/distinfo
@@ -1 +1 @@
-MD5 (gaim-0.56.tar.bz2) = fd7c5cbea0a862d0bcefbf16e4a27db1
+MD5 (gaim-0.57.tar.bz2) = c3b60e140e76b02f600075671ae745fb
diff --git a/net/gaim/files/patch-configure b/net/gaim/files/patch-configure
new file mode 100644
index 000000000000..61019f6818c5
--- /dev/null
+++ b/net/gaim/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Fri Apr 26 19:31:31 2002
++++ configure	Fri Apr 26 19:31:57 2002
+@@ -5165,6 +5165,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/net/gaim/files/patch-ltmain.sh b/net/gaim/files/patch-ltmain.sh
deleted file mode 100644
index 98cb05e4ddb3..000000000000
--- a/net/gaim/files/patch-ltmain.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,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/gaim/pkg-plist b/net/gaim/pkg-plist
index 83cabdde212a..2b21e23237ce 100644
--- a/net/gaim/pkg-plist
+++ b/net/gaim/pkg-plist
@@ -23,11 +23,13 @@ lib/gaim/spellchk.so
 %%GNOME:%%share/gnome/pixmaps/gaim/msgpend.png
 %%GNOME:%%share/gnome/pixmaps/gaim/offline.png
 %%GNOME:%%share/gnome/pixmaps/gaim/online.png
+share/locale/da/LC_MESSAGES/gaim.mo
 share/locale/de/LC_MESSAGES/gaim.mo
 share/locale/es/LC_MESSAGES/gaim.mo
 share/locale/fi/LC_MESSAGES/gaim.mo
 share/locale/fr/LC_MESSAGES/gaim.mo
 share/locale/it/LC_MESSAGES/gaim.mo
+share/locale/ja/LC_MESSAGES/gaim.mo
 share/locale/ko/LC_MESSAGES/gaim.mo
 share/locale/nl/LC_MESSAGES/gaim.mo
 share/locale/pl/LC_MESSAGES/gaim.mo