diff options
| author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2002-06-24 15:17:16 +0000 |
|---|---|---|
| committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2002-06-24 15:17:16 +0000 |
| commit | 99c35d4eb009fe4e89a43cac773c3162b4148aae (patch) | |
| tree | 6e03d309203e1d0913f0012b88d517cefd0856ee /graphics | |
| parent | - Update to version 2.0.99.r2 which is only a release candidate, but there (diff) | |
o Update to 5.4.6.2
o Fix configure issue
PR: 39680
Submitted by: Oliver Lehmann <lehmann@ans-netz.de>
Prompted by: Stephen Montgomery-Smith <stephen@math.missouri.edu>,
too many
Notes
Notes:
svn path=/head/; revision=61880
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/ImageMagick/Makefile | 22 | ||||
| -rw-r--r-- | graphics/ImageMagick/distinfo | 2 | ||||
| -rw-r--r-- | graphics/ImageMagick/files/patch-configure | 15 |
3 files changed, 26 insertions, 13 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 03646bc8f64f..a99772922761 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -6,8 +6,7 @@ # PORTNAME= ImageMagick -PORTVERSION= 5.4.6.1 -PORTREVISION= 1 +PORTVERSION= 5.4.6.2 CATEGORIES= graphics perl5 MASTER_SITES= http://imagemagick.sourceforge.net/http/ \ ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/%SUBDIR%/ \ @@ -49,6 +48,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} USE_PERL5= yes USE_GMAKE= yes USE_LIBTOOL= yes +USE_REINPLACE= yes LIBTOOLFLAGS= # none CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" @@ -118,19 +118,23 @@ INSTALL_TARGET= install INSTALL_TARGET= install install-data-html .endif -pre-patch: - @${PERL} -pi -e 's|-lpthread|-lc_r|g ; \ +post-patch: +# @${REINPLACE_CMD} -e 's|-lpthread|-lc_r|g ; \ + @${REINPLACE_CMD} -e 's|-lpthread|`${ECHO_CMD} ${PTHREAD_LIBS}`|g ; \ s|LIBLTDL=.*$$|LIBLTDL="-lltdl"|g ; \ s|INCLTDL=.*$$|INCLTDL=|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 ; \ + @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ + 's|top_builddir)/ltdl/libltdlc.la|LIBLTDL)|g ; \ s|pkgdocdir =.*$$|pkgdocdir = ${DOCSDIR}/|g ; \ s| install-data-html||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 - @${PERL} -pi -e 's|timestamp: %ld|timestamp: %d|g' \ + @${REINPLACE_CMD} -e 's|lcms/lcms.h|lcms.h|g' ${WRKSRC}/magick/transform.c + @${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 --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo index 4a73c321a5f0..c2911122aa20 100644 --- a/graphics/ImageMagick/distinfo +++ b/graphics/ImageMagick/distinfo @@ -1 +1 @@ -MD5 (ImageMagick-5.4.6-1.tar.gz) = 17c7b6f86f2fee789774ad3a91ff089b +MD5 (ImageMagick-5.4.6-2.tar.gz) = 2bf1c8f5b0bccea4159f593c09f8f077 diff --git a/graphics/ImageMagick/files/patch-configure b/graphics/ImageMagick/files/patch-configure index be4b07896ab8..77bf61c3c286 100644 --- a/graphics/ImageMagick/files/patch-configure +++ b/graphics/ImageMagick/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Sat Apr 6 04:06:38 2002 -+++ configure Fri May 3 04:10:56 2002 -@@ -14424,6 +14424,7 @@ +--- configure.orig Sun Jun 23 12:18:35 2002 ++++ configure Sun Jun 23 12:23:23 2002 +@@ -14689,6 +14689,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,3 +8,12 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' +@@ -25601,7 +25602,7 @@ + freetype_prefix=`freetype-config --prefix` + 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 + |