Date: Fri, 21 Jan 2011 23:37:56 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: mm@FreeBSD.org Subject: ports/154196: [PATCH] graphics/ImageMagick: clean up Makefile Message-ID: <20110121153756.6CA642AEC5E2@sunpoet.net> Resent-Message-ID: <201101211540.p0LFe97E024184@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 154196 >Category: ports >Synopsis: [PATCH] graphics/ImageMagick: clean up Makefile >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jan 21 15:40:09 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Sunpoet Po-Chuan Hsieh >Release: FreeBSD 8.2-PRERELEASE amd64 >Organization: The FreeBSD Project >Environment: System: FreeBSD bonjour.sunpoet.net 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #0: Tue Dec 28 19:05:46 CST 2010 >Description: - Clean up Makefile - Use SH Feature safe: yes Port maintainer (mm@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- ImageMagick-6.6.6.10.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/ImageMagick/Makefile,v retrieving revision 1.317 diff -u -u -r1.317 Makefile --- Makefile 10 Jan 2011 09:08:07 -0000 1.317 +++ Makefile 21 Jan 2011 15:32:53 -0000 @@ -15,8 +15,6 @@ MAINTAINER= mm@FreeBSD.org COMMENT= Image processing tools -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} - USE_XZ= yes USE_PERL5= yes USE_GNOME= gnomehack gnometarget pkgconfig @@ -38,7 +36,7 @@ CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib -PLIST_SUB+= PORTVERSION=${PORTVERSION:R} +PLIST_SUB= PORTVERSION=${PORTVERSION:R} OPTIONS=\ IMAGEMAGICK_16BIT_PIXEL "16bit pixel support" on \ @@ -84,7 +82,7 @@ .if defined(WITH_THREADS) _IMAGEMAGICK_THREADS=yes _IMAGEMAGICK_THREADS_MSG=with threads -PERL_THREADED!= /bin/sh -c 'case `perl --version` in *freebsd-thread*) echo yes ;; esac' +PERL_THREADED!= ${SH} -c 'case `perl --version` in *freebsd-thread*) ${ECHO_CMD} yes ;; esac' .else _IMAGEMAGICK_THREADS=no _IMAGEMAGICK_THREADS_MSG=without threads @@ -309,27 +307,19 @@ PLIST_SUB+= WMF="@comment " .endif -# SVG (Scalable Vector Graphics) images and MSL (Magick Scripting Language) -# both require XML -.if defined(WITH_IMAGEMAGICK_SVG) || !defined(WITHOUT_IMAGEMAGICK_MSL) -USE_GNOME+= libxml2 -CONFIGURE_ARGS+= --with-xml -.else -CONFIGURE_ARGS+= --without-xml -.endif - -# SVG (Scalable Vector Graphics) requires X11 +# SVG (Scalable Vector Graphics) requires both libxml2 and X11 .if defined(WITH_IMAGEMAGICK_SVG) . if defined(WITHOUT_X11) IGNORE= svg support requires X11 . else +USE_GNOME+= libxml2 LIB_DEPENDS+= rsvg-2:${PORTSDIR}/graphics/librsvg2 -CONFIGURE_ARGS+= --with-rsvg +CONFIGURE_ARGS+= --with-rsvg --with-xml CONFIGURE_ENV+= RSVG_CFLAGS="-I${LOCALBASE}/include/librsvg-2" \ RSVG_LIBS="-L${LOCALBASE}/lib" . endif .else -CONFIGURE_ARGS+= --without-rsvg +CONFIGURE_ARGS+= --without-rsvg --without-xml .endif # PDF (Adobe Portable Document Format) support @@ -358,10 +348,6 @@ INSTALL_TARGET= install install-data-html .endif -#.if ${OSVERSION} >= 800000 -#WITHOUT_IMAGEMAGICK_TESTS=yes -#.endif - .if ${ARCH} == sparc64 WITHOUT_IMAGEMAGICK_TESTS=yes .endif @@ -435,11 +421,8 @@ . endfor .endif -.if defined(WITH_IMAGEMAGICK_TESTS) && !defined(WITHOUT_IMAGEMAGICK_TESTS) -# jpeg-7 fails in ValidateImageFormatsOnDisk -.if defined(WITH_IMAGEMAGICK_TEST_JPEG7) +.if !defined(WITHOUT_IMAGEMAGICK_TESTS) post-build: test .endif -.endif .include <bsd.port.post.mk> --- ImageMagick-6.6.6.10.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110121153756.6CA642AEC5E2>