Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv16292

Modified Files:
        imagemagick-nox.info imagemagick.info 
Added Files:
        imagemagick10-dev.info 
Log Message:
major version number of library has changed (sorry that I missed this! and 
thanks to Martin for noticing)


Index: imagemagick.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/imagemagick.info,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- imagemagick.info    18 Feb 2008 00:07:28 -0000      1.20
+++ imagemagick.info    8 Mar 2008 20:09:36 -0000       1.21
@@ -3,13 +3,13 @@
 Package: imagemagick
 Type: -nox (.)
 Version: 6.3.8
-Revision: 1001
+Revision: 1002
 GCC: 4.0
 Source: mirror:sourceforge:imagemagick/ImageMagick-%v-5.tar.gz
 Source-MD5: aeec2f77528dc53b21ff131c05d8c728
 SourceDirectory: ImageMagick-%v
 Depends: <<
- (%type_raw[-nox] = .) %N10-shlibs (= %v-%r), 
+ (%type_raw[-nox] = .) %N1-shlibs (= %v-%r), 
  lcms-shlibs (>= 1.11-1), libtiff-shlibs (>= 3.6.1-3), libjasper.1-shlibs (>= 
1.900.1-1), libpng3-shlibs (>= 1:1.2.18-1), libdjvulibre15-shlibs (>= 
3.5.18-1), libjpeg-shlibs (>= 6b-5), fontconfig2-shlibs (>= 2.2.3-10), 
expat1-shlibs (>= 2.0.0-1), bzip2-shlibs (>= 1.0.2-2), libxml2-shlibs (>= 
2.6.1-1), libiconv (>= 1.11-1), freetype219-shlibs (>= 2.1.9-1),
  ghostscript | ghostscript%type_pkg[-nox], openexr,
  (%type_raw[-nox] = .) gconf2-shlibs (>= 2.10.0-1),
@@ -49,7 +49,7 @@
  (%type_raw[-nox] = .) x11-dev
 <<
 Conflicts: imagemagick, imagemagick-nox
-Replaces: imagemagick, imagemagick-nox, imagemagick10-shlibs (<< 6.3.8-1001), 
imagemagick-nox10-shlibs (<< 6.3.8-1001)
+Replaces: imagemagick, imagemagick-nox, imagemagick10-shlibs, 
imagemagick-nox10-shlibs
 Provides: (%type_raw[-nox] = .) imagemagick-nox
 
 PatchScript: perl -pi -e 's,[EMAIL PROTECTED]@,$& -lstdc++,' Makefile.in
@@ -126,25 +126,23 @@
  as a matter of footprint to use xorg's fontconfig and freetype.
 <<
 SplitOff: <<
-  Package: %N10-shlibs
+  Package: %N1-shlibs
  Depends: <<
  lcms-shlibs (>= 1.11-1), libtiff-shlibs (>= 3.6.1-3), libjpeg-shlibs (>= 
6b-5), fontconfig2-shlibs (>= 2.2.3-10), expat1-shlibs (>= 2.0.0-1), 
bzip2-shlibs (>= 1.0.2-2), freetype219-shlibs (>= 2.1.9-1), x11-shlibs
  <<
-  Conflicts: imagemagick-nox10-shlibs
-  Replaces: imagemagick-nox10-shlibs
   Files: lib/lib*.*.dylib
   Shlibs: <<
-   %p/lib/libMagick++.10.dylib 11.0.0 %n (>= 6.2.8-1)
-   %p/lib/libWand.10.dylib 11.0.0 %n (>= 6.2.8-1)
-   %p/lib/libMagick.10.dylib 11.0.0 %n (>= 6.2.8-1)
+   %p/lib/libMagick++.1.dylib 2.0.0 %n (>= 6.3.8-1002)
+   %p/lib/libMagickWand.1.dylib 2.0.0 %n (>= 6.3.8-1002)
+   %p/lib/libMagickCore.1.dylib 2.0.0 %n (>= 6.3.8-1002)
   <<
   DocFiles: LICENSE README.txt ChangeLog NEWS
 <<
 SplitOff2: <<
