Sun Oct 12 18:55:14 2014 UTC ()
Remove ghostscript option, and always depend on ghostscript: even when
disabled, it still probes for, finds, and depends on the gs
binary. (In fact, even if it can't find the gs binary it still depends
on it at runtime.) The only thing the option was controlling was
linking against the ghostscript library, and disabling just that seems
pointless.

PKGREVISION -> 4


(dholland)
diff -r1.212 -r1.213 pkgsrc/graphics/ImageMagick/Makefile
diff -r1.16 -r1.17 pkgsrc/graphics/ImageMagick/options.mk
cvs diff -r1.212 -r1.213 pkgsrc/graphics/ImageMagick/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/Makefile 2014/10/10 15:17:22 1.212
+++ pkgsrc/graphics/ImageMagick/Makefile 2014/10/12 18:55:14 1.213
@@ -1,35 +1,38 @@ @@ -1,35 +1,38 @@
1# $NetBSD: Makefile,v 1.212 2014/10/10 15:17:22 prlw1 Exp $ 1# $NetBSD: Makefile,v 1.213 2014/10/12 18:55:14 dholland Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5PKGNAME= ImageMagick-${DISTVERSION} 5PKGNAME= ImageMagick-${DISTVERSION}
6PKGREVISION= 3 6PKGREVISION= 4
7 7
8MAINTAINER= adam@NetBSD.org 8MAINTAINER= adam@NetBSD.org
9COMMENT= Package for display and interactive manipulation of images 9COMMENT= Package for display and interactive manipulation of images
10 10
11CONFLICTS= geomview<1.8.1nb2 # used to have a program named 'animate' 11CONFLICTS= geomview<1.8.1nb2 # used to have a program named 'animate'
12 12
13USE_LANGUAGES= c c++ c99 13USE_LANGUAGES= c c++ c99
14USE_TOOLS+= gmake pkg-config 14USE_TOOLS+= gmake pkg-config
15CONFIGURE_ARGS+= --disable-assert 15CONFIGURE_ARGS+= --disable-assert
16CONFIGURE_ARGS+= --with-fontconfig 16CONFIGURE_ARGS+= --with-fontconfig
17CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include 17CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
18CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib 18CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib
19CONFIGURE_ARGS+= --with-xml=yes 19CONFIGURE_ARGS+= --with-xml=yes
20CONFIGURE_ARGS+= --disable-openmp 20CONFIGURE_ARGS+= --disable-openmp
21CONFIGURE_ARGS+= --without-perl 21CONFIGURE_ARGS+= --without-perl
22CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 22CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
 23# This one used to be optional, but it depends on ghostscript even if it's
 24# disabled so having a way to disable it seems pointless.
 25CONFIGURE_ARGS+= --with-gslib
23PKGCONFIG_OVERRIDE= Magick++/lib/ImageMagick++.pc.in 26PKGCONFIG_OVERRIDE= Magick++/lib/ImageMagick++.pc.in
24PKGCONFIG_OVERRIDE+= Magick++/lib/Magick++.pc.in 27PKGCONFIG_OVERRIDE+= Magick++/lib/Magick++.pc.in
25PKGCONFIG_OVERRIDE+= magick/ImageMagick.pc.in 28PKGCONFIG_OVERRIDE+= magick/ImageMagick.pc.in
26PKGCONFIG_OVERRIDE+= magick/MagickCore.pc.in 29PKGCONFIG_OVERRIDE+= magick/MagickCore.pc.in
27PKGCONFIG_OVERRIDE+= wand/MagickWand.pc.in 30PKGCONFIG_OVERRIDE+= wand/MagickWand.pc.in
28PKGCONFIG_OVERRIDE+= wand/Wand.pc.in 31PKGCONFIG_OVERRIDE+= wand/Wand.pc.in
29 32
30GCC_REQD+= 2.95.3 33GCC_REQD+= 2.95.3
31 34
32PLIST_SUBST+= IM_MAJOR_VER=${IM_MAJOR_VER:Q} 35PLIST_SUBST+= IM_MAJOR_VER=${IM_MAJOR_VER:Q}
33PLIST_SUBST+= IM_MAJOR_LIB_VER=${IM_MAJOR_LIB_VER:Q} 36PLIST_SUBST+= IM_MAJOR_LIB_VER=${IM_MAJOR_LIB_VER:Q}
34 37
35TEST_TARGET= check 38TEST_TARGET= check
@@ -72,15 +75,16 @@ SUBST_MESSAGE.fix-etc= Handle configurat @@ -72,15 +75,16 @@ SUBST_MESSAGE.fix-etc= Handle configurat
72SUBST_FILES.fix-etc= Makefile.in 75SUBST_FILES.fix-etc= Makefile.in
73SUBST_SED.fix-etc= -e 's,^configlibdir =.*,configlibdir = $$(DATA_DIR)/examples/ImageMagick,' 76SUBST_SED.fix-etc= -e 's,^configlibdir =.*,configlibdir = $$(DATA_DIR)/examples/ImageMagick,'
74 77
75.include "../../archivers/bzip2/buildlink3.mk" 78.include "../../archivers/bzip2/buildlink3.mk"
76.include "../../archivers/xz/buildlink3.mk" 79.include "../../archivers/xz/buildlink3.mk"
77.include "../../devel/libltdl/buildlink3.mk" 80.include "../../devel/libltdl/buildlink3.mk"
78.include "../../fonts/fontconfig/buildlink3.mk" 81.include "../../fonts/fontconfig/buildlink3.mk"
79.include "../../graphics/freetype2/buildlink3.mk" 82.include "../../graphics/freetype2/buildlink3.mk"
80.include "../../graphics/lcms2/buildlink3.mk" 83.include "../../graphics/lcms2/buildlink3.mk"
81.include "../../graphics/libwebp/buildlink3.mk" 84.include "../../graphics/libwebp/buildlink3.mk"
82.include "../../graphics/png/buildlink3.mk" 85.include "../../graphics/png/buildlink3.mk"
83.include "../../graphics/tiff/buildlink3.mk" 86.include "../../graphics/tiff/buildlink3.mk"
84.include "../../math/fftw/buildlink3.mk" 87.include "../../math/fftw/buildlink3.mk"
 88.include "../../print/ghostscript/buildlink3.mk"
