Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv14957
Modified Files:
imagemagick.info
Log Message:
undoing unintended changes
Index: imagemagick.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/imagemagick.info,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- imagemagick.info 30 Nov 2007 01:44:32 -0000 1.18
+++ imagemagick.info 30 Nov 2007 02:30:53 -0000 1.19
@@ -2,35 +2,24 @@
Package: imagemagick%type_pkg[-nox]
Type: -nox (boolean)
Version: 6.3.5
-Revision: 1004
+Revision: 1003
GCC: 4.0
Source: mirror:sourceforge:imagemagick/ImageMagick-%v-6.tar.gz
Source-MD5: 54c2c91eafb416ae3419a78bb8d0162c
SourceDirectory: ImageMagick-%v
-Depends: %N10-shlibs (= %v-%r)
-BuildDepends: <<
- pkgconfig, bzip2-dev, freetype219, libjpeg, lcms, libpng3 (>= 1:1.2.18-1),
libtiff, libxml2, libiconv-dev, libdjvulibre15-dev,
- (%type_raw[-nox] = .) gconf2-dev, (%type_raw[-nox] = .) glib2-dev,
(%type_raw[-nox] = .) gnome-vfs2-unified-dev,
- (%type_raw[-nox] = .) gtk+2-dev, (%type_raw[-nox] = .) libart2,
(%type_raw[-nox] = .) libbonobo2-dev,
- (%type_raw[-nox] = .) libcroco3, (%type_raw[-nox] = .) libgettext3-dev,
(%type_raw[-nox] = .) libgsf-dev,
- (%type_raw[-nox] = .) librsvg2 (>= 2.9.5-11), (%type_raw[-nox] = .)
orbit2-dev, (%type_raw[-nox] = .) pango1-xft2-dev,
- (%type_raw[-nox] = .) popt, (%type_raw[-nox] = .) x11-dev
-<<
+Depends: %N10-shlibs (= %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, imagemagick-nox
Replaces: imagemagick, imagemagick-nox
-Provides: (%type_raw[-nox] = .) imagemagick-nox
-#SetCPPFLAGS: -I%p/lib/freetype219/include
-I%p/lib/freetype219/include/freetype2
-SetLDFLAGS: -L%p/lib/freetype219/lib
-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-tiff --without-wmf --with-xml --with-zlib
--with-djvu
-# please --enable-libtool-verbose
+Provides: (%type_raw[-nox] = -nox) imagemagick
+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
- export PATH=%p/lib/freetype219/bin:$PATH
if [ "%type_raw[-nox]" == "." ]; then
- PKG_CONFIG=%p/bin/pkg-config ac_cv_func_poll=no ./configure %c --with-x
--with-rsvg
+ 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
--without-rsvg
+ PKG_CONFIG=%p/bin/pkg-config ac_cv_func_poll=no ./configure %c --without-x
fi
make
<<
@@ -42,7 +31,6 @@
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*
<<
DescDetail: <<
@@ -73,14 +61,10 @@
<<
SplitOff: <<
Package: %N10-shlibs
- Depends: <<
- bzip2-shlibs, freetype219-shlibs, ghostscript |
ghostscript%type_pkg[-nox], lcms-shlibs, libdjvulibre15-shlibs,
- (%type_raw[-nox] = .) glib2-shlibs, (%type_raw[-nox] = .) gtk+2-shlibs,
libjpeg-shlibs,
- libpng3-shlibs, (%type_raw[-nox] = .) librsvg2-shlibs, libtiff-shlibs,
libxml2-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] = .) 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)
@@ -91,10 +75,10 @@
<<
SplitOff2: <<
Package: %N10-dev
- Depends: %N10-shlibs (= %v-%r)
+ Depends: %N10-shlibs (= %v-%r), (%type_raw[-nox] = .) x11-shlibs,
(%type_raw[-nox] = .) x11
Conflicts: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev,
imagemagick-nox10-dev
Replaces: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev,
imagemagick-nox10-dev
-# Provides: (%type_raw[-nox] = .) imagemagick-nox10-dev
+ Provides: (%type_raw[-nox] = -nox) imagemagick10-dev
Files: include lib/lib*.* lib/pkgconfig %p/bin/*-config
BuildDependsOnly: True
DocFiles: LICENSE README.txt ChangeLog NEWS
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
