- Update to 2.2.3

- Add new WITHOUT_ knobs to make a "gimp-lite" [1]

PR:		ports/76212 [1]
Submitted by:	oliver [1]

9 files changed, 243 insertions, 60 deletions

diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 670158df9280..3a7f9b3fe162 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	2.2.2
+PORTVERSION=	2.2.3
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -21,14 +21,6 @@ MASTER_SITE_SUBDIR=	gimp/v${PORTVERSION:R}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNU Image Manipulation Program
 
-LIB_DEPENDS=	aa.1:${PORTSDIR}/graphics/aalib \
-		exif.10:${PORTSDIR}/graphics/libexif \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		mng.1:${PORTSDIR}/graphics/libmng \
-		png.5:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		wmf.2:${PORTSDIR}/graphics/libwmf
-
 CONFLICTS=	gimp-1.*
 
 SHLIBVER?=	200
@@ -38,7 +30,7 @@ USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=15
-USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2 librsvg2
+USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2
 WANT_GNOME=	yes
 INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
@@ -55,6 +47,66 @@ GIMP_DISTFILE=	${DISTDIR}/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 MAN1=	gimp.1 gimp-2.2.1 gimp-remote.1 gimp-remote-2.2.1 gimptool-2.0.1
 MAN5=	gimprc.5 gimprc-2.2.5
 
+.if defined(WITHOUT_WMF) && !exists(${LOCALBASE}/bin/libwmf-config)
+PLIST_SUB+=		WMF="@comment "
+.else
+LIB_DEPENDS+=		wmf.2:${PORTSDIR}/graphics/libwmf
+PLIST_SUB+=		WMF=""
+.endif
+
+.if defined(WITHOUT_RSVG2) && !exists(${X11BASE}/bin/rsvg)
+PLIST_SUB+=		SVG="@comment "
+.else
+USE_GNOME+=		librsvg2
+PLIST_SUB+=		SVG=""
+.endif
+
+.if defined(WITHOUT_AA)
+CONFIGURE_ARGS+=	--without-aa
+PLIST_SUB+=		AA="@comment "
+.else
+LIB_DEPENDS+=		aa.1:${PORTSDIR}/graphics/aalib
+PLIST_SUB+=		AA=""
+.endif
+
+.if defined(WITHOUT_EXIF)
+CONFIGURE_ARGS+=	--without-libexif
+.else
+LIB_DEPENDS+=		exif.10:${PORTSDIR}/graphics/libexif
+.endif
+
+.if defined(WITHOUT_MNG)
+CONFIGURE_ARGS+=	--without-libmng
+PLIST_SUB+=		MNG="@comment "
+.else
+LIB_DEPENDS+=		mng.1:${PORTSDIR}/graphics/libmng
+PLIST_SUB+=		MNG=""
+.endif
+
+.if defined(WITHOUT_PNG)
+CONFIGURE_ARGS+=	--without-libpng
+PLIST_SUB+=		PNG="@comment "
+.else
+LIB_DEPENDS+=		png.5:${PORTSDIR}/graphics/png
+PLIST_SUB+=		PNG=""
+.endif
+
+.if defined(WITHOUT_JPEG)
+CONFIGURE_ARGS+=	--without-libjpeg
+PLIST_SUB+=		JPEG="@comment "
+.else
+LIB_DEPENDS+=		jpeg.9:${PORTSDIR}/graphics/jpeg
+PLIST_SUB+=		JPEG:=""
+.endif
+
+.if defined(WITHOUT_TIFF)
+CONFIGURE_ARGS+=	--without-libtiff
+PLIST_SUB+=		TIFF="@comment "
+.else
+LIB_DEPENDS+=		tiff.4:${PORTSDIR}/graphics/tiff
+PLIST_SUB+=		TIFF=""
+.endif
+
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 .endif
@@ -110,6 +162,14 @@ pre-everything::
 	@${ECHO_MSG} "	WITHOUT_PRINT=yes	Turns off GIMP printing"
 	@${ECHO_MSG} "	WITH_HTML_HELP_BROWSER=yes	Turns on the GIMP help browser"
 	@${ECHO_MSG} "	WITH_MP=yes 		Turns on multiple-processor support"
