diff options
| -rw-r--r-- | graphics/ImageMagick/Makefile | 3 | ||||
| -rw-r--r-- | graphics/ImageMagick/buildlink3.mk | 6 | ||||
| -rw-r--r-- | graphics/ImageMagick/options.mk | 16 | ||||
| -rw-r--r-- | graphics/ImageMagick6/Makefile | 3 | ||||
| -rw-r--r-- | graphics/ImageMagick6/buildlink3.mk | 6 | ||||
| -rw-r--r-- | graphics/ImageMagick6/options.mk | 16 |
6 files changed, 26 insertions, 24 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index ab0dedc71d1..f3f0772bd8f 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.230 2017/09/13 08:56:18 wiz Exp $ +# $NetBSD: Makefile,v 1.231 2017/10/30 14:44:05 fhajny Exp $ .include "Makefile.common" PKGNAME= ImageMagick-${DISTVERSION} +PKGREVISION= 1 MAINTAINER= adam@NetBSD.org COMMENT= Package for display and interactive manipulation of images diff --git a/graphics/ImageMagick/buildlink3.mk b/graphics/ImageMagick/buildlink3.mk index 5cb7c085c05..d9859700aa8 100644 --- a/graphics/ImageMagick/buildlink3.mk +++ b/graphics/ImageMagick/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.60 2017/02/28 15:19:59 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.61 2017/10/30 14:44:05 fhajny Exp $ BUILDLINK_TREE+= ImageMagick @@ -15,8 +15,8 @@ pkgbase := ImageMagick .if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mdjvu) .include "../../graphics/djvulibre-lib/buildlink3.mk" .endif -.if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mjasper) -.include "../../graphics/jasper/buildlink3.mk" +.if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mjp2) +.include "../../graphics/openjpeg/buildlink3.mk" .endif .if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mopenexr) .include "../../graphics/openexr/buildlink3.mk" diff --git a/graphics/ImageMagick/options.mk b/graphics/ImageMagick/options.mk index 4893299b51c..4ee2cf7487c 100644 --- a/graphics/ImageMagick/options.mk +++ b/graphics/ImageMagick/options.mk @@ -1,8 +1,9 @@ -# $NetBSD: options.mk,v 1.17 2014/10/12 18:55:14 dholland Exp $ +# $NetBSD: options.mk,v 1.18 2017/10/30 14:44:05 fhajny Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ImageMagick -PKG_SUPPORTED_OPTIONS= x11 jasper djvu openexr wmf -PKG_SUGGESTED_OPTIONS= x11 jasper +PKG_SUPPORTED_OPTIONS= x11 jp2 djvu openexr wmf +PKG_SUGGESTED_OPTIONS= x11 jp2 +PKG_OPTIONS_LEGACY_OPTS+= jasper:jp2 .include "../../mk/bsd.options.mk" @@ -14,12 +15,11 @@ PKG_SUGGESTED_OPTIONS= x11 jasper 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 +.if !empty(PKG_OPTIONS:Mjp2) +.include "../../graphics/openjpeg/buildlink3.mk" +CONFIGURE_ARGS+= --with-openjp2 .else -CONFIGURE_ARGS+= --without-jp2 +CONFIGURE_ARGS+= --without-openjp2 .endif .if !empty(PKG_OPTIONS:Mdjvu) diff --git a/graphics/ImageMagick6/Makefile b/graphics/ImageMagick6/Makefile index dc74e962f3e..4db625615d6 100644 --- a/graphics/ImageMagick6/Makefile +++ b/graphics/ImageMagick6/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.7 2017/09/09 12:09:37 ryoon Exp $ +# $NetBSD: Makefile,v 1.8 2017/10/30 14:44:05 fhajny Exp $ .include "Makefile.common" PKGNAME= ImageMagick6-${DISTVERSION} +PKGREVISION= 1 MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Package for display and interactive manipulation of images diff --git a/graphics/ImageMagick6/buildlink3.mk b/graphics/ImageMagick6/buildlink3.mk index d05effa3b1c..25defa16a11 100644 --- a/graphics/ImageMagick6/buildlink3.mk +++ b/graphics/ImageMagick6/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2017/02/28 15:19:59 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2017/10/30 14:44:05 fhajny Exp $ BUILDLINK_TREE+= ImageMagick6 @@ -15,8 +15,8 @@ pkgbase := ImageMagick6 .if !empty(PKG_BUILD_OPTIONS.ImageMagick6:Mdjvu) .include "../../graphics/djvulibre-lib/buildlink3.mk" .endif -.if !empty(PKG_BUILD_OPTIONS.ImageMagick6:Mjasper) -.include "../../graphics/jasper/buildlink3.mk" +.if !empty(PKG_BUILD_OPTIONS.ImageMagick6:Mjp2) +.include "../../graphics/openjpeg/buildlink3.mk" .endif .if !empty(PKG_BUILD_OPTIONS.ImageMagick6:Mopenexr) .include "../../graphics/openexr/buildlink3.mk" diff --git a/graphics/ImageMagick6/options.mk b/graphics/ImageMagick6/options.mk index f109178def9..4ef39daad14 100644 --- a/graphics/ImageMagick6/options.mk +++ b/graphics/ImageMagick6/options.mk @@ -1,8 +1,9 @@ -# $NetBSD: options.mk,v 1.1 2016/05/25 12:41:17 ryoon Exp $ +# $NetBSD: options.mk,v 1.2 2017/10/30 14:44:05 fhajny Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ImageMagick -PKG_SUPPORTED_OPTIONS= x11 jasper djvu openexr wmf -PKG_SUGGESTED_OPTIONS= x11 jasper +PKG_SUPPORTED_OPTIONS= x11 jp2 djvu openexr wmf +PKG_SUGGESTED_OPTIONS= x11 jp2 +PKG_OPTIONS_LEGACY_OPTS+= jasper:jp2 .include "../../mk/bsd.options.mk" @@ -14,12 +15,11 @@ PKG_SUGGESTED_OPTIONS= x11 jasper 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 +.if !empty(PKG_OPTIONS:Mjp2) +.include "../../graphics/openjpeg/buildlink3.mk" +CONFIGURE_ARGS+= --with-openjp2 .else -CONFIGURE_ARGS+= --without-jp2 +CONFIGURE_ARGS+= --without-openjp2 .endif .if !empty(PKG_OPTIONS:Mdjvu) |