[csw-devel] SF.net SVN: gar:[9179] csw/mgar/pkg/ImageMagick/trunk

[hson at users.sourceforge.net]

Revision: 9179
          http://gar.svn.sourceforge.net/gar/?rev=9179&view=rev
Author:   hson
Date:     2010-03-15 01:49:47 +0000 (Mon, 15 Mar 2010)

Log Message:
-----------
imagemagick: Put docs in version independent dir

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

Added Paths:
-----------
    csw/mgar/pkg/ImageMagick/trunk/files/configure.diff

Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/Makefile	2010-03-15 01:23:06 UTC (rev 9178)
+++ csw/mgar/pkg/ImageMagick/trunk/Makefile	2010-03-15 01:49:47 UTC (rev 9179)
@@ -45,7 +45,7 @@
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxext
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxml2
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxt
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWopenexr
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWopenexrrt
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWperl
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWpng
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWsunmath
@@ -75,6 +75,7 @@
 CONFIGURE_ARGS = $(CONFIGURE_ARGS_COMMON) $(foreach M,$(MODULATIONS),$(CONFIGURE_ARGS_$M))
 
 PATCHFILES += Makefile.patch
+PATCHFILES += configure.diff
 
 # Test has to be run *after* install
 #TEST_TARGET = check
@@ -105,7 +106,6 @@
 SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(GARSUBREV)
 
 post-install-isa-sparcv8:
-	@ln -s ImageMagick-$(GARVERSION) $(INSTALLISADIR)$(docdir)/ImageMagick
 	@( cd $(INSTALLISADIR)$(libdir) ; bzip2 -dc $(CURDIR)/$(FILEDIR)/6.2.9.s.tar.bz2 |tar xf -)
 	@( cd $(INSTALLISADIR)$(libdir) ; bzip2 -dc $(CURDIR)/$(FILEDIR)/6.5.2.s.tar.bz2 |tar xf -)
 	@mv $(INSTALLISADIR)$(mandir)/man1/compare.1 $(INSTALLISADIR)$(mandir)/man1/compare2.1
@@ -113,7 +113,6 @@
 	@$(MAKECOOKIE)
 
 post-install-isa-i386:
-	@ln -s ImageMagick-$(GARVERSION) $(INSTALLISADIR)$(docdir)/ImageMagick
 	@( cd $(INSTALLISADIR)$(libdir) ; bzip2 -dc $(CURDIR)/$(FILEDIR)/6.2.9.i.tar.bz2 |tar xf -)
 	@( cd $(INSTALLISADIR)$(libdir) ; bzip2 -dc $(CURDIR)/$(FILEDIR)/6.5.2.i.tar.bz2 |tar xf -)
 	@mv $(INSTALLISADIR)$(mandir)/man1/compare.1 $(INSTALLISADIR)$(mandir)/man1/compare2.1

Modified: csw/mgar/pkg/ImageMagick/trunk/checksums
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/checksums	2010-03-15 01:23:06 UTC (rev 9178)
+++ csw/mgar/pkg/ImageMagick/trunk/checksums	2010-03-15 01:49:47 UTC (rev 9179)
@@ -1,2 +1,3 @@
 fb57509760a902af5bf535b8da15fdc7  ImageMagick-6.6.0-5.tar.bz2
 6bd361fe352c7d497d60d8d2cbe7cfd4  Makefile.patch
+6e35e7434941ed6aeeabb03de76288d1  configure.diff

Added: csw/mgar/pkg/ImageMagick/trunk/files/configure.diff
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/files/configure.diff	                        (rev 0)
+++ csw/mgar/pkg/ImageMagick/trunk/files/configure.diff	2010-03-15 01:49:47 UTC (rev 9179)
@@ -0,0 +1,11 @@
+--- ImageMagick-6.6.0-5/configure.orig	2010-03-12 18:57:20.000000000 +0100
++++ ImageMagick-6.6.0-5/configure	2010-03-14 16:36:37.881895213 +0100
+@@ -28869,7 +28869,7 @@
+ 
+ #
+ # Path to ImageMagick documentation files
+-DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
++DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}"
+ DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}"
+ DEFINE_DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}/"
+ case "${build_os}" in


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