8 files changed, 243 insertions, 328 deletions

diff --git a/graphics/GraphicsMagick12/Makefile b/graphics/GraphicsMagick12/Makefile
index 19520891e7df..5223e57e3d4c 100644
--- a/graphics/GraphicsMagick12/Makefile
+++ b/graphics/GraphicsMagick12/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	GraphicsMagick
-PORTVERSION=	1.1.12
-PORTEPOCH=	1
+PORTVERSION=	1.2.5
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/
@@ -16,22 +15,27 @@ MASTER_SITE_SUBDIR=	${PORTNAME:L}
 MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	Fast image processing tools based on ImageMagick
 
+CONFLICTS=	GraphicsMagick-1.1.*
+
 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 \
+		OPENMP "Enable OpenMP support (requires GCC 4.2+)" off \
+		SSE "Enable SSE opcodes on supported CPUs" off \
+		TESTS "Run bundled self-tests after build" on
 
 USE_ICONV=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
 USE_GHOSTSCRIPT=yes
 GNU_CONFIGURE=	yes
+LATEST_LINK=	GraphicsMagick12
 
 MAN1=	GraphicsMagick++-config.1 \
 	GraphicsMagick-config.1 \
@@ -40,25 +44,40 @@ MAN1=	GraphicsMagick++-config.1 \
 MAN4=	miff.4
 MAN5=	quantize.5
 
+.if defined(WITH_SSE)
+.if ${MACHINE_CPU:Msse}
+CFLAGS+=	-msse
+.endif
+.if ${MACHINE_CPU:Msse2}
+CFLAGS+=	-msse2
+.endif
+.if ${MACHINE_CPU:Msse3}
+CFLAGS+=	-msse3
+.endif
+.endif
+
+.if defined(WITH_OPENMP)
+# Later versions of FreeBSD 7.0 already have GCC 4.2
+.if ${OSVERSION} < 700042
+USE_GCC=	4.2+
+.endif
+
+CONFIGURE_ENV+=		LDFLAGS=${PTHREAD_LIBS}
+CONFIGURE_ARGS+=	--enable-openmp
+.endif
+
 .ifndef WINDOWS_FONT_DIR
 # Use fonts installed by x11-fonts/webfonts by default
 WINDOWS_FONT_DIR=${LOCALBASE}/lib/X11/fonts/webfonts
 .endif
 
-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)
-INSTALL_TARGET=	install install-data-html
-.endif
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"       \
 	LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -67,8 +86,9 @@ test check:
 
 .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 --git a/graphics/GraphicsMagick12/distinfo b/graphics/GraphicsMagick12/distinfo
index d1b64c6d7779..027f7f1f4e1a 100644
--- a/graphics/GraphicsMagick12/distinfo
+++ b/graphics/GraphicsMagick12/distinfo
@@ -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.5.tar.bz2) = a023a1561ec0780f25f5a4f0cf208053
+SHA256 (GraphicsMagick-1.2.5.tar.bz2) = c51236aa0e592d5d61a7b7658d0129099f302fba7216c64a91ce66c0d574c33a
+SIZE (GraphicsMagick-1.2.5.tar.bz2) = 5983638
diff --git a/graphics/GraphicsMagick12/files/patch-Makefile.in b/graphics/GraphicsMagick12/files/patch-Makefile.in
index 072c2e820395..7c5d272c8bd3 100644
--- a/graphics/GraphicsMagick12/files/patch-Makefile.in
+++ b/graphics/GraphicsMagick12/files/patch-Makefile.in
@@ -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 --git a/graphics/GraphicsMagick12/files/patch-configure b/graphics/GraphicsMagick12/files/patch-configure
deleted file mode 100644
index af50a04fedad..000000000000
--- a/graphics/GraphicsMagick12/files/patch-configure
+++ /dev/null
@@ -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 --git a/graphics/GraphicsMagick12/files/patch-configure.in b/graphics/GraphicsMagick12/files/patch-configure.in
new file mode 100644
index 000000000000..ed7a7535689b
--- /dev/null
+++ b/graphics/GraphicsMagick12/files/patch-configure.in
@@ -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 --git a/graphics/GraphicsMagick12/files/patch-magick_symbols.h b/graphics/GraphicsMagick12/files/patch-magick_symbols.h
deleted file mode 100644
index 8edb9976ad45..000000000000
--- a/graphics/GraphicsMagick12/files/patch-magick_symbols.h
+++ /dev/null
@@ -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 --git a/graphics/GraphicsMagick12/files/patch-newfpx b/graphics/GraphicsMagick12/files/patch-newfpx
deleted file mode 100644
index 6aa24bf3dacc..000000000000
--- a/graphics/GraphicsMagick12/files/patch-newfpx
+++ /dev/null
@@ -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 --git a/graphics/GraphicsMagick12/pkg-plist b/graphics/GraphicsMagick12/pkg-plist
index bbc3db2b1487..bda744fbc059 100644
--- a/graphics/GraphicsMagick12/pkg-plist
+++ b/graphics/GraphicsMagick12/pkg-plist
@@ -19,9 +19,9 @@ include/GraphicsMagick/magick/PreRvIcccm.h
 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/draw.h
 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/magic.h
 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/resize.h
 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,181 +69,184 @@ include/GraphicsMagick/wand/drawing_wand.h
 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