+	@${ECHO_MSG} "	WITHOUT_WMF=yes		Turns off wmf support"
+	@${ECHO_MSG} "	WITHOUT_RSVG2=yes	Turns off rsvg2 support"
+	@${ECHO_MSG} "	WITHOUT_AA=yes		Turns off aa support"
+	@${ECHO_MSG} "	WITHOUT_EXIF=yes	Turns off exif support"
+	@${ECHO_MSG} "	WITHOUT_MNG=yes		Turns off mng support"
+	@${ECHO_MSG} "	WITHOUT_PNG=yes		Turns off png support"
+	@${ECHO_MSG} "	WITHOUT_JPEG=yes	Turns off jpeg support"
+	@${ECHO_MSG} "	WITHOUT_TIFF=yes	Turns off tiff support"
 	@${ECHO_MSG} ""
 
 .if defined(GNOME_ENABLED)
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index e87eb2851d71..3f0b6b7af701 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1,2 +1,2 @@
-MD5 (gimp-2.2.2.tar.bz2) = 155483d3fd4d9a368c3ebd3a680c3439
-SIZE (gimp-2.2.2.tar.bz2) = 14435823
+MD5 (gimp-2.2.3.tar.bz2) = a65ea578d42a8c6658296aa52547063d
+SIZE (gimp-2.2.3.tar.bz2) = 13810493
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index c08446f2be4a..0756deef2583 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -170,6 +170,7 @@ include/gimp-2.0/libgimpwidgets/gimpwidgets.h
 include/gimp-2.0/libgimpwidgets/gimpwidgetstypes.h
 libexec/gimp/2.2/environ/default.env
 %%PYTHON:%%libexec/gimp/2.2/environ/pygimp.env
+%%PYTHON:%%libexec/gimp/2.2/python/pygimp-logo.png
 libexec/gimp/2.2/modules/libcdisplay_colorblind.so
 libexec/gimp/2.2/modules/libcdisplay_gamma.so
 libexec/gimp/2.2/modules/libcdisplay_highcontrast.so
@@ -184,7 +185,7 @@ libexec/gimp/2.2/plug-ins/CML_explorer
 libexec/gimp/2.2/plug-ins/FractalExplorer
 libexec/gimp/2.2/plug-ins/Lighting
 libexec/gimp/2.2/plug-ins/MapObject
-libexec/gimp/2.2/plug-ins/aa
+%%AA%%libexec/gimp/2.2/plug-ins/aa
 libexec/gimp/2.2/plug-ins/align_layers
 libexec/gimp/2.2/plug-ins/animationplay
 libexec/gimp/2.2/plug-ins/animoptimize
@@ -262,7 +263,7 @@ libexec/gimp/2.2/plug-ins/illusion
 libexec/gimp/2.2/plug-ins/imagemap
 libexec/gimp/2.2/plug-ins/iwarp
 libexec/gimp/2.2/plug-ins/jigsaw
-libexec/gimp/2.2/plug-ins/jpeg
+%%JPEG%%libexec/gimp/2.2/plug-ins/jpeg
 libexec/gimp/2.2/plug-ins/laplace
 libexec/gimp/2.2/plug-ins/lic
 libexec/gimp/2.2/plug-ins/mail
@@ -270,7 +271,7 @@ libexec/gimp/2.2/plug-ins/mapcolor
 libexec/gimp/2.2/plug-ins/max_rgb
 libexec/gimp/2.2/plug-ins/maze
 libexec/gimp/2.2/plug-ins/mblur
-libexec/gimp/2.2/plug-ins/mng
+%%MNG%%libexec/gimp/2.2/plug-ins/mng
 libexec/gimp/2.2/plug-ins/mosaic
 libexec/gimp/2.2/plug-ins/neon
 libexec/gimp/2.2/plug-ins/newsprint
@@ -289,7 +290,7 @@ libexec/gimp/2.2/plug-ins/pix
 libexec/gimp/2.2/plug-ins/pixelize
 libexec/gimp/2.2/plug-ins/plasma
 libexec/gimp/2.2/plug-ins/plugin-browser
-libexec/gimp/2.2/plug-ins/png
+%%PNG%%libexec/gimp/2.2/plug-ins/png
 libexec/gimp/2.2/plug-ins/pnm
 libexec/gimp/2.2/plug-ins/polar
 libexec/gimp/2.2/plug-ins/postscript
@@ -327,10 +328,10 @@ libexec/gimp/2.2/plug-ins/spheredesigner
 libexec/gimp/2.2/plug-ins/spread
 libexec/gimp/2.2/plug-ins/struc
 libexec/gimp/2.2/plug-ins/sunras
