[pkgsrc/trunk]: pkgsrc/graphics/ImageMagick Allow building without X11 suppor...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a12375daa66e
branches:  trunk
changeset: 486200:a12375daa66e
user:      tv <tv%pkgsrc.org@localhost>
date:      Fri Dec 24 23:42:49 2004 +0000

description:
Allow building without X11 support with "PKG_OPTIONS.ImageMagick=-x11".
Idea inspired by post to tech-pkg from <imil%home.imil.net@localhost>.

diffstat:

 graphics/ImageMagick/Makefile   |  10 ++--------
 graphics/ImageMagick/options.mk |  18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 8 deletions(-)

diffs (67 lines):

diff -r 7f40d349a4e9 -r a12375daa66e graphics/ImageMagick/Makefile
--- a/graphics/ImageMagick/Makefile     Fri Dec 24 22:02:59 2004 +0000
+++ b/graphics/ImageMagick/Makefile     Fri Dec 24 23:42:49 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.122 2004/10/10 11:20:08 kristerw Exp $
+# $NetBSD: Makefile,v 1.123 2004/12/24 23:42:49 tv Exp $
 
 .include "Makefile.common"
 
@@ -8,15 +8,11 @@
 HOMEPAGE=      http://www.simplesystems.org/ImageMagick/
 COMMENT=       Package for display and interactive manipulation of images
 
-BUILDLINK_DEPENDS.jasper+=     jasper>=1.701.0
-DEPENDS+=                      mpeg2codec-1.2:../../graphics/mpeg2codec
-
 CONFLICTS=     geomview<1.8.1nb2  # used to have a program named 'animate'
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
 USE_BUILDLINK3=                YES
-USE_X11=               YES
 GNU_CONFIGURE=         YES
 USE_LIBTOOL=           YES
 USE_LANGUAGES=         c c++
@@ -29,7 +25,7 @@
 PLIST_SUBST+=          IM_MAJOR_VER=${IM_MAJOR_VER}
 PLIST_SUBST+=          IM_MAJOR_LIB_VER=${IM_MAJOR_LIB_VER}
 
-.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64)
 GCC_REQD+=             3.0
@@ -44,10 +40,8 @@
 CONFIGURE_ARGS+=       --without-perl
 
 .include "../../archivers/bzip2/buildlink3.mk"
-.include "../../graphics/jasper/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
-.include "../../graphics/libwmf/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 7f40d349a4e9 -r a12375daa66e graphics/ImageMagick/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/ImageMagick/options.mk   Fri Dec 24 23:42:49 2004 +0000
@@ -0,0 +1,18 @@
+# $NetBSD: options.mk,v 1.1 2004/12/24 23:42:49 tv Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.ImageMagick
+PKG_DEFAULT_OPTIONS=   x11
+PKG_SUPPORTED_OPTIONS= x11
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mx11)
+BUILDLINK_DEPENDS.jasper+= jasper>=1.701.0
+DEPENDS+=              mpeg2codec-1.2:../../graphics/mpeg2codec
+USE_X11=               YES
+
+.include "../../graphics/jasper/buildlink3.mk"
+.include "../../graphics/libwmf/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-x
+.endif