Update to version 1.1.11

PR:		14779
Submitted by:	Will Andrews <andrews@technologist.com>

24 files changed, 138 insertions, 102 deletions

diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index 422abfdf813a..57f50f846c2d 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -1,16 +1,17 @@
 # New ports collection makefile for:    Gimp
-# Version required:     1.1.10
+# Version required:     1.1.11
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gimp-1.1.10
+DISTNAME=	gimp-${VERSION}
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v1.1.10/ \
-		ftp://ftp.cs.umn.edu/pub/gimp/gimp/unstable/v1.1.10/ \
-		http://www.ameth.org/gimp/pub/gimp/unstable/v1.1.10/
+MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v${VERSION}/ \
+		ftp://ftp.cs.umn.edu/pub/gimp/gimp/unstable/v${VERSION}/ \
+		http://www.ameth.org/gimp/pub/gimp/unstable/v${VERSION}/ \
+		ftp://ftp.gimp.org/pub/gimp/unstable/old/v${VERSION}/
 
 MAINTAINER=	erich@FreeBSD.org
 
@@ -22,6 +23,7 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		png.3:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
+VERSION=	1.1.11
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
diff --git a/graphics/gimp-app-devel/distinfo b/graphics/gimp-app-devel/distinfo
index fb6e47677422..d81ead692c87 100644
--- a/graphics/gimp-app-devel/distinfo
+++ b/graphics/gimp-app-devel/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.1.10.tar.bz2) = a5bf11f5bd1050d9d0ed1fc941f4302c
+MD5 (gimp-1.1.11.tar.bz2) = c22832463f6a6333c1cab549dba8bcbc
diff --git a/graphics/gimp-app-devel/files/patch-ab b/graphics/gimp-app-devel/files/patch-ab
index cc3600f85cac..4a00a2ad60f9 100644
--- a/graphics/gimp-app-devel/files/patch-ab
+++ b/graphics/gimp-app-devel/files/patch-ab
@@ -1,6 +1,6 @@
---- plug-ins/common/url.c.orig	Sat May 30 15:32:36 1998
-+++ plug-ins/common/url.c	Sun Jun  7 10:09:34 1998
-@@ -146,8 +146,8 @@
+--- plug-ins/common/url.c	Sun Nov  7 19:24:37 1999
++++ plug-ins/common/url.c.new	Sun Nov  7 19:26:39 1999
+@@ -151,8 +151,8 @@
      }
    else if (pid == 0)
      {
@@ -8,6 +8,6 @@
 -      g_message ("url: exec failed: wget: %s\n", g_strerror(errno));
 +      execlp ("fetch", "fetch", filename, "-p -o", tmpname, NULL);
 +      g_message ("url: exec failed: fetch: %s\n", g_strerror(errno));
+       g_free (tmpname);
        _exit(127);
      }
-   else
diff --git a/graphics/gimp-app-devel/pkg-plist b/graphics/gimp-app-devel/pkg-plist
index 4661b034cec3..90d661967954 100644
--- a/graphics/gimp-app-devel/pkg-plist
+++ b/graphics/gimp-app-devel/pkg-plist
@@ -9,6 +9,8 @@ include/gck/gckmath.h
 include/gck/gcktypes.h
 include/gck/gckui.h
 include/gck/gckvector.h
+include/libgimp/gimpcolorbutton.h
+include/libgimp/gimpcompat.h
 include/libgimp/color_display.h
 include/libgimp/color_selector.h
 include/libgimp/gimp.h
@@ -36,21 +38,22 @@ include/libgimp/parasiteP.h
 include/libgimp/parasiteio.h
 lib/libgck.a
 lib/libgck.so
-lib/libgck.so.10
+lib/libgck.so.11
 lib/libgimp.a
 lib/libgimp.so
-lib/libgimp.so.10
+lib/libgimp.so.11
 lib/libgimpui.a
 lib/libgimpui.so
-lib/libgimpui.so.10
+lib/libgimpui.so.11
 lib/libgpc.a
 lib/libmegawidget.a
 @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.so
