From glarkin@sourcehosting.net  Fri Jun  6 22:55:41 2008
Return-Path: <glarkin@sourcehosting.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 76C811065672
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  6 Jun 2008 22:55:41 +0000 (UTC)
	(envelope-from glarkin@sourcehosting.net)
Received: from mail1.sourcehosting.net (113901-app1.sourcehosting.net [72.32.213.11])
	by mx1.freebsd.org (Postfix) with ESMTP id 3DD8E8FC16
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  6 Jun 2008 22:55:41 +0000 (UTC)
	(envelope-from glarkin@sourcehosting.net)
Received: from 68-189-244-97.dhcp.oxfr.ma.charter.com ([68.189.244.97] helo=Gregory-Larkins-Computer.local)
	by mail1.sourcehosting.net with esmtp (Exim 4.69 (FreeBSD))
	(envelope-from <glarkin@sourcehosting.net>)
	id 1K4kqL-0002QE-Ed; Fri, 06 Jun 2008 18:55:40 -0400
Received: from fbsd70.entropy.prv (fbsd70.entropy.prv [192.168.1.14])
	by Gregory-Larkins-Computer.local (Postfix) with ESMTP
	id 7E0082017A0F; Fri,  6 Jun 2008 18:55:33 -0400 (EDT)
Received: from fbsd70.entropy.prv (localhost [127.0.0.1])
	by fbsd70.entropy.prv (8.14.2/8.14.2) with ESMTP id m56MrwvC084102;
	Fri, 6 Jun 2008 18:53:58 -0400 (EDT)
	(envelope-from glarkin@fbsd70.entropy.prv)
Received: (from root@localhost)
	by fbsd70.entropy.prv (8.14.2/8.14.2/Submit) id m56MrwXK084101;
	Fri, 6 Jun 2008 18:53:58 -0400 (EDT)
	(envelope-from glarkin)
Message-Id: <200806062253.m56MrwXK084101@fbsd70.entropy.prv>
Date: Fri, 6 Jun 2008 18:53:58 -0400 (EDT)
From: Greg Larkin <glarkin@sourcehosting.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: glarkin@sourcehosting.net, bfriesen@simple.dallas.tx.us
Subject: [PATCH] graphics/GraphicsMagick: update to 1.2.3, take maintainership
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         124365
>Category:       ports
>Synopsis:       [PATCH] graphics/GraphicsMagick: update to 1.2.3, take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    beech
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 06 23:00:12 UTC 2008
>Closed-Date:    Wed Jun 25 05:14:25 UTC 2008
>Last-Modified:  Mon Jul 28 22:30:01 UTC 2008
>Originator:     Greg Larkin
>Release:        FreeBSD 7.0-RELEASE i386
>Organization:
SourceHosting.net, LLC
>Environment:
System: FreeBSD fbsd70.entropy.prv 7.0-RELEASE FreeBSD 7.0-RELEASE #0: Sun Feb 24 19:59:52 UTC 2008
>Description:
- Update to 1.2.3
- Take maintainership

Added file(s):
- files/patch-configure.in

Removed file(s):
- files/patch-configure
- files/patch-magick_symbols.h
- files/patch-newfpx

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- GraphicsMagick-1.2.3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/GraphicsMagick.orig/Makefile /usr/ports/graphics/GraphicsMagick/Makefile
--- /usr/ports/graphics/GraphicsMagick.orig/Makefile	2008-05-16 17:30:00.000000000 -0400
+++ /usr/ports/graphics/GraphicsMagick/Makefile	2008-06-06 18:07:20.836766314 -0400
@@ -6,25 +6,25 @@
 #
 
 PORTNAME=	GraphicsMagick
-PORTVERSION=	1.1.12
+PORTVERSION=	1.2.3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	glarkin@sourcehosting.net
 COMMENT=	Fast image processing tools based on ImageMagick
 
 LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2	\
 		fpx.[2-9]:${PORTSDIR}/graphics/libfpx	\
 		jbig:${PORTSDIR}/graphics/jbigkit	\
 		wmflite:${PORTSDIR}/graphics/libwmf	\
-		xml2:${PORTSDIR}/textproc/libxml2
+		xml2:${PORTSDIR}/textproc/libxml2	\
+		ltdl:${PORTSDIR}/devel/libltdl15
 OTHERGRAPHICS=	jasper jpeg lcms png tiff
 LIB_DEPENDS+=	${OTHERGRAPHICS:C|(.+)|\1:${PORTSDIR}/graphics/\1|}
-OPTIONS=	Q8BIT "Use 8-bit pixels (speed) instead of 16 (quality)" off
-
-OPTIONS+=	TESTS "Run bundled self-tests after build" on
+OPTIONS=	Q8BIT "Use 8-bit pixels (speed) instead of 16 (quality)" off \
+		TESTS "Run bundled self-tests after build" on
 
 USE_ICONV=	yes
 USE_AUTOTOOLS=	libtool:15
@@ -46,13 +46,10 @@
 
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--without-perl --enable-shared --enable-static \
-		--without-threads
+		--without-threads --with-ltdl-include=${LOCALBASE}/include \
+		--with-ltdl-lib=${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
-.if defined(WITH_WINDOWS_FONT_DIR)
-CONFIGURE_ARGS+=	--with-windows-font-dir="${WINDOWS_FONT_DIR}"
-.endif
-
 ALL_TARGET=	-j`${SYSCTL} -n hw.ncpu`
 
 .if !defined(NOPORTDOCS)
@@ -66,8 +63,9 @@
 
 .include <bsd.port.pre.mk>
 
-# Perl and Tcl APIs will be installed by separate ports
-PLIST_SUB+=	WITH_PERL="@comment "
+.if defined(WITH_WINDOWS_FONT_DIR)
+CONFIGURE_ARGS+=	--with-windows-font-dir="${WINDOWS_FONT_DIR}"
+.endif
 
 .if defined(WITHOUT_X11)
 PKGNAMESUFFIX+=	-nox11
diff -ruN --exclude=CVS /usr/ports/graphics/GraphicsMagick.orig/distinfo /usr/ports/graphics/GraphicsMagick/distinfo
--- /usr/ports/graphics/GraphicsMagick.orig/distinfo	2008-04-28 20:52:06.000000000 -0400
+++ /usr/ports/graphics/GraphicsMagick/distinfo	2008-06-06 15:43:25.590852082 -0400
@@ -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.3.tar.bz2) = 6326520b005f76f6c7eae26409c9dea0
+SHA256 (GraphicsMagick-1.2.3.tar.bz2) = 0fffff1e0aded2f2f3d8c4f13bad8f5c10d54745e5a4ec584bb30f2d003787e4
+SIZE (GraphicsMagick-1.2.3.tar.bz2) = 5507918
diff -ruN --exclude=CVS /usr/ports/graphics/GraphicsMagick.orig/files/patch-Makefile.in /usr/ports/graphics/GraphicsMagick/files/patch-Makefile.in
--- /usr/ports/graphics/GraphicsMagick.orig/files/patch-Makefile.in	2007-11-02 10:50:52.000000000 -0400
+++ /usr/ports/graphics/GraphicsMagick/files/patch-Makefile.in	2008-06-06 18:41:31.605544006 -0400
@@ -1,89 +1,20 @@
---- 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 @@
+--- Makefile.in.orig	2008-05-18 17:22:51.000000000 -0400
++++ Makefile.in	2008-06-06 18:41:23.620488084 -0400
+@@ -1775,7 +1775,7 @@
+ MagickLibConfigPath = @MagickLibConfigPath@
+ MagickLibPath = @MagickLibPath@
+ MagickShareConfigPath = @MagickShareConfigPath@
+-MagickSharePath = @MagickSharePath@
++MagickSharePath = ${DATADIR}
+ MogrifyDelegate = @MogrifyDelegate@
+ NM = @NM@
+ NMEDIT = @NMEDIT@
+@@ -4382,7 +4382,7 @@
+ @WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@PERLSTATICNAME = PerlMagick
  
  # Pkgconfig directory
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
  
  # Files to install in Pkgconfig directory
