9 files changed, 113 insertions, 103 deletions

diff --git a/graphics/GraphicsMagick/files/patch-Magick++__lib__Makefile.in b/graphics/GraphicsMagick/files/patch-Magick++__lib__Makefile.in
new file mode 100644
index 000000000000..6f7d40f3fdd8
--- /dev/null
+++ b/graphics/GraphicsMagick/files/patch-Magick++__lib__Makefile.in
@@ -0,0 +1,11 @@
+--- ./Magick++/lib/Makefile.in.orig	2008-04-10 11:16:21.000000000 -0400
++++ ./Magick++/lib/Makefile.in	2008-09-02 08:05:28.000000000 -0400
+@@ -400,7 +400,7 @@
+ AM_LDFLAGS = @LDFLAGS@ $(LIBSTDCLDFLAGS)
+ 
+ # Pkgconfig directory
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ 
+ # Files to install in Pkgconfig directory
+ pkgconfig_DATA = GraphicsMagick++.pc
diff --git a/graphics/GraphicsMagick/files/patch-Makefile.in b/graphics/GraphicsMagick/files/patch-Makefile.in
deleted file mode 100644
index 072c2e820395..000000000000
--- a/graphics/GraphicsMagick/files/patch-Makefile.in
+++ /dev/null
@@ -1,89 +0,0 @@
---- Makefile.in        Fri Mar 18 19:36:21 2005
-+++ Makefile.in        Sun Jul 24 18:21:35 2005
-@@ -466,5 +466,5 @@
- 
- # Install HTML files
--pkgdocdir = @MagickSharePath@
-+pkgdocdir = ${DATA_DIR}/doc/GraphicsMagick
- DOCDIRS = images www www/api www/Magick++
- @WITH_PERL_TRUE@PERLMAGICK = PerlMagick
-@@ -1079,5 +1079,5 @@
- 
- # Install arch-independent package data
--install-data-local: install-data-html
-+install-data-local:
- 
- # Uninstall arch-independent package data
---- coders/Makefile.in Fri Mar 18 19:36:16 2005
-+++ coders/Makefile.in Sun Jul 24 19:22:21 2005
-@@ -1479,5 +1479,5 @@
- install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-+	test -z "$(pkgdir)" -o -z "$(pkg_LTLIBRARIES)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
- 	@list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
- 	 if test -f $$p; then \
-@@ -1825,5 +1825,5 @@
- install-pkgDATA: $(pkg_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-+	test -z "$(pkgdir)" -o -z '$(pkg_DATA)' || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
- 	@list='$(pkg_DATA)'; for p in $$list; do \
- 	 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-@@ -1842,5 +1842,5 @@
- install-pkgdataDATA: $(pkgdata_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
-+	test -z "$(pkgdatadir)" -o -z '$(pkgdata_DATA)' || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
- 	@list='$(pkgdata_DATA)'; for p in $$list; do \
- 	 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
---- filters/Makefile.in        Fri Mar 18 19:36:17 2005
-+++ filters/Makefile.in        Sun Jul 24 19:23:33 2005
-@@ -522,5 +522,5 @@
- install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-+	test -z "$(pkgdir)"  -o -z '$(pkg_LTLIBRARIES)' || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
- 	@list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
-@@ -592,5 +592,5 @@
- install-pkgDATA: $(pkg_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-+	test -z "$(pkgdir)" -o -z '$(pkg_DATA)' || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
- 	@list='$(pkg_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
---- magick/Makefile.in	Fri Mar 18 19:36:18 2005
-+++ magick/Makefile.in	Tue Jul 26 21:05:48 2005
-@@ -664,5 +664,5 @@
- 
- # Pkgconfig directory
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- 
- # Files to install in Pkgconfig directory
-@@ -930,5 +930,5 @@
- install-pkgDATA: $(pkg_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-+	test -z "$(pkgdir)" -o -z '$(pkg_DATA)' || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
- 	@list='$(pkg_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
---- Magick++/lib/Makefile.in	Fri Mar 18 19:36:13 2005
-+++ Magick++/lib/Makefile.in	Tue Jul 26 21:37:39 2005
-@@ -453,5 +453,5 @@
- 
- # Pkgconfig directory
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- 
- # Files to install in Pkgconfig directory
---- wand/Makefile.in	Fri Mar 18 19:36:20 2005
-+++ wand/Makefile.in	Tue Jul 26 21:38:43 2005
-@@ -478,5 +478,5 @@
- 
- # Pkgconfig directory
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- 
- # Files to install in Pkgconfig directory
diff --git a/graphics/GraphicsMagick/files/patch-coders__Makefile.in b/graphics/GraphicsMagick/files/patch-coders__Makefile.in
new file mode 100644
index 000000000000..e703b93259a7
--- /dev/null
+++ b/graphics/GraphicsMagick/files/patch-coders__Makefile.in
@@ -0,0 +1,29 @@
+--- ./coders/Makefile.in.orig	2008-04-10 11:16:23.000000000 -0400
++++ ./coders/Makefile.in	2008-09-02 08:05:28.000000000 -0400
+@@ -1696,7 +1696,7 @@
+ 	done
+ 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 \
+ 	    f=$(am__strip_dir) \
+@@ -2038,7 +2038,7 @@
+ 	-rm -rf .libs _libs
+ 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; \
+ 	  f=$(am__strip_dir) \
+@@ -2055,7 +2055,7 @@
+ 	done
+ 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; \
+ 	  f=$(am__strip_dir) \
diff --git a/graphics/GraphicsMagick/files/patch-newfpx b/graphics/GraphicsMagick/files/patch-coders__fpx.c
index 6aa24bf3dacc..36f49dadeec8 100644
--- a/graphics/GraphicsMagick/files/patch-newfpx
+++ b/graphics/GraphicsMagick/files/patch-coders__fpx.c
@@ -1,6 +1,7 @@
---- 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 @@
+--- ./coders/fpx.c.orig	2007-11-05 22:03:47.000000000 -0500
++++ ./coders/fpx.c	2008-09-02 08:05:29.000000000 -0400
+@@ -181,15 +181,15 @@
+ 
    unsigned int
      status,
 -    subimage;
@@ -18,3 +19,4 @@
 +
    /*
      Open image.
+   */
diff --git a/graphics/GraphicsMagick/files/patch-configure b/graphics/GraphicsMagick/files/patch-configure
index af50a04fedad..a54a2698da9e 100644
--- a/graphics/GraphicsMagick/files/patch-configure
+++ b/graphics/GraphicsMagick/files/patch-configure
@@ -1,23 +1,29 @@
---- 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.)
+--- ./configure.orig	2008-04-10 11:16:29.000000000 -0400
++++ ./configure	2008-09-02 08:05:29.000000000 -0400
+@@ -34040,7 +34040,7 @@
+ #define MagickLibConfigSubDir "$MagickLibConfigSubDir"
+ _ACEOF
+ 
 -MagickLibConfigPath="${LIB_DIR}/${MagickLibConfigSubDir}"
 +MagickLibConfigPath="${DATA_DIR}/GraphicsMagick/config"
  MagickLibConfigPathDefine="${MagickLibConfigPath}/"
  if test "$native_win32_build" = 'yes'
-@@ -2130,5 +2130,5 @@
+ then
+@@ -34098,7 +34098,7 @@
+ #
  # 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.)
+ then
+@@ -34118,7 +34118,7 @@
+ #define MagickShareConfigSubDir "$MagickShareConfigSubDir"
+ _ACEOF
+ 
 -MagickShareConfigPath="${DATA_DIR}/${MagickShareConfigSubDir}"
 +MagickShareConfigPath="${MagickLibConfigPath}"
  MagickShareConfigPathDefine="${MagickShareConfigPath}/"
  if test "$native_win32_build" = 'yes'
+ then
diff --git a/graphics/GraphicsMagick/files/patch-filters__Makefile.in b/graphics/GraphicsMagick/files/patch-filters__Makefile.in
new file mode 100644
index 000000000000..b91a8af3bf1e
--- /dev/null
+++ b/graphics/GraphicsMagick/files/patch-filters__Makefile.in
@@ -0,0 +1,20 @@
+--- ./filters/Makefile.in.orig	2008-04-10 11:16:24.000000000 -0400
++++ ./filters/Makefile.in	2008-09-02 08:05:29.000000000 -0400
+@@ -464,7 +464,7 @@
+ 	done
+ 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 \
+ 	    f=$(am__strip_dir) \
+@@ -530,7 +530,7 @@
+ 	-rm -rf .libs _libs
+ 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; \
+ 	  f=$(am__strip_dir) \
diff --git a/graphics/GraphicsMagick/files/patch-magick__Makefile.in b/graphics/GraphicsMagick/files/patch-magick__Makefile.in
new file mode 100644
index 000000000000..aca343ca9e31
--- /dev/null
+++ b/graphics/GraphicsMagick/files/patch-magick__Makefile.in
@@ -0,0 +1,20 @@
+--- ./magick/Makefile.in.orig	2008-04-10 11:16:24.000000000 -0400
++++ ./magick/Makefile.in	2008-09-02 08:05:29.000000000 -0400
+@@ -612,7 +612,7 @@
+ pkgdata_DATA = 
+ 
+ # Pkgconfig directory
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ 
+ # Files to install in Pkgconfig directory
+ pkgconfig_DATA = GraphicsMagick.pc
+@@ -876,7 +876,7 @@
+ 	done
+ 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; \
+ 	  f=$(am__strip_dir) \
diff --git a/graphics/GraphicsMagick/files/patch-magick_symbols.h b/graphics/GraphicsMagick/files/patch-magick__symbols.h
index 8edb9976ad45..4021e7c561b0 100644
--- a/graphics/GraphicsMagick/files/patch-magick_symbols.h
+++ b/graphics/GraphicsMagick/files/patch-magick__symbols.h
@@ -1,5 +1,5 @@
---- magick/symbols.h.orig	Mon Jul 16 21:55:06 2007
-+++ magick/symbols.h	Mon Jul 16 21:56:04 2007
+--- ./magick/symbols.h.orig	2004-04-14 18:45:07.000000000 -0400
++++ ./magick/symbols.h	2008-09-02 08:05:29.000000000 -0400
 @@ -17,6 +17,8 @@
  #if !defined(_MAGICK_SYMBOLS_H)
  #define _MAGICK_SYMBOLS_H
diff --git a/graphics/GraphicsMagick/files/patch-wand__Makefile.in b/graphics/GraphicsMagick/files/patch-wand__Makefile.in
new file mode 100644
index 000000000000..443ed9f5fa99
--- /dev/null
+++ b/graphics/GraphicsMagick/files/patch-wand__Makefile.in
@@ -0,0 +1,11 @@
+--- ./wand/Makefile.in.orig	2008-04-10 11:16:25.000000000 -0400
++++ ./wand/Makefile.in	2008-09-02 08:05:29.000000000 -0400
+@@ -427,7 +427,7 @@
+ noinst_HEADERS = magick_compat.h
+ 
+ # Pkgconfig directory
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ 
+ # Files to install in Pkgconfig directory
+ pkgconfig_DATA = GraphicsMagickWand.pc