[crux-commits] r1073 - crux-2.2/ports/opt/imagemagick

30 Mar 2006

Author: sip
Date: 2006-03-30 15:16:16 +0200 (Thu, 30 Mar 2006)
New Revision: 1073

Removed:
   crux-2.2/ports/opt/imagemagick/imagemagick-6.2.6.patch
Modified:
   crux-2.2/ports/opt/imagemagick/.footprint
   crux-2.2/ports/opt/imagemagick/.md5sum
   crux-2.2/ports/opt/imagemagick/Pkgfile
Log:
imagemagick: updated to 6.2.6-6

Modified: crux-2.2/ports/opt/imagemagick/.footprint
===================================================================

--- crux-2.2/ports/opt/imagemagick/.footprint	2006-03-30 12:28:33 UTC (rev 1072)
+++ crux-2.2/ports/opt/imagemagick/.footprint	2006-03-30 13:16:16 UTC (rev 1073)
@@ -62,6 +62,7 @@
 -rw-r--r--	root/root	usr/include/magick/hashmap.h
 -rw-r--r--	root/root	usr/include/magick/identify.h
 -rw-r--r--	root/root	usr/include/magick/image.h
+-rw-r--r--	root/root	usr/include/magick/layer.h
 -rw-r--r--	root/root	usr/include/magick/list.h
 -rw-r--r--	root/root	usr/include/magick/locale_.h
 -rw-r--r--	root/root	usr/include/magick/log.h
@@ -139,31 +140,31 @@
 drwxr-xr-x	root/root	usr/lib/ImageMagick-6.2.6/modules-Q16/filters/
 -rw-r--r--	root/root	usr/lib/libMagick++.a
 -rwxr-xr-x	root/root	usr/lib/libMagick++.la
-lrwxrwxrwx	root/root	usr/lib/libMagick++.so -> libMagick++.so.10.0.0
-lrwxrwxrwx	root/root	usr/lib/libMagick++.so.10 -> libMagick++.so.10.0.0
--rwxr-xr-x	root/root	usr/lib/libMagick++.so.10.0.0
+lrwxrwxrwx	root/root	usr/lib/libMagick++.so -> libMagick++.so.10.0.2
+lrwxrwxrwx	root/root	usr/lib/libMagick++.so.10 -> libMagick++.so.10.0.2
+-rwxr-xr-x	root/root	usr/lib/libMagick++.so.10.0.2
 -rw-r--r--	root/root	usr/lib/libMagick.a
 -rwxr-xr-x	root/root	usr/lib/libMagick.la
-lrwxrwxrwx	root/root	usr/lib/libMagick.so -> libMagick.so.10.0.0
-lrwxrwxrwx	root/root	usr/lib/libMagick.so.10 -> libMagick.so.10.0.0
--rwxr-xr-x	root/root	usr/lib/libMagick.so.10.0.0
+lrwxrwxrwx	root/root	usr/lib/libMagick.so -> libMagick.so.10.0.2
+lrwxrwxrwx	root/root	usr/lib/libMagick.so.10 -> libMagick.so.10.0.2
+-rwxr-xr-x	root/root	usr/lib/libMagick.so.10.0.2
 -rw-r--r--	root/root	usr/lib/libWand.a
 -rwxr-xr-x	root/root	usr/lib/libWand.la
-lrwxrwxrwx	root/root	usr/lib/libWand.so -> libWand.so.10.0.0
-lrwxrwxrwx	root/root	usr/lib/libWand.so.10 -> libWand.so.10.0.0
--rwxr-xr-x	root/root	usr/lib/libWand.so.10.0.0
+lrwxrwxrwx	root/root	usr/lib/libWand.so -> libWand.so.10.0.2
+lrwxrwxrwx	root/root	usr/lib/libWand.so.10 -> libWand.so.10.0.2
+-rwxr-xr-x	root/root	usr/lib/libWand.so.10.0.2
 drwxr-xr-x	root/root	usr/lib/perl5/
 drwxr-xr-x	root/root	usr/lib/perl5/site_perl/
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.7/
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.7/linux/
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.7/linux/Image/
--r--r--r--	root/root	usr/lib/perl5/site_perl/5.8.7/linux/Image/Magick.pm
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.7/linux/auto/
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.7/linux/auto/Image/
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.7/linux/auto/Image/Magick/
--r--r--r--	root/root	usr/lib/perl5/site_perl/5.8.7/linux/auto/Image/Magick/Magick.bs (EMPTY)
--r-xr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.7/linux/auto/Image/Magick/Magick.so
--r--r--r--	root/root	usr/lib/perl5/site_perl/5.8.7/linux/auto/Image/Magick/autosplit.ix
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.8/
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.8/linux/
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.8/linux/Image/
+-r--r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/linux/Image/Magick.pm
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.8/linux/auto/
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.8/linux/auto/Image/
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.8/linux/auto/Image/Magick/
+-r--r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/linux/auto/Image/Magick/Magick.bs (EMPTY)
+-r-xr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.8/linux/auto/Image/Magick/Magick.so
+-r--r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/linux/auto/Image/Magick/autosplit.ix
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/ImageMagick++.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/ImageMagick.pc

