6 files changed, 85 insertions, 45 deletions

diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 10f1eea5ff4d..023c718c1b4d 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	1.3.14
-PORTREVISION=	1
+PORTVERSION=	1.3.15
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -32,7 +31,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack gtk20 libartlgpl2
 WANT_GNOME=	yes
 INSTALLS_SHLIB=	yes
@@ -43,7 +42,7 @@ CONFIGURE_ARGS=	--disable-perl \
 		--with-html-dir=${PREFIX}/share/doc/gimp \
 		--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 GIMP_DISTFILE=	${DISTDIR}/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
@@ -69,21 +68,30 @@ LIB_DEPENDS+=		gimpprint.2:${PORTSDIR}/print/gimp-print
 
 .include <bsd.port.pre.mk>
 
+.if exists(${X11BASE}/libdata/pkgconfig/libgtkhtml-2.0.pc)
+WITH_HTML_HELP_BROWSER=	yes
+.endif
+
 .if ${HAVE_GNOME:Mgnomepanel}!=""
 USE_GNOME+=		gnomepanel
 CONFIGURE_ARGS+=	--with-gnome-datadir=${X11BASE}/share/gnome
+PKGNAMESUFFIX=		-gnome
 .endif
 
-#.if exists(${X11BASE}/libdata/pkgconfig/libgtkhtml-2.0.pc) || defined(WITH_HTML_HELP_BROWSER)
-#LIB_DEPENDS+=	gtkhtml-2.0:${PORTSDIR}/www/libgtkhtml
-#.endif
+.if defined(WITH_HTML_HELP_BROWSER)
+USE_GNOME+=		libgtkhtml
+PLIST_SUB+=		HELPBROWSER:=""	
+.else
+PLIST_SUB+=		HELPBROWSER:="@comment "
+.endif
 
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "gimp-devel has the following tunable option(s):"
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "		WITH_PYTHON=yes		Turns on Python-Fu support"
-	@${ECHO_MSG} "		WITHOUT_PRINT=yes	Turns off GIMP printing"
+	@${ECHO_MSG} "	WITH_PYTHON=yes		Turns on Python-Fu support"
+	@${ECHO_MSG} "	WITHOUT_PRINT=yes	Turns off GIMP printing"
+	@${ECHO_MSG} "	WITH_HTML_HELP_BROWSER=yes	Turns on the GIMP help browser"
 	@${ECHO_MSG} ""
 
 .include <bsd.port.post.mk>
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index d6e90e6d04ba..30cc1516f1a3 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.3.14.tar.bz2) = 8fa594f7527a37662722728bb55d40a6
+MD5 (gimp-1.3.15.tar.bz2) = c0ca246339857e3afdc47769c331f01a
diff --git a/graphics/gimp/files/patch-configure b/graphics/gimp/files/patch-configure
index 3228641b4386..f05feba3bfe1 100644
--- a/graphics/gimp/files/patch-configure
+++ b/graphics/gimp/files/patch-configure
@@ -9,14 +9,6 @@
  LT_REVISION=$GIMP_INTERFACE_AGE
  LT_AGE=`expr $GIMP_BINARY_AGE - $GIMP_INTERFACE_AGE`
  LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
-@@ -7224,6 +7224,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'
 @@ -17657,8 +17658,8 @@
  fi
  fi;
diff --git a/graphics/gimp/files/patch-ltmain.sh b/graphics/gimp/files/patch-ltmain.sh
new file mode 100644
index 000000000000..bb660972a6d1
--- /dev/null
+++ b/graphics/gimp/files/patch-ltmain.sh
@@ -0,0 +1,51 @@
+--- ltmain.sh.orig	Thu May 22 16:42:22 2003
++++ ltmain.sh	Tue May 27 12:12:52 2003
+@@ -1072,7 +1072,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
+ 	    ;;
+@@ -1082,8 +1082,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
+ 	;;
+ 
+@@ -2498,6 +2506,9 @@
+ 	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test $build_libtool_need_lc = "yes"; then
+@@ -4325,10 +4336,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/files/patch-plug-ins_Makefile.in b/graphics/gimp/files/patch-plug-ins_Makefile.in
deleted file mode 100644
index 829f78c7162b..000000000000
--- a/graphics/gimp/files/patch-plug-ins_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- plug-ins/Makefile.in.orig	Fri Jul 27 21:36:22 2001
-+++ plug-ins/Makefile.in	Wed Aug 15 22:02:54 2001
-@@ -113,7 +113,7 @@
- HAVE_FINITE = @HAVE_FINITE@
- HAVE_GTK_DOC = @HAVE_GTK_DOC@
- HAVE_ISFINITE = @HAVE_ISFINITE@
--HELPBROWSER = @HELPBROWSER@
-+#HELPBROWSER = @HELPBROWSER@
- HTML_DIR = @HTML_DIR@
- INSTOBJEXT = @INSTOBJEXT@
- INTLBISON = @INTLBISON@
diff --git a/graphics/gimp/pkg-plist b/graphics/gimp/pkg-plist
index cdf55ebadaa0..b41b4dd4f22d 100644
--- a/graphics/gimp/pkg-plist
+++ b/graphics/gimp/pkg-plist
@@ -89,13 +89,6 @@ include/gimp-1.3/libgimpmath/gimpvector.h
 include/gimp-1.3/libgimpmodule/gimpmodule.h
 include/gimp-1.3/libgimpmodule/gimpmoduledb.h
 include/gimp-1.3/libgimpmodule/gimpmoduletypes.h
