Date: Sat, 31 Aug 2002 02:36:33 -0700 (PDT) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/42241: Update port: graphics/ImageMagick (fix ports/40897) Message-ID: <200208310936.g7V9aXTh041303@www.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 42241 >Category: ports >Synopsis: Update port: graphics/ImageMagick (fix ports/40897) >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 Aug 31 02:40:03 PDT 2002 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.6.2-RELEASE i386 >Organization: >Environment: >Description: - Add graphics/jasper to LIB_DEPENDS - Add graphics/hdf to optional LIB_DEPENDS This PR supersedes following PR. [2002/07/22] ports/40897 ports Update port: graphics/ImageMagick >How-To-Repeat: >Fix: diff -urN /usr/ports/graphics/ImageMagick/Makefile graphics/ImageMagick/Makefile --- /usr/ports/graphics/ImageMagick/Makefile Tue Jul 23 01:40:21 2002 +++ graphics/ImageMagick/Makefile Sat Aug 31 02:18:16 2002 @@ -7,6 +7,7 @@ PORTNAME= ImageMagick PORTVERSION= 5.4.7.4 +PORTREVISION= 1 CATEGORIES= graphics perl5 MASTER_SITES= http://imagemagick.sourceforge.net/http/ \ ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/%SUBDIR%/ \ @@ -32,6 +33,7 @@ BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX LIB_DEPENDS= fpx.1:${PORTSDIR}/graphics/libfpx \ + jasper.4:${PORTSDIR}/graphics/jasper \ jbig.1:${PORTSDIR}/graphics/jbigkit \ jpeg.9:${PORTSDIR}/graphics/jpeg \ lcms.1:${PORTSDIR}/graphics/lcms \ @@ -53,7 +55,7 @@ CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-shared --with-perl=${PERL5} \ - --without-gslib --without-hdf --without-jp2 + --without-gslib INSTALLS_SHLIB= yes MAN1= ImageMagick.1 Magick++-config.1 Magick-config.1 \ @@ -89,13 +91,17 @@ # Loadable coders, smaller executable, but PerlMagick not really works # ('make test' there works) .if defined(WITH_IMAGEMAGICK_MODULES) -LIB_DEPENDS+= ltdl.1:${PORTSDIR}/devel/libtool CONFIGURE_ARGS+= --with-modules PLIST_SUB+= MODULES='' .else PLIST_SUB+= MODULES='@comment ' .endif +.if defined(WITH_HDF) +LIB_DEPENDS= df.1:${PORTSDIR}/graphics/hdf +CONFIGURE_ARGS+= --with-hdf +.endif + .if defined(WITHOUT_X11) PKGNAMESUFFIX+= -nox11 BUILD_DEPENDS+= gs:${PORTSDIR}/print/ghostscript-gnu-nox11 @@ -121,15 +127,11 @@ post-patch: # Do not use PTHREAD_LIBS here @${REINPLACE_CMD} -e 's|-lpthread|-lc_r|g ; \ - s|^tagnames=|#tagnames=|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 + s|^tagnames=|#tagnames=|g ; \ + s|lcms/lcms.h|lcms.h|g ; \ + s|lcms_lcms_h|lcms_h|g' ${WRKSRC}/configure @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|top_builddir)/ltdl/libltdlc.la|LIBLTDL)|g ; \ - s|ltdl magick|magick|g ; \ - s|pkgdocdir =.*$$|pkgdocdir = ${DOCSDIR}/|g ; \ + 's|pkgdocdir =.*$$|pkgdocdir = ${DOCSDIR}/|g ; \ s| install-data-html||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 >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?200208310936.g7V9aXTh041303>