Date: Fri, 14 Jul 2000 20:28:45 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/19944: Update port: graphics/ImageMagick to 5.2.1 (fix ports/19675) Message-ID: <20000715032845.C17F437B58E@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 19944
>Category: ports
>Synopsis: Update port: graphics/ImageMagick to 5.2.1 (fix ports/19675)
>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: Fri Jul 14 20:30:05 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.0-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 5.2.1
New file:
patches/patch-aj patches/patch-ak
Remove file:
patches/patch-ab
This PR supersedes ports/19675.
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/ImageMagick/Makefile graphics/ImageMagick/Makefile
--- /usr/ports/graphics/ImageMagick/Makefile Tue Jul 4 19:00:52 2000
+++ graphics/ImageMagick/Makefile Sat Jul 15 11:54:50 2000
@@ -6,7 +6,7 @@
#
PORTNAME= ImageMagick
-PORTVERSION= 5.1.1
+PORTVERSION= 5.2.1
CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_LOCAL} \
ftp://ftp.wizards.dupont.com/pub/ImageMagick/ \
@@ -19,42 +19,39 @@
MAINTAINER= jseger@FreeBSD.org
-LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS= bz2.1:${PORTSDIR}/archivers/bzip2 \
df.1:${PORTSDIR}/graphics/hdf \
- tiff.4:${PORTSDIR}/graphics/tiff \
- png.4:${PORTSDIR}/graphics/png \
jbig.1:${PORTSDIR}/graphics/jbigkit \
- ttf.4:${PORTSDIR}/print/freetype
-
-# bzip2 for bzlib
-BUILD_DEPENDS= bzip2:${PORTSDIR}/archivers/bzip2 \
- fig2dev:${PORTSDIR}/print/transfig \
- picttoppm:${PORTSDIR}/graphics/netpbm \
+ jpeg.9:${PORTSDIR}/graphics/jpeg \
+ png.3:${PORTSDIR}/graphics/png \
+ tiff.4:${PORTSDIR}/graphics/tiff \
+ ttf.4:${PORTSDIR}/print/freetype \
+ xml.5:${PORTSDIR}/textproc/libxml2
+BUILD_DEPENDS= gs:${PORTSDIR}/print/ghostscript55 \
mpeg2decode:${PORTSDIR}/graphics/mpeg2codec \
- gs:${PORTSDIR}/print/ghostscript55
-
-MAN1= ImageMagick.1 animate.1 combine.1 convert.1 display.1 \
- identify.1 import.1 mogrify.1 montage.1
-MAN3= Image::Magick.3
-MAN4= miff.4
-MAN5= quantize.5
+ picttoppm:${PORTSDIR}/graphics/netpbm \
+ fig2dev:${PORTSDIR}/print/transfig
-MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
+USE_PERL5= yes
+USE_XLIB= yes
+USE_LIBTOOL= yes
USE_AUTOCONF= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS= --enable-shared --enable-16bit-pixel --without-modules \
+ --with-perl=${PERL5}
INSTALLS_SHLIB= yes
-CONFIGURE_ARGS= --prefix=${PREFIX} --enable-shared --with-perl=${PERL5} \
- --enable-16bit-pixel
-
.if defined(HAVE_UNISYS_LICENSE)
CONFIGURE_ARGS+= --enable-lzw
.endif
-USE_PERL5= YES
-USE_XLIB= YES
-CONFIGURE_ENV= LDFLAGS="$(LDFLAGS) -L${WRKSRC}/magick/.libs"
+MAN1= ImageMagick.1 animate.1 combine.1 convert.1 display.1 \
+ identify.1 import.1 mogrify.1 montage.1
+MAN3= Image::Magick.3
+MAN4= miff.4
+MAN5= quantize.5
-pre-configure:
- ${RM} -f ${WRKSRC}/config.cache
+MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
.include <bsd.port.mk>
diff -urN /usr/ports/graphics/ImageMagick/files/md5 graphics/ImageMagick/files/md5
--- /usr/ports/graphics/ImageMagick/files/md5 Thu Mar 9 12:32:42 2000
+++ graphics/ImageMagick/files/md5 Sat Jul 15 09:57:37 2000
@@ -1 +1 @@
-MD5 (ImageMagick-5.1.1.tar.gz) = 04a606d99dfa8db3e5aa5e31cf074482
+MD5 (ImageMagick-5.2.1.tar.gz) = fe33bc5b95ec9bc4336e0a6249f93ba9
diff -urN /usr/ports/graphics/ImageMagick/patches/patch-ab graphics/ImageMagick/patches/patch-ab
--- /usr/ports/graphics/ImageMagick/patches/patch-ab Tue Apr 25 02:58:39 2000
+++ graphics/ImageMagick/patches/patch-ab Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- configure.in.orig Mon Apr 24 12:30:01 2000
-+++ configure.in Mon Apr 24 12:30:14 2000
-@@ -263,7 +263,7 @@
- AC_HEADER_TIME
- AC_HEADER_SYS_WAIT
- AC_HEADER_DIRENT
--AC_CHECK_HEADER(elf.h,AC_DEFINE(SVR4))
-+#AC_CHECK_HEADER(elf.h,AC_DEFINE(SVR4))
- AC_CHECK_HEADERS(sys/time.h sys/stat.h sys/types.h)
- AC_CHECK_HEADERS(math.h string.h stdarg.h pwd.h malloc.h)
- AC_CHECK_HEADERS(memory.h errno.h fcntl.h)
diff -urN /usr/ports/graphics/ImageMagick/patches/patch-aj graphics/ImageMagick/patches/patch-aj
--- /usr/ports/graphics/ImageMagick/patches/patch-aj Thu Jan 1 09:00:00 1970
+++ graphics/ImageMagick/patches/patch-aj Tue Jun 6 05:12:43 2000
@@ -0,0 +1,20 @@
+--- aclocal.m4.orig Thu Jun 1 05:37:34 2000
++++ aclocal.m4 Tue Jun 6 05:12:23 2000
+@@ -327,7 +327,7 @@
+ objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
+ deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $lt_target \
++$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
+ || AC_MSG_ERROR([libtool configure failed])
+
+ # Reload cache, that may have been modified by ltconfig
+@@ -1011,7 +1011,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 $lt_target \
++--add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $lt_target \
+ || AC_MSG_ERROR([libtool tag configuration failed])
+ CC="$lt_save_CC"
+ CFLAGS="$lt_save_CFLAGS"
diff -urN /usr/ports/graphics/ImageMagick/patches/patch-ak graphics/ImageMagick/patches/patch-ak
--- /usr/ports/graphics/ImageMagick/patches/patch-ak Thu Jan 1 09:00:00 1970
+++ graphics/ImageMagick/patches/patch-ak Sat Jul 15 10:13:05 2000
@@ -0,0 +1,11 @@
+--- magick/Makefile.in.orig Fri Jun 30 11:05:56 2000
++++ magick/Makefile.in Sat Jul 15 10:01:31 2000
+@@ -248,7 +248,7 @@
+
+
+ # Where modules are installed
+-pkgdir = $(libdir)/ImageMagick/modules/coders
++@WITH_MODULES_TRUE@pkgdir = $(libdir)/ImageMagick/modules/coders
+
+ # Architecture-dependent data files installed with modules
+ pkg_DATA =
diff -urN /usr/ports/graphics/ImageMagick/pkg/PLIST graphics/ImageMagick/pkg/PLIST
--- /usr/ports/graphics/ImageMagick/pkg/PLIST Fri Jun 16 21:43:01 2000
+++ graphics/ImageMagick/pkg/PLIST Sat Jul 15 11:51:08 2000
@@ -7,10 +7,12 @@
bin/import
bin/mogrify
bin/montage
+include/magick/PreRvIcccm.h
include/magick/api.h
+include/magick/attributes.h
include/magick/blob.h
include/magick/cache.h
-include/magick/cache_io.h
+include/magick/cache_view.h
include/magick/classify.h
include/magick/compress.h
include/magick/config.h
@@ -19,15 +21,15 @@
include/magick/gems.h
include/magick/image.h
include/magick/magick.h
-include/magick/memory.h
include/magick/monitor.h
include/magick/quantize.h
+include/magick/semaphore.h
include/magick/timer.h
include/magick/utility.h
include/magick/version.h
+include/magick/widget.h
include/magick/xwindows.h
lib/libMagick.a
-lib/libMagick.la
lib/libMagick.so
lib/libMagick.so.5
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Image/Magick.pm
@@ -36,8 +38,9 @@
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/delegates.mgk
+share/ImageMagick/magic.mgk
+@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
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Image
@dirrm include/magick
-@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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000715032845.C17F437B58E>