From owner-svn-ports-all@FreeBSD.ORG Mon Jul 23 12:56:16 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2A5B5106564A; Mon, 23 Jul 2012 12:56:16 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 13CD68FC0A; Mon, 23 Jul 2012 12:56:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6NCuGnV009882; Mon, 23 Jul 2012 12:56:16 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6NCuFx6009876; Mon, 23 Jul 2012 12:56:15 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201207231256.q6NCuFx6009876@svn.freebsd.org> From: Martin Matuska Date: Mon, 23 Jul 2012 12:56:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r301392 - in head: . Mk graphics/ImageMagick X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jul 2012 12:56:16 -0000 Author: mm Date: Mon Jul 23 12:56:15 2012 New Revision: 301392 URL: http://svn.freebsd.org/changeset/ports/301392 Log: Update ImageMagick to 6.7.8.6 Convert to new options framework and use default option names. Drop lcms v1 support. Modified: head/Mk/bsd.options.desc.mk head/UPDATING head/graphics/ImageMagick/Makefile head/graphics/ImageMagick/distinfo head/graphics/ImageMagick/pkg-plist Modified: head/Mk/bsd.options.desc.mk ============================================================================== --- head/Mk/bsd.options.desc.mk Mon Jul 23 12:52:24 2012 (r301391) +++ head/Mk/bsd.options.desc.mk Mon Jul 23 12:56:15 2012 (r301392) @@ -33,6 +33,7 @@ AVAHI_DESC?= Support Zeroconf through A BDB_DESC?= Berkeley DB support BDB1_DESC?= Berkeley DB 1.85 support BOOST_DESC?= Boost support +BZIP2_DESC?= bzip2 compression support CACA_DESC?= libcaca support CAIRO_DESC?= Cairo graphic library support CARES_DESC?= Asynchronous DNS resolution via c-ares @@ -68,9 +69,11 @@ FAAD_DESC?= FAAD aac decoder support FAM_DESC?= File Alteration Monitor support FASTCGI_DESC?= FastCGI support FFMPEG_DESC?= Support FFMPEG (wma aiff ac3 ape...) +FFTW_DESC?= Discrete Fourier Transform support FLAC_DESC?= FLAC support FONTCONFIG_DESC?= Font configuration API for X FPECTL_DESC?= floating point exception handling +FPX_DESC?= Flashpix support FREETDS_DESC?= FreeTDS support FREETYPE_DESC?= TrueType font rendering engine FREI0R_DESC?= Frei0r video plugins support @@ -123,6 +126,7 @@ JABBER_DESC?= Jabber support JACK_DESC?= Support JACK audio server JASPER_DESC?= JPEG 2000 support via JasPer JAVA_DESC?= JAVA platform support +JBIG_DESC?= JBIG support JHEAD_DESC?= jhead support JPEG_DESC?= JPEG support KDE3_DESC?= KDE3 Desktop support @@ -154,7 +158,9 @@ LIBXINE_DESC?= linxine support LIGHTTPD_DESC?= Lighttpd server LIRC_DESC?= LIRC support LITE_DESC?= Reduced features and memory +LQR_DESC?= Liquid Rescale support LUA_DESC?= LUA support +LZMA_DESC?= LZMA compression support MAD_DESC?= Mad mp3 decoder support MAGICK_DESC?= ImageMagick Library MANPAGES_DESC?= Build and install man pages @@ -204,6 +210,7 @@ ORACLE_JDBC_DESC?= JDBC connection to Or OSD_DESC?= On-Screen-Display support OSS_DESC?= Open Sound System support PAM_DESC?= PAM support +PANGO_DESC?= Pango rendering library support PCRE_DESC?= Use Perl Compatible Regular Expressions PDF_DESC?= PDF support PERL_DESC?= Perl scripting language support @@ -283,6 +290,7 @@ WAV_DESC?= Support WAV audio format WAVPACK_DESC?= WavPack support WEBP_DESC?= WebP support WEBSERVER_DESC?= Build Internal Webserver +WMF_DESC?= Windows Metafile support WXGTK_DESC?= WxGTK gui toolkit X11_DESC?= X11 support X264_DESC?= H264 video codec using x264 Modified: head/UPDATING ============================================================================== --- head/UPDATING Mon Jul 23 12:52:24 2012 (r301391) +++ head/UPDATING Mon Jul 23 12:56:15 2012 (r301392) @@ -5,6 +5,14 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20120823: + AFFECTS: users of graphics/ImageMagick and graphics/ImageMagick-nox11 + AUTHOR: mm@FreeBSD.org + + The options for ImageMagick have been changed to match commonly used + option names. If you are using a customized build, please reconfigure + your port options with "make config". + 20120820: AFFECTS: users of net/spread and net/spread4 AUTHOR: ohauer@FreeBSD.org Modified: head/graphics/ImageMagick/Makefile ============================================================================== --- head/graphics/ImageMagick/Makefile Mon Jul 23 12:52:24 2012 (r301391) +++ head/graphics/ImageMagick/Makefile Mon Jul 23 12:56:15 2012 (r301392) @@ -6,8 +6,7 @@ # PORTNAME= ImageMagick -DISTVERSION= 6.7.7-7 -PORTREVISION= 1 +DISTVERSION= 6.7.8-6 CATEGORIES= graphics perl5 MASTER_SITES= ftp://ftp.imagemagick.org/pub/ImageMagick/ \ http://image_magick.veidrodis.com/image_magick/ \ @@ -26,7 +25,7 @@ USE_AUTOTOOLS= libltdl # For some reason, using our libtool breaks the build into pieces: #USE_AUTOTOOLS+= libtool GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-shared --without-dps +CONFIGURE_ARGS= --enable-shared --without-dps --without-lcms USE_GMAKE= yes MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes @@ -41,51 +40,33 @@ LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= PORTVERSION=${PORTVERSION:R} -OPTIONS=\ - IMAGEMAGICK_16BIT_PIXEL "16bit pixel support" on \ - IMAGEMAGICK_BZLIB "Bzlib support" on \ - IMAGEMAGICK_DJVU "DJVU format support (needs threads)" off \ - IMAGEMAGICK_DOT "GraphViz dot graphs support" off \ - IMAGEMAGICK_FFTW "Discrete Fourier Transform support" on \ - IMAGEMAGICK_FONTCONFIG "Fontconfig support" on \ - IMAGEMAGICK_FPX "FPX format support" on \ - IMAGEMAGICK_GSLIB "libgs (Postscript SHLIB) support" off \ - IMAGEMAGICK_HDRI "High dynamic range images support" off \ - IMAGEMAGICK_JBIG "JBIG format support" on \ - IMAGEMAGICK_JPEG "JPG format support" on \ - IMAGEMAGICK_JPEG2000 "JPEG2000 format support" on \ - IMAGEMAGICK_LCMS2 "LCMS version 2 support" on \ - IMAGEMAGICK_LCMS "LCMS version 1 support" off \ - IMAGEMAGICK_LZMA "LZMA support" on \ - IMAGEMAGICK_LQR "Liquid Rescale support" on \ - IMAGEMAGICK_MODULES "Modules support" on \ - IMAGEMAGICK_OPENEXR "OpenEXR support (needs threads)" off \ - IMAGEMAGICK_OPENMP "OpenMP for SMP (needs threads)" off \ - IMAGEMAGICK_PANGO "Pango support" off \ - IMAGEMAGICK_PDF "PDF format support" on \ - IMAGEMAGICK_PERL "Perl support" on \ - IMAGEMAGICK_PNG "PNG format support" on \ - IMAGEMAGICK_SVG "SVG format support (requires X11)" on \ - IMAGEMAGICK_TESTS "Run bundled self-tests after build" off \ - IMAGEMAGICK_TIFF "TIFF format support" on \ - IMAGEMAGICK_TTF "Freetype support" on \ - IMAGEMAGICK_WEBP "WEBP support" on \ - IMAGEMAGICK_WMF "WMF format support" on \ - THREADS "Threads support" off +OPTIONS_DEFINE= 16BIT_PIXEL BZIP2 DJVU FFTW FONTCONFIG FPX FREETYPE GRAPHVIZ \ + GSLIB HDRI JASPER JBIG JPEG LCMS2 LZMA LQR MODULES \ + OPENEXR OPENMP PANGO PDF PERL PNG SVG TESTS TIFF WEBP WMF \ + THREADS +OPTIONS_DEFAULT= 16BIT_PIXEL BZIP2 FFTW FONTCONFIG FPX FREETYPE \ + JASPER JBIG JPEG LCMS2 LZMA LQR MODULES PDF PERL PNG SVG \ + TIFF WEBP WMF +16BIT_PIXEL_DESC= 16bit pixel support +DJVU_DESC= DJVU format support (needs THREADS) +GSLIB_DESC= libgs (Postscript SHLIB) support +HDRI_DESC= High dynamic range images support +MODULES_DESC= Modules support +TESTS_DESC= Run bundled self-tests after build .include -.if !defined(WITHOUT_IMAGEMAGICK_PDF) && defined(WITH_GHOSTSCRIPT_VER) && ${WITH_GHOSTSCRIPT_VER} == "7" +.if ${PORT_OPTIONS:MPDF} && defined(WITH_GHOSTSCRIPT_VER) && ${WITH_GHOSTSCRIPT_VER} == "7" IGNORE= support for the PDF format requires ghostscript 8 and higher .endif -.if defined(WITH_IMAGEMAGICK_HDRI) +.if ${PORT_OPTIONS:MHDRI} CONFIGURE_ARGS+= --enable-hdri .else CONFIGURE_ARGS+= --disable-hdri .endif -.if defined(WITH_THREADS) +.if ${PORT_OPTIONS:MTHREADS} _IMAGEMAGICK_THREADS=yes _IMAGEMAGICK_THREADS_MSG=with threads PERL_THREADED!= ${SH} -c 'case `perl --version` in *freebsd-thread*) ${ECHO_CMD} yes ;; esac' @@ -95,7 +76,7 @@ _IMAGEMAGICK_THREADS_MSG=without threads _IMAGEMAGICK_THREADS_IGNORE_MSG=. Define WITH_THREADS .endif -.if defined(WITH_IMAGEMAGICK_PERL) +.if ${PORT_OPTIONS:MPERL} CONFIGURE_ARGS+= --with-perl=${PERL5} PLIST_SUB+= WITH_PERL='' MAN3= Image::Magick.3 @@ -128,7 +109,7 @@ _IMAGEMAGICK_THREADS=no .endif # OpenMP -.if defined(WITH_IMAGEMAGICK_OPENMP) +.if ${PORT_OPTIONS:MOPENMP} . if ${_IMAGEMAGICK_THREADS} == "no" IGNORE=OpenMP requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG} . else @@ -139,11 +120,11 @@ CONFIGURE_ARGS+= --disable-openmp .endif # Faster, but poor quality -.if defined(WITHOUT_IMAGEMAGICK_16BIT_PIXEL) +.if ${PORT_OPTIONS:M16BIT_PIXEL} +PLIST_SUB+= QBIT='Q16' +.else CONFIGURE_ARGS+= --with-quantum-depth=8 PLIST_SUB+= QBIT='Q8' -.else -PLIST_SUB+= QBIT='Q16' .endif .if defined(WITH_WINDOWS_FONT_DIR) @@ -152,7 +133,7 @@ CONFIGURE_ARGS+= --with-windows-font-dir # Loadable coders, smaller executable, but PerlMagick not really works # ('make test' there works) -.if defined(WITH_IMAGEMAGICK_MODULES) +.if ${PORT_OPTIONS:MMODULES} CONFIGURE_ARGS+= --with-modules PLIST_SUB+= MODULES='' .else @@ -160,7 +141,7 @@ CONFIGURE_ARGS+= --without-modules PLIST_SUB+= MODULES='@comment ' .endif -.if defined(WITH_IMAGEMAGICK_OPENEXR) +.if ${PORT_OPTIONS:MOPENEXR} . if ${_IMAGEMAGICK_THREADS} == "no" IGNORE=OpenEXR requires threads. ${_IMAGEMAGICK_THREADS_IGNORE_MSG} . else @@ -172,7 +153,7 @@ CONFIGURE_ARGS+= --without-openexr PLIST_SUB+= OPENEXR="@comment " .endif -.if defined(WITH_IMAGEMAGICK_DJVU) +.if ${PORT_OPTIONS:MDJVU} . if ${_IMAGEMAGICK_THREADS} == "no" IGNORE=DjVu requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG} . endif @@ -183,7 +164,7 @@ CONFIGURE_ARGS+= --without-djvu PLIST_SUB+= DJVU="@comment " .endif -.if !defined(WITHOUT_IMAGEMAGICK_JPEG) +.if ${PORT_OPTIONS:MJPEG} LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg PLIST_SUB+= JPEG="" .else @@ -191,7 +172,7 @@ CONFIGURE_ARGS+= --without-jpeg PLIST_SUB+= JPEG="@comment " .endif -.if !defined(WITHOUT_IMAGEMAGICK_PNG) +.if ${PORT_OPTIONS:MPNG} LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png PLIST_SUB+= PNG="" .else @@ -199,7 +180,7 @@ CONFIGURE_ARGS+= --without-png PLIST_SUB+= PNG="@comment " .endif -.if !defined(WITHOUT_IMAGEMAGICK_TIFF) +.if ${PORT_OPTIONS:MTIFF} LIB_DEPENDS+= tiff:${PORTSDIR}/graphics/tiff PLIST_SUB+= TIFF="" .else @@ -207,21 +188,21 @@ CONFIGURE_ARGS+= --without-tiff PLIST_SUB+= TIFF="@comment " .endif -.if defined(WITH_IMAGEMAGICK_GSLIB) +.if ${PORT_OPTIONS:MGSLIB} CONFIGURE_ARGS+= --with-gslib USE_GHOSTSCRIPT= yes .else CONFIGURE_ARGS+= --without-gslib .endif -.if !defined(WITHOUT_IMAGEMAGICK_LQR) +.if ${PORT_OPTIONS:MLQR} CONFIGURE_ARGS+= --with-lqr LIB_DEPENDS+= lqr-1.3:${PORTSDIR}/graphics/liblqr-1 .else CONFIGURE_ARGS+= --without-lqr .endif -.if !defined(WITHOUT_IMAGEMAGICK_FFTW) +.if ${PORT_OPTIONS:MFFTW} CONFIGURE_ARGS+= --with-fftw LIB_DEPENDS+= fftw3:${PORTSDIR}/math/fftw3 .else @@ -229,12 +210,12 @@ CONFIGURE_ARGS+= --without-fftw .endif # Produce BZip compressed MIFF images -.if defined(WITHOUT_IMAGEMAGICK_BZLIB) +.if empty(PORT_OPTIONS:MBZIP2) CONFIGURE_ARGS+= --without-bzlib .endif # FPX (FlashPIX) images -.if !defined(WITHOUT_IMAGEMAGICK_FPX) +.if ${PORT_OPTIONS:MFPX} LIB_DEPENDS+= fpx.[2-9]:${PORTSDIR}/graphics/libfpx CONFIGURE_ARGS+= --with-fpx PLIST_SUB+= FPX="" @@ -244,7 +225,7 @@ PLIST_SUB+= FPX="@comment " .endif # JBIG images (lossless compression for bi-level images) -.if !defined(WITHOUT_IMAGEMAGICK_JBIG) +.if ${PORT_OPTIONS:MJBIG} LIB_DEPENDS+= jbig:${PORTSDIR}/graphics/jbigkit PLIST_SUB+= JBIG="" .else @@ -253,7 +234,7 @@ PLIST_SUB+= JBIG="@comment " .endif # JPEG2000 images (wavelet-based lossy compression) -.if !defined(WITHOUT_IMAGEMAGICK_JPEG2000) +.if ${PORT_OPTIONS:MJASPER} LIB_DEPENDS+= jasper:${PORTSDIR}/graphics/jasper PLIST_SUB+= JPEG2000="" .else @@ -262,7 +243,7 @@ PLIST_SUB+= JPEG2000="@comment " .endif # GraphViz dot graphs -.if defined(WITH_IMAGEMAGICK_DOT) +.if ${PORT_OPTIONS:MGRAPHVIZ} LIB_DEPENDS+= gvc:${PORTSDIR}/graphics/graphviz CFLAGS+= -I${LOCALBASE}/include/graphviz LDFLAGS+= -L${LOCALBASE}/lib/graphviz @@ -271,7 +252,7 @@ CONFIGURE_ARGS+= --without-gvc .endif # LZMA support -.if !defined(WITHOUT_IMAGEMAGICK_LZMA) +.if ${PORT_OPTIONS:MLZMA} . if (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) || (${OSVERSION} < 800505) LIB_DEPENDS+= lzma:${PORTSDIR}/archivers/xz . endif @@ -280,20 +261,14 @@ CONFIGURE_ARGS+= --without-lzma .endif # LCMS (Little CMS) color management version 2 and 1 (mutually exclusive) -.if !defined(WITHOUT_IMAGEMAGICK_LCMS2) +.if ${PORT_OPTIONS:MLCMS2} LIB_DEPENDS+= lcms2:${PORTSDIR}/graphics/lcms2 -CONFIGURE_ARGS+= --without-lcms .else CONFIGURE_ARGS+= --without-lcms2 -. if !defined(WITHOUT_IMAGEMAGICK_LCMS) -LIB_DEPENDS+= lcms:${PORTSDIR}/graphics/lcms -. else -CONFIGURE_ARGS+= --without-lcms -. endif .endif # Freetype (TrueType Font) support -.if !defined(WITHOUT_IMAGEMAGICK_TTF) +.if ${PORT_OPTIONS:MFREETYPE} LIB_DEPENDS+= freetype:${PORTSDIR}/print/freetype2 USE_GHOSTSCRIPT= yes CONFIGURE_ARGS+= --with-freetype @@ -302,7 +277,7 @@ CONFIGURE_ARGS+= --without-freetype .endif # Webp support -.if !defined(WITHOUT_IMAGEMAGICK_WEBP) +.if ${PORT_OPTIONS:MWEBP} LIB_DEPENDS+= webp:${PORTSDIR}/graphics/webp CONFIGURE_ARGS+= --with-webp PLIST_SUB+= WEBP="" @@ -312,7 +287,7 @@ PLIST_SUB+= WEBP="@comment " .endif # Fontconfig support -.if !defined(WITHOUT_IMAGEMAGICK_FONTCONFIG) +.if ${PORT_OPTIONS:MFONTCONFIG} LIB_DEPENDS+= fontconfig:${PORTSDIR}/x11-fonts/fontconfig CONFIGURE_ARGS+= --with-fontconfig CONFIGURE_ENV+= FONTCONFIG_CFLAGS="-I${LOCALBASE}/include" \ @@ -323,7 +298,7 @@ CONFIGURE_ARGS+= --without-fontconfig .endif # WMF (Windows Meta File) images -.if !defined(WITHOUT_IMAGEMAGICK_WMF) +.if ${PORT_OPTIONS:MWMF} . if !defined(WITHOUT_X11) LIB_DEPENDS+= wmf:${PORTSDIR}/graphics/libwmf . else @@ -338,7 +313,7 @@ PLIST_SUB+= WMF="@comment " .endif # SVG (Scalable Vector Graphics) requires both libxml2 and X11 -.if defined(WITH_IMAGEMAGICK_SVG) && !defined(WITHOUT_X11) +.if ${PORT_OPTIONS:MSVG} && !defined(WITHOUT_X11) USE_GNOME+= libxml2 LIB_DEPENDS+= rsvg-2:${PORTSDIR}/graphics/librsvg2 CONFIGURE_ARGS+= --with-rsvg --with-xml @@ -349,7 +324,7 @@ CONFIGURE_ARGS+= --without-rsvg --withou .endif # Pango support -.if defined(WITH_IMAGEMAGICK_PANGO) +.if ${PORT_OPTIONS:MPANGO} && !defined(WITHOUT_X11) LIB_DEPENDS+= pangocairo-1\.0.0:${PORTSDIR}/x11-toolkits/pango PLIST_SUB+= PANGO="" .else @@ -358,7 +333,7 @@ PLIST_SUB+= PANGO="@comment " .endif # PDF (Adobe Portable Document Format) support -.if !defined(WITHOUT_IMAGEMAGICK_PDF) +.if ${PORT_OPTIONS:MPDF} USE_GHOSTSCRIPT= yes .endif @@ -375,10 +350,10 @@ USE_XORG= xext xt PLIST_SUB+= X11='' .endif -.if defined(NOPORTDOCS) -INSTALL_TARGET= install -.else +.if ${PORT_OPTIONS:MDOCS} INSTALL_TARGET= install install-docDATA install-data-html +.else +INSTALL_TARGET= install .endif # Test suite, requires installed ghostscript to pass @@ -386,7 +361,7 @@ INSTALL_TARGET= install install-docDATA _NO_IMAGEMAGICK_TESTS=yes .endif -.if defined(PACKAGE_BUILDING) || defined(WITH_IMAGEMAGICK_TESTS) +.if defined(PACKAGE_BUILDING) || ${PORT_OPTIONS:MTESTS} . if !defined(_NO_IMAGEMAGICK_TESTS) USE_GHOSTSCRIPT_BUILD=yes . endif @@ -434,28 +409,22 @@ pre-configure: @${ECHO_CMD} NOTICE: ${_IMAGEMAGICK_THREADS_PERL_MSG}. Building ImageMagick ${_IMAGEMAGICK_THREADS_MSG}. @${ECHO_CMD} '###################################################################' .endif -.if !defined(WITHOUT_IMAGEMAGICK_LCMS2) && defined(WITH_IMAGEMAGICK_LCMS) - @${ECHO_CMD} '###################################################################' - @${ECHO_CMD} 'WARNING: both WITH_IMAGEMAGICK_LCMS and WITH_IMAGEMAGICK LCMS2' - @${ECHO_CMD} ' selected, LCMS2 has precedence and will be used' - @${ECHO_CMD} '###################################################################' -.endif -.if defined(WITH_IMAGEMAGICK_SVG) && defined(WITHOUT_X11) +.if ${PORT_OPTIONS:MSVG} && defined(WITHOUT_X11) @${ECHO_CMD} NOTICE: SVG format support disabled, requires X11 .endif post-install: -.if !defined(WITHOUT_IMAGEMAGICK_PERL) +.if ${PORT_OPTIONS:MPERL} @${RM} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/mach/perllocal.pod .endif -.if !defined(WITHOUT_IMAGEMAGICK_MODULES) -. if defined(WITHOUT_IMAGEMAGICK_16BIT_PIXEL) - @${TOUCH} ${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q8/coders/.keep - @${TOUCH} ${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q8/filters/.keep -. else +.if ${PORT_OPTIONS:MMODULES} +. if ${PORT_OPTIONS:M16BIT_PIXEL} @${TOUCH} ${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q16/coders/.keep @${TOUCH} ${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q16/filters/.keep +. else + @${TOUCH} ${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q8/coders/.keep + @${TOUCH} ${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q8/filters/.keep . endif .endif @@ -464,7 +433,7 @@ test check: .if !defined(_NO_IMAGEMAGICK_TESTS) regression-test: test -. if !defined(PACKAGE_BUILDING) && defined(WITH_IMAGEMAGICK_TESTS) +. if !defined(PACKAGE_BUILDING) && ${PORT_OPTIONS:MTESTS} post-build: regression-test . endif .endif Modified: head/graphics/ImageMagick/distinfo ============================================================================== --- head/graphics/ImageMagick/distinfo Mon Jul 23 12:52:24 2012 (r301391) +++ head/graphics/ImageMagick/distinfo Mon Jul 23 12:56:15 2012 (r301392) @@ -1,2 +1,2 @@ -SHA256 (ImageMagick-6.7.7-7.tar.xz) = b6b1a462c8c6e69608a7291d6cd100b07aea7d0b7c13aec293e8bba3c582be36 -SIZE (ImageMagick-6.7.7-7.tar.xz) = 7599504 +SHA256 (ImageMagick-6.7.8-6.tar.xz) = cb7817516b891dd0c02c7370fff8dd873e75b6e20e5022834d24d35cde46a040 +SIZE (ImageMagick-6.7.8-6.tar.xz) = 7820384 Modified: head/graphics/ImageMagick/pkg-plist ============================================================================== --- head/graphics/ImageMagick/pkg-plist Mon Jul 23 12:52:24 2012 (r301391) +++ head/graphics/ImageMagick/pkg-plist Mon Jul 23 12:56:15 2012 (r301392) @@ -52,6 +52,7 @@ include/ImageMagick/magick/attribute.h include/ImageMagick/magick/blob.h include/ImageMagick/magick/cache.h include/ImageMagick/magick/cache-view.h +include/ImageMagick/magick/channel.h include/ImageMagick/magick/client.h include/ImageMagick/magick/cipher.h include/ImageMagick/magick/coder.h @@ -1341,6 +1342,7 @@ libdata/pkgconfig/Wand.pc %%PORTDOCS%%%%DOCSDIR%%/www/architecture.html %%PORTDOCS%%%%DOCSDIR%%/www/binary-releases.html %%PORTDOCS%%%%DOCSDIR%%/www/changelog.html +%%PORTDOCS%%%%DOCSDIR%%/www/channel.html %%PORTDOCS%%%%DOCSDIR%%/www/cipher.html %%PORTDOCS%%%%DOCSDIR%%/www/color.html %%PORTDOCS%%%%DOCSDIR%%/www/command-line-options.html