From owner-svn-ports-branches@freebsd.org Tue May 3 12:45:56 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0C797B2B09A; Tue, 3 May 2016 12:45:56 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DCC3A1D70; Tue, 3 May 2016 12:45:55 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u43Cjt8E032270; Tue, 3 May 2016 12:45:55 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u43CjsGx032265; Tue, 3 May 2016 12:45:54 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201605031245.u43CjsGx032265@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 3 May 2016 12:45:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414526 - branches/2016Q2/graphics/ImageMagick7 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 May 2016 12:45:56 -0000 Author: feld Date: Tue May 3 12:45:54 2016 New Revision: 414526 URL: https://svnweb.freebsd.org/changeset/ports/414526 Log: MFH: r414520 Update ImageMagick7 to 7.0.1-0. * Switch to USES=localbase. * Removal all the warnings about this being unstable now that it is released. * Switch to CONFLICT_INSTALL Approved by: ports-secteam (with hat) Modified: branches/2016Q2/graphics/ImageMagick7/Makefile branches/2016Q2/graphics/ImageMagick7/distinfo branches/2016Q2/graphics/ImageMagick7/pkg-descr branches/2016Q2/graphics/ImageMagick7/pkg-plist Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/graphics/ImageMagick7/Makefile ============================================================================== --- branches/2016Q2/graphics/ImageMagick7/Makefile Tue May 3 10:49:03 2016 (r414525) +++ branches/2016Q2/graphics/ImageMagick7/Makefile Tue May 3 12:45:54 2016 (r414526) @@ -1,12 +1,9 @@ # $FreeBSD$ PORTNAME= ImageMagick -DISTVERSION= 7.0.0-0~beta${DATE} -PORTREVISION= 2 +DISTVERSION= 7.0.1-0 CATEGORIES= graphics perl5 MASTER_SITES= http://www.imagemagick.org/download/ \ - http://www.imagemagick.org/download/beta/ \ - LOCAL/kwm \ http://www.imagemagick.org/download/legacy/ \ http://servingzone.com/mirrors/ImageMagick/ \ http://mirror.checkdomain.de/imagemagick/ \ @@ -32,20 +29,18 @@ MASTER_SITES= http://www.imagemagick.org PKGNAMESUFFIX= 7 MAINTAINER= kwm@FreeBSD.org -COMMENT= Image processing tools (unstable version) +COMMENT= Image processing tools LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -DATE= 20160225 -WRKSRC= ${WRKDIR}/${PORTNAME}-7.0.0-0 - 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 @@ -55,17 +50,12 @@ 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} -PLIST_SUB= PORTVERSION=${PORTVERSION:R:R} +PLIST_SUB= PORTVERSION=${PORTVERSION:R} OPTIONS_DEFINE= BZIP2 DOCS DJVU FFTW FONTCONFIG FPX FREETYPE \ GRAPHVIZ GSLIB JPEG2000 JBIG JPEG LCMS2 LZMA LQR MODULES \ @@ -397,12 +387,6 @@ USES+= ghostscript:build . endif .endif -.if defined(USER) && ${USER} == kwm -upload: - scp ${DISTDIR}/${DISTNAME}.tar.xz \ - kwm@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: branches/2016Q2/graphics/ImageMagick7/distinfo ============================================================================== --- branches/2016Q2/graphics/ImageMagick7/distinfo Tue May 3 10:49:03 2016 (r414525) +++ branches/2016Q2/graphics/ImageMagick7/distinfo Tue May 3 12:45:54 2016 (r414526) @@ -1,2 +1,2 @@ -SHA256 (ImageMagick-7.0.0-0~beta20160225.tar.xz) = 35f9ed811415633ab4ed6fa4dd6ada625421e87d38dae98e5afc7d30e2a5e5c6 -SIZE (ImageMagick-7.0.0-0~beta20160225.tar.xz) = 8292428 +SHA256 (ImageMagick-7.0.1-0.tar.xz) = bd15aaef2aa2393b3d62b821f5752d5f4066a90d3b0d9259d93217ad47c056d9 +SIZE (ImageMagick-7.0.1-0.tar.xz) = 8288172 Modified: branches/2016Q2/graphics/ImageMagick7/pkg-descr ============================================================================== --- branches/2016Q2/graphics/ImageMagick7/pkg-descr Tue May 3 10:49:03 2016 (r414525) +++ branches/2016Q2/graphics/ImageMagick7/pkg-descr Tue May 3 12:45:54 2016 (r414526) @@ -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: branches/2016Q2/graphics/ImageMagick7/pkg-plist ============================================================================== --- branches/2016Q2/graphics/ImageMagick7/pkg-plist Tue May 3 10:49:03 2016 (r414525) +++ branches/2016Q2/graphics/ImageMagick7/pkg-plist Tue May 3 12:45:54 2016 (r414526) @@ -23,6 +23,7 @@ bin/stream @sample etc/ImageMagick-7/policy.xml.sample @sample etc/ImageMagick-7/quantization-table.xml.sample @sample etc/ImageMagick-7/thresholds.xml.sample +@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/linked- 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 @@ -316,8 +316,6 @@ lib/ImageMagick-%%PORTVERSION%%/config-% %%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/convert.1.gz 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 @@ man/man1/stream.1.gz %%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