diff options
author | Dmitry Sivachenko <demon@FreeBSD.org> | 2003-02-24 16:29:41 +0000 |
---|---|---|
committer | Dmitry Sivachenko <demon@FreeBSD.org> | 2003-02-24 16:29:41 +0000 |
commit | eafeb8df84aca7e62337852172f62986f315bbe7 (patch) | |
tree | 92a6c97ddabae5db223ed48f2ef527b2cb8470d0 /graphics | |
parent | - fix the file permission problem by running the ${FPSETPERM} script (diff) |
Update to version 5.5.5.
Notes
Notes:
svn path=/head/; revision=76405
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/ImageMagick/Makefile | 9 | ||||
-rw-r--r-- | graphics/ImageMagick/distinfo | 2 | ||||
-rw-r--r-- | graphics/ImageMagick/files/patch-Magick++::lib::Makefile.in | 9 | ||||
-rw-r--r-- | graphics/ImageMagick/files/patch-configure | 9 | ||||
-rw-r--r-- | graphics/ImageMagick/files/patch-magick::Makefile.in | 9 | ||||
-rw-r--r-- | graphics/ImageMagick/pkg-plist | 21 |
6 files changed, 28 insertions, 31 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index f584afe6930b..f0d0273360f1 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -6,7 +6,7 @@ # PORTNAME= ImageMagick -PORTVERSION= 5.5.1.4 +PORTVERSION= 5.5.5 CATEGORIES= graphics perl5 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://imagemagick.sourceforge.net/http/ \ @@ -25,7 +25,6 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ ftp://ftp.fifi.org/pub/%SUBDIR%/ \ ftp://ftp.simplesystems.org/pub/%SUBDIR%/ MASTER_SITE_SUBDIR= ${PORTNAME:L} ${PORTNAME} -DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E} MAINTAINER= ports@FreeBSD.org COMMENT= Image processing tools (interactive optional--misc/display conflict) @@ -41,13 +40,9 @@ LIB_DEPENDS= jasper.4:${PORTSDIR}/graphics/jasper \ tiff.4:${PORTSDIR}/graphics/tiff \ freetype.9:${PORTSDIR}/print/freetype2 \ xml2.5:${PORTSDIR}/textproc/libxml2 -.if !exists(/usr/bin/bzip2) -LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 -.endif - -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} USE_PERL5= yes +USE_BZIP2= yes USE_GMAKE= yes USE_LIBTOOL= yes LIBTOOLFLAGS= # none diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo index ac254d099c97..031f2cbec8ca 100644 --- a/graphics/ImageMagick/distinfo +++ b/graphics/ImageMagick/distinfo @@ -1 +1 @@ -MD5 (ImageMagick-5.5.1-4.tar.gz) = cba70ca3739427dca103694b93386866 +MD5 (ImageMagick-5.5.5.tar.bz2) = ab2b7cc4fa0dd6f86e3c0e12a8ac61dd diff --git a/graphics/ImageMagick/files/patch-Magick++::lib::Makefile.in b/graphics/ImageMagick/files/patch-Magick++::lib::Makefile.in index 5316532ae39b..32f94d3b214b 100644 --- a/graphics/ImageMagick/files/patch-Magick++::lib::Makefile.in +++ b/graphics/ImageMagick/files/patch-Magick++::lib::Makefile.in @@ -1,10 +1,11 @@ ---- Magick++/lib/Makefile.in.orig Mon Oct 28 20:47:18 2002 -+++ Magick++/lib/Makefile.in Mon Oct 28 20:47:34 2002 -@@ -337,7 +337,7 @@ +--- Magick++/lib/Makefile.in.orig Mon Feb 24 15:03:18 2003 ++++ Magick++/lib/Makefile.in Mon Feb 24 15:07:51 2003 +@@ -331,8 +331,7 @@ # Add -no-undefined once Cygwin supports throwing C++ exceptions from DLLs. libMagick___la_LDFLAGS = \ -- -release $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION) +- -release $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)-Q$(QuantumDepth) \ +- -version-info 0:0:0 + -version-info $(MAJOR_VERSION):$(MINOR_VERSION):$(MICRO_VERSION) diff --git a/graphics/ImageMagick/files/patch-configure b/graphics/ImageMagick/files/patch-configure index 77bf61c3c286..c96390c296d5 100644 --- a/graphics/ImageMagick/files/patch-configure +++ b/graphics/ImageMagick/files/patch-configure @@ -8,12 +8,3 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -25601,7 +25602,7 @@ - freetype_prefix=`freetype-config --prefix` - freetype_exec_prefix=`freetype-config --exec-prefix` - LDFLAGS="$LDFLAGS -L${freetype_exec_prefix}/lib" -- CPPFLAGS="$CPPFLAGS -I${freetype_prefix}/include/freetype2" -+ CPPFLAGS="-I${freetype_prefix}/include/freetype2 $CPPFLAGS" - fi - fi - diff --git a/graphics/ImageMagick/files/patch-magick::Makefile.in b/graphics/ImageMagick/files/patch-magick::Makefile.in index f575f356ee30..733f59c88dd3 100644 --- a/graphics/ImageMagick/files/patch-magick::Makefile.in +++ b/graphics/ImageMagick/files/patch-magick::Makefile.in @@ -1,10 +1,11 @@ ---- magick/Makefile.in.orig Mon Oct 28 20:48:26 2002 -+++ magick/Makefile.in Mon Oct 28 20:48:44 2002 -@@ -359,7 +359,7 @@ +--- magick/Makefile.in.orig Mon Feb 24 15:12:11 2003 ++++ magick/Makefile.in Mon Feb 24 15:12:46 2003 +@@ -353,8 +353,7 @@ ALLMANPAGES = Magick-config.1 libMagick_la_LDFLAGS = -no-undefined \ -- -release $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION) +- -release $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)-Q$(QuantumDepth) \ +- -version-info 0:0:0 + -version-info $(MAJOR_VERSION):$(MINOR_VERSION):$(MICRO_VERSION) diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist index 385a89e095dd..00c622aa1bd1 100644 --- a/graphics/ImageMagick/pkg-plist +++ b/graphics/ImageMagick/pkg-plist @@ -43,11 +43,13 @@ include/magick/magick.h include/magick/magick_config.h include/magick/module.h include/magick/monitor.h +include/magick/paint.h include/magick/quantize.h include/magick/registry.h include/magick/render.h include/magick/resource.h include/magick/semaphore.h +include/magick/signature.h include/magick/timer.h include/magick/utility.h include/magick/version.h @@ -93,8 +95,6 @@ lib/ImageMagick/magic.mgk %%MODULES%%lib/ImageMagick/modules/coders/gradient.so %%MODULES%%lib/ImageMagick/modules/coders/gray.la %%MODULES%%lib/ImageMagick/modules/coders/gray.so -%%MODULES%%lib/ImageMagick/modules/coders/hdf.la -%%MODULES%%lib/ImageMagick/modules/coders/hdf.so %%MODULES%%lib/ImageMagick/modules/coders/histogram.la %%MODULES%%lib/ImageMagick/modules/coders/histogram.so %%MODULES%%lib/ImageMagick/modules/coders/html.la @@ -259,9 +259,10 @@ share/ImageMagick/Copyright.txt share/ImageMagick/QuickStart.txt %%PORTDOCS%%share/doc/ImageMagick/ImageMagick.html %%PORTDOCS%%share/doc/ImageMagick/images/authentica.jpg -%%PORTDOCS%%share/doc/ImageMagick/images/ball.png -%%PORTDOCS%%share/doc/ImageMagick/images/corbis.png +%%PORTDOCS%%share/doc/ImageMagick/images/background.gif +%%PORTDOCS%%share/doc/ImageMagick/images/convert.png %%PORTDOCS%%share/doc/ImageMagick/images/examples.jpg +%%PORTDOCS%%share/doc/ImageMagick/images/fade.png %%PORTDOCS%%share/doc/ImageMagick/images/home.png %%PORTDOCS%%share/doc/ImageMagick/images/logo.png %%PORTDOCS%%share/doc/ImageMagick/images/magick.png @@ -272,11 +273,17 @@ share/ImageMagick/QuickStart.txt %%PORTDOCS%%share/doc/ImageMagick/images/magick_icons.ico %%PORTDOCS%%share/doc/ImageMagick/images/magick_small.png %%PORTDOCS%%share/doc/ImageMagick/images/mail.png +%%PORTDOCS%%share/doc/ImageMagick/images/networkeleven.png %%PORTDOCS%%share/doc/ImageMagick/images/pair.png %%PORTDOCS%%share/doc/ImageMagick/images/promote.png +%%PORTDOCS%%share/doc/ImageMagick/images/right_triangle.gif %%PORTDOCS%%share/doc/ImageMagick/images/right_triangle.png %%PORTDOCS%%share/doc/ImageMagick/images/right_triangle_option.png %%PORTDOCS%%share/doc/ImageMagick/images/screen.png +%%PORTDOCS%%share/doc/ImageMagick/images/script.gif +%%PORTDOCS%%share/doc/ImageMagick/images/star.png +%%PORTDOCS%%share/doc/ImageMagick/images/top.jpg +%%PORTDOCS%%share/doc/ImageMagick/images/twi.png %%PORTDOCS%%share/doc/ImageMagick/www/Changelog.html %%PORTDOCS%%share/doc/ImageMagick/www/Copyright.html %%PORTDOCS%%share/doc/ImageMagick/www/FAQ.html @@ -332,6 +339,7 @@ share/ImageMagick/QuickStart.txt %%PORTDOCS%%share/doc/ImageMagick/www/api/composite.html %%PORTDOCS%%share/doc/ImageMagick/www/api/constitute.html %%PORTDOCS%%share/doc/ImageMagick/www/api/decorate.html +%%PORTDOCS%%share/doc/ImageMagick/www/api/deprecate.html %%PORTDOCS%%share/doc/ImageMagick/www/api/display.html %%PORTDOCS%%share/doc/ImageMagick/www/api/draw.html %%PORTDOCS%%share/doc/ImageMagick/www/api/effect.html @@ -344,6 +352,7 @@ share/ImageMagick/QuickStart.txt %%PORTDOCS%%share/doc/ImageMagick/www/api/memory.html %%PORTDOCS%%share/doc/ImageMagick/www/api/monitor.html %%PORTDOCS%%share/doc/ImageMagick/www/api/montage.html +%%PORTDOCS%%share/doc/ImageMagick/www/api/paint.html %%PORTDOCS%%share/doc/ImageMagick/www/api/quantize.html %%PORTDOCS%%share/doc/ImageMagick/www/api/registry.html %%PORTDOCS%%share/doc/ImageMagick/www/api/render.html @@ -403,8 +412,8 @@ share/ImageMagick/QuickStart.txt @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Magick @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Image -%%MODULES%%@dirrm lib/ImageMagick/modules/coders -%%MODULES%%@dirrm lib/ImageMagick/modules +@dirrm lib/ImageMagick/modules/coders +@dirrm lib/ImageMagick/modules @dirrm lib/ImageMagick @dirrm include/magick @dirrm include/Magick++ |