-libexec/gimp/2.2/plug-ins/svg
+%%SVG%%libexec/gimp/2.2/plug-ins/svg
 libexec/gimp/2.2/plug-ins/tga
 libexec/gimp/2.2/plug-ins/threshold_alpha
-libexec/gimp/2.2/plug-ins/tiff
+%%TIFF%%libexec/gimp/2.2/plug-ins/tiff
 libexec/gimp/2.2/plug-ins/tile
 libexec/gimp/2.2/plug-ins/tileit
 libexec/gimp/2.2/plug-ins/tiler
@@ -347,9 +348,9 @@ libexec/gimp/2.2/plug-ins/webbrowser
 libexec/gimp/2.2/plug-ins/whirlpinch
 libexec/gimp/2.2/plug-ins/wind
 libexec/gimp/2.2/plug-ins/winicon
-libexec/gimp/2.2/plug-ins/wmf
+%%WMF%%libexec/gimp/2.2/plug-ins/wmf
 libexec/gimp/2.2/plug-ins/xbm
-libexec/gimp/2.2/plug-ins/xjt
+%%JPEG%%libexec/gimp/2.2/plug-ins/xjt
 libexec/gimp/2.2/plug-ins/xpm
 libexec/gimp/2.2/plug-ins/xwd
 libexec/gimp/2.2/plug-ins/zealouscrop
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 670158df9280..3a7f9b3fe162 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	2.2.2
+PORTVERSION=	2.2.3
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -21,14 +21,6 @@ MASTER_SITE_SUBDIR=	gimp/v${PORTVERSION:R}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNU Image Manipulation Program
 
-LIB_DEPENDS=	aa.1:${PORTSDIR}/graphics/aalib \
-		exif.10:${PORTSDIR}/graphics/libexif \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		mng.1:${PORTSDIR}/graphics/libmng \
-		png.5:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		wmf.2:${PORTSDIR}/graphics/libwmf
-
 CONFLICTS=	gimp-1.*
 
 SHLIBVER?=	200
@@ -38,7 +30,7 @@ USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=15
-USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2 librsvg2
+USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2
 WANT_GNOME=	yes
 INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
@@ -55,6 +47,66 @@ GIMP_DISTFILE=	${DISTDIR}/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 MAN1=	gimp.1 gimp-2.2.1 gimp-remote.1 gimp-remote-2.2.1 gimptool-2.0.1
 MAN5=	gimprc.5 gimprc-2.2.5
 
+.if defined(WITHOUT_WMF) && !exists(${LOCALBASE}/bin/libwmf-config)
+PLIST_SUB+=		WMF="@comment "
+.else
+LIB_DEPENDS+=		wmf.2:${PORTSDIR}/graphics/libwmf
+PLIST_SUB+=		WMF=""
+.endif
+
+.if defined(WITHOUT_RSVG2) && !exists(${X11BASE}/bin/rsvg)
+PLIST_SUB+=		SVG="@comment "
+.else
+USE_GNOME+=		librsvg2
+PLIST_SUB+=		SVG=""
+.endif
+
+.if defined(WITHOUT_AA)
+CONFIGURE_ARGS+=	--without-aa
+PLIST_SUB+=		AA="@comment "
+.else
+LIB_DEPENDS+=		aa.1:${PORTSDIR}/graphics/aalib
+PLIST_SUB+=		AA=""
+.endif
+
+.if defined(WITHOUT_EXIF)
+CONFIGURE_ARGS+=	--without-libexif
+.else
+LIB_DEPENDS+=		exif.10:${PORTSDIR}/graphics/libexif
+.endif
+
+.if defined(WITHOUT_MNG)
+CONFIGURE_ARGS+=	--without-libmng
+PLIST_SUB+=		MNG="@comment "
+.else
+LIB_DEPENDS+=		mng.1:${PORTSDIR}/graphics/libmng
+PLIST_SUB+=		MNG=""
+.endif
+
+.if defined(WITHOUT_PNG)
+CONFIGURE_ARGS+=	--without-libpng
+PLIST_SUB+=		PNG="@comment "
+.else
+LIB_DEPENDS+=		png.5:${PORTSDIR}/graphics/png
+PLIST_SUB+=		PNG=""
+.endif
+
+.if defined(WITHOUT_JPEG)
+CONFIGURE_ARGS+=	--without-libjpeg
+PLIST_SUB+=		JPEG="@comment "
+.else
+LIB_DEPENDS+=		jpeg.9:${PORTSDIR}/graphics/jpeg
+PLIST_SUB+=		JPEG:=""
+.endif
+
+.if defined(WITHOUT_TIFF)
+CONFIGURE_ARGS+=	--without-libtiff
+PLIST_SUB+=		TIFF="@comment "
+.else
+LIB_DEPENDS+=		tiff.4:${PORTSDIR}/graphics/tiff
+PLIST_SUB+=		TIFF=""
+.endif
+
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 .endif
@@ -110,6 +162,14 @@ pre-everything::
 	@${ECHO_MSG} "	WITHOUT_PRINT=yes	Turns off GIMP printing"
 	@${ECHO_MSG} "	WITH_HTML_HELP_BROWSER=yes	Turns on the GIMP help browser"
 	@${ECHO_MSG} "	WITH_MP=yes 		Turns on multiple-processor support"