85.include "../../textproc/libxml2/buildlink3.mk" 89.include "../../textproc/libxml2/buildlink3.mk"
86.include "../../mk/bsd.pkg.mk" 90.include "../../mk/bsd.pkg.mk"
cvs diff -r1.16 -r1.17 pkgsrc/graphics/ImageMagick/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/options.mk 2014/10/10 15:17:22 1.16
+++ pkgsrc/graphics/ImageMagick/options.mk 2014/10/12 18:55:14 1.17
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: options.mk,v 1.16 2014/10/10 15:17:22 prlw1 Exp $ 1# $NetBSD: options.mk,v 1.17 2014/10/12 18:55:14 dholland Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.ImageMagick 3PKG_OPTIONS_VAR= PKG_OPTIONS.ImageMagick
4PKG_SUPPORTED_OPTIONS= x11 jasper djvu ghostscript openexr wmf 4PKG_SUPPORTED_OPTIONS= x11 jasper djvu openexr wmf
5PKG_SUGGESTED_OPTIONS= x11 jasper 5PKG_SUGGESTED_OPTIONS= x11 jasper
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9.if !empty(PKG_OPTIONS:Mx11) 9.if !empty(PKG_OPTIONS:Mx11)
10.include "../../x11/libX11/buildlink3.mk" 10.include "../../x11/libX11/buildlink3.mk"
11.include "../../x11/libXext/buildlink3.mk" 11.include "../../x11/libXext/buildlink3.mk"
12.include "../../x11/libXt/buildlink3.mk" 12.include "../../x11/libXt/buildlink3.mk"
13.else 13.else
14CONFIGURE_ARGS+= --without-x 14CONFIGURE_ARGS+= --without-x
15.endif 15.endif
16 16
17.if !empty(PKG_OPTIONS:Mjasper) 17.if !empty(PKG_OPTIONS:Mjasper)
@@ -19,33 +19,26 @@ BUILDLINK_API_DEPENDS.jasper+= jasper>=1 @@ -19,33 +19,26 @@ BUILDLINK_API_DEPENDS.jasper+= jasper>=1
19.include "../../graphics/jasper/buildlink3.mk" 19.include "../../graphics/jasper/buildlink3.mk"
20CONFIGURE_ARGS+= --with-jp2 20CONFIGURE_ARGS+= --with-jp2
21.else 21.else
22CONFIGURE_ARGS+= --without-jp2 22CONFIGURE_ARGS+= --without-jp2
23.endif 23.endif
24 24
25.if !empty(PKG_OPTIONS:Mdjvu) 25.if !empty(PKG_OPTIONS:Mdjvu)
26.include "../../graphics/djvulibre-lib/buildlink3.mk" 26.include "../../graphics/djvulibre-lib/buildlink3.mk"
27CONFIGURE_ARGS+= --with-djvu 27CONFIGURE_ARGS+= --with-djvu
28.else 28.else
29CONFIGURE_ARGS+= --without-djvu 29CONFIGURE_ARGS+= --without-djvu
30.endif 30.endif
31 31
32.if !empty(PKG_OPTIONS:Mghostscript) 
33.include "../../print/ghostscript/buildlink3.mk" 
34CONFIGURE_ARGS+= --with-gslib 
35.else 
36CONFIGURE_ARGS+= --without-gslib 
37.endif 
38 
39.if !empty(PKG_OPTIONS:Mopenexr) 32.if !empty(PKG_OPTIONS:Mopenexr)
40.include "../../graphics/openexr/buildlink3.mk" 33.include "../../graphics/openexr/buildlink3.mk"
41CONFIGURE_ARGS+= --with-openexr 34CONFIGURE_ARGS+= --with-openexr
42.else 35.else
43CONFIGURE_ARGS+= --without-openexr 36CONFIGURE_ARGS+= --without-openexr
44.endif 37.endif
45 38
46.if !empty(PKG_OPTIONS:Mwmf) 39.if !empty(PKG_OPTIONS:Mwmf)
47.include "../../graphics/libwmf/buildlink3.mk" 40.include "../../graphics/libwmf/buildlink3.mk"
48CONFIGURE_ARGS+= --with-wmf 41CONFIGURE_ARGS+= --with-wmf
49.else 42.else
50CONFIGURE_ARGS+= --without-wmf 43CONFIGURE_ARGS+= --without-wmf
51.endif 44.endif