Upgrade to 1.1.18, and add myself as MAINTAINER.

(erich leave us long time ago).

42 files changed, 558 insertions, 540 deletions

diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index da12d91e6ab..5f1de62d1ed 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -12,12 +12,14 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v${VERSION}/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/v${VERSION}/ \
 		ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/gimp/unstable/v${VERSION}/
 
-MAINTAINER=	erich@FreeBSD.org
+MAINTAINER=	vanilla@FreeBSD.org
 
+.if !defined (WITHOUT_PERL)
 BUILD_DEPENDS=	perldl:${PORTSDIR}/math/PDL \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
 RUN_DEPENDS=	perldl:${PORTSDIR}/math/PDL \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+.endif
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		aa.1:${PORTSDIR}/graphics/aalib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -27,7 +29,7 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		intl.1:${PORTSDIR}/devel/gettext
 
-VERSION=	1.1.17
+VERSION=	1.1.18
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
@@ -37,6 +39,9 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
+.if defined (WITHOUT_PERL)
+CONFIGURE_ARGS=	--disable-perl
+.endif
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GLIB_CONFIG="${GLIB_CONFIG}" \
 		GTK_CONFIG="${GTK_CONFIG}" \
@@ -49,12 +54,22 @@ MAN5=		gimprc.5
 WITH_GNOME=	yes
 .endif
 
+.if defined(WITHOUT_PERL)
+PLISTORIG=		${WRKDIR}/PLIST
+PLIST=			${PKGDIR}/PLIST
+.else
+PLISTORIG=		${WRKDIR}/PLIST.perl
+PLIST=			${SRCDIR}/PLIST.perl
+pre-fetch:
+	@${ECHO} -n "If you want to compile without perl support "
+	@${ECHO} "'make -DWITHOUT_PERL' instead"
+.endif
+
 .if defined(WITH_GNOME) && ${WITH_GNOME} == yes
 LIB_DEPENDS+=	gtkxmhtml.3:${PORTSDIR}/x11/gnomelibs
 .else
-PLIST=		${WRKDIR}/PLIST
 pre-install:
-	@${SED} -e '/helpbrowser/d' ${PKGDIR}/PLIST > ${PLIST}
+	@${SED} -e '/helpbrowser/d' ${PLISTORIG} > ${PLIST}
 .endif
 
 post-install:
diff --git a/graphics/gimp-app-devel/distinfo b/graphics/gimp-app-devel/distinfo
index 4bfc5bc43ff..75190c8cb8f 100644
--- a/graphics/gimp-app-devel/distinfo
+++ b/graphics/gimp-app-devel/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.1.17.tar.bz2) = 5599cb98b3a17324f2ad2682348a7df9
+MD5 (gimp-1.1.18.tar.bz2) = 472ef3f6e814250d31faa63e467b03b9
diff --git a/graphics/gimp-app-devel/files/gimp.setfont b/graphics/gimp-app-devel/files/gimp.setfont
index 487a91baf0e..34f91f9b5b2 100644
--- a/graphics/gimp-app-devel/files/gimp.setfont
+++ b/graphics/gimp-app-devel/files/gimp.setfont
@@ -7,6 +7,7 @@
 $progname = "gimp.setfont";
 $version = "Version 0.4 Feb 07 2000";
 
