svn commit: r338965 - in head/graphics/ImageMagick: . files
Raphael Kubo da Costa
rakuco at FreeBSD.org
Tue Jan 7 00:23:36 UTC 2014
Author: rakuco
Date: Tue Jan 7 00:23:34 2014
New Revision: 338965
URL: http://svnweb.freebsd.org/changeset/ports/338965
Log:
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.
Deleted:
head/graphics/ImageMagick/files/patch-PerlMagick-Makefile.PL.in
Modified:
head/graphics/ImageMagick/Makefile
head/graphics/ImageMagick/distinfo
head/graphics/ImageMagick/files/patch-configure
head/graphics/ImageMagick/pkg-plist
Modified: head/graphics/ImageMagick/Makefile
==============================================================================
--- head/graphics/ImageMagick/Makefile Tue Jan 7 00:23:31 2014 (r338964)
+++ head/graphics/ImageMagick/Makefile Tue Jan 7 00:23:34 2014 (r338965)
@@ -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 D
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
Modified: head/graphics/ImageMagick/distinfo
==============================================================================
--- head/graphics/ImageMagick/distinfo Tue Jan 7 00:23:31 2014 (r338964)
+++ head/graphics/ImageMagick/distinfo Tue Jan 7 00:23:34 2014 (r338965)
@@ -1,2 +1,2 @@
-SHA256 (ImageMagick-6.8.8-1.tar.xz) = 1ce766720e07c61a9993c3c226425d8b1b7a18fd8ffb1841c2380a7d622c107b
-SIZE (ImageMagick-6.8.8-1.tar.xz) = 7527812
+SHA256 (ImageMagick-6.8.0-7.tar.xz) = e15672c8c11148bcfcd95885e1cd7a5575d4a6984bdf0a3a1c718a2a6ad37435
+SIZE (ImageMagick-6.8.0-7.tar.xz) = 8245624
Modified: head/graphics/ImageMagick/files/patch-configure
==============================================================================
--- head/graphics/ImageMagick/files/patch-configure Tue Jan 7 00:23:31 2014 (r338964)
+++ head/graphics/ImageMagick/files/patch-configure Tue Jan 7 00:23:34 2014 (r338965)
@@ -1,38 +1,11 @@
---- configure.bak 2014-01-04 06:01:26.000000000 +0000
-+++ configure 2014-01-04 06:14:09.000000000 +0000
-@@ -32502,7 +32502,7 @@
- #
-
- # Path to ImageMagick header files
--INCLUDE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}"
-+INCLUDE_RELATIVE_PATH="${PACKAGE_NAME}"
- INCLUDE_PATH="${INCLUDE_DIR}/${INCLUDE_RELATIVE_PATH}"
- DEFINE_INCLUDE_PATH="${INCLUDE_DIR}/${INCLUDE_RELATIVE_PATH}/"
- case "${build_os}" in
-@@ -32656,7 +32656,7 @@
+--- configure.orig 2012-05-16 09:58:45.571776589 +0200
++++ configure 2012-05-16 09:58:54.042776583 +0200
+@@ -32626,7 +32626,7 @@
#
# Path to ImageMagick documentation files
--DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}"
+-DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
+DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}"
DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}"
DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/"
case "${build_os}" in
-@@ -32672,7 +32672,7 @@
-
-
- # Subdirectory to place architecture-dependent configuration files
--CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}"
-+CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}"
-
- cat >>confdefs.h <<_ACEOF
- #define CONFIGURE_RELATIVE_PATH "$CONFIGURE_RELATIVE_PATH"
-@@ -32693,7 +32693,7 @@
-
-
- # Subdirectory to place architecture-independent configuration files
--SHARE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}"
-+SHARE_RELATIVE_PATH="${PACKAGE_NAME}"
-
- cat >>confdefs.h <<_ACEOF
- #define SHARE_RELATIVE_PATH "$SHARE_RELATIVE_PATH"
Modified: head/graphics/ImageMagick/pkg-plist
==============================================================================
--- head/graphics/ImageMagick/pkg-plist Tue Jan 7 00:23:31 2014 (r338964)
+++ head/graphics/ImageMagick/pkg-plist Tue Jan 7 00:23:34 2014 (r338965)
@@ -133,10 +133,6 @@ include/ImageMagick/magick/version.h
include/ImageMagick/magick/widget.h
include/ImageMagick/magick/xml-tree.h
include/ImageMagick/magick/xwindow.h
-include/ImageMagick/magick/studio.h
-include/ImageMagick/magick/opencl.h
-include/ImageMagick/magick/distribute-cache.h
-include/ImageMagick/magick/magick-baseconfig.h
include/ImageMagick/wand/MagickWand.h
include/ImageMagick/wand/deprecate.h
include/ImageMagick/wand/drawing-wand.h
@@ -159,7 +155,7 @@ include/ImageMagick/wand/pixel-iterator.
include/ImageMagick/wand/pixel-wand.h
include/ImageMagick/wand/stream.h
include/ImageMagick/wand/wand-view.h
-lib/ImageMagick-%%PORTVERSION%%/config-%%QBIT%%/configure.xml
+lib/ImageMagick-%%PORTVERSION%%/config/configure.xml
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/.keep
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/aai.la
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/aai.so
@@ -395,49 +391,35 @@ lib/ImageMagick-%%PORTVERSION%%/config-%
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/ycbcr.so
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/yuv.la
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/yuv.so
-%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/rgf.so
-%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/rgf.la
-%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/mask.so
-%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/mask.la
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters/.keep
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters/analyze.la
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters/analyze.so
-lib/libMagick++-6.%%QBIT%%.a
-lib/libMagick++-6.%%QBIT%%.la
-lib/libMagick++-6.%%QBIT%%.so
-lib/libMagick++-6.%%QBIT%%.so.3
-lib/libMagickCore-6.%%QBIT%%.a
-lib/libMagickCore-6.%%QBIT%%.la
-lib/libMagickCore-6.%%QBIT%%.so
-lib/libMagickCore-6.%%QBIT%%.so.1
-lib/libMagickWand-6.%%QBIT%%.a
-lib/libMagickWand-6.%%QBIT%%.la
-lib/libMagickWand-6.%%QBIT%%.so
-lib/libMagickWand-6.%%QBIT%%.so.1
-libdata/pkgconfig/ImageMagick++-6.%%QBIT%%.pc
+lib/libMagick++.a
+lib/libMagick++.la
+lib/libMagick++.so
+lib/libMagick++.so.6
+lib/libMagickCore.a
+lib/libMagickCore.la
+lib/libMagickCore.so
+lib/libMagickCore.so.6
+lib/libMagickWand.a
+lib/libMagickWand.la
+lib/libMagickWand.so
+lib/libMagickWand.so.6
libdata/pkgconfig/ImageMagick++.pc
-libdata/pkgconfig/Magick++-6.%%QBIT%%.pc
libdata/pkgconfig/Magick++.pc
-libdata/pkgconfig/ImageMagick-6.%%QBIT%%.pc
libdata/pkgconfig/ImageMagick.pc
-libdata/pkgconfig/MagickCore-6.%%QBIT%%.pc
libdata/pkgconfig/MagickCore.pc
-libdata/pkgconfig/MagickWand-6.%%QBIT%%.pc
libdata/pkgconfig/MagickWand.pc
-libdata/pkgconfig/Wand-6.%%QBIT%%.pc
libdata/pkgconfig/Wand.pc
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Image/Magick.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Image/Magick/%%QBIT%%.pm
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/.packlist
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/Magick.bs
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/Magick.so
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/autosplit.ix
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/%%QBIT%%/%%QBIT%%.bs
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/%%QBIT%%/%%QBIT%%.so
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/%%QBIT%%/autosplit.ix
-%%DATADIR%%/english.xml
-%%DATADIR%%/francais.xml
-%%DATADIR%%/locale.xml
+%%DATADIR%%-%%PORTVERSION%%/english.xml
+%%DATADIR%%-%%PORTVERSION%%/francais.xml
+%%DATADIR%%-%%PORTVERSION%%/locale.xml
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/NEWS.txt
@@ -592,13 +574,7 @@ libdata/pkgconfig/Wand.pc
%%PORTDOCS%%%%DOCSDIR%%/www/advanced-unix-installation.html
%%PORTDOCS%%%%DOCSDIR%%/www/advanced-windows-installation.html
%%PORTDOCS%%%%DOCSDIR%%/www/animate.html
-%%PORTDOCS%%%%DOCSDIR%%/www/openmp.html
-%%PORTDOCS%%%%DOCSDIR%%/www/webp.html
-%%PORTDOCS%%%%DOCSDIR%%/www/distribute-pixel-cache.html
-%%PORTDOCS%%%%DOCSDIR%%/www/color-management.html
-%%PORTDOCS%%%%DOCSDIR%%/www/support.html
%%PORTDOCS%%%%DOCSDIR%%/www/api.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/mime.html
%%PORTDOCS%%%%DOCSDIR%%/www/api/MagickCore/ImageMagick_8h-source.html
%%PORTDOCS%%%%DOCSDIR%%/www/api/MagickCore/ImageMagick_8h.html
%%PORTDOCS%%%%DOCSDIR%%/www/api/MagickCore/MagickCore_8h-source.html
@@ -1352,6 +1328,7 @@ libdata/pkgconfig/Wand.pc
%%PORTDOCS%%%%DOCSDIR%%/www/api/morphology.html
%%PORTDOCS%%%%DOCSDIR%%/www/api/paint.html
%%PORTDOCS%%%%DOCSDIR%%/www/api/pixel-iterator.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/pixel-view.html
%%PORTDOCS%%%%DOCSDIR%%/www/api/pixel-wand.html
%%PORTDOCS%%%%DOCSDIR%%/www/api/profile.html
%%PORTDOCS%%%%DOCSDIR%%/www/api/property.html
@@ -1371,6 +1348,7 @@ libdata/pkgconfig/Wand.pc
%%PORTDOCS%%%%DOCSDIR%%/www/architecture.html
%%PORTDOCS%%%%DOCSDIR%%/www/binary-releases.html
%%PORTDOCS%%%%DOCSDIR%%/www/changelog.html
+%%PORTDOCS%%%%DOCSDIR%%/www/channel.html
%%PORTDOCS%%%%DOCSDIR%%/www/cipher.html
%%PORTDOCS%%%%DOCSDIR%%/www/color.html
%%PORTDOCS%%%%DOCSDIR%%/www/command-line-options.html
@@ -1406,9 +1384,11 @@ libdata/pkgconfig/Wand.pc
%%PORTDOCS%%%%DOCSDIR%%/www/magick-wand.html
%%PORTDOCS%%%%DOCSDIR%%/www/magick.css
%%PORTDOCS%%%%DOCSDIR%%/www/miff.html
+%%PORTDOCS%%%%DOCSDIR%%/www/mirrors.html
%%PORTDOCS%%%%DOCSDIR%%/www/mogrify.html
%%PORTDOCS%%%%DOCSDIR%%/www/montage.html
%%PORTDOCS%%%%DOCSDIR%%/www/motion-picture.html
+%%PORTDOCS%%%%DOCSDIR%%/www/parallel.html
%%PORTDOCS%%%%DOCSDIR%%/www/perl-magick.html
%%PORTDOCS%%%%DOCSDIR%%/www/porting.html
%%PORTDOCS%%%%DOCSDIR%%/www/quantize.html
@@ -1429,6 +1409,7 @@ libdata/pkgconfig/Wand.pc
%%PORTDOCS%%%%DOCSDIR%%/www/source/locale.xml
%%PORTDOCS%%%%DOCSDIR%%/www/source/log.xml
%%PORTDOCS%%%%DOCSDIR%%/www/source/magic.xml
+%%PORTDOCS%%%%DOCSDIR%%/www/source/mgk.c
%%PORTDOCS%%%%DOCSDIR%%/www/source/mime.xml
%%PORTDOCS%%%%DOCSDIR%%/www/source/piechart.mvg
%%PORTDOCS%%%%DOCSDIR%%/www/source/piechart.svg
@@ -1452,16 +1433,14 @@ libdata/pkgconfig/Wand.pc
%%PORTDOCS%%@dirrm %%DOCSDIR%%/images/patterns
%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
%%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm %%DATADIR%%
-%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/%%QBIT%%
+ at dirrm %%DATADIR%%-%%PORTVERSION%%
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick
%%WITH_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image
-%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Image/Magick
%%WITH_PERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Image
@dirrmtry lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters
@dirrmtry lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders
@dirrmtry lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%
- at dirrmtry lib/ImageMagick-%%PORTVERSION%%/config-%%QBIT%%
+ at dirrmtry lib/ImageMagick-%%PORTVERSION%%/config
@dirrmtry lib/ImageMagick-%%PORTVERSION%%
@dirrm include/ImageMagick/wand
@dirrm include/ImageMagick/magick
More information about the svn-ports-all
mailing list