4 files changed, 24 insertions, 22 deletions

diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 7e4d60a6ce2c..1647bf8d2256 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	1.3.17
-PORTREVISION=	2
+PORTVERSION=	1.3.18
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
diff --git a/graphics/gimpshop/distinfo b/graphics/gimpshop/distinfo
index 7e76f3a356c8..295f25759a13 100644
--- a/graphics/gimpshop/distinfo
+++ b/graphics/gimpshop/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.3.17.tar.bz2) = d1fe81d77d9860ab47fda6f298cbf89a
+MD5 (gimp-1.3.18.tar.bz2) = 562c8208016af5b2995bb83e94056855
diff --git a/graphics/gimpshop/files/patch-ltmain.sh b/graphics/gimpshop/files/patch-ltmain.sh
index bb660972a6d1..42463b7df942 100644
--- a/graphics/gimpshop/files/patch-ltmain.sh
+++ b/graphics/gimpshop/files/patch-ltmain.sh
@@ -1,24 +1,24 @@
---- ltmain.sh.orig	Thu May 22 16:42:22 2003
-+++ ltmain.sh	Tue May 27 12:12:52 2003
-@@ -1072,7 +1072,7 @@
+--- ltmain.sh.orig	Mon Aug 11 04:01:36 2003
++++ ltmain.sh	Mon Aug 11 04:08:51 2003
+@@ -1278,7 +1278,7 @@
  	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
+ 	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 @@
+ 	   # 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
-+      ;;
++	compile_command="$compile_command -pthread"
++	finalize_command="$finalize_command -pthread"
++	compiler_flags="$compiler_flags -pthread"
++	continue
++	;;
 +
        -module)
  	module=yes
@@ -26,17 +26,17 @@
  	continue
  	;;
  
-@@ -2498,6 +2506,9 @@
- 	  *-*-openbsd* | *-*-freebsd*)
+@@ -3127,6 +3135,9 @@
  	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
  	    ;;
 +	  *-*-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 @@
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+@@ -5457,10 +5468,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index e6e2f670073e..cf1d51f73309 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -178,6 +178,7 @@ libexec/gimp/1.3/plug-ins/borderaverage
 libexec/gimp/1.3/plug-ins/bumpmap
 libexec/gimp/1.3/plug-ins/bz2
 libexec/gimp/1.3/plug-ins/c_astretch
+libexec/gimp/1.3/plug-ins/ccanalyze
 libexec/gimp/1.3/plug-ins/checkerboard
 %%PYTHON:%%libexec/gimp/1.3/plug-ins/clothify.py
 libexec/gimp/1.3/plug-ins/color_enhance
@@ -248,6 +249,7 @@ libexec/gimp/1.3/plug-ins/mapcolor
 libexec/gimp/1.3/plug-ins/max_rgb
 libexec/gimp/1.3/plug-ins/maze
 libexec/gimp/1.3/plug-ins/mblur
+libexec/gimp/1.3/plug-ins/mng
 libexec/gimp/1.3/plug-ins/mosaic
 libexec/gimp/1.3/plug-ins/newsprint
 libexec/gimp/1.3/plug-ins/nlfilt
@@ -460,6 +462,7 @@ share/doc/gimp/libgimpwidgets/GimpPickButton.html
 share/doc/gimp/libgimpwidgets/GimpPixmap.html
 share/doc/gimp/libgimpwidgets/GimpSizeEntry.html
 share/doc/gimp/libgimpwidgets/GimpUnitMenu.html
+share/doc/gimp/libgimpwidgets/ch01.html
 share/doc/gimp/libgimpwidgets/home.png
 share/doc/gimp/libgimpwidgets/index.html
 share/doc/gimp/libgimpwidgets/index.sgml