+$fontset{'chinese'} = "-*-helvetica-medium-r-normal--17-*-*-*-*-*-iso8859-1,-*-kai-medium-r-normal--16-*-*-*-*-*-big5-0";
 $fontset{'czech'} = "-*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-2";
 $fontset{'danish'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
 $fontset{'dutch'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
@@ -25,6 +26,7 @@ $fontset{'slovak'} = "-*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-2";
 $fontset{'swedish'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
 $fontset{'ukrainian'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-koi8-r";
 
+$locale{'chinese'} = "zh_TW.Big5";
 $locale{'czech'} = "cs_CZ.ISO8859-2";
 $locale{'danish'} = "da_DK.ISO_8859-1";
 $locale{'dutch'} = "nl_NL.ISO_8859-1";
@@ -50,6 +52,7 @@ Usage: gimp.setfont <language>
 
 ----------------------------------------------------------------
 [language]          [fontset]
+ chinese             -*-helvetica-(iso8859-1),-*-kai-(big5-0)
  czech               -*-fixed-(iso8859-2)
  danish              -*-helvetica-(iso8859-1)
  dutch               -*-helvetica-(iso8859-1)
diff --git a/graphics/gimp-app-devel/files/patch-ah b/graphics/gimp-app-devel/files/patch-ah
index 95af0d629b7..267a91fa0f0 100644
--- a/graphics/gimp-app-devel/files/patch-ah
+++ b/graphics/gimp-app-devel/files/patch-ah
@@ -1,5 +1,29 @@
---- configure.orig	Fri Feb 11 10:32:12 2000
-+++ configure	Sat Feb 19 13:51:36 2000
+--- configure.orig	Sat Mar  4 10:23:00 2000
++++ configure	Sun Apr  2 21:42:36 2000
+@@ -1494,8 +1494,8 @@
+ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+ DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
++${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh $lt_target \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+ 
+ # Reload cache, that may have been modified by ltconfig
+@@ -1509,10 +1509,10 @@
+ 
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL="/usr/local/bin/libtool"
+ 
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
 @@ -3480,7 +3480,11 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
@@ -22,7 +46,7 @@
  localedir='${prefix}/${DATADIRNAME}/locale'
  
  brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
-@@ -8561,10 +8565,6 @@
+@@ -8563,10 +8567,6 @@
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
    esac
  
diff --git a/graphics/gimp-app-devel/files/patch-ak b/graphics/gimp-app-devel/files/patch-ak
index 90837d0254f..ead5311df6f 100644
--- a/graphics/gimp-app-devel/files/patch-ak
+++ b/graphics/gimp-app-devel/files/patch-ak
@@ -1,11 +1,17 @@
---- libgimp/Makefile.in.orig	Fri Feb 11 10:42:12 2000
-+++ libgimp/Makefile.in	Sat Feb 19 15:18:59 2000
-@@ -211,7 +211,7 @@
+--- libgimp/Makefile.in.orig	Sat Mar  4 11:10:43 2000
++++ libgimp/Makefile.in	Sun Apr  2 22:40:29 2000
+@@ -209,11 +209,11 @@
+ gimpinclude_HEADERS =  	color_display.h			color_selector.h		gimp.h				gimpchainbutton.h		gimpcolorbutton.h		gimpcolorspace.h	        gimpcompat.h			gimpdialog.h			gimpenums.h			gimpenv.h			gimpexport.h			gimpfeatures.h			gimpfileselection.h		gimphelpui.h			gimplimits.h			gimpmath.h			gimpmatrix.h			gimpmenu.h			gimpmodule.h			gimppatheditor.h		gimppixmap.h			gimpquerybox.h			gimpsizeentry.h			gimpui.h			gimpunit.h              	gimpunitmenu.h          	gimpvector.h			gimpwidgets.h			gimpintl.h			parasite.h			parasiteF.h			parasiteP.h			parasiteio.h
  
- libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
+ 
+-libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
++libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
 -libgimp_la_LIBADD = $(GLIB_LIBS) -lm
 +libgimp_la_LIBADD = $(GTK_LIBS) -lm
  
- libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
+-libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
++libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
+ libgimpui_la_LIBADD = $(GTK_LIBS)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/graphics/gimp-app-devel/files/patch-ao b/graphics/gimp-app-devel/files/patch-ao
new file mode 100644
index 00000000000..e5f1d5a3677
--- /dev/null
+++ b/graphics/gimp-app-devel/files/patch-ao
@@ -0,0 +1,11 @@
+--- plug-ins/libgck/gck/Makefile.in.orig	Sun Apr  2 22:41:29 2000
++++ plug-ins/libgck/gck/Makefile.in	Sun Apr  2 22:41:37 2000
+@@ -191,7 +191,7 @@
+ gckinclude_HEADERS =  	gck.h
+ 
+ 
+-libgck_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
++libgck_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
+ 
+ INCLUDES =  	-I..				-I$(srcdir)/..			-I$(top_srcdir)			$(GTK_CFLAGS)			-I$(includedir)
diff --git a/graphics/gimp-app-devel/pkg-plist b/graphics/gimp-app-devel/pkg-plist
index 87f412103a6..43f671d40a8 100644
--- a/graphics/gimp-app-devel/pkg-plist
+++ b/graphics/gimp-app-devel/pkg-plist
@@ -3,14 +3,6 @@ bin/gimp-config
 bin/gimp.setfont
 bin/gimptool
 include/gck/gck.h
-include/gck/gckcolor.h
-include/gck/gckcommon.h
-include/gck/gckimage.h
-include/gck/gcklistbox.h
-include/gck/gckmath.h
-include/gck/gcktypes.h
-include/gck/gckui.h
-include/gck/gckvector.h
 include/libgimp/color_display.h
 include/libgimp/color_selector.h
 include/libgimp/gimp.h
@@ -32,31 +24,39 @@ include/libgimp/gimpmatrix.h
 include/libgimp/gimpmenu.h
 include/libgimp/gimpmodule.h
 include/libgimp/gimppatheditor.h
+include/libgimp/gimppixmap.h
 include/libgimp/gimpquerybox.h
 include/libgimp/gimpsizeentry.h
 include/libgimp/gimpui.h
 include/libgimp/gimpunit.h
 include/libgimp/gimpunitmenu.h
+include/libgimp/gimpvector.h
 include/libgimp/gimpwidgets.h
-include/libgimp/gserialize.h
 include/libgimp/parasite.h
 include/libgimp/parasiteF.h
 include/libgimp/parasiteP.h
 include/libgimp/parasiteio.h
 lib/libgck.a
+lib/libgck.la
 lib/libgck.so
-lib/libgck.so.17
+lib/libgck.so.18
 lib/libgimp.a
+lib/libgimp.la
 lib/libgimp.so
-lib/libgimp.so.17
+lib/libgimp.so.18
 lib/libgimpui.a
+lib/libgimpui.la
 lib/libgimpui.so
-lib/libgimpui.so.17
+lib/libgimpui.so.18
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+libexec/gimp/1.1/modules/libcdisplay_gamma.la
 libexec/gimp/1.1/modules/libcdisplay_gamma.so
+libexec/gimp/1.1/modules/libcolorsel_gtk.la
 libexec/gimp/1.1/modules/libcolorsel_gtk.so
+libexec/gimp/1.1/modules/libcolorsel_triangle.la
 libexec/gimp/1.1/modules/libcolorsel_triangle.so
+libexec/gimp/1.1/modules/libcolorsel_water.la
 libexec/gimp/1.1/modules/libcolorsel_water.so
 libexec/gimp/1.1/plug-ins/AlienMap
 libexec/gimp/1.1/plug-ins/AlienMap2
@@ -65,33 +65,22 @@ libexec/gimp/1.1/plug-ins/CML_explorer
 libexec/gimp/1.1/plug-ins/FractalExplorer
 libexec/gimp/1.1/plug-ins/Lighting
 libexec/gimp/1.1/plug-ins/MapObject
-libexec/gimp/1.1/plug-ins/PDB
-libexec/gimp/1.1/plug-ins/Perl-Server
 libexec/gimp/1.1/plug-ins/aa
 libexec/gimp/1.1/plug-ins/align_layers
-libexec/gimp/1.1/plug-ins/animate_cells
 libexec/gimp/1.1/plug-ins/animationplay
 libexec/gimp/1.1/plug-ins/animoptimize
 libexec/gimp/1.1/plug-ins/apply_lens
 libexec/gimp/1.1/plug-ins/autocrop
 libexec/gimp/1.1/plug-ins/autostretch_hsv
-libexec/gimp/1.1/plug-ins/avi
-libexec/gimp/1.1/plug-ins/blended2
 libexec/gimp/1.1/plug-ins/blinds
-libexec/gimp/1.1/plug-ins/blowinout
 libexec/gimp/1.1/plug-ins/blur
 libexec/gimp/1.1/plug-ins/bmp
-libexec/gimp/1.1/plug-ins/border
 libexec/gimp/1.1/plug-ins/borderaverage
-libexec/gimp/1.1/plug-ins/bricks
 libexec/gimp/1.1/plug-ins/bumpmap
-libexec/gimp/1.1/plug-ins/burst
 libexec/gimp/1.1/plug-ins/bz2
 libexec/gimp/1.1/plug-ins/c_astretch
-libexec/gimp/1.1/plug-ins/centerguide
 libexec/gimp/1.1/plug-ins/checkerboard
 libexec/gimp/1.1/plug-ins/color_enhance
-libexec/gimp/1.1/plug-ins/colorhtml
 libexec/gimp/1.1/plug-ins/colorify
 libexec/gimp/1.1/plug-ins/colortoalpha
 libexec/gimp/1.1/plug-ins/compose
@@ -99,7 +88,6 @@ libexec/gimp/1.1/plug-ins/convmatrix
 libexec/gimp/1.1/plug-ins/csource
 libexec/gimp/1.1/plug-ins/cubism
 libexec/gimp/1.1/plug-ins/curve_bend
-libexec/gimp/1.1/plug-ins/dataurl
 libexec/gimp/1.1/plug-ins/dbbrowser
 libexec/gimp/1.1/plug-ins/decompose
 libexec/gimp/1.1/plug-ins/deinterlace
@@ -108,23 +96,17 @@ libexec/gimp/1.1/plug-ins/despeckle
 libexec/gimp/1.1/plug-ins/destripe
 libexec/gimp/1.1/plug-ins/diffraction
 libexec/gimp/1.1/plug-ins/displace
-libexec/gimp/1.1/plug-ins/ditherize
 libexec/gimp/1.1/plug-ins/edge
 libexec/gimp/1.1/plug-ins/emboss
 libexec/gimp/1.1/plug-ins/engrave
 libexec/gimp/1.1/plug-ins/exchange
 libexec/gimp/1.1/plug-ins/faxg3
 libexec/gimp/1.1/plug-ins/film
-libexec/gimp/1.1/plug-ins/fire
-libexec/gimp/1.1/plug-ins/fit-text
 libexec/gimp/1.1/plug-ins/fits
 libexec/gimp/1.1/plug-ins/flame
 libexec/gimp/1.1/plug-ins/flarefx
-libexec/gimp/1.1/plug-ins/font_table
 libexec/gimp/1.1/plug-ins/fp
 libexec/gimp/1.1/plug-ins/fractaltrace
-libexec/gimp/1.1/plug-ins/frame_filter
-libexec/gimp/1.1/plug-ins/frame_reshuffle
 libexec/gimp/1.1/plug-ins/gap_decode_mpeg
 libexec/gimp/1.1/plug-ins/gap_filter
 libexec/gimp/1.1/plug-ins/gap_frontends
@@ -141,20 +123,13 @@ libexec/gimp/1.1/plug-ins/gfli
 libexec/gimp/1.1/plug-ins/gicon
 libexec/gimp/1.1/plug-ins/gif
 libexec/gimp/1.1/plug-ins/gifload
-libexec/gimp/1.1/plug-ins/gimpmagick
 libexec/gimp/1.1/plug-ins/gimpressionist
 libexec/gimp/1.1/plug-ins/glasstile
-libexec/gimp/1.1/plug-ins/glowing_steel
-libexec/gimp/1.1/plug-ins/goldenmean
-libexec/gimp/1.1/plug-ins/gouge
 libexec/gimp/1.1/plug-ins/gpb
 libexec/gimp/1.1/plug-ins/gqbist
 libexec/gimp/1.1/plug-ins/gradmap
 libexec/gimp/1.1/plug-ins/grid
 libexec/gimp/1.1/plug-ins/gtm
-libexec/gimp/1.1/plug-ins/guide_remove
-libexec/gimp/1.1/plug-ins/guidegrid
-libexec/gimp/1.1/plug-ins/guides_to_selection
 libexec/gimp/1.1/plug-ins/guillotine
 libexec/gimp/1.1/plug-ins/gz
 libexec/gimp/1.1/plug-ins/header
@@ -163,24 +138,17 @@ libexec/gimp/1.1/plug-ins/hot
 libexec/gimp/1.1/plug-ins/hrz
 libexec/gimp/1.1/plug-ins/ifscompose
 libexec/gimp/1.1/plug-ins/illusion
-libexec/gimp/1.1/plug-ins/image_tile
 libexec/gimp/1.1/plug-ins/imagemap
-libexec/gimp/1.1/plug-ins/innerbevel
 libexec/gimp/1.1/plug-ins/iwarp
 libexec/gimp/1.1/plug-ins/jigsaw
 libexec/gimp/1.1/plug-ins/jpeg
 libexec/gimp/1.1/plug-ins/laplace
-libexec/gimp/1.1/plug-ins/layerfuncs
 libexec/gimp/1.1/plug-ins/lic
-libexec/gimp/1.1/plug-ins/logulator
 libexec/gimp/1.1/plug-ins/mail
-libexec/gimp/1.1/plug-ins/map_to_gradient
 libexec/gimp/1.1/plug-ins/mapcolor
 libexec/gimp/1.1/plug-ins/max_rgb
 libexec/gimp/1.1/plug-ins/maze
 libexec/gimp/1.1/plug-ins/mblur
-libexec/gimp/1.1/plug-ins/miff
-libexec/gimp/1.1/plug-ins/mirrorsplit
 libexec/gimp/1.1/plug-ins/mosaic
 libexec/gimp/1.1/plug-ins/mpeg
 libexec/gimp/1.1/plug-ins/newsprint
@@ -191,43 +159,30 @@ libexec/gimp/1.1/plug-ins/nova
 libexec/gimp/1.1/plug-ins/oilify
 libexec/gimp/1.1/plug-ins/pagecurl
 libexec/gimp/1.1/plug-ins/papertile
-libexec/gimp/1.1/plug-ins/parasite-editor
 libexec/gimp/1.1/plug-ins/pat
 libexec/gimp/1.1/plug-ins/pcx
-libexec/gimp/1.1/plug-ins/perlcc
-libexec/gimp/1.1/plug-ins/perlotine
 libexec/gimp/1.1/plug-ins/pix
 libexec/gimp/1.1/plug-ins/pixelize
-libexec/gimp/1.1/plug-ins/pixelmap
 libexec/gimp/1.1/plug-ins/plasma
 libexec/gimp/1.1/plug-ins/plugindetails
 libexec/gimp/1.1/plug-ins/png
 libexec/gimp/1.1/plug-ins/pnm
 libexec/gimp/1.1/plug-ins/polar
-libexec/gimp/1.1/plug-ins/povray
-libexec/gimp/1.1/plug-ins/prep4gif
 libexec/gimp/1.1/plug-ins/print
 libexec/gimp/1.1/plug-ins/ps
 libexec/gimp/1.1/plug-ins/psd
 libexec/gimp/1.1/plug-ins/psp
-libexec/gimp/1.1/plug-ins/randomart1
-libexec/gimp/1.1/plug-ins/randomblends
 libexec/gimp/1.1/plug-ins/randomize
 libexec/gimp/1.1/plug-ins/rcm
-libexec/gimp/1.1/plug-ins/repdup
 libexec/gimp/1.1/plug-ins/ripple
 libexec/gimp/1.1/plug-ins/rotate
-libexec/gimp/1.1/plug-ins/roundrectsel
-libexec/gimp/1.1/plug-ins/roundsel
 libexec/gimp/1.1/plug-ins/sample_colorize
 libexec/gimp/1.1/plug-ins/scatter_hsv
-libexec/gimp/1.1/plug-ins/scratches
 libexec/gimp/1.1/plug-ins/screenshot
 libexec/gimp/1.1/plug-ins/script-fu
 libexec/gimp/1.1/plug-ins/sel2path
 libexec/gimp/1.1/plug-ins/sel_gauss
 libexec/gimp/1.1/plug-ins/semiflatten
-libexec/gimp/1.1/plug-ins/sethspin
 libexec/gimp/1.1/plug-ins/sgi
 libexec/gimp/1.1/plug-ins/sharpen
 libexec/gimp/1.1/plug-ins/shift
@@ -238,42 +193,30 @@ libexec/gimp/1.1/plug-ins/sobel
 libexec/gimp/1.1/plug-ins/sparkle
 libexec/gimp/1.1/plug-ins/spheredesigner
 libexec/gimp/1.1/plug-ins/spread
-libexec/gimp/1.1/plug-ins/stampify
-libexec/gimp/1.1/plug-ins/stamps
 libexec/gimp/1.1/plug-ins/struc
 libexec/gimp/1.1/plug-ins/sunras
-libexec/gimp/1.1/plug-ins/terral_text
-libexec/gimp/1.1/plug-ins/tex-to-float
 libexec/gimp/1.1/plug-ins/tga
 libexec/gimp/1.1/plug-ins/threshold_alpha
 libexec/gimp/1.1/plug-ins/tiff
 libexec/gimp/1.1/plug-ins/tile
 libexec/gimp/1.1/plug-ins/tileit
 libexec/gimp/1.1/plug-ins/tiler
-libexec/gimp/1.1/plug-ins/translogo
-libexec/gimp/1.1/plug-ins/triangle
+libexec/gimp/1.1/plug-ins/uniteditor
 libexec/gimp/1.1/plug-ins/unsharp
 libexec/gimp/1.1/plug-ins/url
 libexec/gimp/1.1/plug-ins/video
-libexec/gimp/1.1/plug-ins/view3d
 libexec/gimp/1.1/plug-ins/vinvert
 libexec/gimp/1.1/plug-ins/vpropagate
 libexec/gimp/1.1/plug-ins/warp
 libexec/gimp/1.1/plug-ins/waves
 libexec/gimp/1.1/plug-ins/webbrowser
-libexec/gimp/1.1/plug-ins/webify
 libexec/gimp/1.1/plug-ins/whirlpinch
 libexec/gimp/1.1/plug-ins/wind
-libexec/gimp/1.1/plug-ins/windify
 libexec/gimp/1.1/plug-ins/wmf
-libexec/gimp/1.1/plug-ins/xachlego
-libexec/gimp/1.1/plug-ins/xachshadow
-libexec/gimp/1.1/plug-ins/xachvision
 libexec/gimp/1.1/plug-ins/xbm
 libexec/gimp/1.1/plug-ins/xjt
 libexec/gimp/1.1/plug-ins/xpm
 libexec/gimp/1.1/plug-ins/xwd
-libexec/gimp/1.1/plug-ins/yinyang
 libexec/gimp/1.1/plug-ins/zealouscrop
 share/aclocal/gimp.m4
 share/gimp/brushes/10x10square.gbr
@@ -318,15 +261,16 @@ share/gimp/brushes/pixel.gbr
 share/gimp/brushes/thegimp.gbr
 share/gimp/brushes/vine.gih
 share/gimp/brushes/xcf.gbr
-share/gimp/devel-docs/html/libgimp/book1.html
 share/gimp/devel-docs/html/libgimp/gimpchainbutton.html
 share/gimp/devel-docs/html/libgimp/gimpcolorbutton.html
 share/gimp/devel-docs/html/libgimp/gimpdefinitions.html
 share/gimp/devel-docs/html/libgimp/gimpfileselection.html
 share/gimp/devel-docs/html/libgimp/gimpmodule.html
 share/gimp/devel-docs/html/libgimp/gimppatheditor.html
+share/gimp/devel-docs/html/libgimp/gimppixmap.html
 share/gimp/devel-docs/html/libgimp/gimpsizeentry.html
 share/gimp/devel-docs/html/libgimp/gimpunitmenu.html
+share/gimp/devel-docs/html/libgimp/index.html
 share/gimp/devel-docs/html/libgimp/libgimp-color-display.html
 share/gimp/devel-docs/html/libgimp/libgimp-color-selector.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimp.html
@@ -344,10 +288,11 @@ share/gimp/devel-docs/html/libgimp/libgimp-gimpmatrix.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpmenu.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpmodule.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpprotocol.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpquerybox.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpunit.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpvector.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpwidgets.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpwire.html
-share/gimp/devel-docs/html/libgimp/libgimp-gserialize.html
 share/gimp/devel-docs/html/libgimp/libgimp-parasite.html
 share/gimp/devel-docs/html/libgimp/libgimp-parasitef.html
 share/gimp/devel-docs/html/libgimp/libgimp-parasiteio.html
@@ -634,7 +579,6 @@ share/gimp/help/C/dialogs/indexed_palette.html
 share/gimp/help/C/dialogs/info_window.html
 share/gimp/help/C/dialogs/input_devices.html
 share/gimp/help/C/dialogs/layers/add_mask.html
-share/gimp/help/C/dialogs/layers/apply_mask.html
 share/gimp/help/C/dialogs/layers/edit_layer_attributes.html
 share/gimp/help/C/dialogs/layers/index.html
 share/gimp/help/C/dialogs/layers/layer_boundary_size.html
@@ -672,6 +616,7 @@ share/gimp/help/C/dialogs/preferences/session.html
 share/gimp/help/C/dialogs/really_close.html
 share/gimp/help/C/dialogs/really_quit.html
 share/gimp/help/C/dialogs/scale_image.html
+share/gimp/help/C/dialogs/scale_layer_warn.html
 share/gimp/help/C/dialogs/set_canvas_size.html
 share/gimp/help/C/dialogs/shrink_selection.html
 share/gimp/help/C/dialogs/tip_of_the_day.html
@@ -833,6 +778,7 @@ share/gimp/help/C/filters/tiff.html
 share/gimp/help/C/filters/tile.html
 share/gimp/help/C/filters/tileit.html
 share/gimp/help/C/filters/tiler.html
+share/gimp/help/C/filters/uniteditor.html
 share/gimp/help/C/filters/unsharp.html
 share/gimp/help/C/filters/url.html
 share/gimp/help/C/filters/video.html
@@ -925,10 +871,12 @@ share/gimp/help/C/index.html
 share/gimp/help/C/layers/add_alpha_channel.html
 share/gimp/help/C/layers/alpha_to_selection.html
 share/gimp/help/C/layers/anchor_layer.html
+share/gimp/help/C/layers/apply_mask.html
 @exec mkdir -p %D/share/gimp/help/C/layers
 @exec ln -sf %D/share/gimp/help/C/dialogs/layers %D/share/gimp/help/C/layers/dialogs
 @unexec rm -f %D/share/gimp/help/C/layers/dialogs
 share/gimp/help/C/layers/delete_layer.html
+share/gimp/help/C/layers/delete_mask.html
 share/gimp/help/C/layers/duplicate_layer.html
 share/gimp/help/C/layers/flatten_image.html
 share/gimp/help/C/layers/index.html
@@ -1231,14 +1179,12 @@ share/gimp/tips/gimp_tips.txt
 share/gimp/unitrc
 share/gimp/user_install
 share/locale/cs/LC_MESSAGES/gimp-libgimp.mo
-share/locale/cs/LC_MESSAGES/gimp-perl.mo
 share/locale/cs/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/cs/LC_MESSAGES/gimp.mo
 share/locale/da/LC_MESSAGES/gimp-libgimp.mo
 share/locale/da/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/da/LC_MESSAGES/gimp.mo
 share/locale/de/LC_MESSAGES/gimp-libgimp.mo
-share/locale/de/LC_MESSAGES/gimp-perl.mo
 share/locale/de/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/de/LC_MESSAGES/gimp.mo
 share/locale/en_GB/LC_MESSAGES/gimp-libgimp.mo
@@ -1254,7 +1200,6 @@ share/locale/hu/LC_MESSAGES/gimp-libgimp.mo
 share/locale/hu/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/hu/LC_MESSAGES/gimp.mo
 share/locale/it/LC_MESSAGES/gimp-libgimp.mo
-share/locale/it/LC_MESSAGES/gimp-perl.mo
 share/locale/it/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/it/LC_MESSAGES/gimp.mo
 share/locale/ja/LC_MESSAGES/gimp-libgimp.mo
@@ -1267,7 +1212,6 @@ share/locale/nl/LC_MESSAGES/gimp-libgimp.mo
 share/locale/nl/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/nl/LC_MESSAGES/gimp.mo
 share/locale/no/LC_MESSAGES/gimp-libgimp.mo
-share/locale/no/LC_MESSAGES/gimp-perl.mo
 share/locale/no/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/no/LC_MESSAGES/gimp.mo
 share/locale/pl/LC_MESSAGES/gimp-libgimp.mo
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index da12d91e6ab..5f1de62d1ed 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -12,12 +12,14 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v${VERSION}/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/v${VERSION}/ \
 		ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/gimp/unstable/v${VERSION}/
 
-MAINTAINER=	erich@FreeBSD.org
+MAINTAINER=	vanilla@FreeBSD.org
 
+.if !defined (WITHOUT_PERL)
 BUILD_DEPENDS=	perldl:${PORTSDIR}/math/PDL \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
 RUN_DEPENDS=	perldl:${PORTSDIR}/math/PDL \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+.endif
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		aa.1:${PORTSDIR}/graphics/aalib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -27,7 +29,7 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		intl.1:${PORTSDIR}/devel/gettext
 
-VERSION=	1.1.17
+VERSION=	1.1.18
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
@@ -37,6 +39,9 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
+.if defined (WITHOUT_PERL)
+CONFIGURE_ARGS=	--disable-perl
+.endif
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GLIB_CONFIG="${GLIB_CONFIG}" \
 		GTK_CONFIG="${GTK_CONFIG}" \
@@ -49,12 +54,22 @@ MAN5=		gimprc.5
 WITH_GNOME=	yes
 .endif
 
+.if defined(WITHOUT_PERL)
+PLISTORIG=		${WRKDIR}/PLIST
+PLIST=			${PKGDIR}/PLIST
+.else
+PLISTORIG=		${WRKDIR}/PLIST.perl
+PLIST=			${SRCDIR}/PLIST.perl
+pre-fetch:
+	@${ECHO} -n "If you want to compile without perl support "
+	@${ECHO} "'make -DWITHOUT_PERL' instead"
+.endif
+
 .if defined(WITH_GNOME) && ${WITH_GNOME} == yes
 LIB_DEPENDS+=	gtkxmhtml.3:${PORTSDIR}/x11/gnomelibs
 .else
-PLIST=		${WRKDIR}/PLIST
 pre-install:
-	@${SED} -e '/helpbrowser/d' ${PKGDIR}/PLIST > ${PLIST}
+	@${SED} -e '/helpbrowser/d' ${PLISTORIG} > ${PLIST}
 .endif
 
 post-install:
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index 4bfc5bc43ff..75190c8cb8f 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.1.17.tar.bz2) = 5599cb98b3a17324f2ad2682348a7df9
+MD5 (gimp-1.1.18.tar.bz2) = 472ef3f6e814250d31faa63e467b03b9
diff --git a/graphics/gimp-app/files/gimp.setfont b/graphics/gimp-app/files/gimp.setfont
index 487a91baf0e..34f91f9b5b2 100644
--- a/graphics/gimp-app/files/gimp.setfont
+++ b/graphics/gimp-app/files/gimp.setfont
@@ -7,6 +7,7 @@
 $progname = "gimp.setfont";
 $version = "Version 0.4 Feb 07 2000";
 
+$fontset{'chinese'} = "-*-helvetica-medium-r-normal--17-*-*-*-*-*-iso8859-1,-*-kai-medium-r-normal--16-*-*-*-*-*-big5-0";
 $fontset{'czech'} = "-*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-2";
 $fontset{'danish'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
 $fontset{'dutch'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
@@ -25,6 +26,7 @@ $fontset{'slovak'} = "-*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-2";
 $fontset{'swedish'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
 $fontset{'ukrainian'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-koi8-r";
 
+$locale{'chinese'} = "zh_TW.Big5";
 $locale{'czech'} = "cs_CZ.ISO8859-2";
 $locale{'danish'} = "da_DK.ISO_8859-1";
 $locale{'dutch'} = "nl_NL.ISO_8859-1";
@@ -50,6 +52,7 @@ Usage: gimp.setfont <language>
 
 ----------------------------------------------------------------
 [language]          [fontset]
+ chinese             -*-helvetica-(iso8859-1),-*-kai-(big5-0)
  czech               -*-fixed-(iso8859-2)
  danish              -*-helvetica-(iso8859-1)
  dutch               -*-helvetica-(iso8859-1)
diff --git a/graphics/gimp-app/files/patch-ah b/graphics/gimp-app/files/patch-ah
index 95af0d629b7..267a91fa0f0 100644
--- a/graphics/gimp-app/files/patch-ah
+++ b/graphics/gimp-app/files/patch-ah
@@ -1,5 +1,29 @@
---- configure.orig	Fri Feb 11 10:32:12 2000
-+++ configure	Sat Feb 19 13:51:36 2000
+--- configure.orig	Sat Mar  4 10:23:00 2000
++++ configure	Sun Apr  2 21:42:36 2000
+@@ -1494,8 +1494,8 @@
+ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+ DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
++${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh $lt_target \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+ 
+ # Reload cache, that may have been modified by ltconfig
+@@ -1509,10 +1509,10 @@
+ 
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL="/usr/local/bin/libtool"
+ 
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
 @@ -3480,7 +3480,11 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
@@ -22,7 +46,7 @@
  localedir='${prefix}/${DATADIRNAME}/locale'
  
  brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
-@@ -8561,10 +8565,6 @@
+@@ -8563,10 +8567,6 @@
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
    esac
  
diff --git a/graphics/gimp-app/files/patch-ak b/graphics/gimp-app/files/patch-ak
index 90837d0254f..ead5311df6f 100644
--- a/graphics/gimp-app/files/patch-ak
+++ b/graphics/gimp-app/files/patch-ak
@@ -1,11 +1,17 @@
---- libgimp/Makefile.in.orig	Fri Feb 11 10:42:12 2000
-+++ libgimp/Makefile.in	Sat Feb 19 15:18:59 2000
-@@ -211,7 +211,7 @@
+--- libgimp/Makefile.in.orig	Sat Mar  4 11:10:43 2000
++++ libgimp/Makefile.in	Sun Apr  2 22:40:29 2000
+@@ -209,11 +209,11 @@
+ gimpinclude_HEADERS =  	color_display.h			color_selector.h		gimp.h				gimpchainbutton.h		gimpcolorbutton.h		gimpcolorspace.h	        gimpcompat.h			gimpdialog.h			gimpenums.h			gimpenv.h			gimpexport.h			gimpfeatures.h			gimpfileselection.h		gimphelpui.h			gimplimits.h			gimpmath.h			gimpmatrix.h			gimpmenu.h			gimpmodule.h			gimppatheditor.h		gimppixmap.h			gimpquerybox.h			gimpsizeentry.h			gimpui.h			gimpunit.h              	gimpunitmenu.h          	gimpvector.h			gimpwidgets.h			gimpintl.h			parasite.h			parasiteF.h			parasiteP.h			parasiteio.h
  
- libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
+ 
+-libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
++libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
 -libgimp_la_LIBADD = $(GLIB_LIBS) -lm
 +libgimp_la_LIBADD = $(GTK_LIBS) -lm
  
- libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
+-libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
++libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
+ libgimpui_la_LIBADD = $(GTK_LIBS)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/graphics/gimp-app/files/patch-ao b/graphics/gimp-app/files/patch-ao
new file mode 100644
index 00000000000..e5f1d5a3677
--- /dev/null
+++ b/graphics/gimp-app/files/patch-ao
@@ -0,0 +1,11 @@
+--- plug-ins/libgck/gck/Makefile.in.orig	Sun Apr  2 22:41:29 2000
++++ plug-ins/libgck/gck/Makefile.in	Sun Apr  2 22:41:37 2000
+@@ -191,7 +191,7 @@
+ gckinclude_HEADERS =  	gck.h
+ 
+ 
+-libgck_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
++libgck_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
+ 
+ INCLUDES =  	-I..				-I$(srcdir)/..			-I$(top_srcdir)			$(GTK_CFLAGS)			-I$(includedir)
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index 87f412103a6..43f671d40a8 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -3,14 +3,6 @@ bin/gimp-config
 bin/gimp.setfont
 bin/gimptool
 include/gck/gck.h
-include/gck/gckcolor.h
-include/gck/gckcommon.h
-include/gck/gckimage.h
-include/gck/gcklistbox.h
-include/gck/gckmath.h
-include/gck/gcktypes.h
-include/gck/gckui.h
-include/gck/gckvector.h
 include/libgimp/color_display.h
 include/libgimp/color_selector.h
 include/libgimp/gimp.h
@@ -32,31 +24,39 @@ include/libgimp/gimpmatrix.h
 include/libgimp/gimpmenu.h
 include/libgimp/gimpmodule.h
 include/libgimp/gimppatheditor.h
+include/libgimp/gimppixmap.h
 include/libgimp/gimpquerybox.h
 include/libgimp/gimpsizeentry.h
 include/libgimp/gimpui.h
 include/libgimp/gimpunit.h
 include/libgimp/gimpunitmenu.h
+include/libgimp/gimpvector.h
 include/libgimp/gimpwidgets.h
-include/libgimp/gserialize.h
 include/libgimp/parasite.h
 include/libgimp/parasiteF.h
 include/libgimp/parasiteP.h
 include/libgimp/parasiteio.h
 lib/libgck.a
+lib/libgck.la
 lib/libgck.so
-lib/libgck.so.17
+lib/libgck.so.18
 lib/libgimp.a
+lib/libgimp.la
 lib/libgimp.so
-lib/libgimp.so.17
+lib/libgimp.so.18
 lib/libgimpui.a
+lib/libgimpui.la
 lib/libgimpui.so
-lib/libgimpui.so.17
+lib/libgimpui.so.18
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+libexec/gimp/1.1/modules/libcdisplay_gamma.la
 libexec/gimp/1.1/modules/libcdisplay_gamma.so
+libexec/gimp/1.1/modules/libcolorsel_gtk.la
 libexec/gimp/1.1/modules/libcolorsel_gtk.so
+libexec/gimp/1.1/modules/libcolorsel_triangle.la
 libexec/gimp/1.1/modules/libcolorsel_triangle.so
+libexec/gimp/1.1/modules/libcolorsel_water.la
 libexec/gimp/1.1/modules/libcolorsel_water.so
 libexec/gimp/1.1/plug-ins/AlienMap
 libexec/gimp/1.1/plug-ins/AlienMap2
@@ -65,33 +65,22 @@ libexec/gimp/1.1/plug-ins/CML_explorer
 libexec/gimp/1.1/plug-ins/FractalExplorer
 libexec/gimp/1.1/plug-ins/Lighting
 libexec/gimp/1.1/plug-ins/MapObject
-libexec/gimp/1.1/plug-ins/PDB
-libexec/gimp/1.1/plug-ins/Perl-Server
 libexec/gimp/1.1/plug-ins/aa
 libexec/gimp/1.1/plug-ins/align_layers
-libexec/gimp/1.1/plug-ins/animate_cells
 libexec/gimp/1.1/plug-ins/animationplay
 libexec/gimp/1.1/plug-ins/animoptimize
 libexec/gimp/1.1/plug-ins/apply_lens
 libexec/gimp/1.1/plug-ins/autocrop
 libexec/gimp/1.1/plug-ins/autostretch_hsv
-libexec/gimp/1.1/plug-ins/avi
-libexec/gimp/1.1/plug-ins/blended2
 libexec/gimp/1.1/plug-ins/blinds
-libexec/gimp/1.1/plug-ins/blowinout
 libexec/gimp/1.1/plug-ins/blur
 libexec/gimp/1.1/plug-ins/bmp
-libexec/gimp/1.1/plug-ins/border
 libexec/gimp/1.1/plug-ins/borderaverage
-libexec/gimp/1.1/plug-ins/bricks
 libexec/gimp/1.1/plug-ins/bumpmap
-libexec/gimp/1.1/plug-ins/burst
 libexec/gimp/1.1/plug-ins/bz2
 libexec/gimp/1.1/plug-ins/c_astretch
-libexec/gimp/1.1/plug-ins/centerguide
 libexec/gimp/1.1/plug-ins/checkerboard
 libexec/gimp/1.1/plug-ins/color_enhance
-libexec/gimp/1.1/plug-ins/colorhtml
 libexec/gimp/1.1/plug-ins/colorify
 libexec/gimp/1.1/plug-ins/colortoalpha
 libexec/gimp/1.1/plug-ins/compose
@@ -99,7 +88,6 @@ libexec/gimp/1.1/plug-ins/convmatrix
 libexec/gimp/1.1/plug-ins/csource
 libexec/gimp/1.1/plug-ins/cubism
 libexec/gimp/1.1/plug-ins/curve_bend
-libexec/gimp/1.1/plug-ins/dataurl
 libexec/gimp/1.1/plug-ins/dbbrowser
 libexec/gimp/1.1/plug-ins/decompose
 libexec/gimp/1.1/plug-ins/deinterlace
@@ -108,23 +96,17 @@ libexec/gimp/1.1/plug-ins/despeckle
 libexec/gimp/1.1/plug-ins/destripe
 libexec/gimp/1.1/plug-ins/diffraction
 libexec/gimp/1.1/plug-ins/displace
-libexec/gimp/1.1/plug-ins/ditherize
 libexec/gimp/1.1/plug-ins/edge
 libexec/gimp/1.1/plug-ins/emboss
 libexec/gimp/1.1/plug-ins/engrave
 libexec/gimp/1.1/plug-ins/exchange
 libexec/gimp/1.1/plug-ins/faxg3
 libexec/gimp/1.1/plug-ins/film
-libexec/gimp/1.1/plug-ins/fire
-libexec/gimp/1.1/plug-ins/fit-text
 libexec/gimp/1.1/plug-ins/fits
 libexec/gimp/1.1/plug-ins/flame
 libexec/gimp/1.1/plug-ins/flarefx
-libexec/gimp/1.1/plug-ins/font_table
 libexec/gimp/1.1/plug-ins/fp
 libexec/gimp/1.1/plug-ins/fractaltrace
-libexec/gimp/1.1/plug-ins/frame_filter
-libexec/gimp/1.1/plug-ins/frame_reshuffle
 libexec/gimp/1.1/plug-ins/gap_decode_mpeg
 libexec/gimp/1.1/plug-ins/gap_filter
 libexec/gimp/1.1/plug-ins/gap_frontends
@@ -141,20 +123,13 @@ libexec/gimp/1.1/plug-ins/gfli
 libexec/gimp/1.1/plug-ins/gicon
 libexec/gimp/1.1/plug-ins/gif
 libexec/gimp/1.1/plug-ins/gifload
-libexec/gimp/1.1/plug-ins/gimpmagick
 libexec/gimp/1.1/plug-ins/gimpressionist
 libexec/gimp/1.1/plug-ins/glasstile
-libexec/gimp/1.1/plug-ins/glowing_steel
-libexec/gimp/1.1/plug-ins/goldenmean
-libexec/gimp/1.1/plug-ins/gouge
 libexec/gimp/1.1/plug-ins/gpb
 libexec/gimp/1.1/plug-ins/gqbist
 libexec/gimp/1.1/plug-ins/gradmap
 libexec/gimp/1.1/plug-ins/grid
 libexec/gimp/1.1/plug-ins/gtm
-libexec/gimp/1.1/plug-ins/guide_remove
-libexec/gimp/1.1/plug-ins/guidegrid
-libexec/gimp/1.1/plug-ins/guides_to_selection
 libexec/gimp/1.1/plug-ins/guillotine
 libexec/gimp/1.1/plug-ins/gz
 libexec/gimp/1.1/plug-ins/header
@@ -163,24 +138,17 @@ libexec/gimp/1.1/plug-ins/hot
 libexec/gimp/1.1/plug-ins/hrz
 libexec/gimp/1.1/plug-ins/ifscompose
 libexec/gimp/1.1/plug-ins/illusion
-libexec/gimp/1.1/plug-ins/image_tile
 libexec/gimp/1.1/plug-ins/imagemap
-libexec/gimp/1.1/plug-ins/innerbevel
 libexec/gimp/1.1/plug-ins/iwarp
 libexec/gimp/1.1/plug-ins/jigsaw
 libexec/gimp/1.1/plug-ins/jpeg
 libexec/gimp/1.1/plug-ins/laplace
-libexec/gimp/1.1/plug-ins/layerfuncs
 libexec/gimp/1.1/plug-ins/lic
-libexec/gimp/1.1/plug-ins/logulator
 libexec/gimp/1.1/plug-ins/mail
-libexec/gimp/1.1/plug-ins/map_to_gradient
 libexec/gimp/1.1/plug-ins/mapcolor
 libexec/gimp/1.1/plug-ins/max_rgb
 libexec/gimp/1.1/plug-ins/maze
 libexec/gimp/1.1/plug-ins/mblur
-libexec/gimp/1.1/plug-ins/miff
-libexec/gimp/1.1/plug-ins/mirrorsplit
 libexec/gimp/1.1/plug-ins/mosaic
 libexec/gimp/1.1/plug-ins/mpeg
 libexec/gimp/1.1/plug-ins/newsprint
@@ -191,43 +159,30 @@ libexec/gimp/1.1/plug-ins/nova
 libexec/gimp/1.1/plug-ins/oilify
 libexec/gimp/1.1/plug-ins/pagecurl
 libexec/gimp/1.1/plug-ins/papertile
-libexec/gimp/1.1/plug-ins/parasite-editor
 libexec/gimp/1.1/plug-ins/pat
 libexec/gimp/1.1/plug-ins/pcx
-libexec/gimp/1.1/plug-ins/perlcc
-libexec/gimp/1.1/plug-ins/perlotine
 libexec/gimp/1.1/plug-ins/pix
 libexec/gimp/1.1/plug-ins/pixelize
-libexec/gimp/1.1/plug-ins/pixelmap
 libexec/gimp/1.1/plug-ins/plasma
 libexec/gimp/1.1/plug-ins/plugindetails
 libexec/gimp/1.1/plug-ins/png
 libexec/gimp/1.1/plug-ins/pnm
 libexec/gimp/1.1/plug-ins/polar
-libexec/gimp/1.1/plug-ins/povray
-libexec/gimp/1.1/plug-ins/prep4gif
 libexec/gimp/1.1/plug-ins/print
 libexec/gimp/1.1/plug-ins/ps
 libexec/gimp/1.1/plug-ins/psd
 libexec/gimp/1.1/plug-ins/psp
-libexec/gimp/1.1/plug-ins/randomart1
-libexec/gimp/1.1/plug-ins/randomblends
 libexec/gimp/1.1/plug-ins/randomize
 libexec/gimp/1.1/plug-ins/rcm
-libexec/gimp/1.1/plug-ins/repdup
 libexec/gimp/1.1/plug-ins/ripple
 libexec/gimp/1.1/plug-ins/rotate
-libexec/gimp/1.1/plug-ins/roundrectsel
-libexec/gimp/1.1/plug-ins/roundsel
 libexec/gimp/1.1/plug-ins/sample_colorize
 libexec/gimp/1.1/plug-ins/scatter_hsv
-libexec/gimp/1.1/plug-ins/scratches
 libexec/gimp/1.1/plug-ins/screenshot
 libexec/gimp/1.1/plug-ins/script-fu
 libexec/gimp/1.1/plug-ins/sel2path
 libexec/gimp/1.1/plug-ins/sel_gauss
 libexec/gimp/1.1/plug-ins/semiflatten
-libexec/gimp/1.1/plug-ins/sethspin
 libexec/gimp/1.1/plug-ins/sgi
 libexec/gimp/1.1/plug-ins/sharpen
 libexec/gimp/1.1/plug-ins/shift
@@ -238,42 +193,30 @@ libexec/gimp/1.1/plug-ins/sobel
 libexec/gimp/1.1/plug-ins/sparkle
 libexec/gimp/1.1/plug-ins/spheredesigner
 libexec/gimp/1.1/plug-ins/spread
-libexec/gimp/1.1/plug-ins/stampify
-libexec/gimp/1.1/plug-ins/stamps
 libexec/gimp/1.1/plug-ins/struc
 libexec/gimp/1.1/plug-ins/sunras
-libexec/gimp/1.1/plug-ins/terral_text
-libexec/gimp/1.1/plug-ins/tex-to-float
 libexec/gimp/1.1/plug-ins/tga
 libexec/gimp/1.1/plug-ins/threshold_alpha
 libexec/gimp/1.1/plug-ins/tiff
 libexec/gimp/1.1/plug-ins/tile
 libexec/gimp/1.1/plug-ins/tileit
 libexec/gimp/1.1/plug-ins/tiler
-libexec/gimp/1.1/plug-ins/translogo
-libexec/gimp/1.1/plug-ins/triangle
+libexec/gimp/1.1/plug-ins/uniteditor
 libexec/gimp/1.1/plug-ins/unsharp
 libexec/gimp/1.1/plug-ins/url
 libexec/gimp/1.1/plug-ins/video
-libexec/gimp/1.1/plug-ins/view3d
 libexec/gimp/1.1/plug-ins/vinvert
 libexec/gimp/1.1/plug-ins/vpropagate
 libexec/gimp/1.1/plug-ins/warp
 libexec/gimp/1.1/plug-ins/waves
 libexec/gimp/1.1/plug-ins/webbrowser
-libexec/gimp/1.1/plug-ins/webify
 libexec/gimp/1.1/plug-ins/whirlpinch
 libexec/gimp/1.1/plug-ins/wind
-libexec/gimp/1.1/plug-ins/windify
 libexec/gimp/1.1/plug-ins/wmf
-libexec/gimp/1.1/plug-ins/xachlego
-libexec/gimp/1.1/plug-ins/xachshadow
-libexec/gimp/1.1/plug-ins/xachvision
 libexec/gimp/1.1/plug-ins/xbm
 libexec/gimp/1.1/plug-ins/xjt
 libexec/gimp/1.1/plug-ins/xpm
 libexec/gimp/1.1/plug-ins/xwd
-libexec/gimp/1.1/plug-ins/yinyang
 libexec/gimp/1.1/plug-ins/zealouscrop
 share/aclocal/gimp.m4
 share/gimp/brushes/10x10square.gbr
@@ -318,15 +261,16 @@ share/gimp/brushes/pixel.gbr
 share/gimp/brushes/thegimp.gbr
 share/gimp/brushes/vine.gih
 share/gimp/brushes/xcf.gbr
-share/gimp/devel-docs/html/libgimp/book1.html
 share/gimp/devel-docs/html/libgimp/gimpchainbutton.html
 share/gimp/devel-docs/html/libgimp/gimpcolorbutton.html
 share/gimp/devel-docs/html/libgimp/gimpdefinitions.html
 share/gimp/devel-docs/html/libgimp/gimpfileselection.html
 share/gimp/devel-docs/html/libgimp/gimpmodule.html
 share/gimp/devel-docs/html/libgimp/gimppatheditor.html
+share/gimp/devel-docs/html/libgimp/gimppixmap.html
 share/gimp/devel-docs/html/libgimp/gimpsizeentry.html
 share/gimp/devel-docs/html/libgimp/gimpunitmenu.html
+share/gimp/devel-docs/html/libgimp/index.html
 share/gimp/devel-docs/html/libgimp/libgimp-color-display.html
 share/gimp/devel-docs/html/libgimp/libgimp-color-selector.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimp.html
@@ -344,10 +288,11 @@ share/gimp/devel-docs/html/libgimp/libgimp-gimpmatrix.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpmenu.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpmodule.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpprotocol.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpquerybox.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpunit.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpvector.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpwidgets.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpwire.html
-share/gimp/devel-docs/html/libgimp/libgimp-gserialize.html
 share/gimp/devel-docs/html/libgimp/libgimp-parasite.html
 share/gimp/devel-docs/html/libgimp/libgimp-parasitef.html
 share/gimp/devel-docs/html/libgimp/libgimp-parasiteio.html
@@ -634,7 +579,6 @@ share/gimp/help/C/dialogs/indexed_palette.html
 share/gimp/help/C/dialogs/info_window.html
 share/gimp/help/C/dialogs/input_devices.html
 share/gimp/help/C/dialogs/layers/add_mask.html
-share/gimp/help/C/dialogs/layers/apply_mask.html
 share/gimp/help/C/dialogs/layers/edit_layer_attributes.html
 share/gimp/help/C/dialogs/layers/index.html
 share/gimp/help/C/dialogs/layers/layer_boundary_size.html
@@ -672,6 +616,7 @@ share/gimp/help/C/dialogs/preferences/session.html
 share/gimp/help/C/dialogs/really_close.html
 share/gimp/help/C/dialogs/really_quit.html
 share/gimp/help/C/dialogs/scale_image.html
+share/gimp/help/C/dialogs/scale_layer_warn.html
 share/gimp/help/C/dialogs/set_canvas_size.html
 share/gimp/help/C/dialogs/shrink_selection.html
 share/gimp/help/C/dialogs/tip_of_the_day.html
@@ -833,6 +778,7 @@ share/gimp/help/C/filters/tiff.html
 share/gimp/help/C/filters/tile.html
 share/gimp/help/C/filters/tileit.html
 share/gimp/help/C/filters/tiler.html
+share/gimp/help/C/filters/uniteditor.html
 share/gimp/help/C/filters/unsharp.html
 share/gimp/help/C/filters/url.html
 share/gimp/help/C/filters/video.html
@@ -925,10 +871,12 @@ share/gimp/help/C/index.html
 share/gimp/help/C/layers/add_alpha_channel.html
 share/gimp/help/C/layers/alpha_to_selection.html
 share/gimp/help/C/layers/anchor_layer.html
+share/gimp/help/C/layers/apply_mask.html
 @exec mkdir -p %D/share/gimp/help/C/layers
 @exec ln -sf %D/share/gimp/help/C/dialogs/layers %D/share/gimp/help/C/layers/dialogs
 @unexec rm -f %D/share/gimp/help/C/layers/dialogs
 share/gimp/help/C/layers/delete_layer.html
+share/gimp/help/C/layers/delete_mask.html
 share/gimp/help/C/layers/duplicate_layer.html
 share/gimp/help/C/layers/flatten_image.html
 share/gimp/help/C/layers/index.html
@@ -1231,14 +1179,12 @@ share/gimp/tips/gimp_tips.txt
 share/gimp/unitrc
 share/gimp/user_install
 share/locale/cs/LC_MESSAGES/gimp-libgimp.mo
-share/locale/cs/LC_MESSAGES/gimp-perl.mo
 share/locale/cs/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/cs/LC_MESSAGES/gimp.mo
 share/locale/da/LC_MESSAGES/gimp-libgimp.mo
 share/locale/da/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/da/LC_MESSAGES/gimp.mo
 share/locale/de/LC_MESSAGES/gimp-libgimp.mo
-share/locale/de/LC_MESSAGES/gimp-perl.mo
 share/locale/de/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/de/LC_MESSAGES/gimp.mo
 share/locale/en_GB/LC_MESSAGES/gimp-libgimp.mo
@@ -1254,7 +1200,6 @@ share/locale/hu/LC_MESSAGES/gimp-libgimp.mo
 share/locale/hu/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/hu/LC_MESSAGES/gimp.mo
 share/locale/it/LC_MESSAGES/gimp-libgimp.mo
-share/locale/it/LC_MESSAGES/gimp-perl.mo
 share/locale/it/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/it/LC_MESSAGES/gimp.mo
 share/locale/ja/LC_MESSAGES/gimp-libgimp.mo
@@ -1267,7 +1212,6 @@ share/locale/nl/LC_MESSAGES/gimp-libgimp.mo
 share/locale/nl/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/nl/LC_MESSAGES/gimp.mo
 share/locale/no/LC_MESSAGES/gimp-libgimp.mo
-share/locale/no/LC_MESSAGES/gimp-perl.mo
 share/locale/no/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/no/LC_MESSAGES/gimp.mo
 share/locale/pl/LC_MESSAGES/gimp-libgimp.mo
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index da12d91e6ab..5f1de62d1ed 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -12,12 +12,14 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v${VERSION}/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/v${VERSION}/ \
 		ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/gimp/unstable/v${VERSION}/
 
-MAINTAINER=	erich@FreeBSD.org
+MAINTAINER=	vanilla@FreeBSD.org
 
+.if !defined (WITHOUT_PERL)
 BUILD_DEPENDS=	perldl:${PORTSDIR}/math/PDL \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
 RUN_DEPENDS=	perldl:${PORTSDIR}/math/PDL \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+.endif
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		aa.1:${PORTSDIR}/graphics/aalib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -27,7 +29,7 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		intl.1:${PORTSDIR}/devel/gettext
 
-VERSION=	1.1.17
+VERSION=	1.1.18
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
@@ -37,6 +39,9 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
+.if defined (WITHOUT_PERL)
+CONFIGURE_ARGS=	--disable-perl
+.endif
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GLIB_CONFIG="${GLIB_CONFIG}" \
 		GTK_CONFIG="${GTK_CONFIG}" \
@@ -49,12 +54,22 @@ MAN5=		gimprc.5
 WITH_GNOME=	yes
 .endif
 
+.if defined(WITHOUT_PERL)
+PLISTORIG=		${WRKDIR}/PLIST
+PLIST=			${PKGDIR}/PLIST
+.else
+PLISTORIG=		${WRKDIR}/PLIST.perl
+PLIST=			${SRCDIR}/PLIST.perl
+pre-fetch:
+	@${ECHO} -n "If you want to compile without perl support "
+	@${ECHO} "'make -DWITHOUT_PERL' instead"
+.endif
+
 .if defined(WITH_GNOME) && ${WITH_GNOME} == yes
 LIB_DEPENDS+=	gtkxmhtml.3:${PORTSDIR}/x11/gnomelibs
 .else
-PLIST=		${WRKDIR}/PLIST
 pre-install:
-	@${SED} -e '/helpbrowser/d' ${PKGDIR}/PLIST > ${PLIST}
+	@${SED} -e '/helpbrowser/d' ${PLISTORIG} > ${PLIST}
 .endif
 
 post-install:
diff --git a/graphics/gimp-devel/distinfo b/graphics/gimp-devel/distinfo
index 4bfc5bc43ff..75190c8cb8f 100644
--- a/graphics/gimp-devel/distinfo
+++ b/graphics/gimp-devel/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.1.17.tar.bz2) = 5599cb98b3a17324f2ad2682348a7df9
+MD5 (gimp-1.1.18.tar.bz2) = 472ef3f6e814250d31faa63e467b03b9
diff --git a/graphics/gimp-devel/files/gimp.setfont b/graphics/gimp-devel/files/gimp.setfont
index 487a91baf0e..34f91f9b5b2 100644
--- a/graphics/gimp-devel/files/gimp.setfont
+++ b/graphics/gimp-devel/files/gimp.setfont
@@ -7,6 +7,7 @@
 $progname = "gimp.setfont";
 $version = "Version 0.4 Feb 07 2000";
 
+$fontset{'chinese'} = "-*-helvetica-medium-r-normal--17-*-*-*-*-*-iso8859-1,-*-kai-medium-r-normal--16-*-*-*-*-*-big5-0";
 $fontset{'czech'} = "-*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-2";
 $fontset{'danish'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
 $fontset{'dutch'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
@@ -25,6 +26,7 @@ $fontset{'slovak'} = "-*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-2";
 $fontset{'swedish'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
 $fontset{'ukrainian'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-koi8-r";
 
+$locale{'chinese'} = "zh_TW.Big5";
 $locale{'czech'} = "cs_CZ.ISO8859-2";
 $locale{'danish'} = "da_DK.ISO_8859-1";
 $locale{'dutch'} = "nl_NL.ISO_8859-1";
@@ -50,6 +52,7 @@ Usage: gimp.setfont <language>
 
 ----------------------------------------------------------------
 [language]          [fontset]
+ chinese             -*-helvetica-(iso8859-1),-*-kai-(big5-0)
  czech               -*-fixed-(iso8859-2)
  danish              -*-helvetica-(iso8859-1)
  dutch               -*-helvetica-(iso8859-1)
diff --git a/graphics/gimp-devel/files/patch-ah b/graphics/gimp-devel/files/patch-ah
index 95af0d629b7..267a91fa0f0 100644
--- a/graphics/gimp-devel/files/patch-ah
+++ b/graphics/gimp-devel/files/patch-ah
@@ -1,5 +1,29 @@
---- configure.orig	Fri Feb 11 10:32:12 2000
-+++ configure	Sat Feb 19 13:51:36 2000
+--- configure.orig	Sat Mar  4 10:23:00 2000
++++ configure	Sun Apr  2 21:42:36 2000
+@@ -1494,8 +1494,8 @@
+ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+ DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
++${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh $lt_target \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+ 
+ # Reload cache, that may have been modified by ltconfig
+@@ -1509,10 +1509,10 @@
+ 
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL="/usr/local/bin/libtool"
+ 
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
 @@ -3480,7 +3480,11 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
@@ -22,7 +46,7 @@
  localedir='${prefix}/${DATADIRNAME}/locale'
  
  brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
-@@ -8561,10 +8565,6 @@
+@@ -8563,10 +8567,6 @@
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
    esac
  
diff --git a/graphics/gimp-devel/files/patch-ak b/graphics/gimp-devel/files/patch-ak
index 90837d0254f..ead5311df6f 100644
--- a/graphics/gimp-devel/files/patch-ak
+++ b/graphics/gimp-devel/files/patch-ak
@@ -1,11 +1,17 @@
---- libgimp/Makefile.in.orig	Fri Feb 11 10:42:12 2000
-+++ libgimp/Makefile.in	Sat Feb 19 15:18:59 2000
-@@ -211,7 +211,7 @@
+--- libgimp/Makefile.in.orig	Sat Mar  4 11:10:43 2000
++++ libgimp/Makefile.in	Sun Apr  2 22:40:29 2000
+@@ -209,11 +209,11 @@
+ gimpinclude_HEADERS =  	color_display.h			color_selector.h		gimp.h				gimpchainbutton.h		gimpcolorbutton.h		gimpcolorspace.h	        gimpcompat.h			gimpdialog.h			gimpenums.h			gimpenv.h			gimpexport.h			gimpfeatures.h			gimpfileselection.h		gimphelpui.h			gimplimits.h			gimpmath.h			gimpmatrix.h			gimpmenu.h			gimpmodule.h			gimppatheditor.h		gimppixmap.h			gimpquerybox.h			gimpsizeentry.h			gimpui.h			gimpunit.h              	gimpunitmenu.h          	gimpvector.h			gimpwidgets.h			gimpintl.h			parasite.h			parasiteF.h			parasiteP.h			parasiteio.h
  
- libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
+ 
+-libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
++libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
 -libgimp_la_LIBADD = $(GLIB_LIBS) -lm
 +libgimp_la_LIBADD = $(GTK_LIBS) -lm
  
- libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
+-libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
++libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
+ libgimpui_la_LIBADD = $(GTK_LIBS)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/graphics/gimp-devel/files/patch-ao b/graphics/gimp-devel/files/patch-ao
new file mode 100644
index 00000000000..e5f1d5a3677
--- /dev/null
+++ b/graphics/gimp-devel/files/patch-ao
@@ -0,0 +1,11 @@
+--- plug-ins/libgck/gck/Makefile.in.orig	Sun Apr  2 22:41:29 2000
++++ plug-ins/libgck/gck/Makefile.in	Sun Apr  2 22:41:37 2000
+@@ -191,7 +191,7 @@
+ gckinclude_HEADERS =  	gck.h
+ 
+ 
+-libgck_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
++libgck_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
+ 
+ INCLUDES =  	-I..				-I$(srcdir)/..			-I$(top_srcdir)			$(GTK_CFLAGS)			-I$(includedir)
diff --git a/graphics/gimp-devel/pkg-plist b/graphics/gimp-devel/pkg-plist
index 87f412103a6..43f671d40a8 100644
--- a/graphics/gimp-devel/pkg-plist
+++ b/graphics/gimp-devel/pkg-plist
@@ -3,14 +3,6 @@ bin/gimp-config
 bin/gimp.setfont
 bin/gimptool
 include/gck/gck.h
-include/gck/gckcolor.h
-include/gck/gckcommon.h
-include/gck/gckimage.h
-include/gck/gcklistbox.h
-include/gck/gckmath.h
-include/gck/gcktypes.h
-include/gck/gckui.h
-include/gck/gckvector.h
 include/libgimp/color_display.h
 include/libgimp/color_selector.h
 include/libgimp/gimp.h
@@ -32,31 +24,39 @@ include/libgimp/gimpmatrix.h
 include/libgimp/gimpmenu.h
 include/libgimp/gimpmodule.h
 include/libgimp/gimppatheditor.h
+include/libgimp/gimppixmap.h
 include/libgimp/gimpquerybox.h
 include/libgimp/gimpsizeentry.h
 include/libgimp/gimpui.h
 include/libgimp/gimpunit.h
 include/libgimp/gimpunitmenu.h
+include/libgimp/gimpvector.h
 include/libgimp/gimpwidgets.h
-include/libgimp/gserialize.h
 include/libgimp/parasite.h
 include/libgimp/parasiteF.h
 include/libgimp/parasiteP.h
 include/libgimp/parasiteio.h
 lib/libgck.a
+lib/libgck.la
 lib/libgck.so
-lib/libgck.so.17
+lib/libgck.so.18
 lib/libgimp.a
+lib/libgimp.la
 lib/libgimp.so
-lib/libgimp.so.17
+lib/libgimp.so.18
 lib/libgimpui.a
+lib/libgimpui.la
 lib/libgimpui.so
-lib/libgimpui.so.17
+lib/libgimpui.so.18
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+libexec/gimp/1.1/modules/libcdisplay_gamma.la
 libexec/gimp/1.1/modules/libcdisplay_gamma.so
+libexec/gimp/1.1/modules/libcolorsel_gtk.la
 libexec/gimp/1.1/modules/libcolorsel_gtk.so
+libexec/gimp/1.1/modules/libcolorsel_triangle.la
 libexec/gimp/1.1/modules/libcolorsel_triangle.so
+libexec/gimp/1.1/modules/libcolorsel_water.la
 libexec/gimp/1.1/modules/libcolorsel_water.so
 libexec/gimp/1.1/plug-ins/AlienMap
 libexec/gimp/1.1/plug-ins/AlienMap2
@@ -65,33 +65,22 @@ libexec/gimp/1.1/plug-ins/CML_explorer
 libexec/gimp/1.1/plug-ins/FractalExplorer
 libexec/gimp/1.1/plug-ins/Lighting
 libexec/gimp/1.1/plug-ins/MapObject
-libexec/gimp/1.1/plug-ins/PDB
-libexec/gimp/1.1/plug-ins/Perl-Server
 libexec/gimp/1.1/plug-ins/aa
 libexec/gimp/1.1/plug-ins/align_layers
-libexec/gimp/1.1/plug-ins/animate_cells
 libexec/gimp/1.1/plug-ins/animationplay
 libexec/gimp/1.1/plug-ins/animoptimize
 libexec/gimp/1.1/plug-ins/apply_lens
 libexec/gimp/1.1/plug-ins/autocrop
 libexec/gimp/1.1/plug-ins/autostretch_hsv
-libexec/gimp/1.1/plug-ins/avi
-libexec/gimp/1.1/plug-ins/blended2
 libexec/gimp/1.1/plug-ins/blinds
-libexec/gimp/1.1/plug-ins/blowinout
 libexec/gimp/1.1/plug-ins/blur
 libexec/gimp/1.1/plug-ins/bmp
-libexec/gimp/1.1/plug-ins/border
 libexec/gimp/1.1/plug-ins/borderaverage
-libexec/gimp/1.1/plug-ins/bricks
 libexec/gimp/1.1/plug-ins/bumpmap
-libexec/gimp/1.1/plug-ins/burst
 libexec/gimp/1.1/plug-ins/bz2
 libexec/gimp/1.1/plug-ins/c_astretch
-libexec/gimp/1.1/plug-ins/centerguide
 libexec/gimp/1.1/plug-ins/checkerboard
 libexec/gimp/1.1/plug-ins/color_enhance
-libexec/gimp/1.1/plug-ins/colorhtml
 libexec/gimp/1.1/plug-ins/colorify
 libexec/gimp/1.1/plug-ins/colortoalpha
 libexec/gimp/1.1/plug-ins/compose
@@ -99,7 +88,6 @@ libexec/gimp/1.1/plug-ins/convmatrix
 libexec/gimp/1.1/plug-ins/csource
 libexec/gimp/1.1/plug-ins/cubism
 libexec/gimp/1.1/plug-ins/curve_bend
-libexec/gimp/1.1/plug-ins/dataurl
 libexec/gimp/1.1/plug-ins/dbbrowser
 libexec/gimp/1.1/plug-ins/decompose
 libexec/gimp/1.1/plug-ins/deinterlace
@@ -108,23 +96,17 @@ libexec/gimp/1.1/plug-ins/despeckle
 libexec/gimp/1.1/plug-ins/destripe
 libexec/gimp/1.1/plug-ins/diffraction
 libexec/gimp/1.1/plug-ins/displace
-libexec/gimp/1.1/plug-ins/ditherize
 libexec/gimp/1.1/plug-ins/edge
 libexec/gimp/1.1/plug-ins/emboss
 libexec/gimp/1.1/plug-ins/engrave
 libexec/gimp/1.1/plug-ins/exchange
 libexec/gimp/1.1/plug-ins/faxg3
 libexec/gimp/1.1/plug-ins/film
-libexec/gimp/1.1/plug-ins/fire
-libexec/gimp/1.1/plug-ins/fit-text
 libexec/gimp/1.1/plug-ins/fits
 libexec/gimp/1.1/plug-ins/flame
 libexec/gimp/1.1/plug-ins/flarefx
-libexec/gimp/1.1/plug-ins/font_table
 libexec/gimp/1.1/plug-ins/fp
 libexec/gimp/1.1/plug-ins/fractaltrace
-libexec/gimp/1.1/plug-ins/frame_filter
-libexec/gimp/1.1/plug-ins/frame_reshuffle
 libexec/gimp/1.1/plug-ins/gap_decode_mpeg
 libexec/gimp/1.1/plug-ins/gap_filter
 libexec/gimp/1.1/plug-ins/gap_frontends
@@ -141,20 +123,13 @@ libexec/gimp/1.1/plug-ins/gfli
 libexec/gimp/1.1/plug-ins/gicon
 libexec/gimp/1.1/plug-ins/gif
 libexec/gimp/1.1/plug-ins/gifload
-libexec/gimp/1.1/plug-ins/gimpmagick
 libexec/gimp/1.1/plug-ins/gimpressionist
 libexec/gimp/1.1/plug-ins/glasstile
-libexec/gimp/1.1/plug-ins/glowing_steel
-libexec/gimp/1.1/plug-ins/goldenmean
-libexec/gimp/1.1/plug-ins/gouge
 libexec/gimp/1.1/plug-ins/gpb
 libexec/gimp/1.1/plug-ins/gqbist
 libexec/gimp/1.1/plug-ins/gradmap
 libexec/gimp/1.1/plug-ins/grid
 libexec/gimp/1.1/plug-ins/gtm
-libexec/gimp/1.1/plug-ins/guide_remove
-libexec/gimp/1.1/plug-ins/guidegrid
-libexec/gimp/1.1/plug-ins/guides_to_selection
 libexec/gimp/1.1/plug-ins/guillotine
 libexec/gimp/1.1/plug-ins/gz
 libexec/gimp/1.1/plug-ins/header
@@ -163,24 +138,17 @@ libexec/gimp/1.1/plug-ins/hot
 libexec/gimp/1.1/plug-ins/hrz
 libexec/gimp/1.1/plug-ins/ifscompose
 libexec/gimp/1.1/plug-ins/illusion
-libexec/gimp/1.1/plug-ins/image_tile
 libexec/gimp/1.1/plug-ins/imagemap
-libexec/gimp/1.1/plug-ins/innerbevel
 libexec/gimp/1.1/plug-ins/iwarp
 libexec/gimp/1.1/plug-ins/jigsaw
 libexec/gimp/1.1/plug-ins/jpeg
 libexec/gimp/1.1/plug-ins/laplace
-libexec/gimp/1.1/plug-ins/layerfuncs
 libexec/gimp/1.1/plug-ins/lic
-libexec/gimp/1.1/plug-ins/logulator
 libexec/gimp/1.1/plug-ins/mail
-libexec/gimp/1.1/plug-ins/map_to_gradient
 libexec/gimp/1.1/plug-ins/mapcolor
 libexec/gimp/1.1/plug-ins/max_rgb
 libexec/gimp/1.1/plug-ins/maze
 libexec/gimp/1.1/plug-ins/mblur
-libexec/gimp/1.1/plug-ins/miff
-libexec/gimp/1.1/plug-ins/mirrorsplit
 libexec/gimp/1.1/plug-ins/mosaic
 libexec/gimp/1.1/plug-ins/mpeg
 libexec/gimp/1.1/plug-ins/newsprint
@@ -191,43 +159,30 @@ libexec/gimp/1.1/plug-ins/nova
 libexec/gimp/1.1/plug-ins/oilify
 libexec/gimp/1.1/plug-ins/pagecurl
 libexec/gimp/1.1/plug-ins/papertile
-libexec/gimp/1.1/plug-ins/parasite-editor
 libexec/gimp/1.1/plug-ins/pat
 libexec/gimp/1.1/plug-ins/pcx
-libexec/gimp/1.1/plug-ins/perlcc
-libexec/gimp/1.1/plug-ins/perlotine
 libexec/gimp/1.1/plug-ins/pix
 libexec/gimp/1.1/plug-ins/pixelize
-libexec/gimp/1.1/plug-ins/pixelmap
 libexec/gimp/1.1/plug-ins/plasma
 libexec/gimp/1.1/plug-ins/plugindetails
 libexec/gimp/1.1/plug-ins/png
 libexec/gimp/1.1/plug-ins/pnm
 libexec/gimp/1.1/plug-ins/polar
-libexec/gimp/1.1/plug-ins/povray
-libexec/gimp/1.1/plug-ins/prep4gif
 libexec/gimp/1.1/plug-ins/print
 libexec/gimp/1.1/plug-ins/ps
 libexec/gimp/1.1/plug-ins/psd
 libexec/gimp/1.1/plug-ins/psp
-libexec/gimp/1.1/plug-ins/randomart1
-libexec/gimp/1.1/plug-ins/randomblends
 libexec/gimp/1.1/plug-ins/randomize
 libexec/gimp/1.1/plug-ins/rcm
-libexec/gimp/1.1/plug-ins/repdup
 libexec/gimp/1.1/plug-ins/ripple
 libexec/gimp/1.1/plug-ins/rotate
-libexec/gimp/1.1/plug-ins/roundrectsel
-libexec/gimp/1.1/plug-ins/roundsel
 libexec/gimp/1.1/plug-ins/sample_colorize
 libexec/gimp/1.1/plug-ins/scatter_hsv
-libexec/gimp/1.1/plug-ins/scratches
 libexec/gimp/1.1/plug-ins/screenshot
 libexec/gimp/1.1/plug-ins/script-fu
 libexec/gimp/1.1/plug-ins/sel2path
 libexec/gimp/1.1/plug-ins/sel_gauss
 libexec/gimp/1.1/plug-ins/semiflatten
-libexec/gimp/1.1/plug-ins/sethspin
 libexec/gimp/1.1/plug-ins/sgi
 libexec/gimp/1.1/plug-ins/sharpen
 libexec/gimp/1.1/plug-ins/shift
@@ -238,42 +193,30 @@ libexec/gimp/1.1/plug-ins/sobel
 libexec/gimp/1.1/plug-ins/sparkle
 libexec/gimp/1.1/plug-ins/spheredesigner
 libexec/gimp/1.1/plug-ins/spread
-libexec/gimp/1.1/plug-ins/stampify
-libexec/gimp/1.1/plug-ins/stamps
 libexec/gimp/1.1/plug-ins/struc
 libexec/gimp/1.1/plug-ins/sunras
-libexec/gimp/1.1/plug-ins/terral_text
-libexec/gimp/1.1/plug-ins/tex-to-float
 libexec/gimp/1.1/plug-ins/tga
 libexec/gimp/1.1/plug-ins/threshold_alpha
 libexec/gimp/1.1/plug-ins/tiff
 libexec/gimp/1.1/plug-ins/tile
 libexec/gimp/1.1/plug-ins/tileit
 libexec/gimp/1.1/plug-ins/tiler
-libexec/gimp/1.1/plug-ins/translogo
-libexec/gimp/1.1/plug-ins/triangle
+libexec/gimp/1.1/plug-ins/uniteditor
 libexec/gimp/1.1/plug-ins/unsharp
 libexec/gimp/1.1/plug-ins/url
 libexec/gimp/1.1/plug-ins/video
-libexec/gimp/1.1/plug-ins/view3d
 libexec/gimp/1.1/plug-ins/vinvert
 libexec/gimp/1.1/plug-ins/vpropagate
 libexec/gimp/1.1/plug-ins/warp
 libexec/gimp/1.1/plug-ins/waves
 libexec/gimp/1.1/plug-ins/webbrowser
-libexec/gimp/1.1/plug-ins/webify
 libexec/gimp/1.1/plug-ins/whirlpinch
 libexec/gimp/1.1/plug-ins/wind
-libexec/gimp/1.1/plug-ins/windify
 libexec/gimp/1.1/plug-ins/wmf
-libexec/gimp/1.1/plug-ins/xachlego
-libexec/gimp/1.1/plug-ins/xachshadow
-libexec/gimp/1.1/plug-ins/xachvision
 libexec/gimp/1.1/plug-ins/xbm
 libexec/gimp/1.1/plug-ins/xjt
 libexec/gimp/1.1/plug-ins/xpm
 libexec/gimp/1.1/plug-ins/xwd
-libexec/gimp/1.1/plug-ins/yinyang
 libexec/gimp/1.1/plug-ins/zealouscrop
 share/aclocal/gimp.m4
 share/gimp/brushes/10x10square.gbr
@@ -318,15 +261,16 @@ share/gimp/brushes/pixel.gbr
 share/gimp/brushes/thegimp.gbr
 share/gimp/brushes/vine.gih
 share/gimp/brushes/xcf.gbr
-share/gimp/devel-docs/html/libgimp/book1.html
 share/gimp/devel-docs/html/libgimp/gimpchainbutton.html
 share/gimp/devel-docs/html/libgimp/gimpcolorbutton.html
 share/gimp/devel-docs/html/libgimp/gimpdefinitions.html
 share/gimp/devel-docs/html/libgimp/gimpfileselection.html
 share/gimp/devel-docs/html/libgimp/gimpmodule.html
 share/gimp/devel-docs/html/libgimp/gimppatheditor.html
+share/gimp/devel-docs/html/libgimp/gimppixmap.html
 share/gimp/devel-docs/html/libgimp/gimpsizeentry.html
 share/gimp/devel-docs/html/libgimp/gimpunitmenu.html
+share/gimp/devel-docs/html/libgimp/index.html
 share/gimp/devel-docs/html/libgimp/libgimp-color-display.html
 share/gimp/devel-docs/html/libgimp/libgimp-color-selector.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimp.html
@@ -344,10 +288,11 @@ share/gimp/devel-docs/html/libgimp/libgimp-gimpmatrix.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpmenu.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpmodule.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpprotocol.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpquerybox.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpunit.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpvector.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpwidgets.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpwire.html
-share/gimp/devel-docs/html/libgimp/libgimp-gserialize.html
 share/gimp/devel-docs/html/libgimp/libgimp-parasite.html
 share/gimp/devel-docs/html/libgimp/libgimp-parasitef.html
 share/gimp/devel-docs/html/libgimp/libgimp-parasiteio.html
@@ -634,7 +579,6 @@ share/gimp/help/C/dialogs/indexed_palette.html
 share/gimp/help/C/dialogs/info_window.html
 share/gimp/help/C/dialogs/input_devices.html
 share/gimp/help/C/dialogs/layers/add_mask.html
-share/gimp/help/C/dialogs/layers/apply_mask.html
 share/gimp/help/C/dialogs/layers/edit_layer_attributes.html
 share/gimp/help/C/dialogs/layers/index.html
 share/gimp/help/C/dialogs/layers/layer_boundary_size.html
@@ -672,6 +616,7 @@ share/gimp/help/C/dialogs/preferences/session.html
 share/gimp/help/C/dialogs/really_close.html
 share/gimp/help/C/dialogs/really_quit.html
 share/gimp/help/C/dialogs/scale_image.html
+share/gimp/help/C/dialogs/scale_layer_warn.html
 share/gimp/help/C/dialogs/set_canvas_size.html
 share/gimp/help/C/dialogs/shrink_selection.html
 share/gimp/help/C/dialogs/tip_of_the_day.html
@@ -833,6 +778,7 @@ share/gimp/help/C/filters/tiff.html
 share/gimp/help/C/filters/tile.html
 share/gimp/help/C/filters/tileit.html
 share/gimp/help/C/filters/tiler.html
+share/gimp/help/C/filters/uniteditor.html
 share/gimp/help/C/filters/unsharp.html
 share/gimp/help/C/filters/url.html
 share/gimp/help/C/filters/video.html
@@ -925,10 +871,12 @@ share/gimp/help/C/index.html
 share/gimp/help/C/layers/add_alpha_channel.html
 share/gimp/help/C/layers/alpha_to_selection.html
 share/gimp/help/C/layers/anchor_layer.html
+share/gimp/help/C/layers/apply_mask.html
 @exec mkdir -p %D/share/gimp/help/C/layers
 @exec ln -sf %D/share/gimp/help/C/dialogs/layers %D/share/gimp/help/C/layers/dialogs
 @unexec rm -f %D/share/gimp/help/C/layers/dialogs
 share/gimp/help/C/layers/delete_layer.html
+share/gimp/help/C/layers/delete_mask.html
 share/gimp/help/C/layers/duplicate_layer.html
 share/gimp/help/C/layers/flatten_image.html
 share/gimp/help/C/layers/index.html
@@ -1231,14 +1179,12 @@ share/gimp/tips/gimp_tips.txt
 share/gimp/unitrc
 share/gimp/user_install
 share/locale/cs/LC_MESSAGES/gimp-libgimp.mo
-share/locale/cs/LC_MESSAGES/gimp-perl.mo
 share/locale/cs/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/cs/LC_MESSAGES/gimp.mo
 share/locale/da/LC_MESSAGES/gimp-libgimp.mo
 share/locale/da/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/da/LC_MESSAGES/gimp.mo
 share/locale/de/LC_MESSAGES/gimp-libgimp.mo
-share/locale/de/LC_MESSAGES/gimp-perl.mo
 share/locale/de/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/de/LC_MESSAGES/gimp.mo
 share/locale/en_GB/LC_MESSAGES/gimp-libgimp.mo
@@ -1254,7 +1200,6 @@ share/locale/hu/LC_MESSAGES/gimp-libgimp.mo
 share/locale/hu/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/hu/LC_MESSAGES/gimp.mo
 share/locale/it/LC_MESSAGES/gimp-libgimp.mo
-share/locale/it/LC_MESSAGES/gimp-perl.mo
 share/locale/it/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/it/LC_MESSAGES/gimp.mo
 share/locale/ja/LC_MESSAGES/gimp-libgimp.mo
@@ -1267,7 +1212,6 @@ share/locale/nl/LC_MESSAGES/gimp-libgimp.mo
 share/locale/nl/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/nl/LC_MESSAGES/gimp.mo
 share/locale/no/LC_MESSAGES/gimp-libgimp.mo
-share/locale/no/LC_MESSAGES/gimp-perl.mo
 share/locale/no/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/no/LC_MESSAGES/gimp.mo
 share/locale/pl/LC_MESSAGES/gimp-libgimp.mo
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index da12d91e6ab..5f1de62d1ed 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -12,12 +12,14 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v${VERSION}/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/v${VERSION}/ \
 		ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/gimp/unstable/v${VERSION}/
 
-MAINTAINER=	erich@FreeBSD.org
+MAINTAINER=	vanilla@FreeBSD.org
 
+.if !defined (WITHOUT_PERL)
 BUILD_DEPENDS=	perldl:${PORTSDIR}/math/PDL \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
 RUN_DEPENDS=	perldl:${PORTSDIR}/math/PDL \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+.endif
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		aa.1:${PORTSDIR}/graphics/aalib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -27,7 +29,7 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		intl.1:${PORTSDIR}/devel/gettext
 
-VERSION=	1.1.17
+VERSION=	1.1.18
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
@@ -37,6 +39,9 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
+.if defined (WITHOUT_PERL)
+CONFIGURE_ARGS=	--disable-perl
+.endif
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GLIB_CONFIG="${GLIB_CONFIG}" \
 		GTK_CONFIG="${GTK_CONFIG}" \
@@ -49,12 +54,22 @@ MAN5=		gimprc.5
 WITH_GNOME=	yes
 .endif
 
+.if defined(WITHOUT_PERL)
+PLISTORIG=		${WRKDIR}/PLIST
+PLIST=			${PKGDIR}/PLIST
+.else
+PLISTORIG=		${WRKDIR}/PLIST.perl
+PLIST=			${SRCDIR}/PLIST.perl
+pre-fetch:
+	@${ECHO} -n "If you want to compile without perl support "
+	@${ECHO} "'make -DWITHOUT_PERL' instead"
+.endif
+
 .if defined(WITH_GNOME) && ${WITH_GNOME} == yes
 LIB_DEPENDS+=	gtkxmhtml.3:${PORTSDIR}/x11/gnomelibs
 .else
-PLIST=		${WRKDIR}/PLIST
 pre-install:
-	@${SED} -e '/helpbrowser/d' ${PKGDIR}/PLIST > ${PLIST}
+	@${SED} -e '/helpbrowser/d' ${PLISTORIG} > ${PLIST}
 .endif
 
 post-install:
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index 4bfc5bc43ff..75190c8cb8f 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.1.17.tar.bz2) = 5599cb98b3a17324f2ad2682348a7df9
+MD5 (gimp-1.1.18.tar.bz2) = 472ef3f6e814250d31faa63e467b03b9
diff --git a/graphics/gimp/files/gimp.setfont b/graphics/gimp/files/gimp.setfont
index 487a91baf0e..34f91f9b5b2 100644
--- a/graphics/gimp/files/gimp.setfont
+++ b/graphics/gimp/files/gimp.setfont
@@ -7,6 +7,7 @@
 $progname = "gimp.setfont";
 $version = "Version 0.4 Feb 07 2000";
 
+$fontset{'chinese'} = "-*-helvetica-medium-r-normal--17-*-*-*-*-*-iso8859-1,-*-kai-medium-r-normal--16-*-*-*-*-*-big5-0";
 $fontset{'czech'} = "-*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-2";
 $fontset{'danish'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
 $fontset{'dutch'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
@@ -25,6 +26,7 @@ $fontset{'slovak'} = "-*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-2";
 $fontset{'swedish'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
 $fontset{'ukrainian'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-koi8-r";
 
+$locale{'chinese'} = "zh_TW.Big5";
 $locale{'czech'} = "cs_CZ.ISO8859-2";
 $locale{'danish'} = "da_DK.ISO_8859-1";
 $locale{'dutch'} = "nl_NL.ISO_8859-1";
@@ -50,6 +52,7 @@ Usage: gimp.setfont <language>
 
 ----------------------------------------------------------------
 [language]          [fontset]
+ chinese             -*-helvetica-(iso8859-1),-*-kai-(big5-0)
  czech               -*-fixed-(iso8859-2)
  danish              -*-helvetica-(iso8859-1)
  dutch               -*-helvetica-(iso8859-1)
diff --git a/graphics/gimp/files/patch-ah b/graphics/gimp/files/patch-ah
index 95af0d629b7..267a91fa0f0 100644
--- a/graphics/gimp/files/patch-ah
+++ b/graphics/gimp/files/patch-ah
@@ -1,5 +1,29 @@
---- configure.orig	Fri Feb 11 10:32:12 2000
-+++ configure	Sat Feb 19 13:51:36 2000
+--- configure.orig	Sat Mar  4 10:23:00 2000
++++ configure	Sun Apr  2 21:42:36 2000
+@@ -1494,8 +1494,8 @@
+ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+ DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
++${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh $lt_target \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+ 
+ # Reload cache, that may have been modified by ltconfig
+@@ -1509,10 +1509,10 @@
+ 
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL="/usr/local/bin/libtool"
+ 
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
 @@ -3480,7 +3480,11 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
@@ -22,7 +46,7 @@
  localedir='${prefix}/${DATADIRNAME}/locale'
  
  brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
-@@ -8561,10 +8565,6 @@
+@@ -8563,10 +8567,6 @@
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
    esac
  
diff --git a/graphics/gimp/files/patch-ak b/graphics/gimp/files/patch-ak
index 90837d0254f..ead5311df6f 100644
--- a/graphics/gimp/files/patch-ak
+++ b/graphics/gimp/files/patch-ak
@@ -1,11 +1,17 @@
---- libgimp/Makefile.in.orig	Fri Feb 11 10:42:12 2000
-+++ libgimp/Makefile.in	Sat Feb 19 15:18:59 2000
-@@ -211,7 +211,7 @@
+--- libgimp/Makefile.in.orig	Sat Mar  4 11:10:43 2000
++++ libgimp/Makefile.in	Sun Apr  2 22:40:29 2000
+@@ -209,11 +209,11 @@
+ gimpinclude_HEADERS =  	color_display.h			color_selector.h		gimp.h				gimpchainbutton.h		gimpcolorbutton.h		gimpcolorspace.h	        gimpcompat.h			gimpdialog.h			gimpenums.h			gimpenv.h			gimpexport.h			gimpfeatures.h			gimpfileselection.h		gimphelpui.h			gimplimits.h			gimpmath.h			gimpmatrix.h			gimpmenu.h			gimpmodule.h			gimppatheditor.h		gimppixmap.h			gimpquerybox.h			gimpsizeentry.h			gimpui.h			gimpunit.h              	gimpunitmenu.h          	gimpvector.h			gimpwidgets.h			gimpintl.h			parasite.h			parasiteF.h			parasiteP.h			parasiteio.h
  
- libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
+ 
+-libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
++libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
 -libgimp_la_LIBADD = $(GLIB_LIBS) -lm
 +libgimp_la_LIBADD = $(GTK_LIBS) -lm
  
- libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
+-libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
++libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
+ libgimpui_la_LIBADD = $(GTK_LIBS)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/graphics/gimp/files/patch-ao b/graphics/gimp/files/patch-ao
new file mode 100644
index 00000000000..e5f1d5a3677
--- /dev/null
+++ b/graphics/gimp/files/patch-ao
@@ -0,0 +1,11 @@
+--- plug-ins/libgck/gck/Makefile.in.orig	Sun Apr  2 22:41:29 2000
++++ plug-ins/libgck/gck/Makefile.in	Sun Apr  2 22:41:37 2000
+@@ -191,7 +191,7 @@
+ gckinclude_HEADERS =  	gck.h
+ 
+ 
+-libgck_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
++libgck_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
+ 
+ INCLUDES =  	-I..				-I$(srcdir)/..			-I$(top_srcdir)			$(GTK_CFLAGS)			-I$(includedir)
diff --git a/graphics/gimp/pkg-plist b/graphics/gimp/pkg-plist
index 87f412103a6..43f671d40a8 100644
--- a/graphics/gimp/pkg-plist
+++ b/graphics/gimp/pkg-plist
@@ -3,14 +3,6 @@ bin/gimp-config
 bin/gimp.setfont
 bin/gimptool
 include/gck/gck.h
-include/gck/gckcolor.h
-include/gck/gckcommon.h
-include/gck/gckimage.h
-include/gck/gcklistbox.h
-include/gck/gckmath.h
-include/gck/gcktypes.h
-include/gck/gckui.h
-include/gck/gckvector.h
 include/libgimp/color_display.h
 include/libgimp/color_selector.h
 include/libgimp/gimp.h
@@ -32,31 +24,39 @@ include/libgimp/gimpmatrix.h
 include/libgimp/gimpmenu.h
 include/libgimp/gimpmodule.h
 include/libgimp/gimppatheditor.h
+include/libgimp/gimppixmap.h
 include/libgimp/gimpquerybox.h
 include/libgimp/gimpsizeentry.h
 include/libgimp/gimpui.h
 include/libgimp/gimpunit.h
 include/libgimp/gimpunitmenu.h
+include/libgimp/gimpvector.h
 include/libgimp/gimpwidgets.h
-include/libgimp/gserialize.h
 include/libgimp/parasite.h
 include/libgimp/parasiteF.h
 include/libgimp/parasiteP.h
 include/libgimp/parasiteio.h
 lib/libgck.a
+lib/libgck.la
 lib/libgck.so
-lib/libgck.so.17
+lib/libgck.so.18
 lib/libgimp.a
+lib/libgimp.la
 lib/libgimp.so
-lib/libgimp.so.17
+lib/libgimp.so.18
 lib/libgimpui.a
+lib/libgimpui.la
 lib/libgimpui.so
-lib/libgimpui.so.17
+lib/libgimpui.so.18
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+libexec/gimp/1.1/modules/libcdisplay_gamma.la
 libexec/gimp/1.1/modules/libcdisplay_gamma.so
+libexec/gimp/1.1/modules/libcolorsel_gtk.la
 libexec/gimp/1.1/modules/libcolorsel_gtk.so
+libexec/gimp/1.1/modules/libcolorsel_triangle.la
 libexec/gimp/1.1/modules/libcolorsel_triangle.so
+libexec/gimp/1.1/modules/libcolorsel_water.la
 libexec/gimp/1.1/modules/libcolorsel_water.so
 libexec/gimp/1.1/plug-ins/AlienMap
 libexec/gimp/1.1/plug-ins/AlienMap2
@@ -65,33 +65,22 @@ libexec/gimp/1.1/plug-ins/CML_explorer
 libexec/gimp/1.1/plug-ins/FractalExplorer
 libexec/gimp/1.1/plug-ins/Lighting
 libexec/gimp/1.1/plug-ins/MapObject
-libexec/gimp/1.1/plug-ins/PDB
-libexec/gimp/1.1/plug-ins/Perl-Server
 libexec/gimp/1.1/plug-ins/aa
 libexec/gimp/1.1/plug-ins/align_layers
-libexec/gimp/1.1/plug-ins/animate_cells
 libexec/gimp/1.1/plug-ins/animationplay
 libexec/gimp/1.1/plug-ins/animoptimize
 libexec/gimp/1.1/plug-ins/apply_lens
 libexec/gimp/1.1/plug-ins/autocrop
 libexec/gimp/1.1/plug-ins/autostretch_hsv
-libexec/gimp/1.1/plug-ins/avi
-libexec/gimp/1.1/plug-ins/blended2
 libexec/gimp/1.1/plug-ins/blinds
-libexec/gimp/1.1/plug-ins/blowinout
 libexec/gimp/1.1/plug-ins/blur
 libexec/gimp/1.1/plug-ins/bmp
-libexec/gimp/1.1/plug-ins/border
 libexec/gimp/1.1/plug-ins/borderaverage
-libexec/gimp/1.1/plug-ins/bricks
 libexec/gimp/1.1/plug-ins/bumpmap
-libexec/gimp/1.1/plug-ins/burst
 libexec/gimp/1.1/plug-ins/bz2
 libexec/gimp/1.1/plug-ins/c_astretch
-libexec/gimp/1.1/plug-ins/centerguide
 libexec/gimp/1.1/plug-ins/checkerboard
 libexec/gimp/1.1/plug-ins/color_enhance
-libexec/gimp/1.1/plug-ins/colorhtml
 libexec/gimp/1.1/plug-ins/colorify
 libexec/gimp/1.1/plug-ins/colortoalpha
 libexec/gimp/1.1/plug-ins/compose
@@ -99,7 +88,6 @@ libexec/gimp/1.1/plug-ins/convmatrix
 libexec/gimp/1.1/plug-ins/csource
 libexec/gimp/1.1/plug-ins/cubism
 libexec/gimp/1.1/plug-ins/curve_bend
-libexec/gimp/1.1/plug-ins/dataurl
 libexec/gimp/1.1/plug-ins/dbbrowser
 libexec/gimp/1.1/plug-ins/decompose
 libexec/gimp/1.1/plug-ins/deinterlace
@@ -108,23 +96,17 @@ libexec/gimp/1.1/plug-ins/despeckle
 libexec/gimp/1.1/plug-ins/destripe
 libexec/gimp/1.1/plug-ins/diffraction
 libexec/gimp/1.1/plug-ins/displace
-libexec/gimp/1.1/plug-ins/ditherize
 libexec/gimp/1.1/plug-ins/edge
 libexec/gimp/1.1/plug-ins/emboss
 libexec/gimp/1.1/plug-ins/engrave
 libexec/gimp/1.1/plug-ins/exchange
 libexec/gimp/1.1/plug-ins/faxg3
 libexec/gimp/1.1/plug-ins/film
-libexec/gimp/1.1/plug-ins/fire
-libexec/gimp/1.1/plug-ins/fit-text
 libexec/gimp/1.1/plug-ins/fits
 libexec/gimp/1.1/plug-ins/flame
 libexec/gimp/1.1/plug-ins/flarefx
-libexec/gimp/1.1/plug-ins/font_table
 libexec/gimp/1.1/plug-ins/fp
 libexec/gimp/1.1/plug-ins/fractaltrace
-libexec/gimp/1.1/plug-ins/frame_filter
-libexec/gimp/1.1/plug-ins/frame_reshuffle
 libexec/gimp/1.1/plug-ins/gap_decode_mpeg
 libexec/gimp/1.1/plug-ins/gap_filter
 libexec/gimp/1.1/plug-ins/gap_frontends
@@ -141,20 +123,13 @@ libexec/gimp/1.1/plug-ins/gfli
 libexec/gimp/1.1/plug-ins/gicon
 libexec/gimp/1.1/plug-ins/gif
 libexec/gimp/1.1/plug-ins/gifload
-libexec/gimp/1.1/plug-ins/gimpmagick
 libexec/gimp/1.1/plug-ins/gimpressionist
 libexec/gimp/1.1/plug-ins/glasstile
-libexec/gimp/1.1/plug-ins/glowing_steel
-libexec/gimp/1.1/plug-ins/goldenmean
-libexec/gimp/1.1/plug-ins/gouge
 libexec/gimp/1.1/plug-ins/gpb
 libexec/gimp/1.1/plug-ins/gqbist
 libexec/gimp/1.1/plug-ins/gradmap
 libexec/gimp/1.1/plug-ins/grid
 libexec/gimp/1.1/plug-ins/gtm
-libexec/gimp/1.1/plug-ins/guide_remove
-libexec/gimp/1.1/plug-ins/guidegrid
-libexec/gimp/1.1/plug-ins/guides_to_selection
 libexec/gimp/1.1/plug-ins/guillotine
 libexec/gimp/1.1/plug-ins/gz
 libexec/gimp/1.1/plug-ins/header
@@ -163,24 +138,17 @@ libexec/gimp/1.1/plug-ins/hot
 libexec/gimp/1.1/plug-ins/hrz
 libexec/gimp/1.1/plug-ins/ifscompose
 libexec/gimp/1.1/plug-ins/illusion
-libexec/gimp/1.1/plug-ins/image_tile
 libexec/gimp/1.1/plug-ins/imagemap
-libexec/gimp/1.1/plug-ins/innerbevel
 libexec/gimp/1.1/plug-ins/iwarp
 libexec/gimp/1.1/plug-ins/jigsaw
 libexec/gimp/1.1/plug-ins/jpeg
 libexec/gimp/1.1/plug-ins/laplace
-libexec/gimp/1.1/plug-ins/layerfuncs
 libexec/gimp/1.1/plug-ins/lic
-libexec/gimp/1.1/plug-ins/logulator
 libexec/gimp/1.1/plug-ins/mail
-libexec/gimp/1.1/plug-ins/map_to_gradient
 libexec/gimp/1.1/plug-ins/mapcolor
 libexec/gimp/1.1/plug-ins/max_rgb
 libexec/gimp/1.1/plug-ins/maze
 libexec/gimp/1.1/plug-ins/mblur
-libexec/gimp/1.1/plug-ins/miff
-libexec/gimp/1.1/plug-ins/mirrorsplit
 libexec/gimp/1.1/plug-ins/mosaic
 libexec/gimp/1.1/plug-ins/mpeg
 libexec/gimp/1.1/plug-ins/newsprint
@@ -191,43 +159,30 @@ libexec/gimp/1.1/plug-ins/nova
 libexec/gimp/1.1/plug-ins/oilify
 libexec/gimp/1.1/plug-ins/pagecurl
 libexec/gimp/1.1/plug-ins/papertile
-libexec/gimp/1.1/plug-ins/parasite-editor
 libexec/gimp/1.1/plug-ins/pat
 libexec/gimp/1.1/plug-ins/pcx
-libexec/gimp/1.1/plug-ins/perlcc
-libexec/gimp/1.1/plug-ins/perlotine
 libexec/gimp/1.1/plug-ins/pix
 libexec/gimp/1.1/plug-ins/pixelize
-libexec/gimp/1.1/plug-ins/pixelmap
 libexec/gimp/1.1/plug-ins/plasma
 libexec/gimp/1.1/plug-ins/plugindetails
 libexec/gimp/1.1/plug-ins/png
 libexec/gimp/1.1/plug-ins/pnm
 libexec/gimp/1.1/plug-ins/polar
-libexec/gimp/1.1/plug-ins/povray
-libexec/gimp/1.1/plug-ins/prep4gif
 libexec/gimp/1.1/plug-ins/print
 libexec/gimp/1.1/plug-ins/ps
 libexec/gimp/1.1/plug-ins/psd
 libexec/gimp/1.1/plug-ins/psp
-libexec/gimp/1.1/plug-ins/randomart1
-libexec/gimp/1.1/plug-ins/randomblends
 libexec/gimp/1.1/plug-ins/randomize
 libexec/gimp/1.1/plug-ins/rcm
-libexec/gimp/1.1/plug-ins/repdup
 libexec/gimp/1.1/plug-ins/ripple
 libexec/gimp/1.1/plug-ins/rotate
-libexec/gimp/1.1/plug-ins/roundrectsel
-libexec/gimp/1.1/plug-ins/roundsel
 libexec/gimp/1.1/plug-ins/sample_colorize
 libexec/gimp/1.1/plug-ins/scatter_hsv
-libexec/gimp/1.1/plug-ins/scratches
 libexec/gimp/1.1/plug-ins/screenshot
 libexec/gimp/1.1/plug-ins/script-fu
 libexec/gimp/1.1/plug-ins/sel2path
 libexec/gimp/1.1/plug-ins/sel_gauss
 libexec/gimp/1.1/plug-ins/semiflatten
-libexec/gimp/1.1/plug-ins/sethspin
 libexec/gimp/1.1/plug-ins/sgi
 libexec/gimp/1.1/plug-ins/sharpen
 libexec/gimp/1.1/plug-ins/shift
@@ -238,42 +193,30 @@ libexec/gimp/1.1/plug-ins/sobel
 libexec/gimp/1.1/plug-ins/sparkle
 libexec/gimp/1.1/plug-ins/spheredesigner
 libexec/gimp/1.1/plug-ins/spread
-libexec/gimp/1.1/plug-ins/stampify
-libexec/gimp/1.1/plug-ins/stamps
 libexec/gimp/1.1/plug-ins/struc
 libexec/gimp/1.1/plug-ins/sunras
-libexec/gimp/1.1/plug-ins/terral_text
-libexec/gimp/1.1/plug-ins/tex-to-float
 libexec/gimp/1.1/plug-ins/tga
 libexec/gimp/1.1/plug-ins/threshold_alpha
 libexec/gimp/1.1/plug-ins/tiff
 libexec/gimp/1.1/plug-ins/tile
 libexec/gimp/1.1/plug-ins/tileit
 libexec/gimp/1.1/plug-ins/tiler
-libexec/gimp/1.1/plug-ins/translogo
-libexec/gimp/1.1/plug-ins/triangle
+libexec/gimp/1.1/plug-ins/uniteditor
 libexec/gimp/1.1/plug-ins/unsharp
 libexec/gimp/1.1/plug-ins/url
 libexec/gimp/1.1/plug-ins/video
-libexec/gimp/1.1/plug-ins/view3d
 libexec/gimp/1.1/plug-ins/vinvert
 libexec/gimp/1.1/plug-ins/vpropagate
 libexec/gimp/1.1/plug-ins/warp
 libexec/gimp/1.1/plug-ins/waves
 libexec/gimp/1.1/plug-ins/webbrowser
-libexec/gimp/1.1/plug-ins/webify
 libexec/gimp/1.1/plug-ins/whirlpinch
 libexec/gimp/1.1/plug-ins/wind
-libexec/gimp/1.1/plug-ins/windify
 libexec/gimp/1.1/plug-ins/wmf
-libexec/gimp/1.1/plug-ins/xachlego
-libexec/gimp/1.1/plug-ins/xachshadow
-libexec/gimp/1.1/plug-ins/xachvision
 libexec/gimp/1.1/plug-ins/xbm
 libexec/gimp/1.1/plug-ins/xjt
 libexec/gimp/1.1/plug-ins/xpm
 libexec/gimp/1.1/plug-ins/xwd
-libexec/gimp/1.1/plug-ins/yinyang
 libexec/gimp/1.1/plug-ins/zealouscrop
 share/aclocal/gimp.m4
 share/gimp/brushes/10x10square.gbr
@@ -318,15 +261,16 @@ share/gimp/brushes/pixel.gbr
 share/gimp/brushes/thegimp.gbr
 share/gimp/brushes/vine.gih
 share/gimp/brushes/xcf.gbr
-share/gimp/devel-docs/html/libgimp/book1.html
 share/gimp/devel-docs/html/libgimp/gimpchainbutton.html
 share/gimp/devel-docs/html/libgimp/gimpcolorbutton.html
 share/gimp/devel-docs/html/libgimp/gimpdefinitions.html
 share/gimp/devel-docs/html/libgimp/gimpfileselection.html
 share/gimp/devel-docs/html/libgimp/gimpmodule.html
 share/gimp/devel-docs/html/libgimp/gimppatheditor.html
+share/gimp/devel-docs/html/libgimp/gimppixmap.html
 share/gimp/devel-docs/html/libgimp/gimpsizeentry.html
 share/gimp/devel-docs/html/libgimp/gimpunitmenu.html
+share/gimp/devel-docs/html/libgimp/index.html
 share/gimp/devel-docs/html/libgimp/libgimp-color-display.html
 share/gimp/devel-docs/html/libgimp/libgimp-color-selector.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimp.html
@@ -344,10 +288,11 @@ share/gimp/devel-docs/html/libgimp/libgimp-gimpmatrix.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpmenu.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpmodule.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpprotocol.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpquerybox.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpunit.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpvector.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpwidgets.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpwire.html
-share/gimp/devel-docs/html/libgimp/libgimp-gserialize.html
 share/gimp/devel-docs/html/libgimp/libgimp-parasite.html
 share/gimp/devel-docs/html/libgimp/libgimp-parasitef.html
 share/gimp/devel-docs/html/libgimp/libgimp-parasiteio.html
@@ -634,7 +579,6 @@ share/gimp/help/C/dialogs/indexed_palette.html
 share/gimp/help/C/dialogs/info_window.html
 share/gimp/help/C/dialogs/input_devices.html
 share/gimp/help/C/dialogs/layers/add_mask.html
-share/gimp/help/C/dialogs/layers/apply_mask.html
 share/gimp/help/C/dialogs/layers/edit_layer_attributes.html
 share/gimp/help/C/dialogs/layers/index.html
 share/gimp/help/C/dialogs/layers/layer_boundary_size.html
@@ -672,6 +616,7 @@ share/gimp/help/C/dialogs/preferences/session.html
 share/gimp/help/C/dialogs/really_close.html
 share/gimp/help/C/dialogs/really_quit.html
 share/gimp/help/C/dialogs/scale_image.html
+share/gimp/help/C/dialogs/scale_layer_warn.html
 share/gimp/help/C/dialogs/set_canvas_size.html
 share/gimp/help/C/dialogs/shrink_selection.html
 share/gimp/help/C/dialogs/tip_of_the_day.html
@@ -833,6 +778,7 @@ share/gimp/help/C/filters/tiff.html
 share/gimp/help/C/filters/tile.html
 share/gimp/help/C/filters/tileit.html
 share/gimp/help/C/filters/tiler.html
+share/gimp/help/C/filters/uniteditor.html
 share/gimp/help/C/filters/unsharp.html
 share/gimp/help/C/filters/url.html
 share/gimp/help/C/filters/video.html
@@ -925,10 +871,12 @@ share/gimp/help/C/index.html
 share/gimp/help/C/layers/add_alpha_channel.html
 share/gimp/help/C/layers/alpha_to_selection.html
 share/gimp/help/C/layers/anchor_layer.html
+share/gimp/help/C/layers/apply_mask.html
 @exec mkdir -p %D/share/gimp/help/C/layers
 @exec ln -sf %D/share/gimp/help/C/dialogs/layers %D/share/gimp/help/C/layers/dialogs
 @unexec rm -f %D/share/gimp/help/C/layers/dialogs
 share/gimp/help/C/layers/delete_layer.html
+share/gimp/help/C/layers/delete_mask.html
 share/gimp/help/C/layers/duplicate_layer.html
 share/gimp/help/C/layers/flatten_image.html
 share/gimp/help/C/layers/index.html
@@ -1231,14 +1179,12 @@ share/gimp/tips/gimp_tips.txt
 share/gimp/unitrc
 share/gimp/user_install
 share/locale/cs/LC_MESSAGES/gimp-libgimp.mo
-share/locale/cs/LC_MESSAGES/gimp-perl.mo
 share/locale/cs/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/cs/LC_MESSAGES/gimp.mo
 share/locale/da/LC_MESSAGES/gimp-libgimp.mo
 share/locale/da/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/da/LC_MESSAGES/gimp.mo
 share/locale/de/LC_MESSAGES/gimp-libgimp.mo
-share/locale/de/LC_MESSAGES/gimp-perl.mo
 share/locale/de/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/de/LC_MESSAGES/gimp.mo
 share/locale/en_GB/LC_MESSAGES/gimp-libgimp.mo
@@ -1254,7 +1200,6 @@ share/locale/hu/LC_MESSAGES/gimp-libgimp.mo
 share/locale/hu/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/hu/LC_MESSAGES/gimp.mo
 share/locale/it/LC_MESSAGES/gimp-libgimp.mo
-share/locale/it/LC_MESSAGES/gimp-perl.mo
 share/locale/it/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/it/LC_MESSAGES/gimp.mo
 share/locale/ja/LC_MESSAGES/gimp-libgimp.mo
@@ -1267,7 +1212,6 @@ share/locale/nl/LC_MESSAGES/gimp-libgimp.mo
 share/locale/nl/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/nl/LC_MESSAGES/gimp.mo
 share/locale/no/LC_MESSAGES/gimp-libgimp.mo
-share/locale/no/LC_MESSAGES/gimp-perl.mo
 share/locale/no/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/no/LC_MESSAGES/gimp.mo
 share/locale/pl/LC_MESSAGES/gimp-libgimp.mo
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index da12d91e6ab..5f1de62d1ed 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -12,12 +12,14 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v${VERSION}/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/v${VERSION}/ \
 		ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/gimp/unstable/v${VERSION}/
 
-MAINTAINER=	erich@FreeBSD.org
+MAINTAINER=	vanilla@FreeBSD.org
 
+.if !defined (WITHOUT_PERL)
 BUILD_DEPENDS=	perldl:${PORTSDIR}/math/PDL \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
 RUN_DEPENDS=	perldl:${PORTSDIR}/math/PDL \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+.endif
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		aa.1:${PORTSDIR}/graphics/aalib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -27,7 +29,7 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		intl.1:${PORTSDIR}/devel/gettext
 
-VERSION=	1.1.17
+VERSION=	1.1.18
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
@@ -37,6 +39,9 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
+.if defined (WITHOUT_PERL)
+CONFIGURE_ARGS=	--disable-perl
+.endif
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GLIB_CONFIG="${GLIB_CONFIG}" \
 		GTK_CONFIG="${GTK_CONFIG}" \
@@ -49,12 +54,22 @@ MAN5=		gimprc.5
 WITH_GNOME=	yes
 .endif
 
+.if defined(WITHOUT_PERL)
+PLISTORIG=		${WRKDIR}/PLIST
+PLIST=			${PKGDIR}/PLIST
+.else
+PLISTORIG=		${WRKDIR}/PLIST.perl
+PLIST=			${SRCDIR}/PLIST.perl
+pre-fetch:
+	@${ECHO} -n "If you want to compile without perl support "
+	@${ECHO} "'make -DWITHOUT_PERL' instead"
+.endif
+
 .if defined(WITH_GNOME) && ${WITH_GNOME} == yes
 LIB_DEPENDS+=	gtkxmhtml.3:${PORTSDIR}/x11/gnomelibs
 .else
-PLIST=		${WRKDIR}/PLIST
 pre-install:
-	@${SED} -e '/helpbrowser/d' ${PKGDIR}/PLIST > ${PLIST}
+	@${SED} -e '/helpbrowser/d' ${PLISTORIG} > ${PLIST}
 .endif
 
 post-install:
diff --git a/graphics/gimp1/distinfo b/graphics/gimp1/distinfo
index 4bfc5bc43ff..75190c8cb8f 100644
--- a/graphics/gimp1/distinfo
+++ b/graphics/gimp1/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.1.17.tar.bz2) = 5599cb98b3a17324f2ad2682348a7df9
+MD5 (gimp-1.1.18.tar.bz2) = 472ef3f6e814250d31faa63e467b03b9
diff --git a/graphics/gimp1/files/gimp.setfont b/graphics/gimp1/files/gimp.setfont
index 487a91baf0e..34f91f9b5b2 100644
--- a/graphics/gimp1/files/gimp.setfont
+++ b/graphics/gimp1/files/gimp.setfont
@@ -7,6 +7,7 @@
 $progname = "gimp.setfont";
 $version = "Version 0.4 Feb 07 2000";
 
+$fontset{'chinese'} = "-*-helvetica-medium-r-normal--17-*-*-*-*-*-iso8859-1,-*-kai-medium-r-normal--16-*-*-*-*-*-big5-0";
 $fontset{'czech'} = "-*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-2";
 $fontset{'danish'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
 $fontset{'dutch'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
@@ -25,6 +26,7 @@ $fontset{'slovak'} = "-*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-2";
 $fontset{'swedish'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
 $fontset{'ukrainian'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-koi8-r";
 
+$locale{'chinese'} = "zh_TW.Big5";
 $locale{'czech'} = "cs_CZ.ISO8859-2";
 $locale{'danish'} = "da_DK.ISO_8859-1";
 $locale{'dutch'} = "nl_NL.ISO_8859-1";
@@ -50,6 +52,7 @@ Usage: gimp.setfont <language>
 
 ----------------------------------------------------------------
 [language]          [fontset]
+ chinese             -*-helvetica-(iso8859-1),-*-kai-(big5-0)
  czech               -*-fixed-(iso8859-2)
  danish              -*-helvetica-(iso8859-1)
  dutch               -*-helvetica-(iso8859-1)
diff --git a/graphics/gimp1/files/patch-ah b/graphics/gimp1/files/patch-ah
index 95af0d629b7..267a91fa0f0 100644
--- a/graphics/gimp1/files/patch-ah
+++ b/graphics/gimp1/files/patch-ah
@@ -1,5 +1,29 @@
---- configure.orig	Fri Feb 11 10:32:12 2000
-+++ configure	Sat Feb 19 13:51:36 2000
+--- configure.orig	Sat Mar  4 10:23:00 2000
++++ configure	Sun Apr  2 21:42:36 2000
+@@ -1494,8 +1494,8 @@
+ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+ DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
++${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh $lt_target \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+ 
+ # Reload cache, that may have been modified by ltconfig
+@@ -1509,10 +1509,10 @@
+ 
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL="/usr/local/bin/libtool"
+ 
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
 @@ -3480,7 +3480,11 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
@@ -22,7 +46,7 @@
  localedir='${prefix}/${DATADIRNAME}/locale'
  
  brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
-@@ -8561,10 +8565,6 @@
+@@ -8563,10 +8567,6 @@
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
    esac
  
diff --git a/graphics/gimp1/files/patch-ak b/graphics/gimp1/files/patch-ak
index 90837d0254f..ead5311df6f 100644
--- a/graphics/gimp1/files/patch-ak
+++ b/graphics/gimp1/files/patch-ak
@@ -1,11 +1,17 @@
---- libgimp/Makefile.in.orig	Fri Feb 11 10:42:12 2000
-+++ libgimp/Makefile.in	Sat Feb 19 15:18:59 2000
-@@ -211,7 +211,7 @@
+--- libgimp/Makefile.in.orig	Sat Mar  4 11:10:43 2000
++++ libgimp/Makefile.in	Sun Apr  2 22:40:29 2000
+@@ -209,11 +209,11 @@
+ gimpinclude_HEADERS =  	color_display.h			color_selector.h		gimp.h				gimpchainbutton.h		gimpcolorbutton.h		gimpcolorspace.h	        gimpcompat.h			gimpdialog.h			gimpenums.h			gimpenv.h			gimpexport.h			gimpfeatures.h			gimpfileselection.h		gimphelpui.h			gimplimits.h			gimpmath.h			gimpmatrix.h			gimpmenu.h			gimpmodule.h			gimppatheditor.h		gimppixmap.h			gimpquerybox.h			gimpsizeentry.h			gimpui.h			gimpunit.h              	gimpunitmenu.h          	gimpvector.h			gimpwidgets.h			gimpintl.h			parasite.h			parasiteF.h			parasiteP.h			parasiteio.h
  
- libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
+ 
+-libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
++libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
 -libgimp_la_LIBADD = $(GLIB_LIBS) -lm
 +libgimp_la_LIBADD = $(GTK_LIBS) -lm
  
- libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
+-libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
++libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
+ libgimpui_la_LIBADD = $(GTK_LIBS)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/graphics/gimp1/files/patch-ao b/graphics/gimp1/files/patch-ao
new file mode 100644
index 00000000000..e5f1d5a3677
--- /dev/null
+++ b/graphics/gimp1/files/patch-ao
@@ -0,0 +1,11 @@
+--- plug-ins/libgck/gck/Makefile.in.orig	Sun Apr  2 22:41:29 2000
++++ plug-ins/libgck/gck/Makefile.in	Sun Apr  2 22:41:37 2000
+@@ -191,7 +191,7 @@
+ gckinclude_HEADERS =  	gck.h
+ 
+ 
+-libgck_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
++libgck_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
+ 
+ INCLUDES =  	-I..				-I$(srcdir)/..			-I$(top_srcdir)			$(GTK_CFLAGS)			-I$(includedir)
diff --git a/graphics/gimp1/pkg-plist b/graphics/gimp1/pkg-plist
index 87f412103a6..43f671d40a8 100644
--- a/graphics/gimp1/pkg-plist
+++ b/graphics/gimp1/pkg-plist
@@ -3,14 +3,6 @@ bin/gimp-config
 bin/gimp.setfont
 bin/gimptool
 include/gck/gck.h
-include/gck/gckcolor.h
-include/gck/gckcommon.h
-include/gck/gckimage.h
-include/gck/gcklistbox.h
-include/gck/gckmath.h
-include/gck/gcktypes.h
-include/gck/gckui.h
-include/gck/gckvector.h
 include/libgimp/color_display.h
 include/libgimp/color_selector.h
 include/libgimp/gimp.h
@@ -32,31 +24,39 @@ include/libgimp/gimpmatrix.h
 include/libgimp/gimpmenu.h
 include/libgimp/gimpmodule.h
 include/libgimp/gimppatheditor.h
+include/libgimp/gimppixmap.h
 include/libgimp/gimpquerybox.h
 include/libgimp/gimpsizeentry.h
 include/libgimp/gimpui.h
 include/libgimp/gimpunit.h
 include/libgimp/gimpunitmenu.h
+include/libgimp/gimpvector.h
 include/libgimp/gimpwidgets.h
-include/libgimp/gserialize.h
 include/libgimp/parasite.h
 include/libgimp/parasiteF.h
 include/libgimp/parasiteP.h
 include/libgimp/parasiteio.h
 lib/libgck.a
+lib/libgck.la
 lib/libgck.so
-lib/libgck.so.17
+lib/libgck.so.18
 lib/libgimp.a
+lib/libgimp.la
 lib/libgimp.so
-lib/libgimp.so.17
+lib/libgimp.so.18
 lib/libgimpui.a
+lib/libgimpui.la
 lib/libgimpui.so
-lib/libgimpui.so.17
+lib/libgimpui.so.18
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+libexec/gimp/1.1/modules/libcdisplay_gamma.la
 libexec/gimp/1.1/modules/libcdisplay_gamma.so
+libexec/gimp/1.1/modules/libcolorsel_gtk.la
 libexec/gimp/1.1/modules/libcolorsel_gtk.so
+libexec/gimp/1.1/modules/libcolorsel_triangle.la
 libexec/gimp/1.1/modules/libcolorsel_triangle.so
+libexec/gimp/1.1/modules/libcolorsel_water.la
 libexec/gimp/1.1/modules/libcolorsel_water.so
 libexec/gimp/1.1/plug-ins/AlienMap
 libexec/gimp/1.1/plug-ins/AlienMap2
@@ -65,33 +65,22 @@ libexec/gimp/1.1/plug-ins/CML_explorer
 libexec/gimp/1.1/plug-ins/FractalExplorer
 libexec/gimp/1.1/plug-ins/Lighting
 libexec/gimp/1.1/plug-ins/MapObject
-libexec/gimp/1.1/plug-ins/PDB
-libexec/gimp/1.1/plug-ins/Perl-Server
 libexec/gimp/1.1/plug-ins/aa
 libexec/gimp/1.1/plug-ins/align_layers
-libexec/gimp/1.1/plug-ins/animate_cells
 libexec/gimp/1.1/plug-ins/animationplay
 libexec/gimp/1.1/plug-ins/animoptimize
 libexec/gimp/1.1/plug-ins/apply_lens
 libexec/gimp/1.1/plug-ins/autocrop
 libexec/gimp/1.1/plug-ins/autostretch_hsv
-libexec/gimp/1.1/plug-ins/avi
-libexec/gimp/1.1/plug-ins/blended2
 libexec/gimp/1.1/plug-ins/blinds
-libexec/gimp/1.1/plug-ins/blowinout
 libexec/gimp/1.1/plug-ins/blur
 libexec/gimp/1.1/plug-ins/bmp
-libexec/gimp/1.1/plug-ins/border
 libexec/gimp/1.1/plug-ins/borderaverage
-libexec/gimp/1.1/plug-ins/bricks
 libexec/gimp/1.1/plug-ins/bumpmap
-libexec/gimp/1.1/plug-ins/burst
 libexec/gimp/1.1/plug-ins/bz2
 libexec/gimp/1.1/plug-ins/c_astretch
-libexec/gimp/1.1/plug-ins/centerguide
 libexec/gimp/1.1/plug-ins/checkerboard
 libexec/gimp/1.1/plug-ins/color_enhance
-libexec/gimp/1.1/plug-ins/colorhtml
 libexec/gimp/1.1/plug-ins/colorify
 libexec/gimp/1.1/plug-ins/colortoalpha
 libexec/gimp/1.1/plug-ins/compose
@@ -99,7 +88,6 @@ libexec/gimp/1.1/plug-ins/convmatrix
 libexec/gimp/1.1/plug-ins/csource
 libexec/gimp/1.1/plug-ins/cubism
 libexec/gimp/1.1/plug-ins/curve_bend
-libexec/gimp/1.1/plug-ins/dataurl
 libexec/gimp/1.1/plug-ins/dbbrowser
 libexec/gimp/1.1/plug-ins/decompose
 libexec/gimp/1.1/plug-ins/deinterlace
@@ -108,23 +96,17 @@ libexec/gimp/1.1/plug-ins/despeckle
 libexec/gimp/1.1/plug-ins/destripe
 libexec/gimp/1.1/plug-ins/diffraction
 libexec/gimp/1.1/plug-ins/displace
-libexec/gimp/1.1/plug-ins/ditherize
 libexec/gimp/1.1/plug-ins/edge
 libexec/gimp/1.1/plug-ins/emboss
 libexec/gimp/1.1/plug-ins/engrave
 libexec/gimp/1.1/plug-ins/exchange
 libexec/gimp/1.1/plug-ins/faxg3
 libexec/gimp/1.1/plug-ins/film
-libexec/gimp/1.1/plug-ins/fire
-libexec/gimp/1.1/plug-ins/fit-text
 libexec/gimp/1.1/plug-ins/fits
 libexec/gimp/1.1/plug-ins/flame
 libexec/gimp/1.1/plug-ins/flarefx
-libexec/gimp/1.1/plug-ins/font_table
 libexec/gimp/1.1/plug-ins/fp
 libexec/gimp/1.1/plug-ins/fractaltrace
-libexec/gimp/1.1/plug-ins/frame_filter
-libexec/gimp/1.1/plug-ins/frame_reshuffle
 libexec/gimp/1.1/plug-ins/gap_decode_mpeg
 libexec/gimp/1.1/plug-ins/gap_filter
 libexec/gimp/1.1/plug-ins/gap_frontends
@@ -141,20 +123,13 @@ libexec/gimp/1.1/plug-ins/gfli
 libexec/gimp/1.1/plug-ins/gicon
 libexec/gimp/1.1/plug-ins/gif
 libexec/gimp/1.1/plug-ins/gifload
-libexec/gimp/1.1/plug-ins/gimpmagick
 libexec/gimp/1.1/plug-ins/gimpressionist
 libexec/gimp/1.1/plug-ins/glasstile
-libexec/gimp/1.1/plug-ins/glowing_steel
-libexec/gimp/1.1/plug-ins/goldenmean
-libexec/gimp/1.1/plug-ins/gouge
 libexec/gimp/1.1/plug-ins/gpb
 libexec/gimp/1.1/plug-ins/gqbist
 libexec/gimp/1.1/plug-ins/gradmap
 libexec/gimp/1.1/plug-ins/grid
 libexec/gimp/1.1/plug-ins/gtm
-libexec/gimp/1.1/plug-ins/guide_remove
-libexec/gimp/1.1/plug-ins/guidegrid
-libexec/gimp/1.1/plug-ins/guides_to_selection
 libexec/gimp/1.1/plug-ins/guillotine
 libexec/gimp/1.1/plug-ins/gz
 libexec/gimp/1.1/plug-ins/header
@@ -163,24 +138,17 @@ libexec/gimp/1.1/plug-ins/hot
 libexec/gimp/1.1/plug-ins/hrz
 libexec/gimp/1.1/plug-ins/ifscompose
 libexec/gimp/1.1/plug-ins/illusion
-libexec/gimp/1.1/plug-ins/image_tile
 libexec/gimp/1.1/plug-ins/imagemap
-libexec/gimp/1.1/plug-ins/innerbevel
 libexec/gimp/1.1/plug-ins/iwarp
 libexec/gimp/1.1/plug-ins/jigsaw
 libexec/gimp/1.1/plug-ins/jpeg
 libexec/gimp/1.1/plug-ins/laplace
-libexec/gimp/1.1/plug-ins/layerfuncs
 libexec/gimp/1.1/plug-ins/lic
-libexec/gimp/1.1/plug-ins/logulator
 libexec/gimp/1.1/plug-ins/mail
-libexec/gimp/1.1/plug-ins/map_to_gradient
 libexec/gimp/1.1/plug-ins/mapcolor
 libexec/gimp/1.1/plug-ins/max_rgb
 libexec/gimp/1.1/plug-ins/maze
 libexec/gimp/1.1/plug-ins/mblur
-libexec/gimp/1.1/plug-ins/miff
-libexec/gimp/1.1/plug-ins/mirrorsplit
 libexec/gimp/1.1/plug-ins/mosaic
 libexec/gimp/1.1/plug-ins/mpeg
 libexec/gimp/1.1/plug-ins/newsprint
@@ -191,43 +159,30 @@ libexec/gimp/1.1/plug-ins/nova
 libexec/gimp/1.1/plug-ins/oilify
 libexec/gimp/1.1/plug-ins/pagecurl
 libexec/gimp/1.1/plug-ins/papertile
-libexec/gimp/1.1/plug-ins/parasite-editor
 libexec/gimp/1.1/plug-ins/pat
 libexec/gimp/1.1/plug-ins/pcx
-libexec/gimp/1.1/plug-ins/perlcc
-libexec/gimp/1.1/plug-ins/perlotine
 libexec/gimp/1.1/plug-ins/pix
 libexec/gimp/1.1/plug-ins/pixelize
-libexec/gimp/1.1/plug-ins/pixelmap
 libexec/gimp/1.1/plug-ins/plasma
 libexec/gimp/1.1/plug-ins/plugindetails
 libexec/gimp/1.1/plug-ins/png
 libexec/gimp/1.1/plug-ins/pnm
 libexec/gimp/1.1/plug-ins/polar
-libexec/gimp/1.1/plug-ins/povray
-libexec/gimp/1.1/plug-ins/prep4gif
 libexec/gimp/1.1/plug-ins/print
 libexec/gimp/1.1/plug-ins/ps
 libexec/gimp/1.1/plug-ins/psd
 libexec/gimp/1.1/plug-ins/psp
-libexec/gimp/1.1/plug-ins/randomart1
-libexec/gimp/1.1/plug-ins/randomblends
 libexec/gimp/1.1/plug-ins/randomize
 libexec/gimp/1.1/plug-ins/rcm
-libexec/gimp/1.1/plug-ins/repdup
 libexec/gimp/1.1/plug-ins/ripple
 libexec/gimp/1.1/plug-ins/rotate
-libexec/gimp/1.1/plug-ins/roundrectsel
-libexec/gimp/1.1/plug-ins/roundsel
 libexec/gimp/1.1/plug-ins/sample_colorize
 libexec/gimp/1.1/plug-ins/scatter_hsv
-libexec/gimp/1.1/plug-ins/scratches
 libexec/gimp/1.1/plug-ins/screenshot
 libexec/gimp/1.1/plug-ins/script-fu
 libexec/gimp/1.1/plug-ins/sel2path
 libexec/gimp/1.1/plug-ins/sel_gauss
 libexec/gimp/1.1/plug-ins/semiflatten
-libexec/gimp/1.1/plug-ins/sethspin
 libexec/gimp/1.1/plug-ins/sgi
 libexec/gimp/1.1/plug-ins/sharpen
 libexec/gimp/1.1/plug-ins/shift
@@ -238,42 +193,30 @@ libexec/gimp/1.1/plug-ins/sobel
 libexec/gimp/1.1/plug-ins/sparkle
 libexec/gimp/1.1/plug-ins/spheredesigner
 libexec/gimp/1.1/plug-ins/spread
-libexec/gimp/1.1/plug-ins/stampify
-libexec/gimp/1.1/plug-ins/stamps
 libexec/gimp/1.1/plug-ins/struc
 libexec/gimp/1.1/plug-ins/sunras
-libexec/gimp/1.1/plug-ins/terral_text
-libexec/gimp/1.1/plug-ins/tex-to-float
 libexec/gimp/1.1/plug-ins/tga
 libexec/gimp/1.1/plug-ins/threshold_alpha
 libexec/gimp/1.1/plug-ins/tiff
 libexec/gimp/1.1/plug-ins/tile
 libexec/gimp/1.1/plug-ins/tileit
 libexec/gimp/1.1/plug-ins/tiler
-libexec/gimp/1.1/plug-ins/translogo
-libexec/gimp/1.1/plug-ins/triangle
+libexec/gimp/1.1/plug-ins/uniteditor
 libexec/gimp/1.1/plug-ins/unsharp
 libexec/gimp/1.1/plug-ins/url
 libexec/gimp/1.1/plug-ins/video
-libexec/gimp/1.1/plug-ins/view3d
 libexec/gimp/1.1/plug-ins/vinvert
 libexec/gimp/1.1/plug-ins/vpropagate
 libexec/gimp/1.1/plug-ins/warp
 libexec/gimp/1.1/plug-ins/waves
 libexec/gimp/1.1/plug-ins/webbrowser
-libexec/gimp/1.1/plug-ins/webify
 libexec/gimp/1.1/plug-ins/whirlpinch
 libexec/gimp/1.1/plug-ins/wind
-libexec/gimp/1.1/plug-ins/windify
 libexec/gimp/1.1/plug-ins/wmf
-libexec/gimp/1.1/plug-ins/xachlego
-libexec/gimp/1.1/plug-ins/xachshadow
-libexec/gimp/1.1/plug-ins/xachvision
 libexec/gimp/1.1/plug-ins/xbm
 libexec/gimp/1.1/plug-ins/xjt
 libexec/gimp/1.1/plug-ins/xpm
 libexec/gimp/1.1/plug-ins/xwd
-libexec/gimp/1.1/plug-ins/yinyang
 libexec/gimp/1.1/plug-ins/zealouscrop
 share/aclocal/gimp.m4
 share/gimp/brushes/10x10square.gbr
@@ -318,15 +261,16 @@ share/gimp/brushes/pixel.gbr
 share/gimp/brushes/thegimp.gbr
 share/gimp/brushes/vine.gih
 share/gimp/brushes/xcf.gbr
-share/gimp/devel-docs/html/libgimp/book1.html
 share/gimp/devel-docs/html/libgimp/gimpchainbutton.html
 share/gimp/devel-docs/html/libgimp/gimpcolorbutton.html
 share/gimp/devel-docs/html/libgimp/gimpdefinitions.html
 share/gimp/devel-docs/html/libgimp/gimpfileselection.html
 share/gimp/devel-docs/html/libgimp/gimpmodule.html
 share/gimp/devel-docs/html/libgimp/gimppatheditor.html
+share/gimp/devel-docs/html/libgimp/gimppixmap.html
 share/gimp/devel-docs/html/libgimp/gimpsizeentry.html
 share/gimp/devel-docs/html/libgimp/gimpunitmenu.html
+share/gimp/devel-docs/html/libgimp/index.html
 share/gimp/devel-docs/html/libgimp/libgimp-color-display.html
 share/gimp/devel-docs/html/libgimp/libgimp-color-selector.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimp.html
@@ -344,10 +288,11 @@ share/gimp/devel-docs/html/libgimp/libgimp-gimpmatrix.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpmenu.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpmodule.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpprotocol.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpquerybox.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpunit.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpvector.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpwidgets.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpwire.html
-share/gimp/devel-docs/html/libgimp/libgimp-gserialize.html
 share/gimp/devel-docs/html/libgimp/libgimp-parasite.html
 share/gimp/devel-docs/html/libgimp/libgimp-parasitef.html
 share/gimp/devel-docs/html/libgimp/libgimp-parasiteio.html
@@ -634,7 +579,6 @@ share/gimp/help/C/dialogs/indexed_palette.html
 share/gimp/help/C/dialogs/info_window.html
 share/gimp/help/C/dialogs/input_devices.html
 share/gimp/help/C/dialogs/layers/add_mask.html
-share/gimp/help/C/dialogs/layers/apply_mask.html
 share/gimp/help/C/dialogs/layers/edit_layer_attributes.html
 share/gimp/help/C/dialogs/layers/index.html
 share/gimp/help/C/dialogs/layers/layer_boundary_size.html
@@ -672,6 +616,7 @@ share/gimp/help/C/dialogs/preferences/session.html
 share/gimp/help/C/dialogs/really_close.html
 share/gimp/help/C/dialogs/really_quit.html
 share/gimp/help/C/dialogs/scale_image.html
+share/gimp/help/C/dialogs/scale_layer_warn.html
 share/gimp/help/C/dialogs/set_canvas_size.html
 share/gimp/help/C/dialogs/shrink_selection.html
 share/gimp/help/C/dialogs/tip_of_the_day.html
@@ -833,6 +778,7 @@ share/gimp/help/C/filters/tiff.html
 share/gimp/help/C/filters/tile.html
 share/gimp/help/C/filters/tileit.html
 share/gimp/help/C/filters/tiler.html
+share/gimp/help/C/filters/uniteditor.html
 share/gimp/help/C/filters/unsharp.html
 share/gimp/help/C/filters/url.html
 share/gimp/help/C/filters/video.html
@@ -925,10 +871,12 @@ share/gimp/help/C/index.html
 share/gimp/help/C/layers/add_alpha_channel.html
 share/gimp/help/C/layers/alpha_to_selection.html
 share/gimp/help/C/layers/anchor_layer.html
+share/gimp/help/C/layers/apply_mask.html
 @exec mkdir -p %D/share/gimp/help/C/layers
 @exec ln -sf %D/share/gimp/help/C/dialogs/layers %D/share/gimp/help/C/layers/dialogs
 @unexec rm -f %D/share/gimp/help/C/layers/dialogs
 share/gimp/help/C/layers/delete_layer.html
+share/gimp/help/C/layers/delete_mask.html
 share/gimp/help/C/layers/duplicate_layer.html
 share/gimp/help/C/layers/flatten_image.html
 share/gimp/help/C/layers/index.html
@@ -1231,14 +1179,12 @@ share/gimp/tips/gimp_tips.txt
 share/gimp/unitrc
 share/gimp/user_install
 share/locale/cs/LC_MESSAGES/gimp-libgimp.mo
-share/locale/cs/LC_MESSAGES/gimp-perl.mo
 share/locale/cs/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/cs/LC_MESSAGES/gimp.mo
 share/locale/da/LC_MESSAGES/gimp-libgimp.mo
 share/locale/da/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/da/LC_MESSAGES/gimp.mo
 share/locale/de/LC_MESSAGES/gimp-libgimp.mo
-share/locale/de/LC_MESSAGES/gimp-perl.mo
 share/locale/de/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/de/LC_MESSAGES/gimp.mo
 share/locale/en_GB/LC_MESSAGES/gimp-libgimp.mo
@@ -1254,7 +1200,6 @@ share/locale/hu/LC_MESSAGES/gimp-libgimp.mo
 share/locale/hu/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/hu/LC_MESSAGES/gimp.mo
 share/locale/it/LC_MESSAGES/gimp-libgimp.mo
-share/locale/it/LC_MESSAGES/gimp-perl.mo
 share/locale/it/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/it/LC_MESSAGES/gimp.mo
 share/locale/ja/LC_MESSAGES/gimp-libgimp.mo
@@ -1267,7 +1212,6 @@ share/locale/nl/LC_MESSAGES/gimp-libgimp.mo
 share/locale/nl/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/nl/LC_MESSAGES/gimp.mo
 share/locale/no/LC_MESSAGES/gimp-libgimp.mo
-share/locale/no/LC_MESSAGES/gimp-perl.mo
 share/locale/no/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/no/LC_MESSAGES/gimp.mo
 share/locale/pl/LC_MESSAGES/gimp-libgimp.mo
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index da12d91e6ab..5f1de62d1ed 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -12,12 +12,14 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v${VERSION}/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/v${VERSION}/ \
 		ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/gimp/unstable/v${VERSION}/
 
-MAINTAINER=	erich@FreeBSD.org
+MAINTAINER=	vanilla@FreeBSD.org
 
+.if !defined (WITHOUT_PERL)
 BUILD_DEPENDS=	perldl:${PORTSDIR}/math/PDL \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
 RUN_DEPENDS=	perldl:${PORTSDIR}/math/PDL \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+.endif
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		aa.1:${PORTSDIR}/graphics/aalib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -27,7 +29,7 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		intl.1:${PORTSDIR}/devel/gettext
 
-VERSION=	1.1.17
+VERSION=	1.1.18
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
@@ -37,6 +39,9 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
+.if defined (WITHOUT_PERL)
+CONFIGURE_ARGS=	--disable-perl
+.endif
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GLIB_CONFIG="${GLIB_CONFIG}" \
 		GTK_CONFIG="${GTK_CONFIG}" \
@@ -49,12 +54,22 @@ MAN5=		gimprc.5
 WITH_GNOME=	yes
 .endif
 
+.if defined(WITHOUT_PERL)
+PLISTORIG=		${WRKDIR}/PLIST
+PLIST=			${PKGDIR}/PLIST
+.else
+PLISTORIG=		${WRKDIR}/PLIST.perl
+PLIST=			${SRCDIR}/PLIST.perl
+pre-fetch:
+	@${ECHO} -n "If you want to compile without perl support "
+	@${ECHO} "'make -DWITHOUT_PERL' instead"
+.endif
+
 .if defined(WITH_GNOME) && ${WITH_GNOME} == yes
 LIB_DEPENDS+=	gtkxmhtml.3:${PORTSDIR}/x11/gnomelibs
 .else
-PLIST=		${WRKDIR}/PLIST
 pre-install:
-	@${SED} -e '/helpbrowser/d' ${PKGDIR}/PLIST > ${PLIST}
+	@${SED} -e '/helpbrowser/d' ${PLISTORIG} > ${PLIST}
 .endif
 
 post-install:
diff --git a/graphics/gimpshop/distinfo b/graphics/gimpshop/distinfo
index 4bfc5bc43ff..75190c8cb8f 100644
--- a/graphics/gimpshop/distinfo
+++ b/graphics/gimpshop/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.1.17.tar.bz2) = 5599cb98b3a17324f2ad2682348a7df9
+MD5 (gimp-1.1.18.tar.bz2) = 472ef3f6e814250d31faa63e467b03b9
diff --git a/graphics/gimpshop/files/gimp.setfont b/graphics/gimpshop/files/gimp.setfont
index 487a91baf0e..34f91f9b5b2 100644
--- a/graphics/gimpshop/files/gimp.setfont
+++ b/graphics/gimpshop/files/gimp.setfont
@@ -7,6 +7,7 @@
 $progname = "gimp.setfont";
 $version = "Version 0.4 Feb 07 2000";
 
+$fontset{'chinese'} = "-*-helvetica-medium-r-normal--17-*-*-*-*-*-iso8859-1,-*-kai-medium-r-normal--16-*-*-*-*-*-big5-0";
 $fontset{'czech'} = "-*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-2";
 $fontset{'danish'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
 $fontset{'dutch'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
@@ -25,6 +26,7 @@ $fontset{'slovak'} = "-*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-2";
 $fontset{'swedish'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
 $fontset{'ukrainian'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-koi8-r";
 
+$locale{'chinese'} = "zh_TW.Big5";
 $locale{'czech'} = "cs_CZ.ISO8859-2";
 $locale{'danish'} = "da_DK.ISO_8859-1";
 $locale{'dutch'} = "nl_NL.ISO_8859-1";
@@ -50,6 +52,7 @@ Usage: gimp.setfont <language>
 
 ----------------------------------------------------------------
 [language]          [fontset]
+ chinese             -*-helvetica-(iso8859-1),-*-kai-(big5-0)
  czech               -*-fixed-(iso8859-2)
  danish              -*-helvetica-(iso8859-1)
  dutch               -*-helvetica-(iso8859-1)
diff --git a/graphics/gimpshop/files/patch-ah b/graphics/gimpshop/files/patch-ah
index 95af0d629b7..267a91fa0f0 100644
--- a/graphics/gimpshop/files/patch-ah
+++ b/graphics/gimpshop/files/patch-ah
@@ -1,5 +1,29 @@
---- configure.orig	Fri Feb 11 10:32:12 2000
-+++ configure	Sat Feb 19 13:51:36 2000
+--- configure.orig	Sat Mar  4 10:23:00 2000
++++ configure	Sun Apr  2 21:42:36 2000
+@@ -1494,8 +1494,8 @@
+ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+ DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
++${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh $lt_target \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+ 
+ # Reload cache, that may have been modified by ltconfig
+@@ -1509,10 +1509,10 @@
+ 
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL="/usr/local/bin/libtool"
+ 
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
 @@ -3480,7 +3480,11 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
@@ -22,7 +46,7 @@
  localedir='${prefix}/${DATADIRNAME}/locale'
  
  brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
-@@ -8561,10 +8565,6 @@
+@@ -8563,10 +8567,6 @@
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
    esac
  
diff --git a/graphics/gimpshop/files/patch-ak b/graphics/gimpshop/files/patch-ak
index 90837d0254f..ead5311df6f 100644
--- a/graphics/gimpshop/files/patch-ak
+++ b/graphics/gimpshop/files/patch-ak
@@ -1,11 +1,17 @@
---- libgimp/Makefile.in.orig	Fri Feb 11 10:42:12 2000
-+++ libgimp/Makefile.in	Sat Feb 19 15:18:59 2000
-@@ -211,7 +211,7 @@
+--- libgimp/Makefile.in.orig	Sat Mar  4 11:10:43 2000
++++ libgimp/Makefile.in	Sun Apr  2 22:40:29 2000
+@@ -209,11 +209,11 @@
+ gimpinclude_HEADERS =  	color_display.h			color_selector.h		gimp.h				gimpchainbutton.h		gimpcolorbutton.h		gimpcolorspace.h	        gimpcompat.h			gimpdialog.h			gimpenums.h			gimpenv.h			gimpexport.h			gimpfeatures.h			gimpfileselection.h		gimphelpui.h			gimplimits.h			gimpmath.h			gimpmatrix.h			gimpmenu.h			gimpmodule.h			gimppatheditor.h		gimppixmap.h			gimpquerybox.h			gimpsizeentry.h			gimpui.h			gimpunit.h              	gimpunitmenu.h          	gimpvector.h			gimpwidgets.h			gimpintl.h			parasite.h			parasiteF.h			parasiteP.h			parasiteio.h
  
- libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
+ 
+-libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
++libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
 -libgimp_la_LIBADD = $(GLIB_LIBS) -lm
 +libgimp_la_LIBADD = $(GTK_LIBS) -lm
  
- libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
+-libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
++libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
+ libgimpui_la_LIBADD = $(GTK_LIBS)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/graphics/gimpshop/files/patch-ao b/graphics/gimpshop/files/patch-ao
new file mode 100644
index 00000000000..e5f1d5a3677
--- /dev/null
+++ b/graphics/gimpshop/files/patch-ao
@@ -0,0 +1,11 @@
+--- plug-ins/libgck/gck/Makefile.in.orig	Sun Apr  2 22:41:29 2000
++++ plug-ins/libgck/gck/Makefile.in	Sun Apr  2 22:41:37 2000
+@@ -191,7 +191,7 @@
+ gckinclude_HEADERS =  	gck.h
+ 
+ 
+-libgck_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
++libgck_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
+ 
+ INCLUDES =  	-I..				-I$(srcdir)/..			-I$(top_srcdir)			$(GTK_CFLAGS)			-I$(includedir)
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index 87f412103a6..43f671d40a8 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -3,14 +3,6 @@ bin/gimp-config
 bin/gimp.setfont
 bin/gimptool
 include/gck/gck.h
-include/gck/gckcolor.h
-include/gck/gckcommon.h
-include/gck/gckimage.h
-include/gck/gcklistbox.h
-include/gck/gckmath.h
-include/gck/gcktypes.h
-include/gck/gckui.h
-include/gck/gckvector.h
 include/libgimp/color_display.h
 include/libgimp/color_selector.h
 include/libgimp/gimp.h
@@ -32,31 +24,39 @@ include/libgimp/gimpmatrix.h
 include/libgimp/gimpmenu.h
 include/libgimp/gimpmodule.h
 include/libgimp/gimppatheditor.h
+include/libgimp/gimppixmap.h
 include/libgimp/gimpquerybox.h
 include/libgimp/gimpsizeentry.h
 include/libgimp/gimpui.h
 include/libgimp/gimpunit.h
 include/libgimp/gimpunitmenu.h
+include/libgimp/gimpvector.h
 include/libgimp/gimpwidgets.h
-include/libgimp/gserialize.h
 include/libgimp/parasite.h
 include/libgimp/parasiteF.h
 include/libgimp/parasiteP.h
 include/libgimp/parasiteio.h
 lib/libgck.a
+lib/libgck.la
 lib/libgck.so
-lib/libgck.so.17
+lib/libgck.so.18
 lib/libgimp.a
+lib/libgimp.la
 lib/libgimp.so
-lib/libgimp.so.17
+lib/libgimp.so.18
 lib/libgimpui.a
+lib/libgimpui.la
 lib/libgimpui.so
-lib/libgimpui.so.17
+lib/libgimpui.so.18
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+libexec/gimp/1.1/modules/libcdisplay_gamma.la
 libexec/gimp/1.1/modules/libcdisplay_gamma.so
+libexec/gimp/1.1/modules/libcolorsel_gtk.la
 libexec/gimp/1.1/modules/libcolorsel_gtk.so
+libexec/gimp/1.1/modules/libcolorsel_triangle.la
 libexec/gimp/1.1/modules/libcolorsel_triangle.so
+libexec/gimp/1.1/modules/libcolorsel_water.la
 libexec/gimp/1.1/modules/libcolorsel_water.so
 libexec/gimp/1.1/plug-ins/AlienMap
 libexec/gimp/1.1/plug-ins/AlienMap2
@@ -65,33 +65,22 @@ libexec/gimp/1.1/plug-ins/CML_explorer
 libexec/gimp/1.1/plug-ins/FractalExplorer
 libexec/gimp/1.1/plug-ins/Lighting
 libexec/gimp/1.1/plug-ins/MapObject
-libexec/gimp/1.1/plug-ins/PDB
-libexec/gimp/1.1/plug-ins/Perl-Server
 libexec/gimp/1.1/plug-ins/aa
 libexec/gimp/1.1/plug-ins/align_layers
-libexec/gimp/1.1/plug-ins/animate_cells
 libexec/gimp/1.1/plug-ins/animationplay
 libexec/gimp/1.1/plug-ins/animoptimize
 libexec/gimp/1.1/plug-ins/apply_lens
 libexec/gimp/1.1/plug-ins/autocrop
 libexec/gimp/1.1/plug-ins/autostretch_hsv
-libexec/gimp/1.1/plug-ins/avi
-libexec/gimp/1.1/plug-ins/blended2
 libexec/gimp/1.1/plug-ins/blinds
-libexec/gimp/1.1/plug-ins/blowinout
 libexec/gimp/1.1/plug-ins/blur
 libexec/gimp/1.1/plug-ins/bmp
-libexec/gimp/1.1/plug-ins/border
 libexec/gimp/1.1/plug-ins/borderaverage
-libexec/gimp/1.1/plug-ins/bricks
 libexec/gimp/1.1/plug-ins/bumpmap
-libexec/gimp/1.1/plug-ins/burst
 libexec/gimp/1.1/plug-ins/bz2
 libexec/gimp/1.1/plug-ins/c_astretch
-libexec/gimp/1.1/plug-ins/centerguide
 libexec/gimp/1.1/plug-ins/checkerboard
 libexec/gimp/1.1/plug-ins/color_enhance
-libexec/gimp/1.1/plug-ins/colorhtml
 libexec/gimp/1.1/plug-ins/colorify
 libexec/gimp/1.1/plug-ins/colortoalpha
 libexec/gimp/1.1/plug-ins/compose
@@ -99,7 +88,6 @@ libexec/gimp/1.1/plug-ins/convmatrix
 libexec/gimp/1.1/plug-ins/csource
 libexec/gimp/1.1/plug-ins/cubism
 libexec/gimp/1.1/plug-ins/curve_bend
-libexec/gimp/1.1/plug-ins/dataurl
 libexec/gimp/1.1/plug-ins/dbbrowser
 libexec/gimp/1.1/plug-ins/decompose
 libexec/gimp/1.1/plug-ins/deinterlace
@@ -108,23 +96,17 @@ libexec/gimp/1.1/plug-ins/despeckle
 libexec/gimp/1.1/plug-ins/destripe
 libexec/gimp/1.1/plug-ins/diffraction
 libexec/gimp/1.1/plug-ins/displace
-libexec/gimp/1.1/plug-ins/ditherize
 libexec/gimp/1.1/plug-ins/edge
 libexec/gimp/1.1/plug-ins/emboss
 libexec/gimp/1.1/plug-ins/engrave
 libexec/gimp/1.1/plug-ins/exchange
 libexec/gimp/1.1/plug-ins/faxg3
 libexec/gimp/1.1/plug-ins/film
-libexec/gimp/1.1/plug-ins/fire
-libexec/gimp/1.1/plug-ins/fit-text
 libexec/gimp/1.1/plug-ins/fits
 libexec/gimp/1.1/plug-ins/flame
 libexec/gimp/1.1/plug-ins/flarefx
-libexec/gimp/1.1/plug-ins/font_table
 libexec/gimp/1.1/plug-ins/fp
 libexec/gimp/1.1/plug-ins/fractaltrace
-libexec/gimp/1.1/plug-ins/frame_filter
-libexec/gimp/1.1/plug-ins/frame_reshuffle
 libexec/gimp/1.1/plug-ins/gap_decode_mpeg
 libexec/gimp/1.1/plug-ins/gap_filter
 libexec/gimp/1.1/plug-ins/gap_frontends
@@ -141,20 +123,13 @@ libexec/gimp/1.1/plug-ins/gfli
 libexec/gimp/1.1/plug-ins/gicon
 libexec/gimp/1.1/plug-ins/gif
 libexec/gimp/1.1/plug-ins/gifload
-libexec/gimp/1.1/plug-ins/gimpmagick
 libexec/gimp/1.1/plug-ins/gimpressionist
 libexec/gimp/1.1/plug-ins/glasstile
-libexec/gimp/1.1/plug-ins/glowing_steel
-libexec/gimp/1.1/plug-ins/goldenmean
-libexec/gimp/1.1/plug-ins/gouge
 libexec/gimp/1.1/plug-ins/gpb
 libexec/gimp/1.1/plug-ins/gqbist
 libexec/gimp/1.1/plug-ins/gradmap
 libexec/gimp/1.1/plug-ins/grid
 libexec/gimp/1.1/plug-ins/gtm
-libexec/gimp/1.1/plug-ins/guide_remove
-libexec/gimp/1.1/plug-ins/guidegrid
-libexec/gimp/1.1/plug-ins/guides_to_selection
 libexec/gimp/1.1/plug-ins/guillotine
 libexec/gimp/1.1/plug-ins/gz
 libexec/gimp/1.1/plug-ins/header
@@ -163,24 +138,17 @@ libexec/gimp/1.1/plug-ins/hot
 libexec/gimp/1.1/plug-ins/hrz
 libexec/gimp/1.1/plug-ins/ifscompose
 libexec/gimp/1.1/plug-ins/illusion
-libexec/gimp/1.1/plug-ins/image_tile
 libexec/gimp/1.1/plug-ins/imagemap
-libexec/gimp/1.1/plug-ins/innerbevel
 libexec/gimp/1.1/plug-ins/iwarp
 libexec/gimp/1.1/plug-ins/jigsaw
 libexec/gimp/1.1/plug-ins/jpeg
 libexec/gimp/1.1/plug-ins/laplace
-libexec/gimp/1.1/plug-ins/layerfuncs
 libexec/gimp/1.1/plug-ins/lic
-libexec/gimp/1.1/plug-ins/logulator
 libexec/gimp/1.1/plug-ins/mail
-libexec/gimp/1.1/plug-ins/map_to_gradient
 libexec/gimp/1.1/plug-ins/mapcolor
 libexec/gimp/1.1/plug-ins/max_rgb
 libexec/gimp/1.1/plug-ins/maze
 libexec/gimp/1.1/plug-ins/mblur
-libexec/gimp/1.1/plug-ins/miff
-libexec/gimp/1.1/plug-ins/mirrorsplit
 libexec/gimp/1.1/plug-ins/mosaic
 libexec/gimp/1.1/plug-ins/mpeg
 libexec/gimp/1.1/plug-ins/newsprint
@@ -191,43 +159,30 @@ libexec/gimp/1.1/plug-ins/nova
 libexec/gimp/1.1/plug-ins/oilify
 libexec/gimp/1.1/plug-ins/pagecurl
 libexec/gimp/1.1/plug-ins/papertile
-libexec/gimp/1.1/plug-ins/parasite-editor
 libexec/gimp/1.1/plug-ins/pat
 libexec/gimp/1.1/plug-ins/pcx
-libexec/gimp/1.1/plug-ins/perlcc
-libexec/gimp/1.1/plug-ins/perlotine
 libexec/gimp/1.1/plug-ins/pix
 libexec/gimp/1.1/plug-ins/pixelize
-libexec/gimp/1.1/plug-ins/pixelmap
 libexec/gimp/1.1/plug-ins/plasma
 libexec/gimp/1.1/plug-ins/plugindetails
 libexec/gimp/1.1/plug-ins/png
 libexec/gimp/1.1/plug-ins/pnm
 libexec/gimp/1.1/plug-ins/polar
-libexec/gimp/1.1/plug-ins/povray
-libexec/gimp/1.1/plug-ins/prep4gif
 libexec/gimp/1.1/plug-ins/print
 libexec/gimp/1.1/plug-ins/ps
 libexec/gimp/1.1/plug-ins/psd
 libexec/gimp/1.1/plug-ins/psp
-libexec/gimp/1.1/plug-ins/randomart1
-libexec/gimp/1.1/plug-ins/randomblends
 libexec/gimp/1.1/plug-ins/randomize
 libexec/gimp/1.1/plug-ins/rcm
-libexec/gimp/1.1/plug-ins/repdup
 libexec/gimp/1.1/plug-ins/ripple
 libexec/gimp/1.1/plug-ins/rotate
-libexec/gimp/1.1/plug-ins/roundrectsel
-libexec/gimp/1.1/plug-ins/roundsel
 libexec/gimp/1.1/plug-ins/sample_colorize
 libexec/gimp/1.1/plug-ins/scatter_hsv
-libexec/gimp/1.1/plug-ins/scratches
 libexec/gimp/1.1/plug-ins/screenshot
 libexec/gimp/1.1/plug-ins/script-fu
 libexec/gimp/1.1/plug-ins/sel2path
 libexec/gimp/1.1/plug-ins/sel_gauss
 libexec/gimp/1.1/plug-ins/semiflatten
-libexec/gimp/1.1/plug-ins/sethspin
 libexec/gimp/1.1/plug-ins/sgi
 libexec/gimp/1.1/plug-ins/sharpen
 libexec/gimp/1.1/plug-ins/shift
@@ -238,42 +193,30 @@ libexec/gimp/1.1/plug-ins/sobel
 libexec/gimp/1.1/plug-ins/sparkle
 libexec/gimp/1.1/plug-ins/spheredesigner
 libexec/gimp/1.1/plug-ins/spread
-libexec/gimp/1.1/plug-ins/stampify
-libexec/gimp/1.1/plug-ins/stamps
 libexec/gimp/1.1/plug-ins/struc
 libexec/gimp/1.1/plug-ins/sunras
-libexec/gimp/1.1/plug-ins/terral_text
-libexec/gimp/1.1/plug-ins/tex-to-float
 libexec/gimp/1.1/plug-ins/tga
 libexec/gimp/1.1/plug-ins/threshold_alpha
 libexec/gimp/1.1/plug-ins/tiff
 libexec/gimp/1.1/plug-ins/tile
 libexec/gimp/1.1/plug-ins/tileit
 libexec/gimp/1.1/plug-ins/tiler
-libexec/gimp/1.1/plug-ins/translogo
-libexec/gimp/1.1/plug-ins/triangle
+libexec/gimp/1.1/plug-ins/uniteditor
 libexec/gimp/1.1/plug-ins/unsharp
 libexec/gimp/1.1/plug-ins/url
 libexec/gimp/1.1/plug-ins/video
-libexec/gimp/1.1/plug-ins/view3d
 libexec/gimp/1.1/plug-ins/vinvert
 libexec/gimp/1.1/plug-ins/vpropagate
 libexec/gimp/1.1/plug-ins/warp
 libexec/gimp/1.1/plug-ins/waves
 libexec/gimp/1.1/plug-ins/webbrowser
-libexec/gimp/1.1/plug-ins/webify
 libexec/gimp/1.1/plug-ins/whirlpinch
 libexec/gimp/1.1/plug-ins/wind
-libexec/gimp/1.1/plug-ins/windify
 libexec/gimp/1.1/plug-ins/wmf
-libexec/gimp/1.1/plug-ins/xachlego
-libexec/gimp/1.1/plug-ins/xachshadow
-libexec/gimp/1.1/plug-ins/xachvision
 libexec/gimp/1.1/plug-ins/xbm
 libexec/gimp/1.1/plug-ins/xjt
 libexec/gimp/1.1/plug-ins/xpm
 libexec/gimp/1.1/plug-ins/xwd
-libexec/gimp/1.1/plug-ins/yinyang
 libexec/gimp/1.1/plug-ins/zealouscrop
 share/aclocal/gimp.m4
 share/gimp/brushes/10x10square.gbr
@@ -318,15 +261,16 @@ share/gimp/brushes/pixel.gbr
 share/gimp/brushes/thegimp.gbr
 share/gimp/brushes/vine.gih
 share/gimp/brushes/xcf.gbr
-share/gimp/devel-docs/html/libgimp/book1.html
 share/gimp/devel-docs/html/libgimp/gimpchainbutton.html
 share/gimp/devel-docs/html/libgimp/gimpcolorbutton.html
 share/gimp/devel-docs/html/libgimp/gimpdefinitions.html
 share/gimp/devel-docs/html/libgimp/gimpfileselection.html
 share/gimp/devel-docs/html/libgimp/gimpmodule.html
 share/gimp/devel-docs/html/libgimp/gimppatheditor.html
+share/gimp/devel-docs/html/libgimp/gimppixmap.html
 share/gimp/devel-docs/html/libgimp/gimpsizeentry.html
 share/gimp/devel-docs/html/libgimp/gimpunitmenu.html
+share/gimp/devel-docs/html/libgimp/index.html
 share/gimp/devel-docs/html/libgimp/libgimp-color-display.html
 share/gimp/devel-docs/html/libgimp/libgimp-color-selector.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimp.html
@@ -344,10 +288,11 @@ share/gimp/devel-docs/html/libgimp/libgimp-gimpmatrix.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpmenu.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpmodule.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpprotocol.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpquerybox.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpunit.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpvector.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpwidgets.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpwire.html
-share/gimp/devel-docs/html/libgimp/libgimp-gserialize.html
 share/gimp/devel-docs/html/libgimp/libgimp-parasite.html
 share/gimp/devel-docs/html/libgimp/libgimp-parasitef.html
 share/gimp/devel-docs/html/libgimp/libgimp-parasiteio.html
@@ -634,7 +579,6 @@ share/gimp/help/C/dialogs/indexed_palette.html
 share/gimp/help/C/dialogs/info_window.html
 share/gimp/help/C/dialogs/input_devices.html
 share/gimp/help/C/dialogs/layers/add_mask.html
-share/gimp/help/C/dialogs/layers/apply_mask.html
 share/gimp/help/C/dialogs/layers/edit_layer_attributes.html
 share/gimp/help/C/dialogs/layers/index.html
 share/gimp/help/C/dialogs/layers/layer_boundary_size.html
@@ -672,6 +616,7 @@ share/gimp/help/C/dialogs/preferences/session.html
 share/gimp/help/C/dialogs/really_close.html
 share/gimp/help/C/dialogs/really_quit.html
 share/gimp/help/C/dialogs/scale_image.html
+share/gimp/help/C/dialogs/scale_layer_warn.html
 share/gimp/help/C/dialogs/set_canvas_size.html
 share/gimp/help/C/dialogs/shrink_selection.html
 share/gimp/help/C/dialogs/tip_of_the_day.html
@@ -833,6 +778,7 @@ share/gimp/help/C/filters/tiff.html
 share/gimp/help/C/filters/tile.html
 share/gimp/help/C/filters/tileit.html
 share/gimp/help/C/filters/tiler.html
+share/gimp/help/C/filters/uniteditor.html
 share/gimp/help/C/filters/unsharp.html
 share/gimp/help/C/filters/url.html
 share/gimp/help/C/filters/video.html
@@ -925,10 +871,12 @@ share/gimp/help/C/index.html
 share/gimp/help/C/layers/add_alpha_channel.html
 share/gimp/help/C/layers/alpha_to_selection.html
 share/gimp/help/C/layers/anchor_layer.html
+share/gimp/help/C/layers/apply_mask.html
 @exec mkdir -p %D/share/gimp/help/C/layers
 @exec ln -sf %D/share/gimp/help/C/dialogs/layers %D/share/gimp/help/C/layers/dialogs
 @unexec rm -f %D/share/gimp/help/C/layers/dialogs
 share/gimp/help/C/layers/delete_layer.html
+share/gimp/help/C/layers/delete_mask.html
 share/gimp/help/C/layers/duplicate_layer.html
 share/gimp/help/C/layers/flatten_image.html
 share/gimp/help/C/layers/index.html
@@ -1231,14 +1179,12 @@ share/gimp/tips/gimp_tips.txt
 share/gimp/unitrc
 share/gimp/user_install
 share/locale/cs/LC_MESSAGES/gimp-libgimp.mo
-share/locale/cs/LC_MESSAGES/gimp-perl.mo
 share/locale/cs/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/cs/LC_MESSAGES/gimp.mo
 share/locale/da/LC_MESSAGES/gimp-libgimp.mo
 share/locale/da/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/da/LC_MESSAGES/gimp.mo
 share/locale/de/LC_MESSAGES/gimp-libgimp.mo
-share/locale/de/LC_MESSAGES/gimp-perl.mo
 share/locale/de/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/de/LC_MESSAGES/gimp.mo
 share/locale/en_GB/LC_MESSAGES/gimp-libgimp.mo
@@ -1254,7 +1200,6 @@ share/locale/hu/LC_MESSAGES/gimp-libgimp.mo
 share/locale/hu/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/hu/LC_MESSAGES/gimp.mo
 share/locale/it/LC_MESSAGES/gimp-libgimp.mo
-share/locale/it/LC_MESSAGES/gimp-perl.mo
 share/locale/it/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/it/LC_MESSAGES/gimp.mo
 share/locale/ja/LC_MESSAGES/gimp-libgimp.mo
@@ -1267,7 +1212,6 @@ share/locale/nl/LC_MESSAGES/gimp-libgimp.mo
 share/locale/nl/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/nl/LC_MESSAGES/gimp.mo
 share/locale/no/LC_MESSAGES/gimp-libgimp.mo
-share/locale/no/LC_MESSAGES/gimp-perl.mo
 share/locale/no/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/no/LC_MESSAGES/gimp.mo
 share/locale/pl/LC_MESSAGES/gimp-libgimp.mo