diff options
| author | rakuco <rakuco@FreeBSD.org> | 2014-01-07 08:23:34 +0800 |
|---|---|---|
| committer | rakuco <rakuco@FreeBSD.org> | 2014-01-07 08:23:34 +0800 |
| commit | 5654a532596d02f8085c20a43901592a7b7d62d8 (patch) | |
| tree | afb11d6a480d4e1885056baa3e919f23d2d97f9b /graphics/ImageMagick/Makefile | |
| parent | 9802a17315d9d9befec898dfa7e3cd660f74bfa7 (diff) | |
| download | freebsd-ports-graphics-5654a532596d02f8085c20a43901592a7b7d62d8.tar.gz freebsd-ports-graphics-5654a532596d02f8085c20a43901592a7b7d62d8.tar.zst freebsd-ports-graphics-5654a532596d02f8085c20a43901592a7b7d62d8.zip | |
Go back to 6.8.0 :(
This reverts r338918, r338948, r338951 and r338953 (modulo reassigning the
port to ports@, some comment fixes and the removal of a patch that was meant
for FreeBSD 7).
ImageMagick is normally a beast to update, and somewhere between 6.8.0 and
6.8.8 the developers also decided to change the naming scheme for their
libraries, which requires updating tons of ports in the tree and bumping a
lot of PORTREVISIONs. I do not have the time for that at the moment, so it's
safer to go back to what was working and let a braver soul handle the update
properly later, otherwise the tree will be on fire for quite a while.
ache: I'm truly sorry for reverting your PerlMagick commits, but I couldn't
test if they still worked with the older version in a timely fashion.
Diffstat (limited to 'graphics/ImageMagick/Makefile')
| -rw-r--r-- | graphics/ImageMagick/Makefile | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index c0d30768410..5b984fa48c6 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,8 +1,9 @@ # $FreeBSD$ PORTNAME= ImageMagick -#PORTREVISION= 1 -DISTVERSION= 6.8.8-1 +DISTVERSION= 6.8.0-7 +PORTREVISION= 3 +PORTEPOCH= 1 CATEGORIES= graphics perl5 MASTER_SITES= http://www.imagemagick.org/download/ \ http://servingzone.com/mirrors/ImageMagick/ \ @@ -34,16 +35,14 @@ LICENSE= APACHE20 USES= pkgconfig:both pathfix perl5 USE_XZ= yes -USE_PERL5= run build patch install +USE_PERL5= run build patch WANT_GNOME= yes USE_AUTOTOOLS= libltdl NO_STAGE= yes # For some reason, using our libtool breaks the build into pieces: #USE_AUTOTOOLS+= libtool GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-shared \ - --without-dps \ - --without-lcms +CONFIGURE_ARGS= --enable-shared --without-dps --without-lcms USE_GMAKE= yes USE_LDCONFIG= yes @@ -62,9 +61,8 @@ OPTIONS_DEFINE= 16BIT_PIXEL BZIP2 DOCS DJVU FFTW FONTCONFIG FPX FREETYPE \ OPENEXR OPENMP PANGO PDF PERL PNG SVG TESTS TIFF WEBP WMF \ THREADS OPTIONS_DEFAULT= 16BIT_PIXEL BZIP2 FFTW FONTCONFIG FPX FREETYPE \ - JASPER JBIG JPEG LCMS2 LZMA LQR MODULES PDF PERL PNG SVG TIFF \ - WEBP WMF THREADS - + JASPER JBIG JPEG LCMS2 LZMA LQR MODULES PDF PERL PNG SVG \ + TIFF WEBP WMF 16BIT_PIXEL_DESC= 16bit pixel support DJVU_DESC= DJVU format support (needs THREADS) GSLIB_DESC= libgs (Postscript SHLIB) support @@ -406,10 +404,6 @@ post-patch: ${WRKSRC}/${i} . endfor .endif -.if ${PORT_OPTIONS:MPERL} - ${REINPLACE_CMD} -e "s|LIBS_magick = '|LIBS_magick = '-L${LOCALBASE}/lib/perl5/${PERL_VER}/mach/CORE |" \ - ${WRKSRC}/PerlMagick/Makefile.PL.in -.endif # deprecated gvCleanup @${REINPLACE_CMD} -e "s|gvCleanup|gvFreeContext|g" \ ${WRKSRC}/coders/dot.c |