[Midnightbsd-cvs] mports [21466] trunk/graphics/ImageMagick7: update image magic 7 to a release version

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri May 27 00:17:36 EDT 2016


Revision: 21466
          http://svnweb.midnightbsd.org/mports/?rev=21466
Author:   laffer1
Date:     2016-05-27 00:17:35 -0400 (Fri, 27 May 2016)
Log Message:
-----------
update image magic 7 to a release version

Modified Paths:
--------------
    trunk/graphics/ImageMagick7/Makefile
    trunk/graphics/ImageMagick7/distinfo
    trunk/graphics/ImageMagick7/pkg-descr
    trunk/graphics/ImageMagick7/pkg-plist

Added Paths:
-----------
    trunk/graphics/ImageMagick7/files/
    trunk/graphics/ImageMagick7/files/patch-config_policy.xml

Modified: trunk/graphics/ImageMagick7/Makefile
===================================================================
--- trunk/graphics/ImageMagick7/Makefile	2016-05-27 03:45:49 UTC (rev 21465)
+++ trunk/graphics/ImageMagick7/Makefile	2016-05-27 04:17:35 UTC (rev 21466)
@@ -2,12 +2,9 @@
 # $FreeBSD: head/graphics/ImageMagick7/Makefile 409613 2016-02-26 15:33:49Z kwm $
 
 PORTNAME=	ImageMagick
-DISTVERSION=	7.0.0-0~beta${DATE}
-PORTREVISION=	0
+DISTVERSION=	7.0.1-5
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.imagemagick.org/download/ \
-		http://www.imagemagick.org/download/beta/ \
-		FREEBSD_LOCAL/kwm \
 		http://www.imagemagick.org/download/legacy/ \
 		http://servingzone.com/mirrors/ImageMagick/ \
 		http://mirror.checkdomain.de/imagemagick/ \
@@ -38,15 +35,13 @@
 LICENSE=	apache2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-DATE=		20160225
-WRKSRC=		${WRKDIR}/${PORTNAME}-7.0.0-0
-
 LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
 
 CONFLICTS_INSTALL=	execline-[0-9]* # bin/import
 
 # This port uses .la files, keep libtool:keepla! (magick/module.c)
-USES=		cpe gmake libtool:keepla pathfix perl5 pkgconfig:both shebangfix tar:xz
+USES=		cpe gmake libtool:keepla localbase pathfix perl5 \
+		pkgconfig:both shebangfix tar:xz
 CPE_PRODUCT=	imagemagick
 CPE_VENDOR=	imagemagick
 SHEBANG_FILES=	www/source/examples.pl
@@ -56,17 +51,13 @@
 USE_LDCONFIG=	yes
 USE_GNOME=	libxml2
 
-# make sure LOCALBASE is placed at the end of the compiler lookup so the configure
-# script can find openjpeg2 headers before the openjpeg15 headers
-CPPFLAGS+=	-isystem${LOCALBASE}/include
-LDFLAGS+=	-Wl,-Y${LOCALBASE}/lib
-
 SAMPLE_FILES=	coder.xml colors.xml delegates.xml log.xml magic.xml mime.xml \
-		policy.xml quantization-table.xml thresholds.xml type-dejavu.xml \
-		type-ghostscript.xml type-windows.xml type.xml
+		policy.xml quantization-table.xml thresholds.xml \
+		type-apple.xml type-dejavu.xml type-ghostscript.xml \
+		type-windows.xml type.xml
 
 #PLIST_SUB=	PORTVERSION=${PORTVERSION:R}
-PLIST_SUB+=	PORTVERSION=${PORTVERSION:R:R} SITE_ARCH=${SITE_ARCH_REL} \
+PLIST_SUB+=	PORTVERSION=${PORTVERSION:R} SITE_ARCH=${SITE_ARCH_REL} \
 		PERL5_MAN3=man/man3
 
 OPTIONS_DEFINE=	BZIP2 DOCS DJVU FFTW FONTCONFIG FPX FREETYPE \
@@ -399,12 +390,6 @@
 . endif
 .endif
 
-.if defined(USER) && ${USER} == kwm
-upload:
-	scp ${DISTDIR}/${DISTNAME}.tar.xz \
-		kwm at freefall.freebsd.org:public_distfiles/
-.endif
-
 post-patch:
 # strip library name of variable parts that can change due to
 # the HDRI and Q16 option

Modified: trunk/graphics/ImageMagick7/distinfo
===================================================================
--- trunk/graphics/ImageMagick7/distinfo	2016-05-27 03:45:49 UTC (rev 21465)
+++ trunk/graphics/ImageMagick7/distinfo	2016-05-27 04:17:35 UTC (rev 21466)
@@ -1,2 +1,3 @@
-SHA256 (ImageMagick-7.0.0-0~beta20160225.tar.xz) = 35f9ed811415633ab4ed6fa4dd6ada625421e87d38dae98e5afc7d30e2a5e5c6
-SIZE (ImageMagick-7.0.0-0~beta20160225.tar.xz) = 8292428
+TIMESTAMP = 1463648575
+SHA256 (ImageMagick-7.0.1-5.tar.xz) = 3a1820c11c81d77ec4a8cac5f24d8582cc2e63d00e40d6930892bd405e86d953
+SIZE (ImageMagick-7.0.1-5.tar.xz) = 8282756