+ pkgconfig_DATA = \
diff -ruN --exclude=CVS /usr/ports/graphics/GraphicsMagick.orig/files/patch-configure /usr/ports/graphics/GraphicsMagick/files/patch-configure
--- /usr/ports/graphics/GraphicsMagick.orig/files/patch-configure	2005-07-26 23:21:21.000000000 -0400
+++ /usr/ports/graphics/GraphicsMagick/files/patch-configure	1969-12-31 19:00:00.000000000 -0500
@@ -1,23 +0,0 @@
---- configure	Fri Mar 18 19:35:06 2005
-+++ configure	Tue Jul 26 22:53:50 2005
-@@ -2092,5 +2092,5 @@
- MagickLibConfigSubDir="${MagickLibSubdir}/config"
- AC_DEFINE_UNQUOTED(MagickLibConfigSubDir,"$MagickLibConfigSubDir",Subdirectory of lib where architecture-dependent configuration files live.)
--MagickLibConfigPath="${LIB_DIR}/${MagickLibConfigSubDir}"
-+MagickLibConfigPath="${DATA_DIR}/GraphicsMagick/config"
- MagickLibConfigPathDefine="${MagickLibConfigPath}/"
- if test "$native_win32_build" = 'yes'
-@@ -2130,5 +2130,5 @@
- # Path to GraphicsMagick share files
- MagickShareSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
--MagickSharePath="${DATA_DIR}/${MagickShareSubdir}"
-+MagickSharePath="${DATA_DIR}/GraphicsMagick/"
- MagickSharePathDefine="${MagickSharePath}/"
- if test "$native_win32_build" = 'yes'
-@@ -2142,5 +2142,5 @@
- MagickShareConfigSubDir="${MagickLibSubdir}/config"
- AC_DEFINE_UNQUOTED(MagickShareConfigSubDir,"$MagickShareConfigSubDir",Subdirectory of lib where architecture-independent configuration files live.)
--MagickShareConfigPath="${DATA_DIR}/${MagickShareConfigSubDir}"
-+MagickShareConfigPath="${MagickLibConfigPath}"
- MagickShareConfigPathDefine="${MagickShareConfigPath}/"
- if test "$native_win32_build" = 'yes'
diff -ruN --exclude=CVS /usr/ports/graphics/GraphicsMagick.orig/files/patch-configure.in /usr/ports/graphics/GraphicsMagick/files/patch-configure.in
--- /usr/ports/graphics/GraphicsMagick.orig/files/patch-configure.in	1969-12-31 19:00:00.000000000 -0500
+++ /usr/ports/graphics/GraphicsMagick/files/patch-configure.in	2008-06-06 18:38:06.528717999 -0400
@@ -0,0 +1,20 @@
+--- configure.orig	2008-05-18 17:22:52.000000000 -0400
++++ configure	2008-06-06 18:37:48.269146182 -0400
+@@ -37604,7 +37604,7 @@
+ #
+ 
+ # Subdirectory under lib to place GraphicsMagick lib files
+-MagickLibSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
++MagickLibSubdir="${PACKAGE_NAME}"
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define MagickLibSubdir "$MagickLibSubdir"
+@@ -37708,7 +37708,7 @@
+ 
+ #
+ # Path to GraphicsMagick share files
+-MagickShareSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
++MagickShareSubdir="${PACKAGE_NAME}"
+ MagickSharePath="${DATA_DIR}/${MagickShareSubdir}"
+ MagickSharePathDefine="${MagickSharePath}/"
+ case "${build_os}" in
diff -ruN --exclude=CVS /usr/ports/graphics/GraphicsMagick.orig/files/patch-magick_symbols.h /usr/ports/graphics/GraphicsMagick/files/patch-magick_symbols.h
--- /usr/ports/graphics/GraphicsMagick.orig/files/patch-magick_symbols.h	2007-07-16 14:30:28.000000000 -0400
+++ /usr/ports/graphics/GraphicsMagick/files/patch-magick_symbols.h	1969-12-31 19:00:00.000000000 -0500
@@ -1,19 +0,0 @@
---- magick/symbols.h.orig	Mon Jul 16 21:55:06 2007
-+++ magick/symbols.h	Mon Jul 16 21:56:04 2007
-@@ -17,6 +17,8 @@
- #if !defined(_MAGICK_SYMBOLS_H)
- #define _MAGICK_SYMBOLS_H
- 
-+#define GetToken GmGetToken
-+
- #if defined(PREFIX_MAGICK_SYMBOLS)
- #define AccessDefinition GmAccessDefinition
- #define AcquireCacheNexus GmAcquireCacheNexus
-@@ -386,7 +388,6 @@
- #define GetQuantizeInfo GmGetQuantizeInfo
- #define GetSignatureInfo GmGetSignatureInfo
- #define GetTimerInfo GmGetTimerInfo
--#define GetToken GmGetToken
- #define GetTypeInfo GmGetTypeInfo
- #define GetTypeInfoByFamily GmGetTypeInfoByFamily
- #define GetTypeList GmGetTypeList
diff -ruN --exclude=CVS /usr/ports/graphics/GraphicsMagick.orig/files/patch-newfpx /usr/ports/graphics/GraphicsMagick/files/patch-newfpx
--- /usr/ports/graphics/GraphicsMagick.orig/files/patch-newfpx	2007-11-02 10:50:52.000000000 -0400
+++ /usr/ports/graphics/GraphicsMagick/files/patch-newfpx	1969-12-31 19:00:00.000000000 -0500
@@ -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.
diff -ruN --exclude=CVS /usr/ports/graphics/GraphicsMagick.orig/pkg-plist /usr/ports/graphics/GraphicsMagick/pkg-plist
--- /usr/ports/graphics/GraphicsMagick.orig/pkg-plist	2008-04-29 08:25:08.000000000 -0400
+++ /usr/ports/graphics/GraphicsMagick/pkg-plist	2008-06-06 18:38:31.534658419 -0400
@@ -19,9 +19,9 @@
 include/GraphicsMagick/magick/api.h
 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
 include/GraphicsMagick/magick/compress.h
@@ -33,6 +33,7 @@
 include/GraphicsMagick/magick/effect.h
 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
 include/GraphicsMagick/magick/image.h
@@ -42,10 +43,13 @@
 include/GraphicsMagick/magick/magick.h
 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
 include/GraphicsMagick/magick/registry.h
@@ -54,7 +58,6 @@
 include/GraphicsMagick/magick/resource.h
 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
 include/GraphicsMagick/magick/transform.h
@@ -66,56 +69,55 @@
 include/GraphicsMagick/wand/magick_wand.h
 include/GraphicsMagick/wand/pixel_wand.h
 include/GraphicsMagick/wand/wand_api.h
-%%DATADIR%%/Copyright.txt
-%%DATADIR%%/config/colors.mgk
-%%DATADIR%%/config/delegates.mgk
-%%DATADIR%%/config/log.mgk
-%%DATADIR%%/config/magic.mgk
-%%DATADIR%%/config/modules.mgk
-%%DATADIR%%/config/type-ghostscript.mgk
-%%DATADIR%%/config/type-solaris.mgk
-%%DATADIR%%/config/type-windows.mgk
-%%DATADIR%%/config/type.mgk
+lib/GraphicsMagick/config/delegates.mgk
+lib/GraphicsMagick/config/type-ghostscript.mgk
+lib/GraphicsMagick/config/type-solaris.mgk
+lib/GraphicsMagick/config/type-windows.mgk
+lib/GraphicsMagick/config/type.mgk
 lib/libGraphicsMagick++.a
 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
 libdata/pkgconfig/GraphicsMagickWand.pc
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Graphics/Magick.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics/Magick/.packlist
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics/Magick/Magick.so
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics/Magick/Magick.bs
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics/Magick/autosplit.ix
-@comment lib/GraphicsMagick-%%PORTVERSION%%/modules-%%Q%%/coders
-@comment lib/GraphicsMagick-%%PORTVERSION%%/modules-%%Q%%/filters
+%%DATADIR%%/config/colors.mgk
+%%DATADIR%%/config/log.mgk
+%%DATADIR%%/config/magic.mgk
+%%DATADIR%%/config/modules.mgk
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2001
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2002
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2003
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2004
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2005
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2006
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2007
+%%PORTDOCS%%%%DOCSDIR%%/Copyright.txt
+%%PORTDOCS%%%%DOCSDIR%%/NEWS.txt
 %%PORTDOCS%%%%DOCSDIR%%/images/ball.png
-%%PORTDOCS%%%%DOCSDIR%%/images/corbis.png
 %%PORTDOCS%%%%DOCSDIR%%/images/examples.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/gm-125x80t.png
 %%PORTDOCS%%%%DOCSDIR%%/images/gm-188x120t.png
 %%PORTDOCS%%%%DOCSDIR%%/images/gm-282x180t.png
-%%PORTDOCS%%%%DOCSDIR%%/images/home.png
-%%PORTDOCS%%%%DOCSDIR%%/images/mail.png
-%%PORTDOCS%%%%DOCSDIR%%/images/pdfsages.png
-%%PORTDOCS%%%%DOCSDIR%%/images/pngnow.png
 %%PORTDOCS%%%%DOCSDIR%%/images/right_triangle.png
 %%PORTDOCS%%%%DOCSDIR%%/images/right_triangle_option.png
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/www/AUTHORS.html
+%%PORTDOCS%%%%DOCSDIR%%/www/BENCHMARKS.html
+%%PORTDOCS%%%%DOCSDIR%%/www/BUGS.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Changelog.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Copyright.html
 %%PORTDOCS%%%%DOCSDIR%%/www/FAQ.html
-%%PORTDOCS%%%%DOCSDIR%%/www/GraphicsMagick.html
+%%PORTDOCS%%%%DOCSDIR%%/%%WWWDIR%%.html
 %%PORTDOCS%%%%DOCSDIR%%/www/INSTALL-unix.html
 %%PORTDOCS%%%%DOCSDIR%%/www/INSTALL-windows.html
 %%PORTDOCS%%%%DOCSDIR%%/www/ImageMagickObject.html
@@ -159,6 +161,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/thumbnail-sample-framed.jpg
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/thumbnail-sample-plain.jpg
 %%PORTDOCS%%%%DOCSDIR%%/www/NEWS.html
+%%PORTDOCS%%%%DOCSDIR%%/www/PLATFORMS.html
 %%PORTDOCS%%%%DOCSDIR%%/www/README.html
 %%PORTDOCS%%%%DOCSDIR%%/www/animate.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api.html
@@ -166,8 +169,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/www/api/annotate.html
 %%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
 %%PORTDOCS%%%%DOCSDIR%%/www/api/constitute.html
@@ -185,7 +187,9 @@
 %%PORTDOCS%%%%DOCSDIR%%/www/api/memory.html
 %%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
 %%PORTDOCS%%%%DOCSDIR%%/www/api/registry.html