-libexec/gimp/1.1/modules/libcolorsel_gtk.so
-libexec/gimp/1.1/modules/libcolorsel_triangle.so
-libexec/gimp/1.1/modules/libcolorsel_water.so
+libexec/gimp/1.1/modules/libcdisplay_gamma.a
+libexec/gimp/1.1/modules/libcolorsel_gtk.a
+libexec/gimp/1.1/modules/libcolorsel_triangle.a
+libexec/gimp/1.1/modules/libcolorsel_water.a
+libexec/gimp/1.1/plug-ins/helpbrowser
 libexec/gimp/1.1/plug-ins/AlienMap
 libexec/gimp/1.1/plug-ins/AlienMap2
 libexec/gimp/1.1/plug-ins/CEL
@@ -1039,6 +1042,7 @@ share/gimp/tips/gimp_tips.ja.txt
 share/gimp/tips/gimp_tips.it.txt
 share/gimp/tips/gimp_conseils.fr.txt
 share/gimp/tips/gimp_tips.ru.txt
+share/gimp/tips/gimp_tips.ko.txt
 share/gimp/unitrc
 share/gimp/user_install
 share/locale/de/LC_MESSAGES/gimp.mo
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 422abfdf813a..57f50f846c2d 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -1,16 +1,17 @@
 # New ports collection makefile for:    Gimp
-# Version required:     1.1.10
+# Version required:     1.1.11
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gimp-1.1.10
+DISTNAME=	gimp-${VERSION}
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v1.1.10/ \
-		ftp://ftp.cs.umn.edu/pub/gimp/gimp/unstable/v1.1.10/ \
-		http://www.ameth.org/gimp/pub/gimp/unstable/v1.1.10/
+MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v${VERSION}/ \
+		ftp://ftp.cs.umn.edu/pub/gimp/gimp/unstable/v${VERSION}/ \
+		http://www.ameth.org/gimp/pub/gimp/unstable/v${VERSION}/ \
+		ftp://ftp.gimp.org/pub/gimp/unstable/old/v${VERSION}/
 
 MAINTAINER=	erich@FreeBSD.org
 
@@ -22,6 +23,7 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		png.3:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
+VERSION=	1.1.11
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index fb6e47677422..d81ead692c87 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.1.10.tar.bz2) = a5bf11f5bd1050d9d0ed1fc941f4302c
+MD5 (gimp-1.1.11.tar.bz2) = c22832463f6a6333c1cab549dba8bcbc
diff --git a/graphics/gimp-app/files/patch-ab b/graphics/gimp-app/files/patch-ab
index cc3600f85cac..4a00a2ad60f9 100644
--- a/graphics/gimp-app/files/patch-ab
+++ b/graphics/gimp-app/files/patch-ab
@@ -1,6 +1,6 @@
---- plug-ins/common/url.c.orig	Sat May 30 15:32:36 1998
-+++ plug-ins/common/url.c	Sun Jun  7 10:09:34 1998
-@@ -146,8 +146,8 @@
+--- plug-ins/common/url.c	Sun Nov  7 19:24:37 1999
++++ plug-ins/common/url.c.new	Sun Nov  7 19:26:39 1999
+@@ -151,8 +151,8 @@
      }
    else if (pid == 0)
      {
@@ -8,6 +8,6 @@
 -      g_message ("url: exec failed: wget: %s\n", g_strerror(errno));
 +      execlp ("fetch", "fetch", filename, "-p -o", tmpname, NULL);
 +      g_message ("url: exec failed: fetch: %s\n", g_strerror(errno));
+       g_free (tmpname);
        _exit(127);
      }
-   else
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index 4661b034cec3..90d661967954 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -9,6 +9,8 @@ include/gck/gckmath.h
 include/gck/gcktypes.h
 include/gck/gckui.h
 include/gck/gckvector.h
+include/libgimp/gimpcolorbutton.h
+include/libgimp/gimpcompat.h
 include/libgimp/color_display.h
 include/libgimp/color_selector.h
 include/libgimp/gimp.h
@@ -36,21 +38,22 @@ include/libgimp/parasiteP.h
 include/libgimp/parasiteio.h
 lib/libgck.a
 lib/libgck.so
-lib/libgck.so.10
+lib/libgck.so.11
 lib/libgimp.a
 lib/libgimp.so