-include/gimp-1.3/libgimpproxy/gimpchannel.h
-include/gimp-1.3/libgimpproxy/gimpobject.h
-include/gimp-1.3/libgimpproxy/gimpproxytypes.h
-include/gimp-1.3/libgimptool/gimptool.h
-include/gimp-1.3/libgimptool/gimptoolenums.h
-include/gimp-1.3/libgimptool/gimptoolmodule.h
-include/gimp-1.3/libgimptool/gimptooltypes.h
 include/gimp-1.3/libgimpwidgets/gimpbutton.h
 include/gimp-1.3/libgimpwidgets/gimpchainbutton.h
 include/gimp-1.3/libgimpwidgets/gimpcolorarea.h
@@ -141,12 +134,6 @@ lib/libgimpmodule-1.3.so.%%SHLIBVER%%
 lib/libgimpui-1.3.a
 lib/libgimpui-1.3.so
 lib/libgimpui-1.3.so.%%SHLIBVER%%
-lib/libgimpproxy-1.3.a
-lib/libgimpproxy-1.3.so
-lib/libgimpproxy-1.3.so.%%SHLIBVER%%
-lib/libgimptool-1.3.a
-lib/libgimptool-1.3.so
-lib/libgimptool-1.3.so.%%SHLIBVER%%
 lib/libgimpwidgets-1.3.a
 lib/libgimpwidgets-1.3.so
 lib/libgimpwidgets-1.3.so.%%SHLIBVER%%
@@ -234,6 +221,7 @@ libexec/gimp/1.3/plug-ins/gtm
 libexec/gimp/1.3/plug-ins/guillotine
 libexec/gimp/1.3/plug-ins/gz
 libexec/gimp/1.3/plug-ins/header
+%%HELPBROWSER:%%libexec/gimp/1.3/plug-ins/helpbrowser
 libexec/gimp/1.3/plug-ins/hot
 libexec/gimp/1.3/plug-ins/hrz
 libexec/gimp/1.3/plug-ins/ifscompose
@@ -304,7 +292,6 @@ libexec/gimp/1.3/plug-ins/tiff
 libexec/gimp/1.3/plug-ins/tile
 libexec/gimp/1.3/plug-ins/tileit
 libexec/gimp/1.3/plug-ins/tiler
-libexec/gimp/1.3/plug-ins/tool-safe-mode
 libexec/gimp/1.3/plug-ins/uniteditor
 libexec/gimp/1.3/plug-ins/unsharp
 libexec/gimp/1.3/plug-ins/url
@@ -460,6 +447,7 @@ share/doc/gimp/libgimpwidgets/index.sgml
 share/doc/gimp/libgimpwidgets/left.png
 share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpColorArea.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpHelpUI.html
+share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpOffsetArea.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpQueryBox.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpStock.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpWidgets.html
@@ -513,6 +501,8 @@ share/doc/gimp/libgimpwidgets/stock-edit-16.png
 share/doc/gimp/libgimpwidgets/stock-error-64.png
 share/doc/gimp/libgimpwidgets/stock-eye-12.png
 share/doc/gimp/libgimpwidgets/stock-eye-20.png
+share/doc/gimp/libgimpwidgets/stock-flip-horizontal-16.png
+share/doc/gimp/libgimpwidgets/stock-flip-vertical-16.png
 share/doc/gimp/libgimpwidgets/stock-gradient-bilinear-16.png
 share/doc/gimp/libgimpwidgets/stock-gradient-conical-asymmetric-16.png
 share/doc/gimp/libgimpwidgets/stock-gradient-conical-symmetric-16.png
@@ -563,6 +553,8 @@ share/doc/gimp/libgimpwidgets/stock-navigation-16.png
 share/doc/gimp/libgimpwidgets/stock-paste-as-new-16.png
 share/doc/gimp/libgimpwidgets/stock-paste-into-16.png
 share/doc/gimp/libgimpwidgets/stock-path-stroke-16.png