-%%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/Changelog.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Copyright.html
-%%PORTDOCS%%%%DOCSDIR%%/www/FAQ.html
-%%PORTDOCS%%%%DOCSDIR%%/www/GraphicsMagick.html
-%%PORTDOCS%%%%DOCSDIR%%/www/INSTALL-unix.html
-%%PORTDOCS%%%%DOCSDIR%%/www/INSTALL-windows.html
-%%PORTDOCS%%%%DOCSDIR%%/www/ImageMagickObject.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Blob.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Cache.fig
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Cache.png
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Cache.svg
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/ChangeLog.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/CoderInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Color.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Documentation.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Drawable.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Drawable_example_1.png
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Enumerations.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Exception.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/FormatCharacters.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Future.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Geometry.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Image.fig
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Image.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Image.png
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/ImageDesign.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/ImageMagick.png
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Install.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Magick++.png
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Montage.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/NEWS.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/PixelPacket.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Pixels.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/README.txt
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/STL.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/TypeMetric.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/gm-188x120t.png
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/index.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/montage-sample-framed.jpg
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/right_triangle.png
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/thumbnail-anatomy-framed.fig
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/thumbnail-anatomy-framed.jpg
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/thumbnail-anatomy-plain.fig
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/thumbnail-anatomy-plain.jpg
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/thumbnail-sample-framed.jpg
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/thumbnail-sample-plain.jpg
-%%PORTDOCS%%%%DOCSDIR%%/www/NEWS.html
-%%PORTDOCS%%%%DOCSDIR%%/www/README.html
-%%PORTDOCS%%%%DOCSDIR%%/www/animate.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/animate.html
-%%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/color.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/composite.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/constitute.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/decorate.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/deprecate.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/display.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/draw.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/effect.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/enhance.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/error.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/fx.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/image.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/list.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/magick.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/memory.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/monitor.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/montage.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/paint.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/profile.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/quantize.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/registry.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/render.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/resize.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/resource.html
-%%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
-%%PORTDOCS%%%%DOCSDIR%%/www/contribute.html
-%%PORTDOCS%%%%DOCSDIR%%/www/convert.html
-%%PORTDOCS%%%%DOCSDIR%%/www/cvs.html
-%%PORTDOCS%%%%DOCSDIR%%/www/development.html
-%%PORTDOCS%%%%DOCSDIR%%/www/display.html
-%%PORTDOCS%%%%DOCSDIR%%/www/download.html
-%%PORTDOCS%%%%DOCSDIR%%/www/formats.html
-%%PORTDOCS%%%%DOCSDIR%%/www/gm.html
-%%PORTDOCS%%%%DOCSDIR%%/www/header.html
-%%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/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
+%%DATADIR%%/config/colors.mgk
+%%DATADIR%%/config/log.mgk
+%%DATADIR%%/config/magic.mgk
+%%DATADIR%%/config/modules.mgk
+%%DOCSDIR%%/ChangeLog
+%%DOCSDIR%%/ChangeLog.2001
+%%DOCSDIR%%/ChangeLog.2002
+%%DOCSDIR%%/ChangeLog.2003
+%%DOCSDIR%%/ChangeLog.2004
+%%DOCSDIR%%/ChangeLog.2005
+%%DOCSDIR%%/ChangeLog.2006
+%%DOCSDIR%%/ChangeLog.2007
+%%DOCSDIR%%/Copyright.txt
+%%DOCSDIR%%/NEWS.txt
+%%DOCSDIR%%/images/ball.png
+%%DOCSDIR%%/images/examples.jpg
+%%DOCSDIR%%/images/gm-125x80t.png
+%%DOCSDIR%%/images/gm-188x120t.png
+%%DOCSDIR%%/images/gm-282x180t.png
+%%DOCSDIR%%/images/right_triangle.png
+%%DOCSDIR%%/images/right_triangle_option.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/www/AUTHORS.html
+%%DOCSDIR%%/www/BENCHMARKS.html
+%%DOCSDIR%%/www/BUGS.html
+%%DOCSDIR%%/www/Changelog.html
+%%DOCSDIR%%/www/Copyright.html
+%%DOCSDIR%%/www/FAQ.html
+%%DOCSDIR%%/%%WWWDIR%%.html
+%%DOCSDIR%%/www/INSTALL-unix.html
+%%DOCSDIR%%/www/INSTALL-windows.html
+%%DOCSDIR%%/www/ImageMagickObject.html
+%%DOCSDIR%%/www/Magick++/Blob.html
+%%DOCSDIR%%/www/Magick++/Cache.fig
+%%DOCSDIR%%/www/Magick++/Cache.png
+%%DOCSDIR%%/www/Magick++/Cache.svg
+%%DOCSDIR%%/www/Magick++/ChangeLog.html
+%%DOCSDIR%%/www/Magick++/CoderInfo.html
+%%DOCSDIR%%/www/Magick++/Color.html
+%%DOCSDIR%%/www/Magick++/Documentation.html
+%%DOCSDIR%%/www/Magick++/Drawable.html
+%%DOCSDIR%%/www/Magick++/Drawable_example_1.png
+%%DOCSDIR%%/www/Magick++/Enumerations.html
+%%DOCSDIR%%/www/Magick++/Exception.html
+%%DOCSDIR%%/www/Magick++/FormatCharacters.html
+%%DOCSDIR%%/www/Magick++/Future.html
+%%DOCSDIR%%/www/Magick++/Geometry.html
+%%DOCSDIR%%/www/Magick++/Image.fig
+%%DOCSDIR%%/www/Magick++/Image.html
+%%DOCSDIR%%/www/Magick++/Image.png
+%%DOCSDIR%%/www/Magick++/ImageDesign.html
+%%DOCSDIR%%/www/Magick++/ImageMagick.png
+%%DOCSDIR%%/www/Magick++/Install.html
+%%DOCSDIR%%/www/Magick++/Magick++.png
+%%DOCSDIR%%/www/Magick++/Montage.html
+%%DOCSDIR%%/www/Magick++/NEWS.html
+%%DOCSDIR%%/www/Magick++/PixelPacket.html
+%%DOCSDIR%%/www/Magick++/Pixels.html
+%%DOCSDIR%%/www/Magick++/README.txt
+%%DOCSDIR%%/www/Magick++/STL.html
+%%DOCSDIR%%/www/Magick++/TypeMetric.html
+%%DOCSDIR%%/www/Magick++/gm-188x120t.png
+%%DOCSDIR%%/www/Magick++/index.html
+%%DOCSDIR%%/www/Magick++/montage-sample-framed.jpg
+%%DOCSDIR%%/www/Magick++/right_triangle.png
+%%DOCSDIR%%/www/Magick++/thumbnail-anatomy-framed.fig
+%%DOCSDIR%%/www/Magick++/thumbnail-anatomy-framed.jpg
+%%DOCSDIR%%/www/Magick++/thumbnail-anatomy-plain.fig
+%%DOCSDIR%%/www/Magick++/thumbnail-anatomy-plain.jpg
+%%DOCSDIR%%/www/Magick++/thumbnail-sample-framed.jpg
+%%DOCSDIR%%/www/Magick++/thumbnail-sample-plain.jpg
+%%DOCSDIR%%/www/NEWS.html
+%%DOCSDIR%%/www/PLATFORMS.html
+%%DOCSDIR%%/www/README.html
+%%DOCSDIR%%/www/animate.html
+%%DOCSDIR%%/www/api.html
+%%DOCSDIR%%/www/api/animate.html
+%%DOCSDIR%%/www/api/annotate.html
+%%DOCSDIR%%/www/api/attribute.html
+%%DOCSDIR%%/www/api/blob.html
+%%DOCSDIR%%/www/api/channel.html
+%%DOCSDIR%%/www/api/color.html
+%%DOCSDIR%%/www/api/composite.html
+%%DOCSDIR%%/www/api/constitute.html
+%%DOCSDIR%%/www/api/decorate.html
+%%DOCSDIR%%/www/api/deprecate.html
+%%DOCSDIR%%/www/api/display.html
+%%DOCSDIR%%/www/api/draw.html
+%%DOCSDIR%%/www/api/effect.html
+%%DOCSDIR%%/www/api/enhance.html
+%%DOCSDIR%%/www/api/error.html
+%%DOCSDIR%%/www/api/fx.html
+%%DOCSDIR%%/www/api/image.html
+%%DOCSDIR%%/www/api/list.html
+%%DOCSDIR%%/www/api/magick.html
+%%DOCSDIR%%/www/api/memory.html
+%%DOCSDIR%%/www/api/monitor.html
+%%DOCSDIR%%/www/api/montage.html
+%%DOCSDIR%%/www/api/operator.html
+%%DOCSDIR%%/www/api/paint.html
+%%DOCSDIR%%/www/api/pixel_cache.html
+%%DOCSDIR%%/www/api/profile.html
+%%DOCSDIR%%/www/api/quantize.html
+%%DOCSDIR%%/www/api/registry.html
+%%DOCSDIR%%/www/api/render.html
+%%DOCSDIR%%/www/api/resize.html
+%%DOCSDIR%%/www/api/resource.html
+%%DOCSDIR%%/www/api/segment.html
+%%DOCSDIR%%/www/api/shear.html
+%%DOCSDIR%%/www/api/signature.html
+%%DOCSDIR%%/www/api/transform.html
+%%DOCSDIR%%/www/api/types.html
+%%DOCSDIR%%/www/api/widget.html
+%%DOCSDIR%%/www/body.html
+%%DOCSDIR%%/www/color.html
+%%DOCSDIR%%/www/composite.html
+%%DOCSDIR%%/www/conjure.html
+%%DOCSDIR%%/www/contribute.html
+%%DOCSDIR%%/www/convert.html
+%%DOCSDIR%%/www/cvs.html
+%%DOCSDIR%%/www/development.html
+%%DOCSDIR%%/www/display.html
+%%DOCSDIR%%/www/download.html
+%%DOCSDIR%%/www/formats.html
+%%DOCSDIR%%/www/gm.html
+%%DOCSDIR%%/www/header.html
+%%DOCSDIR%%/www/identify.html
+%%DOCSDIR%%/www/import.html
+%%DOCSDIR%%/www/index.html
+%%DOCSDIR%%/www/links.html
+%%DOCSDIR%%/www/magick.css
+%%DOCSDIR%%/www/miff.html
+%%DOCSDIR%%/www/mission.html
+%%DOCSDIR%%/www/mogrify.html
+%%DOCSDIR%%/www/montage.html
+%%DOCSDIR%%/www/motion-picture.html
+%%DOCSDIR%%/www/perl.html
+%%DOCSDIR%%/www/programming.html
+%%DOCSDIR%%/www/quantize.html
+%%DOCSDIR%%/www/smile.c
+%%DOCSDIR%%/www/tools.html
+%%DOCSDIR%%/www/utilities.html
+@dirrm %%DOCSDIR%%/www/api
+@dirrm %%DOCSDIR%%/www/Magick++
+@dirrm %%DOCSDIR%%/www
+@dirrm %%DOCSDIR%%/images
+@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/config
 @dirrm %%DATADIR%%
+@dirrmtry libdata/pkgconfig
+@dirrm lib/GraphicsMagick/modules-Q%%Q%%/filters
+@dirrm lib/GraphicsMagick/modules-Q%%Q%%/coders
+@dirrm lib/GraphicsMagick/modules-Q%%Q%%
+@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-Q%%Q%%/filters
+@exec mkdir -p %D/lib/GraphicsMagick/modules-Q%%Q%%/coders