@@ -195,12 +199,10 @@
 %%PORTDOCS%%%%DOCSDIR%%/www/api/segment.html
 %%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
 %%PORTDOCS%%%%DOCSDIR%%/www/conjure.html
@@ -216,31 +218,35 @@
 %%PORTDOCS%%%%DOCSDIR%%/www/identify.html
 %%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
 %%PORTDOCS%%%%DOCSDIR%%/www/miff.html
 %%PORTDOCS%%%%DOCSDIR%%/www/mission.html
 %%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
 %%PORTDOCS%%%%DOCSDIR%%/www/quantize.html
 %%PORTDOCS%%%%DOCSDIR%%/www/smile.c
 %%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++
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/www
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics/Magick
-%%WITH_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics
-%%WITH_PERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Graphics
 @dirrm %%DATADIR%%/config
 @dirrm %%DATADIR%%
+@dirrmtry libdata/pkgconfig
+@dirrm lib/GraphicsMagick/modules-Q16/filters
+@dirrm lib/GraphicsMagick/modules-Q16/coders
+@dirrm lib/GraphicsMagick/modules-Q16
+@dirrm lib/GraphicsMagick/config
+@dirrm lib/GraphicsMagick
 @dirrm include/GraphicsMagick/wand
 @dirrm include/GraphicsMagick/magick
 @dirrm include/GraphicsMagick/Magick++
 @dirrm include/GraphicsMagick
+@exec mkdir -p %D/lib/GraphicsMagick/modules-Q16/filters
+@exec mkdir -p %D/lib/GraphicsMagick/modules-Q16/coders
--- GraphicsMagick-1.2.3.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->beech 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Jun 6 23:00:22 UTC 2008 
Responsible-Changed-Why:  
beech@ wants his PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=124365 