Modified: crux-2.2/ports/opt/imagemagick/.md5sum
===================================================================
--- crux-2.2/ports/opt/imagemagick/.md5sum	2006-03-30 12:28:33 UTC (rev 1072)
+++ crux-2.2/ports/opt/imagemagick/.md5sum	2006-03-30 13:16:16 UTC (rev 1073)
@@ -1,2 +1 @@
-4ff40a92bba825d8cb9447ca454698a0  ImageMagick-6.2.6-0.tar.bz2
-543ed5c3a42e6c567488440fc13643d6  imagemagick-6.2.6.patch
+cc586d50d8c8a450593d691314783f64  ImageMagick-6.2.6-6.tar.bz2

Modified: crux-2.2/ports/opt/imagemagick/Pkgfile
===================================================================
--- crux-2.2/ports/opt/imagemagick/Pkgfile	2006-03-30 12:28:33 UTC (rev 1072)
+++ crux-2.2/ports/opt/imagemagick/Pkgfile	2006-03-30 13:16:16 UTC (rev 1073)
@@ -6,13 +6,11 @@
 
 name=imagemagick
 version=6.2.6
-release=2
-source=(http://dl.sourceforge.net/sourceforge/imagemagick/ImageMagick-$version-0.tar...
-	$name-$version.patch)
+release=1
+source=(http://dl.sourceforge.net/sourceforge/imagemagick/ImageMagick-$version-6.tar...)
 
 build () {
     cd ImageMagick-$version
-    patch -p1 < ../$name-$version.patch
     ./configure --prefix=/usr --enable-shared --enable-lzw --with-perl
     make
     mkdir -p $PKG/usr/

Deleted: crux-2.2/ports/opt/imagemagick/imagemagick-6.2.6.patch
===================================================================
--- crux-2.2/ports/opt/imagemagick/imagemagick-6.2.6.patch	2006-03-30 12:28:33 UTC (rev 1072)
+++ crux-2.2/ports/opt/imagemagick/imagemagick-6.2.6.patch	2006-03-30 13:16:16 UTC (rev 1073)
@@ -1,41 +0,0 @@
-diff -Nru ImageMagick-6.2.6/magick/blob.c ImageMagick-6.2.6-new/magick/blob.c
---- ImageMagick-6.2.6/magick/blob.c	2006-01-19 00:30:32.000000000 +0100
-+++ ImageMagick-6.2.6-new/magick/blob.c	2006-01-26 00:12:21.000000000 +0100
-@@ -1927,8 +1927,17 @@
-             char
-               format[MaxTextExtent];
- 
-+	    /* Extract first numeric format specifier */
-             (void) CopyMagickString(format,p,MaxTextExtent);
-+	    if (q-p+1 < MaxTextExtent)
-+		    format[q-p+1]='\0';
-+	    /* Expand format */
-             (void) FormatMagickString(p,MaxTextExtent,format,image->scene);
-+	    /* Copy rest of string verbatim without further expansion */
-+	    (void) ConcatenateMagickString(filename,
-+	                                   image_info->filename+(q-filename)+1,
-+					   MaxTextExtent);
-+
-             break;
-           }
-       }
-diff -Nru ImageMagick-6.2.6/magick/image.c ImageMagick-6.2.6-new/magick/image.c
---- ImageMagick-6.2.6/magick/image.c	2006-01-17 17:20:54.000000000 +0100
-+++ ImageMagick-6.2.6-new/magick/image.c	2006-01-26 00:12:21.000000000 +0100
-@@ -2794,8 +2794,16 @@
-             char
-               format[MaxTextExtent];
- 
-+	    /* Extract first numeric format specifier */
-             (void) CopyMagickString(format,p,MaxTextExtent);
-+	    if (q-p+1 < MaxTextExtent)
-+		    format[q-p+1]='\0';
-+	    /* Expand format */
-             (void) FormatMagickString(p,MaxTextExtent,format,image_info->scene);
-+	    /* Copy rest of string verbatim without further expansion */
-+	    (void) ConcatenateMagickString(filename,
-+	                                   image_info->filename+(q-filename)+1,
-+					   MaxTextExtent);
-             break;
-           }
-       }

    

[crux-commits] r1073 - crux-2.2/ports/opt/imagemagick

crux＠crux.nu