Add x11 option (default: enabled).

No functionally change, but bump PKGREVISION due to detect x11 option.

4 files changed, 38 insertions, 15 deletions

diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index c34bb3b64db..b312a007f7c 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2007/09/18 19:18:10 drochner Exp $
+# $NetBSD: Makefile,v 1.44 2007/11/17 01:40:50 obache Exp $
 
 DISTNAME=	imlib2-1.4.0
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=enlightenment/}
 
@@ -42,8 +43,5 @@ SUBST_SED.shlib+=	-e 's,"\.so",".${SHLIB_SUFFIX}",'
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/imlib2/PLIST b/graphics/imlib2/PLIST
index 933e3bd02ff..c0c0f2383db 100644
--- a/graphics/imlib2/PLIST
+++ b/graphics/imlib2/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.8 2006/11/24 12:46:12 drochner Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/11/17 01:40:50 obache Exp $
 bin/imlib2-config
-bin/imlib2_bumpmap
-bin/imlib2_colorspace
+${X11}bin/imlib2_bumpmap
+${X11}bin/imlib2_colorspace
 bin/imlib2_conv
-bin/imlib2_grab
-bin/imlib2_poly
-bin/imlib2_show
-bin/imlib2_test
-bin/imlib2_view
+${X11}bin/imlib2_grab
+${X11}bin/imlib2_poly
+${X11}bin/imlib2_show
+${X11}bin/imlib2_test
+${X11}bin/imlib2_view
 include/Imlib2.h
 lib/imlib2/filters/bumpmap.la
 lib/imlib2/filters/colormod.la
diff --git a/graphics/imlib2/buildlink3.mk b/graphics/imlib2/buildlink3.mk
index 5e070a17344..2ed59418c95 100644
--- a/graphics/imlib2/buildlink3.mk
+++ b/graphics/imlib2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/11/06 11:28:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2007/11/17 01:40:50 obache Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 IMLIB2_BUILDLINK3_MK:=	${IMLIB2_BUILDLINK3_MK}+
@@ -24,7 +24,20 @@ BUILDLINK_PKGSRCDIR.imlib2?=	../../graphics/imlib2
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+
+_IMLIB2_PRE_X11_OPTION!= \
+	if ${PKG_INFO} -qe 'imlib2<=1.4.0'; then			\
+		${ECHO} yes;						\
+	else								\
+		${ECHO} no;						\
+	fi
+
+pkgbase := imlib2
+.include "../../mk/pkg-build-options.mk"
+
+.if ${_IMLIB2_PRE_X11_OPTION} == "yes" || !empty(PKG_BUILD_OPTIONS.imlib2:Mx11)
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
+.endif
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/imlib2/options.mk b/graphics/imlib2/options.mk
index 22c63e46b67..1b2c6ebbf06 100644
--- a/graphics/imlib2/options.mk
+++ b/graphics/imlib2/options.mk
@@ -1,9 +1,10 @@
-# $NetBSD: options.mk,v 1.6 2007/06/13 14:01:11 obache Exp $
+# $NetBSD: options.mk,v 1.7 2007/11/17 01:40:50 obache Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.imlib2
-PKG_SUPPORTED_OPTIONS=	#empty
+PKG_SUPPORTED_OPTIONS=	x11
+PKG_SUGGESTED_OPTIONS=	x11
 .if ${MACHINE_ARCH} == "i386"
 PKG_SUPPORTED_OPTIONS+=	mmx
 .elif ${MACHINE_ARCH} == "x86_64"
@@ -20,3 +21,14 @@ CONFIGURE_ARGS+=	--enable-mmx
 .if !empty(PKG_OPTIONS:Mimlib2-amd64)
 CONFIGURE_ARGS+=	--enable-amd64
 .endif
+
+.if !empty(PKG_OPTIONS:Mx11)
+.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+PLIST_SUBST+=		X11=""
+.else
+CONFIGURE_ARGS+=	--without-x
+PLIST_SUBST+=		X11="@comment "
+.endif
+