Skip site navigation (1)Skip section navigation (2)
Date:      Mon,  5 Jun 2000 15:38:53 -0700 (PDT)
From:      tkato@prontomail.ne.jp
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/19045: Update port: graphics/ImageMagick to 5.2.0
Message-ID:  <20000605223853.0B86F37B68C@hub.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         19045
>Category:       ports
>Synopsis:       Update port: graphics/ImageMagick to 5.2.0
>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:   Mon Jun 05 15:40:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.0-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 5.2.0

New file:
patches/patch-aj

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/graphics/ImageMagick/Makefile graphics/ImageMagick/Makefile
--- /usr/ports/graphics/ImageMagick/Makefile	Sat Jun  3 08:24:44 2000
+++ graphics/ImageMagick/Makefile	Tue Jun  6 07:19:48 2000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ImageMagick
-PORTVERSION=	5.1.1
+PORTVERSION=	5.2.0
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://people.FreeBSD.org/~asami/distfiles/ \
 		ftp://ftp.wizards.dupont.com/pub/ImageMagick/ \
@@ -18,44 +18,39 @@
 
 MAINTAINER=	jseger@FreeBSD.org
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		df.1:${PORTSDIR}/graphics/hdf \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		png.3:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	df.1:${PORTSDIR}/graphics/hdf \
 		jbig.1:${PORTSDIR}/graphics/jbigkit \
-		ttf.4:${PORTSDIR}/print/freetype
-
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		png.3:${PORTSDIR}/graphics/png \
+		tiff.4:${PORTSDIR}/graphics/tiff \
+		ttf.4:${PORTSDIR}/print/freetype \
+		xml.5:${PORTSDIR}/textproc/libxml
 # bzip2 for bzlib
-BUILD_DEPENDS=  bzip2:${PORTSDIR}/archivers/bzip2 \
-		fig2dev:${PORTSDIR}/print/transfig \
-		picttoppm:${PORTSDIR}/graphics/netpbm \
+BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2 \
+		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_ARGS= --prefix=${PREFIX} --enable-shared --with-perl=${PERL5} \
-		--enable-16bit-pixel
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--enable-shared --enable-16bit-pixel --without-modules \
+		--with-perl=${PERL5}
 
 .if defined(HAVE_UNISYS_LICENSE)
 CONFIGURE_ARGS+= --enable-lzw
 .endif
 
-USE_PERL5=	YES
-USE_XLIB=	YES
-CONFIGURE_ENV=	LDFLAGS="$(LDFLAGS) -L${WRKSRC}/magick/.libs"
-
-pre-configure:
-	${RM} -f ${WRKSRC}/config.cache
+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
 
-post-install:
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+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	Tue Jun  6 04:37:14 2000
@@ -1 +1 @@
-MD5 (ImageMagick-5.1.1.tar.gz) = 04a606d99dfa8db3e5aa5e31cf074482
+MD5 (ImageMagick-5.2.0.tar.gz) = ec3b3ccb219080d945fb2ff4a9a0e223
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	Tue Jun  6 04:49:01 2000
@@ -1,11 +1,20 @@
---- 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)
+--- configure.in.orig	Thu Jun  1 05:14:18 2000
++++ configure.in	Tue Jun  6 04:48:03 2000
+@@ -48,7 +48,7 @@
+ AM_PROG_LD
+ AC_SUBST(LD)
+ AC_PROG_CPP
+-AM_PROG_CC_STDC
++#AM_PROG_CC_STDC
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ AC_PROG_LN_S
+@@ -989,7 +989,7 @@
  AC_CHECK_HEADERS(memory.h errno.h fcntl.h)
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+-AC_PROG_CC_STDC
++#AC_PROG_CC_STDC
+ AC_C_CONST
+ AC_C_INLINE
+ AC_C_BIGENDIAN
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/pkg/PLIST graphics/ImageMagick/pkg/PLIST
--- /usr/ports/graphics/ImageMagick/pkg/PLIST	Mon Mar  6 00:38:27 2000
+++ graphics/ImageMagick/pkg/PLIST	Tue Jun  6 07:10:26 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,27 +21,27 @@
 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/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
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+@exec /sbin/ldconfig -m %B
+@unexec /sbin/ldconfig -R
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Image/Magick.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Magick/.packlist
 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/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?20000605223853.0B86F37B68C>