Add options.mk for GraphicsMagic and add options for building without X

or a few other dependencies.  This is part of PR pkg/43929 from
Edgar Fuß

4 files changed, 89 insertions, 21 deletions

diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index ff06101c26a..efc5171f9c1 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -1,12 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2011/04/22 13:42:47 obache Exp $
+# $NetBSD: Makefile,v 1.39 2011/05/16 01:18:54 dmcmahill Exp $
 #
 
-DISTNAME=	GraphicsMagick-1.3.12
-PKGREVISION=	4
-CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=graphicsmagick/} \
-		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.3/
-
+.include "Makefile.common"
+PKGREVISION=	1
 MAINTAINER=	obache@NetBSD.org
 HOMEPAGE=	http://www.graphicsmagick.org/
 COMMENT=	X application for displaying and manipulating images
@@ -27,29 +23,28 @@ PKGCONFIG_OVERRIDE+=	magick/GraphicsMagick.pc.in \
 			wand/GraphicsMagickWand.pc.in \
 			Magick++/lib/GraphicsMagick++.pc.in
 
-CONFIGURE_ARGS+=	--without-perl
-
 TEST_TARGET=	check
 
 FIND_PREFIX:=	URW_FONTS_DIR=urw-fonts
 .include "../../mk/find-prefix.mk"
 
+.include "options.mk"
+
+CONFIGURE_ARGS+=	--without-perl
+CONFIGURE_ARGS+=	--with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
+CONFIGURE_ARGS+=	--with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib
+
 .include "../../archivers/bzip2/buildlink3.mk"
+.include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jbigkit/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
-.include "../../graphics/libwmf/buildlink3.mk"
-.include "../../graphics/jasper/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/GraphicsMagick/Makefile.common b/graphics/GraphicsMagick/Makefile.common
new file mode 100755
index 00000000000..d22b9586a84
--- /dev/null
+++ b/graphics/GraphicsMagick/Makefile.common
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile.common,v 1.1 2011/05/16 01:18:54 dmcmahill Exp $
+#
+# used by graphics/p5-GraphicsMagick/Makefile
+
+GM_MAJOR_VER=		1.3
+GM_MINOR_VER=		12
+DISTVERSION=		${GM_MAJOR_VER}.${GM_MINOR_VER}
+DISTNAME=		GraphicsMagick-${DISTVERSION}
+
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=graphicsmagick/} \
+		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/${GM_MAJOR_VER}/
+
+CATEGORIES=	graphics
diff --git a/graphics/GraphicsMagick/buildlink3.mk b/graphics/GraphicsMagick/buildlink3.mk
index d74800ce4d6..5d3509d2c45 100644
--- a/graphics/GraphicsMagick/buildlink3.mk
+++ b/graphics/GraphicsMagick/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2011/04/22 13:42:47 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2011/05/16 01:18:54 dmcmahill Exp $
 
 BUILDLINK_TREE+=	GraphicsMagick
 
@@ -9,21 +9,37 @@ BUILDLINK_API_DEPENDS.GraphicsMagick+=	GraphicsMagick>=1.2
 BUILDLINK_ABI_DEPENDS.GraphicsMagick?=	GraphicsMagick>=1.3.12nb4
 BUILDLINK_PKGSRCDIR.GraphicsMagick?=	../../graphics/GraphicsMagick
 
+pkgbase := GraphicsMagick
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.GraphicsMagick:Mghostscript)
+.include "../../print/ghostscript/buildlink3.mk"
+.endif
+.if !empty(PKG_BUILD_OPTIONS.GraphicsMagick:Mjasper)
+.include "../../graphics/jasper/buildlink3.mk"
+.endif
+.if !empty(PKG_BUILD_OPTIONS.GraphicsMagick:Mwmf)
+.include "../../graphics/libwmf/buildlink3.mk"
+.endif
+.if !empty(PKG_BUILD_OPTIONS.GraphicsMagick:Mx11)
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mbzip2)
 .include "../../archivers/bzip2/buildlink3.mk"
+.endif
+
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jbigkit/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
-.include "../../graphics/libwmf/buildlink3.mk"
-.include "../../graphics/jasper/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .endif # GRAPHICSMAGICK_BUILDLINK3_MK
diff --git a/graphics/GraphicsMagick/options.mk b/graphics/GraphicsMagick/options.mk
new file mode 100755
index 00000000000..25667b952c8
--- /dev/null
+++ b/graphics/GraphicsMagick/options.mk
@@ -0,0 +1,44 @@
+# $NetBSD: options.mk,v 1.1 2011/05/16 01:18:54 dmcmahill Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.GraphicsMagick
+PKG_SUPPORTED_OPTIONS=	bzip2 x11 jasper ghostscript wmf
+PKG_SUGGESTED_OPTIONS=	bzip2 x11 jasper
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mbzip2)
+.include "../../archivers/bzip2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-bzlib
+.endif
+
+.if !empty(PKG_OPTIONS:Mx11)
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-x
+.endif
+
+.if !empty(PKG_OPTIONS:Mjasper)
+BUILDLINK_API_DEPENDS.jasper+=	jasper>=1.701.0
+.include "../../graphics/jasper/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-jp2
+.else
+CONFIGURE_ARGS+=	--without-jp2
+.endif
+
+.if !empty(PKG_OPTIONS:Mghostscript)
+.include "../../print/ghostscript/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-gslib
+.else
+CONFIGURE_ARGS+=	--without-gslib
+.endif
+
+.if !empty(PKG_OPTIONS:Mwmf)
+.include "../../graphics/libwmf/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-wmf
+.else
+CONFIGURE_ARGS+=	--without-wmf
+.endif