[pkgsrc/trunk]: pkgsrc/graphics graphics/ImageMagick*: Replace (optional) dep...

[fhajny <fhajny%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/db3e7e054ae8
branches:  trunk
changeset: 370984:db3e7e054ae8
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Mon Oct 30 14:44:05 2017 +0000

description:
graphics/ImageMagick*: Replace (optional) dependency on jasper, removed
by upstream in as early as 6.8, and replace with openjpeg - for the
purposes of JPEG 2000 (JP2) support. Bump PKGREVISION.

diffstat:

 graphics/ImageMagick/Makefile       |   3 ++-
 graphics/ImageMagick/buildlink3.mk  |   6 +++---
 graphics/ImageMagick/options.mk     |  16 ++++++++--------
 graphics/ImageMagick6/Makefile      |   3 ++-
 graphics/ImageMagick6/buildlink3.mk |   6 +++---
 graphics/ImageMagick6/options.mk    |  16 ++++++++--------
 6 files changed, 26 insertions(+), 24 deletions(-)

diffs (134 lines):

diff -r 3e252557ad0f -r db3e7e054ae8 graphics/ImageMagick/Makefile
--- a/graphics/ImageMagick/Makefile     Mon Oct 30 14:02:13 2017 +0000
+++ b/graphics/ImageMagick/Makefile     Mon Oct 30 14:44:05 2017 +0000
@@ -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@localhost
 COMMENT=       Package for display and interactive manipulation of images
diff -r 3e252557ad0f -r db3e7e054ae8 graphics/ImageMagick/buildlink3.mk
--- a/graphics/ImageMagick/buildlink3.mk        Mon Oct 30 14:02:13 2017 +0000
+++ b/graphics/ImageMagick/buildlink3.mk        Mon Oct 30 14:44:05 2017 +0000
@@ -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 @@
 .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 -r 3e252557ad0f -r db3e7e054ae8 graphics/ImageMagick/options.mk
--- a/graphics/ImageMagick/options.mk   Mon Oct 30 14:02:13 2017 +0000
+++ b/graphics/ImageMagick/options.mk   Mon Oct 30 14:44:05 2017 +0000
@@ -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 @@
 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 -r 3e252557ad0f -r db3e7e054ae8 graphics/ImageMagick6/Makefile
--- a/graphics/ImageMagick6/Makefile    Mon Oct 30 14:02:13 2017 +0000
+++ b/graphics/ImageMagick6/Makefile    Mon Oct 30 14:44:05 2017 +0000
@@ -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@localhost
 COMMENT=       Package for display and interactive manipulation of images
diff -r 3e252557ad0f -r db3e7e054ae8 graphics/ImageMagick6/buildlink3.mk
--- a/graphics/ImageMagick6/buildlink3.mk       Mon Oct 30 14:02:13 2017 +0000
+++ b/graphics/ImageMagick6/buildlink3.mk       Mon Oct 30 14:44:05 2017 +0000
@@ -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 @@
 .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 -r 3e252557ad0f -r db3e7e054ae8 graphics/ImageMagick6/options.mk
--- a/graphics/ImageMagick6/options.mk  Mon Oct 30 14:02:13 2017 +0000
+++ b/graphics/ImageMagick6/options.mk  Mon Oct 30 14:44:05 2017 +0000
@@ -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 @@
 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)