From: "Greg Larkin" <glarkin@sourcehosting.net>
To: <bug-followup@FreeBSD.org>, <glarkin@sourcehosting.net>
Cc: "'Bob Friesenhahn'" <bfriesen@simple.dallas.tx.us>
Subject: Re: ports/124365: [PATCH] graphics/GraphicsMagick: update to 1.2.3, take maintainership
Date: Wed, 11 Jun 2008 18:28:52 -0400

 This is a multi-part message in MIME format.
 
 ------=_NextPart_000_00C4_01C8CBF0.FFE66D20
 Content-Type: text/plain;
 	charset="us-ascii"
 Content-Transfer-Encoding: 7bit
 
 Hi there,
 
 Please replace the original PR patch file with the one attached to this
 message.  I received some performance improvement suggestions from the
 upstream package developer and incorporated them into the port Makefile.
 
 Thank you,
 Greg Larkin
 
 
 ------=_NextPart_000_00C4_01C8CBF0.FFE66D20
 Content-Type: application/octet-stream;
 	name="GM.new.patch"
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: attachment;
 	filename="GM.new.patch"
 
 =3D=3D=3D> Generating patch=0A=
 =3D=3D=3D> Viewing diff with less=0A=
 diff -ruN --exclude=3DCVS =
 /usr/ports/graphics/GraphicsMagick.orig/Makefile =
 /usr/ports/graphics/GraphicsMagick/Makefile=0A=
 --- /usr/ports/graphics/GraphicsMagick.orig/Makefile	2008-05-16 =
 17:30:00.000000000 -0400=0A=
 +++ /usr/ports/graphics/GraphicsMagick/Makefile	2008-06-11 =
 16:51:49.186813386 -0400=0A=
 @@ -6,25 +6,27 @@=0A=
  #=0A=
  =0A=
  PORTNAME=3D	GraphicsMagick=0A=
 -PORTVERSION=3D	1.1.12=0A=
 +PORTVERSION=3D	1.2.3=0A=
  CATEGORIES=3D	graphics=0A=
  MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE} \=0A=
  		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/=0A=
  MASTER_SITE_SUBDIR=3D	${PORTNAME:L}=0A=
  =0A=
 -MAINTAINER=3D	ports@FreeBSD.org=0A=
 +MAINTAINER=3D	glarkin@sourcehosting.net=0A=
  COMMENT=3D	Fast image processing tools based on ImageMagick=0A=
  =0A=
  LIB_DEPENDS=3D	freetype:${PORTSDIR}/print/freetype2	\=0A=
  		fpx.[2-9]:${PORTSDIR}/graphics/libfpx	\=0A=
  		jbig:${PORTSDIR}/graphics/jbigkit	\=0A=
  		wmflite:${PORTSDIR}/graphics/libwmf	\=0A=
 -		xml2:${PORTSDIR}/textproc/libxml2=0A=
 +		xml2:${PORTSDIR}/textproc/libxml2	\=0A=
 +		ltdl:${PORTSDIR}/devel/libltdl15=0A=
  OTHERGRAPHICS=3D	jasper jpeg lcms png tiff=0A=
  LIB_DEPENDS+=3D	${OTHERGRAPHICS:C|(.+)|\1:${PORTSDIR}/graphics/\1|}=0A=
 -OPTIONS=3D	Q8BIT "Use 8-bit pixels (speed) instead of 16 (quality)" off=0A=
 -=0A=
 -OPTIONS+=3D	TESTS "Run bundled self-tests after build" on=0A=
 +OPTIONS=3D	Q8BIT "Use 8-bit pixels (speed) instead of 16 (quality)" off =
 \=0A=
 +		OPENMP "Enable OpenMP support (requires GCC 4.2+)" off \=0A=
 +		SSE "Enable SSE opcodes on supported CPUs" off \=0A=
 +		TESTS "Run bundled self-tests after build" on=0A=
  =0A=
  USE_ICONV=3D	yes=0A=
  USE_AUTOTOOLS=3D	libtool:15=0A=
 @@ -46,13 +48,10 @@=0A=
  =0A=
  CONFIGURE_TARGET=3D--build=3D${MACHINE_ARCH}-portbld-freebsd${OSREL}=0A=
  CONFIGURE_ARGS=3D	--without-perl --enable-shared --enable-static \=0A=
 -		--without-threads=0A=
 +		--without-threads --with-ltdl-include=3D${LOCALBASE}/include \=0A=
 +		--with-ltdl-lib=3D${LOCALBASE}/lib=0A=
  USE_LDCONFIG=3D	yes=0A=
  =0A=
 -.if defined(WITH_WINDOWS_FONT_DIR)=0A=
 -CONFIGURE_ARGS+=3D	--with-windows-font-dir=3D"${WINDOWS_FONT_DIR}"=0A=
 -.endif=0A=
 -=0A=
  ALL_TARGET=3D	-j`${SYSCTL} -n hw.ncpu`=0A=
  =0A=
  .if !defined(NOPORTDOCS)=0A=
 @@ -66,8 +65,31 @@=0A=
  =0A=
  .include <bsd.port.pre.mk>=0A=
  =0A=
 -# Perl and Tcl APIs will be installed by separate ports=0A=
 -PLIST_SUB+=3D	WITH_PERL=3D"@comment "=0A=
 +.if defined(WITH_SSE)=0A=
 +.if ${MACHINE_CPU:Msse}=0A=
 +CFLAGS+=3D	-msse=0A=
 +.endif=0A=
 +.if ${MACHINE_CPU:Msse2}=0A=
 +CFLAGS+=3D	-msse2=0A=
 +.endif=0A=
 +.if ${MACHINE_CPU:Msse3}=0A=
 +CFLAGS+=3D	-msse3=0A=
 +.endif=0A=
 +.endif=0A=
 +=0A=
 +.if defined(WITH_OPENMP)=0A=
 +# Later versions of FreeBSD 7.0 already have GCC 4.2=0A=
 +.if ${OSVERSION} < 700042=0A=
 +USE_GCC=3D		4.2+=0A=
 +.endif=0A=
 +=0A=
 +CONFIGURE_ENV+=3D		LDFLAGS=3D${PTHREAD_LIBS}=0A=
 +CONFIGURE_ARGS+=3D	--enable-openmp=0A=
 +.endif=0A=
 +=0A=
 +.if defined(WITH_WINDOWS_FONT_DIR)=0A=
 +CONFIGURE_ARGS+=3D	--with-windows-font-dir=3D"${WINDOWS_FONT_DIR}"=0A=
 +.endif=0A=
  =0A=
  .if defined(WITHOUT_X11)=0A=
  PKGNAMESUFFIX+=3D	-nox11=0A=
 diff -ruN --exclude=3DCVS =
 /usr/ports/graphics/GraphicsMagick.orig/distinfo =
 /usr/ports/graphics/GraphicsMagick/distinfo=0A=
 --- /usr/ports/graphics/GraphicsMagick.orig/distinfo	2008-04-28 =
 20:52:06.000000000 -0400=0A=
 +++ /usr/ports/graphics/GraphicsMagick/distinfo	2008-06-06 =
 15:43:25.590852082 -0400=0A=
 @@ -1,3 +1,3 @@=0A=
 -MD5 (GraphicsMagick-1.1.12.tar.bz2) =3D 07653ae3d22a79786e637202a0532a95=0A=
 -SHA256 (GraphicsMagick-1.1.12.tar.bz2) =3D =
 50e2a96cccad84e7eb5dfa277d3b68055e154f32a8d00d81acd072ba91a1a92e=0A=
 -SIZE (GraphicsMagick-1.1.12.tar.bz2) =3D 5034822=0A=
 +MD5 (GraphicsMagick-1.2.3.tar.bz2) =3D 6326520b005f76f6c7eae26409c9dea0=0A=
 +SHA256 (GraphicsMagick-1.2.3.tar.bz2) =3D =
 0fffff1e0aded2f2f3d8c4f13bad8f5c10d54745e5a4ec584bb30f2d003787e4=0A=
 +SIZE (GraphicsMagick-1.2.3.tar.bz2) =3D 5507918=0A=
 diff -ruN --exclude=3DCVS =
 /usr/ports/graphics/GraphicsMagick.orig/files/patch-Makefile.in =
 /usr/ports/graphics/GraphicsMagick/files/patch-Makefile.in=0A=
 --- /usr/ports/graphics/GraphicsMagick.orig/files/patch-Makefile.in	=
 2007-11-02 10:50:52.000000000 -0400=0A=
 +++ /usr/ports/graphics/GraphicsMagick/files/patch-Makefile.in	=
 2008-06-06 18:41:31.605544006 -0400=0A=
 @@ -1,89 +1,20 @@=0A=
 ---- Makefile.in        Fri Mar 18 19:36:21 2005=0A=
 -+++ Makefile.in        Sun Jul 24 18:21:35 2005=0A=
 -@@ -466,5 +466,5 @@=0A=
 - =0A=
 - # Install HTML files=0A=
 --pkgdocdir =3D @MagickSharePath@=0A=
 -+pkgdocdir =3D ${DATA_DIR}/doc/GraphicsMagick=0A=
 - DOCDIRS =3D images www www/api www/Magick++=0A=
 - @WITH_PERL_TRUE@PERLMAGICK =3D PerlMagick=0A=
 -@@ -1079,5 +1079,5 @@=0A=
 - =0A=
 - # Install arch-independent package data=0A=
 --install-data-local: install-data-html=0A=
 -+install-data-local:=0A=
 - =0A=
 - # Uninstall arch-independent package data=0A=
 ---- coders/Makefile.in Fri Mar 18 19:36:16 2005=0A=
 -+++ coders/Makefile.in Sun Jul 24 19:22:21 2005=0A=
 -@@ -1479,5 +1479,5 @@=0A=
 - install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)=0A=
 - 	@$(NORMAL_INSTALL)=0A=
 --	test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"=0A=
 -+	test -z "$(pkgdir)" -o -z "$(pkg_LTLIBRARIES)" || $(MKDIR_P) =
 "$(DESTDIR)$(pkgdir)"=0A=
 - 	@list=3D'$(pkg_LTLIBRARIES)'; for p in $$list; do \=0A=
 - 	 if test -f $$p; then \=0A=
 -@@ -1825,5 +1825,5 @@=0A=
 - install-pkgDATA: $(pkg_DATA)=0A=
 - 	@$(NORMAL_INSTALL)=0A=
 --	test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"=0A=
 -+	test -z "$(pkgdir)" -o -z '$(pkg_DATA)' || $(MKDIR_P) =
 "$(DESTDIR)$(pkgdir)"=0A=
 - 	@list=3D'$(pkg_DATA)'; for p in $$list; do \=0A=
 - 	 if test -f "$$p"; then d=3D; else d=3D"$(srcdir)/"; fi; \=0A=
 -@@ -1842,5 +1842,5 @@=0A=
 - install-pkgdataDATA: $(pkgdata_DATA)=0A=
 - 	@$(NORMAL_INSTALL)=0A=
 --	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"=0A=
 -+	test -z "$(pkgdatadir)" -o -z '$(pkgdata_DATA)' || $(MKDIR_P) =
 "$(DESTDIR)$(pkgdatadir)"=0A=
 - 	@list=3D'$(pkgdata_DATA)'; for p in $$list; do \=0A=
 - 	 if test -f "$$p"; then d=3D; else d=3D"$(srcdir)/"; fi; \=0A=
 ---- filters/Makefile.in        Fri Mar 18 19:36:17 2005=0A=
 -+++ filters/Makefile.in        Sun Jul 24 19:23:33 2005=0A=
 -@@ -522,5 +522,5 @@=0A=
 - install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)=0A=
 - 	@$(NORMAL_INSTALL)=0A=
 --	test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"=0A=
 -+	test -z "$(pkgdir)"  -o -z '$(pkg_LTLIBRARIES)' || $(MKDIR_P) =
 "$(DESTDIR)$(pkgdir)"=0A=
 - 	@list=3D'$(pkg_LTLIBRARIES)'; for p in $$list; do \=0A=
 - 	  if test -f $$p; then \=0A=
 -@@ -592,5 +592,5 @@=0A=
 - install-pkgDATA: $(pkg_DATA)=0A=
 - 	@$(NORMAL_INSTALL)=0A=
 --	test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"=0A=
 -+	test -z "$(pkgdir)" -o -z '$(pkg_DATA)' || $(MKDIR_P) =
 "$(DESTDIR)$(pkgdir)"=0A=
 - 	@list=3D'$(pkg_DATA)'; for p in $$list; do \=0A=
 - 	  if test -f "$$p"; then d=3D; else d=3D"$(srcdir)/"; fi; \=0A=
 ---- magick/Makefile.in	Fri Mar 18 19:36:18 2005=0A=
 -+++ magick/Makefile.in	Tue Jul 26 21:05:48 2005=0A=
 -@@ -664,5 +664,5 @@=0A=
 - =0A=
 - # Pkgconfig directory=0A=
 --pkgconfigdir =3D $(libdir)/pkgconfig=0A=
 -+pkgconfigdir =3D $(prefix)/libdata/pkgconfig=0A=
 - =0A=
 - # Files to install in Pkgconfig directory=0A=
 -@@ -930,5 +930,5 @@=0A=
 - install-pkgDATA: $(pkg_DATA)=0A=
 - 	@$(NORMAL_INSTALL)=0A=
 --	test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"=0A=
 -+	test -z "$(pkgdir)" -o -z '$(pkg_DATA)' || $(MKDIR_P) =
 "$(DESTDIR)$(pkgdir)"=0A=
 - 	@list=3D'$(pkg_DATA)'; for p in $$list; do \=0A=
 - 	  if test -f "$$p"; then d=3D; else d=3D"$(srcdir)/"; fi; \=0A=
 ---- Magick++/lib/Makefile.in	Fri Mar 18 19:36:13 2005=0A=
 -+++ Magick++/lib/Makefile.in	Tue Jul 26 21:37:39 2005=0A=
 -@@ -453,5 +453,5 @@=0A=
 - =0A=
 - # Pkgconfig directory=0A=
 --pkgconfigdir =3D $(libdir)/pkgconfig=0A=
 -+pkgconfigdir =3D $(prefix)/libdata/pkgconfig=0A=
 - =0A=
 - # Files to install in Pkgconfig directory=0A=
 ---- wand/Makefile.in	Fri Mar 18 19:36:20 2005=0A=
 -+++ wand/Makefile.in	Tue Jul 26 21:38:43 2005=0A=
 -@@ -478,5 +478,5 @@=0A=
 +--- Makefile.in.orig	2008-05-18 17:22:51.000000000 -0400=0A=
 ++++ Makefile.in	2008-06-06 18:41:23.620488084 -0400=0A=
 +@@ -1775,7 +1775,7 @@=0A=
 + MagickLibConfigPath =3D @MagickLibConfigPath@=0A=
 + MagickLibPath =3D @MagickLibPath@=0A=
 + MagickShareConfigPath =3D @MagickShareConfigPath@=0A=
 +-MagickSharePath =3D @MagickSharePath@=0A=
 ++MagickSharePath =3D ${DATADIR}=0A=
 + MogrifyDelegate =3D @MogrifyDelegate@=0A=
 + NM =3D @NM@=0A=
 + NMEDIT =3D @NMEDIT@=0A=
 +@@ -4382,7 +4382,7 @@=0A=
 + =
 @WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@PERLSTATI=
 CNAME =3D PerlMagick=0A=
   =0A=
   # Pkgconfig directory=0A=
  -pkgconfigdir =3D $(libdir)/pkgconfig=0A=
  +pkgconfigdir =3D $(prefix)/libdata/pkgconfig=0A=
   =0A=
   # Files to install in Pkgconfig directory=0A=
 + pkgconfig_DATA =3D \=0A=
 diff -ruN --exclude=3DCVS =
 /usr/ports/graphics/GraphicsMagick.orig/files/patch-configure =
 /usr/ports/graphics/GraphicsMagick/files/patch-configure=0A=
 --- /usr/ports/graphics/GraphicsMagick.orig/files/patch-configure	=
 2005-07-26 23:21:21.000000000 -0400=0A=
 +++ /usr/ports/graphics/GraphicsMagick/files/patch-configure	1969-12-31 =
 19:00:00.000000000 -0500=0A=
 @@ -1,23 +0,0 @@=0A=
 ---- configure	Fri Mar 18 19:35:06 2005=0A=
 -+++ configure	Tue Jul 26 22:53:50 2005=0A=
 -@@ -2092,5 +2092,5 @@=0A=
 - MagickLibConfigSubDir=3D"${MagickLibSubdir}/config"=0A=
 - =
 AC_DEFINE_UNQUOTED(MagickLibConfigSubDir,"$MagickLibConfigSubDir",Subdire=
 ctory of lib where architecture-dependent configuration files live.)=0A=
 --MagickLibConfigPath=3D"${LIB_DIR}/${MagickLibConfigSubDir}"=0A=
 -+MagickLibConfigPath=3D"${DATA_DIR}/GraphicsMagick/config"=0A=
 - MagickLibConfigPathDefine=3D"${MagickLibConfigPath}/"=0A=
 - if test "$native_win32_build" =3D 'yes'=0A=
 -@@ -2130,5 +2130,5 @@=0A=
 - # Path to GraphicsMagick share files=0A=
 - MagickShareSubdir=3D"${PACKAGE_NAME}-${PACKAGE_VERSION}"=0A=
 --MagickSharePath=3D"${DATA_DIR}/${MagickShareSubdir}"=0A=
 -+MagickSharePath=3D"${DATA_DIR}/GraphicsMagick/"=0A=
 - MagickSharePathDefine=3D"${MagickSharePath}/"=0A=
 - if test "$native_win32_build" =3D 'yes'=0A=
 -@@ -2142,5 +2142,5 @@=0A=
 - MagickShareConfigSubDir=3D"${MagickLibSubdir}/config"=0A=
 - =
 AC_DEFINE_UNQUOTED(MagickShareConfigSubDir,"$MagickShareConfigSubDir",Sub=
 directory of lib where architecture-independent configuration files =
 live.)=0A=
 --MagickShareConfigPath=3D"${DATA_DIR}/${MagickShareConfigSubDir}"=0A=
 -+MagickShareConfigPath=3D"${MagickLibConfigPath}"=0A=
 - MagickShareConfigPathDefine=3D"${MagickShareConfigPath}/"=0A=
 - if test "$native_win32_build" =3D 'yes'=0A=
 diff -ruN --exclude=3DCVS =
 /usr/ports/graphics/GraphicsMagick.orig/files/patch-configure.in =
 /usr/ports/graphics/GraphicsMagick/files/patch-configure.in=0A=
 --- /usr/ports/graphics/GraphicsMagick.orig/files/patch-configure.in	=
 1969-12-31 19:00:00.000000000 -0500=0A=
 +++ /usr/ports/graphics/GraphicsMagick/files/patch-configure.in	=
 2008-06-06 18:38:06.528717999 -0400=0A=
 @@ -0,0 +1,20 @@=0A=
 +--- configure.orig	2008-05-18 17:22:52.000000000 -0400=0A=
 ++++ configure	2008-06-06 18:37:48.269146182 -0400=0A=
 +@@ -37604,7 +37604,7 @@=0A=
 + #=0A=
 + =0A=
 + # Subdirectory under lib to place GraphicsMagick lib files=0A=
 +-MagickLibSubdir=3D"${PACKAGE_NAME}-${PACKAGE_VERSION}"=0A=
 ++MagickLibSubdir=3D"${PACKAGE_NAME}"=0A=
 + =0A=
 + cat >>confdefs.h <<_ACEOF=0A=
 + #define MagickLibSubdir "$MagickLibSubdir"=0A=
 +@@ -37708,7 +37708,7 @@=0A=
 + =0A=
 + #=0A=
 + # Path to GraphicsMagick share files=0A=
 +-MagickShareSubdir=3D"${PACKAGE_NAME}-${PACKAGE_VERSION}"=0A=
 ++MagickShareSubdir=3D"${PACKAGE_NAME}"=0A=
 + MagickSharePath=3D"${DATA_DIR}/${MagickShareSubdir}"=0A=
 + MagickSharePathDefine=3D"${MagickSharePath}/"=0A=
 + case "${build_os}" in=0A=
 diff -ruN --exclude=3DCVS =
 /usr/ports/graphics/GraphicsMagick.orig/files/patch-magick_symbols.h =
 /usr/ports/graphics/GraphicsMagick/files/patch-magick_symbols.h=0A=
 --- /usr/ports/graphics/GraphicsMagick.orig/files/patch-magick_symbols.h	=
 2007-07-16 14:30:28.000000000 -0400=0A=
 +++ /usr/ports/graphics/GraphicsMagick/files/patch-magick_symbols.h	=
 1969-12-31 19:00:00.000000000 -0500=0A=
 @@ -1,19 +0,0 @@=0A=
 ---- magick/symbols.h.orig	Mon Jul 16 21:55:06 2007=0A=
 -+++ magick/symbols.h	Mon Jul 16 21:56:04 2007=0A=
 -@@ -17,6 +17,8 @@=0A=
 - #if !defined(_MAGICK_SYMBOLS_H)=0A=
 - #define _MAGICK_SYMBOLS_H=0A=
 - =0A=
 -+#define GetToken GmGetToken=0A=
 -+=0A=
 - #if defined(PREFIX_MAGICK_SYMBOLS)=0A=
 - #define AccessDefinition GmAccessDefinition=0A=
 - #define AcquireCacheNexus GmAcquireCacheNexus=0A=
 -@@ -386,7 +388,6 @@=0A=
 - #define GetQuantizeInfo GmGetQuantizeInfo=0A=
 - #define GetSignatureInfo GmGetSignatureInfo=0A=
 - #define GetTimerInfo GmGetTimerInfo=0A=
 --#define GetToken GmGetToken=0A=
 - #define GetTypeInfo GmGetTypeInfo=0A=
 - #define GetTypeInfoByFamily GmGetTypeInfoByFamily=0A=
 - #define GetTypeList GmGetTypeList=0A=
 diff -ruN --exclude=3DCVS =
 /usr/ports/graphics/GraphicsMagick.orig/files/patch-newfpx =
 /usr/ports/graphics/GraphicsMagick/files/patch-newfpx=0A=
 --- /usr/ports/graphics/GraphicsMagick.orig/files/patch-newfpx	=
 2007-11-02 10:50:52.000000000 -0400=0A=
 +++ /usr/ports/graphics/GraphicsMagick/files/patch-newfpx	1969-12-31 =
 19:00:00.000000000 -0500=0A=
 @@ -1,20 +0,0 @@=0A=
 ---- coders/fpx.c	2004-04-14 18:45:28.000000000 -0400=0A=
 -+++ coders/fpx.c	2007-11-01 23:30:18.000000000 -0500=0A=
 -@@ -182,13 +182,13 @@=0A=
 -   unsigned int=0A=
 -     status,=0A=
 --    subimage;=0A=
 --=0A=
 --  unsigned long=0A=
 -+    subimage,=0A=
 -     height,=0A=
 --    memory_limit,=0A=
 -     tile_width,=0A=
 -     tile_height,=0A=
 -     width;=0A=
 - =0A=
 -+  size_t=0A=
 -+    memory_limit;=0A=
 -+=0A=
 -   /*=0A=
 -     Open image.=0A=
 diff -ruN --exclude=3DCVS =
 /usr/ports/graphics/GraphicsMagick.orig/pkg-plist =
 /usr/ports/graphics/GraphicsMagick/pkg-plist=0A=
 --- /usr/ports/graphics/GraphicsMagick.orig/pkg-plist	2008-04-29 =
 08:25:08.000000000 -0400=0A=
 +++ /usr/ports/graphics/GraphicsMagick/pkg-plist	2008-06-06 =
 18:38:31.534658419 -0400=0A=
 @@ -19,9 +19,9 @@=0A=
  include/GraphicsMagick/magick/api.h=0A=
  include/GraphicsMagick/magick/attribute.h=0A=
  include/GraphicsMagick/magick/blob.h=0A=
 -include/GraphicsMagick/magick/cache.h=0A=
 -include/GraphicsMagick/magick/cache_view.h=0A=
 +include/GraphicsMagick/magick/channel.h=0A=
  include/GraphicsMagick/magick/color.h=0A=
 +include/GraphicsMagick/magick/colorspace.h=0A=
  include/GraphicsMagick/magick/command.h=0A=
  include/GraphicsMagick/magick/composite.h=0A=
  include/GraphicsMagick/magick/compress.h=0A=
 @@ -33,6 +33,7 @@=0A=
  include/GraphicsMagick/magick/effect.h=0A=
  include/GraphicsMagick/magick/enhance.h=0A=
  include/GraphicsMagick/magick/error.h=0A=
 +include/GraphicsMagick/magick/forward.h=0A=
  include/GraphicsMagick/magick/fx.h=0A=
  include/GraphicsMagick/magick/gem.h=0A=
  include/GraphicsMagick/magick/image.h=0A=
 @@ -42,10 +43,13 @@=0A=
  include/GraphicsMagick/magick/magick.h=0A=
  include/GraphicsMagick/magick/magick_config.h=0A=
  include/GraphicsMagick/magick/magick_types.h=0A=
 +include/GraphicsMagick/magick/memory.h=0A=
  include/GraphicsMagick/magick/module.h=0A=
  include/GraphicsMagick/magick/monitor.h=0A=
  include/GraphicsMagick/magick/montage.h=0A=
 +include/GraphicsMagick/magick/operator.h=0A=
  include/GraphicsMagick/magick/paint.h=0A=
 +include/GraphicsMagick/magick/pixel_cache.h=0A=
  include/GraphicsMagick/magick/profile.h=0A=
  include/GraphicsMagick/magick/quantize.h=0A=
  include/GraphicsMagick/magick/registry.h=0A=
 @@ -54,7 +58,6 @@=0A=
  include/GraphicsMagick/magick/resource.h=0A=
  include/GraphicsMagick/magick/shear.h=0A=
  include/GraphicsMagick/magick/signature.h=0A=
 -include/GraphicsMagick/magick/stream.h=0A=
  include/GraphicsMagick/magick/symbols.h=0A=
  include/GraphicsMagick/magick/timer.h=0A=
  include/GraphicsMagick/magick/transform.h=0A=
 @@ -66,56 +69,55 @@=0A=
  include/GraphicsMagick/wand/magick_wand.h=0A=
  include/GraphicsMagick/wand/pixel_wand.h=0A=
  include/GraphicsMagick/wand/wand_api.h=0A=
 -%%DATADIR%%/Copyright.txt=0A=
 -%%DATADIR%%/config/colors.mgk=0A=
 -%%DATADIR%%/config/delegates.mgk=0A=
 -%%DATADIR%%/config/log.mgk=0A=
 -%%DATADIR%%/config/magic.mgk=0A=
 -%%DATADIR%%/config/modules.mgk=0A=
 -%%DATADIR%%/config/type-ghostscript.mgk=0A=
 -%%DATADIR%%/config/type-solaris.mgk=0A=
 -%%DATADIR%%/config/type-windows.mgk=0A=
 -%%DATADIR%%/config/type.mgk=0A=
 +lib/GraphicsMagick/config/delegates.mgk=0A=
 +lib/GraphicsMagick/config/type-ghostscript.mgk=0A=
 +lib/GraphicsMagick/config/type-solaris.mgk=0A=
 +lib/GraphicsMagick/config/type-windows.mgk=0A=
 +lib/GraphicsMagick/config/type.mgk=0A=
  lib/libGraphicsMagick++.a=0A=
  lib/libGraphicsMagick++.la=0A=
  lib/libGraphicsMagick++.so=0A=
 -lib/libGraphicsMagick++.so.1=0A=
 +lib/libGraphicsMagick++.so.2=0A=
  lib/libGraphicsMagick.a=0A=
  lib/libGraphicsMagick.la=0A=
  lib/libGraphicsMagick.so=0A=
 -lib/libGraphicsMagick.so.1=0A=
 +lib/libGraphicsMagick.so.2=0A=
  lib/libGraphicsMagickWand.a=0A=
  lib/libGraphicsMagickWand.la=0A=
  lib/libGraphicsMagickWand.so=0A=
 -lib/libGraphicsMagickWand.so.0=0A=
 +lib/libGraphicsMagickWand.so.1=0A=
  libdata/pkgconfig/GraphicsMagick++.pc=0A=
  libdata/pkgconfig/GraphicsMagick.pc=0A=
  libdata/pkgconfig/GraphicsMagickWand.pc=0A=
 -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Graphics/Magick.pm=0A=
 -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics/Magick/.packlist=0A=
 -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics/Magick/Magick.so=0A=
 -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics/Magick/Magick.bs=0A=
 -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics/Magick/autosplit.=
 ix=0A=
 -@comment lib/GraphicsMagick-%%PORTVERSION%%/modules-%%Q%%/coders=0A=
 -@comment lib/GraphicsMagick-%%PORTVERSION%%/modules-%%Q%%/filters=0A=
 +%%DATADIR%%/config/colors.mgk=0A=
 +%%DATADIR%%/config/log.mgk=0A=
 +%%DATADIR%%/config/magic.mgk=0A=
 +%%DATADIR%%/config/modules.mgk=0A=
 +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog=0A=
 +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2001=0A=
 +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2002=0A=
 +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2003=0A=
 +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2004=0A=
 +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2005=0A=
 +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2006=0A=
 +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2007=0A=
 +%%PORTDOCS%%%%DOCSDIR%%/Copyright.txt=0A=
 +%%PORTDOCS%%%%DOCSDIR%%/NEWS.txt=0A=
  %%PORTDOCS%%%%DOCSDIR%%/images/ball.png=0A=
 -%%PORTDOCS%%%%DOCSDIR%%/images/corbis.png=0A=
  %%PORTDOCS%%%%DOCSDIR%%/images/examples.jpg=0A=
  %%PORTDOCS%%%%DOCSDIR%%/images/gm-125x80t.png=0A=
  %%PORTDOCS%%%%DOCSDIR%%/images/gm-188x120t.png=0A=
  %%PORTDOCS%%%%DOCSDIR%%/images/gm-282x180t.png=0A=
 -%%PORTDOCS%%%%DOCSDIR%%/images/home.png=0A=
 -%%PORTDOCS%%%%DOCSDIR%%/images/mail.png=0A=
 -%%PORTDOCS%%%%DOCSDIR%%/images/pdfsages.png=0A=
 -%%PORTDOCS%%%%DOCSDIR%%/images/pngnow.png=0A=
  %%PORTDOCS%%%%DOCSDIR%%/images/right_triangle.png=0A=
  %%PORTDOCS%%%%DOCSDIR%%/images/right_triangle_option.png=0A=
  %%PORTDOCS%%%%DOCSDIR%%/index.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/AUTHORS.html=0A=
 +%%PORTDOCS%%%%DOCSDIR%%/www/BENCHMARKS.html=0A=
 +%%PORTDOCS%%%%DOCSDIR%%/www/BUGS.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/Changelog.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/Copyright.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/FAQ.html=0A=
 -%%PORTDOCS%%%%DOCSDIR%%/www/GraphicsMagick.html=0A=
 +%%PORTDOCS%%%%DOCSDIR%%/%%WWWDIR%%.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/INSTALL-unix.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/INSTALL-windows.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/ImageMagickObject.html=0A=
 @@ -159,6 +161,7 @@=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/thumbnail-sample-framed.jpg=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/thumbnail-sample-plain.jpg=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/NEWS.html=0A=
 +%%PORTDOCS%%%%DOCSDIR%%/www/PLATFORMS.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/README.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/animate.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/api.html=0A=
 @@ -166,8 +169,7 @@=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/api/annotate.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/api/attribute.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/api/blob.html=0A=
 -%%PORTDOCS%%%%DOCSDIR%%/www/api/cache.html=0A=
 -%%PORTDOCS%%%%DOCSDIR%%/www/api/cache_view.html=0A=
 +%%PORTDOCS%%%%DOCSDIR%%/www/api/channel.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/api/color.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/api/composite.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/api/constitute.html=0A=
 @@ -185,7 +187,9 @@=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/api/memory.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/api/monitor.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/api/montage.html=0A=
 +%%PORTDOCS%%%%DOCSDIR%%/www/api/operator.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/api/paint.html=0A=
 +%%PORTDOCS%%%%DOCSDIR%%/www/api/pixel_cache.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/api/profile.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/api/quantize.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/api/registry.html=0A=
 @@ -195,12 +199,10 @@=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/api/segment.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/api/shear.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/api/signature.html=0A=
 -%%PORTDOCS%%%%DOCSDIR%%/www/api/stream.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/api/transform.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/api/types.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/api/widget.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/body.html=0A=
 -%%PORTDOCS%%%%DOCSDIR%%/www/books.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/color.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/composite.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/conjure.html=0A=
 @@ -216,31 +218,35 @@=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/identify.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/import.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/index.html=0A=
 -%%PORTDOCS%%%%DOCSDIR%%/www/install.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/links.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/magick.css=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/miff.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/mission.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/mogrify.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/montage.html=0A=
 +%%PORTDOCS%%%%DOCSDIR%%/www/motion-picture.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/perl.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/programming.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/quantize.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/smile.c=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/tools.html=0A=
  %%PORTDOCS%%%%DOCSDIR%%/www/utilities.html=0A=
 -%%PORTDOCS%%%%DOCSDIR%%/www/windows.html=0A=
  %%PORTDOCS%%@dirrm %%DOCSDIR%%/www/api=0A=
  %%PORTDOCS%%@dirrm %%DOCSDIR%%/www/Magick++=0A=
  %%PORTDOCS%%@dirrm %%DOCSDIR%%/www=0A=
  %%PORTDOCS%%@dirrm %%DOCSDIR%%/images=0A=
  %%PORTDOCS%%@dirrm %%DOCSDIR%%=0A=
 -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics/Magick=0A=
 -%%WITH_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics=0A=
 -%%WITH_PERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Graphics=0A=
  @dirrm %%DATADIR%%/config=0A=
  @dirrm %%DATADIR%%=0A=
 +@dirrmtry libdata/pkgconfig=0A=
 +@dirrm lib/GraphicsMagick/modules-Q16/filters=0A=
 +@dirrm lib/GraphicsMagick/modules-Q16/coders=0A=
 +@dirrm lib/GraphicsMagick/modules-Q16=0A=
 +@dirrm lib/GraphicsMagick/config=0A=
 +@dirrm lib/GraphicsMagick=0A=
  @dirrm include/GraphicsMagick/wand=0A=
  @dirrm include/GraphicsMagick/magick=0A=
  @dirrm include/GraphicsMagick/Magick++=0A=
  @dirrm include/GraphicsMagick=0A=
 +@exec mkdir -p %D/lib/GraphicsMagick/modules-Q16/filters=0A=
 +@exec mkdir -p %D/lib/GraphicsMagick/modules-Q16/coders=0A=
 =3D=3D=3D> Done=0A=
 
 ------=_NextPart_000_00C4_01C8CBF0.FFE66D20--
 
 
State-Changed-From-To: open->closed 
State-Changed-By: beech 
State-Changed-When: Wed Jun 25 05:14:11 UTC 2008 
State-Changed-Why:  
Committed, Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=124365 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/124365: commit references a PR
Date: Wed, 25 Jun 2008 05:13:55 +0000 (UTC)

 beech       2008-06-25 05:13:50 UTC
 
   FreeBSD ports repository
 
   Modified files:
     graphics/GraphicsMagick Makefile distinfo pkg-plist 
     graphics/GraphicsMagick/files patch-Makefile.in 
   Added files:
     graphics/GraphicsMagick/files patch-configure.in 
   Removed files:
     graphics/GraphicsMagick/files patch-configure 
                                   patch-magick_symbols.h 
                                   patch-newfpx 
   Log:
   - Update to 1.2.3
   - Pass  maintainership to submitter
   
   Added file(s):
   - files/patch-configure.in
   
   Removed file(s):
   - files/patch-configure
   - files/patch-magick_symbols.h
   - files/patch-newfpx
   
   PR:             ports/124365
   Submitted by:   Greg Larkin <glarkin@sourcehosting.net>
   
   Revision  Changes    Path
   1.20      +11 -13    ports/graphics/GraphicsMagick/Makefile
   1.7       +3 -3      ports/graphics/GraphicsMagick/distinfo
   1.4       +14 -83    ports/graphics/GraphicsMagick/files/patch-Makefile.in
   1.2       +0 -23     ports/graphics/GraphicsMagick/files/patch-configure (dead)
   1.1       +20 -0     ports/graphics/GraphicsMagick/files/patch-configure.in (new)
   1.2       +0 -19     ports/graphics/GraphicsMagick/files/patch-magick_symbols.h (dead)
   1.2       +0 -20     ports/graphics/GraphicsMagick/files/patch-newfpx (dead)
   1.6       +44 -38    ports/graphics/GraphicsMagick/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
To: Greg Larkin <glarkin@sourcehosting.net>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/124365: [PATCH] graphics/GraphicsMagick: update to 1.2.3,
 take maintainership
Date: Sun, 29 Jun 2008 23:03:07 -0500 (CDT)

 GraphicsMagick 1.2.4 was released today with more bug/security fixes. 
 Meanwhile it seems that advancement of the FreeBSD port to 1.2.X is 
 still stalled.  Is there a way that I can help unstall it?  Do you 
 know what the hold up is?
 
 Bob
 
 On Wed, 11 Jun 2008, Greg Larkin wrote:
 
 > Hi there,
 >
 > Please replace the original PR patch file with the one attached to this
 > message.  I received some performance improvement suggestions from the
 > upstream package developer and incorporated them into the port Makefile.
 >
 > Thank you,
 > Greg Larkin
 >
 >
 
 ======================================
 Bob Friesenhahn
 bfriesen@simple.dallas.tx.us, http://www.simplesystems.org/users/bfriesen/
 GraphicsMagick Maintainer,    http://www.GraphicsMagick.org/
 

From: "Greg Larkin" <glarkin@sourcehosting.net>
To: "'Bob Friesenhahn'" <bfriesen@simple.dallas.tx.us>
Cc: <bug-followup@FreeBSD.org>
Subject: RE: ports/124365: [PATCH] graphics/GraphicsMagick: update to 1.2.3, take maintainership
Date: Mon, 30 Jun 2008 16:36:23 -0400

 > -----Original Message-----
 > From: Bob Friesenhahn [mailto:bfriesen@simple.dallas.tx.us] 
 > 
 > 
 > 
 > On Wed, 11 Jun 2008, Greg Larkin wrote:
 > 
 > > Hi there,
 > >
 > > Please replace the original PR patch file with the one attached to 
 > > this message.  I received some performance improvement suggestions 
 > > from the upstream package developer and incorporated them 
 > into the port Makefile.
 > >
 > > Thank you,
 > > Greg Larkin
 > >
 > >
 > GraphicsMagick 1.2.4 was released today with more bug/security fixes. 
 > Meanwhile it seems that advancement of the FreeBSD port to 
 > 1.2.X is still stalled.  Is there a way that I can help 
 > unstall it?  Do you know what the hold up is?
 > 
 > Bob
 
 Hi Bob,
 
 I made a mistake with the GraphicsMagick PR to upgrade it to 1.2.3.  Even
 after learning the reason that the previous maintainer quit, I failed to
 realize the significance of the shared library dependencies.  That was a big
 mistake on my part!
 
 Apparently, the API in 1.2.x is different enough from 1.1.x that my port
 upgrade broke the KOffice port.  After a few emails back and forth last
 week, I asked a committer to revert the GM port to 1.1.12 while I first
 prepare to upgrade it to 1.1.14 and then request a repocopy so I can begin
 to support the 1.2.x baseline in a separate directory.
 
 The FreeBSD ports tree will then contain:
 
 graphics/GraphicsMagick
 graphics/GraphicsMagick12
 
 This will allow the ports with GM dependencies to migrate to 1.2.x as their
 needs dictate.
 
 I'm setting up a new ports environment here, but I hope to file the revised
 PRs within the week.
 
 Regards,
 Greg
 
 

From: Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
To: Greg Larkin <glarkin@sourcehosting.net>
Cc: bug-followup@FreeBSD.org
Subject: RE: ports/124365: [PATCH] graphics/GraphicsMagick: update to 1.2.3,
 take maintainership
Date: Mon, 30 Jun 2008 17:05:45 -0500 (CDT)

 On Mon, 30 Jun 2008, Greg Larkin wrote:
 > Hi Bob,
 >
 > I made a mistake with the GraphicsMagick PR to upgrade it to 1.2.3.  Even
 > after learning the reason that the previous maintainer quit, I failed to
 > realize the significance of the shared library dependencies.  That was a big
 > mistake on my part!
 >
 > Apparently, the API in 1.2.x is different enough from 1.1.x that my port
 > upgrade broke the KOffice port.  After a few emails back and forth last
 > week, I asked a committer to revert the GM port to 1.1.12 while I first
 > prepare to upgrade it to 1.1.14 and then request a repocopy so I can begin
 > to support the 1.2.x baseline in a separate directory.
 
 I understand the issue in the Krita code and reported it as a bug to 
 the KOffice project shortly after 1.2 was released.  It is really just 
 a small bit of code (for embedded profiles) which is involved.  The 
 Krita folks were aware that they were using a deprecated interface 
 when they wrote the code.  Probably less than 10 lines are impacted. 
 Another avenue is to create a patch to the Krita driver so that it can 
 work with newer GraphicsMagick.  I think that it can be written to 
 work with older GraphicsMagick as well.  However, it is possible that 
 some other code is using the same old interfaces.  It is useful to 
 know if there are additional packages with problems.
 
 > The FreeBSD ports tree will then contain:
 >
 > graphics/GraphicsMagick
 > graphics/GraphicsMagick12
 
 This is really expensive for everyone involved and I don't have the 
 resources available to continue pushing out security fixes for the 1.1 
 branch now that the 1.2 branch has had four releases already.  It 
 seems wrong to put some FreeBSD users at risk due to KOffice.  Yes, 
 there are security issues and there will always be security issues for 
 this kind of software.  It would be wrong of me to attempt to hide it.
 
 Can we please consider the patch approach and the Krita driver can be 
 re-built (along with anything depending on it) if someone updates the 
 GraphicsMagick port?
 
 I know that KOffice chose to use GraphicsMagick because it is more 
 stable but it seems that ImageMagick has had no problems with pushing 
 out new releases on FreeBSD and it is much less stable.
 
 Bob
 ======================================
 Bob Friesenhahn
 bfriesen@simple.dallas.tx.us, http://www.simplesystems.org/users/bfriesen/
 GraphicsMagick Maintainer,    http://www.GraphicsMagick.org/
 

From: "Greg Larkin" <glarkin@sourcehosting.net>
To: "'Bob Friesenhahn'" <bfriesen@simple.dallas.tx.us>
Cc: <bug-followup@FreeBSD.org>, <beech@freebsd.org>
Subject: RE: ports/124365: [PATCH] graphics/GraphicsMagick: update to 1.2.3, take maintainership
Date: Wed, 2 Jul 2008 00:03:10 -0400

 > -----Original Message-----
 > From: Bob Friesenhahn [mailto:bfriesen@simple.dallas.tx.us] 
 > 
 > On Mon, 30 Jun 2008, Greg Larkin wrote:
 > > Hi Bob,
 > >
 > > I made a mistake with the GraphicsMagick PR to upgrade it 
 > to 1.2.3.  
 > > Even after learning the reason that the previous maintainer quit, I 
 > > failed to realize the significance of the shared library 
 > dependencies.  
 > > That was a big mistake on my part!
 > >
 > > Apparently, the API in 1.2.x is different enough from 1.1.x that my 
 > > port upgrade broke the KOffice port.  After a few emails back and 
 > > forth last week, I asked a committer to revert the GM port 
 > to 1.1.12 
 > > while I first prepare to upgrade it to 1.1.14 and then request a 
 > > repocopy so I can begin to support the 1.2.x baseline in a 
 > separate directory.
 > 
 > I understand the issue in the Krita code and reported it as a 
 > bug to the KOffice project shortly after 1.2 was released.  
 > It is really just a small bit of code (for embedded profiles) 
 > which is involved.  The Krita folks were aware that they were 
 > using a deprecated interface when they wrote the code.  
 > Probably less than 10 lines are impacted. 
 > Another avenue is to create a patch to the Krita driver so 
 > that it can work with newer GraphicsMagick.  I think that it 
 > can be written to work with older GraphicsMagick as well.  
 > However, it is possible that some other code is using the 
 > same old interfaces.  It is useful to know if there are 
 > additional packages with problems.
 > 
 > > The FreeBSD ports tree will then contain:
 > >
 > > graphics/GraphicsMagick
 > > graphics/GraphicsMagick12
 > 
 > This is really expensive for everyone involved and I don't 
 > have the resources available to continue pushing out security 
 > fixes for the 1.1 branch now that the 1.2 branch has had four 
 > releases already.  It seems wrong to put some FreeBSD users 
 > at risk due to KOffice.  Yes, there are security issues and 
 > there will always be security issues for this kind of 
 > software.  It would be wrong of me to attempt to hide it.
 > 
 > Can we please consider the patch approach and the Krita 
 > driver can be re-built (along with anything depending on it) 
 > if someone updates the GraphicsMagick port?
 > 
 > I know that KOffice chose to use GraphicsMagick because it is 
 > more stable but it seems that ImageMagick has had no problems 
 > with pushing out new releases on FreeBSD and it is much less stable.
 > 
 
 Hi Bob,
 
 I'm not familiar with the Krita/GraphicsMagick issues, and I don't disagree
 that the ideal scenario is for all ports dependent on GraphicsMagick to
 upgrade their code to comply with your 1.2.x baseline.
 
 However, the 1.1.x baseline is still available for download from your web
 site, and I don't have the authority to request other ports and upstream
 packages to adopt GraphicsMagick 1.2.x.  Until 1.1.x is unavailable for
 download, I feel that the best solution is to place 1.1.x and 1.2.x in the
 ports tree and add a note to /usr/ports/UPDATING to encourage dependent
 ports to migrate to 1.2.x.  
 
 Once 1.1.x and 1.2.x are both available, I hope that will make it a lot
 easier for you to lobby KOffice developers and others to adopt 1.2.x.
 Otherwise, a lot more coordination is needed between the various port
 maintainers, as I learned over the past couple of weeks.
 
 I plan to submit a PR to upgrade the existing FreeBSD port from 1.1.12 to
 1.1.14 and then request the repocopy so I can make a new port for 1.2.4.  As
 you release additional stable versions in either baseline, I will track them
 closely and submit more PRs.
 
 I look forward to your feedback when you have a moment.
 
 Regards,
 Greg
 
 

From: Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
To: Greg Larkin <glarkin@sourcehosting.net>
Cc: bug-followup@FreeBSD.org, beech@FreeBSD.org
Subject: RE: ports/124365: [PATCH] graphics/GraphicsMagick: update to 1.2.3,
 take maintainership
Date: Wed, 2 Jul 2008 00:47:47 -0500 (CDT)

 On Wed, 2 Jul 2008, Greg Larkin wrote:
 >
 > I'm not familiar with the Krita/GraphicsMagick issues, and I don't disagree
 > that the ideal scenario is for all ports dependent on GraphicsMagick to
 > upgrade their code to comply with your 1.2.x baseline.
 
 There is four more years of work in that baseline so clearly it is 
 improved.
 
 > However, the 1.1.x baseline is still available for download from your web
 > site, and I don't have the authority to request other ports and upstream
 > packages to adopt GraphicsMagick 1.2.x.  Until 1.1.x is unavailable for
 > download, I feel that the best solution is to place 1.1.x and 1.2.x in the
 > ports tree and add a note to /usr/ports/UPDATING to encourage dependent
 > ports to migrate to 1.2.x.
 
 Ok.  I do know that Krita was not planning to make another minor 
 release and expected to pick up newer GM with a more major release.
 
 > Once 1.1.x and 1.2.x are both available, I hope that will make it a lot
 > easier for you to lobby KOffice developers and others to adopt 1.2.x.
 > Otherwise, a lot more coordination is needed between the various port
 > maintainers, as I learned over the past couple of weeks.
 
 It seems that GM is a victim of its own success. :-) Before Krita 
 switched to GM, it was apparently needing to update its code to adapt 
 to latest ImageMagick every few weeks.
 
 > I plan to submit a PR to upgrade the existing FreeBSD port from 1.1.12 to
 > 1.1.14 and then request the repocopy so I can make a new port for 1.2.4.  As
 > you release additional stable versions in either baseline, I will track them
 > closely and submit more PRs.
 
 I very much appreciate your assistance.
 
 Bob
 ======================================
 Bob Friesenhahn
 bfriesen@simple.dallas.tx.us, http://www.simplesystems.org/users/bfriesen/
 GraphicsMagick Maintainer,    http://www.GraphicsMagick.org/
 

From: Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
To: Greg Larkin <glarkin@sourcehosting.net>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/124365: [PATCH] graphics/GraphicsMagick: update to 1.2.3,
 take maintainership
Date: Sun, 27 Jul 2008 14:41:27 -0500 (CDT)

 Yesterday I released GraphicsMagick 1.2.5.  GraphicsMagick 1.2 was 
 released in April after a vast amount of testing.  All GraphicsMagick 
 1.2 releases are binary compatible and thoroughly tested on FreeBSD.
 
 New ImageMagick releases seem to be incorporated into FreeBSD releases 
 whenever they appear.  What is keeping GraphicsMagick 1.2.X from being 
 integrated into FreeBSD ports?
 
 Thanks,
 
 Bob
 
 On Wed, 11 Jun 2008, Greg Larkin wrote:
 
 > Hi there,
 >
 > Please replace the original PR patch file with the one attached to this
 > message.  I received some performance improvement suggestions from the
 > upstream package developer and incorporated them into the port Makefile.
 >
 > Thank you,
 > Greg Larkin
 >
 >
 
 ======================================
 Bob Friesenhahn
 bfriesen@simple.dallas.tx.us, http://www.simplesystems.org/users/bfriesen/
 GraphicsMagick Maintainer,    http://www.GraphicsMagick.org/
 

From: "Greg Larkin" <glarkin@sourcehosting.net>
To: <bug-followup@FreeBSD.org>
Cc: <bfriesen@simple.dallas.tx.us>, <beech@FreeBSD.org>,
	<glarkin@FreeBSD.org>
Subject: Re: ports/124365: [PATCH] graphics/GraphicsMagick: update to 1.2.3, take maintainership
Date: Mon, 28 Jul 2008 17:41:24 -0400

 Hi Bob,
 
 Thank you for getting in touch, and I am aware of the delay upgrading
 GraphicsMagick in the ports tree - both the 1.1.x and 1.2.x baselines.
 
 I recently received my ports tree commit bit, and strangely, that has
 delayed the 1.1.14 upgrade, which then lays the foundation for the inclusion
 of 1.2.5 into the tree.  I started the 1.1.14 upgrade near the time that I
 received the commit bit, and I have been temporarily refocused on absorbing
 many new processes and committing much simpler port changes to the tree.
 
 Rest assured, I have not forgotten about GraphicsMagick, and it is the very
 first port that I will tackle when my FreeBSD tinderbox environment is set
 up in the next couple of days.  I'm reluctant to commit any GM changes to
 the tree until I run a complete build/test under tinderbox, including
 dependent ports.  I want to make sure that nothing breaks before the commit.
 
 I appreciate your patience, and once the 1.1.14 and 1.2.5 bits are
 committed, future port upgrades will be much quicker, as I typically upgrade
 my ports within 5-7 days of new upstream releases.
 
 Best regards,
 Greg
 
 

From: Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
To: Greg Larkin <glarkin@sourcehosting.net>
Cc: bug-followup@FreeBSD.org, beech@FreeBSD.org, glarkin@FreeBSD.org
Subject: Re: ports/124365: [PATCH] graphics/GraphicsMagick: update to 1.2.3,
 take maintainership
Date: Mon, 28 Jul 2008 17:20:30 -0500 (CDT)

 On Mon, 28 Jul 2008, Greg Larkin wrote:
 
 > Hi Bob,
 >
 > Thank you for getting in touch, and I am aware of the delay upgrading
 > GraphicsMagick in the ports tree - both the 1.1.x and 1.2.x baselines.
 >
 > I recently received my ports tree commit bit, and strangely, that has
 > delayed the 1.1.14 upgrade, which then lays the foundation for the inclusion
 > of 1.2.5 into the tree.  I started the 1.1.14 upgrade near the time that I
 > received the commit bit, and I have been temporarily refocused on absorbing
 > many new processes and committing much simpler port changes to the tree.
 
 1.1.14 fixes quite a few issues which are present in 1.1.12, including 
 some "security" issues.  It is very much needed for server sites which 
 allow users to upload files.  It is quite trivial to cause a hung 
 process, or a crash, by uploading a bogus file.  The blackhats will 
 have no difficulty with finding these files.
 
 1.2.5 fixes many more issues.  After supporting 1.1.X for so long, and 
 given that 1.2.X has been out for a while and I am working on 1.3, I 
 have run out of energy to support 1.1.X for anything but critical 
 fixes.
 
 > Rest assured, I have not forgotten about GraphicsMagick, and it is the very
 > first port that I will tackle when my FreeBSD tinderbox environment is set
 > up in the next couple of days.  I'm reluctant to commit any GM changes to
 > the tree until I run a complete build/test under tinderbox, including
 > dependent ports.  I want to make sure that nothing breaks before the commit.
 
 I am very glad to hear that.  I will try to make things as easy for 
 you as possible.
 
 Bob
 ======================================
 Bob Friesenhahn
 bfriesen@simple.dallas.tx.us, http://www.simplesystems.org/users/bfriesen/
 GraphicsMagick Maintainer,    http://www.GraphicsMagick.org/
 
>Unformatted:
