Update to 0.80. For a list of what's changed, see

http://gaim.sourceforge.net/ChangeLog.

Submitted by:	Matthew Luckie <mjl@luckie.org.nz>

5 files changed, 7 insertions, 58 deletions

diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index 39a5a8907449..bdf31dcf9408 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -5,7 +5,7 @@
 #
 
 PORTNAME=	gaim
-PORTVERSION=	0.79
+PORTVERSION=	0.80
 CATEGORIES?=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,7 +24,7 @@ USE_GNOME=	gnomeprefix gnomehack gtk20
 USE_PERL5=	yes
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=15
 CONFIGURE_ARGS=	--enable-static=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" \
diff --git a/net-im/gaim/distinfo b/net-im/gaim/distinfo
index f6a5d4a03157..d7fb15245189 100644
--- a/net-im/gaim/distinfo
+++ b/net-im/gaim/distinfo
@@ -1,2 +1,2 @@
-MD5 (gaim-0.79.tar.bz2) = 8d8758e4ef00187fcfe3ab14e4a3283e
-SIZE (gaim-0.79.tar.bz2) = 4377687
+MD5 (gaim-0.80.tar.bz2) = cb68e059ff9667d3156d7abef74b7b19
+SIZE (gaim-0.80.tar.bz2) = 4589883
diff --git a/net-im/gaim/files/patch-ltmain.sh b/net-im/gaim/files/patch-ltmain.sh
deleted file mode 100644
index b3f60f4f8944..000000000000
--- a/net-im/gaim/files/patch-ltmain.sh
+++ /dev/null
@@ -1,51 +0,0 @@
---- ltmain.sh.orig	Sun May 30 13:18:23 2004
-+++ ltmain.sh	Sun May 30 17:53:23 2004
-@@ -1280,7 +1280,7 @@
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
-@@ -1290,8 +1290,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+      compile_command="$compile_command -pthread"
-+      finalize_command="$finalize_command -pthread"
-+      compiler_flags="$compiler_flags -pthread"
-+      continue
-+      ;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -3000,6 +3008,9 @@
- 	    # problems, so we reset it completely
- 	    verstring=
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    verstring="0.0"
- 	    ;;
-@@ -5428,10 +5439,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/files/patch-plugins_Makefile.in b/net-im/gaim/files/patch-plugins_Makefile.in
index 7fd2ba7bed19..3d74afc3ece1 100644
--- a/net-im/gaim/files/patch-plugins_Makefile.in
+++ b/net-im/gaim/files/patch-plugins_Makefile.in
@@ -1,14 +1,12 @@
 --- plugins/Makefile.in.orig	Sun May 30 17:53:41 2004
 +++ plugins/Makefile.in	Sun May 30 17:54:22 2004
-@@ -285,9 +285,9 @@
+@@ -285,7 +285,7 @@
  target_cpu = @target_cpu@
  target_os = @target_os@
  target_vendor = @target_vendor@
 -DIST_SUBDIRS = docklet gevolution gaim-remote gestures perl ssl tcl ticker
 +DIST_SUBDIRS = docklet gaim-remote gestures perl ssl tcl ticker
- 
 -@BUILD_GEVOLUTION_TRUE@GEVOLUTION_DIR = gevolution
 +@BUILD_GEVOLUTION_TRUE@GEVOLUTION_DIR =
- 
  @USE_PERL_TRUE@PERL_DIR = perl
  
diff --git a/net-im/gaim/pkg-plist b/net-im/gaim/pkg-plist
index 2c6a61791d9c..e20a11955551 100644
--- a/net-im/gaim/pkg-plist
+++ b/net-im/gaim/pkg-plist
@@ -330,6 +330,7 @@ share/gnome/pixmaps/gaim/status/default/gadu-gadu.png
 share/gnome/pixmaps/gaim/status/default/game.png
 share/gnome/pixmaps/gaim/status/default/hiptop.png
 share/gnome/pixmaps/gaim/status/default/icq.png
+share/gnome/pixmaps/gaim/status/default/ignored.svg
 share/gnome/pixmaps/gaim/status/default/invisible.png
 share/gnome/pixmaps/gaim/status/default/irc.png
 share/gnome/pixmaps/gaim/status/default/jabber.png
@@ -378,6 +379,7 @@ share/locale/hu/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/lt/LC_MESSAGES/gaim.mo
 share/locale/mk/LC_MESSAGES/gaim.mo
 share/locale/nl/LC_MESSAGES/gaim.mo
 share/locale/no/LC_MESSAGES/gaim.mo