summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authortv <tv@pkgsrc.org>2004-12-24 23:42:49 +0000
committertv <tv@pkgsrc.org>2004-12-24 23:42:49 +0000
commit3a5e9351e603177011fe5061f6b27b1ef4cab3a4 (patch)
tree7c4c1b1c4ade676046fe4bdeed859cef6eb24407 /graphics
parent4158efc5723cb01c488b7df6a1c86e4e24ab4610 (diff)
downloadpkgsrc-3a5e9351e603177011fe5061f6b27b1ef4cab3a4.tar.gz
Allow building without X11 support with "PKG_OPTIONS.ImageMagick=-x11".
Idea inspired by post to tech-pkg from <imil@home.imil.net>.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/ImageMagick/Makefile10
-rw-r--r--graphics/ImageMagick/options.mk18
2 files changed, 20 insertions, 8 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index e6d1a142230..320473b9542 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -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 @@ MAINTAINER= adam@NetBSD.org
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 @@ GCC_REQD+= 2.95.3
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 @@ CFLAGS= -O
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 --git a/graphics/ImageMagick/options.mk b/graphics/ImageMagick/options.mk
new file mode 100644
index 00000000000..1dc35eb4800
--- /dev/null
+++ b/graphics/ImageMagick/options.mk
@@ -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