- Package: %N10-dev
- Depends: (%type_raw[-nox] = .) %N10-shlibs (= %v-%r)
- Conflicts: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev, 
imagemagick-nox10-dev
- Replaces: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev, 
imagemagick-nox10-dev
+ Package: %N1-dev
+ Depends: (%type_raw[-nox] = .) %N1-shlibs (= %v-%r)
+ Conflicts: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev, 
imagemagick-nox10-dev, imagemagick1-dev, imagemagick-nox1-dev
+ Replaces: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev, 
imagemagick-nox10-dev, imagemagick1-dev, imagemagick-nox1-dev
  Files: include lib/lib*.* lib/pkgconfig %p/bin/*-config
  BuildDependsOnly: True
  DocFiles: LICENSE README.txt ChangeLog NEWS

--- NEW FILE: imagemagick10-dev.info ---
Info2: <<
Package: imagemagick%type_pkg[-nox]10-dev
Type: -nox (boolean)
Epoch: 1
Version: 6.3.5
Revision: 1006
GCC: 4.0
Source: mirror:sourceforge:imagemagick/ImageMagick-%v-6.tar.gz
Source-MD5: 54c2c91eafb416ae3419a78bb8d0162c
SourceDirectory: ImageMagick-%v
Depends: imagemagick%type_pkg[-nox]10-shlibs (= %e:%v-%r), (%type_raw[-nox] = 
.) x11-shlibs, (%type_raw[-nox] = .) x11
BuildDepends: pango1-xft2-dev, pkgconfig, (%type_raw[-nox] = .) x11-dev, 
bzip2-dev, libjpeg, lcms, libpng3 (>= 1:1.2.18-1), libtiff, libxml2, 
libiconv-dev, librsvg2 (>= 2.9.5-11), libdjvulibre15-dev
Conflicts: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev, 
imagemagick-nox10-dev, imagemagick1-dev, imagemagick-nox1-dev
Replaces: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev, 
imagemagick-nox10-dev, imagemagick1-dev, imagemagick-nox1-dev
Provides: (%type_raw[-nox] = -nox) imagemagick10-dev
ConfigureParams: --without-perl --mandir='${prefix}/share/man' --with-bzlib 
--without-dps --without-fpx --without-fontconfig 
--with-gs-font-dir=%p/share/ghostscript/fonts --without-gslib --without-gvc 
--without-jbig --with-jpeg --without-jp2 --with-lcms --with-magic-plus-plus 
--without-openexr --with-png --with-rsvg --with-tiff --without-wmf --with-xml 
--with-zlib --with-djvu
CompileScript: <<
 #!/bin/sh -ev
 if [ "%type_raw[-nox]" == "." ]; then
 PKG_CONFIG=%p/bin/pkg-config ac_cv_func_poll=no ./configure %c --with-x
 fi
 if [ "%type_raw[-nox]" == "-nox" ]; then
 PKG_CONFIG=%p/bin/pkg-config ac_cv_func_poll=no ./configure %c --without-x
 fi
 make
<<
Description: Image manipulation tools
InstallScript: <<
 #!/bin/sh -ev
 make install DESTDIR=%d
 if [ "%type_raw[-nox]" == "." ]; then
 perl -pi -e "s|-lXext -lSM -lICE -lX11||g" %i/lib/libMagick*la
 perl -pi -e "s|-L/usr/X11R6/lib||g" %i/lib/libMagick*la
 fi
 /bin/rm -f %i/lib/libltdl*
 /bin/rm %i/bin/animate %i/bin/compare %i/bin/composite %i/bin/conjure 
%i/bin/convert %i/bin/display %i/bin/identify %i/bin/import %i/bin/mogrify 
%i/bin/montage %i/bin/stream
<<
DescDetail: <<
 ImageMagick is a robust collection of tools and libraries to read, 
 write, and manipulate an image in many image formats (over 68 major formats)
 including popular formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF.
 With ImageMagick you can create images dynamically, making it 
 suitable for Web applications. You can also resize, rotate, sharpen,
 color reduce, or add special effects to an image and save your
 completed work in the same or a different image format.
<<
DescPort: <<
 --without-perl is the correct option for building perlmagick as a 
 separate package (which we do).

 configure has trouble finding pkg-config, so we tell it where to look.

 In version >- 5.5.6-23, we get around the libpoll problem in OS X 10.3 by
 fooling ./configure into thinking that poll is not present.

 In version >= 6.3.2, we disable fontconfig support because imagemagick wants
 version >= 2.4.1 but Apple's X11 only supplies version 2.1.0, and fink's
 fontconfig2 package only supplies version 2.3.2 (2.2.3 in stable).

 Fink's graphviz package is very out of date, and doesn't contain the
 libgvc library which imagemagick wants.  (Disabled for now.)

<<
SplitOff: <<
  Package: imagemagick%type_pkg[-nox]10-shlibs
  Depends: ghostscript%type_pkg[-nox], (%type_raw[-nox] = .) x11, 
(%type_raw[-nox] = .) x11-shlibs, bzip2-shlibs, libjpeg-shlibs, lcms-shlibs, 
libpng3-shlibs, libtiff-shlibs, libxml2-shlibs, libiconv, libdjvulibre15-shlibs
  Conflicts: imagemagick10-shlibs, imagemagick-nox10-shlibs
  Replaces: imagemagick10-shlibs, imagemagick-nox10-shlibs
  Provides: (%type_raw[-nox] = -nox) imagemagick10-shlibs
  Files: lib/lib*.*.dylib %p/lib/ImageMagick-%v
  Shlibs: <<
   %p/lib/libMagick++.10.dylib 11.0.0 %n (>= 6.2.8-1)
   %p/lib/libWand.10.dylib 11.0.0 %n (>= 6.2.8-1)
   %p/lib/libMagick.10.dylib 11.0.0 %n (>= 6.2.8-1)
  <<
  DocFiles: LICENSE README.txt ChangeLog NEWS
<<
BuildDependsOnly: True
DocFiles: LICENSE README.txt ChangeLog NEWS
License: BSD
Maintainer: Dave Morrison <[EMAIL PROTECTED]>
Homepage: http://www.imagemagick.org/
#end of Info2
<<

Index: imagemagick-nox.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/imagemagick-nox.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- imagemagick-nox.info        18 Feb 2008 00:07:28 -0000      1.1
+++ imagemagick-nox.info        8 Mar 2008 20:09:36 -0000       1.2
@@ -1,15 +1,15 @@
 Info2: <<
 #Package: imagemagick%type_pkg[-nox]
-Package: imagemagick-nox
+Package: imagemagick
 Type: -nox (-nox)
 Version: 6.3.8
-Revision: 1001
+Revision: 1002
 GCC: 4.0
 Source: mirror:sourceforge:imagemagick/ImageMagick-%v-5.tar.gz
 Source-MD5: aeec2f77528dc53b21ff131c05d8c728
 SourceDirectory: ImageMagick-%v
 Depends: <<
- (%type_raw[-nox] = .) %N10-shlibs (= %v-%r), 
+ (%type_raw[-nox] = .) %N1-shlibs (= %v-%r), 
  lcms-shlibs (>= 1.11-1), libtiff-shlibs (>= 3.6.1-3), libjasper.1-shlibs (>= 
1.900.1-1), libpng3-shlibs (>= 1:1.2.18-1), libdjvulibre15-shlibs (>= 
3.5.18-1), libjpeg-shlibs (>= 6b-5), fontconfig2-shlibs (>= 2.2.3-10), 
expat1-shlibs (>= 2.0.0-1), bzip2-shlibs (>= 1.0.2-2), libxml2-shlibs (>= 
2.6.1-1), libiconv (>= 1.11-1), freetype219-shlibs (>= 2.1.9-1),
  ghostscript | ghostscript%type_pkg[-nox], openexr,
  (%type_raw[-nox] = .) gconf2-shlibs (>= 2.10.0-1),
@@ -49,7 +49,7 @@
  (%type_raw[-nox] = .) x11-dev
 <<
 Conflicts: imagemagick, imagemagick-nox
-Replaces: imagemagick, imagemagick-nox, imagemagick10-shlibs (<< 6.3.8-1001), 
imagemagick-nox10-shlibs (<< 6.3.8-1001)
+Replaces: imagemagick, imagemagick-nox, imagemagick10-shlibs, 
imagemagick-nox10-shlibs
 Provides: (%type_raw[-nox] = .) imagemagick-nox
 
 PatchScript: perl -pi -e 's,[EMAIL PROTECTED]@,$& -lstdc++,' Makefile.in
@@ -126,25 +126,23 @@
  as a matter of footprint to use xorg's fontconfig and freetype.
 <<
 #SplitOff: <<
-#  Package: %N10-shlibs
+#  Package: %N1-shlibs
 # Depends: <<
 # lcms-shlibs (>= 1.11-1), libtiff-shlibs (>= 3.6.1-3), libjpeg-shlibs (>= 
6b-5), fontconfig2-shlibs (>= 2.2.3-10), expat1-shlibs (>= 2.0.0-1), 
bzip2-shlibs (>= 1.0.2-2), freetype219-shlibs (>= 2.1.9-1), x11-shlibs
 # <<
-#  Conflicts: imagemagick-nox10-shlibs
-#  Replaces: imagemagick-nox10-shlibs
 #  Files: lib/lib*.*.dylib
 #  Shlibs: <<
-#   %p/lib/libMagick++.10.dylib 11.0.0 %n (>= 6.2.8-1)
-#   %p/lib/libWand.10.dylib 11.0.0 %n (>= 6.2.8-1)
-#   %p/lib/libMagick.10.dylib 11.0.0 %n (>= 6.2.8-1)
+#   %p/lib/libMagick++.1.dylib 2.0.0 %n (>= 6.3.8-1002)
+#   %p/lib/libMagickWand.1.dylib 2.0.0 %n (>= 6.3.8-1002)
+#   %p/lib/libMagickCore.1.dylib 2.0.0 %n (>= 6.3.8-1002)
 #  <<
 #  DocFiles: LICENSE README.txt ChangeLog NEWS
 #<<
 SplitOff2: <<
- Package: %N10-dev
- Depends: (%type_raw[-nox] = .) %N10-shlibs (= %v-%r)
- Conflicts: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev, 
imagemagick-nox10-dev
- Replaces: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev, 
imagemagick-nox10-dev
+ Package: %N1-dev
+ Depends: (%type_raw[-nox] = .) %N1-shlibs (= %v-%r)
+ Conflicts: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev, 
imagemagick-nox10-dev, imagemagick1-dev, imagemagick-nox1-dev
+ Replaces: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev, 
imagemagick-nox10-dev, imagemagick1-dev, imagemagick-nox1-dev
  Files: include lib/lib*.* lib/pkgconfig %p/bin/*-config
  BuildDependsOnly: True
  DocFiles: LICENSE README.txt ChangeLog NEWS


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to