diff options
author | adam <adam@pkgsrc.org> | 2011-05-11 11:38:48 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2011-05-11 11:38:48 +0000 |
commit | 9993febd2b4c4090980768b47fd16363e38025c0 (patch) | |
tree | 5a252ec3c858c2330c3beecc1d4a41507f68f702 | |
parent | b0c1eea4bd1bc4bfc34ac868a76b51803684ffdd (diff) | |
download | pkgsrc-9993febd2b4c4090980768b47fd16363e38025c0.tar.gz |
Changes 6.6.9.8:
* Fixed some cut-and-paste errors in new png.c code that caused PNG8
reductions to fail.
Changes 6.6.9.8:
* Add various Option Flags, and fix option skip counts for plus forms
of simple operators where plus form is the same as minus form.
For example the incorrect counts produces a weird error, and posible
future segmentation fault in a command like convert rose: +border show:
Changes 6.6.9.7:
* Fix FX default for interpolation to Bilinear.
* Fix pixel interpolation for -draw image over (reference
http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=18612).
* Write the proper bKGD chunk value in grayscale PNG images (reference
http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=18624).
* Added Inverse method for Sparse Color Interpolation
-rw-r--r-- | graphics/ImageMagick/Makefile | 35 | ||||
-rw-r--r-- | graphics/ImageMagick/Makefile.common | 10 | ||||
-rw-r--r-- | graphics/ImageMagick/PLIST | 116 | ||||
-rw-r--r-- | graphics/ImageMagick/distinfo | 8 | ||||
-rw-r--r-- | graphics/ImageMagick/options.mk | 3 | ||||
-rw-r--r-- | graphics/p5-PerlMagick/Makefile | 7 |
6 files changed, 133 insertions, 46 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 7b1ce543485..13c28acb925 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,12 +1,10 @@ -# $NetBSD: Makefile,v 1.168 2011/01/13 13:36:08 wiz Exp $ +# $NetBSD: Makefile,v 1.169 2011/05/11 11:38:48 adam Exp $ .include "Makefile.common" PKGNAME= ImageMagick-${DISTVERSION} -PKGREVISION= 1 MAINTAINER= adam@NetBSD.org -HOMEPAGE= http://www.imagemagick.org/ COMMENT= Package for display and interactive manipulation of images CONFLICTS= geomview<1.8.1nb2 # used to have a program named 'animate' @@ -15,11 +13,12 @@ PKG_DESTDIR_SUPPORT= user-destdir PKG_INSTALLATION_TYPES= overwrite pkgviews USE_LANGUAGES= c c++ c99 -USE_LIBTOOL= yes USE_TOOLS+= gmake pkg-config -GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-assert CONFIGURE_ARGS+= --with-fontconfig +CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include +CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib +CONFIGURE_ARGS+= --without-perl PKGCONFIG_OVERRIDE= Magick++/lib/ImageMagick++.pc.in PKGCONFIG_OVERRIDE+= magick/ImageMagick.pc.in @@ -41,18 +40,34 @@ GCC_REQD+= 3.0 CFLAGS+= -O .endif -# Some configure_args come from Makefile.common -CONFIGURE_ARGS+= --without-perl -CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include -CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib +PKG_SYSCONFSUBDIR= ImageMagick +EGDIR= ${PREFIX}/share/examples/ImageMagick +CONF_FILES= ${EGDIR}/coder.xml ${PKG_SYSCONFDIR}/coder.xml +CONF_FILES+= ${EGDIR}/colors.xml ${PKG_SYSCONFDIR}/colors.xml +CONF_FILES+= ${EGDIR}/delegates.xml ${PKG_SYSCONFDIR}/delegates.xml +CONF_FILES+= ${EGDIR}/log.xml ${PKG_SYSCONFDIR}/log.xml +CONF_FILES+= ${EGDIR}/magic.xml ${PKG_SYSCONFDIR}/magic.xml +CONF_FILES+= ${EGDIR}/mime.xml ${PKG_SYSCONFDIR}/mime.xml +CONF_FILES+= ${EGDIR}/policy.xml ${PKG_SYSCONFDIR}/policy.xml +CONF_FILES+= ${EGDIR}/sRGB.icm ${PKG_SYSCONFDIR}/sRGB.icm +CONF_FILES+= ${EGDIR}/thresholds.xml ${PKG_SYSCONFDIR}/thresholds.xml +CONF_FILES+= ${EGDIR}/type-dejavu.xml ${PKG_SYSCONFDIR}/type-dejavu.xml +CONF_FILES+= ${EGDIR}/type-ghostscript.xml ${PKG_SYSCONFDIR}/type-ghostscript.xml +CONF_FILES+= ${EGDIR}/type-windows.xml ${PKG_SYSCONFDIR}/type-windows.xml +CONF_FILES+= ${EGDIR}/type.xml ${PKG_SYSCONFDIR}/type.xml -# Put our CONFIGURE_ARGS into configure.xml, otherwise WRKDIR gets mentioned. SUBST_CLASSES+= fix-cfg SUBST_STAGE.fix-cfg= pre-configure SUBST_MESSAGE.fix-cfg= Fixing configure.xml. SUBST_FILES.fix-cfg= config/configure.xml.in SUBST_VARS.fix-cfg= CONFIGURE_ARGS +SUBST_CLASSES+= fix-etc +SUBST_STAGE.fix-etc= pre-configure +SUBST_MESSAGE.fix-etc= Handle configuration files. +SUBST_FILES.fix-etc= Makefile.in +SUBST_SED.fix-etc= -e 's,^configlibdir =.*,configlibdir = $$(DATA_DIR)/examples/ImageMagick,' + .include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/libltdl/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common index 6fe89d1349f..cb1099496d0 100644 --- a/graphics/ImageMagick/Makefile.common +++ b/graphics/ImageMagick/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.89 2010/12/14 10:08:40 adam Exp $ +# $NetBSD: Makefile.common,v 1.90 2011/05/11 11:38:48 adam Exp $ # # used by graphics/p5-PerlMagick/Makefile -IM_MAJOR_VER= 6.6.6 -IM_MINOR_VER= 5 +IM_MAJOR_VER= 6.6.9 +IM_MINOR_VER= 8 IM_MAJOR_LIB_VER= ${IM_MAJOR_VER} .if (${IM_MINOR_VER} != NONE) @@ -25,8 +25,12 @@ MASTER_SITES= ftp://ftp.imagemagick.org/pub/ImageMagick/ \ http://www.imagemagick.org/download/ EXTRACT_SUFX= .tar.bz2 +HOMEPAGE= http://www.imagemagick.org/ + WRKSRC= ${WRKDIR}/ImageMagick-${DISTSUFFIX} +USE_LIBTOOL= yes +GNU_CONFIGURE= yes # For things for which we do not specify an explicit dependency above, disable # so that we don't cause implicit "hidden" dependencies. CONFIGURE_ARGS+= --without-dps diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST index 1a12c20ff91..d8b20cfd3a6 100644 --- a/graphics/ImageMagick/PLIST +++ b/graphics/ImageMagick/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.68 2010/12/14 10:08:40 adam Exp $ +@comment $NetBSD: PLIST,v 1.69 2011/05/11 11:38:48 adam Exp $ bin/Magick++-config bin/Magick-config bin/MagickCore-config @@ -139,16 +139,6 @@ 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-${IM_MAJOR_LIB_VER}/config/configure.xml -lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/delegates.xml -lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/english.xml -lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/francais.xml -lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/locale.xml -lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/policy.xml -lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/type-dejavu.xml -lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/type-ghostscript.xml -lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/type-windows.xml -lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/type.xml lib/libMagick++.la lib/libMagickCore.la lib/libMagickWand.la @@ -175,16 +165,13 @@ man/man1/import.1 man/man1/mogrify.1 man/man1/montage.1 man/man1/stream.1 -share/ImageMagick-${IM_MAJOR_VER}/ChangeLog -share/ImageMagick-${IM_MAJOR_VER}/LICENSE -share/ImageMagick-${IM_MAJOR_VER}/NEWS.txt -share/ImageMagick-${IM_MAJOR_VER}/config/coder.xml -share/ImageMagick-${IM_MAJOR_VER}/config/colors.xml -share/ImageMagick-${IM_MAJOR_VER}/config/log.xml -share/ImageMagick-${IM_MAJOR_VER}/config/magic.xml -share/ImageMagick-${IM_MAJOR_VER}/config/mime.xml -share/ImageMagick-${IM_MAJOR_VER}/config/sRGB.icm -share/ImageMagick-${IM_MAJOR_VER}/config/thresholds.xml +share/ImageMagick-${IM_MAJOR_VER}/configure.xml +share/ImageMagick-${IM_MAJOR_VER}/english.xml +share/ImageMagick-${IM_MAJOR_VER}/francais.xml +share/ImageMagick-${IM_MAJOR_VER}/locale.xml +share/doc/ImageMagick-${IM_MAJOR_VER}/ChangeLog +share/doc/ImageMagick-${IM_MAJOR_VER}/LICENSE +share/doc/ImageMagick-${IM_MAJOR_VER}/NEWS.txt share/doc/ImageMagick-${IM_MAJOR_VER}/images/affine.png share/doc/ImageMagick-${IM_MAJOR_VER}/images/arc.png share/doc/ImageMagick-${IM_MAJOR_VER}/images/background.jpg @@ -198,6 +185,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/images/configure.jpg share/doc/ImageMagick-${IM_MAJOR_VER}/images/cylinder_shaded.png share/doc/ImageMagick-${IM_MAJOR_VER}/images/definitive-guide.png share/doc/ImageMagick-${IM_MAJOR_VER}/images/difference.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/donate.png share/doc/ImageMagick-${IM_MAJOR_VER}/images/examples.jpg share/doc/ImageMagick-${IM_MAJOR_VER}/images/frame.jpg share/doc/ImageMagick-${IM_MAJOR_VER}/images/fuzzy-magick.png @@ -205,11 +193,68 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/images/gaussian-blur.png share/doc/ImageMagick-${IM_MAJOR_VER}/images/granite.png share/doc/ImageMagick-${IM_MAJOR_VER}/images/imade_art2.jpg share/doc/ImageMagick-${IM_MAJOR_VER}/images/label.gif -share/doc/ImageMagick-${IM_MAJOR_VER}/images/logo.eps +share/doc/ImageMagick-${IM_MAJOR_VER}/images/logo-sm-flop.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/logo-sm-fx.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/logo-sm.png share/doc/ImageMagick-${IM_MAJOR_VER}/images/logo.jpg +share/doc/ImageMagick-${IM_MAJOR_VER}/images/logo.png share/doc/ImageMagick-${IM_MAJOR_VER}/images/montage.jpg share/doc/ImageMagick-${IM_MAJOR_VER}/images/navy.png share/doc/ImageMagick-${IM_MAJOR_VER}/images/networkredux.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/bricks.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/checkerboard.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/circles.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/crosshatch.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/crosshatch30.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/crosshatch45.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/fishscales.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray0.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray10.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray100.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray15.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray20.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray25.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray30.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray35.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray40.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray45.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray5.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray50.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray55.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray60.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray65.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray70.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray75.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray80.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray85.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray90.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray95.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/hexagons.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/horizontal.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/horizontal2.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/horizontal3.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/horizontalsaw.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/hs_bdiagonal.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/hs_cross.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/hs_diagcross.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/hs_fdiagonal.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/hs_horizontal.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/hs_vertical.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/left30.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/left45.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/leftshingle.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/octagons.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/right30.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/right45.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/rightshingle.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/smallfishscales.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/vertical.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/vertical2.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/vertical3.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/verticalbricks.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/verticalleftshingle.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/verticalrightshingle.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/patterns/verticalsaw.png share/doc/ImageMagick-${IM_MAJOR_VER}/images/piechart.png share/doc/ImageMagick-${IM_MAJOR_VER}/images/project-support.jpg share/doc/ImageMagick-${IM_MAJOR_VER}/images/radial-gradient.png @@ -229,7 +274,10 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/images/sprite.jpg share/doc/ImageMagick-${IM_MAJOR_VER}/images/t-shirt.png share/doc/ImageMagick-${IM_MAJOR_VER}/images/tricks.png share/doc/ImageMagick-${IM_MAJOR_VER}/images/wand.ico +share/doc/ImageMagick-${IM_MAJOR_VER}/images/wand.png share/doc/ImageMagick-${IM_MAJOR_VER}/images/white-highlight.png +share/doc/ImageMagick-${IM_MAJOR_VER}/images/wizard.jpg +share/doc/ImageMagick-${IM_MAJOR_VER}/images/wizard.png share/doc/ImageMagick-${IM_MAJOR_VER}/index.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/ImageMagickObject.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Blob.html @@ -711,6 +759,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickCore/struct__Ascii85Info.htm share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickCore/struct__BlobInfo.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickCore/struct__CacheInfo.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickCore/struct__CacheMethods.html +share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickCore/struct__CacheView.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickCore/struct__ChannelStatistics.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickCore/struct__ChromaticityInfo.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickCore/struct__Cluster.html @@ -1006,6 +1055,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/effect.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/enhance.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/exception.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/feature.html +share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/fourier.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/fx.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/histogram.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/image-view.html @@ -1073,6 +1123,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/install-source.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/jp2.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/license.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/links.html +share/doc/ImageMagick-${IM_MAJOR_VER}/www/magick++.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/magick-core.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/magick-vector-graphics.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/magick-wand.html @@ -1084,6 +1135,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/mogrify.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/montage.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/motion-picture.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/perl-magick.html +share/doc/ImageMagick-${IM_MAJOR_VER}/www/porting.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/quantize.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/resources.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/search.html @@ -1092,17 +1144,24 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/analyze.c share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/coder.xml share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/colors.xml share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/configure.xml +share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/contrast.c share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/core.c share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/delegates.xml share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/english.xml share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/examples.pl +share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/francais.xml share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/incantation.msl share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/locale.xml share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/log.xml share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/magic.xml +share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/mgk.c +share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/mime.xml share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/piechart.mvg share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/piechart.svg +share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/policy.xml +share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/thresholds.xml share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/type-ghostscript.xml +share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/type-windows.xml share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/type.xml share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/wand.c share/doc/ImageMagick-${IM_MAJOR_VER}/www/sponsors.html @@ -1110,5 +1169,18 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/stream.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/subversion.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/t-shirt.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/wand.png +share/examples/ImageMagick/coder.xml +share/examples/ImageMagick/colors.xml +share/examples/ImageMagick/delegates.xml +share/examples/ImageMagick/log.xml +share/examples/ImageMagick/magic.xml +share/examples/ImageMagick/mime.xml +share/examples/ImageMagick/policy.xml +share/examples/ImageMagick/sRGB.icm +share/examples/ImageMagick/thresholds.xml +share/examples/ImageMagick/type-dejavu.xml +share/examples/ImageMagick/type-ghostscript.xml +share/examples/ImageMagick/type-windows.xml +share/examples/ImageMagick/type.xml @pkgdir lib/ImageMagick-${IM_MAJOR_LIB_VER}/modules-Q16/coders @pkgdir lib/ImageMagick-${IM_MAJOR_LIB_VER}/modules-Q16/filters diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo index 16b43ffd796..ecdc0df29fe 100644 --- a/graphics/ImageMagick/distinfo +++ b/graphics/ImageMagick/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.105 2010/12/14 10:08:40 adam Exp $ +$NetBSD: distinfo,v 1.106 2011/05/11 11:38:48 adam Exp $ -SHA1 (ImageMagick-6.6.6-5.tar.bz2) = 0b41c2fd613636c76094e821bb03669ce104d996 -RMD160 (ImageMagick-6.6.6-5.tar.bz2) = d11219cae8ec24f544f5b6dfed58bf1e50753bb6 -Size (ImageMagick-6.6.6-5.tar.bz2) = 8824856 bytes +SHA1 (ImageMagick-6.6.9-8.tar.bz2) = c175e65f7eef867cd6af78d05820de32f77a9a85 +RMD160 (ImageMagick-6.6.9-8.tar.bz2) = ee489847c9a577fc1181d336c93b41fcdc6e7046 +Size (ImageMagick-6.6.9-8.tar.bz2) = 10155738 bytes diff --git a/graphics/ImageMagick/options.mk b/graphics/ImageMagick/options.mk index 71260ae1ad4..fa98221d55f 100644 --- a/graphics/ImageMagick/options.mk +++ b/graphics/ImageMagick/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.9 2009/01/07 08:58:07 adam Exp $ +# $NetBSD: options.mk,v 1.10 2011/05/11 11:38:48 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ImageMagick PKG_SUPPORTED_OPTIONS= x11 jasper djvu ghostscript wmf @@ -8,6 +8,7 @@ PKG_SUGGESTED_OPTIONS= x11 jasper .if !empty(PKG_OPTIONS:Mx11) .include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" .include "../../x11/xextproto/buildlink3.mk" .else CONFIGURE_ARGS+= --without-x diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile index da1285870ef..bd7f8793234 100644 --- a/graphics/p5-PerlMagick/Makefile +++ b/graphics/p5-PerlMagick/Makefile @@ -1,10 +1,8 @@ -# $NetBSD: Makefile,v 1.74 2011/01/13 13:38:13 wiz Exp $ +# $NetBSD: Makefile,v 1.75 2011/05/11 11:38:48 adam Exp $ .include "../../graphics/ImageMagick/Makefile.common" PKGNAME= p5-PerlMagick-${DISTVERSION} - -PKGREVISION= 1 SVR4_PKGNAME= p5pma MAINTAINER= pkgsrc-users@NetBSD.org @@ -12,14 +10,11 @@ HOMEPAGE= http://www.simplesystems.org/ImageMagick/www/perl-magick.html COMMENT= Object-oriented Perl interface to ImageMagick DISTINFO_FILE= ${.CURDIR}/../../graphics/ImageMagick/distinfo -FILESDIR= ${.CURDIR}/../../graphics/ImageMagick/files PATCHDIR= ${.CURDIR}/../../graphics/ImageMagick/patches PKG_DESTDIR_SUPPORT= user-destdir PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_LIBTOOL= yes -GNU_CONFIGURE= yes # Some configure_args come from Makefile.common CONFIGURE_ARGS+= --with-perl=${PERL5:Q} |