SF.net SVN: gar:[25696] csw/mgar/pkg/ImageMagick/trunk

[lblume at users.sourceforge.net]

Revision: 25696
          http://sourceforge.net/p/gar/code/25696
Author:   lblume
Date:     2016-05-05 11:43:24 +0000 (Thu, 05 May 2016)
Log Message:
-----------
ImageMagick/trunk: Improve the handling of the configuration files

Modified Paths:
--------------
    csw/mgar/pkg/ImageMagick/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/ImageMagick/trunk/files/0004-remove-version-from-sysconfdir.patch

Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/Makefile	2016-05-05 11:25:24 UTC (rev 25695)
+++ csw/mgar/pkg/ImageMagick/trunk/Makefile	2016-05-05 11:43:24 UTC (rev 25696)
@@ -32,10 +32,26 @@
 LICENSE = LICENSE
 
 PATCHFILES += 0002_warn_all_does_not_work.patch 
-
 # Mitigation for the CVE
 PATCHFILES += 0003-CVE-2016-3714.patch
+# Make it easier to keep configuration files
+PATCHFILES += 0004-remove-version-from-sysconfdir.patch
 
+PRESERVECONF += $(sysconfdir)/ImageMagick/coder.xml
+PRESERVECONF += $(sysconfdir)/ImageMagick/colors.xml
+PRESERVECONF += $(sysconfdir)/ImageMagick/delegates.xml
+PRESERVECONF += $(sysconfdir)/ImageMagick/log.xml
+PRESERVECONF += $(sysconfdir)/ImageMagick/magic.xml
+PRESERVECONF += $(sysconfdir)/ImageMagick/mime.xml
+PRESERVECONF += $(sysconfdir)/ImageMagick/policy.xml
+PRESERVECONF += $(sysconfdir)/ImageMagick/quantization-table.xml
+PRESERVECONF += $(sysconfdir)/ImageMagick/thresholds.xml
+PRESERVECONF += $(sysconfdir)/ImageMagick/type-apple.xml
+PRESERVECONF += $(sysconfdir)/ImageMagick/type-dejavu.xml
+PRESERVECONF += $(sysconfdir)/ImageMagick/type-ghostscript.xml
+PRESERVECONF += $(sysconfdir)/ImageMagick/type-windows.xml
+PRESERVECONF += $(sysconfdir)/ImageMagick/type.xml
+
 BUILD_DEP_PKGS += CSWliblcms-dev
 BUILD_DEP_PKGS += CSWlibcairo-dev
 BUILD_DEP_PKGS += CSWlibwmf-dev
@@ -221,3 +237,10 @@
 include gar/category.mk
 
 SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(GARSUBREV)
+
+
+# we re-run autoconf because of the sysconfdir directory patch
+pre-configure:
+	cd $(WORKSRC) && autoconf
+	@$(MAKECOOKIE)
+

Added: csw/mgar/pkg/ImageMagick/trunk/files/0004-remove-version-from-sysconfdir.patch
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/files/0004-remove-version-from-sysconfdir.patch	                        (rev 0)
+++ csw/mgar/pkg/ImageMagick/trunk/files/0004-remove-version-from-sysconfdir.patch	2016-05-05 11:43:24 UTC (rev 25696)
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -2961,7 +2961,7 @@ AC_ARG_ENABLE([docs],
+ AM_CONDITIONAL([INSTALL_DOC], [test "$wantdocs" = "yes"])
+ 
+ # Subdirectory to place architecture-dependent configuration files
+-CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}"
++CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}"
+ AC_DEFINE_UNQUOTED(CONFIGURE_RELATIVE_PATH,"$CONFIGURE_RELATIVE_PATH",[Subdirectory of lib where architecture-dependent configuration files live.])
+ CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/"
+ DEFINE_CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.