- Fix OPTIONS and PLIST

- Add dependency on ruby
- Bump PORTREVISION

2 files changed, 55 insertions, 39 deletions

diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile
index fc62a982a67e..1e38ea5fdf34 100644
--- a/graphics/gegl/Makefile
+++ b/graphics/gegl/Makefile
@@ -7,31 +7,31 @@
 
 PORTNAME=	gegl
 PORTVERSION=	0.0.${GEGL_MINOR}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gegl/0.0/
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	A graph based image processing framework
 
-LIB_DEPENDS=	babl-0.0:${PORTSDIR}/x11/babl \
-    		png.5:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	babl-0.0:${PORTSDIR}/x11/babl
 
 OPTIONS=	CAIRO		"Enable Cairo" on \
-		FFMPEG		"Enable ffmpeg" on \
-		GTK		"Enable GTK+" on \
+		FFMPEG		"Enable videos through ffmpeg" on \
 		GRAPHVIZ	"Enable Graphviz" on \
-		JPEG		"Enable JPEG" on \
-		OPENEXR		"Enable OpenEXR" on \
-		OPENRAW		"Enable OpenRAW" on \
-		PANGO		"Enable Pango" on \
-		RSVG		"Enable RSVG" on \
+		JPEG		"Enable JPEG format support" on \
+		OPENEXR		"Enable High Dynamic Range (HDR) format support" on \
+		OPENRAW		"Enable RAW camera format support" on \
+		PANGO		"Enable rendering through Pango " on \
+		PNG		"Enable PNG format support" on \
+		RSVG		"Enable RSVG format support" on \
 		SPIRO		"Enable Spiro" on \
 		SDL		"Enable SDL" on
 
-USE_GNOME=	glib20 pkgconfig gnomehack
+USE_GNOME=	gtk20 glib20 pkgconfig gnomehack
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_RUBY=	build
 USE_LDCONFIG=	${PREFIX}/lib/gegl-0.0
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -50,20 +50,18 @@ EXAMPLES=	2geglbuffer gegl-paint geglbuffer-add-image \
 
 .if !defined(WITHOUT_CAIRO)
 LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
+PLIST_SUB+=	CAIRO=""
 .else
 CONFIGURE_ARGS+=--without-cairo
+PLIST_SUB+=	CAIRO="@comment "
 .endif
 
 .if !defined(WITHOUT_FFMPEG)
 LIB_DEPENDS+=	avformat.1:${PORTSDIR}/multimedia/ffmpeg
+PLIST_SUB+=	FFMPEG=""
 .else
 CONFIGURE_ARGS+=--without-libavformat
-.endif
-
-.if !defined(WITHOUT_GTK)
-USE_GNOME+=	gtk20
-.else
-CONFIGURE_ARGS+=--without-gtk
+PLIST_SUB+=	FFMPEG="@comment "
 .endif
 
 .if !defined(WITHOUT_GRAPHVIZ)
@@ -74,20 +72,26 @@ CONFIGURE_ARGS+=--without-graphviz
 
 .if !defined(WITHOUT_JPEG)
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
+PLIST_SUB+=	JPEG=""
 .else
 CONFIGURE_ARGS+=--without-libjpeg
+PLIST_SUB+=	JPEG="@comment "
 .endif
 
 .if !defined(WITHOUT_OPENEXR)
 LIB_DEPENDS+=	IlmImf.6:${PORTSDIR}/graphics/OpenEXR
+PLIST_SUB+=	OPENEXR=""
 .else
 CONFIGURE_ARGS+=--without-openexr
+PLIST_SUB+=	OPENEXR="@comment "
 .endif
 
 .if !defined(WITHOUT_OPENRAW)
 LIB_DEPENDS+=	openraw.5:${PORTSDIR}/graphics/libopenraw
+PLIST_SUB+=	OPENRAW=""
 .else
 CONFIGURE_ARGS+=--without-libopenraw