-lib/libgimp.so.10
+lib/libgimp.so.11
 lib/libgimpui.a
 lib/libgimpui.so
-lib/libgimpui.so.10
+lib/libgimpui.so.11
 lib/libgpc.a
 lib/libmegawidget.a
 @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.so
-libexec/gimp/1.1/modules/libcolorsel_gtk.so
-libexec/gimp/1.1/modules/libcolorsel_triangle.so
-libexec/gimp/1.1/modules/libcolorsel_water.so
+libexec/gimp/1.1/modules/libcdisplay_gamma.a
+libexec/gimp/1.1/modules/libcolorsel_gtk.a
+libexec/gimp/1.1/modules/libcolorsel_triangle.a
+libexec/gimp/1.1/modules/libcolorsel_water.a
+libexec/gimp/1.1/plug-ins/helpbrowser
 libexec/gimp/1.1/plug-ins/AlienMap
 libexec/gimp/1.1/plug-ins/AlienMap2
 libexec/gimp/1.1/plug-ins/CEL
@@ -1039,6 +1042,7 @@ share/gimp/tips/gimp_tips.ja.txt
 share/gimp/tips/gimp_tips.it.txt
 share/gimp/tips/gimp_conseils.fr.txt
 share/gimp/tips/gimp_tips.ru.txt
+share/gimp/tips/gimp_tips.ko.txt
 share/gimp/unitrc
 share/gimp/user_install
 share/locale/de/LC_MESSAGES/gimp.mo
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index 422abfdf813a..57f50f846c2d 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -1,16 +1,17 @@
 # New ports collection makefile for:    Gimp
-# Version required:     1.1.10
+# Version required:     1.1.11
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gimp-1.1.10
+DISTNAME=	gimp-${VERSION}
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v1.1.10/ \
-		ftp://ftp.cs.umn.edu/pub/gimp/gimp/unstable/v1.1.10/ \
-		http://www.ameth.org/gimp/pub/gimp/unstable/v1.1.10/
+MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v${VERSION}/ \
+		ftp://ftp.cs.umn.edu/pub/gimp/gimp/unstable/v${VERSION}/ \
+		http://www.ameth.org/gimp/pub/gimp/unstable/v${VERSION}/ \
+		ftp://ftp.gimp.org/pub/gimp/unstable/old/v${VERSION}/
 
 MAINTAINER=	erich@FreeBSD.org
 
@@ -22,6 +23,7 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		png.3:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
+VERSION=	1.1.11
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
diff --git a/graphics/gimp-devel/distinfo b/graphics/gimp-devel/distinfo
index fb6e47677422..d81ead692c87 100644
--- a/graphics/gimp-devel/distinfo
+++ b/graphics/gimp-devel/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.1.10.tar.bz2) = a5bf11f5bd1050d9d0ed1fc941f4302c
+MD5 (gimp-1.1.11.tar.bz2) = c22832463f6a6333c1cab549dba8bcbc
diff --git a/graphics/gimp-devel/files/patch-ab b/graphics/gimp-devel/files/patch-ab
index cc3600f85cac..4a00a2ad60f9 100644
--- a/graphics/gimp-devel/files/patch-ab
+++ b/graphics/gimp-devel/files/patch-ab
@@ -1,6 +1,6 @@
---- plug-ins/common/url.c.orig	Sat May 30 15:32:36 1998
-+++ plug-ins/common/url.c	Sun Jun  7 10:09:34 1998
-@@ -146,8 +146,8 @@
+--- plug-ins/common/url.c	Sun Nov  7 19:24:37 1999
++++ plug-ins/common/url.c.new	Sun Nov  7 19:26:39 1999
+@@ -151,8 +151,8 @@
      }
    else if (pid == 0)
      {
@@ -8,6 +8,6 @@
 -      g_message ("url: exec failed: wget: %s\n", g_strerror(errno));
 +      execlp ("fetch", "fetch", filename, "-p -o", tmpname, NULL);
 +      g_message ("url: exec failed: fetch: %s\n", g_strerror(errno));
+       g_free (tmpname);
        _exit(127);
      }
