imagemagick: update to 7.0.7-30

Take benefits of generic support for non startable package
Resolves #3301

cross/freetype/PLIST

@@ -1,4 +1,4 @@
-bin:bin/freetype-config
+rsc:bin/freetype-config
 lnk:lib/libfreetype.so
 lnk:lib/libfreetype.so.6
 lib:lib/libfreetype.so.6.16.0

cross/imagemagick/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = ImageMagick
-PKG_VERS = 6.9.5-10
+PKG_VERS = 7.0.7-30
 PKG_EXT = tar.xz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = http://www.imagemagick.org/download/releases
@@ -18,17 +18,17 @@ GNU_CONFIGURE = 1
 CONFIGURE_ARGS = --disable-installed --without-perl --without-x --without-fpx --without-wmf --disable-openmp
 
 
-INSTALL_TARGET = myInstall
+INSTALL_TARGET = imagemagick_extra_install
 
 include ../../mk/spksrc.cross-cc.mk
 
-myInstall:
+imagemagick_extra_install:
 	$(RUN) make install prefix=$(STAGING_INSTALL_PREFIX) \
-	SHARE_PATH=$(STAGING_INSTALL_PREFIX)/share/ImageMagick-6/ \
+	SHARE_PATH=$(STAGING_INSTALL_PREFIX)/share/ImageMagick-7/ \
-	DATA_DIR=$(STAGING_INSTALL_PREFIX)/share/ImageMagick-6/ \
+	DATA_DIR=$(STAGING_INSTALL_PREFIX)/share/ImageMagick-7/ \
 	CONFIGURE_PATH=$(STAGING_INSTALL_PREFIX)/etc/ImageMagick-6/ \
-	LIBRARY_PATH=$(STAGING_INSTALL_PREFIX)/lib/ImageMagick-6.9.0/ \
+	LIBRARY_PATH=$(STAGING_INSTALL_PREFIX)/lib/ImageMagick-7.0.7/ \
-	SHAREARCH_PATH=$(STAGING_INSTALL_PREFIX)/lib/ImageMagick-6.9.0/config-Q16 \
+	SHAREARCH_PATH=$(STAGING_INSTALL_PREFIX)/lib/ImageMagick-7.0.7/config-Q16 \
-	DOCUMENTATION_PATH=$(STAGING_INSTALL_PREFIX)/share/doc/ImageMagick-6 \
+	DOCUMENTATION_PATH=$(STAGING_INSTALL_PREFIX)/share/doc/ImageMagick-7 \
-	INCLUDE_PATH=$(STAGING_INSTALL_PREFIX)/include/ImageMagick-6 \
+	INCLUDE_PATH=$(STAGING_INSTALL_PREFIX)/include/ImageMagick-7 \
-	INCLUDEARCH_PATH=$(STAGING_INSTALL_PREFIX)/include/ImageMagick-6
+	INCLUDEARCH_PATH=$(STAGING_INSTALL_PREFIX)/include/ImageMagick-7

cross/imagemagick/PLIST

@@ -1,26 +1,26 @@
-bin:bin/animate
+bin:bin/magick
-bin:bin/compare
+lnk:bin/magick-script
-bin:bin/composite
+lnk:bin/animate
-bin:bin/conjure
+lnk:bin/compare
-bin:bin/convert
+lnk:bin/composite
-bin:bin/display
+lnk:bin/conjure
-bin:bin/identify
+lnk:bin/convert
-bin:bin/import
+lnk:bin/display
-bin:bin/Magick-config
+lnk:bin/identify
-bin:bin/Magick++-config
+lnk:bin/import
-bin:bin/MagickCore-config
+rsc:bin/Magick++-config
-bin:bin/MagickWand-config
+rsc:bin/MagickCore-config
-bin:bin/mogrify
+rsc:bin/MagickWand-config
-bin:bin/montage
+lnk:bin/mogrify
-bin:bin/stream
+lnk:bin/montage
-bin:bin/Wand-config
+lnk:bin/stream
 shr:etc/ImageMagick-6
