[csw-devel] SF.net SVN: gar:[9165] csw/mgar/pkg/ImageMagick/trunk
hson at users.sourceforge.net
hson at users.sourceforge.net
Sun Mar 14 16:27:13 CET 2010
Revision: 9165
http://gar.svn.sourceforge.net/gar/?rev=9165&view=rev
Author: hson
Date: 2010-03-14 15:27:13 +0000 (Sun, 14 Mar 2010)
Log Message:
-----------
Update too 6.6.0-5
Revamp inclusion of old libraries
Remove patched not needed any longer
Remove checkpkg overrides no longer needed
Modified Paths:
--------------
csw/mgar/pkg/ImageMagick/trunk/Makefile
csw/mgar/pkg/ImageMagick/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/ImageMagick/trunk/files/6.2.9.i.tar.bz2
csw/mgar/pkg/ImageMagick/trunk/files/6.2.9.s.tar.bz2
csw/mgar/pkg/ImageMagick/trunk/files/6.5.2.i.tar.bz2
csw/mgar/pkg/ImageMagick/trunk/files/6.5.2.s.tar.bz2
Removed Paths:
-------------
csw/mgar/pkg/ImageMagick/trunk/files/djvu.c.diff
csw/mgar/pkg/ImageMagick/trunk/files/fixme.sh
csw/mgar/pkg/ImageMagick/trunk/files/libMagick++.so.10.0.4.i
csw/mgar/pkg/ImageMagick/trunk/files/libMagick++.so.10.0.4.s
csw/mgar/pkg/ImageMagick/trunk/files/libMagick.so.10.0.4.i
csw/mgar/pkg/ImageMagick/trunk/files/libMagick.so.10.0.4.s
csw/mgar/pkg/ImageMagick/trunk/files/libWand.so.10.0.4.i
csw/mgar/pkg/ImageMagick/trunk/files/libWand.so.10.0.4.s
csw/mgar/pkg/ImageMagick/trunk/files/lib_6.2.9_i.tar.gz
csw/mgar/pkg/ImageMagick/trunk/files/lib_6.2.9_s.tar.gz
Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-03-14 14:46:59 UTC (rev 9164)
+++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-03-14 15:27:13 UTC (rev 9165)
@@ -1,5 +1,5 @@
GARNAME = imagemagick
-GARVERSION = 6.5.9
+GARVERSION = 6.6.0
GARSUBREV = 5
CATEGORIES = lib
@@ -52,230 +52,6 @@
RUNTIME_DEP_PKGS_CSWimagemagick += CSWtiffrt
RUNTIME_DEP_PKGS_CSWimagemagick += CSWzlib
-CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|libMagick++.so.10.0.4
-CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|ept.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cip.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|otb.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|gif.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|vid.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pix.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mvg.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|palm.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pdf.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|avs.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pcd.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|icon.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|magick.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tim.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xc.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ps2.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|raw.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xcf.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dps.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ps3.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ps.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mpc.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|fpx.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pnm.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mpeg.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xwd.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|url.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|gray.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ycbcr.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|rgb.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tile.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|uil.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pwp.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sfw.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|stegano.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pattern.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|txt.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mpr.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|html.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|info.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pdb.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cut.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|msl.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|jp2.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|fits.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|vicar.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cmyk.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|histogram.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|scr.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|avi.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|label.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|bmp.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|psd.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|jbig.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|null.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dcm.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tiff.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dot.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sun.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|wmf.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|x.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ttf.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|miff.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xbm.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|jpeg.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|map.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|rle.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|art.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xpm.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|svg.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|uyvy.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tga.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dib.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|wbmp.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|fax.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|clip.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sct.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pcl.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mono.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|rla.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|matte.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mat.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pict.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|preview.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|viff.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|meta.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|gradient.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sgi.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|yuv.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cin.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|plasma.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|png.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mtv.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pcx.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|caption.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|wpg.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dpx.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|analyze.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|inline.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pcd.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|jpeg.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ps2.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|miff.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tim.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mpc.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xcf.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ps3.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|raw.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|uyvy.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pnm.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|fpx.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|jbig.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cip.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ept.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|label.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|otb.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cmyk.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|thumbnail.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tiff.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|gif.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|braille.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|avs.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pdf.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|null.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pix.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mvg.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|exr.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|vid.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|txt.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mpr.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|x.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|msl.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pdb.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cut.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|plasma.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|jp2.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dds.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|hald.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|caption.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xwd.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|hrz.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|clip.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|wbmp.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|rgb.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|url.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sfw.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|meta.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|uil.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|viff.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pwp.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|matte.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pict.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|preview.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xps.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mono.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xbm.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ttf.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sun.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|magick.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|wmf.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|art.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|rle.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|map.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|icon.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dng.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|svg.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xpm.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tga.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xc.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|bmp.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cals.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|scr.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|psd.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dcm.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|palm.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dot.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ipl.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ps.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sgi.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|gradient.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|info.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|html.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|png.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|stegano.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|djvu.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cin.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pattern.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|yuv.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pcx.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mtv.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|vicar.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|fits.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dpx.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|wpg.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ycbcr.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dib.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|gray.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sct.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pcl.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mpeg.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|histogram.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|fax.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mat.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tile.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|rla.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|convolve.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|analyze.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|libMagick++.so.2.0.1
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|libWand.so.10.0.4
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|libMagickWand.so.2.0.1
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|Magick.so
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|conjure
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|montage
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|animate
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|import
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|display
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mogrify
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|identify
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|convert
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|compare2
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|composite
-CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|stream
-
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = ImageMagick-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2
@@ -286,7 +62,7 @@
CONFIGURE_ARGS_COMMON += --x-includes=/opt/csw/X11/include
CONFIGURE_ARGS_COMMON += --x-libraries=/opt/csw/X11/lib
CONFIGURE_ARGS_COMMON += --with-modules=yes
-CONFIGURE_ARGS_COMMON += --disable-openmp
+#CONFIGURE_ARGS_COMMON += --disable-openmp
CONFIGURE_ARGS_COMMON += --disable-silent-rules
# Until librsvg,graphviz and perl is 64bit
#CONFIGURE_ARGS_isa-amd64 += --without-gvc
@@ -299,8 +75,6 @@
CONFIGURE_ARGS = $(CONFIGURE_ARGS_COMMON) $(foreach M,$(MODULATIONS),$(CONFIGURE_ARGS_$M))
PATCHFILES += Makefile.patch
-# Temporary patch until upstream make a more permenent fix
-#PATCHFILES += djvu.c.diff
# Test has to be run *after* install
#TEST_TARGET = check
@@ -331,27 +105,17 @@
SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(GARSUBREV)
post-install-isa-sparcv8:
- @cp $(FILEDIR)/libMagick.so.10.0.4.s $(INSTALLISADIR)$(libdir)/libMagick.so.10.0.4
- @cp $(FILEDIR)/libWand.so.10.0.4.s $(INSTALLISADIR)$(libdir)/libWand.so.10.0.4
- @cp $(FILEDIR)/libMagick++.so.10.0.4.s $(INSTALLISADIR)$(libdir)/libMagick++.so.10.0.4
- @( if [ ! -r $(INSTALLISADIR)$(libdir)/libMagick.so.10.0.4 ] ; then ln -s libMagick.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick.so.10 ; fi )
- @( if [ ! -r $(INSTALLISADIR)$(libdir)/libWand.so.10.0.4 ] ; then ln -s libWand.so.10.0.4 $(INSTALLISADIR)$(libdir)/libWand.so.10 ; fi )
- @( if [ ! -r $(INSTALLISADIR)$(libdir)/libMagick++.so.10.0.4 ] ; then ln -s libMagick++.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick++.so.10 ; fi )
@ln -s ImageMagick-$(GARVERSION) $(INSTALLISADIR)$(docdir)/ImageMagick
- @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(CURDIR)/$(FILEDIR)/lib_6.2.9_s.tar.gz |tar xf -)
+ @( 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:
- @cp $(FILEDIR)/libMagick.so.10.0.4.i $(INSTALLISADIR)$(libdir)/libMagick.so.10.0.4
- @cp $(FILEDIR)/libWand.so.10.0.4.i $(INSTALLISADIR)$(libdir)/libWand.so.10.0.4
- @cp $(FILEDIR)/libMagick++.so.10.0.4.i $(INSTALLISADIR)$(libdir)/libMagick++.so.10.0.4
- @( if [ ! -r $(INSTALLISADIR)$(libdir)/libMagick.so.10.0.4 ] ; then ln -s libMagick.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick.so.10 ; fi )
- @( if [ ! -r $(INSTALLISADIR)$(libdir)/libWand.so.10.0.4 ] ; then ln -s libWand.so.10.0.4 $(INSTALLISADIR)$(libdir)/libWand.so.10 ; fi )
- @( if [ ! -r $(INSTALLISADIR)$(libdir)/libMagick++.so.10.0.4 ] ; then ln -s libMagick++.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick++.so.10 ; fi )
@ln -s ImageMagick-$(GARVERSION) $(INSTALLISADIR)$(docdir)/ImageMagick
- @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(CURDIR)/$(FILEDIR)/lib_6.2.9_i.tar.gz |tar xf -)
+ @( 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)
Modified: csw/mgar/pkg/ImageMagick/trunk/checksums
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/checksums 2010-03-14 14:46:59 UTC (rev 9164)
+++ csw/mgar/pkg/ImageMagick/trunk/checksums 2010-03-14 15:27:13 UTC (rev 9165)
@@ -1,2 +1,2 @@
-ee8f6c42f982fe785c5df8f89e6deb91 ImageMagick-6.5.9-5.tar.bz2
+fb57509760a902af5bf535b8da15fdc7 ImageMagick-6.6.0-5.tar.bz2
6bd361fe352c7d497d60d8d2cbe7cfd4 Makefile.patch
Added: csw/mgar/pkg/ImageMagick/trunk/files/6.2.9.i.tar.bz2
===================================================================
(Binary files differ)
Property changes on: csw/mgar/pkg/ImageMagick/trunk/files/6.2.9.i.tar.bz2
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: csw/mgar/pkg/ImageMagick/trunk/files/6.2.9.s.tar.bz2
===================================================================
(Binary files differ)
Property changes on: csw/mgar/pkg/ImageMagick/trunk/files/6.2.9.s.tar.bz2
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: csw/mgar/pkg/ImageMagick/trunk/files/6.5.2.i.tar.bz2
===================================================================
(Binary files differ)
Property changes on: csw/mgar/pkg/ImageMagick/trunk/files/6.5.2.i.tar.bz2
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: csw/mgar/pkg/ImageMagick/trunk/files/6.5.2.s.tar.bz2
===================================================================
(Binary files differ)
Property changes on: csw/mgar/pkg/ImageMagick/trunk/files/6.5.2.s.tar.bz2
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: csw/mgar/pkg/ImageMagick/trunk/files/djvu.c.diff
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/files/djvu.c.diff 2010-03-14 14:46:59 UTC (rev 9164)
+++ csw/mgar/pkg/ImageMagick/trunk/files/djvu.c.diff 2010-03-14 15:27:13 UTC (rev 9165)
@@ -1,32 +0,0 @@
---- ../build-global/ImageMagick-6.5.1-1/coders/djvu.c 2009-03-31 17:44:40.000000000 +0200
-+++ ImageMagick-6.5.1-1/coders/djvu.c 2009-04-12 11:00:15.678316236 +0200
-@@ -58,6 +58,29 @@
- #if defined(MAGICKCORE_DJVU_DELEGATE)
- #include <libdjvu/ddjvuapi.h>
- #endif
-+
-+#if defined(__SunOS_5_8) || defined(__SunOS_5_9)
-+#define signbit(x) copysign(1, x)<0
-+
-+
-+double
-+fmax(double x, double y)
-+{
-+ if (isnan(x))
-+ return (y);
-+ if (isnan(y))
-+ return (x);
-+
-+ if (signbit(x) != signbit(y)) {
-+ if (signbit(x))
-+ return (y);
-+ else
-+ return (x);
-+ }
-+
-+ return (x > y ? x : y);
-+}
-+#endif
-
- /*
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Deleted: csw/mgar/pkg/ImageMagick/trunk/files/fixme.sh
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/files/fixme.sh 2010-03-14 14:46:59 UTC (rev 9164)
+++ csw/mgar/pkg/ImageMagick/trunk/files/fixme.sh 2010-03-14 15:27:13 UTC (rev 9165)
@@ -1,49 +0,0 @@
-#!/bin/bash
-####################################################
-#
-# fixme.sh
-# Intended to remove the use of libtool's
-# pseudo-libraries for opencsw builds.
-#
-# Author: Mike Watters mwatters_at_opencsw.org
-# Initial Version: 0.1
-#
-####################################################
-
-umask 0022
-PATH=/opt/csw/bin
-
-if [ $# -ne 1 ]; then
- gecho "USAGE: $(basename $0) WORKSRC"
- exit 1
-fi
-BASEPATH=$1
-
-## Fix Makefiles
-for mk in $(gfind ${BASEPATH} -name Makefile -print); do
- LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \
- gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/")
-
- for file in ${LT_FILES}; do
- LIB_NAME=$(ggrep 'dlname=' ${file} | \
- gsed -e "s/.*'\(.*\)'/\1/" \
- -e "s/^lib//" \
- -e "s/\.so.*$//")
- fixpath=$(gecho $file |gsed 's/\//\\\//g')
- gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new
- gmv Makefile.new ${mk}
- done
-done
-
-## Fix libtool Script
-for lt in $(gfind ${BASEPATH} -name libtool -print); do
- gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new
- gmv ${lt}.new ${lt}
-done
-
-LTMAIN=$(gfind ${BASEPATH} -name ltmain.sh -print)
-if [ -f ${LTMAIN} ]; then
- gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new
- gmv ${LTMAIN}.new ${LTMAIN}
-fi
-
Deleted: csw/mgar/pkg/ImageMagick/trunk/files/libMagick++.so.10.0.4.i
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/ImageMagick/trunk/files/libMagick++.so.10.0.4.s
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/ImageMagick/trunk/files/libMagick.so.10.0.4.i
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/ImageMagick/trunk/files/libMagick.so.10.0.4.s
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/ImageMagick/trunk/files/libWand.so.10.0.4.i
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/ImageMagick/trunk/files/libWand.so.10.0.4.s
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/ImageMagick/trunk/files/lib_6.2.9_i.tar.gz
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/ImageMagick/trunk/files/lib_6.2.9_s.tar.gz
===================================================================
(Binary files differ)
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