Date: Tue, 17 Jun 2014 20:05:31 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358176 - in head: databases/virtuoso deskutils/calibre devel/synfig editors/emacs editors/emacs-devel graphics/ImageMagick graphics/ImageMagick/files graphics/autotrace graphics/conver... Message-ID: <201406172005.s5HK5V26072279@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Tue Jun 17 20:05:30 2014 New Revision: 358176 URL: http://svnweb.freebsd.org/changeset/ports/358176 QAT: https://qat.redports.org/buildarchive/r358176/ Log: Update to 6.8.9-3 [1][3]. Use USES=compiler:openmp for the OPENMP option[2] Ditch the use of perl for patching etc [4] and silence perl threaded check [6] -delay option spurious message should be fixed [5] JASPER option was replace by JPEG2000 for JP2k support. Put 16BIT_PIXEL and HDRI option separate option block. These options change the library name, so the user needs to take this into consideration. Use new LIB_DEPENDS syntax. Use @sample for config files. Sprinkle some USES=pkgconfig for some ports, since we don't pull it in anymore at run-time. PR: 185462 [1] PR: 187548 [2] PR: 182793 [3] PR: 181746 [4] PR: 176047 [5] PR: 190814 [6] Submitted by: c.petrik.sosa@gmail.com [1] Matthieu Volat <mazhe@alkumuna.eu> [2] free.bsd@webstyle.ch [3] andrnils@gmail.com [4] rfg@tristatelogic.com [5] Michelle Sullivan <michelle@sorbs.net> [6] Approved by: portmgr (blanket) (for NO_STAGED ports) Deleted: head/graphics/ImageMagick/files/ Modified: head/databases/virtuoso/Makefile head/deskutils/calibre/Makefile head/devel/synfig/Makefile head/editors/emacs-devel/Makefile head/editors/emacs/Makefile head/graphics/ImageMagick/Makefile head/graphics/ImageMagick/distinfo head/graphics/ImageMagick/pkg-plist head/graphics/autotrace/Makefile head/graphics/converseen/Makefile head/graphics/cuneiform/Makefile head/graphics/dcraw-m/Makefile head/graphics/fpc-imagemagick/Makefile head/graphics/gimp-gmic-plugin/Makefile head/graphics/inkscape/Makefile head/graphics/k3d/Makefile head/graphics/kipi-plugin-videoslideshow/Makefile head/graphics/libdmtx/Makefile head/graphics/npretty/Makefile head/graphics/opendx/Makefile head/graphics/pecl-imagick/Makefile head/graphics/pfstools/Makefile head/graphics/php-magickwand/Makefile head/graphics/pstoedit/Makefile head/graphics/py-wand/Makefile head/graphics/reallyslick/Makefile head/graphics/ruby-rmagick/Makefile head/graphics/rubygem-rmagick/Makefile head/graphics/zbar/Makefile head/multimedia/dvdauthor/Makefile head/multimedia/libxine/Makefile head/multimedia/transcode/Makefile head/security/libfprint/Makefile head/www/WebMagick/Makefile head/x11/xlockmore/Makefile Modified: head/databases/virtuoso/Makefile ============================================================================== --- head/databases/virtuoso/Makefile Tue Jun 17 20:02:16 2014 (r358175) +++ head/databases/virtuoso/Makefile Tue Jun 17 20:05:30 2014 (r358176) @@ -3,7 +3,7 @@ PORTNAME= virtuoso PORTVERSION= 6.1.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MASTER_SITES= SF DISTNAME= ${PORTNAME}-opensource-${PORTVERSION} @@ -68,7 +68,7 @@ check: .if ${PORT_OPTIONS:MIMAGEMAGICK} CONFIGURE_ARGS+=--enable-imagemagick=${LOCALBASE} -LIB_DEPENDS+= libMagickWand.so:${PORTSDIR}/graphics/ImageMagick +LIB_DEPENDS+= libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick PLIST_SUB+= WITH_IMAGEMAGICK="" .else CONFIGURE_ARGS+=--disable-imagemagick Modified: head/deskutils/calibre/Makefile ============================================================================== --- head/deskutils/calibre/Makefile Tue Jun 17 20:02:16 2014 (r358175) +++ head/deskutils/calibre/Makefile Tue Jun 17 20:05:30 2014 (r358176) @@ -3,13 +3,14 @@ PORTNAME= calibre PORTVERSION= 1.35.0 +PORTREVISION= 1 CATEGORIES= deskutils python MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ MAINTAINER= rnejdl@ringofsaturn.com COMMENT= Ebook management application -LIB_DEPENDS= libMagickWand.so:${PORTSDIR}/graphics/ImageMagick \ +LIB_DEPENDS= libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 \ libwmflite.so:${PORTSDIR}/graphics/libwmf \ @@ -50,7 +51,7 @@ RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/ USE_RC_SUBR= calibre EXTRACT_BEFORE_ARGS= -x -s '/^calibre/~-src/' -f -USES= desktop-file-utils shared-mime-info shebangfix tar:xz +USES= desktop-file-utils pkgconfig shared-mime-info shebangfix tar:xz SHEBANG_FILES= src/calibre/ebooks/metadata/odt.py \ src/calibre/utils/*.py \ src/odf/*.py Modified: head/devel/synfig/Makefile ============================================================================== --- head/devel/synfig/Makefile Tue Jun 17 20:02:16 2014 (r358175) +++ head/devel/synfig/Makefile Tue Jun 17 20:05:30 2014 (r358176) @@ -10,19 +10,21 @@ MASTER_SITES= SF MAINTAINER= dhn@FreeBSD.org COMMENT= Vector based 2D animation package +# update to 0.64.1 does pick up ImageMagick correctly but there are a +# multitude of c++ build failures which are beyond my skill to fix .. +BROKEN= Doesn't pickup ImageMagick anymore. + BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/ETL.pc:${PORTSDIR}/devel/etl -LIB_DEPENDS= glibmm-2.4.1:${PORTSDIR}/devel/glibmm \ - MagickWand:${PORTSDIR}/graphics/ImageMagick \ - jpeg:${PORTSDIR}/graphics/jpeg \ - mng:${PORTSDIR}/graphics/libmng \ - png15:${PORTSDIR}/graphics/png \ - tiff:${PORTSDIR}/graphics/tiff \ - avcodec:${PORTSDIR}/multimedia/ffmpeg \ - dv:${PORTSDIR}/multimedia/libdv \ - IlmImf:${PORTSDIR}/graphics/OpenEXR \ - xml\\+\\+-2.6:${PORTSDIR}/textproc/libxml++26 +LIB_DEPENDS= libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick \ + libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libmng.so:${PORTSDIR}/graphics/libmng \ + libpng15.so:${PORTSDIR}/graphics/png \ + libtiff.so:${PORTSDIR}/graphics/tiff \ + libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \ + libdv.so:${PORTSDIR}/multimedia/libdv \ + libIlmImf.so:${PORTSDIR}/graphics/OpenEXR -USE_GNOME= gnomehack glib20 +USE_GNOME= gnomehack glib20 glibmm libxml++26 USES= gettext GNU_CONFIGURE= yes USE_LDCONFIG= yes Modified: head/editors/emacs-devel/Makefile ============================================================================== --- head/editors/emacs-devel/Makefile Tue Jun 17 20:02:16 2014 (r358175) +++ head/editors/emacs-devel/Makefile Tue Jun 17 20:05:30 2014 (r358176) @@ -3,7 +3,7 @@ PORTNAME= emacs PORTVERSION= ${EMACS_VER}.${EMACS_REV} -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= editors ipv6 MASTER_SITES= http://distfiles.pirateparty.in/%SUBDIR%/ \ @@ -146,7 +146,7 @@ M17N_CONFIGURE_WITH= m17n-flt OTF_LIB_DEPENDS= libotf.so:${PORTSDIR}/print/libotf OTF_CONFIGURE_WITH= libotf -MAGICK_LIB_DEPENDS= libMagickCore.so:${PORTSDIR}/graphics/ImageMagick +MAGICK_LIB_DEPENDS= libMagickCore-6.Q*.so:${PORTSDIR}/graphics/ImageMagick MAGICK_CONFIGURE_WITH= imagemagick GSETTINGS_USE= gnome=glib20 Modified: head/editors/emacs/Makefile ============================================================================== --- head/editors/emacs/Makefile Tue Jun 17 20:02:16 2014 (r358175) +++ head/editors/emacs/Makefile Tue Jun 17 20:05:30 2014 (r358176) @@ -3,7 +3,7 @@ PORTNAME= emacs PORTVERSION= ${EMACS_VER} -PORTREVISION?= 4 +PORTREVISION?= 5 PORTEPOCH= 3 CATEGORIES= editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} @@ -144,7 +144,7 @@ M17N_CONFIGURE_WITH= m17n-flt OTF_LIB_DEPENDS= libotf.so:${PORTSDIR}/print/libotf OTF_CONFIGURE_WITH= libotf -MAGICK_LIB_DEPENDS= libMagickCore.so:${PORTSDIR}/graphics/ImageMagick +MAGICK_LIB_DEPENDS= libMagickCore-6.Q*.so:${PORTSDIR}/graphics/ImageMagick MAGICK_CONFIGURE_WITH= imagemagick GSETTINGS_USE= gnome=glib20 Modified: head/graphics/ImageMagick/Makefile ============================================================================== --- head/graphics/ImageMagick/Makefile Tue Jun 17 20:02:16 2014 (r358175) +++ head/graphics/ImageMagick/Makefile Tue Jun 17 20:05:30 2014 (r358176) @@ -1,11 +1,11 @@ # $FreeBSD$ PORTNAME= ImageMagick -DISTVERSION= 6.8.0-7 -PORTREVISION= 9 +DISTVERSION= 6.8.9-3 PORTEPOCH= 1 CATEGORIES= graphics perl5 MASTER_SITES= http://www.imagemagick.org/download/ \ + http://www.imagemagick.org/download/legacy/ \ http://servingzone.com/mirrors/ImageMagick/ \ http://mirror.checkdomain.de/imagemagick/ \ http://image_magick.veidrodis.com/image_magick/ \ @@ -31,49 +31,66 @@ MASTER_SITES= http://www.imagemagick.org MAINTAINER= kwm@FreeBSD.org COMMENT= Image processing tools -LICENSE= APACHE20 +#LICENSE= APACHE20 -USES= gmake libtool:keepla pathfix perl5 pkgconfig:both shebangfix +USES= gmake libtool pathfix perl5 pkgconfig shebangfix tar:xz SHEBANG_FILES= www/source/examples.pl -USE_XZ= yes -USE_PERL5= run build patch -WANT_GNOME= yes USE_AUTOTOOLS= libltdl GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-dps --without-lcms +CONFIGURE_ENV= MAKE=${MAKE_CMD} +CONFIGURE_ARGS= --without-dps \ + --without-lcms USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${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 + + PLIST_SUB= PORTVERSION=${PORTVERSION:R} -OPTIONS_DEFINE= 16BIT_PIXEL BZIP2 DOCS DJVU FFTW FONTCONFIG FPX FREETYPE \ - GRAPHVIZ GSLIB HDRI JASPER JBIG JPEG LCMS2 LZMA LQR MODULES \ +OPTIONS_DEFINE= BZIP2 DOCS DJVU FFTW FONTCONFIG FPX FREETYPE \ + GRAPHVIZ GSLIB JPEG2000 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 + JPEG2000 JBIG JPEG LCMS2 LZMA LQR MODULES PDF PNG SVG TIFF \ + WEBP WMF THREADS +OPTIONS_GROUP= HALFSUPPORTED +OPTIONS_GROUP_HALFSUPPORTED= 16BIT_PIXEL HDRI + +HALFSUPPORTED_DESC= Half supported options (see help dialog) 16BIT_PIXEL_DESC= 16bit pixel support +JPEG2000_DESC= OpenJPEG 2000 support via openjpeg 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 <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MHDRI} CONFIGURE_ARGS+= --enable-hdri +_HDRI=HDRI .else CONFIGURE_ARGS+= --disable-hdri +_HDRI="" .endif +PLIST_SUB+= HDRI=${_HDRI} .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' +. if exists(${PERL}) +PERL_THREADED!= ${SH} -c 'case `perl --version` in *freebsd-thread*) ${ECHO_CMD} yes ;; esac'; ${ECHO_CMD} +. else +# if ${PERL} doesn't exists, assume we dealing with threaded perl. +PERL_THREADED= yes +. endif .else _IMAGEMAGICK_THREADS=no _IMAGEMAGICK_THREADS_MSG=without threads @@ -81,10 +98,9 @@ _IMAGEMAGICK_THREADS_IGNORE_MSG=. Define .endif .if ${PORT_OPTIONS:MPERL} -CONFIGURE_ARGS+= --with-perl=${PERL5} +CONFIGURE_ARGS+= --with-perl=${PERL5} \ + --with-perl-options="MAKE=${MAKE_CMD}" PLIST_SUB+= WITH_PERL='' -MAN3= Image::Magick.3 -MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER} # PerlMagick does not work with threads, if perl is not threaded, and vice versa . if defined(PERL_THREADED) _IMAGEMAGICK_THREADS_PERL_MSG=Perl is threaded @@ -118,18 +134,20 @@ _IMAGEMAGICK_THREADS=no IGNORE=OpenMP requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG} . else CONFIGURE_ARGS+= --enable-openmp +USES+= compiler:openmp . endif .else CONFIGURE_ARGS+= --disable-openmp .endif .if ${PORT_OPTIONS:M16BIT_PIXEL} -PLIST_SUB+= QBIT='Q16' +_QBIT=Q16 .else # Faster, but poor quality CONFIGURE_ARGS+= --with-quantum-depth=8 -PLIST_SUB+= QBIT='Q8' +_QBIT=Q8 .endif +PLIST_SUB+= QBIT=${_QBIT} .if defined(WITH_WINDOWS_FONT_DIR) CONFIGURE_ARGS+= --with-windows-font-dir=${WITH_WINDOWS_FONT_DIR} @@ -149,7 +167,7 @@ PLIST_SUB+= MODULES='@comment ' . if ${_IMAGEMAGICK_THREADS} == "no" IGNORE=OpenEXR requires threads. ${_IMAGEMAGICK_THREADS_IGNORE_MSG} . else -LIB_DEPENDS+= IlmImf:${PORTSDIR}/graphics/OpenEXR +LIB_DEPENDS+= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR PLIST_SUB+= OPENEXR="" . endif .else @@ -161,7 +179,7 @@ PLIST_SUB+= OPENEXR="@comment " . if ${_IMAGEMAGICK_THREADS} == "no" IGNORE=DjVu requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG} . endif -LIB_DEPENDS+= djvulibre:${PORTSDIR}/graphics/djvulibre +LIB_DEPENDS+= libdjvulibre.so:${PORTSDIR}/graphics/djvulibre PLIST_SUB+= DJVU="" .else CONFIGURE_ARGS+= --without-djvu @@ -169,7 +187,7 @@ PLIST_SUB+= DJVU="@comment " .endif .if ${PORT_OPTIONS:MJPEG} -LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg PLIST_SUB+= JPEG="" .else CONFIGURE_ARGS+= --without-jpeg @@ -177,7 +195,7 @@ PLIST_SUB+= JPEG="@comment " .endif .if ${PORT_OPTIONS:MPNG} -LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png +LIB_DEPENDS+= libpng15.so:${PORTSDIR}/graphics/png PLIST_SUB+= PNG="" .else CONFIGURE_ARGS+= --without-png @@ -185,7 +203,7 @@ PLIST_SUB+= PNG="@comment " .endif .if ${PORT_OPTIONS:MTIFF} -LIB_DEPENDS+= tiff:${PORTSDIR}/graphics/tiff +LIB_DEPENDS+= libtiff.so:${PORTSDIR}/graphics/tiff PLIST_SUB+= TIFF="" .else CONFIGURE_ARGS+= --without-tiff @@ -201,14 +219,14 @@ CONFIGURE_ARGS+= --without-gslib .if ${PORT_OPTIONS:MLQR} CONFIGURE_ARGS+= --with-lqr -LIB_DEPENDS+= lqr-1:${PORTSDIR}/graphics/liblqr-1 +LIB_DEPENDS+= liblqr-1.so:${PORTSDIR}/graphics/liblqr-1 .else CONFIGURE_ARGS+= --without-lqr .endif .if ${PORT_OPTIONS:MFFTW} CONFIGURE_ARGS+= --with-fftw -LIB_DEPENDS+= fftw3:${PORTSDIR}/math/fftw3 +LIB_DEPENDS+= libfftw3.so:${PORTSDIR}/math/fftw3 .else CONFIGURE_ARGS+= --without-fftw .endif @@ -220,7 +238,7 @@ CONFIGURE_ARGS+= --without-bzlib # FPX (FlashPIX) images .if ${PORT_OPTIONS:MFPX} -LIB_DEPENDS+= fpx.[2-9]:${PORTSDIR}/graphics/libfpx +LIB_DEPENDS+= libfpx.so:${PORTSDIR}/graphics/libfpx CONFIGURE_ARGS+= --with-fpx PLIST_SUB+= FPX="" .else @@ -230,7 +248,7 @@ PLIST_SUB+= FPX="@comment " # JBIG images (lossless compression for bi-level images) .if ${PORT_OPTIONS:MJBIG} -LIB_DEPENDS+= jbig:${PORTSDIR}/graphics/jbigkit +LIB_DEPENDS+= libjbig.so:${PORTSDIR}/graphics/jbigkit PLIST_SUB+= JBIG="" .else CONFIGURE_ARGS+= --without-jbig @@ -238,17 +256,17 @@ PLIST_SUB+= JBIG="@comment " .endif # JPEG2000 images (wavelet-based lossy compression) -.if ${PORT_OPTIONS:MJASPER} -LIB_DEPENDS+= jasper:${PORTSDIR}/graphics/jasper +.if ${PORT_OPTIONS:MJPEG2000} +LIB_DEPENDS+= libopenjp2.so:${PORTSDIR}/graphics/openjpeg PLIST_SUB+= JPEG2000="" .else -CONFIGURE_ARGS+= --without-jp2 +CONFIGURE_ARGS+= --without-openjp2 PLIST_SUB+= JPEG2000="@comment " .endif # GraphViz dot graphs .if ${PORT_OPTIONS:MGRAPHVIZ} -LIB_DEPENDS+= gvc:${PORTSDIR}/graphics/graphviz +LIB_DEPENDS+= libgvc.so:${PORTSDIR}/graphics/graphviz CFLAGS+= -I${LOCALBASE}/include/graphviz LDFLAGS+= -L${LOCALBASE}/lib/graphviz .else @@ -256,20 +274,21 @@ CONFIGURE_ARGS+= --without-gvc .endif # LZMA support +# needs manula override for base system... .if ! ${PORT_OPTIONS:MLZMA} CONFIGURE_ARGS+= --without-lzma .endif # LCMS (Little CMS) color management version 2 and 1 (mutually exclusive) .if ${PORT_OPTIONS:MLCMS2} -LIB_DEPENDS+= lcms2:${PORTSDIR}/graphics/lcms2 +LIB_DEPENDS+= liblcms2.so:${PORTSDIR}/graphics/lcms2 .else CONFIGURE_ARGS+= --without-lcms2 .endif # Freetype (TrueType Font) support .if ${PORT_OPTIONS:MFREETYPE} -LIB_DEPENDS+= freetype:${PORTSDIR}/print/freetype2 +LIB_DEPENDS+= libfreetype.so:${PORTSDIR}/print/freetype2 USE_GHOSTSCRIPT= yes CONFIGURE_ARGS+= --with-freetype .else @@ -288,7 +307,7 @@ PLIST_SUB+= WEBP="@comment " # Fontconfig support .if ${PORT_OPTIONS:MFONTCONFIG} -LIB_DEPENDS+= fontconfig:${PORTSDIR}/x11-fonts/fontconfig +LIB_DEPENDS+= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig CONFIGURE_ARGS+= --with-fontconfig CONFIGURE_ENV+= FONTCONFIG_CFLAGS="-I${LOCALBASE}/include" \ FONTCONFIG_LIBS="-L${LOCALBASE}/lib" @@ -300,9 +319,9 @@ CONFIGURE_ARGS+= --without-fontconfig # WMF (Windows Meta File) images .if ${PORT_OPTIONS:MWMF} . if !defined(WITHOUT_X11) -LIB_DEPENDS+= wmf:${PORTSDIR}/graphics/libwmf +LIB_DEPENDS+= libwmf.so:${PORTSDIR}/graphics/libwmf . else -LIB_DEPENDS+= wmf:${PORTSDIR}/graphics/libwmf-nox11 +LIB_DEPENDS+= libwmf.so:${PORTSDIR}/graphics/libwmf-nox11 . endif CONFIGURE_ARGS+= --with-wmf=yes CFLAGS+= -I${LOCALBASE}/include/freetype2 @@ -315,7 +334,7 @@ PLIST_SUB+= WMF="@comment " # SVG (Scalable Vector Graphics) requires both libxml2 and X11 .if ${PORT_OPTIONS:MSVG} && !defined(WITHOUT_X11) USE_GNOME+= libxml2 -LIB_DEPENDS+= rsvg-2:${PORTSDIR}/graphics/librsvg2 +LIB_DEPENDS+= librsvg-2.so:${PORTSDIR}/graphics/librsvg2 CONFIGURE_ARGS+= --with-rsvg --with-xml CONFIGURE_ENV+= RSVG_CFLAGS="-I${LOCALBASE}/include/librsvg-2.0" \ RSVG_LIBS="-L${LOCALBASE}/lib" @@ -325,7 +344,7 @@ CONFIGURE_ARGS+= --without-rsvg --withou # Pango support .if ${PORT_OPTIONS:MPANGO} && !defined(WITHOUT_X11) -LIB_DEPENDS+= pangocairo-1\.0:${PORTSDIR}/x11-toolkits/pango +USE_GNOME+= pango PLIST_SUB+= PANGO="" .else CONFIGURE_ARGS+= --without-pango @@ -351,9 +370,9 @@ PLIST_SUB+= X11='' .endif .if ${PORT_OPTIONS:MDOCS} -INSTALL_TARGET= install install-docDATA install-data-html +INSTALL_TARGET= install-strip install-docDATA install-data-html .else -INSTALL_TARGET= install +INSTALL_TARGET= install-strip .endif # Test suite, requires installed ghostscript to pass @@ -362,46 +381,6 @@ INSTALL_TARGET= install USE_GHOSTSCRIPT_BUILD=yes .endif -post-patch: -# prevent perllocal.pod from being written - @${REINPLACE_CMD} -e '/PERL/s|install && \\$$|pure_install \&\& \\|' \ - -e 's/install-docDATA install-filters/install-filters/' \ - ${WRKSRC}/Makefile.in -# remove the autogenerated Magick.c so it will be regenerated from -# Magick.xs on _this_ system: - @${RM} -f ${WRKSRC}/PerlMagick/Magick.c - @${PERL} -pi -e 's|^tagnames=|#tagnames=|g ; \ - s|lcms/lcms.h|lcms.h|g ; \ - s|lcms_lcms_h|lcms_h|g' ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} -# version neither libraries nor directories - @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \ - 's|pkgdocdir =.*$$|pkgdocdir = ${DOCSDIR}/|g ; \ - s|-\$$\(VERSION\)||; \ - s| install-data-html||g' -# do not version lib directories - @${PERL} -pi -e 's|^(MagickLibSubdir).*$$|\1="ImageMagick"|' \ - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} - @${PERL} -pi -e 's|lcms/lcms.h|lcms.h|g' ${WRKSRC}/magick/transform.c -# @${PERL} -pi -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/ltdl/ltdl.c - @${PERL} -pi -e 's|timestamp: %ld|timestamp: %d|g' \ - ${WRKSRC}/magick/xwindow.c -.if ${_IMAGEMAGICK_THREADS} == "yes" -. for i in Magick++/lib/ImageMagick++.pc.in wand/Wand.pc.in magick/ImageMagick.pc.in - @${PERL} -pi -e 's|^(Libs.+)$$|\1 ${PTHREAD_LIBS}|; \ - s|^(Cflags.+)$$|\1 ${PTHREAD_CFLAGS}|' \ - ${WRKSRC}/${i} -. endfor -.endif -# deprecated gvCleanup - @${REINPLACE_CMD} -e "s|gvCleanup|gvFreeContext|g" \ - ${WRKSRC}/coders/dot.c -# freetype headers are in freetype2/ nowadays - @${REINPLACE_CMD} -e "s|freetype/|freetype2/|g" \ - ${WRKSRC}/configure \ - ${WRKSRC}/coders/ttf.c \ - ${WRKSRC}/magick/annotate.c \ - ${WRKSRC}/www/api/MagickCore/annotate_8c.html - pre-configure: .if defined(_IMAGEMAGICK_THREADS_PERL_MSG) @${ECHO_CMD} '###################################################################' @@ -415,22 +394,21 @@ pre-configure: post-install: test .if ${PORT_OPTIONS:MPERL} - @${RM} -f ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/mach/perllocal.pod - ${REINPLACE_CMD} -i '' -e 's}^${STAGEDIR}}}' ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Image/Magick/.packlist + @${RM} -f ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod* + @${RM} -f ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Image/Magick/.packlist .endif .if ${PORT_OPTIONS:MMODULES} -. if ${PORT_OPTIONS:M16BIT_PIXEL} - @${TOUCH} ${STAGEDIR}${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q16/coders/.keep - @${TOUCH} ${STAGEDIR}${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q16/filters/.keep -. else - @${TOUCH} ${STAGEDIR}${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q8/coders/.keep - @${TOUCH} ${STAGEDIR}${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q8/filters/.keep -. endif + @${TOUCH} ${STAGEDIR}${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-${_QBIT}${_HDRI}/coders/.keep + @${TOUCH} ${STAGEDIR}${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-${_QBIT}${_HDRI}/filters/.keep .endif +.for i in ${SAMPLE_FILES} + @${MV} ${STAGEDIR}${PREFIX}/etc/ImageMagick-6/${i} \ + ${STAGEDIR}${PREFIX}/etc/ImageMagick-6/${i}.sample +.endfor test check: -.if (${PORT_OPTIONS:MTESTS} || defined(PACKAGE_BUILDING)) +.if ${PORT_OPTIONS:MTESTS} -cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} limits -m 20m ${MAKE} check .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/ImageMagick/distinfo ============================================================================== --- head/graphics/ImageMagick/distinfo Tue Jun 17 20:02:16 2014 (r358175) +++ head/graphics/ImageMagick/distinfo Tue Jun 17 20:05:30 2014 (r358176) @@ -1,2 +1,2 @@ -SHA256 (ImageMagick-6.8.0-7.tar.xz) = e15672c8c11148bcfcd95885e1cd7a5575d4a6984bdf0a3a1c718a2a6ad37435 -SIZE (ImageMagick-6.8.0-7.tar.xz) = 8245624 +SHA256 (ImageMagick-6.8.9-3.tar.xz) = aca0c1af5b2db84a39dcb7ac109be542965af61ebab967c84d26541f475ba9d1 +SIZE (ImageMagick-6.8.9-3.tar.xz) = 7555684 Modified: head/graphics/ImageMagick/pkg-plist ============================================================================== --- head/graphics/ImageMagick/pkg-plist Tue Jun 17 20:02:16 2014 (r358175) +++ head/graphics/ImageMagick/pkg-plist Tue Jun 17 20:05:30 2014 (r358176) @@ -14,415 +14,312 @@ bin/import bin/mogrify bin/montage bin/stream -etc/ImageMagick/coder.xml -etc/ImageMagick/colors.xml -etc/ImageMagick/delegates.xml -etc/ImageMagick/log.xml -etc/ImageMagick/magic.xml -etc/ImageMagick/mime.xml -etc/ImageMagick/policy.xml -etc/ImageMagick/quantization-table.xml -etc/ImageMagick/thresholds.xml -etc/ImageMagick/type.xml -etc/ImageMagick/type-dejavu.xml -etc/ImageMagick/type-ghostscript.xml -etc/ImageMagick/type-windows.xml -include/ImageMagick/Magick++.h -include/ImageMagick/Magick++/Blob.h -include/ImageMagick/Magick++/CoderInfo.h -include/ImageMagick/Magick++/Color.h -include/ImageMagick/Magick++/Drawable.h -include/ImageMagick/Magick++/Exception.h -include/ImageMagick/Magick++/Geometry.h -include/ImageMagick/Magick++/Image.h -include/ImageMagick/Magick++/Include.h -include/ImageMagick/Magick++/Montage.h -include/ImageMagick/Magick++/Pixels.h -include/ImageMagick/Magick++/STL.h -include/ImageMagick/Magick++/TypeMetric.h -include/ImageMagick/magick/ImageMagick.h -include/ImageMagick/magick/MagickCore.h -include/ImageMagick/magick/PreRvIcccm.h -include/ImageMagick/magick/accelerate.h -include/ImageMagick/magick/animate.h -include/ImageMagick/magick/annotate.h -include/ImageMagick/magick/api.h -include/ImageMagick/magick/artifact.h -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 -include/ImageMagick/magick/color.h -include/ImageMagick/magick/colormap.h -include/ImageMagick/magick/colorspace.h -include/ImageMagick/magick/compare.h -include/ImageMagick/magick/composite.h -include/ImageMagick/magick/compress.h -include/ImageMagick/magick/configure.h -include/ImageMagick/magick/constitute.h -include/ImageMagick/magick/decorate.h -include/ImageMagick/magick/delegate.h -include/ImageMagick/magick/deprecate.h -include/ImageMagick/magick/display.h -include/ImageMagick/magick/distort.h -include/ImageMagick/magick/draw.h -include/ImageMagick/magick/effect.h -include/ImageMagick/magick/enhance.h -include/ImageMagick/magick/exception.h -include/ImageMagick/magick/feature.h -include/ImageMagick/magick/fourier.h -include/ImageMagick/magick/fx.h -include/ImageMagick/magick/gem.h -include/ImageMagick/magick/geometry.h -include/ImageMagick/magick/hashmap.h -include/ImageMagick/magick/histogram.h -include/ImageMagick/magick/identify.h -include/ImageMagick/magick/image.h -include/ImageMagick/magick/image-view.h -include/ImageMagick/magick/layer.h -include/ImageMagick/magick/list.h -include/ImageMagick/magick/locale_.h -include/ImageMagick/magick/log.h -include/ImageMagick/magick/magic.h -include/ImageMagick/magick/magick.h -include/ImageMagick/magick/magick-config.h -include/ImageMagick/magick/magick-type.h -include/ImageMagick/magick/matrix.h -include/ImageMagick/magick/memory_.h -include/ImageMagick/magick/method-attribute.h -include/ImageMagick/magick/methods.h -include/ImageMagick/magick/mime.h -include/ImageMagick/magick/module.h -include/ImageMagick/magick/monitor.h -include/ImageMagick/magick/montage.h -include/ImageMagick/magick/morphology.h -include/ImageMagick/magick/option.h -include/ImageMagick/magick/paint.h -include/ImageMagick/magick/pixel.h -include/ImageMagick/magick/pixel-accessor.h -include/ImageMagick/magick/policy.h -include/ImageMagick/magick/prepress.h -include/ImageMagick/magick/profile.h -include/ImageMagick/magick/property.h -include/ImageMagick/magick/quantum.h -include/ImageMagick/magick/quantize.h -include/ImageMagick/magick/random_.h -include/ImageMagick/magick/registry.h -include/ImageMagick/magick/resample.h -include/ImageMagick/magick/resize.h -include/ImageMagick/magick/resource_.h -include/ImageMagick/magick/segment.h -include/ImageMagick/magick/semaphore.h -include/ImageMagick/magick/shear.h -include/ImageMagick/magick/signature.h -include/ImageMagick/magick/splay-tree.h -include/ImageMagick/magick/statistic.h -include/ImageMagick/magick/stream.h -include/ImageMagick/magick/string_.h -include/ImageMagick/magick/threshold.h -include/ImageMagick/magick/timer.h -include/ImageMagick/magick/token.h -include/ImageMagick/magick/transform.h -include/ImageMagick/magick/type.h -include/ImageMagick/magick/utility.h -include/ImageMagick/magick/version.h -include/ImageMagick/magick/widget.h -include/ImageMagick/magick/xml-tree.h -include/ImageMagick/magick/xwindow.h -include/ImageMagick/wand/MagickWand.h -include/ImageMagick/wand/deprecate.h -include/ImageMagick/wand/drawing-wand.h -include/ImageMagick/wand/animate.h -include/ImageMagick/wand/compare.h -include/ImageMagick/wand/composite.h -include/ImageMagick/wand/conjure.h -include/ImageMagick/wand/convert.h -include/ImageMagick/wand/display.h -include/ImageMagick/wand/identify.h -include/ImageMagick/wand/import.h -include/ImageMagick/wand/magick-image.h -include/ImageMagick/wand/magick-property.h -include/ImageMagick/wand/magick_wand.h -include/ImageMagick/wand/magick-wand.h -include/ImageMagick/wand/method-attribute.h -include/ImageMagick/wand/mogrify.h -include/ImageMagick/wand/montage.h -include/ImageMagick/wand/pixel-iterator.h -include/ImageMagick/wand/pixel-wand.h -include/ImageMagick/wand/stream.h -include/ImageMagick/wand/wand-view.h -lib/ImageMagick-%%PORTVERSION%%/config/configure.xml -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/.keep -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/aai.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/aai.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/art.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/art.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/avs.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/avs.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/bgr.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/bgr.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/bmp.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/bmp.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/braille.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/braille.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/cals.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/cals.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/caption.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/caption.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/cin.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/cin.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/cip.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/cip.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/clip.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/clip.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/cmyk.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/cmyk.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/cut.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/cut.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/dcm.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/dcm.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/dds.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/dds.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/debug.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/debug.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/dib.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/dib.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/dng.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/dng.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/dot.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/dot.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/dpx.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/dpx.so -%%TIFF%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/ept.la -%%TIFF%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/ept.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/fax.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/fax.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/fd.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/fd.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/fits.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/fits.so -%%FPX%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/fpx.la -%%FPX%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/fpx.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/gif.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/gif.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/gradient.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/gradient.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/gray.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/gray.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/hald.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/hald.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/hdr.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/hdr.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/histogram.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/histogram.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/hrz.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/hrz.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/html.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/html.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/icon.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/icon.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/info.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/info.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/inline.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/inline.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/ipl.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/ipl.so -%%JBIG%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/jbig.la -%%JBIG%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/jbig.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/jnx.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/jnx.so -%%JPEG2000%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/jp2.la -%%JPEG2000%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/jp2.so -%%JPEG%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/jpeg.la -%%JPEG%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/jpeg.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/label.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/label.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/mac.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/mac.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/magick.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/magick.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/map.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/map.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/mat.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/mat.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/matte.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/matte.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/meta.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/meta.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/miff.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/miff.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/mono.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/mono.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/mpc.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/mpc.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/mpeg.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/mpeg.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/mpr.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/mpr.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/msl.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/msl.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/mtv.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/mtv.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/mvg.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/mvg.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/null.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/null.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/otb.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/otb.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/palm.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/palm.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pattern.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pattern.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pcd.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pcd.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pcl.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pcl.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pcx.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pcx.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pdb.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pdb.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pdf.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pdf.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pes.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pes.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pict.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pict.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pix.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pix.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/plasma.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/plasma.so -%%PNG%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/png.la -%%PNG%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/png.so -%%OPENEXR%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/exr.la -%%OPENEXR%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/exr.so -%%DJVU%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/djvu.la -%%DJVU%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/djvu.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pnm.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pnm.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pango.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pango.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/preview.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/preview.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/ps.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/ps.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/ps2.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/ps2.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/ps3.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/ps3.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/psd.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/psd.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pwp.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pwp.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/raw.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/raw.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/rgb.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/rgb.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/rla.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/rla.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/rle.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/rle.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/scr.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/scr.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/sct.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/sct.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/sfw.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/sfw.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/sgi.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/sgi.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/stegano.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/stegano.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/sun.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/sun.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/svg.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/svg.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/tga.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/tga.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/thumbnail.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/thumbnail.so -%%TIFF%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/tiff.la -%%TIFF%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/tiff.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/tile.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/tile.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/tim.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/tim.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/ttf.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/ttf.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/txt.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/txt.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/uil.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/uil.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/url.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/url.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/uyvy.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/uyvy.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/vicar.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/vicar.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/vid.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/vid.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/viff.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/viff.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/wbmp.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/wbmp.so -%%WEBP%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/webp.la -%%WEBP%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/webp.so -%%WMF%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/wmf.la -%%WMF%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/wmf.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/wpg.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/wpg.so -%%X11%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/x.la -%%X11%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/x.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/xbm.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/xbm.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/xc.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/xc.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/xcf.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/xcf.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/xpm.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/xpm.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/xps.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/xps.so -%%X11%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/xwd.la -%%X11%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/xwd.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/ycbcr.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/ycbcr.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/yuv.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/yuv.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters/.keep -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters/analyze.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters/analyze.so -%%MODULES%%@dirrmtry lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters -%%MODULES%%@dirrmtry lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders -%%MODULES%%@dirrmtry lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%% -lib/libMagick++.a -lib/libMagick++.la -lib/libMagick++.so -lib/libMagick++.so.6 -lib/libMagick++.so.6.0.0 -lib/libMagickCore.a -lib/libMagickCore.la -lib/libMagickCore.so -lib/libMagickCore.so.6 -lib/libMagickCore.so.6.0.0 -lib/libMagickWand.a -lib/libMagickWand.la -lib/libMagickWand.so -lib/libMagickWand.so.6 -lib/libMagickWand.so.6.0.0 +@sample etc/ImageMagick-6/coder.xml.sample +@sample etc/ImageMagick-6/colors.xml.sample +@sample etc/ImageMagick-6/delegates.xml.sample +@sample etc/ImageMagick-6/log.xml.sample +@sample etc/ImageMagick-6/magic.xml.sample +@sample etc/ImageMagick-6/mime.xml.sample +@sample etc/ImageMagick-6/policy.xml.sample +@sample etc/ImageMagick-6/quantization-table.xml.sample +@sample etc/ImageMagick-6/thresholds.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 +@sample etc/ImageMagick-6/type.xml.sample +include/ImageMagick-6/Magick++.h +include/ImageMagick-6/Magick++/Blob.h +include/ImageMagick-6/Magick++/ChannelMoments.h +include/ImageMagick-6/Magick++/CoderInfo.h +include/ImageMagick-6/Magick++/Color.h +include/ImageMagick-6/Magick++/Drawable.h +include/ImageMagick-6/Magick++/Exception.h +include/ImageMagick-6/Magick++/Functions.h +include/ImageMagick-6/Magick++/Geometry.h +include/ImageMagick-6/Magick++/Image.h +include/ImageMagick-6/Magick++/Include.h +include/ImageMagick-6/Magick++/Montage.h +include/ImageMagick-6/Magick++/Pixels.h +include/ImageMagick-6/Magick++/ResourceLimits.h +include/ImageMagick-6/Magick++/STL.h +include/ImageMagick-6/Magick++/TypeMetric.h +include/ImageMagick-6/magick/ImageMagick.h +include/ImageMagick-6/magick/MagickCore.h +include/ImageMagick-6/magick/PreRvIcccm.h +include/ImageMagick-6/magick/accelerate.h +include/ImageMagick-6/magick/animate.h +include/ImageMagick-6/magick/annotate.h +include/ImageMagick-6/magick/api.h +include/ImageMagick-6/magick/artifact.h +include/ImageMagick-6/magick/attribute.h +include/ImageMagick-6/magick/blob.h +include/ImageMagick-6/magick/cache.h +include/ImageMagick-6/magick/cache-view.h +include/ImageMagick-6/magick/channel.h +include/ImageMagick-6/magick/client.h +include/ImageMagick-6/magick/cipher.h +include/ImageMagick-6/magick/coder.h +include/ImageMagick-6/magick/color.h +include/ImageMagick-6/magick/colormap.h +include/ImageMagick-6/magick/colorspace.h +include/ImageMagick-6/magick/compare.h +include/ImageMagick-6/magick/composite.h +include/ImageMagick-6/magick/compress.h +include/ImageMagick-6/magick/configure.h +include/ImageMagick-6/magick/constitute.h +include/ImageMagick-6/magick/decorate.h +include/ImageMagick-6/magick/delegate.h +include/ImageMagick-6/magick/deprecate.h +include/ImageMagick-6/magick/display.h +include/ImageMagick-6/magick/distort.h +include/ImageMagick-6/magick/draw.h +include/ImageMagick-6/magick/effect.h +include/ImageMagick-6/magick/enhance.h +include/ImageMagick-6/magick/exception.h +include/ImageMagick-6/magick/feature.h +include/ImageMagick-6/magick/fourier.h +include/ImageMagick-6/magick/fx.h +include/ImageMagick-6/magick/gem.h +include/ImageMagick-6/magick/geometry.h +include/ImageMagick-6/magick/hashmap.h +include/ImageMagick-6/magick/histogram.h +include/ImageMagick-6/magick/identify.h +include/ImageMagick-6/magick/image.h +include/ImageMagick-6/magick/image-view.h +include/ImageMagick-6/magick/layer.h +include/ImageMagick-6/magick/list.h +include/ImageMagick-6/magick/locale_.h +include/ImageMagick-6/magick/log.h +include/ImageMagick-6/magick/magic.h +include/ImageMagick-6/magick/magick.h +include/ImageMagick-6/magick/magick-config.h *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406172005.s5HK5V26072279>