+	@${ECHO_MSG} "	WITHOUT_WMF=yes		Turns off wmf support"
+	@${ECHO_MSG} "	WITHOUT_RSVG2=yes	Turns off rsvg2 support"
+	@${ECHO_MSG} "	WITHOUT_AA=yes		Turns off aa support"
+	@${ECHO_MSG} "	WITHOUT_EXIF=yes	Turns off exif support"
+	@${ECHO_MSG} "	WITHOUT_MNG=yes		Turns off mng support"
+	@${ECHO_MSG} "	WITHOUT_PNG=yes		Turns off png support"
+	@${ECHO_MSG} "	WITHOUT_JPEG=yes	Turns off jpeg support"
+	@${ECHO_MSG} "	WITHOUT_TIFF=yes	Turns off tiff support"
 	@${ECHO_MSG} ""
 
 .if defined(GNOME_ENABLED)
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index e87eb2851d71..3f0b6b7af701 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,2 +1,2 @@
-MD5 (gimp-2.2.2.tar.bz2) = 155483d3fd4d9a368c3ebd3a680c3439
-SIZE (gimp-2.2.2.tar.bz2) = 14435823
+MD5 (gimp-2.2.3.tar.bz2) = a65ea578d42a8c6658296aa52547063d
+SIZE (gimp-2.2.3.tar.bz2) = 13810493
diff --git a/graphics/gimp/pkg-plist b/graphics/gimp/pkg-plist
index c08446f2be4a..0756deef2583 100644
--- a/graphics/gimp/pkg-plist
+++ b/graphics/gimp/pkg-plist
@@ -170,6 +170,7 @@ include/gimp-2.0/libgimpwidgets/gimpwidgets.h
 include/gimp-2.0/libgimpwidgets/gimpwidgetstypes.h
 libexec/gimp/2.2/environ/default.env
 %%PYTHON:%%libexec/gimp/2.2/environ/pygimp.env
+%%PYTHON:%%libexec/gimp/2.2/python/pygimp-logo.png
 libexec/gimp/2.2/modules/libcdisplay_colorblind.so
 libexec/gimp/2.2/modules/libcdisplay_gamma.so
 libexec/gimp/2.2/modules/libcdisplay_highcontrast.so
@@ -184,7 +185,7 @@ libexec/gimp/2.2/plug-ins/CML_explorer
 libexec/gimp/2.2/plug-ins/FractalExplorer
 libexec/gimp/2.2/plug-ins/Lighting
 libexec/gimp/2.2/plug-ins/MapObject
-libexec/gimp/2.2/plug-ins/aa
+%%AA%%libexec/gimp/2.2/plug-ins/aa
 libexec/gimp/2.2/plug-ins/align_layers
 libexec/gimp/2.2/plug-ins/animationplay
 libexec/gimp/2.2/plug-ins/animoptimize
@@ -262,7 +263,7 @@ libexec/gimp/2.2/plug-ins/illusion
 libexec/gimp/2.2/plug-ins/imagemap
 libexec/gimp/2.2/plug-ins/iwarp
 libexec/gimp/2.2/plug-ins/jigsaw
-libexec/gimp/2.2/plug-ins/jpeg
+%%JPEG%%libexec/gimp/2.2/plug-ins/jpeg
 libexec/gimp/2.2/plug-ins/laplace
 libexec/gimp/2.2/plug-ins/lic
 libexec/gimp/2.2/plug-ins/mail