-lnk:lib/libMagick++-6.Q16.so
+lnk:lib/libMagick++-7.Q16HDRI.so
-lnk:lib/libMagick++-6.Q16.so.6
+lnk:lib/libMagick++-7.Q16HDRI.so.4
-lib:lib/libMagick++-6.Q16.so.6.0.0
+lib:lib/libMagick++-7.Q16HDRI.so.4.0.0
-lnk:lib/libMagickCore-6.Q16.so
+lnk:lib/libMagickCore-7.Q16HDRI.so
-lnk:lib/libMagickCore-6.Q16.so.2
+lnk:lib/libMagickCore-7.Q16HDRI.so.6
-lib:lib/libMagickCore-6.Q16.so.2.0.0
+lib:lib/libMagickCore-7.Q16HDRI.so.6.0.0
-lnk:lib/libMagickWand-6.Q16.so
+lnk:lib/libMagickWand-7.Q16HDRI.so
-lnk:lib/libMagickWand-6.Q16.so.2
+lnk:lib/libMagickWand-7.Q16HDRI.so.6
-lib:lib/libMagickWand-6.Q16.so.2.0.0
+lib:lib/libMagickWand-7.Q16HDRI.so.6.0.0

cross/imagemagick/digests

@@ -1,3 +1,3 @@
-ImageMagick-6.9.5-10.tar.xz SHA1 8d3b15ef80a5611688d56f94830fd7bd382c66d7
+ImageMagick-7.0.7-30.tar.xz SHA1 bc147af6e63654cc4857f2b141dad279918920e8
-ImageMagick-6.9.5-10.tar.xz SHA256 2805ab7945ca92251172335da992df800bcc09fee993eeb4711b20c53efeb233
+ImageMagick-7.0.7-30.tar.xz SHA256 f8f5cd7b4a3abb6b1a93b54ae8eb55a1a87cdba47f8efd187178a2d0eb9ba712
-ImageMagick-6.9.5-10.tar.xz MD5 2564f2450a0df9d167d1c29a1c3db726
+ImageMagick-7.0.7-30.tar.xz MD5 678d25f58a4c4961fe7ba3b00d53388a

spk/imagemagick/Makefile

@@ -1,6 +1,6 @@
 SPK_NAME = imagemagick
-SPK_VERS = 6.9.5
+SPK_VERS = 7.0.7
-SPK_REV = 2
+SPK_REV = 3
 SPK_ICON = src/imagemagick.png
 
 DEPENDS = cross/$(SPK_NAME)
@@ -8,20 +8,11 @@ DEPENDS = cross/$(SPK_NAME)
 MAINTAINER = SynoCommunity
 DESCRIPTION = ImageMagick is a software suite to create, edit, compose, or convert bitmap images.
 DISPLAY_NAME = ImageMagick
-CHANGELOG = Updated to ImageMagick 6.9.5-10
+CHANGELOG = Updated to ImageMagick 7.0.7-30
 
-BETA = 1
 STARTABLE = no
 
 HOMEPAGE = http://www.imagemagick.org/
 LICENSE  = Apache 2.0
 
-INSTALLER_SCRIPT = src/installer.sh
-SSS_SCRIPT       = src/dsm-control.sh
-
-INSTALL_PREFIX = /usr/local/$(SPK_NAME)
-
-POST_STRIP_TARGET = imagemagick_extra_install
-
-
 include ../../mk/spksrc.spk.mk

spk/imagemagick/src/dsm-control.sh

@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# Package
-PACKAGE="imagemagick"
-
-
-case $1 in
-    start)
-        exit 0
-    ;;
-    stop)
-        exit 0
-    ;;
-    status)
-        exit 0
-    ;;
-    log)
-        exit 0
-    ;;
-esac

spk/imagemagick/src/installer.sh

@@ -1,46 +0,0 @@
-#!/bin/sh
-
-# Package
-PACKAGE="imagemagick"
-# Others
-INSTALL_DIR="/usr/local/${PACKAGE}"
-
-
-
-preinst ()
-{
-    exit 0
-}
-
-postinst ()
-{
-    # Link
-    ln -s ${SYNOPKG_PKGDEST} ${INSTALL_DIR}
-
-    exit 0
-}
-
-preuninst ()
-{
-
-    exit 0
-}
-
-postuninst ()
-{
-    # Remove link
-    rm -f ${INSTALL_DIR}
-
-    exit 0
-}
-
-preupgrade ()
-{
-    exit 0
-}
-
-postupgrade ()
-{
-    exit 0
-}
-