Date: Sat, 6 Jul 2002 01:54:38 -0700 (PDT) From: Patrick Greenwell <patrick@stealthgeeks.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/40259: Update request:: ImageMagick 5.4.7 Message-ID: <200207060854.g668scFq003977@www.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 40259
>Category: ports
>Synopsis: Update request:: ImageMagick 5.4.7
>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 Jul 06 02:00:10 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Patrick Greenwell
>Release: 4.6-STABLE
>Organization:
>Environment:
FreeBSD rockstar.stealthgeeks.net 4.6-STABLE FreeBSD 4.6-STABLE #7: Fri Jul 5 11:51:42 PDT 2002 root@rockstar.stealthgeeks.net:/usr/obj/usr/src/sys/LOCAL i386
>Description:
The version of ImageMagick in ports, 5.4.6.2 is no longer carried by the listed mirrors. There is a newer version, 5.4.7 which is out, however it does not compile cleanly.
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/ImageMagick/Makefile ImageMagick/Makefile
--- /usr/ports/graphics/ImageMagick/Makefile Mon Jun 24 08:17:15 2002
+++ ImageMagick/Makefile Sat Jul 6 01:41:51 2002
@@ -6,7 +6,7 @@
#
PORTNAME= ImageMagick
-PORTVERSION= 5.4.6.2
+PORTVERSION= 5.4.7
CATEGORIES= graphics perl5
MASTER_SITES= http://imagemagick.sourceforge.net/http/ \
ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/%SUBDIR%/ \
@@ -26,7 +26,7 @@
ftp://ftp.fifi.org/pub/%SUBDIR%/ \
ftp://ftp.simplesystems.org/pub/%SUBDIR%/
MASTER_SITE_SUBDIR= ${PORTNAME}
-DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
+DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
@@ -43,7 +43,7 @@
LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
.endif
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_PERL5= yes
USE_GMAKE= yes
@@ -133,8 +133,5 @@
@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/ltdl/ltdl.c
@${REINPLACE_CMD} -e 's|timestamp: %ld|timestamp: %d|g' \
${WRKSRC}/magick/xwindow.c
- @${REINPLACE_CMD}-e 's|^tagnames.*\$$|#&|' \
- ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} \
- ${WRKSRC}/ltdl/configure
.include <bsd.port.mk>
diff -urN /usr/ports/graphics/ImageMagick/distinfo ImageMagick/distinfo
--- /usr/ports/graphics/ImageMagick/distinfo Mon Jun 24 08:17:15 2002
+++ ImageMagick/distinfo Sat Jul 6 01:42:43 2002
@@ -1 +1 @@
-MD5 (ImageMagick-5.4.6-2.tar.gz) = 2bf1c8f5b0bccea4159f593c09f8f077
+MD5 (ImageMagick-5.4.7.tar.gz) = 1e69ef2ac0594d51ab66c687605daba5
diff -urN /usr/ports/graphics/ImageMagick/files/patch-ak ImageMagick/files/patch-ak
--- /usr/ports/graphics/ImageMagick/files/patch-ak Wed Jul 19 06:08:38 2000
+++ ImageMagick/files/patch-ak Sat Jul 6 01:44:11 2002
@@ -1,11 +1,9 @@
---- 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 @@
-
+--- magick/Makefile.in.orig Fri Jun 30 11:05:56 2000
++++ magick/Makefile.in Sat Jul 6 02:01:31 2002
+@@ -299,5 +299,5 @@
# 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/files/patch-configure ImageMagick/files/patch-configure
--- /usr/ports/graphics/ImageMagick/files/patch-configure Mon Jun 24 08:17:16 2002
+++ ImageMagick/files/patch-configure Sat Jul 6 01:44:36 2002
@@ -1,19 +1,15 @@
---- configure.orig Sun Jun 23 12:18:35 2002
-+++ configure Sun Jun 23 12:23:23 2002
-@@ -14689,6 +14689,7 @@
-
+--- configure.orig Sun Jun 23 12:18:35 2002
++++ configure Sat Jul 6 02:01:31 2002
+@@ -18023,4 +18023,5 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
# Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -25601,7 +25602,7 @@
- freetype_prefix=`freetype-config --prefix`
+@@ -28542,5 +28543,5 @@
freetype_exec_prefix=`freetype-config --exec-prefix`
LDFLAGS="$LDFLAGS -L${freetype_exec_prefix}/lib"
- CPPFLAGS="$CPPFLAGS -I${freetype_prefix}/include/freetype2"
+ CPPFLAGS="-I${freetype_prefix}/include/freetype2 $CPPFLAGS"
fi
fi
-diff -urN /usr/ports/graphics/ImageMagick/work/ImageMagick-5.4.7/magick/semaphore.c ImageMagick/work/ImageMagick-5.4.7/magick/semaphore.c
--- /usr/ports/graphics/ImageMagick/work/ImageMagick-5.4.7/magick/semaphore.c Sat Jun 29 18:31:56 2002
+++ ImageMagick/work/ImageMagick-5.4.7/magick/semaphore.c Sat Jul 6 01:53:40 2002
@@ -70,8 +70,8 @@
#endif
#if defined(WIN32)
CRITICAL_SECTION
-#endif
mutex;
+#endif
unsigned long
signature;
>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?200207060854.g668scFq003977>