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

hson at users.sourceforge.net hson at users.sourceforge.net
Thu Mar 12 18:23:51 CET 2009 

Revision: 3737
          http://gar.svn.sourceforge.net/gar/?rev=3737&view=rev
Author:   hson
Date:     2009-03-12 17:23:51 +0000 (Thu, 12 Mar 2009)

Log Message:
-----------
imagemagick: Update to 6.4.9-10, fix dependencies, added coders from 6.2.9 for backward compatibility

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

Added Paths:
-----------
    csw/mgar/pkg/ImageMagick/trunk/files/lib_6.2.9_i.tar.gz
    csw/mgar/pkg/ImageMagick/trunk/files/lib_6.2.9_s.tar.gz

Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/Makefile	2009-03-12 16:46:53 UTC (rev 3736)
+++ csw/mgar/pkg/ImageMagick/trunk/Makefile	2009-03-12 17:23:51 UTC (rev 3737)
@@ -1,6 +1,6 @@
 GARNAME = imagemagick
 GARVERSION = 6.4.9
-GARSUBREV = 6
+GARSUBREV = 10
 CATEGORIES = lib
 
 DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images
@@ -13,12 +13,6 @@
 
 MASTER_SITES = ftp://ftp.imagemagick.org/pub/ImageMagick/
 DISTFILES  = ImageMagick-$(GARVERSION)-$(GARSUBREV).tar.bz2
-DISTFILES += libMagick++.so.10.0.4.i
-DISTFILES += libMagick++.so.10.0.4.s
-DISTFILES += libMagick.so.10.0.4.i
-DISTFILES += libMagick.so.10.0.4.s
-DISTFILES += libWand.so.10.0.4.i
-DISTFILES += libWand.so.10.0.4.s
 
 DISTNAME = ImageMagick-$(GARVERSION)-$(GARSUBREV)
 
@@ -26,11 +20,10 @@
 
 LICENSE = LICENSE
 
-REQUIRED_PKGS += CSWbzip2 CSWdjvulibre CSWfconfig CSWftype2 CSWgcc2g++rt 
-REQUIRED_PKGS += CSWggettext CSWggettextrt CSWglib2 CSWgs CSWgtk2 CSWiconv 
-REQUIRED_PKGS += CSWilmbase CSWjasper CSWjbigkit CSWjpeg CSWlcms CSWlibcairo 
-REQUIRED_PKGS += CSWlibfpx CSWlibrsvg CSWlibxml2 CSWopenexr CSWperl CSWpng 
-REQUIRED_PKGS += CSWsunmath CSWtiff CSWwmf CSWzlib
+REQUIRED_PKGS += CSWbzip2 CSWdjvulibre CSWfconfig CSWftype2 CSWggettextrt
+REQUIRED_PKGS += CSWglib2 CSWgs CSWgtk2 CSWilmbase CSWjasper CSWjbigkit
+REQUIRED_PKGS += CSWjpeg CSWlcms CSWlibcairo CSWlibfpx CSWlibrsvg CSWlibxml2
+REQUIRED_PKGS += CSWopenexr CSWperl CSWpng CSWsunmath CSWtiff CSWwmf CSWzlib
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = ImageMagick-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2
@@ -55,19 +48,25 @@
 include gar/category.mk
 
 post-install-isa-sparcv8:
-	@cp $(FILEDIR)/libMagick.so.10.0.4.s $(INSTALLISADIR)/opt/csw/lib/libMagick.so.10.0.4
-	@cp $(FILEDIR)/libWand.so.10.0.4.s $(INSTALLISADIR)/opt/csw/lib/libWand.so.10.0.4
-	@cp $(FILEDIR)/libMagick++.so.10.0.4.s $(INSTALLISADIR)/opt/csw/lib/libMagick++.so.10.0.4
-	@ln -s libMagick.so.10.0.4 $(INSTALLISADIR)/opt/csw/lib/libMagick.so.10
-	@ln -s libWand.so.10.0.4 $(INSTALLISADIR)/opt/csw/lib/libWand.so.10
-	@ln -s libMagick++.so.10.0.4 $(INSTALLISADIR)/opt/csw/lib/libMagick++.so.10
-	@ln -s ImageMagick-$(GARVERSION) $(INSTALLISADIR)/opt/csw/share/doc/ImageMagick
+	@cp $(FILEDIR)/libMagick.so.10.0.4.s $(INSTALLISADIR)$(libdir)/libMagick.so.10.0.4
+	@cp $(FILEDIR)/libWand.so.10.0.4.s $(INSTALLISADIR)$(libdir)/libWand.so.10.0.4
+	@cp $(FILEDIR)/libMagick++.so.10.0.4.s $(INSTALLISADIR)$(libdir)/libMagick++.so.10.0.4
+	@ln -s libMagick.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick.so.10
+	@ln -s libWand.so.10.0.4 $(INSTALLISADIR)$(libdir)/libWand.so.10
+	@ln -s libMagick++.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick++.so.10
+	@ln -s ImageMagick-$(GARVERSION) $(INSTALLISADIR)$(docdir)/ImageMagick
+	echo $(DESTDIR)
+	@( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/lib_6.2.9_s.tar.gz |tar xf -)
+	@$(MAKECOOKIE)
 
 post-install-isa-i386:
