CVS commit: pkgsrc/graphics

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Mon Oct 30 14:44:05 UTC 2017

Modified Files:
        pkgsrc/graphics/ImageMagick: Makefile buildlink3.mk options.mk
        pkgsrc/graphics/ImageMagick6: Makefile buildlink3.mk options.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.230 -r1.231 pkgsrc/graphics/ImageMagick/Makefile
cvs rdiff -u -r1.60 -r1.61 pkgsrc/graphics/ImageMagick/buildlink3.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/ImageMagick/options.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/ImageMagick6/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/ImageMagick6/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/ImageMagick6/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/ImageMagick/Makefile
diff -u pkgsrc/graphics/ImageMagick/Makefile:1.230 pkgsrc/graphics/ImageMagick/Makefile:1.231
--- pkgsrc/graphics/ImageMagick/Makefile:1.230  Wed Sep 13 08:56:18 2017
+++ pkgsrc/graphics/ImageMagick/Makefile        Mon Oct 30 14:44:05 2017
@@ -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

Index: pkgsrc/graphics/ImageMagick/buildlink3.mk
diff -u pkgsrc/graphics/ImageMagick/buildlink3.mk:1.60 pkgsrc/graphics/ImageMagick/buildlink3.mk:1.61
--- pkgsrc/graphics/ImageMagick/buildlink3.mk:1.60      Tue Feb 28 15:19:59 2017
+++ pkgsrc/graphics/ImageMagick/buildlink3.mk   Mon Oct 30 14:44:05 2017
@@ -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"

Index: pkgsrc/graphics/ImageMagick/options.mk
diff -u pkgsrc/graphics/ImageMagick/options.mk:1.17 pkgsrc/graphics/ImageMagick/options.mk:1.18
--- pkgsrc/graphics/ImageMagick/options.mk:1.17 Sun Oct 12 18:55:14 2014
+++ pkgsrc/graphics/ImageMagick/options.mk      Mon Oct 30 14:44:05 2017
@@ -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)

Index: pkgsrc/graphics/ImageMagick6/Makefile
diff -u pkgsrc/graphics/ImageMagick6/Makefile:1.7 pkgsrc/graphics/ImageMagick6/Makefile:1.8
--- pkgsrc/graphics/ImageMagick6/Makefile:1.7   Sat Sep  9 12:09:37 2017
+++ pkgsrc/graphics/ImageMagick6/Makefile       Mon Oct 30 14:44:05 2017
@@ -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

Index: pkgsrc/graphics/ImageMagick6/buildlink3.mk
diff -u pkgsrc/graphics/ImageMagick6/buildlink3.mk:1.2 pkgsrc/graphics/ImageMagick6/buildlink3.mk:1.3
--- pkgsrc/graphics/ImageMagick6/buildlink3.mk:1.2      Tue Feb 28 15:19:59 2017
+++ pkgsrc/graphics/ImageMagick6/buildlink3.mk  Mon Oct 30 14:44:05 2017
@@ -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"

Index: pkgsrc/graphics/ImageMagick6/options.mk
diff -u pkgsrc/graphics/ImageMagick6/options.mk:1.1 pkgsrc/graphics/ImageMagick6/options.mk:1.2
--- pkgsrc/graphics/ImageMagick6/options.mk:1.1 Wed May 25 12:41:17 2016
+++ pkgsrc/graphics/ImageMagick6/options.mk     Mon Oct 30 14:44:05 2017
@@ -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)