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

[dmichelsen at users.sourceforge.net]

Revision: 14915
          http://gar.svn.sourceforge.net/gar/?rev=14915&view=rev
Author:   dmichelsen
Date:     2011-06-27 12:25:37 +0000 (Mon, 27 Jun 2011)

Log Message:
-----------
ImageMagick: Update to 6.7.0-8, fix dupe of bin/compare, update deps, fix perl module package

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

Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/Makefile	2011-06-27 12:21:56 UTC (rev 14914)
+++ csw/mgar/pkg/ImageMagick/trunk/Makefile	2011-06-27 12:25:37 UTC (rev 14915)
@@ -1,6 +1,6 @@
 NAME = imagemagick
 VERSION = 6.7.0
-GARSUBREV = 7
+GARSUBREV = 8
 CATEGORIES = lib
 
 DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images
@@ -26,7 +26,7 @@
 SPKG_DESC_CSWlibmagick++4 += Library from ImageMagick, libMagick++.so.4
 RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWlibltdl7
 RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWjpeg
-RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWlcmsrt
+RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWliblcms2-2
 RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWliblqr
 RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWtiff
@@ -45,7 +45,7 @@
 SPKG_DESC_CSWlibmagickcore4 += Library from ImageMagick, libMagickCore.so.4
 RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWlibltdl7
 RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWjpeg
-RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWlcmsrt
+RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWliblcms2-2
 RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWliblqr
 RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWtiff
@@ -65,7 +65,7 @@
 SPKG_DESC_CSWlibmagickwand4 += Library from ImageMagick, libMagickWand.so.4
 RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWlibltdl7
 RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWjpeg
-RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWlcmsrt
+RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWliblcms2-2
 RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWliblqr
 RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWtiff
@@ -80,6 +80,8 @@
 
 PACKAGES += CSWimagemagick-dev
 SPKG_DESC_CSWimagemagick-dev = Development files for ImageMagick libraries
+# In man3 there is just the manpage for the Perl module
+PKGFILES_DEVEL_MAN3_MANPAGE =
 PKGFILES_CSWimagemagick-dev += $(PKGFILES_DEVEL)
 PKGFILES_CSWimagemagick-dev += $(docdir)/.*
 RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagick++4
@@ -94,7 +96,7 @@
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickcore4
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickwand4
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlcmsrt
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWliblcms2-2
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWbzip2
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWilmbase
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWpng
@@ -124,22 +126,26 @@
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmf0-2-7
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmflite0-2-7
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWliblzma5
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwebp0
 
 PACKAGES += CSWpm-image-magick
 SPKG_DESC_CSWpm-image-magick = Image::Magick: Perl binding for Imagemagick
 PKGFILES_CSWpm-image-magick += $(libdir)/perl/.*
+PKGFILES_CSWpm-image-magick += $(mandir)/.*\.3perl
+
 RUNTIME_DEP_PKGS_CSWpm-image-magick += CSWperl
 RUNTIME_DEP_PKGS_CSWpm-image-magick += CSWlibmagickcore4
 
 BUILD_DEP_PKGS += CSWdjvulibredevel
 BUILD_DEP_PKGS += CSWgraphvizdevel
 BUILD_DEP_PKGS += CSWilmbasedevel
-BUILD_DEP_PKGS += CSWlcmsdevel
+BUILD_DEP_PKGS += CSWliblcms-dev
 BUILD_DEP_PKGS += CSWlibcairodevel
 BUILD_DEP_PKGS += CSWliblqrdevel
 BUILD_DEP_PKGS += CSWlibwmf-dev
 BUILD_DEP_PKGS += CSWliblzma-dev
 BUILD_DEP_PKGS += CSWopenexrdevel
+BUILD_DEP_PKGS += CSWlibwebp-dev
 
 EXTRA_LINKER_FLAGS = -norunpath
 
@@ -154,6 +160,10 @@
 #   FAIL: Magick++/tests/coderInfo.sh
 EXTRA_LIB = /usr/openwin/lib
 
+# We especially don't want ISALIST for the above /usr/openwin/lib
+# This should be reworked after a general rework of ISALIST in GAR
+RUNPATH_ISALIST = $(libpath_install)
+
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-perl=$(bindir)/perl
 CONFIGURE_ARGS += --enable-shared --disable-static
@@ -193,7 +203,8 @@
 EXTRA_MERGE_EXCLUDE_FILES += .*/perllocal.pod
 EXTRA_MERGE_EXCLUDE_FILES += .*/\.packlist
 
-EXTRA_PAX_ARGS = -s ',$(bindir)/compare,$(bindir)/compare-imagemagick,'
+EXTRA_PAX_ARGS += -s ',$(bindir)/compare,$(bindir)/compare-imagemagick,'
+EXTRA_PAX_ARGS += -s ',$(mandir)/man1/compare\.1,$(mandir)/man1/compare-imagemagick.1,'
 
 STRIP_LIBTOOL = 1
 

Modified: csw/mgar/pkg/ImageMagick/trunk/checksums
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/checksums	2011-06-27 12:21:56 UTC (rev 14914)
+++ csw/mgar/pkg/ImageMagick/trunk/checksums	2011-06-27 12:25:37 UTC (rev 14915)
@@ -1 +1 @@
-b4fbc24494b6bcbb5b8b6b75077f46b8  ImageMagick-6.7.0-7.tar.xz
+67d8631c20fc9a2409343c02b159407d  ImageMagick-6.7.0-8.tar.xz


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