[csw-devel] SF.net SVN: gar:[14729] csw/mgar/pkg/ImageMagick/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Jun 7 17:32:17 CEST 2011
Revision: 14729
http://gar.svn.sourceforge.net/gar/?rev=14729&view=rev
Author: dmichelsen
Date: 2011-06-07 15:32:17 +0000 (Tue, 07 Jun 2011)
Log Message:
-----------
ImageMagick: Update to 6.7.0-4, complete rework
Modified Paths:
--------------
csw/mgar/pkg/ImageMagick/trunk/Makefile
csw/mgar/pkg/ImageMagick/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/ImageMagick/trunk/files/Makefile.patch
csw/mgar/pkg/ImageMagick/trunk/files/configure.diff
Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/Makefile 2011-06-07 15:06:34 UTC (rev 14728)
+++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2011-06-07 15:32:17 UTC (rev 14729)
@@ -1,6 +1,6 @@
NAME = imagemagick
-VERSION = 6.6.0
-GARSUBREV = 9
+VERSION = 6.7.0
+GARSUBREV = 4
CATEGORIES = lib
DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images
@@ -12,179 +12,265 @@
endef
MASTER_SITES = ftp://ftp.imagemagick.org/pub/ImageMagick/
-DISTFILES = ImageMagick-$(VERSION)-$(GARSUBREV).tar.bz2
-
DISTNAME = ImageMagick-$(VERSION)-$(GARSUBREV)
+DISTFILES = $(DISTNAME).tar.xz
-SPKG_SOURCEURL = http://www.imagemagick.org
+VENDOR_URL = http://www.imagemagick.org
LICENSE = LICENSE
+# Shared library suffix .10 has been used to mean "1.0"
+
+#PACKAGES += CSWlibmagick++10
+#PKGFILES_CSWlibmagick++10 += $(call pkgfiles_lib,libMagick++.so.10)
+#SPKG_DESC_CSWlibmagick++10 += Library from ImageMagick, libMagick++.so.10
+#RUNTIME_DEP_PKGS_CSWlibmagick++10 += CSWlibwand10
+#RUNTIME_DEP_PKGS_CSWlibmagick++10 += CSWftype2
+#RUNTIME_DEP_PKGS_CSWlibmagick++10 += CSWlibmagick10
+#RUNTIME_DEP_PKGS_CSWlibmagick++10 += CSWsunmath
+#RUNTIME_DEP_PKGS_CSWlibmagick++10 += CSWzlib
+
+#PACKAGES += CSWlibmagick++2
+#PKGFILES_CSWlibmagick++2 += $(call pkgfiles_lib,libMagick++.so.2)
+#SPKG_DESC_CSWlibmagick++2 += Library from ImageMagick, libMagick++.so.2
+#RUNTIME_DEP_PKGS_CSWlibmagick++2 += CSWlibmagickwand2
+#RUNTIME_DEP_PKGS_CSWlibmagick++2 += CSWjpeg
+#RUNTIME_DEP_PKGS_CSWlibmagick++2 += CSWlcmsrt
+#RUNTIME_DEP_PKGS_CSWlibmagick++2 += CSWtiff
+#RUNTIME_DEP_PKGS_CSWlibmagick++2 += CSWzlib
+#RUNTIME_DEP_PKGS_CSWlibmagick++2 += CSWftype2
+#RUNTIME_DEP_PKGS_CSWlibmagick++2 += CSWlibmagickcore2
+#RUNTIME_DEP_PKGS_CSWlibmagick++2 += CSWfconfig
+
+PACKAGES += CSWlibmagick++4
+PKGFILES_CSWlibmagick++4 += $(call pkgfiles_lib,libMagick++.so.4)
+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 += CSWliblqr
+RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWtiff
+RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWlibmagickcore4
+RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWzlib
+RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWftype2
+RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWbzip2
+RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWlibmagickwand4
+RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWfconfig
+RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWglib2
+RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWlibfftw3-3
+RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWliblzma5
+
+
+#PACKAGES += CSWlibmagick10
+#PKGFILES_CSWlibmagick10 += $(call pkgfiles_lib,libMagick.so.10)
+#SPKG_DESC_CSWlibmagick10 += Library from ImageMagick, libMagick.so.10
+#RUNTIME_DEP_PKGS_CSWlibmagick10 += CSWjpeg
+#RUNTIME_DEP_PKGS_CSWlibmagick10 += CSWsunmath
+#RUNTIME_DEP_PKGS_CSWlibmagick10 += CSWtiff
+#RUNTIME_DEP_PKGS_CSWlibmagick10 += CSWzlib
+#RUNTIME_DEP_PKGS_CSWlibmagick10 += CSWftype2
+#RUNTIME_DEP_PKGS_CSWlibmagick10 += CSWlcmsrt
+#RUNTIME_DEP_PKGS_CSWlibmagick10 += CSWbzip2
+#RUNTIME_DEP_PKGS_CSWlibmagick10 += CSWfconfig
+
+#PACKAGES += CSWlibmagickcore2
+#PKGFILES_CSWlibmagickcore2 += $(call pkgfiles_lib,libMagickCore.so.2)
+#SPKG_DESC_CSWlibmagickcore2 += Library from ImageMagick, libMagickCore.so.2
+#RUNTIME_DEP_PKGS_CSWlibmagickcore2 += CSWjpeg
+#RUNTIME_DEP_PKGS_CSWlibmagickcore2 += CSWlcmsrt
+#RUNTIME_DEP_PKGS_CSWlibmagickcore2 += CSWtiff
+#RUNTIME_DEP_PKGS_CSWlibmagickcore2 += CSWzlib
+#RUNTIME_DEP_PKGS_CSWlibmagickcore2 += CSWftype2
+#RUNTIME_DEP_PKGS_CSWlibmagickcore2 += CSWfconfig
+
+PACKAGES += CSWlibmagickcore4
+PKGFILES_CSWlibmagickcore4 += $(call pkgfiles_lib,libMagickCore.so.4)
+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 += CSWliblqr
+RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWtiff
+RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWzlib
+RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWftype2
+RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWbzip2
+RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWfconfig
+RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWglib2
+RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWlibfftw3-3
+RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWliblzma5
+# Gnuplot is detected by the magic cookie #!/usr/local/bin/gnuplot
+# XXX: Is this correct?
+CHECKPKG_OVERRIDES_CSWlibmagickcore4 += file-with-bad-content|/usr/local|root/opt/csw/lib/libMagickCore.so.4.0.1
+
+#PACKAGES += CSWlibmagickwand2
+#PKGFILES_CSWlibmagickwand2 += $(call pkgfiles_lib,libMagickWand.so.2)
+#SPKG_DESC_CSWlibmagickwand2 += Library from ImageMagick, libMagickWand.so.2
+#RUNTIME_DEP_PKGS_CSWlibmagickwand2 += CSWjpeg
+#RUNTIME_DEP_PKGS_CSWlibmagickwand2 += CSWlcmsrt
+#RUNTIME_DEP_PKGS_CSWlibmagickwand2 += CSWtiff
+#RUNTIME_DEP_PKGS_CSWlibmagickwand2 += CSWzlib
+#RUNTIME_DEP_PKGS_CSWlibmagickwand2 += CSWftype2
+#RUNTIME_DEP_PKGS_CSWlibmagickwand2 += CSWlibmagickcore2
+#RUNTIME_DEP_PKGS_CSWlibmagickwand2 += CSWfconfig
+
+PACKAGES += CSWlibmagickwand4
+PKGFILES_CSWlibmagickwand4 += $(call pkgfiles_lib,libMagickWand.so.4)
+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 += CSWliblqr
+RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWtiff
+RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWlibmagickcore4
+RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWzlib
+RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWftype2
+RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWbzip2
+RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWfconfig
+RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWglib2
+RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWlibfftw3-3
+RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWliblzma5
+
+#PACKAGES += CSWlibwand10
+#PKGFILES_CSWlibwand10 += $(call pkgfiles_lib,libWand.so.10)
+#SPKG_DESC_CSWlibwand10 += Library from ImageMagick, libWand.so.10
+#RUNTIME_DEP_PKGS_CSWlibwand10 += CSWftype2
+#RUNTIME_DEP_PKGS_CSWlibwand10 += CSWsunmath
+#RUNTIME_DEP_PKGS_CSWlibwand10 += CSWlibmagick10
+#RUNTIME_DEP_PKGS_CSWlibwand10 += CSWzlib
+
+PACKAGES += CSWimagemagick-dev
+SPKG_DESC_CSWimagemagick-dev = Development files for ImageMagick libraries
+PKGFILES_CSWimagemagick-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSWimagemagick-dev += $(docdir)/.*
+RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagick++4
+RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickcore4
+RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickwand4
+RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWperl
+# This is all in /opt/csw/share/doc
+CHECKPKG_OVERRIDES_CSWimagemagick-dev += file-with-bad-content
+
+PACKAGES += CSWimagemagick
+SPKG_DESC_CSWimagemagick = A comprehensive package supporting automated and interative manipulation of images
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickcore4
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickwand4
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlcmsrt
RUNTIME_DEP_PKGS_CSWimagemagick += CSWbzip2
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWdjvulibrert
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWfconfig
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWftype2
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWggettextrt
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWilmbase
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWpng
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWgtk2
RUNTIME_DEP_PKGS_CSWimagemagick += CSWglib2
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgvc6
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibcdt5
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgraph5
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWgs
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWgtk2
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWilmbase
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibltdl7
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWjpeg
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibfpx
RUNTIME_DEP_PKGS_CSWimagemagick += CSWjasper
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWtiff
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWfconfig
RUNTIME_DEP_PKGS_CSWimagemagick += CSWjbigkit
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWjpeg
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlcmsrt
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibcairo
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibfpx
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibice
RUNTIME_DEP_PKGS_CSWimagemagick += CSWliblqr
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibcdt5
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWzlib
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWftype2
RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibrsvg
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibsm
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibtoolrt
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibx11
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxext
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxml2
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxt
RUNTIME_DEP_PKGS_CSWimagemagick += CSWopenexrrt
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWdjvulibrert
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgraph5
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibcairo
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgvc6
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWgcc3g++rt
RUNTIME_DEP_PKGS_CSWimagemagick += CSWperl
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWpng
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWsunmath
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWtiff
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWzlib
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibintl3
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmf
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibfftw3-3
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmf0-2-7
RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmflite0-2-7
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibltdl7
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWliblzma5
-# these should go when rsvg & xml fixed on unstable
-CHECKPKG_OVERRIDES_CSWimagemagick += missing-dependency|CSWlibxml2-2
-CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWggettextrt
-CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWlibcairo
-CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWlibtoolrt
-CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWlibxml2
-CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWlibwmf
-
BUILD_DEP_PKGS += CSWdjvulibredevel
BUILD_DEP_PKGS += CSWgraphvizdevel
BUILD_DEP_PKGS += CSWilmbasedevel
BUILD_DEP_PKGS += CSWlcmsdevel
BUILD_DEP_PKGS += CSWlibcairodevel
BUILD_DEP_PKGS += CSWliblqrdevel
-BUILD_DEP_PKGS += CSWlibwmfdevel
+BUILD_DEP_PKGS += CSWlibwmf-dev
+BUILD_DEP_PKGS += CSWliblzma-dev
BUILD_DEP_PKGS += CSWopenexrdevel
-BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWimagemagick)
-# I want to say something rude about libtool and the entire shared lib world!
-# Hoping most of this will get fixed by uninstalling imagemagic during build.
-CHECKPKG_OVERRIDES_CSWimagemagick += non-uniform-lib-versions-in-package|sonames=libMagick++.so.10,libMagick++.so.2,libMagick++.so.3,libMagick.so.10,libMagickCore.so.2,libMagickCore.so.3,libMagickWand.so.2,libMagickWand.so.3,libWand.so.10
-CHECKPKG_OVERRIDES_CSWimagemagick += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libMagickCore.so
-CHECKPKG_OVERRIDES_CSWimagemagick += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libMagickWand.so
-CHECKPKG_OVERRIDES_CSWimagemagick += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libMagick++.so
-CHECKPKG_OVERRIDES_CSWimagemagick += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libMagickCore.so
-CHECKPKG_OVERRIDES_CSWimagemagick += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libMagickWand.so
-CHECKPKG_OVERRIDES_CSWimagemagick += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libMagick++.so
-CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/libMagick++.so.10.0.4
-CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/libMagick++.so.3.0.0
-CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/libMagick++.so.3.0.0
-CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/libMagick++.so.3.0.0
-CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/lib|opt/csw/lib/libMagick++.so.3.0.0
-CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/studio/SOS11/SUNWspro/lib/rw7|opt/csw/lib/libMagick++.so.2.0.0
-CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/studio/SOS11/SUNWspro/lib/v8|opt/csw/lib/libMagick++.so.2.0.0
-CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/studio/SOS11/SUNWspro/lib|opt/csw/lib/libMagick++.so.2.0.0
-CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/libMagick++.so.2.0.0
-CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/libMagick++.so.2.0.0
-CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/lib|opt/csw/lib/libMagick++.so.2.0.0
-CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/studio/SOS8/SUNWspro/lib/rw7|opt/csw/lib/libMagick++.so.10.0.4
-CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/studio/SOS8/SUNWspro/lib/v8|opt/csw/lib/libMagick++.so.10.0.4
-CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/studio/SOS8/SUNWspro/lib|opt/csw/lib/libMagick++.so.10.0.4
-CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/libMagick++.so.10.0.4
+EXTRA_LINKER_FLAGS = -norunpath
-# pffft! don't bug me!
-CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/ImageMagick-6.6.0/config/mime.xml
-CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/ImageMagick-6.6.0/ChangeLog
-CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ImageMagick/www/api/MagickCore/magick-config_8h-source.html
-CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ImageMagick/www/api/MagickCore/version_8h.html
-CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ImageMagick/www/perl-magick.html
-CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ImageMagick/www/api/MagickCore/magick-config_8h.html
-CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ImageMagick/www/resources.html
-CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ImageMagick/www/advanced-unix-installation.html
-CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ImageMagick/www/changelog.html
-CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/lib/libMagickCore.so.2.0.0
-CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ImageMagick/www/install-source.html
-CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/lib/libMagick.so.10.0.4
-CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/lib/libMagickCore.so.3.0.0
+# Somehow the above flag does not make it to the linker
+CHECKPKG_OVERRIDES_CSWlibmagick++4 += bad-rpath-entry|/lib|opt/csw/lib/libMagick++.so.4.0.1
+CHECKPKG_OVERRIDES_CSWlibmagick++4 += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/libMagick++.so.4.0.1
+CHECKPKG_OVERRIDES_CSWlibmagick++4 += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/libMagick++.so.4.0.1
+CHECKPKG_OVERRIDES_CSWlibmagick++4 += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/libMagick++.so.4.0.1
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = ImageMagick-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2
-
-CONFIGURE_ARGS_COMMON = $(DIRPATHS)
-CONFIGURE_ARGS_COMMON += --with-perl=$(bindir)/perl
-CONFIGURE_ARGS_COMMON += --enable-shared --disable-static
-CONFIGURE_ARGS_COMMON += --with-dps=yes
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --with-perl=$(bindir)/perl
+CONFIGURE_ARGS += --enable-shared --disable-static
+CONFIGURE_ARGS += --with-dps=yes
# Ghostscript lib is linked to Sun X11
-CONFIGURE_ARGS_COMMON += --with-gslib=no
-CONFIGURE_ARGS_COMMON += --x-includes=/opt/csw/X11/include
-CONFIGURE_ARGS_COMMON += --x-libraries=/opt/csw/X11/lib
+# CONFIGURE_ARGS += --with-gslib=no
# Solaris 8 and 9 doesn't have complex.h
-CONFIGURE_ARGS_COMMON += --without-fftw
-CONFIGURE_ARGS_COMMON += --with-modules=yes
+# CONFIGURE_ARGS += --without-fftw
+CONFIGURE_ARGS += --with-modules=yes
# Let's try to use openmp and see what it does for performance
-#CONFIGURE_ARGS_COMMON += --disable-openmp
-CONFIGURE_ARGS_COMMON += --disable-silent-rules
+#CONFIGURE_ARGS += --disable-openmp
+CONFIGURE_ARGS += --disable-silent-rules
+
# Until librsvg,graphviz and perl is 64bit
-#CONFIGURE_ARGS_isa-amd64 += --without-gvc
-#CONFIGURE_ARGS_isa-amd64 += --without-rsvg
-#CONFIGURE_ARGS_isa-amd64 += --without-perl
-#CONFIGURE_ARGS_isa-sparcv9 += --without-gvc
-#CONFIGURE_ARGS_isa-sparcv9 += --without-rsvg
-#CONFIGURE_ARGS_isa-sparcv9 += --without-perl
+CONFIGURE_ARGS-64 += --without-gvc
+CONFIGURE_ARGS-64 += --without-rsvg
+CONFIGURE_ARGS-64 += --without-perl
+CONFIGURE_ARGS-64 += --without-gvc
+CONFIGURE_ARGS-64 += --without-rsvg
+CONFIGURE_ARGS-64 += --without-perl
+CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
-CONFIGURE_ARGS = $(CONFIGURE_ARGS_COMMON) $(foreach M,$(MODULATIONS),$(CONFIGURE_ARGS_$M))
+# One test is failing:
+# FAIL: Magick++/tests/attributes.sh
+# This has been reported upstream at
+# http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=18889
+SKIPTEST ?= 1
-PATCHFILES += Makefile.patch
-PATCHFILES += configure.diff
-
-# Test has to be run *after* install
-#TEST_TARGET = check
-TEST_TARGET =
-
-#Dependencies not 64-bit yet
+# Dependencies not 64-bit yet
#BUILD64 = 1
-EXTRA_INC = $(prefix)/X11/include
-EXTRA_LIB = $(prefix)/X11/lib
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
-#EXTRA_LDFLAGS = -L./magick/.libs
-#EXTRA_LD_OPTIONS = -L./magick/.libs
-#
-EXTRA_SOS_LD_FLAGS += -L$(shell pwd)/$(WORKSRC)/magick/.libs
-EXTRA_SOS_LD_FLAGS += -L$(shell pwd)/$(WORKSRC)/wand/.libs
-# We want to be link with Xrender from $(prefix)/X11/lib not $(prefix)/lib
-# since the latter is linked to /usr/openwin/lib/libX11.so.4
-EXTRA_SOS_LD_FLAGS += -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
+# This is for coders/dps.so to find libdps.so.5 and libdpstk.so.5
+# EXTRA_LIB = /usr/openwin/lib
+# Is this really a problem?
+CHECKPKG_OVERRIDES_CSWimagemagick += soname-not-found|libdps.so.5|is|needed|by|opt/csw/lib/ImageMagick-6.7.0/modules-Q16/coders/dps.so
+CHECKPKG_OVERRIDES_CSWimagemagick += soname-not-found|libdpstk.so.5|is|needed|by|opt/csw/lib/ImageMagick-6.7.0/modules-Q16/coders/dps.so
+# Only remove libtool files from the public lib directory, keep the private ones for libtool dlopn
MERGE_EXCLUDE_LIBTOOL ?= $(libdir)/lib.*\.la
+
EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod
-STRIP_LIBTOOL=1
+STRIP_LIBTOOL = 1
+
include gar/category.mk
SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(GARSUBREV)
-post-install-isa-sparcv8:
- @( 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
- @mv $(INSTALLISADIR)$(bindir)/compare $(INSTALLISADIR)$(bindir)/compare2
- @$(MAKECOOKIE)
+#post-install-isa-sparcv8:
+# @( 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
+# @mv $(INSTALLISADIR)$(bindir)/compare $(INSTALLISADIR)$(bindir)/compare2
+# @$(MAKECOOKIE)
+#
+#post-install-isa-i386:
+# @( 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
+# @mv $(INSTALLISADIR)$(bindir)/compare $(INSTALLISADIR)$(bindir)/compare2
+# @$(MAKECOOKIE)
-post-install-isa-i386:
- @( 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
- @mv $(INSTALLISADIR)$(bindir)/compare $(INSTALLISADIR)$(bindir)/compare2
- @$(MAKECOOKIE)
+post-install-modulated:
+ perl -pi \
+ -e 's,/usr/local/bin,$(bindir),g' \
+ $(DESTDIR)$(sysconfdir)/ImageMagick/mime.xml
Modified: csw/mgar/pkg/ImageMagick/trunk/checksums
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/checksums 2011-06-07 15:06:34 UTC (rev 14728)
+++ csw/mgar/pkg/ImageMagick/trunk/checksums 2011-06-07 15:32:17 UTC (rev 14729)
@@ -1,3 +1 @@
-c04030c3d4649bee4d6a891a16e031a3 ImageMagick-6.6.0-9.tar.bz2
-6bd361fe352c7d497d60d8d2cbe7cfd4 Makefile.patch
-6e35e7434941ed6aeeabb03de76288d1 configure.diff
+90a0fdff3ef323314a3470a0d355d6ca ImageMagick-6.7.0-4.tar.xz
Deleted: csw/mgar/pkg/ImageMagick/trunk/files/Makefile.patch
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/files/Makefile.patch 2011-06-07 15:06:34 UTC (rev 14728)
+++ csw/mgar/pkg/ImageMagick/trunk/files/Makefile.patch 2011-06-07 15:32:17 UTC (rev 14729)
@@ -1,11 +0,0 @@
---- ImageMagick-6.4.9-4.orig/Makefile.in 2009-02-12 23:04:45.000000000 +0100
-+++ ImageMagick-6.4.9-4/Makefile.in 2009-02-18 07:30:25.392728347 +0100
-@@ -2929,7 +2929,7 @@
- coders_fpx_la_SOURCES = coders/fpx.c
- coders_fpx_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
- coders_fpx_la_LDFLAGS = $(MODULECOMMONFLAGS)
--coders_fpx_la_LIBADD = $(MAGICKCORE_LIBS) $(FPX_LIBS) -lstdc++
-+coders_fpx_la_LIBADD = $(MAGICKCORE_LIBS) $(FPX_LIBS)
-
- # GIF coder module
- coders_gif_la_SOURCES = coders/gif.c
Deleted: csw/mgar/pkg/ImageMagick/trunk/files/configure.diff
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/files/configure.diff 2011-06-07 15:06:34 UTC (rev 14728)
+++ csw/mgar/pkg/ImageMagick/trunk/files/configure.diff 2011-06-07 15:32:17 UTC (rev 14729)
@@ -1,11 +0,0 @@
---- 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.
More information about the devel
mailing list