[pkgsrc/trunk]: pkgsrc/graphics/imlib2 Add x11 option (default: enabled).

[obache <obache%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4340e01d4ede
branches:  trunk
changeset: 535416:4340e01d4ede
user:      obache <obache%pkgsrc.org@localhost>
date:      Sat Nov 17 01:40:50 2007 +0000

description:
Add x11 option (default: enabled).

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

diffstat:

 graphics/imlib2/Makefile      |   6 ++----
 graphics/imlib2/PLIST         |  16 ++++++++--------
 graphics/imlib2/buildlink3.mk |  15 ++++++++++++++-
 graphics/imlib2/options.mk    |  16 ++++++++++++++--
 4 files changed, 38 insertions(+), 15 deletions(-)

diffs (107 lines):

diff -r 1ffc2c7cd26a -r 4340e01d4ede graphics/imlib2/Makefile
--- a/graphics/imlib2/Makefile  Fri Nov 16 23:04:54 2007 +0000
+++ b/graphics/imlib2/Makefile  Sat Nov 17 01:40:50 2007 +0000
@@ -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 @@
 .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 -r 1ffc2c7cd26a -r 4340e01d4ede graphics/imlib2/PLIST
--- a/graphics/imlib2/PLIST     Fri Nov 16 23:04:54 2007 +0000
+++ b/graphics/imlib2/PLIST     Sat Nov 17 01:40:50 2007 +0000
@@ -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 -r 1ffc2c7cd26a -r 4340e01d4ede graphics/imlib2/buildlink3.mk
--- a/graphics/imlib2/buildlink3.mk     Fri Nov 16 23:04:54 2007 +0000
+++ b/graphics/imlib2/buildlink3.mk     Sat Nov 17 01:40:50 2007 +0000
@@ -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 @@
 .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 -r 1ffc2c7cd26a -r 4340e01d4ede graphics/imlib2/options.mk
--- a/graphics/imlib2/options.mk        Fri Nov 16 23:04:54 2007 +0000
+++ b/graphics/imlib2/options.mk        Sat Nov 17 01:40:50 2007 +0000
@@ -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 @@
 .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
+