Update to 2.24.1.

Make xorg depend optional on WITHOUT_X11.


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

3 files changed, 23 insertions, 18 deletions

diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile
index b63f6bd3d..e392ff402 100644
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@@ -3,10 +3,10 @@
 # Whom:			Ade Lovett <ade@lovett.com>
 #
 # $FreeBSD$
-#    $MCom: ports/graphics/gdk-pixbuf2/Makefile,v 1.15 2011/06/27 21:10:23 kwm Exp $
+#    $MCom: ports/graphics/gdk-pixbuf2/Makefile,v 1.17 2011/08/30 21:21:37 kwm Exp $
 
 PORTNAME?=	gdk-pixbuf
-PORTVERSION=	2.24.0
+PORTVERSION=	2.24.1
 CATEGORIES?=	graphics
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/gdk-pixbuf/${PORTVERSION:R}
@@ -25,21 +25,26 @@ LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png \
 LATEST_LINK=	gdk-pixbuf2
 USE_XZ=		yes
 USE_GMAKE=	yes
-USE_XORG=	xt xi x11
 USE_AUTOTOOLS=	libtool
 USE_GNOME+=	gnomehack glib20 ltverhack
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-introspection=yes --with-libjasper
 
 MAN1=		gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|" == "|" = "|g' ${WRKSRC}/configure
-
 post-install:
 	@cd ${WRKSRC}/docs/reference/gdk-pixbuf && gmake install-man1
 
+.if !defined(WITHOUT_X11)
+USE_XORG=	xt xi x11
+CONFIGURE_ARGS+=--with-x11
+PLIST_SUB+=	XLIB=""
+.else
+CONFIGURE_ARGS+=--without-x11
+PLIST_SUB+=	XLIB="@comment "
+.endif
+
 .include <bsd.port.mk>
diff --git a/graphics/gdk-pixbuf2/distinfo b/graphics/gdk-pixbuf2/distinfo
index 7d89c05c8..9b5dd453b 100644
--- a/graphics/gdk-pixbuf2/distinfo
+++ b/graphics/gdk-pixbuf2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gdk-pixbuf-2.24.0.tar.xz) = 67c11d3aa40441c1cea42c365bf2d6a9a9dd52fae2d359a707ad5e8abb4d28a7
-SIZE (gnome2/gdk-pixbuf-2.24.0.tar.xz) = 1176324
+SHA256 (gnome2/gdk-pixbuf-2.24.1.tar.xz) = da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1
+SIZE (gnome2/gdk-pixbuf-2.24.1.tar.xz) = 1177036
diff --git a/graphics/gdk-pixbuf2/pkg-plist b/graphics/gdk-pixbuf2/pkg-plist
index 7ba643f95..3cc9277b8 100644
--- a/graphics/gdk-pixbuf2/pkg-plist
+++ b/graphics/gdk-pixbuf2/pkg-plist
@@ -1,7 +1,7 @@
 bin/gdk-pixbuf-csource
 bin/gdk-pixbuf-query-loaders
-include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
-include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
+%%XLIB%%include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
+%%XLIB%%include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-core.h
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h
@@ -69,12 +69,12 @@ lib/libgdk_pixbuf-2.0.a
 lib/libgdk_pixbuf-2.0.la
 lib/libgdk_pixbuf-2.0.so
 lib/libgdk_pixbuf-2.0.so.0
-lib/libgdk_pixbuf_xlib-2.0.a
-lib/libgdk_pixbuf_xlib-2.0.la
-lib/libgdk_pixbuf_xlib-2.0.so
-lib/libgdk_pixbuf_xlib-2.0.so.0
+%%XLIB%%lib/libgdk_pixbuf_xlib-2.0.a
+%%XLIB%%lib/libgdk_pixbuf_xlib-2.0.la
+%%XLIB%%lib/libgdk_pixbuf_xlib-2.0.so
+%%XLIB%%lib/libgdk_pixbuf_xlib-2.0.so.0
 libdata/pkgconfig/gdk-pixbuf-2.0.pc
-libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
+%%XLIB%%libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
 share/gir-1.0/GdkPixbuf-2.0.gir
 share/locale/af/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/ang/LC_MESSAGES/gdk-pixbuf.mo
@@ -245,5 +245,5 @@ share/locale/zh_TW/LC_MESSAGES/gdk-pixbuf.mo
 @dirrm lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%
 @dirrm lib/gdk-pixbuf-2.0
 @dirrm include/gdk-pixbuf-2.0/gdk-pixbuf
-@dirrm include/gdk-pixbuf-2.0/gdk-pixbuf-xlib
+%%XLIB%%@dirrm include/gdk-pixbuf-2.0/gdk-pixbuf-xlib
 @dirrm include/gdk-pixbuf-2.0