Date: Wed, 7 Feb 2001 10:21:16 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/24928: Update port: graphics/ImageMagick to 5.2.8 Message-ID: <200102071821.f17ILGi94520@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 24928 >Category: ports >Synopsis: Update port: graphics/ImageMagick to 5.2.8 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Feb 07 10:30:01 PST 2001 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.2-RELEASE i386 >Organization: >Environment: >Description: - Update to version 5.2.8 >How-To-Repeat: >Fix: diff -urN /usr/ports/graphics/ImageMagick/Makefile graphics/ImageMagick/Makefile --- /usr/ports/graphics/ImageMagick/Makefile Fri Jan 26 20:32:38 2001 +++ graphics/ImageMagick/Makefile Thu Feb 8 01:53:02 2001 @@ -6,16 +6,15 @@ # PORTNAME= ImageMagick -PORTVERSION= 5.2.7 -PORTREVISION= 2 +PORTVERSION= 5.2.8 CATEGORIES= graphics perl5 MASTER_SITES= ftp://ftp.simplesystems.org/pub/ImageMagick/ \ ftp://ftp.cdrom.com/pub/ImageMagick/ \ ftp://ftp.u-aizu.ac.jp/pub/graphics/image/ImageMagick/ \ ftp://ftp.fifi.org/pub/ImageMagick/ \ ftp://gd.tuwien.ac.at/pub/graphics/ImageMagick/ \ - ftp://ftp.ms.mff.cuni.cz/MIRRORS/ftp.wizards.dupont.com/pub/ImageMagick/ \ - ftp://ftp.oce.nl/pub/Internet/audio+video/ImageMagick/ + ${MASTER_SITE_RINGSERVER} +MASTER_SITE_SUBDIR= graphics/ImageMagick MAINTAINER= jseger@FreeBSD.org @@ -23,18 +22,17 @@ df.1:${PORTSDIR}/graphics/hdf \ jbig.1:${PORTSDIR}/graphics/jbigkit \ jpeg.9:${PORTSDIR}/graphics/jpeg \ + lcms.1:${PORTSDIR}/graphics/lcms \ wmf.1:${PORTSDIR}/graphics/libwmf \ png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ - freetype.6:${PORTSDIR}/print/freetype2 + freetype.6:${PORTSDIR}/print/freetype2 \ + xml2.5:${PORTSDIR}/textproc/libxml2 BUILD_DEPENDS= gs:${PORTSDIR}/print/ghostscript55 \ mpeg2decode:${PORTSDIR}/graphics/mpeg2codec \ picttoppm:${PORTSDIR}/graphics/netpbm \ fig2dev:${PORTSDIR}/print/transfig -RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript55 \ - mpeg2decode:${PORTSDIR}/graphics/mpeg2codec \ - picttoppm:${PORTSDIR}/graphics/netpbm \ - fig2dev:${PORTSDIR}/print/transfig +RUN_DEPENDS= ${BUILD_DEPENDS} USE_PERL5= yes USE_XLIB= yes @@ -44,15 +42,19 @@ LIBS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-shared --without-modules \ --without-magick-plus-plus \ - --with-perl=${PERL5} --without-xml + --with-perl=${PERL5} INSTALLS_SHLIB= yes .if defined(PERL_THREADED) && ${PERL_THREADED} == "true" CONFIGURE_ARGS+= --with-threads +.else +CONFIGURE_ARGS+= --without-threads .endif .if defined(WITH_16BIT_PIXEL) CONFIGURE_ARGS+= --enable-16bit-pixel +.else +CONFIGURE_ARGS+= --disable-16bit-pixel .endif .if defined(HAVE_UNISYS_LICENSE) @@ -66,5 +68,11 @@ MAN5= quantize.5 MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} + +pre-patch: +.for file in coders/svg.c coders/url.c magick/config.h.in + @${PERL} -pi -e 's|libxml/|libxml2/|g ; \ + s|HAVE_LIBXML_|HAVE_LIBXML2_|g' ${WRKSRC}/${file} +.endfor .include <bsd.port.mk> diff -urN /usr/ports/graphics/ImageMagick/distinfo graphics/ImageMagick/distinfo --- /usr/ports/graphics/ImageMagick/distinfo Fri Jan 26 20:32:48 2001 +++ graphics/ImageMagick/distinfo Tue Feb 6 05:33:41 2001 @@ -1 +1 @@ -MD5 (ImageMagick-5.2.7.tar.gz) = df997328774872982b0249f66bc7b8ff +MD5 (ImageMagick-5.2.8.tar.gz) = 134add938d6d54031a328101c368ab9b diff -urN /usr/ports/graphics/ImageMagick/files/patch-al graphics/ImageMagick/files/patch-al --- /usr/ports/graphics/ImageMagick/files/patch-al Thu Jan 11 14:19:46 2001 +++ graphics/ImageMagick/files/patch-al Thu Feb 1 03:42:21 2001 @@ -1,6 +1,6 @@ ---- configure.in.orig Fri Dec 1 02:14:22 2000 -+++ configure.in Tue Dec 5 02:43:13 2000 -@@ -471,10 +471,10 @@ +--- configure.in.orig Wed Jan 31 09:36:22 2001 ++++ configure.in Thu Feb 1 03:42:11 2001 +@@ -487,10 +487,10 @@ LIB_THREAD='' if test "$with_threads" != 'no' then @@ -14,3 +14,31 @@ LIBS="$LIB_THREAD $LIBS" CPPFLAGS="$DEF_THREAD $CPPFLAGS" fi +@@ -1021,8 +1021,8 @@ + AC_MSG_RESULT() + failed=0; + passed=0; +- AC_CHECK_HEADER(libxml/parser.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`) +- AC_CHECK_LIB(xml,xmlParseExternalEntity,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) ++ AC_CHECK_HEADER(libxml2/parser.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`) ++ AC_CHECK_LIB(xml2,xmlParseExternalEntity,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) + AC_MSG_CHECKING(if XML package is complete) + if test $passed -gt 0 + then +@@ -1031,14 +1031,14 @@ + AC_MSG_RESULT(no -- some components failed test) + have_xml='no (failed tests)' + else +- LIB_XML='-lxml' ++ LIB_XML='-lxml2' + LIBS="$LIB_XML $LIBS" + AC_DEFINE(HasXML,,Define if you have XML library) + AC_MSG_RESULT(yes) + have_xml='yes' + + # check which xml error header file to use +- AC_CHECK_HEADERS(libxml/xml-error.h libxml/xmlerror.h) ++ AC_CHECK_HEADERS(libxml2/xml-error.h libxml2/xmlerror.h) + fi + else + AC_MSG_RESULT(no) diff -urN /usr/ports/graphics/ImageMagick/pkg-plist graphics/ImageMagick/pkg-plist --- /usr/ports/graphics/ImageMagick/pkg-plist Thu Jan 11 20:42:25 2001 +++ graphics/ImageMagick/pkg-plist Thu Feb 8 01:51:05 2001 @@ -40,8 +40,106 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Magick/Magick.bs lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Magick/Magick.so lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Magick/autosplit.ix +share/ImageMagick/Copyright.txt +share/ImageMagick/ImageMagick.html +share/ImageMagick/QuickStart.txt share/ImageMagick/delegates.mgk +share/ImageMagick/images/authentica.jpg +share/ImageMagick/images/ball.png +share/ImageMagick/images/corbis.png +share/ImageMagick/images/digital-applications.png +share/ImageMagick/images/examples.jpg +share/ImageMagick/images/home.png +share/ImageMagick/images/logo.png +share/ImageMagick/images/magick.png +share/ImageMagick/images/magick_small.png +share/ImageMagick/images/mail.png +share/ImageMagick/images/right_triangle.png +share/ImageMagick/images/right_triangle_option.png +share/ImageMagick/images/screen.png share/ImageMagick/magic.mgk +share/ImageMagick/www/Changelog.html +share/ImageMagick/www/Magick.html +share/ImageMagick/www/animate.html +share/ImageMagick/www/api/animate.html +share/ImageMagick/www/api/annotate.html +share/ImageMagick/www/api/attributes.html +share/ImageMagick/www/api/blob.html +share/ImageMagick/www/api/cache.html +share/ImageMagick/www/api/cache_view.html +share/ImageMagick/www/api/colors.html +share/ImageMagick/www/api/compress.html +share/ImageMagick/www/api/constitute.html +share/ImageMagick/www/api/decorate.html +share/ImageMagick/www/api/delegates.html +share/ImageMagick/www/api/display.html +share/ImageMagick/www/api/draw.html +share/ImageMagick/www/api/effects.html +share/ImageMagick/www/api/enhance.html +share/ImageMagick/www/api/error.html +share/ImageMagick/www/api/gems.html +share/ImageMagick/www/api/image.html +share/ImageMagick/www/api/mac.html +share/ImageMagick/www/api/magick.html +share/ImageMagick/www/api/memory.html +share/ImageMagick/www/api/monitor.html +share/ImageMagick/www/api/montage.html +share/ImageMagick/www/api/nt.html +share/ImageMagick/www/api/pixel_cache.html +share/ImageMagick/www/api/pixels.html +share/ImageMagick/www/api/quantize.html +share/ImageMagick/www/api/segment.html +share/ImageMagick/www/api/shear.html +share/ImageMagick/www/api/signature.html +share/ImageMagick/www/api/stream.html +share/ImageMagick/www/api/transform.html +share/ImageMagick/www/api/types/AnnotateInfo.html +share/ImageMagick/www/api/types/ChromaticityInfo.html +share/ImageMagick/www/api/types/ColorPacket.html +share/ImageMagick/www/api/types/DrawInfo.html +share/ImageMagick/www/api/types/Enumerations.html +share/ImageMagick/www/api/types/ExceptionInfo.html +share/ImageMagick/www/api/types/Image.html +share/ImageMagick/www/api/types/ImageAttribute.html +share/ImageMagick/www/api/types/ImageInfo.html +share/ImageMagick/www/api/types/MagickInfo.html +share/ImageMagick/www/api/types/PixelPacket.html +share/ImageMagick/www/api/types/PointInfo.html +share/ImageMagick/www/api/types/ProfileInfo.html +share/ImageMagick/www/api/types/RectangleInfo.html +share/ImageMagick/www/api/utility.html +share/ImageMagick/www/api/vms.html +share/ImageMagick/www/api/widget.html +share/ImageMagick/www/api/xwindows.html +share/ImageMagick/www/api/zoom.html +share/ImageMagick/www/api.html +share/ImageMagick/www/archives.html +share/ImageMagick/www/cd.html +share/ImageMagick/www/color.html +share/ImageMagick/www/combine.html +share/ImageMagick/www/convert.html +share/ImageMagick/www/cvs.html +share/ImageMagick/www/display.html +share/ImageMagick/www/formats.html +share/ImageMagick/www/help.html +share/ImageMagick/www/identify.html +share/ImageMagick/www/import.html +share/ImageMagick/www/install.html +share/ImageMagick/www/magick-list.html +share/ImageMagick/www/miff.html +share/ImageMagick/www/mogrify.html +share/ImageMagick/www/montage.html +share/ImageMagick/www/new.html +share/ImageMagick/www/perl.html +share/ImageMagick/www/quantize.html +share/ImageMagick/www/smile.c +share/ImageMagick/www/sponsor.html +share/ImageMagick/www/tools.html +share/ImageMagick/www/xtp.html +@dirrm share/ImageMagick/www/api/types +@dirrm share/ImageMagick/www/api +@dirrm share/ImageMagick/www +@dirrm share/ImageMagick/images @dirrm share/ImageMagick @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Magick @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200102071821.f17ILGi94520>