Date: Sun, 23 Jun 2002 12:42:41 +0200 From: Oliver Lehmann <lehmann@ans-netz.de> To: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> Cc: freebsd-ports@FreeBSD.ORG Subject: Re: ports/39680: Imagemagick port has configure error Message-ID: <20020623124241.0fedcee0.lehmann@ans-netz.de> In-Reply-To: <20020623044704.75251.qmail@exxodus.fedaykin.here> References: <200206230300.g5N309109350@freefall.freebsd.org> <20020623044704.75251.qmail@exxodus.fedaykin.here>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, 23 Jun 2002 01:46:42 -0300
Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> wrote:
> What about this simple patch? It updates ImageMagick
> to 5.4.6.2 and incorporates part of the idea from previous
> patch from Oliver Lehmann <lehmann@ans-netz.de>
> If I get confirmation that this work for you, I'll commit
> it. By the way, it fixed it for me.
Don't forget to bring -I/usr/local/include/freetype2 in front of CPPFLAGS.
Elsewhere -I/usr/local/include is in front and it's possible that
/usr/local/includes handels a freetype/freetype.h too. But that would be
freetype 1 and causes compilation problems with the WMF support (which uses
freetype/freetype.h) So... take that patch ;) (I took the chance and
replaced {PERL} with the RPLACE_CMD):
diff -ruN ImageMagick.old/Makefile /usr/ports/graphics/ImageMagick/Makefile
--- ImageMagick.old/Makefile Sun Jun 23 04:12:18 2002
+++ /usr/ports/graphics/ImageMagick/Makefile Sun Jun 23 12:40:49 2002
@@ -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%/ \
@@ -47,6 +46,7 @@
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
USE_PERL5= yes
+USE_REINPLACE= yes
USE_GMAKE= yes
USE_LIBTOOL= yes
LIBTOOLFLAGS= # none
@@ -119,18 +119,23 @@
.endif
pre-patch:
- @${PERL} -pi -e 's|-lpthread|-lc_r|g ; \
+ @${REINPLACE_CMD} -e 's|-lpthread|-lc_r|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
+
+post-patch:
+ @${REINPLACE_CMD}-e 's|^tagnames.*\$$|#&|' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} \
+ ${WRKSRC}/ltdl/configure
.include <bsd.port.mk>
diff -ruN ImageMagick.old/distinfo /usr/ports/graphics/ImageMagick/distinfo
--- ImageMagick.old/distinfo Sun Jun 23 04:12:18 2002
+++ /usr/ports/graphics/ImageMagick/distinfo Sun Jun 23 11:58:25 2002
@@ -1 +1 @@
-MD5 (ImageMagick-5.4.6-1.tar.gz) = 17c7b6f86f2fee789774ad3a91ff089b
+MD5 (ImageMagick-5.4.6-2.tar.gz) = 2bf1c8f5b0bccea4159f593c09f8f077
diff -ruN ImageMagick.old/files/patch-configure /usr/ports/graphics/ImageMagick/files/patch-configure
--- ImageMagick.old/files/patch-configure Sun Jun 23 04:12:18 2002
+++ /usr/ports/graphics/ImageMagick/files/patch-configure Sun Jun 23 12:32:19 2002
@@ -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
+
--
:======> Oliver Lehmann <======: clear perl code is better than
:====> lehmann@ans-netz.de <====: unclear awk code; but NOTHING
:===> http://www.pofo.de/ <===: comes close to unclear perl code
:=> http://wishlist.pofo.de/ <=: (taken from comp.lang.awk FAQ)
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?20020623124241.0fedcee0.lehmann>