Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1142
Modified Files:
imagemagick-6.4.1.info imagemagick-dev.info
imagemagick10-dev.info
Added Files:
imagemagick-nox-6.4.1.info
Removed Files:
imagemagick-nox-6.4.1-1014.info
Log Message:
make sure that all of the versions of imagemagick-dev can swap with each other
--- imagemagick-nox-6.4.1-1014.info DELETED ---
Index: imagemagick-6.4.1.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/imagemagick-6.4.1.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- imagemagick-6.4.1.info 14 Dec 2009 18:14:29 -0000 1.1
+++ imagemagick-6.4.1.info 18 Jan 2010 22:53:18 -0000 1.2
@@ -2,7 +2,7 @@
Package: imagemagick%type_pkg[-nox]
Type: -nox .
Version: 6.4.1
-Revision: 1014
+Revision: 1015
GCC: 4.0
Source: mirror:sourceforge:imagemagick/ImageMagick-%v-1.tar.gz
Source-MD5: 51c42ae5c2cad8d669e24eecaca91840
@@ -150,8 +150,8 @@
SplitOff2: <<
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
+ Conflicts: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev,
imagemagick-nox10-dev, imagemagick1-dev, imagemagick-nox1-dev,
imagemagick2-dev, imagemagick-nox2-dev
+ Replaces: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev,
imagemagick-nox10-dev, imagemagick1-dev, imagemagick-nox1-dev,
imagemagick2-dev, imagemagick-nox2-dev
Files: include lib/lib*.* lib/pkgconfig %p/bin/*-config
BuildDependsOnly: True
DocFiles: LICENSE README.txt ChangeLog NEWS.txt
--- NEW FILE: imagemagick-nox-6.4.1.info ---
Info2: <<
Package: imagemagick%type_pkg[-nox]
Type: -nox -nox
Version: 6.4.1
Revision: 1015
GCC: 4.0
Source: mirror:sourceforge:imagemagick/ImageMagick-%v-1.tar.gz
Source-MD5: 51c42ae5c2cad8d669e24eecaca91840
SourceDirectory: ImageMagick-%v
Depends: <<
(%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.27-1), libdjvulibre15-shlibs (>=
3.5.18-1), libjpeg-shlibs (>= 6b-5), fontconfig2-shlibs (>= 2.4.1-1),
expat1-shlibs (>= 2.0.0-1), bzip2-shlibs (>= 1.0.2-2), libxml2-shlibs (>=
2.6.30-1), libiconv (>= 1.11-1), freetype219-shlibs (>= 2.3.5-1),
ghostscript | ghostscript%type_pkg[-nox], openexr,
(%type_raw[-nox] = .) cairo-shlibs (>= 1.6-1),
(%type_raw[-nox] = .) gconf2-shlibs (>= 2.20.1-1),
(%type_raw[-nox] = .) glib2-shlibs (>= 2.14.0-1),
(%type_raw[-nox] = .) gnome-vfs2-unified-shlibs (>= 1:2.15.2-1),
(%type_raw[-nox] = .) gtk+2-shlibs (>= 2.12.0-1),
(%type_raw[-nox] = .) libart2-shlibs (>= 2.3.16-3),
(%type_raw[-nox] = .) libavahi-common3-shlibs,
(%type_raw[-nox] = .) libavahi-client3-shlibs,
(%type_raw[-nox] = .) libavahi-glib1-shlibs,
(%type_raw[-nox] = .) libcroco3-shlibs (>= 0.6.0-11),
(%type_raw[-nox] = .) libgettext3-shlibs (>= 0.14-1),
(%type_raw[-nox] = .) libgsf1.114-shlibs,
(%type_raw[-nox] = .) librsvg2-shlibs (>= 2.20.0-1),
(%type_raw[-nox] = .) libwmf-shlibs (>= 0.2.8.2-1),
(%type_raw[-nox] = .) orbit2-shlibs (>= 2.14.10-1),
(%type_raw[-nox] = .) pango1-xft2-ft219-shlibs (>= 1.18.4-4),
(%type_raw[-nox] = .) x11-shlibs
<<
BuildDepends: <<
lcms (>= 1.11-1), libtiff (>= 3.6.1-3), libjasper.1 (>= 1.900.1-1), libpng3
(>= 1:1.2.27-1), libdjvulibre15-dev (>= 3.5.18-1), libjpeg (>= 6b-5),
fontconfig2-dev (>= 2.4.1-1), expat1 (>= 2.0.0-1), bzip2-dev (>= 1.0.2-2),
libxml2 (>= 2.6.30-1), libiconv-dev (>= 1.11-1), freetype219 (>= 2.3.5-1),
openexr-dev,
pkgconfig (>= 0.21-1),
(%type_raw[-nox] = .) avahi-dev,
(%type_raw[-nox] = .) cairo (>= 1.6-1),
(%type_raw[-nox] = .) gconf2-dev (>= 2.20.1-1),
(%type_raw[-nox] = .) glib2-dev (>= 2.14.0-1),
(%type_raw[-nox] = .) gnome-vfs2-unified-dev (>= 1:2.15.2-1),
(%type_raw[-nox] = .) gtk+2-dev (>= 2.12.0-1),
(%type_raw[-nox] = .) libart2 (>= 2.3.16-3),
(%type_raw[-nox] = .) libavahi-glib1-dev,
(%type_raw[-nox] = .) libcroco3 (>= 0.6.0-11),
(%type_raw[-nox] = .) libgettext3-dev,
(%type_raw[-nox] = .) libgsf1.114-dev,
(%type_raw[-nox] = .) librsvg2 (>= 2.20.0-1),
(%type_raw[-nox] = .) libwmf (>= 0.2.8.2-1),
(%type_raw[-nox] = .) orbit2-dev (>= 2.14.10-1),
(%type_raw[-nox] = .) pango1-xft2-ft219-dev (>= 1.18.4-4),
(%type_raw[-nox] = .) pixman (>= 0.10.0-1),
(%type_raw[-nox] = .) x11-dev,
(%type_raw[-nox] = .) xft2-dev
<<
Conflicts: imagemagick, imagemagick-nox
Replaces: imagemagick, imagemagick-nox, imagemagick10-shlibs,
imagemagick-nox10-shlibs, imagemagick10-dev (<= 1:6.3.5-1006)
Provides: (%type_raw[-nox] = .) imagemagick-nox
PatchScript: perl -pi -e 's,\...@openexr_libs\@,$& -lstdc++,' Makefile.in
ConfigureParams: <<
--without-perl --mandir='${prefix}/share/man' --enable-libtool-verbose
--with-bzlib --without-dps --without-fpx \
--with-gs-font-dir=%p/share/ghostscript/fonts --without-gslib --without-gvc
--with-jpeg --with-lcms \
--with-magick-plus-plus --with-png --with-tiff --with-xml --with-zlib
--with-djvu --with-fontconfig --enable-hdri
<<
NoSetLDFLAGS: true
SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/fontconfig2/lib
-L%p/lib/freetype219/lib -L%p/lib
NoSetCPPFLAGS: true
SetCPPFLAGS: -I%p/lib/pango-ft219/include -I%p/lib/fontconfig2/include
-I%p/lib/freetype219/include -I%p/lib/freetype219/include/freetype2 -I%p/include
CompileScript: <<
#!/bin/sh -ev
export PATH=%p/lib/freetype219/bin:%p/lib/fontconfig2/bin:$PATH
export
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
if [ "%type_raw[-nox]" == "." ]; then
c="--with-x --with-rsvg --disable-static"
else
c="--without-x --without-rsvg --without-wmf --disable-shared"
fi
PKG_CONFIG=%p/bin/pkg-config ac_cv_func_poll=no ./configure %c $c
make CCLD=g++
<<
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
perl -pi -e 's,-L%p/lib ,,g; s, -L%p/lib/freetype219/lib,,' %i/bin/*-config
/bin/rm -f %i/lib/libltdl*
if [ "%type_raw[-nox]" == "-nox" ]; then
/bin/rm -f %i/lib/*.la
fi
<<
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.
<<
DescPackaging: <<
In version 6.3.8-1001 and later, the imagemagick-nox package no longer
builds shared libraries and no longer has a -shlibs splitoff. There is
still a -dev splitoff, in case another package wishes to link to the
static library. Moreover, imagemagick now provides imagemagick-nox, rather
than vice versa.
Also in version 6.3.8-1001 and later, we have moved the plugins directory
%p/lib/ImageMagick-%v from the -shlibs splitoff to the main package,
and for this reason, the main package must Replace older versions of the
splitoff packages.
<<
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.
Fink's graphviz package is very out of date, and doesn't contain the
libgvc library which imagemagick wants. (Disabled for now.)
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.
We take fontconfig (and hence freetype) support from fink:
1) in order to avoid x11 in the -nox version,
2) for the x11-version, because imagemagick wants
version >= 2.4.1 but Apple's X11 only supplies version 2.1.0,
If it was just for xorg, it would have been more economical
as a matter of footprint to use xorg's fontconfig and freetype.
<<
#SplitOff: <<
# Package: %N1-shlibs
# Depends: <<
# lcms-shlibs (>= 1.11-1), libtiff-shlibs (>= 3.6.1-3), libjpeg-shlibs (>=
6b-5), fontconfig2-shlibs (>= 2.4.1-1), expat1-shlibs (>= 2.0.0-1),
bzip2-shlibs (>= 1.0.2-2), freetype219-shlibs (>= 2.3.5-1), x11-shlibs
# <<
# Files: lib/lib*.*.dylib
# Shlibs: <<
# %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.txt
#<<
SplitOff2: <<
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,
imagemagick2-dev, imagemagick-nox2-dev
Replaces: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev,
imagemagick-nox10-dev, imagemagick1-dev, imagemagick-nox1-dev,
imagemagick2-dev, imagemagick-nox2-dev
Files: include lib/lib*.* lib/pkgconfig %p/bin/*-config
BuildDependsOnly: True
DocFiles: LICENSE README.txt ChangeLog NEWS.txt
<<
DocFiles: LICENSE README.txt ChangeLog NEWS.txt
License: BSD
Maintainer: Dave Morrison <d...@finkproject.org>
Homepage: http://www.imagemagick.org/
#end of Info2
<<
Index: imagemagick10-dev.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/imagemagick10-dev.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- imagemagick10-dev.info 21 Nov 2009 20:58:44 -0000 1.4
+++ imagemagick10-dev.info 18 Jan 2010 22:53:18 -0000 1.5
@@ -3,15 +3,15 @@
Type: -nox (boolean)
Epoch: 1
Version: 6.3.5
-Revision: 1018
+Revision: 1019
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-ft219-dev (>= 1.18.4-4), 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, libgsf-dev,
libcroco3
-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
+Conflicts: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev,
imagemagick-nox10-dev, imagemagick1-dev, imagemagick-nox1-dev,
imagemagick2-dev, imagemagick-nox2-dev
+Replaces: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev,
imagemagick-nox10-dev, imagemagick1-dev, imagemagick-nox1-dev,
imagemagick2-dev, imagemagick-nox2-dev
Provides: (%type_raw[-nox] = -nox) imagemagick10-dev
SetCC: gcc-4.0
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 (%m = x86_64) --disable-openmp --disable-static
Index: imagemagick-dev.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/imagemagick-dev.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- imagemagick-dev.info 21 Nov 2009 20:58:44 -0000 1.5
+++ imagemagick-dev.info 18 Jan 2010 22:53:18 -0000 1.6
@@ -2,7 +2,7 @@
Package: imagemagick%type_pkg[-nox]-dev
Type: -nox (boolean)
Version: 6.1.8
-Revision: 1009
+Revision: 1010
Distribution: 10.4, 10.5
GCC: 4.0
Source: mirror:sourceforge:imagemagick/ImageMagick-%v-7.tar.gz
@@ -14,8 +14,8 @@
BuildDependsOnly: True
Depends: imagemagick%type_pkg[-nox]-shlibs (= %v-%r), (%type_raw[-nox] = .)
x11-shlibs, (%type_raw[-nox] = .) x11, freetype219-shlibs
BuildDepends: libjpeg, libpng3, libtiff, libxml2, lcms, bzip2-dev,
libiconv-dev, (%type_raw[-nox] = .) x11-dev, libtool14, freetype219, fink (>=
0.24.12-1)
-Conflicts: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev,
imagemagick-nox10-dev
-Replaces: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev,
imagemagick-nox10-dev
+Conflicts: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev,
imagemagick-nox10-dev, imagemagick1-dev, imagemagick-nox1-dev,
imagemagick2-dev, imagemagick-nox2-dev
+Replaces: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev,
imagemagick-nox10-dev, imagemagick1-dev, imagemagick-nox1-dev,
imagemagick2-dev, imagemagick-nox2-dev
Provides: (%type_raw[-nox] = -nox) imagemagick-dev
ConfigureParams: --without-perl --mandir='${prefix}/share/man' --enable-lzw
--without-hdf5 --with-bzlib --without-dps --without-fpx --with-ttf
--without-gslib --with-gs-font-dir=%p/share/ghostscript/fonts --without-jbig
--with-jpeg --without-jp2 --with-lcms --without-mpeg2 --with-magic-plus-plus
--with-png --with-tiff -without-wmf --with-xml --with-zlib --disable-static
CompileScript: <<
------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
