Revision: 25695
http://sourceforge.net/p/gar/code/25695
Author: lblume
Date: 2016-05-05 11:25:24 +0000 (Thu, 05 May 2016)
Log Message:
-----------
ImageMagick/trunk: Adjust packaging according to mgar's advice for the new
version
Modified Paths:
--------------
csw/mgar/pkg/ImageMagick/trunk/Makefile
Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/Makefile 2016-05-05 10:58:19 UTC (rev
25694)
+++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2016-05-05 11:25:24 UTC (rev
25695)
@@ -5,7 +5,7 @@
#BETAREV = beta20140518
GARTYPE = v2
-DESCRIPTION = A comprehensive package supporting automated and interative
manipulation of images
+DESCRIPTION = A comprehensive package for the manipulation of images
define BLURB
ImageMagick is a robust collection of tools and libraries offered under a
usage license to read, write, and manipulate an image in many image formats
@@ -52,42 +52,40 @@
BUILD_DEP_PKGS += CSWgraphviz-dev
BUILD_DEP_PKGS += CSWlibfftw-dev
-PACKAGES += CSWlibmagickcore6q16hdri2
-CATALOGNAME_CSWlibmagickcore6q16hdri2 = libmagickcore6q16hdri2
-SPKG_DESC_CSWlibmagickcore6q16hdri2 += Library from ImageMagick,
libMagickCore-6.Q16HDRI.so.2
-PKGFILES_CSWlibmagickcore6q16hdri2 += $(call
baseisadirs,$(libdir),libMagickCore-6\.Q16HDRI\.so\.2\.0\.0)
-PKGFILES_CSWlibmagickcore6q16hdri2 += $(call
baseisadirs,$(libdir),libMagickCore-6\.Q16HDRI\.so\.2(\.\d+)*)
-RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibltdl7
-RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWliblcms2-2
-RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWliblqr1-0
-RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibbz2-1-0
-RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibfftw3-3
-RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibgomp1
-RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibgcc-s1
+PACKAGES += CSWlibmagickcore7q16hdri0
+SPKG_DESC_CSWlibmagickcore7q16hdri0 += $(DESCRIPTION),
libMagickCore-7.Q16HDRI.so.0
+CATALOGNAME_CSWlibmagickcore7q16hdri0 = libmagickcore7q16hdri0
+PKGFILES_CSWlibmagickcore7q16hdri0 += $(call
baseisadirs,$(libdir),libMagickCore-7\.Q16HDRI\.so\.0\.0\.0)
+PKGFILES_CSWlibmagickcore7q16hdri0 += $(call
baseisadirs,$(libdir),libMagickCore-7\.Q16HDRI\.so\.0(\.\d+)*)
-PACKAGES += CSWlibmagickwand6q16hdri2
-CATALOGNAME_CSWlibmagickwand6q16hdri2 = libmagickwand6q16hdri2
-SPKG_DESC_CSWlibmagickwand6q16hdri2 += Library from ImageMagick,
libMagickWand-6.Q16HDRI.so.2
-PKGFILES_CSWlibmagickwand6q16hdri2 += $(call
baseisadirs,$(libdir),libMagickWand-6\.Q16HDRI\.so\.2\.0\.0)
-PKGFILES_CSWlibmagickwand6q16hdri2 += $(call
baseisadirs,$(libdir),libMagickWand-6\.Q16HDRI\.so\.2(\.\d+)*)
-PKGFILES_CSWlibmagickwand6q16hdri2 += $(call
baseisadirs,$(libdir),libMagickWand-6\.Q16HDRI\.so\.2\.0\.0)
-PKGFILES_CSWlibmagickwand6q16hdri2 += $(call
baseisadirs,$(libdir),libMagickWand-6\.Q16HDRI\.so\.2(\.\d+)*)
-RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibmagickcore6q16hdri2
-RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibgomp1
-RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibgcc-s1
+PACKAGES += CSWlibmagickwand7q16hdri0
+SPKG_DESC_CSWlibmagickwand7q16hdri0 += $(DESCRIPTION),
libMagickWand-7.Q16HDRI.so.0
+CATALOGNAME_CSWlibmagickwand7q16hdri0 = libmagickwand7q16hdri0
+PKGFILES_CSWlibmagickwand7q16hdri0 += $(call
baseisadirs,$(libdir),libMagickWand-7\.Q16HDRI\.so\.0\.0\.0)
+PKGFILES_CSWlibmagickwand7q16hdri0 += $(call
baseisadirs,$(libdir),libMagickWand-7\.Q16HDRI\.so\.0(\.\d+)*)
+RUNTIME_DEP_PKGS_CSWlibmagickcore7q16hdri0 += CSWlibltdl7
+RUNTIME_DEP_PKGS_CSWlibmagickcore7q16hdri0 += CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWlibmagickcore7q16hdri0 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibmagickcore7q16hdri0 += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWlibmagickcore7q16hdri0 += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibmagickcore7q16hdri0 += CSWliblcms2-2
+RUNTIME_DEP_PKGS_CSWlibmagickcore7q16hdri0 += CSWliblqr1-0
+RUNTIME_DEP_PKGS_CSWlibmagickcore7q16hdri0 += CSWlibfftw3-3
+RUNTIME_DEP_PKGS_CSWlibmagickcore7q16hdri0 += CSWlibgomp1
+RUNTIME_DEP_PKGS_CSWlibmagickcore7q16hdri0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibmagickwand7q16hdri0 += CSWlibmagickcore7q16hdri0
+RUNTIME_DEP_PKGS_CSWlibmagickwand7q16hdri0 += CSWlibgomp1
+RUNTIME_DEP_PKGS_CSWlibmagickwand7q16hdri0 += CSWlibgcc-s1
-PACKAGES += CSWlibmagick++6q16hdri6
-CATALOGNAME_CSWlibmagick++6q16hdri6 = libmagick++6q16hdri6
-PKGFILES_CSWlibmagick++6q16hdri6 += $(call
baseisadirs,$(libdir),libMagick\+\+-6\.Q16HDRI\.so\.6\.0\.0)
-PKGFILES_CSWlibmagick++6q16hdri6 += $(call
baseisadirs,$(libdir),libMagick\+\+-6\.Q16HDRI\.so\.6(\.\d+)*)
-SPKG_DESC_CSWlibmagick++6q16hdri6 += Library from ImageMagick,
libMagick++-6.Q16HDRI.so.6
-RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri6 += CSWlibmagickcore6q16hdri2
-RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri6 += CSWlibmagickwand6q16hdri2
-RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri6 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri6 += CSWlibstdc++6
+PACKAGES += CSWlibmagick++7q16hdri0
+SPKG_DESC_CSWlibmagick++7q16hdri0 += $(DESCRIPTION), libMagick++-7.Q16HDRI.so.0
+CATALOGNAME_CSWlibmagick++7q16hdri0 = libmagick++7q16hdri0
+PKGFILES_CSWlibmagick++7q16hdri0 += $(call
baseisadirs,$(libdir),libMagick\+\+-7\.Q16HDRI\.so\.0\.0\.0)
+PKGFILES_CSWlibmagick++7q16hdri0 += $(call
baseisadirs,$(libdir),libMagick\+\+-7\.Q16HDRI\.so\.0(\.\d+)*)
+RUNTIME_DEP_PKGS_CSWlibmagick++7q16hdri0 += CSWlibmagickcore7q16hdri0
+RUNTIME_DEP_PKGS_CSWlibmagick++7q16hdri0 += CSWlibmagickwand7q16hdri0
+RUNTIME_DEP_PKGS_CSWlibmagick++7q16hdri0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibmagick++7q16hdri0 += CSWlibstdc++6
PACKAGES += CSWimagemagick-dev
SPKG_DESC_CSWimagemagick-dev = Development files for ImageMagick libraries
@@ -96,16 +94,16 @@
PKGFILES_CSWimagemagick-dev += $(PKGFILES_DEVEL)
PKGFILES_CSWimagemagick-dev += $(docdir)/.*
RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWimagemagick
-RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickcore6q16hdri2
-RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickwand6q16hdri2
-RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagick++6q16hdri6
+RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickcore7q16hdri0
+RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickwand7q16hdri0
+RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagick++7q16hdri0
RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWperl
PACKAGES += CSWimagemagick
SPKG_DESC_CSWimagemagick = A comprehensive package supporting automated and
interative manipulation of images
# PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickcore6q16hdri2
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickwand6q16hdri2
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickcore7q16hdri0
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickwand7q16hdri0
RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibbz2-1-0
RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgobject2-0-0
RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibjpeg7
@@ -152,8 +150,10 @@
#RUNTIME_DEP_PKGS_CSWpm-image-magick += CSWperl
#RUNTIME_DEP_PKGS_CSWpm-image-magick += CSWlibmagickcore6q16hdri1
-# No binary in that package, since no 64 bit perl
-#CHECKPKG_OVERRIDES_CSWpm-image-magick += 64-bit-binaries-missing
+# No idea where that comes from? grep does not find it in those files
+CHECKPKG_OVERRIDES_CSWlibmagickcore7q16hdri0 +=
file-with-bad-content|/usr/local|root/opt/csw/lib/libMagickCore-7.Q16HDRI.so.0.0.0
+CHECKPKG_OVERRIDES_CSWlibmagickcore7q16hdri0 +=
file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libMagickCore-7.Q16HDRI.so.0.0.0
+CHECKPKG_OVERRIDES_CSWlibmagickcore7q16hdri0 +=
file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libMagickCore-7.Q16HDRI.so.0.0.0
REINPLACE_USRLOCAL += config/mime.xml
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
