2 files changed, 77 insertions, 33 deletions

diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index c595c409719f..a49e931f74ce 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gimp-app
 DISTVERSION=	2.6.6
-PORTREVISION?=	2
+PORTREVISION?=	3
 PORTEPOCH?=	1
 CATEGORIES?=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -25,12 +25,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNU Image Manipulation Program
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS=	exif.12:${PORTSDIR}/graphics/libexif \
-		wmf.2:${PORTSDIR}/graphics/libwmf \
-		poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk \
-		aa.1:${PORTSDIR}/graphics/aalib \
-		mng.1:${PORTSDIR}/graphics/libmng \
-		png.5:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		jpeg.10:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		lcms.1:${PORTSDIR}/graphics/lcms \
@@ -64,12 +59,17 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 .if !defined(GIMP_SLAVE)
 WANT_GNOME=	yes
 
-OPTIONS?=	DEBUG "debugging" off \
+OPTIONS?=	AA "Ascii Art plug-in" on \
 		DBUS "D-BUS support" on \
+		EXIF "reading meta-data from camera/scanner" on \
 		GVFS "Use GVFS for the URI plug-in" on \
 		HELPBROWSER "internal help browser" on \
+		MNG "MNG format support" on \
 		MP "multiple processor support" off \
-		RSVG "SVG format support" on
+		POPPLER "PDF format support" on \
+		RSVG "SVG format support" on \
+		SIMD "Use cpu-specific optimizations if available" off \
+		WMF "wmf plugin" on
 .endif
 
 .include <bsd.port.pre.mk>
@@ -91,24 +91,10 @@ MLINKS=	gimp-2.6.1 gimp.1 \
 	gimp-console-2.6.1 gimp-console.1 \
 	gimprc-2.6.5 gimprc.5
 
-.if defined(WITHOUT_RSVG)
-CONFIGURE_ARGS+=	--without-librsvg
-PLIST_SUB+=		SVG="@comment "
-.else
-USE_GNOME+=		librsvg2
-PLIST_SUB+=		SVG=""
-.endif
-
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
-.if defined(WITH_MP)
-CONFIGURE_ARGS+=	--enable-mp
-.else
-CONFIGURE_ARGS+=	--disable-mp
-.endif
-
 .if ${HAVE_GNOME:Mgnomehier}!="" || defined(WITH_GNOME)
 USE_GNOME+=		desktopfileutils gnomehier
 PLIST_SUB+=		GNOME=""
@@ -116,13 +102,12 @@ PLIST_SUB+=		GNOME=""
 PLIST_SUB+=		GNOME="@comment "
 .endif
 
-.if defined(WITH_HELPBROWSER)
-LIB_DEPENDS+=		webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2
-CONFIGURE_ARGS+=	--with-webkit
-PLIST_SUB+=		HELPBROWSER=""
+.if defined(WITH_AA)
+LIB_DEPENDS+=		aa.1:${PORTSDIR}/graphics/aalib
+PLIST_SUB+=		AA=""
 .else
-CONFIGURE_ARGS+=	--without-webkit
-PLIST_SUB+=		HELPBROWSER="@comment "
+CONFIGURE_ARGS+=	--without-aa
+PLIST_SUB+=		AA="@comment "
 .endif
 
 .if defined(WITH_DBUS)
@@ -132,6 +117,12 @@ CONFIGURE_ARGS+=	--with-dbus
 CONFIGURE_ARGS+=	--without-dbus
 .endif
 
+.if defined(WITH_EXIF)
+LIB_DEPENDS+=		exif.12:${PORTSDIR}/graphics/libexif
+.else
+CONFIGURE_ARGS+=	--without-libexif
+.endif
+
 .if defined(WITH_GVFS) || ${HAVE_GNOME:Mgvfs}!=""
 LIB_DEPENDS+=	gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
 USE_GNOME+=	gvfs
@@ -140,6 +131,59 @@ USE_GNOME+=	libgnomeui
 .  endif
 .endif
 
