Date: Sun, 11 May 2008 11:46:10 -0400 From: Mikhail Teterin <mi+kde@aldan.algebra.com> To: anray@FreeBSD.org, gnome@FreeBSD.org, kde@FreeBSD.org, koutek@o-k.cz, thierry@FreeBSD.org Cc: portmgr@FreeBSD.org, Bob Friesenhahn <bfriesen@simple.dallas.tx.us> Subject: heads up: updating GraphicsMagick Message-ID: <200805111146.11559@aldan>
next in thread | raw e-mail | index | archive | help
--Boundary-00=_DTxJIPM+R2zpCjp
Content-Type: text/plain;
charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Hello!
I intend to update the GraphicsMagick port with the attached diff in a few
days. Among other things, it ups the shared-library versions and may
otherwise affect your ports.
Please, let me know, if anything is blatantly wrong or forever hold your
peace. Thanks! Yours,
-mi
P.S. Gnome and KDE teams! It seems, your ports require /both/ ImageMagick and
GraphicsMagick. Considering, that the two packages are two prongs of the same
fork, you may wish to look into making your stuff use only one of them...
--Boundary-00=_DTxJIPM+R2zpCjp
Content-Type: text/x-diff;
charset="us-ascii";
name="GM-update.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="GM-update.diff"
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/GraphicsMagick/Makefile,v
retrieving revision 1.18
diff -U2 -r1.18 Makefile
--- Makefile 29 Apr 2008 00:52:06 -0000 1.18
+++ Makefile 11 May 2008 15:41:11 -0000
@@ -7,9 +7,10 @@
PORTNAME= GraphicsMagick
-PORTVERSION= 1.1.12
+PORTVERSION= 1.2.1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
- ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/
+ ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/${PORTVERSION:R}/
MASTER_SITE_SUBDIR= ${PORTNAME:L}
+EXTRACT_SUFX= .tar.lzma
MAINTAINER= mi@aldan.algebra.com
@@ -23,11 +24,11 @@
OTHERGRAPHICS= jasper jpeg lcms png tiff
LIB_DEPENDS+= ${OTHERGRAPHICS:C|(.+)|\1:${PORTSDIR}/graphics/\1|}
+EXTRACT_DEPENDS=lzcat:${PORTSDIR}/archivers/lzmautils
OPTIONS= Q8BIT "Use 8-bit pixels (speed) instead of 16 (quality)" off
OPTIONS+= TESTS "Run bundled self-tests after build" on
-
+EXTRACT_CMD= ${LOCALBASE}/bin/lzcat
USE_ICONV= yes
-USE_AUTOTOOLS= libtool:15
-USE_BZIP2= yes
+#USE_AUTOTOOLS= libtool:15
USE_GHOSTSCRIPT=yes
GNU_CONFIGURE= yes
@@ -47,5 +48,5 @@
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --without-perl --enable-shared --enable-static \
- --without-threads
+ --without-threads --with-fpx
USE_LDCONFIG= yes
@@ -65,4 +66,9 @@
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check
+post-configure:
+ ${REINPLACE_CMD} -e 's,docdir =.*,docdir=${DOCSDIR},' \
+ -e 's,pkgconfigdir =.*,pkgconfigdir=${PREFIX}/libdata/pkgconfig,' \
+ ${WRKSRC}/Makefile
+
.include <bsd.port.pre.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/graphics/GraphicsMagick/distinfo,v
retrieving revision 1.6
diff -U2 -r1.6 distinfo
--- distinfo 29 Apr 2008 00:52:06 -0000 1.6
+++ distinfo 11 May 2008 15:41:11 -0000
@@ -1,3 +1,3 @@
-MD5 (GraphicsMagick-1.1.12.tar.bz2) = 07653ae3d22a79786e637202a0532a95
-SHA256 (GraphicsMagick-1.1.12.tar.bz2) = 50e2a96cccad84e7eb5dfa277d3b68055e154f32a8d00d81acd072ba91a1a92e
-SIZE (GraphicsMagick-1.1.12.tar.bz2) = 5034822
+MD5 (GraphicsMagick-1.2.1.tar.lzma) = 1fea4c69922e224455ef660a14c1062b
+SHA256 (GraphicsMagick-1.2.1.tar.lzma) = 000203a17e5e4857aee49e567a91ac0e4d883edeb2d1429d62b643dbed203870
+SIZE (GraphicsMagick-1.2.1.tar.lzma) = 4160040
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/graphics/GraphicsMagick/pkg-plist,v
retrieving revision 1.5
diff -U2 -r1.5 pkg-plist
--- pkg-plist 29 Apr 2008 12:25:08 -0000 1.5
+++ pkg-plist 11 May 2008 15:41:11 -0000
@@ -20,7 +20,7 @@
include/GraphicsMagick/magick/attribute.h
include/GraphicsMagick/magick/blob.h
-include/GraphicsMagick/magick/cache.h
-include/GraphicsMagick/magick/cache_view.h
+include/GraphicsMagick/magick/channel.h
include/GraphicsMagick/magick/color.h
+include/GraphicsMagick/magick/colorspace.h
include/GraphicsMagick/magick/command.h
include/GraphicsMagick/magick/composite.h
@@ -34,4 +34,5 @@
include/GraphicsMagick/magick/enhance.h
include/GraphicsMagick/magick/error.h
+include/GraphicsMagick/magick/forward.h
include/GraphicsMagick/magick/fx.h
include/GraphicsMagick/magick/gem.h
@@ -43,8 +44,11 @@
include/GraphicsMagick/magick/magick_config.h
include/GraphicsMagick/magick/magick_types.h
+include/GraphicsMagick/magick/memory.h
include/GraphicsMagick/magick/module.h
include/GraphicsMagick/magick/monitor.h
include/GraphicsMagick/magick/montage.h
+include/GraphicsMagick/magick/operator.h
include/GraphicsMagick/magick/paint.h
+include/GraphicsMagick/magick/pixel_cache.h
include/GraphicsMagick/magick/profile.h
include/GraphicsMagick/magick/quantize.h
@@ -55,5 +59,4 @@
include/GraphicsMagick/magick/shear.h
include/GraphicsMagick/magick/signature.h
-include/GraphicsMagick/magick/stream.h
include/GraphicsMagick/magick/symbols.h
include/GraphicsMagick/magick/timer.h
@@ -67,5 +70,4 @@
include/GraphicsMagick/wand/pixel_wand.h
include/GraphicsMagick/wand/wand_api.h
-%%DATADIR%%/Copyright.txt
%%DATADIR%%/config/colors.mgk
%%DATADIR%%/config/delegates.mgk
@@ -80,13 +82,13 @@
lib/libGraphicsMagick++.la
lib/libGraphicsMagick++.so
-lib/libGraphicsMagick++.so.1
+lib/libGraphicsMagick++.so.2
lib/libGraphicsMagick.a
lib/libGraphicsMagick.la
lib/libGraphicsMagick.so
-lib/libGraphicsMagick.so.1
+lib/libGraphicsMagick.so.2
lib/libGraphicsMagickWand.a
lib/libGraphicsMagickWand.la
lib/libGraphicsMagickWand.so
-lib/libGraphicsMagickWand.so.0
+lib/libGraphicsMagickWand.so.1
libdata/pkgconfig/GraphicsMagick++.pc
libdata/pkgconfig/GraphicsMagick.pc
@@ -99,4 +101,7 @@
@comment lib/GraphicsMagick-%%PORTVERSION%%/modules-%%Q%%/coders
@comment lib/GraphicsMagick-%%PORTVERSION%%/modules-%%Q%%/filters
+%%PORTDOCS%%%%DOCSDIR%%/Copyright.txt
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS.txt
%%PORTDOCS%%%%DOCSDIR%%/images/ball.png
%%PORTDOCS%%%%DOCSDIR%%/images/corbis.png
@@ -113,4 +118,7 @@
%%PORTDOCS%%%%DOCSDIR%%/index.html
%%PORTDOCS%%%%DOCSDIR%%/www/AUTHORS.html
+%%PORTDOCS%%%%DOCSDIR%%/www/BENCHMARKS.html
+%%PORTDOCS%%%%DOCSDIR%%/www/BUGS.html
+%%PORTDOCS%%%%DOCSDIR%%/www/PLATFORMS.html
%%PORTDOCS%%%%DOCSDIR%%/www/Changelog.html
%%PORTDOCS%%%%DOCSDIR%%/www/Copyright.html
@@ -167,6 +175,5 @@
%%PORTDOCS%%%%DOCSDIR%%/www/api/attribute.html
%%PORTDOCS%%%%DOCSDIR%%/www/api/blob.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/cache.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/cache_view.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/channel.html
%%PORTDOCS%%%%DOCSDIR%%/www/api/color.html
%%PORTDOCS%%%%DOCSDIR%%/www/api/composite.html
@@ -186,5 +193,7 @@
%%PORTDOCS%%%%DOCSDIR%%/www/api/monitor.html
%%PORTDOCS%%%%DOCSDIR%%/www/api/montage.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/operator.html
%%PORTDOCS%%%%DOCSDIR%%/www/api/paint.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/pixel_cache.html
%%PORTDOCS%%%%DOCSDIR%%/www/api/profile.html
%%PORTDOCS%%%%DOCSDIR%%/www/api/quantize.html
@@ -196,10 +205,8 @@
%%PORTDOCS%%%%DOCSDIR%%/www/api/shear.html
%%PORTDOCS%%%%DOCSDIR%%/www/api/signature.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/stream.html
%%PORTDOCS%%%%DOCSDIR%%/www/api/transform.html
%%PORTDOCS%%%%DOCSDIR%%/www/api/types.html
%%PORTDOCS%%%%DOCSDIR%%/www/api/widget.html
%%PORTDOCS%%%%DOCSDIR%%/www/body.html
-%%PORTDOCS%%%%DOCSDIR%%/www/books.html
%%PORTDOCS%%%%DOCSDIR%%/www/color.html
%%PORTDOCS%%%%DOCSDIR%%/www/composite.html
@@ -217,5 +224,4 @@
%%PORTDOCS%%%%DOCSDIR%%/www/import.html
%%PORTDOCS%%%%DOCSDIR%%/www/index.html
-%%PORTDOCS%%%%DOCSDIR%%/www/install.html
%%PORTDOCS%%%%DOCSDIR%%/www/links.html
%%PORTDOCS%%%%DOCSDIR%%/www/magick.css
@@ -224,4 +230,5 @@
%%PORTDOCS%%%%DOCSDIR%%/www/mogrify.html
%%PORTDOCS%%%%DOCSDIR%%/www/montage.html
+%%PORTDOCS%%%%DOCSDIR%%/www/motion-picture.html
%%PORTDOCS%%%%DOCSDIR%%/www/perl.html
%%PORTDOCS%%%%DOCSDIR%%/www/programming.html
@@ -230,5 +237,4 @@
%%PORTDOCS%%%%DOCSDIR%%/www/tools.html
%%PORTDOCS%%%%DOCSDIR%%/www/utilities.html
-%%PORTDOCS%%%%DOCSDIR%%/www/windows.html
%%PORTDOCS%%@dirrm %%DOCSDIR%%/www/api
%%PORTDOCS%%@dirrm %%DOCSDIR%%/www/Magick++
Index: files/patch-Makefile.in
===================================================================
RCS file: files/patch-Makefile.in
diff -N files/patch-Makefile.in
--- files/patch-Makefile.in 2 Nov 2007 14:50:52 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,89 +0,0 @@
---- Makefile.in Fri Mar 18 19:36:21 2005
-+++ Makefile.in Sun Jul 24 18:21:35 2005
-@@ -466,5 +466,5 @@
-
- # Install HTML files
--pkgdocdir = @MagickSharePath@
-+pkgdocdir = ${DATA_DIR}/doc/GraphicsMagick
- DOCDIRS = images www www/api www/Magick++
- @WITH_PERL_TRUE@PERLMAGICK = PerlMagick
-@@ -1079,5 +1079,5 @@
-
- # Install arch-independent package data
--install-data-local: install-data-html
-+install-data-local:
-
- # Uninstall arch-independent package data
---- coders/Makefile.in Fri Mar 18 19:36:16 2005
-+++ coders/Makefile.in Sun Jul 24 19:22:21 2005
-@@ -1479,5 +1479,5 @@
- install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-- test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-+ test -z "$(pkgdir)" -o -z "$(pkg_LTLIBRARIES)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
- @list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-@@ -1825,5 +1825,5 @@
- install-pkgDATA: $(pkg_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-+ test -z "$(pkgdir)" -o -z '$(pkg_DATA)' || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
- @list='$(pkg_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-@@ -1842,5 +1842,5 @@
- install-pkgdataDATA: $(pkgdata_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
-+ test -z "$(pkgdatadir)" -o -z '$(pkgdata_DATA)' || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
---- filters/Makefile.in Fri Mar 18 19:36:17 2005
-+++ filters/Makefile.in Sun Jul 24 19:23:33 2005
-@@ -522,5 +522,5 @@
- install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-- test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-+ test -z "$(pkgdir)" -o -z '$(pkg_LTLIBRARIES)' || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
- @list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-@@ -592,5 +592,5 @@
- install-pkgDATA: $(pkg_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-+ test -z "$(pkgdir)" -o -z '$(pkg_DATA)' || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
- @list='$(pkg_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
---- magick/Makefile.in Fri Mar 18 19:36:18 2005
-+++ magick/Makefile.in Tue Jul 26 21:05:48 2005
-@@ -664,5 +664,5 @@
-
- # Pkgconfig directory
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
-
- # Files to install in Pkgconfig directory
-@@ -930,5 +930,5 @@
- install-pkgDATA: $(pkg_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-+ test -z "$(pkgdir)" -o -z '$(pkg_DATA)' || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
- @list='$(pkg_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
---- Magick++/lib/Makefile.in Fri Mar 18 19:36:13 2005
-+++ Magick++/lib/Makefile.in Tue Jul 26 21:37:39 2005
-@@ -453,5 +453,5 @@
-
- # Pkgconfig directory
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
-
- # Files to install in Pkgconfig directory
---- wand/Makefile.in Fri Mar 18 19:36:20 2005
-+++ wand/Makefile.in Tue Jul 26 21:38:43 2005
-@@ -478,5 +478,5 @@
-
- # Pkgconfig directory
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
-
- # Files to install in Pkgconfig directory
Index: files/patch-newfpx
===================================================================
RCS file: files/patch-newfpx
diff -N files/patch-newfpx
--- files/patch-newfpx 2 Nov 2007 14:50:52 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
---- coders/fpx.c 2004-04-14 18:45:28.000000000 -0400
-+++ coders/fpx.c 2007-11-01 23:30:18.000000000 -0500
-@@ -182,13 +182,13 @@
- unsigned int
- status,
-- subimage;
--
-- unsigned long
-+ subimage,
- height,
-- memory_limit,
- tile_width,
- tile_height,
- width;
-
-+ size_t
-+ memory_limit;
-+
- /*
- Open image.
--Boundary-00=_DTxJIPM+R2zpCjp--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200805111146.11559>