+share/doc/gimp/libgimpwidgets/stock-path-16.png
+share/doc/gimp/libgimpwidgets/stock-path-22.png
 share/doc/gimp/libgimpwidgets/stock-paths-16.png
 share/doc/gimp/libgimpwidgets/stock-paths-22.png
 share/doc/gimp/libgimpwidgets/stock-plugin-16.png
@@ -577,6 +569,7 @@ share/doc/gimp/libgimpwidgets/stock-rotate-180-16.png
 share/doc/gimp/libgimpwidgets/stock-rotate-270-16.png
 share/doc/gimp/libgimpwidgets/stock-rotate-90-16.png
 share/doc/gimp/libgimpwidgets/stock-scale-16.png
+share/doc/gimp/libgimpwidgets/stock-selection-16.png
 share/doc/gimp/libgimpwidgets/stock-selection-add-16.png
 share/doc/gimp/libgimpwidgets/stock-selection-all-16.png
 share/doc/gimp/libgimpwidgets/stock-selection-grow-16.png
@@ -620,6 +613,8 @@ share/doc/gimp/libgimpwidgets/stock-tool-color-balance-16.png
 share/doc/gimp/libgimpwidgets/stock-tool-color-balance-22.png
 share/doc/gimp/libgimpwidgets/stock-tool-color-picker-16.png
 share/doc/gimp/libgimpwidgets/stock-tool-color-picker-22.png
+share/doc/gimp/libgimpwidgets/stock-tool-colorize-16.png
+share/doc/gimp/libgimpwidgets/stock-tool-colorize-22.png
 share/doc/gimp/libgimpwidgets/stock-tool-crop-16.png
 share/doc/gimp/libgimpwidgets/stock-tool-crop-22.png
 share/doc/gimp/libgimpwidgets/stock-tool-curves-16.png
@@ -1231,6 +1226,8 @@ share/gimp/themes/Default/images/stock-edit-16.png
 share/gimp/themes/Default/images/stock-error-64.png
 share/gimp/themes/Default/images/stock-eye-12.png
 share/gimp/themes/Default/images/stock-eye-20.png
+share/gimp/themes/Default/images/stock-flip-horizontal-16.png
+share/gimp/themes/Default/images/stock-flip-vertical-16.png
 share/gimp/themes/Default/images/stock-gradient-bilinear-16.png
 share/gimp/themes/Default/images/stock-gradient-conical-asymmetric-16.png
 share/gimp/themes/Default/images/stock-gradient-conical-symmetric-16.png
@@ -1281,6 +1278,8 @@ share/gimp/themes/Default/images/stock-navigation-16.png
 share/gimp/themes/Default/images/stock-paste-as-new-16.png
 share/gimp/themes/Default/images/stock-paste-into-16.png
 share/gimp/themes/Default/images/stock-path-stroke-16.png
+share/gimp/themes/Default/images/stock-path-16.png
+share/gimp/themes/Default/images/stock-path-22.png
 share/gimp/themes/Default/images/stock-paths-16.png
 share/gimp/themes/Default/images/stock-paths-22.png
 share/gimp/themes/Default/images/stock-plugin-16.png
@@ -1295,6 +1294,7 @@ share/gimp/themes/Default/images/stock-rotate-180-16.png
 share/gimp/themes/Default/images/stock-rotate-270-16.png
 share/gimp/themes/Default/images/stock-rotate-90-16.png
 share/gimp/themes/Default/images/stock-scale-16.png
+share/gimp/themes/Default/images/stock-selection-16.png
 share/gimp/themes/Default/images/stock-selection-add-16.png
 share/gimp/themes/Default/images/stock-selection-all-16.png
 share/gimp/themes/Default/images/stock-selection-grow-16.png
@@ -1338,6 +1338,8 @@ share/gimp/themes/Default/images/stock-tool-color-balance-16.png
 share/gimp/themes/Default/images/stock-tool-color-balance-22.png
 share/gimp/themes/Default/images/stock-tool-color-picker-16.png
 share/gimp/themes/Default/images/stock-tool-color-picker-22.png
+share/gimp/themes/Default/images/stock-tool-colorize-16.png
+share/gimp/themes/Default/images/stock-tool-colorize-22.png
 share/gimp/themes/Default/images/stock-tool-crop-16.png
 share/gimp/themes/Default/images/stock-tool-crop-22.png
 share/gimp/themes/Default/images/stock-tool-curves-16.png
@@ -1568,8 +1570,6 @@ share/locale/zh_TW/LC_MESSAGES/gimp14.mo
 @dirrm libexec/gimp/1.3
 @dirrm libexec/gimp
 @dirrm include/gimp-1.3/libgimpwidgets
-@dirrm include/gimp-1.3/libgimptool
-@dirrm include/gimp-1.3/libgimpproxy
 @dirrm include/gimp-1.3/libgimpmodule
 @dirrm include/gimp-1.3/libgimpmath
 @dirrm include/gimp-1.3/libgimpcolor