-   else
diff --git a/graphics/gimp-devel/pkg-plist b/graphics/gimp-devel/pkg-plist
index 4661b034cec3..90d661967954 100644
--- a/graphics/gimp-devel/pkg-plist
+++ b/graphics/gimp-devel/pkg-plist
@@ -9,6 +9,8 @@ include/gck/gckmath.h
 include/gck/gcktypes.h
 include/gck/gckui.h
 include/gck/gckvector.h
+include/libgimp/gimpcolorbutton.h
+include/libgimp/gimpcompat.h
 include/libgimp/color_display.h
 include/libgimp/color_selector.h
 include/libgimp/gimp.h
@@ -36,21 +38,22 @@ include/libgimp/parasiteP.h
 include/libgimp/parasiteio.h
 lib/libgck.a
 lib/libgck.so
-lib/libgck.so.10
+lib/libgck.so.11
 lib/libgimp.a
 lib/libgimp.so
-lib/libgimp.so.10
+lib/libgimp.so.11
 lib/libgimpui.a
 lib/libgimpui.so
-lib/libgimpui.so.10
+lib/libgimpui.so.11
 lib/libgpc.a
 lib/libmegawidget.a
 @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.so
-libexec/gimp/1.1/modules/libcolorsel_gtk.so
-libexec/gimp/1.1/modules/libcolorsel_triangle.so
-libexec/gimp/1.1/modules/libcolorsel_water.so
+libexec/gimp/1.1/modules/libcdisplay_gamma.a
+libexec/gimp/1.1/modules/libcolorsel_gtk.a
+libexec/gimp/1.1/modules/libcolorsel_triangle.a
+libexec/gimp/1.1/modules/libcolorsel_water.a
+libexec/gimp/1.1/plug-ins/helpbrowser
 libexec/gimp/1.1/plug-ins/AlienMap
 libexec/gimp/1.1/plug-ins/AlienMap2
 libexec/gimp/1.1/plug-ins/CEL
@@ -1039,6 +1042,7 @@ share/gimp/tips/gimp_tips.ja.txt
 share/gimp/tips/gimp_tips.it.txt
 share/gimp/tips/gimp_conseils.fr.txt
 share/gimp/tips/gimp_tips.ru.txt
+share/gimp/tips/gimp_tips.ko.txt
 share/gimp/unitrc
 share/gimp/user_install
 share/locale/de/LC_MESSAGES/gimp.mo
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 422abfdf813a..57f50f846c2d 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,16 +1,17 @@
 # New ports collection makefile for:    Gimp
-# Version required:     1.1.10
+# Version required:     1.1.11
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gimp-1.1.10
+DISTNAME=	gimp-${VERSION}
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v1.1.10/ \
-		ftp://ftp.cs.umn.edu/pub/gimp/gimp/unstable/v1.1.10/ \
-		http://www.ameth.org/gimp/pub/gimp/unstable/v1.1.10/
+MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v${VERSION}/ \
+		ftp://ftp.cs.umn.edu/pub/gimp/gimp/unstable/v${VERSION}/ \
+		http://www.ameth.org/gimp/pub/gimp/unstable/v${VERSION}/ \
+		ftp://ftp.gimp.org/pub/gimp/unstable/old/v${VERSION}/
 
 MAINTAINER=	erich@FreeBSD.org
 
@@ -22,6 +23,7 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		png.3:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
+VERSION=	1.1.11
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index fb6e47677422..d81ead692c87 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.1.10.tar.bz2) = a5bf11f5bd1050d9d0ed1fc941f4302c
+MD5 (gimp-1.1.11.tar.bz2) = c22832463f6a6333c1cab549dba8bcbc
diff --git a/graphics/gimp/files/patch-ab b/graphics/gimp/files/patch-ab
index cc3600f85cac..4a00a2ad60f9 100644
--- a/graphics/gimp/files/patch-ab
+++ b/graphics/gimp/files/patch-ab
@@ -1,6 +1,6 @@
---- plug-ins/common/url.c.orig	Sat May 30 15:32:36 1998
-+++ plug-ins/common/url.c	Sun Jun  7 10:09:34 1998
-@@ -146,8 +146,8 @@
+--- plug-ins/common/url.c	Sun Nov  7 19:24:37 1999
++++ plug-ins/common/url.c.new	Sun Nov  7 19:26:39 1999
+@@ -151,8 +151,8 @@
      }
    else if (pid == 0)
      {
@@ -8,6 +8,6 @@
 -      g_message ("url: exec failed: wget: %s\n", g_strerror(errno));
 +      execlp ("fetch", "fetch", filename, "-p -o", tmpname, NULL);
 +      g_message ("url: exec failed: fetch: %s\n", g_strerror(errno));
+       g_free (tmpname);
        _exit(127);
      }
