Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs17:/tmp/cvs-serv16001/main/finkinfo/graphics
Modified Files:
Tag: pangocairo-branch
graphviz.info imagemagick-dev.info imagemagick.info
Log Message:
more fixes
Index: imagemagick-dev.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/imagemagick-dev.info,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- imagemagick-dev.info 5 Sep 2006 03:10:57 -0000 1.4
+++ imagemagick-dev.info 28 Sep 2007 20:25:41 -0000 1.4.2.1
@@ -2,7 +2,7 @@
Package: imagemagick%type_pkg[-nox]-dev
Type: -nox (boolean)
Version: 6.1.8
-Revision: 1007
+Revision: 1008
GCC: 4.0
Source: mirror:sourceforge:imagemagick/ImageMagick-%v-7.tar.gz
Source-MD5: a79d01f885b2727489c26238946be27a
@@ -10,26 +10,29 @@
SourceRename: ImageMagick-%v.tar.gz
Patch: %{ni}.patch
BuildDependsOnly: True
-Depends: imagemagick%type_pkg[-nox]-shlibs (= %v-%r), (%type_raw[-nox] = .)
x11-shlibs, (%type_raw[-nox] = .) x11
-BuildDepends: libjpeg, libpng3, libtiff, libxml2, lcms, bzip2-dev,
libiconv-dev, (%type_raw[-nox] = .) x11-dev, libtool14
+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
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] = -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
+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
CompileScript: <<
#!/bin/sh -ev
+
+ export PATH=%p/lib/freetype219/bin:$PATH
if [ "%type_raw[-nox]" == "." ]; then
ac_cv_func_poll=no ./configure %c --with-x
fi
if [ "%type_raw[-nox]" == "-nox" ]; then
ac_cv_func_poll=no ./configure %c --without-x
fi
+ perl -pi -e 's,^LDFLAGS = ,LDFLAGS = -L%p/lib/freetype219/lib ,' Makefile
make
<<
Description: Image manipulation tools
InstallScript: <<
#!/bin/sh -ev
- make install DESTDIR=%d
+ make -j1 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
@@ -57,7 +60,7 @@
<<
SplitOff: <<
Package: imagemagick%type_pkg[-nox]-shlibs
- Depends: libtool14-shlibs, libjpeg-shlibs, libpng3-shlibs, libtiff-shlibs,
bzip2, ghostscript%type_pkg[-nox], libxml2-shlibs, lcms-shlibs,
(%type_raw[-nox] = .) x11-shlibs, (%type_raw[-nox] = .) x11
+ Depends: libtool14-shlibs, libjpeg-shlibs, libpng3-shlibs, libtiff-shlibs,
bzip2, ghostscript%type_pkg[-nox], libxml2-shlibs, lcms-shlibs,
(%type_raw[-nox] = .) x11-shlibs, (%type_raw[-nox] = .) x11, freetype219-shlibs
Conflicts: imagemagick-shlibs, imagemagick-nox-shlibs
Replaces: imagemagick-shlibs, imagemagick-nox-shlibs
Provides: (%type_raw[-nox] = -nox) imagemagick-shlibs
Index: imagemagick.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/imagemagick.info,v
retrieving revision 1.10.2.5
retrieving revision 1.10.2.6
diff -u -d -r1.10.2.5 -r1.10.2.6
--- imagemagick.info 21 Sep 2007 17:07:34 -0000 1.10.2.5
+++ imagemagick.info 28 Sep 2007 20:25:41 -0000 1.10.2.6
@@ -8,25 +8,28 @@
Source-MD5: 54c2c91eafb416ae3419a78bb8d0162c
SourceDirectory: ImageMagick-%v
Depends: %N10-shlibs (= %v-%r), (%type_raw[-nox] = .) x11-shlibs,
(%type_raw[-nox] = .) x11
-BuildDepends: pango1-xft2-ft219-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
+BuildDepends: pango1-xft2-ft219-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, freetype219
Conflicts: imagemagick, imagemagick-nox
Replaces: imagemagick, imagemagick-nox
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
fi
if [ "%type_raw[-nox]" == "-nox" ]; then
PKG_CONFIG=%p/bin/pkg-config ac_cv_func_poll=no ./configure %c --without-x
fi
+ perl -pi -e 's,^LDFLAGS = ,LDFLAGS = -L%p/lib/freetype219/lib ,' Makefile
make
<<
Description: Image manipulation tools
InstallScript: <<
#!/bin/sh -ev
- make install DESTDIR=%d
+ make -j1 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
@@ -61,7 +64,7 @@
<<
SplitOff: <<
Package: %N10-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
+ 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, freetype219-shlibs
Conflicts: imagemagick10-shlibs, imagemagick-nox10-shlibs
Replaces: imagemagick10-shlibs, imagemagick-nox10-shlibs
Provides: (%type_raw[-nox] = -nox) imagemagick10-shlibs
Index: graphviz.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/graphviz.info,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- graphviz.info 16 Jan 2007 16:02:42 -0000 1.5.2.1
+++ graphviz.info 28 Sep 2007 20:25:41 -0000 1.5.2.2
@@ -1,6 +1,6 @@
Package: graphviz
Version: 1.16
-Revision: 1012
+Revision: 1013
Source: mirror:custom:%n-%v.tar.gz
CustomMirror: <<
nam-US: http://www.graphviz.org/pub/graphviz/ARCHIVE
@@ -10,9 +10,9 @@
Source-MD5: a2a3bd1b9fe807c46e676fb9a3f0ba22
Patch: %n.patch
PatchScript: grep -r 'panic ' lefty | cut -d: -f1 | sort -u | xargs perl
-pi.bak -e 's,panic ,lefty_panic ,g'
-Depends: tcltk, x11, libpng3-shlibs, libjpeg-shlibs, libiconv, expat-shlibs,
gd2-shlibs
-BuildDepends: tcltk-dev, x11-dev, libpng3, libjpeg, libiconv-dev, expat, gd2,
gd2-bin, gawk (>= 3.1.2-12)
-ConfigureParams: --mandir=%p/share/man --with-extraincludedir=%p/include
--with-extralibdir=%p/lib --with-tcl=%p --with-tk=%p --with-x
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
--with-freetypeincludedir=/usr/X11R6/include/freetype2 --enable-static
--disable-shared
+Depends: fontconfig2-shlibs, freetype219-shlibs, tcltk, x11, libpng3-shlibs,
libjpeg-shlibs, libiconv, expat-shlibs, gd2-shlibs
+BuildDepends: fontconfig2-dev, freetype219, tcltk-dev, x11-dev, libpng3,
libjpeg, libiconv-dev, expat, gd2, gd2-bin, gawk (>= 3.1.2-12)
+ConfigureParams: --mandir=%p/share/man --with-extraincludedir=%p/include
--with-extralibdir=%p/lib --with-tcl=%p --with-tk=%p --with-x
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
--with-freetypeincludedir=%p/lib/freetype219/include/freetype2 --enable-static
--disable-shared
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
InstallScript: make -i install DESTDIR=%d
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
