12 files changed, 9 insertions, 48 deletions

diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 53c67f283f8c..161c015fd9b3 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	2.2.0
-PORTREVISION=	2
+PORTVERSION=	2.2.1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index 649f4bb700b1..6156373202ea 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1,2 +1,2 @@
-MD5 (gimp-2.2.0.tar.bz2) = 7fa66cfd3a2a67f95c3c80307e46e4dd
-SIZE (gimp-2.2.0.tar.bz2) = 13806207
+MD5 (gimp-2.2.1.tar.bz2) = bfc5ebe61113124353b86499b1bfe889
+SIZE (gimp-2.2.1.tar.bz2) = 13788305
diff --git a/graphics/gimp-app/files/patch-plug-ins-pygimp-Makefile.in b/graphics/gimp-app/files/patch-plug-ins-pygimp-Makefile.in
deleted file mode 100644
index 4ec8ad5492bf..000000000000
--- a/graphics/gimp-app/files/patch-plug-ins-pygimp-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- plug-ins/pygimp/Makefile.in.orig	Fri Dec 24 15:37:44 2004
-+++ plug-ins/pygimp/Makefile.in	Fri Dec 24 16:14:44 2004
-@@ -433,7 +433,7 @@
- 	gimpfu.py
- 
- 
--pygimp_DATA = pygimp-logo.png
-+pygimp_DATA =
- 
- pyenvdir = $(gimpplugindir)/environ
- 
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index 370555c83093..c08446f2be4a 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -1283,7 +1283,6 @@ share/gimp/scripts/alien-glow-bullet.scm
 share/gimp/scripts/alien-glow-button.scm
 share/gimp/scripts/alien-glow-logo.scm
 share/gimp/scripts/alien-neon-logo.scm
-share/gimp/scripts/asc2img.scm
 share/gimp/scripts/basic1-logo.scm
 share/gimp/scripts/basic2-logo.scm
 share/gimp/scripts/beveled-button.scm
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 53c67f283f8c..161c015fd9b3 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	2.2.0
-PORTREVISION=	2
+PORTVERSION=	2.2.1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index 649f4bb700b1..6156373202ea 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,2 +1,2 @@
-MD5 (gimp-2.2.0.tar.bz2) = 7fa66cfd3a2a67f95c3c80307e46e4dd
-SIZE (gimp-2.2.0.tar.bz2) = 13806207
+MD5 (gimp-2.2.1.tar.bz2) = bfc5ebe61113124353b86499b1bfe889
+SIZE (gimp-2.2.1.tar.bz2) = 13788305
diff --git a/graphics/gimp/files/patch-plug-ins-pygimp-Makefile.in b/graphics/gimp/files/patch-plug-ins-pygimp-Makefile.in
deleted file mode 100644
index 4ec8ad5492bf..000000000000
--- a/graphics/gimp/files/patch-plug-ins-pygimp-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- plug-ins/pygimp/Makefile.in.orig	Fri Dec 24 15:37:44 2004
-+++ plug-ins/pygimp/Makefile.in	Fri Dec 24 16:14:44 2004
-@@ -433,7 +433,7 @@
- 	gimpfu.py
- 
- 
--pygimp_DATA = pygimp-logo.png
-+pygimp_DATA =
- 
- pyenvdir = $(gimpplugindir)/environ
- 
diff --git a/graphics/gimp/pkg-plist b/graphics/gimp/pkg-plist
index 370555c83093..c08446f2be4a 100644
--- a/graphics/gimp/pkg-plist
+++ b/graphics/gimp/pkg-plist
@@ -1283,7 +1283,6 @@ share/gimp/scripts/alien-glow-bullet.scm
 share/gimp/scripts/alien-glow-button.scm
 share/gimp/scripts/alien-glow-logo.scm
 share/gimp/scripts/alien-neon-logo.scm
-share/gimp/scripts/asc2img.scm
 share/gimp/scripts/basic1-logo.scm
 share/gimp/scripts/basic2-logo.scm
 share/gimp/scripts/beveled-button.scm
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 53c67f283f8c..161c015fd9b3 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	2.2.0
-PORTREVISION=	2
+PORTVERSION=	2.2.1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
diff --git a/graphics/gimpshop/distinfo b/graphics/gimpshop/distinfo
index 649f4bb700b1..6156373202ea 100644
--- a/graphics/gimpshop/distinfo
+++ b/graphics/gimpshop/distinfo
@@ -1,2 +1,2 @@
-MD5 (gimp-2.2.0.tar.bz2) = 7fa66cfd3a2a67f95c3c80307e46e4dd
-SIZE (gimp-2.2.0.tar.bz2) = 13806207
+MD5 (gimp-2.2.1.tar.bz2) = bfc5ebe61113124353b86499b1bfe889
+SIZE (gimp-2.2.1.tar.bz2) = 13788305
diff --git a/graphics/gimpshop/files/patch-plug-ins-pygimp-Makefile.in b/graphics/gimpshop/files/patch-plug-ins-pygimp-Makefile.in
deleted file mode 100644
index 4ec8ad5492bf..000000000000
--- a/graphics/gimpshop/files/patch-plug-ins-pygimp-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- plug-ins/pygimp/Makefile.in.orig	Fri Dec 24 15:37:44 2004
-+++ plug-ins/pygimp/Makefile.in	Fri Dec 24 16:14:44 2004
-@@ -433,7 +433,7 @@
- 	gimpfu.py
- 
- 
--pygimp_DATA = pygimp-logo.png
-+pygimp_DATA =
- 
- pyenvdir = $(gimpplugindir)/environ
- 
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index 370555c83093..c08446f2be4a 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -1283,7 +1283,6 @@ share/gimp/scripts/alien-glow-bullet.scm
 share/gimp/scripts/alien-glow-button.scm
 share/gimp/scripts/alien-glow-logo.scm
 share/gimp/scripts/alien-neon-logo.scm
-share/gimp/scripts/asc2img.scm
 share/gimp/scripts/basic1-logo.scm
 share/gimp/scripts/basic2-logo.scm
 share/gimp/scripts/beveled-button.scm