svn commit: r414527 - branches/2016Q2/graphics/ImageMagick
Mark Felder
feld at FreeBSD.org
Tue May 3 12:47:33 UTC 2016
Author: feld
Date: Tue May 3 12:47:31 2016
New Revision: 414527
URL: https://svnweb.freebsd.org/changeset/ports/414527
Log:
MFH: r413630 r413645 r414519
Update ImageMagick to 6.9.3-8.
Fix the handling of type-apple.xml under @sample. PORTREVISION
bump for plist change.
Committed under just-fix-it.
Update ImageMagick to 6.9.3-9.
* Switch to USES=localbase.
* Mark this version as legacy version now that ImageMagick7 is released.
Upstream will continue to support this version.
* Switch to CONFLICT_INSTALL
Approved by: ports-secteam (with hat)
Modified:
branches/2016Q2/graphics/ImageMagick/Makefile
branches/2016Q2/graphics/ImageMagick/distinfo
branches/2016Q2/graphics/ImageMagick/pkg-plist
Directory Properties:
branches/2016Q2/ (props changed)
Modified: branches/2016Q2/graphics/ImageMagick/Makefile
==============================================================================
--- branches/2016Q2/graphics/ImageMagick/Makefile Tue May 3 12:45:54 2016 (r414526)
+++ branches/2016Q2/graphics/ImageMagick/Makefile Tue May 3 12:47:31 2016 (r414527)
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= ImageMagick
-DISTVERSION= 6.9.3-7
-PORTREVISION= 2
+DISTVERSION= 6.9.3-9
PORTEPOCH= 1
CATEGORIES= graphics perl5
MASTER_SITES= http://www.imagemagick.org/download/ \
@@ -30,7 +29,7 @@ MASTER_SITES= http://www.imagemagick.org
ftp://ftp.fifi.org/pub/ImageMagick/
MAINTAINER= kwm at FreeBSD.org
-COMMENT= Image processing tools
+COMMENT= Image processing tools (legacy version)
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
@@ -40,7 +39,8 @@ LIB_DEPENDS= libltdl.so: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
@@ -50,14 +50,9 @@ CONFIGURE_ARGS= --without-dps
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}
@@ -366,11 +361,11 @@ USES+= ghostscript
.if ! ${PORT_OPTIONS:MX11}
CONFIGURE_ARGS+= --without-x
-CONFLICTS+= ImageMagick-6*
+CONFLICTS_INSTALL+= ImageMagick-6*
PLIST_SUB+= X11='@comment '
PKGNAMESUFFIX= -nox11
.else
-CONFLICTS+= ImageMagick-nox11-6*
+CONFLICTS_INSTALL+= ImageMagick-nox11-6*
CONFLICTS+= display-[0-9]*
CONFIGURE_ARGS+= --with-x
USE_XORG= xext xt
Modified: branches/2016Q2/graphics/ImageMagick/distinfo
==============================================================================
--- branches/2016Q2/graphics/ImageMagick/distinfo Tue May 3 12:45:54 2016 (r414526)
+++ branches/2016Q2/graphics/ImageMagick/distinfo Tue May 3 12:47:31 2016 (r414527)
@@ -1,2 +1,2 @@
-SHA256 (ImageMagick-6.9.3-7.tar.xz) = 6731c414b5b939713a73a088840ed68c22c91d1335514d228d6687d07ce2e1c8
-SIZE (ImageMagick-6.9.3-7.tar.xz) = 8782808
+SHA256 (ImageMagick-6.9.3-9.tar.xz) = cec69db7d14cb1ab2d173381e5676219c678ca27b7af8878c6ffec18ec932960
+SIZE (ImageMagick-6.9.3-9.tar.xz) = 8777400
Modified: branches/2016Q2/graphics/ImageMagick/pkg-plist
==============================================================================
--- branches/2016Q2/graphics/ImageMagick/pkg-plist Tue May 3 12:45:54 2016 (r414526)
+++ branches/2016Q2/graphics/ImageMagick/pkg-plist Tue May 3 12:47:31 2016 (r414527)
@@ -23,6 +23,7 @@ bin/stream
@sample etc/ImageMagick-6/policy.xml.sample
@sample etc/ImageMagick-6/quantization-table.xml.sample
@sample etc/ImageMagick-6/thresholds.xml.sample
+ at sample etc/ImageMagick-6/type-apple.xml.sample
@sample etc/ImageMagick-6/type-dejavu.xml.sample
@sample etc/ImageMagick-6/type-ghostscript.xml.sample
@sample etc/ImageMagick-6/type-windows.xml.sample
More information about the svn-ports-all
mailing list