Update to 2.0.5, and use the new libtool scheme.

4 files changed, 12 insertions, 45 deletions

diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index ecdc82e98ba6..3ede18eb5a8d 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	2.0.4
+PORTVERSION=	2.0.5
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -35,7 +35,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=15
 USE_GNOME=	gnomehack intltool gtk20 libartlgpl2 librsvg2
 WANT_GNOME=	yes
 INSTALLS_SHLIB=	yes
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index a8a6f6b7de68..ffe1d410c3ae 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,2 +1,2 @@
-MD5 (gimp-2.0.4.tar.bz2) = 731198e0f46cca833243c43197681c66
-SIZE (gimp-2.0.4.tar.bz2) = 13845175
+MD5 (gimp-2.0.5.tar.bz2) = b24d069b9d670d92fc75ba7035e9300d
+SIZE (gimp-2.0.5.tar.bz2) = 14107082
diff --git a/graphics/gimp/files/patch-ltmain.sh b/graphics/gimp/files/patch-ltmain.sh
deleted file mode 100644
index 14cb2f8c753b..000000000000
--- a/graphics/gimp/files/patch-ltmain.sh
+++ /dev/null
@@ -1,41 +0,0 @@
---- ltmain.sh.orig	Sun Sep  7 16:23:57 2003
-+++ ltmain.sh	Sat Sep 13 01:29:14 2003
-@@ -1278,7 +1278,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
- 	   ;;
-@@ -1288,8 +1288,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
- 	;;
- 
-@@ -5457,10 +5465,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/graphics/gimp/pkg-plist b/graphics/gimp/pkg-plist
index 0469af074f2d..6c50792404c4 100644
--- a/graphics/gimp/pkg-plist
+++ b/graphics/gimp/pkg-plist
@@ -1639,6 +1639,10 @@ share/locale/ms/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/ms/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ms/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/ms/LC_MESSAGES/gimp20.mo
+share/locale/nb/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/nb/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/nb/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/nb/LC_MESSAGES/gimp20.mo
 share/locale/nl/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/nl/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/nl/LC_MESSAGES/gimp20-std-plug-ins.mo
@@ -1671,6 +1675,10 @@ share/locale/sk/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/sk/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/sk/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/sk/LC_MESSAGES/gimp20.mo
+share/locale/sq/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/sq/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/sq/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/sq/LC_MESSAGES/gimp20.mo
 share/locale/sr/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/sr/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/sr/LC_MESSAGES/gimp20-std-plug-ins.mo