@@ -270,7 +271,7 @@ libexec/gimp/2.2/plug-ins/mapcolor
 libexec/gimp/2.2/plug-ins/max_rgb
 libexec/gimp/2.2/plug-ins/maze
 libexec/gimp/2.2/plug-ins/mblur
-libexec/gimp/2.2/plug-ins/mng
+%%MNG%%libexec/gimp/2.2/plug-ins/mng
 libexec/gimp/2.2/plug-ins/mosaic
 libexec/gimp/2.2/plug-ins/neon
 libexec/gimp/2.2/plug-ins/newsprint
@@ -289,7 +290,7 @@ libexec/gimp/2.2/plug-ins/pix
 libexec/gimp/2.2/plug-ins/pixelize
 libexec/gimp/2.2/plug-ins/plasma
 libexec/gimp/2.2/plug-ins/plugin-browser
-libexec/gimp/2.2/plug-ins/png
+%%PNG%%libexec/gimp/2.2/plug-ins/png
 libexec/gimp/2.2/plug-ins/pnm
 libexec/gimp/2.2/plug-ins/polar
 libexec/gimp/2.2/plug-ins/postscript
@@ -327,10 +328,10 @@ libexec/gimp/2.2/plug-ins/spheredesigner
 libexec/gimp/2.2/plug-ins/spread
 libexec/gimp/2.2/plug-ins/struc
 libexec/gimp/2.2/plug-ins/sunras
-libexec/gimp/2.2/plug-ins/svg
+%%SVG%%libexec/gimp/2.2/plug-ins/svg
 libexec/gimp/2.2/plug-ins/tga
 libexec/gimp/2.2/plug-ins/threshold_alpha
-libexec/gimp/2.2/plug-ins/tiff
+%%TIFF%%libexec/gimp/2.2/plug-ins/tiff
 libexec/gimp/2.2/plug-ins/tile
 libexec/gimp/2.2/plug-ins/tileit
 libexec/gimp/2.2/plug-ins/tiler
@@ -347,9 +348,9 @@ libexec/gimp/2.2/plug-ins/webbrowser
 libexec/gimp/2.2/plug-ins/whirlpinch
 libexec/gimp/2.2/plug-ins/wind
 libexec/gimp/2.2/plug-ins/winicon
-libexec/gimp/2.2/plug-ins/wmf
+%%WMF%%libexec/gimp/2.2/plug-ins/wmf
 libexec/gimp/2.2/plug-ins/xbm
-libexec/gimp/2.2/plug-ins/xjt
+%%JPEG%%libexec/gimp/2.2/plug-ins/xjt
 libexec/gimp/2.2/plug-ins/xpm
 libexec/gimp/2.2/plug-ins/xwd
 libexec/gimp/2.2/plug-ins/zealouscrop
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 670158df9280..3a7f9b3fe162 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	2.2.2
+PORTVERSION=	2.2.3
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -21,14 +21,6 @@ MASTER_SITE_SUBDIR=	gimp/v${PORTVERSION:R}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNU Image Manipulation Program
 
-LIB_DEPENDS=	aa.1:${PORTSDIR}/graphics/aalib \
-		exif.10:${PORTSDIR}/graphics/libexif \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		mng.1:${PORTSDIR}/graphics/libmng \
-		png.5:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		wmf.2:${PORTSDIR}/graphics/libwmf
-
 CONFLICTS=	gimp-1.*
 
 SHLIBVER?=	200
@@ -38,7 +30,7 @@ USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=15
-USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2 librsvg2
+USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2
 WANT_GNOME=	yes
 INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
@@ -55,6 +47,66 @@ GIMP_DISTFILE=	${DISTDIR}/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 MAN1=	gimp.1 gimp-2.2.1 gimp-remote.1 gimp-remote-2.2.1 gimptool-2.0.1
 MAN5=	gimprc.5 gimprc-2.2.5
 