+PLIST_SUB+=	OPENRAW="@comment "
 .endif
 
 .if !defined(WITHOUT_PANGO)
@@ -96,16 +100,28 @@ USE_GNOME+=	pango
 CONFIGURE_ARGS+=--without-pango
 .endif
 
+.if !defined(WITHOUT_PNG)
+LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
+PLIST_SUB+=	PNG=""
+.else
+CONFIGURE_ARGS+=--without-libpng
+PLIST_SUB+=	PNG="@comment "
+.endif
+
 .if !defined(WITHOUT_RSVG)
 LIB_DEPENDS+=	rsvg-2.2:${PORTSDIR}/graphics/librsvg2
+PLIST_SUB+=	RSVG=""
 .else
 CONFIGURE_ARGS+=--without-librsvg
+PLIST_SUB+=	RSVG="@comment "
 .endif
 
 .if !defined(WITHOUT_SDL)
 USE_SDL=	sdl
+PLIST_SUB+=	SDL=""
 .else
 CONFIGURE_ARGS+=--without-sdl
+PLIST_SUB+=	SDL="@comment "
 .endif
 
 .if !defined(WITHOUT_SPIRO)
diff --git a/graphics/gegl/pkg-plist b/graphics/gegl/pkg-plist
index ab3655545dfc..32b25d3db491 100644
--- a/graphics/gegl/pkg-plist
+++ b/graphics/gegl/pkg-plist
@@ -64,8 +64,8 @@ lib/gegl-0.0/difference-of-gaussians.la
 lib/gegl-0.0/difference-of-gaussians.so
 lib/gegl-0.0/difference.la
 lib/gegl-0.0/difference.so
-lib/gegl-0.0/display.la
-lib/gegl-0.0/display.so
+%%SDL%%lib/gegl-0.0/display.la
+%%SDL%%lib/gegl-0.0/display.so
 lib/gegl-0.0/divide.la
 lib/gegl-0.0/divide.so
 lib/gegl-0.0/dropshadow.la
@@ -82,10 +82,10 @@ lib/gegl-0.0/dst.la
 lib/gegl-0.0/dst.so
 lib/gegl-0.0/exclusion.la
 lib/gegl-0.0/exclusion.so
-lib/gegl-0.0/exr-load.la
-lib/gegl-0.0/exr-load.so
-lib/gegl-0.0/ff-load.la
-lib/gegl-0.0/ff-load.so
+%%OPENEXR%%lib/gegl-0.0/exr-load.la
+%%OPENEXR%%lib/gegl-0.0/exr-load.so
+%%FFMPEG%%lib/gegl-0.0/ff-load.la
+%%FFMPEG%%lib/gegl-0.0/ff-load.so
 lib/gegl-0.0/fractal-explorer.la
 lib/gegl-0.0/fractal-explorer.so
 lib/gegl-0.0/gamma.la
@@ -100,8 +100,8 @@ lib/gegl-0.0/introspect.la
 lib/gegl-0.0/introspect.so
 lib/gegl-0.0/invert.la
 lib/gegl-0.0/invert.so
-lib/gegl-0.0/jpg-load.la
-lib/gegl-0.0/jpg-load.so
+%%JPEG%%lib/gegl-0.0/jpg-load.la
+%%JPEG%%lib/gegl-0.0/jpg-load.so
 lib/gegl-0.0/layer.la
 lib/gegl-0.0/layer.so
 lib/gegl-0.0/levels.la
@@ -130,22 +130,22 @@ lib/gegl-0.0/opacity.la
 lib/gegl-0.0/opacity.so
 lib/gegl-0.0/open-buffer.la
 lib/gegl-0.0/open-buffer.so