Added: trunk/graphics/ImageMagick7/files/patch-config_policy.xml
===================================================================
--- trunk/graphics/ImageMagick7/files/patch-config_policy.xml	                        (rev 0)
+++ trunk/graphics/ImageMagick7/files/patch-config_policy.xml	2016-05-27 04:17:35 UTC (rev 21466)
@@ -0,0 +1,12 @@
+--- config/policy.xml.orig	2016-05-09 19:28:58.000000000 +0200
++++ config/policy.xml	2016-05-10 17:44:26.720503000 +0200
+@@ -64,4 +64,9 @@
+   <!-- <policy domain="coder" rights="none" pattern="HTTPS" /> -->
+   <!-- <policy domain="path" rights="none" pattern="@*" /> -->
+   <policy domain="cache" name="shared-secret" value="passphrase"/>
++  <policy domain="coder" rights="none" pattern="EPHEMERAL" />
++  <policy domain="coder" rights="none" pattern="URL" />
++  <policy domain="coder" rights="none" pattern="HTTPS" />
++  <policy domain="coder" rights="none" pattern="MVG" />
++  <policy domain="coder" rights="none" pattern="MSL" />
+ </policymap>


Property changes on: trunk/graphics/ImageMagick7/files/patch-config_policy.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/graphics/ImageMagick7/pkg-descr
===================================================================
--- trunk/graphics/ImageMagick7/pkg-descr	2016-05-27 03:45:49 UTC (rev 21465)
+++ trunk/graphics/ImageMagick7/pkg-descr	2016-05-27 04:17:35 UTC (rev 21466)
@@ -1,8 +1,3 @@
-
-*** This is a UNSTABLE development snapshot. API/ABI breakage guaranteed ***
-
-*** This port is a best efford and updates might be irregular ***
-
 ImageMagick is a package for display and interactive manipulation of
 images. The package includes tools for image conversion, annotation,
 compositing, animation, and creating montages. ImageMagick can read and

Modified: trunk/graphics/ImageMagick7/pkg-plist
===================================================================
--- trunk/graphics/ImageMagick7/pkg-plist	2016-05-27 03:45:49 UTC (rev 21465)
+++ trunk/graphics/ImageMagick7/pkg-plist	2016-05-27 04:17:35 UTC (rev 21466)
@@ -23,6 +23,7 @@
 @sample etc/ImageMagick-7/policy.xml.sample
 @sample etc/ImageMagick-7/quantization-table.xml.sample
 @sample etc/ImageMagick-7/thresholds.xml.sample
+ at sample etc/ImageMagick-7/type-apple.xml.sample
 @sample etc/ImageMagick-7/type-dejavu.xml.sample
 @sample etc/ImageMagick-7/type-ghostscript.xml.sample
 @sample etc/ImageMagick-7/type-windows.xml.sample
@@ -88,7 +89,6 @@
 include/ImageMagick-7/MagickCore/list.h
 include/ImageMagick-7/MagickCore/locale_.h
 include/ImageMagick-7/MagickCore/log.h
-include/ImageMagick-7/MagickCore/magic-private.h
 include/ImageMagick-7/MagickCore/magic.h
 include/ImageMagick-7/MagickCore/magick-baseconfig.h
 include/ImageMagick-7/MagickCore/magick-config.h
@@ -163,7 +163,7 @@
 include/ImageMagick-7/MagickWand/stream.h
 include/ImageMagick-7/MagickWand/wand-view.h
 include/ImageMagick-7/MagickWand/wandcli.h
-lib/ImageMagick-%%PORTVERSION%%/config-%%QBIT%%%%HDRI%%/configure.xml
+lib/ImageMagick-7.0.1/config-%%QBIT%%%%HDRI%%/configure.xml
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/aai.la
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/aai.so
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/art.la
@@ -316,8 +316,6 @@
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/pnm.so
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/pango.la
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/pango.so
-%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/preview.la
-%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/preview.so
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/ps.la
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/ps.so
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/ps2.la
@@ -455,6 +453,7 @@
 man/man1/display.1.gz
 man/man1/identify.1.gz
 man/man1/import.1.gz
+man/man1/magick-script.1.gz
 man/man1/magick.1.gz
 man/man1/mogrify.1.gz
 man/man1/montage.1.gz
@@ -1493,8 +1492,10 @@
 %%PORTDOCS%%%%DOCSDIR%%-7/www/links.html
 %%PORTDOCS%%%%DOCSDIR%%-7/www/magick++.html
 %%PORTDOCS%%%%DOCSDIR%%-7/www/magick-core.html
+%%PORTDOCS%%%%DOCSDIR%%-7/www/magick-script.html
 %%PORTDOCS%%%%DOCSDIR%%-7/www/magick-vector-graphics.html
 %%PORTDOCS%%%%DOCSDIR%%-7/www/magick-wand.html
+%%PORTDOCS%%%%DOCSDIR%%-7/www/magick.html
 %%PORTDOCS%%%%DOCSDIR%%-7/www/miff.html
 %%PORTDOCS%%%%DOCSDIR%%-7/www/mogrify.html
 %%PORTDOCS%%%%DOCSDIR%%-7/www/montage.html



More information about the Midnightbsd-cvs mailing list