+.if defined(WITHOUT_WMF) && !exists(${LOCALBASE}/bin/libwmf-config)
+PLIST_SUB+=		WMF="@comment "
+.else
+LIB_DEPENDS+=		wmf.2:${PORTSDIR}/graphics/libwmf
+PLIST_SUB+=		WMF=""
+.endif
+
+.if defined(WITHOUT_RSVG2) && !exists(${X11BASE}/bin/rsvg)
+PLIST_SUB+=		SVG="@comment "
+.else
+USE_GNOME+=		librsvg2
+PLIST_SUB+=		SVG=""
+.endif
+
+.if defined(WITHOUT_AA)
+CONFIGURE_ARGS+=	--without-aa
+PLIST_SUB+=		AA="@comment "
+.else
+LIB_DEPENDS+=		aa.1:${PORTSDIR}/graphics/aalib
+PLIST_SUB+=		AA=""
+.endif
+
+.if defined(WITHOUT_EXIF)
+CONFIGURE_ARGS+=	--without-libexif
+.else
+LIB_DEPENDS+=		exif.10:${PORTSDIR}/graphics/libexif
+.endif
+
+.if defined(WITHOUT_MNG)
+CONFIGURE_ARGS+=	--without-libmng
+PLIST_SUB+=		MNG="@comment "
+.else
+LIB_DEPENDS+=		mng.1:${PORTSDIR}/graphics/libmng
+PLIST_SUB+=		MNG=""
+.endif
+
+.if defined(WITHOUT_PNG)
+CONFIGURE_ARGS+=	--without-libpng
+PLIST_SUB+=		PNG="@comment "
+.else
+LIB_DEPENDS+=		png.5:${PORTSDIR}/graphics/png
+PLIST_SUB+=		PNG=""
+.endif
+
+.if defined(WITHOUT_JPEG)
+CONFIGURE_ARGS+=	--without-libjpeg
+PLIST_SUB+=		JPEG="@comment "
+.else
+LIB_DEPENDS+=		jpeg.9:${PORTSDIR}/graphics/jpeg
+PLIST_SUB+=		JPEG:=""
+.endif
+
+.if defined(WITHOUT_TIFF)
+CONFIGURE_ARGS+=	--without-libtiff
+PLIST_SUB+=		TIFF="@comment "
+.else
+LIB_DEPENDS+=		tiff.4:${PORTSDIR}/graphics/tiff
+PLIST_SUB+=		TIFF=""
+.endif
+
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 .endif
@@ -110,6 +162,14 @@ pre-everything::
 	@${ECHO_MSG} "	WITHOUT_PRINT=yes	Turns off GIMP printing"
 	@${ECHO_MSG} "	WITH_HTML_HELP_BROWSER=yes	Turns on the GIMP help browser"
 	@${ECHO_MSG} "	WITH_MP=yes 		Turns on multiple-processor support"
+	@${ECHO_MSG} "	WITHOUT_WMF=yes		Turns off wmf support"
+	@${ECHO_MSG} "	WITHOUT_RSVG2=yes	Turns off rsvg2 support"
+	@${ECHO_MSG} "	WITHOUT_AA=yes		Turns off aa support"
+	@${ECHO_MSG} "	WITHOUT_EXIF=yes	Turns off exif support"
+	@${ECHO_MSG} "	WITHOUT_MNG=yes		Turns off mng support"
+	@${ECHO_MSG} "	WITHOUT_PNG=yes		Turns off png support"
+	@${ECHO_MSG} "	WITHOUT_JPEG=yes	Turns off jpeg support"
+	@${ECHO_MSG} "	WITHOUT_TIFF=yes	Turns off tiff support"
 	@${ECHO_MSG} ""
 
 .if defined(GNOME_ENABLED)
diff --git a/graphics/gimpshop/distinfo b/graphics/gimpshop/distinfo
index e87eb2851d71..3f0b6b7af701 100644
--- a/graphics/gimpshop/distinfo
+++ b/graphics/gimpshop/distinfo
@@ -1,2 +1,2 @@
-MD5 (gimp-2.2.2.tar.bz2) = 155483d3fd4d9a368c3ebd3a680c3439
-SIZE (gimp-2.2.2.tar.bz2) = 14435823
+MD5 (gimp-2.2.3.tar.bz2) = a65ea578d42a8c6658296aa52547063d
+SIZE (gimp-2.2.3.tar.bz2) = 13810493
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index c08446f2be4a..0756deef2583 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -170,6 +170,7 @@ include/gimp-2.0/libgimpwidgets/gimpwidgets.h
 include/gimp-2.0/libgimpwidgets/gimpwidgetstypes.h
 libexec/gimp/2.2/environ/default.env
 %%PYTHON:%%libexec/gimp/2.2/environ/pygimp.env
