Date: Sat, 8 Dec 2001 11:07:07 -0800 (PST) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/32617: Update port: graphics/ImageMagick to 5.4.0.5 Message-ID: <200112081907.fB8J77S99194@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 32617 >Category: ports >Synopsis: Update port: graphics/ImageMagick to 5.4.0.5 >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: Sat Dec 08 11:10:02 PST 2001 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.4-RELEASE i386 >Organization: >Environment: >Description: - Update to version 5.4.0-5 New file: files/patch-an Remove file: files/patch-al files/patch-am >How-To-Repeat: >Fix: diff -urN /usr/ports/graphics/ImageMagick/Makefile graphics/ImageMagick/Makefile --- /usr/ports/graphics/ImageMagick/Makefile Sat Sep 22 17:38:04 2001 +++ graphics/ImageMagick/Makefile Sat Dec 8 12:30:45 2001 @@ -6,7 +6,7 @@ # PORTNAME= ImageMagick -PORTVERSION= 5.3.8.2 +PORTVERSION= 5.4.0.5 CATEGORIES= graphics perl5 MASTER_SITES= http://imagemagick.sourceforge.net/http/ \ ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/%SUBDIR%/ \ @@ -26,6 +26,7 @@ ftp://ftp.fifi.org/pub/%SUBDIR%/ \ ftp://ftp.simplesystems.org/pub/%SUBDIR%/ MASTER_SITE_SUBDIR= ${PORTNAME} +DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E} MAINTAINER= ports@FreeBSD.org @@ -45,12 +46,11 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} USE_PERL5= yes -USE_LIBTOOL= yes -USE_AUTOCONF= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" +GNU_CONFIGURE= yes +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-shared --with-perl=${PERL5} \ - --without-gslib --without-hdf --without-wmf + --without-gslib --without-hdf --without-jp2 INSTALLS_SHLIB= yes MAN1= ImageMagick.1 Magick++-config.1 Magick-config.1 \ @@ -60,10 +60,15 @@ MAN5= quantize.5 MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib + # PerlMagick not works with threads, if perl is not threaded, and vice versa .if defined(WITH_IMAGEMAGICK_THREADS) || \ defined(PERL_THREADED) && ${PERL_THREADED} == "true" CONFIGURE_ARGS+= --with-threads +CPPFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} .else CONFIGURE_ARGS+= --without-threads .endif @@ -82,7 +87,6 @@ # ('make test' there works) .if defined(WITH_IMAGEMAGICK_MODULES) LIB_DEPENDS+= ltdl.1:${PORTSDIR}/devel/libtool -LIBTOOLFLAGS= # none CONFIGURE_ARGS+= --with-modules PLIST_SUB+= MODULES='' .else @@ -93,9 +97,11 @@ PKGNAMESUFFIX= -nox11 BUILD_DEPENDS+= gs:${PORTSDIR}/print/ghostscript-gnu-nox11 RUN_DEPENDS+= gs:${PORTSDIR}/print/ghostscript-gnu-nox11 -CONFIGURE_ARGS+= --without-x +CONFIGURE_ARGS+= --without-x --without-mpeg2 --without-wmf PLIST_SUB+= X11='@comment ' .else +LIB_DEPENDS+= mpeg2.0:${PORTSDIR}/graphics/libmpeg2 \ + wmf.2:${PORTSDIR}/graphics/libwmf BUILD_DEPENDS+= gs:${PORTSDIR}/print/ghostscript-gnu RUN_DEPENDS+= gs:${PORTSDIR}/print/ghostscript-gnu USE_XLIB= yes @@ -104,11 +110,14 @@ .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 + @${PERL} -pi -e 's|-lpthread|-lc_r|g ; \ + s|LIBLTDL=.*\n|LIBLTDL="-lltdl"\n|g ; \ + s|INCLTDL=.*\n|INCLTDL=\n|g ; \ + s|lcms/lcms.h|lcms.h|g ; \ + s|lcms_lcms_h|lcms_h|g' ${WRKSRC}/configure @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}/magick/transform.c + @${PERL} -pi -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/ltdl/ltdl.c .include <bsd.port.mk> diff -urN /usr/ports/graphics/ImageMagick/distinfo graphics/ImageMagick/distinfo --- /usr/ports/graphics/ImageMagick/distinfo Sat Sep 22 17:38:05 2001 +++ graphics/ImageMagick/distinfo Sat Dec 8 11:29:50 2001 @@ -1 +1 @@ -MD5 (ImageMagick-5.3.8.2.tar.gz) = 9423b8c7d47073bba37be27b7246f4ec +MD5 (ImageMagick-5.4.0-5.tar.gz) = 52942fa0a6bcd7d8600436d7b2024c60 diff -urN /usr/ports/graphics/ImageMagick/files/patch-al graphics/ImageMagick/files/patch-al --- /usr/ports/graphics/ImageMagick/files/patch-al Sat Aug 25 13:28:11 2001 +++ graphics/ImageMagick/files/patch-al Thu Jan 1 09:00:00 1970 @@ -1,52 +0,0 @@ ---- configure.in.orig Fri Aug 24 04:50:46 2001 -+++ configure.in Fri Aug 24 04:51:11 2001 -@@ -67,7 +67,7 @@ - # - AC_ENABLE_SHARED(no) - AC_ENABLE_STATIC(yes) --AC_LIBLTDL_CONVENIENCE -+AC_LIBLTDL_INSTALLABLE - # Substitute INCLTDL and LIBLTDL in the Makefiles - AC_SUBST(INCLTDL) - AC_SUBST(LIBLTDL) -@@ -714,7 +714,7 @@ - AC_MSG_RESULT() - failed=0; - passed=0; -- AC_CHECK_HEADER(lcms/lcms.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) -+ AC_CHECK_HEADER(lcms.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) - AC_CHECK_LIB(lcms,cmsOpenProfileFromMem,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) - AC_MSG_CHECKING(if LCMS package is complete) - if test $passed -gt 0 -@@ -1099,6 +1099,22 @@ - AC_MSG_RESULT() - failed=0; - passed=0; -+ -+ OLD_LDFLAGS="$LDFLAGS" -+ OLD_CPPFLAGS="$CPPFLAGS" -+ if test -d "$builddir/libxml/include" -+ then -+ : -+ else -+ xml_config='' -+ AC_CHECK_PROGS(xml_config,xml2-config,)dnl -+ if test -n "$xml_config" -+ then -+ LDFLAGS=-L`$xml_config --prefix`/lib" $LDFLAGS" 2> /dev/null -+ CPPFLAGS=`$xml_config --cflags`" $CPPFLAGS" 2> /dev/null -+ fi -+ fi -+ - 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) -@@ -1108,6 +1124,8 @@ - then - AC_MSG_RESULT(no -- some components failed test) - have_xml='no (failed tests)' -+ CPPFLAGS="$OLD_CPPFLAGS" -+ LDFLAGS="$OLD_LDFLAGS" - else - LIB_XML='-lxml2' - LIBS="$LIB_XML $LIBS" diff -urN /usr/ports/graphics/ImageMagick/files/patch-am graphics/ImageMagick/files/patch-am --- /usr/ports/graphics/ImageMagick/files/patch-am Wed Mar 7 02:19:53 2001 +++ graphics/ImageMagick/files/patch-am Thu Jan 1 09:00:00 1970 @@ -1,20 +0,0 @@ ---- aclocal.m4.orig Mon Dec 11 06:02:45 2000 -+++ aclocal.m4 Sat Feb 17 05:30:40 2001 -@@ -1474,7 +1474,7 @@ - deplibs_check_method="$deplibs_check_method" \ - file_magic_cmd="$file_magic_cmd" \ - ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \ ----build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \ -+--build="$build" $ac_aux_dir/ltmain.sh $host \ - || AC_MSG_ERROR([libtool tag configuration failed]) - CC="$lt_save_CC" - CFLAGS="$lt_save_CFLAGS" -@@ -1508,7 +1508,7 @@ - deplibs_check_method="$deplibs_check_method" \ - file_magic_cmd="$file_magic_cmd" \ - ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \ ----build="$build" --add-tag=GCJ $ac_aux_dir/ltcf-gcj.sh $host \ -+--build="$build" $ac_aux_dir/ltmain.sh $host \ - || AC_MSG_ERROR([libtool tag configuration failed]) - CC="$lt_save_CC" - CFLAGS="$lt_save_CFLAGS" diff -urN /usr/ports/graphics/ImageMagick/files/patch-an graphics/ImageMagick/files/patch-an --- /usr/ports/graphics/ImageMagick/files/patch-an Thu Jan 1 09:00:00 1970 +++ graphics/ImageMagick/files/patch-an Thu Oct 18 03:11:37 2001 @@ -0,0 +1,28 @@ +--- ltmain.sh.orig Mon Sep 24 07:11:39 2001 ++++ ltmain.sh Sat Sep 29 19:58:41 2001 +@@ -1138,6 +1138,7 @@ + ;; + + -avoid-version) ++ build_old_libs=no + avoid_version=yes + continue + ;; +@@ -1225,7 +1226,7 @@ + # These systems don't actually have a C library (as such) + test "X$arg" = "X-lc" && continue + ;; +- *-*-openbsd*) ++ *-*-openbsd* | *-*-freebsd*) + # Do not include libc due to us having libc/libc_r. + test "X$arg" = "X-lc" && continue + ;; +@@ -2829,7 +2835,7 @@ + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; +- *-*-openbsd*) ++ *-*-openbsd* | *-*-freebsd*) + # Do not include libc due to us having libc/libc_r. + test "X$arg" = "X-lc" && continue + ;; diff -urN /usr/ports/graphics/ImageMagick/pkg-plist graphics/ImageMagick/pkg-plist --- /usr/ports/graphics/ImageMagick/pkg-plist Sat Sep 22 17:38:06 2001 +++ graphics/ImageMagick/pkg-plist Sat Nov 17 05:36:53 2001 @@ -10,7 +10,7 @@ bin/montage include/Magick++.h include/Magick++/Blob.h -include/Magick++/Coder.h +include/Magick++/CoderInfo.h include/Magick++/Color.h include/Magick++/Drawable.h include/Magick++/Exception.h @@ -32,7 +32,6 @@ include/magick/cache_view.h include/magick/classify.h include/magick/compress.h -include/magick/config.h include/magick/delegate.h include/magick/draw.h include/magick/error.h @@ -40,9 +39,11 @@ include/magick/image.h include/magick/magic.h include/magick/magick.h +include/magick/magick_config.h include/magick/module.h include/magick/monitor.h include/magick/quantize.h +include/magick/registry.h include/magick/semaphore.h include/magick/timer.h include/magick/utility.h @@ -50,8 +51,6 @@ include/magick/widget.h include/magick/xwindow.h lib/ImageMagick/delegates.mgk -%%MODULES%%lib/ImageMagick/modules/coders/8bim.la -%%MODULES%%lib/ImageMagick/modules/coders/8bim.so %%MODULES%%lib/ImageMagick/modules/coders/art.la %%MODULES%%lib/ImageMagick/modules/coders/art.so %%MODULES%%lib/ImageMagick/modules/coders/avi.la @@ -90,26 +89,26 @@ %%MODULES%%lib/ImageMagick/modules/coders/histogram.so %%MODULES%%lib/ImageMagick/modules/coders/html.la %%MODULES%%lib/ImageMagick/modules/coders/html.so -%%MODULES%%lib/ImageMagick/modules/coders/icm.la -%%MODULES%%lib/ImageMagick/modules/coders/icm.so %%MODULES%%lib/ImageMagick/modules/coders/icon.la %%MODULES%%lib/ImageMagick/modules/coders/icon.so -%%MODULES%%lib/ImageMagick/modules/coders/iptc.la -%%MODULES%%lib/ImageMagick/modules/coders/iptc.so %%MODULES%%lib/ImageMagick/modules/coders/jbig.la %%MODULES%%lib/ImageMagick/modules/coders/jbig.so -%%MODULES%%lib/ImageMagick/modules/coders/jpeg.la -%%MODULES%%lib/ImageMagick/modules/coders/jpeg.so %%MODULES%%lib/ImageMagick/modules/coders/jp2.la %%MODULES%%lib/ImageMagick/modules/coders/jp2.so +%%MODULES%%lib/ImageMagick/modules/coders/jpeg.la +%%MODULES%%lib/ImageMagick/modules/coders/jpeg.so %%MODULES%%lib/ImageMagick/modules/coders/label.la %%MODULES%%lib/ImageMagick/modules/coders/label.so %%MODULES%%lib/ImageMagick/modules/coders/logo.la %%MODULES%%lib/ImageMagick/modules/coders/logo.so %%MODULES%%lib/ImageMagick/modules/coders/map.la %%MODULES%%lib/ImageMagick/modules/coders/map.so +%%MODULES%%lib/ImageMagick/modules/coders/mat.la +%%MODULES%%lib/ImageMagick/modules/coders/mat.so %%MODULES%%lib/ImageMagick/modules/coders/matte.la %%MODULES%%lib/ImageMagick/modules/coders/matte.so +%%MODULES%%lib/ImageMagick/modules/coders/meta.la +%%MODULES%%lib/ImageMagick/modules/coders/meta.so %%MODULES%%lib/ImageMagick/modules/coders/miff.la %%MODULES%%lib/ImageMagick/modules/coders/miff.so %%MODULES%%lib/ImageMagick/modules/coders/modules.mgk @@ -117,12 +116,16 @@ %%MODULES%%lib/ImageMagick/modules/coders/mono.so %%MODULES%%lib/ImageMagick/modules/coders/mpc.la %%MODULES%%lib/ImageMagick/modules/coders/mpc.so +%%MODULES%%lib/ImageMagick/modules/coders/mpeg.la +%%MODULES%%lib/ImageMagick/modules/coders/mpeg.so %%MODULES%%lib/ImageMagick/modules/coders/mtv.la %%MODULES%%lib/ImageMagick/modules/coders/mtv.so %%MODULES%%lib/ImageMagick/modules/coders/mvg.la %%MODULES%%lib/ImageMagick/modules/coders/mvg.so %%MODULES%%lib/ImageMagick/modules/coders/null.la %%MODULES%%lib/ImageMagick/modules/coders/null.so +%%MODULES%%lib/ImageMagick/modules/coders/otb.la +%%MODULES%%lib/ImageMagick/modules/coders/otb.so %%MODULES%%lib/ImageMagick/modules/coders/pcd.la %%MODULES%%lib/ImageMagick/modules/coders/pcd.so %%MODULES%%lib/ImageMagick/modules/coders/pcl.la @@ -155,6 +158,8 @@ %%MODULES%%lib/ImageMagick/modules/coders/psd.so %%MODULES%%lib/ImageMagick/modules/coders/pwp.la %%MODULES%%lib/ImageMagick/modules/coders/pwp.so +%%MODULES%%lib/ImageMagick/modules/coders/registry.la +%%MODULES%%lib/ImageMagick/modules/coders/registry.so %%MODULES%%lib/ImageMagick/modules/coders/rgb.la %%MODULES%%lib/ImageMagick/modules/coders/rgb.so %%MODULES%%lib/ImageMagick/modules/coders/rla.la @@ -217,11 +222,11 @@ %%MODULES%%lib/ImageMagick/modules/coders/yuv.so lib/ImageMagick/type.mgk lib/libMagick++.a -%%MODULES%%lib/libMagick++.la +lib/libMagick++.la lib/libMagick++.so lib/libMagick++.so.5 lib/libMagick.a -%%MODULES%%lib/libMagick.la +lib/libMagick.la lib/libMagick.so lib/libMagick.so.5 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Image/Magick.pm @@ -311,6 +316,7 @@ share/ImageMagick/www/api/nt.html share/ImageMagick/www/api/pixel_cache.html share/ImageMagick/www/api/quantize.html +share/ImageMagick/www/api/registry.html share/ImageMagick/www/api/segment.html share/ImageMagick/www/api/shear.html share/ImageMagick/www/api/signature.html @@ -348,6 +354,7 @@ share/ImageMagick/www/import.html share/ImageMagick/www/install.html share/ImageMagick/www/magick-list.html +share/ImageMagick/www/magick.css share/ImageMagick/www/miff.html share/ImageMagick/www/mogrify.html share/ImageMagick/www/montage.html >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?200112081907.fB8J77S99194>