-   else
diff --git a/graphics/gimp/pkg-plist b/graphics/gimp/pkg-plist
index 4661b034cec3..90d661967954 100644
--- a/graphics/gimp/pkg-plist
+++ b/graphics/gimp/pkg-plist
@@ -9,6 +9,8 @@ include/gck/gckmath.h
 include/gck/gcktypes.h
 include/gck/gckui.h
 include/gck/gckvector.h
+include/libgimp/gimpcolorbutton.h
+include/libgimp/gimpcompat.h
 include/libgimp/color_display.h
 include/libgimp/color_selector.h
 include/libgimp/gimp.h
@@ -36,21 +38,22 @@ include/libgimp/parasiteP.h
 include/libgimp/parasiteio.h
 lib/libgck.a
 lib/libgck.so
-lib/libgck.so.10
+lib/libgck.so.11
 lib/libgimp.a
 lib/libgimp.so
-lib/libgimp.so.10
+lib/libgimp.so.11
 lib/libgimpui.a
 lib/libgimpui.so
-lib/libgimpui.so.10
+lib/libgimpui.so.11
 lib/libgpc.a
 lib/libmegawidget.a
 @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.so
-libexec/gimp/1.1/modules/libcolorsel_gtk.so
-libexec/gimp/1.1/modules/libcolorsel_triangle.so
-libexec/gimp/1.1/modules/libcolorsel_water.so
+libexec/gimp/1.1/modules/libcdisplay_gamma.a
+libexec/gimp/1.1/modules/libcolorsel_gtk.a
+libexec/gimp/1.1/modules/libcolorsel_triangle.a
+libexec/gimp/1.1/modules/libcolorsel_water.a
+libexec/gimp/1.1/plug-ins/helpbrowser
 libexec/gimp/1.1/plug-ins/AlienMap
 libexec/gimp/1.1/plug-ins/AlienMap2
 libexec/gimp/1.1/plug-ins/CEL
@@ -1039,6 +1042,7 @@ share/gimp/tips/gimp_tips.ja.txt
 share/gimp/tips/gimp_tips.it.txt
 share/gimp/tips/gimp_conseils.fr.txt
 share/gimp/tips/gimp_tips.ru.txt
+share/gimp/tips/gimp_tips.ko.txt
 share/gimp/unitrc
 share/gimp/user_install
 share/locale/de/LC_MESSAGES/gimp.mo
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index 422abfdf813a..57f50f846c2d 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -1,16 +1,17 @@
 # New ports collection makefile for:    Gimp
-# Version required:     1.1.10
+# Version required:     1.1.11
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gimp-1.1.10
+DISTNAME=	gimp-${VERSION}
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v1.1.10/ \
-		ftp://ftp.cs.umn.edu/pub/gimp/gimp/unstable/v1.1.10/ \
-		http://www.ameth.org/gimp/pub/gimp/unstable/v1.1.10/
+MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v${VERSION}/ \
+		ftp://ftp.cs.umn.edu/pub/gimp/gimp/unstable/v${VERSION}/ \
+		http://www.ameth.org/gimp/pub/gimp/unstable/v${VERSION}/ \
+		ftp://ftp.gimp.org/pub/gimp/unstable/old/v${VERSION}/
 
 MAINTAINER=	erich@FreeBSD.org
 
