Update gdk-pixbuf2 to 2.31.1. Switch to a more compact options, renaming

JP2 to JASPER. Remove the dirrm entries.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19951 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 16 insertions, 46 deletions

diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile
index f2c0bff9f..ecab2e581 100644
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@@ -3,8 +3,7 @@
 #    $MCom$
 
 PORTNAME=	gdk-pixbuf
-PORTVERSION=	2.30.8
-PORTREVISION=	1
+PORTVERSION=	2.31.1
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	2
@@ -19,12 +18,21 @@ USE_GNOME+=	gnomehier glib20 introspection:build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-introspection=yes --with-x11
 INSTALL_TARGET=	install-strip
 
+OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	JASPER JPEG PNG TIFF
 OPTIONS_DEFAULT=JASPER JPEG PNG TIFF
+JASPER_CONFIGURE_WITH=	libjasper
+JASPER_LIB_DEPENDS=	libjasper.so:${PORTSDIR}/graphics/jasper
+JPEG_CONFIGURE_WITPNGH=	libjpeg
+JPEG_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
+PNG_CONFIGURE_WITH=	libpng
+PNG_LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
+TIFF_CONFIGURE_WITH=	libtiff
+TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
 
 .include <bsd.port.options.mk>
 
@@ -36,38 +44,6 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MJASPER}
-LIB_DEPENDS+=	libjasper.so:${PORTSDIR}/graphics/jasper
-CONFIGURE_ARGS+=--with-libjasper
-PLIST_SUB+=	JP2=""
-.else
-PLIST_SUB+=	JP2="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MJPEG}
-LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg
-PLIST_SUB+=	JPEG=""
-.else
-CONFIGURE_ARGS+=--without-libjpeg
-PLIST_SUB+=	JPEG="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=	libpng15.so:${PORTSDIR}/graphics/png
-PLIST_SUB+=	PNG=""
-.else
-CONFIGURE_ARGS+=--without-libpng
-PLIST_SUB+=	PNG="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MTIFF}
-LIB_DEPENDS+=	libtiff.so:${PORTSDIR}/graphics/tiff
-PLIST_SUB+=	TIFF=""
-.else
-CONFIGURE_ARGS+=--without-libtiff
-PLIST_SUB+=	TIFF="@comment "
-.endif
-
 post-install:
 	@cd ${WRKSRC}/docs/reference/gdk-pixbuf && env DESTDIR=${STAGEDIR} ${GMAKE} install-man1
 
diff --git a/graphics/gdk-pixbuf2/distinfo b/graphics/gdk-pixbuf2/distinfo
index 21b841b3d..eb9ddc922 100644
--- a/graphics/gdk-pixbuf2/distinfo
+++ b/graphics/gdk-pixbuf2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gdk-pixbuf-2.30.8.tar.xz) = 4853830616113db4435837992c0aebd94cbb993c44dc55063cee7f72a7bef8be
-SIZE (gnome2/gdk-pixbuf-2.30.8.tar.xz) = 1336788
+SHA256 (gnome2/gdk-pixbuf-2.31.1.tar.xz) = 25a75e3c61dac11e6ff6416ad846951ccafac6486b1c6a1bfb0b213b99db52cd
+SIZE (gnome2/gdk-pixbuf-2.31.1.tar.xz) = 1340056
diff --git a/graphics/gdk-pixbuf2/pkg-plist b/graphics/gdk-pixbuf2/pkg-plist
index 86dbb069d..5f4181ed4 100644
--- a/graphics/gdk-pixbuf2/pkg-plist
+++ b/graphics/gdk-pixbuf2/pkg-plist
@@ -19,7 +19,7 @@ lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-bmp.so
 lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-gif.so
 lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-icns.so
 lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-ico.so
-%%JP2%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-jasper.so
+%%JASPER%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-jasper.so
 %%JPEG%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-jpeg.so
 lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-pcx.so
 %%PNG%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-png.so
@@ -34,10 +34,10 @@ lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-xpm.so
 lib/girepository-1.0/GdkPixbuf-2.0.typelib
 lib/libgdk_pixbuf-2.0.so
 lib/libgdk_pixbuf-2.0.so.0
-lib/libgdk_pixbuf-2.0.so.0.3000.8
+lib/libgdk_pixbuf-2.0.so.0.3100.1
 lib/libgdk_pixbuf_xlib-2.0.so
 lib/libgdk_pixbuf_xlib-2.0.so.0
-lib/libgdk_pixbuf_xlib-2.0.so.0.3000.8
+lib/libgdk_pixbuf_xlib-2.0.so.0.3100.1
 libdata/pkgconfig/gdk-pixbuf-2.0.pc
 libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
 man/man1/gdk-pixbuf-csource.1.gz
@@ -215,9 +215,3 @@ share/gir-1.0/GdkPixbuf-2.0.gir
 %%NLS%%@dirrmtry share/locale/as
 %%NLS%%@dirrmtry share/locale/ang/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ang
-@dirrm lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders
-@dirrm lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%
-@dirrm lib/gdk-pixbuf-2.0
-@dirrm include/gdk-pixbuf-2.0/gdk-pixbuf-xlib
-@dirrm include/gdk-pixbuf-2.0/gdk-pixbuf
-@dirrm include/gdk-pixbuf-2.0