From owner-freebsd-ports Wed Apr 11 11:50:18 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4744337B423 for ; Wed, 11 Apr 2001 11:50:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.1/8.11.1) id f3BIo1o84258; Wed, 11 Apr 2001 11:50:01 -0700 (PDT) (envelope-from gnats) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 56C7837B422 for ; Wed, 11 Apr 2001 11:46:29 -0700 (PDT) (envelope-from nobody@FreeBSD.org) Received: (from nobody@localhost) by freefall.freebsd.org (8.11.1/8.11.1) id f3BIkTh84067; Wed, 11 Apr 2001 11:46:29 -0700 (PDT) (envelope-from nobody) Message-Id: <200104111846.f3BIkTh84067@freefall.freebsd.org> Date: Wed, 11 Apr 2001 11:46:29 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/26499: Update port: graphics/ImageMagick to 5.3.0 (fix ports/26329) Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 26499 >Category: ports >Synopsis: Update port: graphics/ImageMagick to 5.3.0 (fix ports/26329) >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 Apr 11 11:50:00 PDT 2001 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.2-RELEASE i386 >Organization: >Environment: >Description: - Update to version 5.3.0 This PR supersedes ports/26329. >How-To-Repeat: >Fix: diff -urN /usr/ports/graphics/ImageMagick/Makefile graphics/ImageMagick/Makefile --- /usr/ports/graphics/ImageMagick/Makefile Wed Apr 11 20:11:16 2001 +++ graphics/ImageMagick/Makefile Wed Apr 11 21:56:06 2001 @@ -6,17 +6,15 @@ # PORTNAME= ImageMagick -PORTVERSION= 5.2.9 -PORTREVISION= 1 +PORTVERSION= 5.3.0 CATEGORIES= graphics perl5 -MASTER_SITES= ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/ImageMagick/ \ - ftp://gd.tuwien.ac.at/pub/graphics/ImageMagick/ \ - ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ \ - ftp://ftp.u-aizu.ac.jp/pub/graphics/image/ImageMagick/ \ - ftp://ftp.fifi.org/pub/ImageMagick/ \ - ftp://ftp.simplesystems.org/pub/ImageMagick/ \ - ${MASTER_SITE_RINGSERVER} -MASTER_SITE_SUBDIR= graphics/ImageMagick +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,imagemagick,} \ + ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/%SUBDIR%/ \ + ftp://gd.tuwien.ac.at/pub/graphics/%SUBDIR%/ \ + ftp://ftp.sunet.se/pub/multimedia/graphics/%SUBDIR%/ \ + ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/ImageMagick,} \ + ftp://ftp.simplesystems.org/pub/%SUBDIR%/ +MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org @@ -88,9 +86,11 @@ .endif pre-patch: + @${PERL} -pi -e 's|\(pthread,|\(c_r,|g ; \ + s|-lpthread|${PTHREAD_LIBS}|g ; \ + s|-D_REENTRANT|${PTHREAD_CFLAGS}|g' ${WRKSRC}/configure.in @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$$\(top_builddir\)/ltdl/libltdlc.la|\$$\(LIBLTDL\)|g' - ${PERL} -pi -e 's|lcms/lcms.h|lcms.h|g' \ - ${WRKSRC}/configure.in ${WRKSRC}/magick/transform.c + @${PERL} -pi -e 's|lcms/lcms.h|lcms.h| ${WRKSRC}/magick/transform.c .include diff -urN /usr/ports/graphics/ImageMagick/distinfo graphics/ImageMagick/distinfo --- /usr/ports/graphics/ImageMagick/distinfo Thu Mar 8 02:16:21 2001 +++ graphics/ImageMagick/distinfo Wed Apr 11 21:45:38 2001 @@ -1 +1 @@ -MD5 (ImageMagick-5.2.9.tar.gz) = a8a414d7579d967d938a1cb03b915118 +MD5 (ImageMagick-5.3.0.tar.gz) = 26e9693d8602c35741639972aac7cbb9 diff -urN /usr/ports/graphics/ImageMagick/files/patch-al graphics/ImageMagick/files/patch-al --- /usr/ports/graphics/ImageMagick/files/patch-al Thu Mar 8 02:16:21 2001 +++ graphics/ImageMagick/files/patch-al Wed Apr 11 21:51:17 2001 @@ -1,5 +1,5 @@ ---- configure.in.orig Tue Feb 13 02:19:24 2001 -+++ configure.in Sat Feb 17 05:17:02 2001 +--- configure.in.orig Sun Mar 4 11:07:42 2001 ++++ configure.in Wed Mar 28 05:33:09 2001 @@ -65,7 +65,7 @@ # AC_ENABLE_SHARED(no) @@ -9,21 +9,7 @@ # Substitute INCLTDL and LIBLTDL in the Makefiles AC_SUBST(INCLTDL) AC_SUBST(LIBLTDL) -@@ -487,10 +487,10 @@ - LIB_THREAD='' - if test "$with_threads" != 'no' - then -- AC_CHECK_LIB(pthread,pthread_attr_init, -+ AC_CHECK_LIB(c_r,pthread_attr_init, - [AC_DEFINE(HasPTHREADS,,Define if you have Posix thread methods.) -- LIB_THREAD="-lpthread" -- DEF_THREAD="-D_REENTRANT"],,) -+ LIB_THREAD="-pthread" -+ DEF_THREAD="-D_THREAD_SAFE"],,) - LIBS="$LIB_THREAD $LIBS" - CPPFLAGS="$DEF_THREAD $CPPFLAGS" - fi -@@ -1021,6 +1021,22 @@ +@@ -1021,6 +1027,22 @@ AC_MSG_RESULT() failed=0; passed=0; @@ -46,7 +32,7 @@ AC_CHECK_HEADER(libxml/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) -@@ -1030,6 +1046,8 @@ +@@ -1030,6 +1052,8 @@ then AC_MSG_RESULT(no -- some components failed test) have_xml='no (failed tests)' diff -urN /usr/ports/graphics/ImageMagick/pkg-plist graphics/ImageMagick/pkg-plist --- /usr/ports/graphics/ImageMagick/pkg-plist Wed Mar 14 19:12:07 2001 +++ graphics/ImageMagick/pkg-plist Thu Mar 29 02:40:13 2001 @@ -67,6 +67,8 @@ %%MODULES%%lib/ImageMagick/modules/coders/dcm.so %%MODULES%%lib/ImageMagick/modules/coders/dps.la %%MODULES%%lib/ImageMagick/modules/coders/dps.so +%%MODULES%%lib/ImageMagick/modules/coders/dpx.la +%%MODULES%%lib/ImageMagick/modules/coders/dpx.so %%MODULES%%lib/ImageMagick/modules/coders/ept.la %%MODULES%%lib/ImageMagick/modules/coders/ept.so %%MODULES%%lib/ImageMagick/modules/coders/fax.la @@ -241,6 +243,42 @@ share/ImageMagick/images/screen.png share/ImageMagick/magic.mgk share/ImageMagick/www/Changelog.html +share/ImageMagick/www/Magick++/Blob.html +share/ImageMagick/www/Magick++/Cache.fig +share/ImageMagick/www/Magick++/Cache.png +share/ImageMagick/www/Magick++/Cache.svg +share/ImageMagick/www/Magick++/Color.html +share/ImageMagick/www/Magick++/Documentation.html +share/ImageMagick/www/Magick++/Drawable.html +share/ImageMagick/www/Magick++/Drawable_example_1.png +share/ImageMagick/www/Magick++/Enumerations.html +share/ImageMagick/www/Magick++/Exception.html +share/ImageMagick/www/Magick++/FormatCharacters.html +share/ImageMagick/www/Magick++/Future.html +share/ImageMagick/www/Magick++/Geometry.html +share/ImageMagick/www/Magick++/Image.fig +share/ImageMagick/www/Magick++/Image.html +share/ImageMagick/www/Magick++/Image.png +share/ImageMagick/www/Magick++/Image.svg +share/ImageMagick/www/Magick++/ImageDesign.html +share/ImageMagick/www/Magick++/ImageMagick.png +share/ImageMagick/www/Magick++/Install.html +share/ImageMagick/www/Magick++/Magick++.png +share/ImageMagick/www/Magick++/Montage.html +share/ImageMagick/www/Magick++/NEWS.html +share/ImageMagick/www/Magick++/PixelPacket.html +share/ImageMagick/www/Magick++/Pixels.html +share/ImageMagick/www/Magick++/README.txt +share/ImageMagick/www/Magick++/STL.html +share/ImageMagick/www/Magick++/index.html +share/ImageMagick/www/Magick++/montage-sample-framed.jpg +share/ImageMagick/www/Magick++/right_triangle.png +share/ImageMagick/www/Magick++/thumbnail-anatomy-framed.fig +share/ImageMagick/www/Magick++/thumbnail-anatomy-framed.jpg +share/ImageMagick/www/Magick++/thumbnail-anatomy-plain.fig +share/ImageMagick/www/Magick++/thumbnail-anatomy-plain.jpg +share/ImageMagick/www/Magick++/thumbnail-sample-framed.jpg +share/ImageMagick/www/Magick++/thumbnail-sample-plain.jpg share/ImageMagick/www/Magick.html share/ImageMagick/www/animate.html share/ImageMagick/www/api/animate.html @@ -319,6 +357,7 @@ share/ImageMagick/www/tools.html @dirrm share/ImageMagick/www/api/types @dirrm share/ImageMagick/www/api +@dirrm share/ImageMagick/www/Magick++ @dirrm share/ImageMagick/www @dirrm share/ImageMagick/images @dirrm share/ImageMagick >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message