diff options
| author | kwm <kwm@FreeBSD.org> | 2015-06-21 05:30:09 +0800 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2015-06-21 05:30:09 +0800 |
| commit | f2381100a33430dc9ac537d358ccd89f42924e73 (patch) | |
| tree | 82b56950a6f261e5704a18e18c0da242a815f9d2 /graphics | |
| parent | 24657c6416cab10fde9d6f006ace0d8440aae16e (diff) | |
| download | freebsd-ports-gnome-f2381100a33430dc9ac537d358ccd89f42924e73.tar.gz freebsd-ports-gnome-f2381100a33430dc9ac537d358ccd89f42924e73.tar.zst freebsd-ports-gnome-f2381100a33430dc9ac537d358ccd89f42924e73.zip | |
Update ImageMagick to 6.9.1-6.
* Remove double --without-lcms.
* Speed up the test target by running it with multiple jobs.
* Finaly add back WITHOUT_X11 to the IM-nox11 port, this will select the
ghostscript-nox11 port instead of the x11 version. The code in
bsd.port.mk doesn't handle the OPTIONS UNSET/EXCLUDE of X11. [1]
PR: 199268 [1]
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/ImageMagick-nox11/Makefile | 2 | ||||
| -rw-r--r-- | graphics/ImageMagick/Makefile | 9 | ||||
| -rw-r--r-- | graphics/ImageMagick/distinfo | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/graphics/ImageMagick-nox11/Makefile b/graphics/ImageMagick-nox11/Makefile index 37b0af0a2705..62e3b72c0444 100644 --- a/graphics/ImageMagick-nox11/Makefile +++ b/graphics/ImageMagick-nox11/Makefile @@ -4,6 +4,8 @@ # the SVG and PANGO plugins need X11 OPTIONS_EXCLUDE= X11 SVG PANGO PORTSCOUT= ignore:1 +# workaround until bsd.port.mk code can grok the disabling of the X11 option +WITHOUT_X11=yes MASTERDIR= ${.CURDIR}/../ImageMagick diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index db6fc2dcf809..414a7aa74dac 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ImageMagick -DISTVERSION= 6.9.1-4 +DISTVERSION= 6.9.1-6 PORTEPOCH= 1 CATEGORIES= graphics perl5 MASTER_SITES= http://www.imagemagick.org/download/ \ @@ -45,8 +45,7 @@ CPE_VENDOR= imagemagick SHEBANG_FILES= www/source/examples.pl GNU_CONFIGURE= yes CONFIGURE_ENV= MAKE=${MAKE_CMD} -CONFIGURE_ARGS= --without-dps \ - --without-lcms +CONFIGURE_ARGS= --without-dps USE_LDCONFIG= yes USE_GNOME= libxml2 @@ -291,7 +290,7 @@ CONFIGURE_ARGS+= --without-lzma .if ${PORT_OPTIONS:MLCMS2} LIB_DEPENDS+= liblcms2.so:${PORTSDIR}/graphics/lcms2 .else -CONFIGURE_ARGS+= --without-lcms2 +CONFIGURE_ARGS+= --without-lcms .endif # Freetype (TrueType Font) support @@ -414,7 +413,7 @@ post-install: test test check: .if ${PORT_OPTIONS:MTESTS} - -cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} limits -m 20m ${MAKE} check + -cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} limits -m 20m ${MAKE} ${_MAKE_JOBS} check .endif .include <bsd.port.mk> diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo index 624425b09ce4..e7fc94343e61 100644 --- a/graphics/ImageMagick/distinfo +++ b/graphics/ImageMagick/distinfo @@ -1,2 +1,2 @@ -SHA256 (ImageMagick-6.9.1-4.tar.xz) = 74973478058069ce44040ff76b61df713d70adcadfd207836cc0622cadf1e4bf -SIZE (ImageMagick-6.9.1-4.tar.xz) = 7978216 +SHA256 (ImageMagick-6.9.1-6.tar.xz) = 8d83934df129833f9e8696017182d8bbca8189842bbd2705c24729fed8db3358 +SIZE (ImageMagick-6.9.1-6.tar.xz) = 8276660 |