@@ -22,6 +23,7 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		png.3:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
+VERSION=	1.1.11
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
diff --git a/graphics/gimp1/distinfo b/graphics/gimp1/distinfo
index fb6e47677422..d81ead692c87 100644
--- a/graphics/gimp1/distinfo
+++ b/graphics/gimp1/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.1.10.tar.bz2) = a5bf11f5bd1050d9d0ed1fc941f4302c
+MD5 (gimp-1.1.11.tar.bz2) = c22832463f6a6333c1cab549dba8bcbc
diff --git a/graphics/gimp1/files/patch-ab b/graphics/gimp1/files/patch-ab
index cc3600f85cac..4a00a2ad60f9 100644
--- a/graphics/gimp1/files/patch-ab
+++ b/graphics/gimp1/files/patch-ab
@@ -1,6 +1,6 @@
---- plug-ins/common/url.c.orig	Sat May 30 15:32:36 1998
-+++ plug-ins/common/url.c	Sun Jun  7 10:09:34 1998
-@@ -146,8 +146,8 @@
+--- plug-ins/common/url.c	Sun Nov  7 19:24:37 1999
++++ plug-ins/common/url.c.new	Sun Nov  7 19:26:39 1999
+@@ -151,8 +151,8 @@
      }
    else if (pid == 0)
      {
@@ -8,6 +8,6 @@
 -      g_message ("url: exec failed: wget: %s\n", g_strerror(errno));
 +      execlp ("fetch", "fetch", filename, "-p -o", tmpname, NULL);
 +      g_message ("url: exec failed: fetch: %s\n", g_strerror(errno));
+       g_free (tmpname);
        _exit(127);
      }
-   else
diff --git a/graphics/gimp1/pkg-plist b/graphics/gimp1/pkg-plist
index 4661b034cec3..90d661967954 100644
--- a/graphics/gimp1/pkg-plist
+++ b/graphics/gimp1/pkg-plist
@@ -9,6 +9,8 @@ include/gck/gckmath.h
 include/gck/gcktypes.h
 include/gck/gckui.h
 include/gck/gckvector.h
+include/libgimp/gimpcolorbutton.h
+include/libgimp/gimpcompat.h
 include/libgimp/color_display.h
 include/libgimp/color_selector.h
 include/libgimp/gimp.h
@@ -36,21 +38,22 @@ include/libgimp/parasiteP.h
 include/libgimp/parasiteio.h
 lib/libgck.a
 lib/libgck.so
-lib/libgck.so.10
+lib/libgck.so.11
 lib/libgimp.a
 lib/libgimp.so
-lib/libgimp.so.10
+lib/libgimp.so.11
 lib/libgimpui.a
 lib/libgimpui.so
-lib/libgimpui.so.10
+lib/libgimpui.so.11
 lib/libgpc.a
 lib/libmegawidget.a
 @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.so
-libexec/gimp/1.1/modules/libcolorsel_gtk.so
-libexec/gimp/1.1/modules/libcolorsel_triangle.so
-libexec/gimp/1.1/modules/libcolorsel_water.so
+libexec/gimp/1.1/modules/libcdisplay_gamma.a
+libexec/gimp/1.1/modules/libcolorsel_gtk.a
+libexec/gimp/1.1/modules/libcolorsel_triangle.a
+libexec/gimp/1.1/modules/libcolorsel_water.a
+libexec/gimp/1.1/plug-ins/helpbrowser
 libexec/gimp/1.1/plug-ins/AlienMap
 libexec/gimp/1.1/plug-ins/AlienMap2
 libexec/gimp/1.1/plug-ins/CEL
@@ -1039,6 +1042,7 @@ share/gimp/tips/gimp_tips.ja.txt
 share/gimp/tips/gimp_tips.it.txt
 share/gimp/tips/gimp_conseils.fr.txt
 share/gimp/tips/gimp_tips.ru.txt
+share/gimp/tips/gimp_tips.ko.txt
 share/gimp/unitrc
 share/gimp/user_install
 share/locale/de/LC_MESSAGES/gimp.mo
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 422abfdf813a..57f50f846c2d 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -1,16 +1,17 @@
 # New ports collection makefile for:    Gimp
-# Version required:     1.1.10
+# Version required:     1.1.11
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gimp-1.1.10
+DISTNAME=	gimp-${VERSION}
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v1.1.10/ \
-		ftp://ftp.cs.umn.edu/pub/gimp/gimp/unstable/v1.1.10/ \
-		http://www.ameth.org/gimp/pub/gimp/unstable/v1.1.10/
+MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v${VERSION}/ \
+		ftp://ftp.cs.umn.edu/pub/gimp/gimp/unstable/v${VERSION}/ \
+		http://www.ameth.org/gimp/pub/gimp/unstable/v${VERSION}/ \
+		ftp://ftp.gimp.org/pub/gimp/unstable/old/v${VERSION}/
 
 MAINTAINER=	erich@FreeBSD.org
 
