SF.net SVN: gar:[23919] csw/mgar/pkg/ImageMagick/trunk

[lblume at users.sourceforge.net]

Revision: 23919
          http://sourceforge.net/p/gar/code/23919
Author:   lblume
Date:     2014-08-04 08:46:30 +0000 (Mon, 04 Aug 2014)
Log Message:
-----------
ImageMagick/trunk: Bump to 6.8.9-6; remove OBSOLETED_BY

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	2014-08-04 05:44:37 UTC (rev 23918)
+++ csw/mgar/pkg/ImageMagick/trunk/Makefile	2014-08-04 08:46:30 UTC (rev 23919)
@@ -1,6 +1,6 @@
 NAME      = imagemagick
 VERSION   = 6.8.9
-GARSUBREV = 2
+GARSUBREV = 6
 #BETAREV   = beta20140518
 GARTYPE   = v2
 
@@ -61,7 +61,6 @@
 RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibfftw3-3
 RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibgomp1
 RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibgcc-s1
-OBSOLETED_BY_CSWlibmagickcore6q16hdri2 += CSWlibmagickcore6q16hdri1
 
 PACKAGES += CSWlibmagickwand6q16hdri2
 CATALOGNAME_CSWlibmagickwand6q16hdri2 = libmagickwand6q16hdri2
@@ -73,7 +72,6 @@
 RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibmagickcore6q16hdri2
 RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibgomp1
 RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibgcc-s1
-OBSOLETED_BY_CSWlibmagickwand6q16hdri2 += CSWlibmagickwand6q16hdri1
 
 PACKAGES += CSWlibmagick++6q16hdri4
 CATALOGNAME_CSWlibmagick++6q16hdri4 = libmagick++6q16hdri4
@@ -186,10 +184,8 @@
 
 REINPLACE_USRLOCAL += config/mime.xml
 
-#EXTRA_LINKER_FLAGS = -lsocket -lnsl 
-#EXTRA_LD_OPTIONS = -z nolazyload 
-EXTRA_LINKER_FLAGS = -lsocket -lnsl  -Wl,-z,nolazyload -Wl,-Bdirect
-EXTRA_LD_OPTIONS = -z nolazyload -Bdirect
+EXTRA_LINKER_FLAGS = -lsocket -lnsl 
+EXTRA_LD_OPTIONS = -z nolazyload 
 
 # We especially don't want ISALIST for the above /usr/openwin/lib
 # This should be reworked after a general rework of ISALIST in GAR

Modified: csw/mgar/pkg/ImageMagick/trunk/checksums
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/checksums	2014-08-04 05:44:37 UTC (rev 23918)
+++ csw/mgar/pkg/ImageMagick/trunk/checksums	2014-08-04 08:46:30 UTC (rev 23919)
@@ -1 +1 @@
-c4bbc23fc209e7d43628d28296616cac  ImageMagick-6.8.9-2.tar.xz
+97f24ab74f1e42ac90d337b073f99799  ImageMagick-6.8.9-6.tar.xz

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