-lib/gegl-0.0/openraw.la
-lib/gegl-0.0/openraw.so
+%%OPENRAW%%lib/gegl-0.0/openraw.la
+%%OPENRAW%%lib/gegl-0.0/openraw.so
 lib/gegl-0.0/over.la
 lib/gegl-0.0/over.so
 lib/gegl-0.0/overlay.la
 lib/gegl-0.0/overlay.so
-lib/gegl-0.0/path.la
-lib/gegl-0.0/path.so
+%%CAIRO%%lib/gegl-0.0/path.la
+%%CAIRO%%lib/gegl-0.0/path.so
 lib/gegl-0.0/pixbuf.la
 lib/gegl-0.0/pixbuf.so
 lib/gegl-0.0/plus.la
 lib/gegl-0.0/plus.so
-lib/gegl-0.0/png-load.la
-lib/gegl-0.0/png-load.so
-lib/gegl-0.0/png-save.la
-lib/gegl-0.0/png-save.so
+%%PNG%%lib/gegl-0.0/png-load.la
+%%PNG%%lib/gegl-0.0/png-load.so
+%%PNG%%lib/gegl-0.0/png-save.la
+%%PNG%%lib/gegl-0.0/png-save.so
 lib/gegl-0.0/raw-load.la
 lib/gegl-0.0/raw-load.so
 lib/gegl-0.0/rectangle.la
@@ -182,8 +182,8 @@ lib/gegl-0.0/subtract.la
 lib/gegl-0.0/subtract.so
 lib/gegl-0.0/svg-huerotate.la
 lib/gegl-0.0/svg-huerotate.so
-lib/gegl-0.0/svg-load.la
-lib/gegl-0.0/svg-load.so
+%%RSVG%%lib/gegl-0.0/svg-load.la
+%%RSVG%%lib/gegl-0.0/svg-load.so
 lib/gegl-0.0/svg-luminancetoalpha.la
 lib/gegl-0.0/svg-luminancetoalpha.so
 lib/gegl-0.0/svg-matrix.la
@@ -218,16 +218,16 @@ libdata/pkgconfig/gegl.pc
 %%PORTDOCS%%%%DOCSDIR%%/brightness-contrast.c.html
 %%PORTDOCS%%%%DOCSDIR%%/class-hierarchy.html
 %%PORTDOCS%%%%DOCSDIR%%/devhelp.css
-%%PORTDOCS%%%%DOCSDIR%%/gallery/OpenRaster-00.png
+%%PNG%%%%PORTDOCS%%%%DOCSDIR%%/gallery/OpenRaster-00.png
 %%PORTDOCS%%%%DOCSDIR%%/gallery/OpenRaster-00.txt
 %%PORTDOCS%%%%DOCSDIR%%/gallery/OpenRaster-00.xml
-%%PORTDOCS%%%%DOCSDIR%%/gallery/OpenRaster-01.png
+%%PNG%%%%PORTDOCS%%%%DOCSDIR%%/gallery/OpenRaster-01.png
 %%PORTDOCS%%%%DOCSDIR%%/gallery/OpenRaster-01.txt
 %%PORTDOCS%%%%DOCSDIR%%/gallery/OpenRaster-01.xml
-%%PORTDOCS%%%%DOCSDIR%%/gallery/OpenRaster-04.png
+%%PNG%%%%PORTDOCS%%%%DOCSDIR%%/gallery/OpenRaster-04.png
 %%PORTDOCS%%%%DOCSDIR%%/gallery/OpenRaster-04.txt
 %%PORTDOCS%%%%DOCSDIR%%/gallery/OpenRaster-04.xml
-%%PORTDOCS%%%%DOCSDIR%%/gallery/clones.png
+%%PNG%%%%PORTDOCS%%%%DOCSDIR%%/gallery/clones.png
 %%PORTDOCS%%%%DOCSDIR%%/gallery/clones.txt
 %%PORTDOCS%%%%DOCSDIR%%/gallery/clones.xml
 %%PORTDOCS%%%%DOCSDIR%%/gallery/index.html