@@ -22,6 +23,7 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		png.3:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
+VERSION=	1.1.11
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
diff --git a/graphics/gimpshop/distinfo b/graphics/gimpshop/distinfo
index fb6e47677422..d81ead692c87 100644
--- a/graphics/gimpshop/distinfo
+++ b/graphics/gimpshop/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.1.10.tar.bz2) = a5bf11f5bd1050d9d0ed1fc941f4302c
+MD5 (gimp-1.1.11.tar.bz2) = c22832463f6a6333c1cab549dba8bcbc
diff --git a/graphics/gimpshop/files/patch-ab b/graphics/gimpshop/files/patch-ab
index cc3600f85cac..4a00a2ad60f9 100644
--- a/graphics/gimpshop/files/patch-ab
+++ b/graphics/gimpshop/files/patch-ab
@@ -1,6 +1,6 @@
---- plug-ins/common/url.c.orig	Sat May 30 15:32:36 1998
-+++ plug-ins/common/url.c	Sun Jun  7 10:09:34 1998
-@@ -146,8 +146,8 @@
+--- plug-ins/common/url.c	Sun Nov  7 19:24:37 1999
++++ plug-ins/common/url.c.new	Sun Nov  7 19:26:39 1999
+@@ -151,8 +151,8 @@
      }
    else if (pid == 0)
      {
@@ -8,6 +8,6 @@
 -      g_message ("url: exec failed: wget: %s\n", g_strerror(errno));
 +      execlp ("fetch", "fetch", filename, "-p -o", tmpname, NULL);
 +      g_message ("url: exec failed: fetch: %s\n", g_strerror(errno));
+       g_free (tmpname);
        _exit(127);
      }
-   else
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index 4661b034cec3..90d661967954 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -9,6 +9,8 @@ include/gck/gckmath.h
 include/gck/gcktypes.h
 include/gck/gckui.h
 include/gck/gckvector.h
+include/libgimp/gimpcolorbutton.h
+include/libgimp/gimpcompat.h
 include/libgimp/color_display.h
 include/libgimp/color_selector.h
 include/libgimp/gimp.h
@@ -36,21 +38,22 @@ include/libgimp/parasiteP.h
 include/libgimp/parasiteio.h
 lib/libgck.a
 lib/libgck.so
-lib/libgck.so.10
+lib/libgck.so.11
 lib/libgimp.a
 lib/libgimp.so
-lib/libgimp.so.10
+lib/libgimp.so.11
 lib/libgimpui.a
 lib/libgimpui.so
-lib/libgimpui.so.10
+lib/libgimpui.so.11
 lib/libgpc.a
 lib/libmegawidget.a
 @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.so
-libexec/gimp/1.1/modules/libcolorsel_gtk.so
-libexec/gimp/1.1/modules/libcolorsel_triangle.so
-libexec/gimp/1.1/modules/libcolorsel_water.so
+libexec/gimp/1.1/modules/libcdisplay_gamma.a
+libexec/gimp/1.1/modules/libcolorsel_gtk.a
+libexec/gimp/1.1/modules/libcolorsel_triangle.a
+libexec/gimp/1.1/modules/libcolorsel_water.a
+libexec/gimp/1.1/plug-ins/helpbrowser
 libexec/gimp/1.1/plug-ins/AlienMap
 libexec/gimp/1.1/plug-ins/AlienMap2
 libexec/gimp/1.1/plug-ins/CEL
@@ -1039,6 +1042,7 @@ share/gimp/tips/gimp_tips.ja.txt
 share/gimp/tips/gimp_tips.it.txt
 share/gimp/tips/gimp_conseils.fr.txt
 share/gimp/tips/gimp_tips.ru.txt
+share/gimp/tips/gimp_tips.ko.txt
 share/gimp/unitrc
 share/gimp/user_install
 share/locale/de/LC_MESSAGES/gimp.mo