Remove some hunks from patch-Makefile.in -- these changes really belong

to the configure script. This ensures, magick.mgk and friends are
properly found at run-time.

2 files changed, 23 insertions, 28 deletions

diff --git a/graphics/GraphicsMagick12/files/patch-Makefile.in b/graphics/GraphicsMagick12/files/patch-Makefile.in
index 356c937c6998..695f093c89fc 100644
--- a/graphics/GraphicsMagick12/files/patch-Makefile.in
+++ b/graphics/GraphicsMagick12/files/patch-Makefile.in
@@ -1,21 +1,5 @@
 --- Makefile.in        Fri Mar 18 19:36:21 2005
 +++ Makefile.in        Sun Jul 24 18:21:35 2005
-@@ -100,5 +100,5 @@
- 
- # Architecture independent data files installed in the package's data directory
--pkgdatadir = @MagickSharePath@
-+pkgdatadir = ${DATA_DIR}/GraphicsMagick
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
-@@ -301,6 +301,6 @@
- MagickLibConfigPath = @MagickLibConfigPath@
- MagickLibPath = @MagickLibPath@
--MagickShareConfigPath = @MagickShareConfigPath@
--MagickSharePath = @MagickSharePath@
-+MagickShareConfigPath = ${DATADIR}/share/GraphicsMagick/config
-+MagickSharePath = ${DATADIR}/share/GraphicsMagick
- MogrifyDelegate = @MogrifyDelegate@
- NM = @NM@
 @@ -466,5 +466,5 @@
  
  # Install HTML files
@@ -69,18 +53,6 @@
 +	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; \
---- config/Makefile.in Fri Mar 18 19:36:16 2005
-+++ config/Makefile.in Sun Jul 24 19:25:34 2005
-@@ -274,7 +274,7 @@
- MagickCoderModulesPath = @MagickCoderModulesPath@
- MagickFilterModulesPath = @MagickFilterModulesPath@
--MagickLibConfigPath = @MagickLibConfigPath@
-+MagickLibConfigPath = ${DATA_DIR}/GraphicsMagick/config
- MagickLibPath = @MagickLibPath@
--MagickShareConfigPath = @MagickShareConfigPath@
-+MagickShareConfigPath = ${MagickLibConfigPath}
- MagickSharePath = @MagickSharePath@
- MogrifyDelegate = @MogrifyDelegate@
 --- magick/Makefile.in	Fri Mar 18 19:36:18 2005
 +++ magick/Makefile.in	Tue Jul 26 21:05:48 2005
 @@ -664,5 +664,5 @@
diff --git a/graphics/GraphicsMagick12/files/patch-configure b/graphics/GraphicsMagick12/files/patch-configure
new file mode 100644
index 000000000000..af50a04fedad
--- /dev/null
+++ b/graphics/GraphicsMagick12/files/patch-configure
@@ -0,0 +1,23 @@
+--- 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'