diff options
| author | dholland <dholland> | 2014-10-12 18:55:14 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2014-10-12 18:55:14 +0000 |
| commit | d80729a537b400e4f28830f5b6177f4f7af4318f (patch) | |
| tree | fab8e4bab306f65d67f50605d65cd1bc57ecd9ba | |
| parent | 1be02451441b4f996acc01937be2eeb294c62b04 (diff) | |
| download | pkgsrc-d80729a537b400e4f28830f5b6177f4f7af4318f.tar.gz | |
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
| -rw-r--r-- | graphics/ImageMagick/Makefile | 8 | ||||
| -rw-r--r-- | graphics/ImageMagick/options.mk | 11 |
2 files changed, 8 insertions, 11 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index b6057f7145b..a4886986a13 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.212 2014/10/10 15:17:22 prlw1 Exp $ +# $NetBSD: Makefile,v 1.213 2014/10/12 18:55:14 dholland Exp $ .include "Makefile.common" PKGNAME= ImageMagick-${DISTVERSION} -PKGREVISION= 3 +PKGREVISION= 4 MAINTAINER= adam@NetBSD.org COMMENT= Package for display and interactive manipulation of images @@ -20,6 +20,9 @@ CONFIGURE_ARGS+= --with-xml=yes CONFIGURE_ARGS+= --disable-openmp CONFIGURE_ARGS+= --without-perl CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} +# This one used to be optional, but it depends on ghostscript even if it's +# disabled so having a way to disable it seems pointless. +CONFIGURE_ARGS+= --with-gslib PKGCONFIG_OVERRIDE= Magick++/lib/ImageMagick++.pc.in PKGCONFIG_OVERRIDE+= Magick++/lib/Magick++.pc.in PKGCONFIG_OVERRIDE+= magick/ImageMagick.pc.in @@ -82,5 +85,6 @@ SUBST_SED.fix-etc= -e 's,^configlibdir =.*,configlibdir = $$(DATA_DIR)/examples/ .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../math/fftw/buildlink3.mk" +.include "../../print/ghostscript/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/ImageMagick/options.mk b/graphics/ImageMagick/options.mk index ad3ac7a8923..4893299b51c 100644 --- a/graphics/ImageMagick/options.mk +++ b/graphics/ImageMagick/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.16 2014/10/10 15:17:22 prlw1 Exp $ +# $NetBSD: options.mk,v 1.17 2014/10/12 18:55:14 dholland Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ImageMagick -PKG_SUPPORTED_OPTIONS= x11 jasper djvu ghostscript openexr wmf +PKG_SUPPORTED_OPTIONS= x11 jasper djvu openexr wmf PKG_SUGGESTED_OPTIONS= x11 jasper .include "../../mk/bsd.options.mk" @@ -29,13 +29,6 @@ CONFIGURE_ARGS+= --with-djvu CONFIGURE_ARGS+= --without-djvu .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:Mopenexr) .include "../../graphics/openexr/buildlink3.mk" CONFIGURE_ARGS+= --with-openexr |