-	@cp $(FILEDIR)/libMagick.so.10.0.4.i $(INSTALLISADIR)/opt/csw/lib/libMagick.so.10.0.4
-	@cp $(FILEDIR)/libWand.so.10.0.4.i $(INSTALLISADIR)/opt/csw/lib/libWand.so.10.0.4
-	@cp $(FILEDIR)/libMagick++.so.10.0.4.i $(INSTALLISADIR)/opt/csw/lib/libMagick++.so.10.0.4
-	@ln -s libMagick.so.10.0.4 $(INSTALLISADIR)/opt/csw/lib/libMagick.so.10
-	@ln -s libWand.so.10.0.4 $(INSTALLISADIR)/opt/csw/lib/libWand.so.10
-	@ln -s libMagick++.so.10.0.4 $(INSTALLISADIR)/opt/csw/lib/libMagick++.so.10
-	@ln -s ImageMagick-$(GARVERSION) $(INSTALLISADIR)/opt/csw/share/doc/ImageMagick
+	@cp $(FILEDIR)/libMagick.so.10.0.4.i $(INSTALLISADIR)$(libdir)/libMagick.so.10.0.4
+	@cp $(FILEDIR)/libWand.so.10.0.4.i $(INSTALLISADIR)$(libdir)/libWand.so.10.0.4
+	@cp $(FILEDIR)/libMagick++.so.10.0.4.i $(INSTALLISADIR)$(libdir)/libMagick++.so.10.0.4
+	@ln -s libMagick.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick.so.10
+	@ln -s libWand.so.10.0.4 $(INSTALLISADIR)$(libdir)/libWand.so.10
+	@ln -s libMagick++.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick++.so.10
+	@ln -s ImageMagick-$(GARVERSION) $(INSTALLISADIR)$(docdir)/ImageMagick
+	echo $(DESTDIR)
+	@( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/lib_6.2.9_i.tar.gz |tar xf -)
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/ImageMagick/trunk/checksums
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/checksums	2009-03-12 16:46:53 UTC (rev 3736)
+++ csw/mgar/pkg/ImageMagick/trunk/checksums	2009-03-12 17:23:51 UTC (rev 3737)
@@ -1,8 +1,2 @@
-d65a4cd3cf103d49085a55c90c871854  download/ImageMagick-6.4.9-6.tar.bz2
-26ba45bf8a01f64c01973522657e1e09  download/libMagick++.so.10.0.4.i
-d4d961c6aab8c2fb4067953f80a5213b  download/libMagick++.so.10.0.4.s
-c6254fa21d534ca99be36547ce599709  download/libMagick.so.10.0.4.i
-c3da4ba416306f5c064cfcc109f69091  download/libMagick.so.10.0.4.s
-f46e2f8d0bd8f2c1206534592ebda333  download/libWand.so.10.0.4.i
-0f6e06e2d8e5b446e90be3a8ae328761  download/libWand.so.10.0.4.s
+4efbf9ba504ce228ed67e6db4c8245ff  download/ImageMagick-6.4.9-10.tar.bz2
 6bd361fe352c7d497d60d8d2cbe7cfd4  download/Makefile.patch

Added: csw/mgar/pkg/ImageMagick/trunk/files/lib_6.2.9_i.tar.gz
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/ImageMagick/trunk/files/lib_6.2.9_i.tar.gz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: csw/mgar/pkg/ImageMagick/trunk/files/lib_6.2.9_s.tar.gz
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/ImageMagick/trunk/files/lib_6.2.9_s.tar.gz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


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

More information about the devel mailing list