+.if defined(WITH_HELPBROWSER)
+LIB_DEPENDS+=		webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2
+CONFIGURE_ARGS+=	--with-webkit
+PLIST_SUB+=		HELPBROWSER=""
+.else
+CONFIGURE_ARGS+=	--without-webkit
+PLIST_SUB+=		HELPBROWSER="@comment "
+.endif
+
+.if defined(WITH_MNG)
+LIB_DEPENDS+=		mng.1:${PORTSDIR}/graphics/libmng
+PLIST_SUB+=		MNG=""
+.else
+CONFIGURE_ARGS+=	--without-libmng
+PLIST_SUB+=		MNG="@comment "
+.endif
+
+.if defined(WITH_MP)
+CONFIGURE_ARGS+=	--enable-mp
+.else
+CONFIGURE_ARGS+=	--disable-mp
+.endif
+
+.if defined(WITH_POPPLER)
+LIB_DEPENDS+=		poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk
+PLIST_SUB+=		POPPLER=""
+.else
+CONFIGURE_ARGS+=	--without-poppler
+PLIST_SUB+=		POPPLER="@comment "
+.endif
+
+.if defined(WITH_RSVG)
+USE_GNOME+=		librsvg2
+PLIST_SUB+=		SVG=""
+.else
+CONFIGURE_ARGS+=	--without-librsvg
+PLIST_SUB+=		SVG="@comment "
+.endif
+
+.if defined(WITH_WMF)
+LIB_DEPENDS+=		wmf.2:${PORTSDIR}/graphics/libwmf
+PLIST_SUB+=		WMF=""
+.else
+CONFIGURE_ARGS+=	--without-wmf
+PLIST_SUB+=		WMF="@comment "
+.endif
+
+.if !defined(WITH_SIMD)
+CONFIGURE_ARGS+=	--disable-mmx \
+			--disable-sse \
+			--disable-altivec
+.endif
+
 .endif
 
 post-patch:
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index ca271443a601..3b4a4ef60482 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -334,7 +334,7 @@ libexec/gimp/2.2/plug-ins/edge-neon
 libexec/gimp/2.2/plug-ins/edge-sobel
 libexec/gimp/2.2/plug-ins/emboss
 libexec/gimp/2.2/plug-ins/engrave
-libexec/gimp/2.2/plug-ins/file-aa
+%%AA%%libexec/gimp/2.2/plug-ins/file-aa
 libexec/gimp/2.2/plug-ins/file-bmp
 libexec/gimp/2.2/plug-ins/file-cel
 libexec/gimp/2.2/plug-ins/file-compressor
@@ -353,10 +353,10 @@ libexec/gimp/2.2/plug-ins/file-header
 libexec/gimp/2.2/plug-ins/file-html-table
 libexec/gimp/2.2/plug-ins/file-ico
 libexec/gimp/2.2/plug-ins/file-jpeg
-libexec/gimp/2.2/plug-ins/file-mng
+%%MNG%%libexec/gimp/2.2/plug-ins/file-mng
 libexec/gimp/2.2/plug-ins/file-pat
 libexec/gimp/2.2/plug-ins/file-pcx
-libexec/gimp/2.2/plug-ins/file-pdf
+%%POPPLER%%libexec/gimp/2.2/plug-ins/file-pdf
 libexec/gimp/2.2/plug-ins/file-pix
 libexec/gimp/2.2/plug-ins/file-png
 libexec/gimp/2.2/plug-ins/file-pnm
@@ -372,7 +372,7 @@ libexec/gimp/2.2/plug-ins/file-tga
 libexec/gimp/2.2/plug-ins/file-tiff-load
 libexec/gimp/2.2/plug-ins/file-tiff-save
 libexec/gimp/2.2/plug-ins/file-uri
-libexec/gimp/2.2/plug-ins/file-wmf
+%%WMF%%libexec/gimp/2.2/plug-ins/file-wmf
 libexec/gimp/2.2/plug-ins/file-xbm
 libexec/gimp/2.2/plug-ins/file-xjt
 libexec/gimp/2.2/plug-ins/file-xpm