+%%PYTHON:%%libexec/gimp/2.2/python/pygimp-logo.png
 libexec/gimp/2.2/modules/libcdisplay_colorblind.so
 libexec/gimp/2.2/modules/libcdisplay_gamma.so
 libexec/gimp/2.2/modules/libcdisplay_highcontrast.so
@@ -184,7 +185,7 @@ libexec/gimp/2.2/plug-ins/CML_explorer
 libexec/gimp/2.2/plug-ins/FractalExplorer
 libexec/gimp/2.2/plug-ins/Lighting
 libexec/gimp/2.2/plug-ins/MapObject
-libexec/gimp/2.2/plug-ins/aa
+%%AA%%libexec/gimp/2.2/plug-ins/aa
 libexec/gimp/2.2/plug-ins/align_layers
 libexec/gimp/2.2/plug-ins/animationplay
 libexec/gimp/2.2/plug-ins/animoptimize
@@ -262,7 +263,7 @@ libexec/gimp/2.2/plug-ins/illusion
 libexec/gimp/2.2/plug-ins/imagemap
 libexec/gimp/2.2/plug-ins/iwarp
 libexec/gimp/2.2/plug-ins/jigsaw
-libexec/gimp/2.2/plug-ins/jpeg
+%%JPEG%%libexec/gimp/2.2/plug-ins/jpeg
 libexec/gimp/2.2/plug-ins/laplace
 libexec/gimp/2.2/plug-ins/lic
 libexec/gimp/2.2/plug-ins/mail
@@ -270,7 +271,7 @@ libexec/gimp/2.2/plug-ins/mapcolor
 libexec/gimp/2.2/plug-ins/max_rgb
 libexec/gimp/2.2/plug-ins/maze
 libexec/gimp/2.2/plug-ins/mblur
-libexec/gimp/2.2/plug-ins/mng
+%%MNG%%libexec/gimp/2.2/plug-ins/mng
 libexec/gimp/2.2/plug-ins/mosaic
 libexec/gimp/2.2/plug-ins/neon
 libexec/gimp/2.2/plug-ins/newsprint
@@ -289,7 +290,7 @@ libexec/gimp/2.2/plug-ins/pix
 libexec/gimp/2.2/plug-ins/pixelize
 libexec/gimp/2.2/plug-ins/plasma
 libexec/gimp/2.2/plug-ins/plugin-browser
-libexec/gimp/2.2/plug-ins/png
+%%PNG%%libexec/gimp/2.2/plug-ins/png
 libexec/gimp/2.2/plug-ins/pnm
 libexec/gimp/2.2/plug-ins/polar
 libexec/gimp/2.2/plug-ins/postscript
@@ -327,10 +328,10 @@ libexec/gimp/2.2/plug-ins/spheredesigner
 libexec/gimp/2.2/plug-ins/spread
 libexec/gimp/2.2/plug-ins/struc
 libexec/gimp/2.2/plug-ins/sunras
-libexec/gimp/2.2/plug-ins/svg
+%%SVG%%libexec/gimp/2.2/plug-ins/svg
 libexec/gimp/2.2/plug-ins/tga
 libexec/gimp/2.2/plug-ins/threshold_alpha
-libexec/gimp/2.2/plug-ins/tiff
+%%TIFF%%libexec/gimp/2.2/plug-ins/tiff
 libexec/gimp/2.2/plug-ins/tile
 libexec/gimp/2.2/plug-ins/tileit
 libexec/gimp/2.2/plug-ins/tiler
@@ -347,9 +348,9 @@ libexec/gimp/2.2/plug-ins/webbrowser
 libexec/gimp/2.2/plug-ins/whirlpinch
 libexec/gimp/2.2/plug-ins/wind
 libexec/gimp/2.2/plug-ins/winicon
-libexec/gimp/2.2/plug-ins/wmf
+%%WMF%%libexec/gimp/2.2/plug-ins/wmf
 libexec/gimp/2.2/plug-ins/xbm
-libexec/gimp/2.2/plug-ins/xjt
+%%JPEG%%libexec/gimp/2.2/plug-ins/xjt
 libexec/gimp/2.2/plug-ins/xpm
 libexec/gimp/2.2/plug-ins/xwd
 libexec/gimp/2.2/plug-ins/zealouscrop