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

Modified Files:
      Tag: pangocairo-branch
        autotrace.info autotrace.patch cairo.info dvdrip-perl.info 
        frontline.info gd2.info gts.info libemf.info pstoedit.info 
        reportlab-py.info zphoto.info 
Added Files:
      Tag: pangocairo-branch
        antiprism.info antiprism.patch gd2-nox.info 
        greycstoration.info greycstoration.patch t1lib5.info 
        zphoto-1.2-1013.info 
Removed Files:
      Tag: pangocairo-branch
        zphoto-1.2-1012.info 
Log Message:
missing stuff from HEAD

--- NEW FILE: greycstoration.patch ---
diff -urN src/Makefile src-new/Makefile
--- src/Makefile        2007-03-30 07:06:54.000000000 -0500
+++ src-new/Makefile    2007-06-23 23:53:28.000000000 -0500
@@ -8,7 +8,7 @@
 
 # Define the CImg files to be compiled (name of the source file without the 
.cpp extension)
 CIMG_FILES = greycstoration \
-            greycstoration4integration \
+            #greycstoration4integration \
 
 # Set correct variables and paths
 CC       = g++
@@ -36,19 +36,19 @@
 CIMG_XRANDR_FLAGS = -Dcimg_use_xrandr -lXrandr
 
 # Uncomment to enable native support for PNG image files, using the PNG 
library.
-#CIMG_PNG_FLAGS = -Dcimg_use_png -lpng -lz
+CIMG_PNG_FLAGS = -Dcimg_use_png -lpng -lz
 
 # Uncomment to enable native support for JPEG image files, using the JPEG 
library.
-#CIMG_JPEG_FLAGS = -Dcimg_use_jpeg -ljpeg
+CIMG_JPEG_FLAGS = -Dcimg_use_jpeg -ljpeg
 
 # Uncomment to enable native support for TIFF image files, using the TIFF 
library.
-#CIMG_TIFF_FLAGS = -Dcimg_use_tiff -ltiff
+CIMG_TIFF_FLAGS = -Dcimg_use_tiff -ltiff
 
 # Uncomment to enable native support of most classical image file formats, 
using the Magick++ library.
 #CIMG_MAGICK_FLAGS = -Dcimg_use_magick `Magick++-config --cppflags` 
`Magick++-config --cxxflags` `Magick++-config --ldflags` `Magick++-config 
--libs`
 
 # Uncomment to enable faster Discrete Fourier Transform computation, using the 
FFTW3 library
-#CIMG_FFTW3_FLAGS = -Dcimg_use_fftw3 -lfftw3
+CIMG_FFTW3_FLAGS = -Dcimg_use_fftw3 -lfftw3 -I$(FFTW3_I) -L$(FFTW3_L)
 
 EXTRA_FLAGS = $(CIMG_X11_FLAGS) $(CIMG_STRICT_FLAGS) $(CIMG_XSHM_FLAGS) 
$(CIMG_XRANDR_FLAGS) $(CIMG_PNG_FLAGS) $(CIMG_JPEG_FLAGS) $(CIMG_TIFF_FLAGS) 
$(CIMG_MAGICK_FLAGS) $(CIMG_FFTW3_FLAGS)
 
@@ -82,7 +82,7 @@
        @echo "Choose your option :"
        @read CHOICE; echo; make $$CHOICE; echo; echo "> Next time, you can 
bypass the menu by typing directly 'make $$CHOICE'"; echo;
 
-all: $(CIMG_FILES) gimp
+all: $(CIMG_FILES) #gimp
 
 clean:
        rm -f greycstoration4gimp *.exe *~ $(CIMG_FILES)
@@ -92,7 +92,7 @@
        @echo
        @echo "** Compiling 'greycstoration4gimp ($(CIMG_VERSION))' with 
'`$(CC) -v 2>&1 | grep version`'"
        @echo
-       $(CC) -o greycstoration4gimp greycstoration4gimp.cpp `gimptool-2.0 
--cflags` `gimptool-2.0 --libs` -lpthread -O3
+       $(CC) -o greycstoration4gimp greycstoration4gimp.cpp `gimptool-2.0 
--cflags` `gimptool-2.0 --libs` -lpthread -Os
        strip greycstoration4gimp
 # Linux/Mac OSX targets
 linux:
@@ -100,7 +100,7 @@
 dlinux:
        make "ARCHFLAGS=-Dcimg_debug=2 -g $(EXTRA_FLAGS)" all
 olinux:
-       make "ARCHFLAGS=-O3 $(EXTRA_FLAGS)" all
+       make "ARCHFLAGS=-Os $(EXTRA_FLAGS)" all
 
 # Sun Solaris targets
 solaris:
@@ -108,7 +108,7 @@
 dsolaris:
        make "ARCHFLAGS=-Dcimg_debug=2 -g -R$(X11PATH)/lib -lrt -lnsl -lsocket 
$(EXTRA_FLAGS)" all
 osolaris:
-       make "ARCHFLAGS=-O3 -R$(X11PATH)/lib -lrt -lnsl -lsocket 
$(EXTRA_FLAGS)" all
+       make "ARCHFLAGS=-Os -R$(X11PATH)/lib -lrt -lnsl -lsocket 
$(EXTRA_FLAGS)" all
 
 # targets with minimal dependancies
 minimal:
@@ -116,4 +116,4 @@
 dminimal:
        make "ARCHFLAGS=-Dcimg_display_type=0 -Dcimg_debug=2 -g" all
 ominimal:
-       make "ARCHFLAGS=-Dcimg_display_type=0 -O3" all
+       make "ARCHFLAGS=-Dcimg_display_type=0 -Os" all

--- NEW FILE: zphoto-1.2-1013.info ---
Info2: <<
Package: zphoto%type_pkg[-gui]
Description: Zooming photo album generator
Version: 1.2
Revision: 1013
GCC: 4.0
Type: -gui (-wxgtk)
License: LGPL
Maintainer: ASARI Takashi <[EMAIL PROTECTED]>

BuildDepends: <<
  libiconv-dev, libgettext3-dev, gettext-bin, gettext-tools,
  ming (>=0.2a), imlib2 (>=1.1.0), popt (>=1.6.3), freetype219,
  (%type_raw[-gui] = -wxgtk) wxgtk (>=2.5.2.8-1003), (%type_raw[-gui] = -wxmac) 
wxmac (>=2.4.1)
<<
Depends: <<
  libiconv, libgettext3-shlibs,
  ming-shlibs (>=0.2a), imlib2-shlibs (>=1.1.0), popt-shlibs (>=1.6.3), 
freetype219-shlibs,
  (%type_raw[-gui] = -wxgtk) wxgtk-shlibs (>=2.5.2.8-1003), (%type_raw[-gui] = 
-wxmac) wxmac-shlibs (>=2.4.1)
<<
Conflicts: wxzphoto (<< 1.2-4), (%type_raw[-gui] != .) zphoto, (%type_raw[-gui] 
!= -wxgtk) zphoto-wxgtk, (%type_raw[-gui] != -wxmac) zphoto-wxmac
Replaces: wxzphoto (<< 1.2-4), (%type_raw[-gui] != .) zphoto, (%type_raw[-gui] 
!= -wxgtk) zphoto-wxgtk, (%type_raw[-gui] != -wxmac) zphoto-wxmac
Provides: (%type_raw[-gui] != .) zphoto

Source: http://namazu.org/~satoru/zphoto/zphoto-%v.tar.gz
Source-MD5: 636a9cffec9131043e29c1f5812a6c3c

Patch: zphoto.patch

CompileScript: <<
  #!/bin/sh -ev
  case "x%type_raw[-gui]" in
    x.) args="--disable-wx";;
    x-wxgtk|x-wxmac) args="--with-wx-config=%p/bin/wx-config";;
  esac
  ./configure %c $args
  make
<<
InstallScript: <<
  #!/bin/sh -ev
  %{default_script}
  if [ "x%type_raw[-gui]" = "x-wxmac" ]; then
    /bin/mkdir -p %i/Applications/Zphoto.app/Contents/MacOS
    /bin/mv %I/bin/wxzphoto %i/Applications/Zphoto.app/Contents/MacOS/Zphoto
    /bin/mkdir -p %i/Applications/Zphoto.app/Contents/Resources
    /bin/cp %p/share/wxmac/wxmac.icns 
%i/Applications/Zphoto.app/Contents/Resources
    /usr/bin/printf 'APPL????' > %i/Applications/Zphoto.app/Contents/PkgInfo
    /bin/cp Info.plist %i/Applications/Zphoto.app/Contents/Info.plist
  fi
<<
DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README
PostInstScript: <<
  if [ "x%type_raw[-gui]" = "x-wxmac" ]; then
    /usr/bin/install -m 775 -d /Applications/Fink
    /bin/ln -fs %p/Applications/Zphoto.app /Applications/Fink/Zphoto.app
  fi
<<
PreRmScript: [ "x%type_raw[-gui]" = "x-wxmac" ] && /bin/rm -f 
/Applications/Fink/Zphoto.app

DescPackaging: <<
 We have split the zphoto-wxgtk variant into a separate file so that the
 other variants can be updated to g++-4.0.  If this package is updated some
 day, it is likely that the variants can once again be handled by a single
 .info file.
<<
DescDetail: <<
zphoto is a zooming photo album generator. 
zphoto creates a flash-based web page.
<<
Homepage: http://zphoto.sourceforge.net/
<<

Index: zphoto.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/zphoto.info,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- zphoto.info 22 Feb 2007 13:09:22 -0000      1.4.2.1
+++ zphoto.info 19 Jul 2007 22:23:29 -0000      1.4.2.2
@@ -2,7 +2,7 @@
 Package: zphoto%type_pkg[-gui]
 Description: Zooming photo album generator
 Version: 1.2
-Revision: 1022
+Revision: 1023
 GCC: 4.0
 Type: -gui (. -wxmac)
 License: LGPL
@@ -14,6 +14,7 @@
   (%type_raw[-gui] = -wxgtk) wxgtk (>=2.5.2.8-3), (%type_raw[-gui] = -wxmac) 
wxmac (>=2.6.3-1001)
 <<
 Depends: <<
+  libiconv, libgettext3-shlibs,
   ming-shlibs (>=0.2a), imlib2-shlibs (>=1.2.1), popt-shlibs (>=1.6.3), 
freetype219-shlibs,
   (%type_raw[-gui] = -wxgtk) wxgtk-shlibs (>=2.5.2.8-3), (%type_raw[-gui] = 
-wxmac) wxmac-shlibs (>=2.6.3-1001)
 <<

Index: cairo.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/cairo.info,v
retrieving revision 1.9.2.10
retrieving revision 1.9.2.11
diff -u -d -r1.9.2.10 -r1.9.2.11
--- cairo.info  29 May 2007 20:21:39 -0000      1.9.2.10
+++ cairo.info  19 Jul 2007 22:23:28 -0000      1.9.2.11
@@ -22,7 +22,13 @@
 <<
 BuildDependsOnly: true
 
-CustomMirror: RangerMirror
+CustomMirror: <<
+       Primary: http://ranger.users.finkproject.org/distfiles
+       eur-NL: http://ranger.users.finkproject.org/distfiles
+       nam-US: http://ranger.befunk.com/fink
+       nam-US: http://astrange.ithinksw.net/~astrange/ranger-fink
+       nam-CA: http://www.southofheaven.net/befunk
+<<
 Source: http://cairographics.org/releases/%n-%v.tar.gz
 Source-MD5: ae16e73f9dca46ac93b4ce435e93773c
 Patch: %n.patch

Index: dvdrip-perl.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/dvdrip-perl.info,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- dvdrip-perl.info    19 Jun 2007 21:16:59 -0000      1.1.2.3
+++ dvdrip-perl.info    19 Jul 2007 22:23:28 -0000      1.1.2.4
@@ -2,7 +2,7 @@
 
 Package: dvdrip-perl-%type_pkg[perl]
 Version: 0.98.4
-Revision: 1
+Revision: 2
 Architecture: (%type_pkg[perl] = 581) powerpc, (%type_pkg[perl] = 584) powerpc
 Distribution: (%type_pkg[perl] = 581) 10.3, (%type_pkg[perl] = 581) 10.4, 
(%type_pkg[perl] = 584) 10.3, (%type_pkg[perl] = 584) 10.4
 

Index: frontline.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/frontline.info,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- frontline.info      16 Jan 2007 16:02:42 -0000      1.4.2.1
+++ frontline.info      19 Jul 2007 22:23:28 -0000      1.4.2.2
@@ -1,10 +1,10 @@
 Package: frontline 
 Version: 0.5.4
-Revision: 1015
+Revision: 1017
 GCC: 4.0
 Maintainer: None <[EMAIL PROTECTED]>
-Depends: autotrace-shlibs (>= 0.31.1-1014), pstoedit-shlibs (>= 3.40-1002), 
gnome-libs-shlibs, libxml2-shlibs, ming-shlibs, x11, libart2-shlibs, popt-shlibs
-BuildDepends: gnome-libs-dev, gnome-libs, esound, glib, gtk+, libjpeg, 
libtiff, libxml2, ming, gimp-dev (>= 1.2.5-1003), autotrace (>= 0.31.1-1014), 
pstoedit (>= 3.40-1002), libart2, popt, orbit-dev, imlib, pkgconfig, x11-dev, 
plotutils-dev (>= 2.4.1-1007), imagemagick-dev (>= 6.1.8-1002), lcms, libemf 
(>= 1.0.2-1011), libpng3, libgettext3-dev, audiofile, giflib, gettext-tools
+Depends: autotrace-shlibs (>= 0.31.1-1014), pstoedit-shlibs (>= 3.40-1002), 
gnome-libs-shlibs, libxml2-shlibs, ming-shlibs, x11, libart2-shlibs, 
popt-shlibs, imagemagick10-shlibs, libemf-shlibs (>= 1.0.2-1012)
+BuildDepends: gnome-libs-dev, gnome-libs, esound, glib, gtk+, libjpeg, 
libtiff, libxml2, ming, gimp-dev (>= 1.2.5-1003), autotrace (>= 0.31.1-1014), 
pstoedit (>= 3.40-1002), libart2, popt, orbit-dev, imlib, pkgconfig, x11-dev, 
plotutils-dev (>= 2.4.1-1007), imagemagick10-dev, lcms, libemf (>= 1.0.2-1012), 
libpng3, libgettext3-dev, audiofile, giflib, gettext-tools
 Source: http://ftp1.sourceforge.net/autotrace/%n-%v.tar.gz
 Source-MD5: 5fc2c3459b153dbc2b3138c1133f927e
 PatchScript: perl -pi -e 's/(AC_DEFUN\()([^[]+)(,)/\1\[\2]\3/' frontline.m4
@@ -16,7 +16,7 @@
 InstallScript: make install DESTDIR=%d
 Splitoff: <<
 Package: %N-gimp-plugin
-Depends: gimp (>= 1.2.5-1003), %N
+Depends: gimp (>= 1.2.5-1003), %N (= %v-%r)
 Description: autotrace plugin for the gimp
 DocFiles: README COPYING
 License: GPL

--- NEW FILE: gd2-nox.info ---
Package: gd2-nox
Version: 2.0.35
Revision: 1
BuildDepends: libpng3, libjpeg (>= 6b-3), fink (>= 0.9.9-1), libiconv-dev, 
autoconf (>= 2.60-1), freetype219
Conflicts: gd, gd2, gd209
Replaces: gd, gd2, gd209, gd2-bin (<< 2.0.33-3)
Source: http://www.libgd.org/releases/gd-%v.tar.bz2
Source-MD5: 6c6c3dbb7bf079e0bb5fbbfd3bb8a71c
ConfigureParams: --with-freetype=%p/lib/freetype219 --without-fontconfig 
--disable-dependency-tracking --without-x --disable-shared
DocFiles: COPYING INSTALL index.html README-JPEG.TXT README.TXT readme.jpn
BuildDependsOnly: True
InstallScript: make install DESTDIR=%d
SplitOff: <<
  Package: %N-bin
  Depends: libjpeg-bin, libiconv, libjpeg-shlibs, freetype219-shlibs, 
libpng3-shlibs
  Conflicts: gd-bin, gd2-bin, gd209-bin
  Replaces: gd-bin, gd209-bin, gd2-bin
  Files: <<
    bin/annotate
    bin/bdftogd
    bin/gd2copypal
    bin/gd2togif
    bin/gd2topng
    bin/gdcmpgif
    bin/gdparttopng
    bin/gdtopng
    bin/giftogd2
    bin/pngtogd
    bin/pngtogd2
    bin/webpng
  <<
  Description: Executables for gd2 package (no X11)
  DocFiles: COPYING index.html
<<
Description: Graphics generation library (no X11 support)
DescDetail: <<
 The GD library is useful for creating graphics like hit counters on
 the fly. This version supports the PNG, JPEG and WBMP formats and lets
 you use TrueType fonts rendered via freetype2.
<<
DescPackaging: <<
 This package is based on previous work by David Morrison, Chris Pepper, Jeremy 
Higgs
 and Peter O'Gorman.  Previously maintained by Christoph Pfisterer.

 BuildDepends on autoconf is needed for 10.3, not for 10.4 (but is present
 in both packages for ease of maintenance).
 
 The -nox version installs only static libraries, for use by other programs
 which need gd2 functionality in a -nox environment.
<<
License: OSI-Approved
Homepage: http://www.libgd.org/
Maintainer:  Dave Morrison <[EMAIL PROTECTED]>

Index: gts.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/gts.info,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- gts.info    3 Feb 2006 16:41:50 -0000       1.2
+++ gts.info    19 Jul 2007 22:23:28 -0000      1.2.2.1
@@ -1,21 +1,22 @@
 Package: gts
 Version: 0.7.3
-Revision: 1002
+Revision: 1003
 Description: GNU triangulated surface library
 Source: mirror:sourceforge:%n/%n-%v.tar.gz
 DocFiles: AUTHORS COPYING README
 Maintainer: Patrick Stein <[EMAIL PROTECTED]>
 HomePage: http://gts.sourceforge.net/
 License: LGPL
-BuildDepends: glib2-dev (>= 2.6.6-1111), libiconv-dev, libgettext3-dev
+BuildDepends: glib2-dev (>= 2.12.0-1), libiconv-dev, libgettext3-dev
 Depends: %n-shlibs (= %v-%r), pkgconfig
 BuildDependsOnly: True
 Source-MD5: c02209e38229eb2abb1370dadd0020b4
+PatchScript: perl -pi -e 's/(AC_DEFUN\()([^[]+)(,)/\1\[\2]\3/' src/gts.m4
 ConfigureParams: --with-glib-prefix=%p
 SetCPPFLAGS: -I%p/include/glib-2.0 -I%p/lib/glib-2.0/include
 SplitOff: <<
     Package: %N-shlibs
-    Depends: glib2-shlibs (>= 2.6.6-1111), libiconv, libgettext3-shlibs
+    Depends: glib2-shlibs (>= 2.12.0-1), libiconv, libgettext3-shlibs
     Files: lib/lib%N-*.dylib
     Shlibs: %p/lib/lib%N-0.7.3.dylib 4.0.0 %n (>= 0.7.3-2)
     DocFiles: AUTHORS COPYING README
@@ -24,7 +25,7 @@
     Package: %N-bin
     Depends: <<
        %N-shlibs (= %v-%r),
-       glib2-shlibs (>= 2.6.6-1111), libiconv, libgettext3-shlibs
+       glib2-shlibs (>= 2.12.0-1), libiconv, libgettext3-shlibs
 <<
     Files: <<
        bin/gts2dxf bin/gts2oogl bin/gts2stl

--- zphoto-1.2-1012.info DELETED ---

Index: libemf.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/libemf.info,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- libemf.info 24 Apr 2006 17:30:40 -0000      1.3
+++ libemf.info 19 Jul 2007 22:23:28 -0000      1.3.2.1
@@ -1,23 +1,21 @@
 Package: libemf
 Version: 1.0.2
-Revision: 1011
+Revision: 1012
 GCC: 4.0
 Maintainer: None <[EMAIL PROTECTED]>
 License: GPL
 Description: ECMA-234 library
-Source: http://www.lignumcomputing.com/%n/libEMF-%v.tar.gz
+#Source: http://www.lignumcomputing.com/%n/libEMF-%v.tar.gz
+Source: mirror:master:libEMF-%v.tar.gz
 Source-MD5: 4c83d50626bb815efd1837f56a1ca27e
 BuildDependsOnly: true
-Depends: %N-shlibs
+Depends: %N-shlibs (= %v-%r)
+BuildDepends: autoconf (>= 2.60), automake1.9, libtool14
+PatchScript: perl -pi -e 's/__PPC__/__POWERPC__/' include/libEMF/wine/winnt.h
 CompileScript: <<
-#! /bin/sh -ex
-if [ "%m" == "powerpc" ]; then
-  CPPFLAGS="-D__PPC__" ./configure %c
-else
+  autoreconf -f -i
   ./configure %c
-fi
-perl -pi.bak -e 's/^deplibs_check_method=.*/deplibs_check_method=pass_all/g' 
libtool
-make 
+  make 
 <<
 InstallScript: <<
 make install DESTDIR=%d
@@ -32,7 +30,7 @@
 <<
 Splitoff2: <<
 Package: %N-bin
-Depends: %N-shlibs
+Depends: %N-shlibs (= %v-%r)
 Files: bin/*
 Description: Binary utilities for libemf
 DocFiles: COPYING
@@ -41,3 +39,14 @@
 DescPackaging: <<
  Originally packaged by Peter O'Gorman.
 <<
+DescPort: <<
+  The token for PowerPC machines is __POWERPC__ not __PPC__
+<<
+DescDetail: <<
+libEMF is a library for generating Enhanced Metafiles on systems which
+don't natively support the ECMA-234 Graphics Device Interface
+(GDI). The library is intended to be used as a driver for other
+graphics programs such as Grace or gnuplot. Therefore, it implements a
+very limited subset of the GDI.
+<<
+Homepage: http://libemf.sourceforge.net

Index: autotrace.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/autotrace.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- autotrace.patch     3 Aug 2006 06:10:54 -0000       1.1
+++ autotrace.patch     19 Jul 2007 22:23:28 -0000      1.1.2.1
@@ -1,26 +1,211 @@
-diff -Nurd -x'*~' autotrace-0.31.1.orig/Makefile.in 
autotrace-0.31.1/Makefile.in
---- autotrace-0.31.1.orig/Makefile.in  2002-11-08 13:18:43.000000000 -0500
-+++ autotrace-0.31.1/Makefile.in       2006-08-03 01:50:53.000000000 -0400
-@@ -221,9 +221,6 @@
- autotrace_LDADD = \
-               libautotrace.la                 \
+diff -Nurd -x'*~' autotrace-0.31.1.orig/Makefile.am 
autotrace-0.31.1/Makefile.am
+--- autotrace-0.31.1.orig/Makefile.am  2002-10-30 11:51:46.000000000 -0500
++++ autotrace-0.31.1/Makefile.am       2007-06-25 02:49:30.000000000 -0400
+@@ -127,12 +127,13 @@
+ 
+ INCLUDES = $(MAGICK_CFLAGS) $(LIBPSTOEDIT_CFLAGS)
+ autotrace_LDADD =                             \
+-              libautotrace.la                 \
++              libautotrace.la
++              -lm
++libautotrace_la_LIBADD =                      \
                $(MAGICK_LDFLAGS)               \
--              $(LIBPNG_LDFLAGS)               \
--              $(LIBSWF_LDFLAGS)               \
+               $(LIBPNG_LDFLAGS)               \
+               $(LIBSWF_LDFLAGS)               \
 -              $(LIBPSTOEDIT_LIBS)             \
-               -lm
+-              -lm
++              $(LIBPSTOEDIT_LIBS)
+ 
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = autotrace.m4
+diff -Nurd -x'*~' autotrace-0.31.1.orig/acconfig.h autotrace-0.31.1/acconfig.h
+--- autotrace-0.31.1.orig/acconfig.h   2002-10-29 23:50:13.000000000 -0500
++++ autotrace-0.31.1/acconfig.h        1969-12-31 19:00:00.000000000 -0500
+@@ -1,30 +0,0 @@
+-/* acconfig.h
+-   This file is in the public domain.
+-
+-   Descriptive text for the C preprocessor macros that
+-   the distributed Autoconf macros can define.
+-   No software package will use all of them; autoheader copies the ones
+-   your configure.in uses into your configuration header file templates.
+-
+-   The entries are in sort -df order: alphabetical, case insensitive,
+-   ignoring punctuation (such as underscores).  Although this order
+-   can split up related entries, it makes it easier to check whether
+-   a given entry is in the file.
+-
+-   Leave the following blank line there!!  Autoheader needs it.  */
+-
+-
+-/* Other stuff */
+-#undef AUTOTRACE_VERSION
+-#undef AUTOTRACE_WEB
+-#undef HAVE_LIBPNG
+-#undef HAVE_LIBSWF
+-#undef HAVE_MAGICK
+-#undef HAVE_LIBPSTOEDIT
+-#undef HAVE_MKSTEMP
+-
+-
+-/* Leave that blank line there!!  Autoheader needs it.
+-   If you're adding to this file, keep in mind:
+-   The entries are in sort -df order: alphabetical, case insensitive,
+-   ignoring punctuation (such as underscores).  */
+diff -Nurd -x'*~' autotrace-0.31.1.orig/autotrace.m4 
autotrace-0.31.1/autotrace.m4
+--- autotrace-0.31.1.orig/autotrace.m4 2002-10-10 16:44:12.000000000 -0400
++++ autotrace-0.31.1/autotrace.m4      2007-06-25 02:48:10.000000000 -0400
+@@ -4,7 +4,7 @@
+ dnl AM_PATH_AUTOTRACE([MINIMUM-VERSION, [ACTION-IF-FOUND [, 
ACTION-IF-NOT-FOUND]])
+ dnl Test to see if libautotrace is installed, and define AUTOTRACE_CFLAGS, 
LIBS
+ dnl
+-AC_DEFUN(AM_PATH_AUTOTRACE,
++AC_DEFUN([AM_PATH_AUTOTRACE],
+ [dnl
+ dnl Get the cflags and libraries from the autotrace-config script
+ dnl
+diff -Nurd -x'*~' autotrace-0.31.1.orig/configure.in 
autotrace-0.31.1/configure.in
+--- autotrace-0.31.1.orig/configure.in 2002-11-08 12:49:23.000000000 -0500
++++ autotrace-0.31.1/configure.in      2007-06-25 02:48:10.000000000 -0400
+@@ -11,7 +11,7 @@
+ AUTOTRACE_MINOR_VERSION=31
+ AUTOTRACE_MICRO_VERSION=1
+ 
AUTOTRACE_VERSION=${AUTOTRACE_MAJOR_VERSION}.${AUTOTRACE_MINOR_VERSION}.${AUTOTRACE_MICRO_VERSION}
+-AC_DEFINE_UNQUOTED(AUTOTRACE_VERSION,"$AUTOTRACE_VERSION")
++AC_DEFINE_UNQUOTED(AUTOTRACE_VERSION,"$AUTOTRACE_VERSION", [Program version.])
+ AC_SUBST(AUTOTRACE_VERSION)
+ AM_INIT_AUTOMAKE(autotrace, $AUTOTRACE_VERSION, no-define)
  
+@@ -30,14 +30,13 @@
+ AC_PROG_LIBTOOL
  
-@@ -242,7 +239,11 @@
- CONFIG_CLEAN_FILES = autotrace-config autotrace.pc autotrace.spec
- LTLIBRARIES = $(lib_LTLIBRARIES)
+ AUTOTRACE_WEB=http://autotrace.sourceforge.net
+-AC_DEFINE_UNQUOTED(AUTOTRACE_WEB, "$AUTOTRACE_WEB")
++AC_DEFINE_UNQUOTED(AUTOTRACE_WEB, "$AUTOTRACE_WEB", [Program homepage.])
  
--libautotrace_la_LIBADD =
-+libautotrace_la_LIBADD = \
-+              $(LIBPNG_LDFLAGS)               \
-+              $(LIBSWF_LDFLAGS)               \
-+              $(LIBPSTOEDIT_LIBS)
-+
- @HAVE_LIBPNG_FALSE@@HAVE_LIBPSTOEDIT_FALSE@@HAVE_LIBSWF_FALSE@@[EMAIL 
PROTECTED] = \
- 
@HAVE_LIBPNG_FALSE@@HAVE_LIBPSTOEDIT_FALSE@@HAVE_LIBSWF_FALSE@@HAVE_MAGICK_TRUE@
      input-pnm.lo \
- 
@HAVE_LIBPNG_FALSE@@HAVE_LIBPSTOEDIT_FALSE@@HAVE_LIBSWF_FALSE@@HAVE_MAGICK_TRUE@
      input-bmp.lo \
+ AM_MAINTAINER_MODE
+ 
+ AM_CONFIG_HEADER(config.h)
+ 
+ AC_PROG_CPP
+-AC_PROG_RANLIB
+ dnl AC_CANONICAL_HOST
+ dnl AC_ARG_PROGRAM
+ AM_SANITY_CHECK
+@@ -80,10 +79,10 @@
+                       changequote([,])dnl
+                       MAGICK_MAJOR_VERSION_CHECK=`expr $MAGICK_MAJOR_VERSION 
\>= 5`
+                       MAGICK_MINOR_VERSION_CHECK=`expr $MAGICK_MINOR_VERSION 
\>= 2`
+-                      dnl I don't consider ImageMagick 6.x.
+-                      if test "$MAGICK_VERSION" = "5.2.0" \
+-                         || test "$MAGICK_MAJOR_VERSION_CHECK" = 0 \
+-                         || test "$MAGICK_MINOR_VERSION_CHECK" = 0 ; then
++                      MAGICK_MICRO_VERSION_CHECK=`expr $MAGICK_MICRO_VERSION 
\>= 1`
++                      if    test "$MAGICK_MAJOR_VERSION_CHECK" = 0 \
++                         && test "$MAGICK_MINOR_VERSION_CHECK" = 0 \
++                         && test "$MAGICK_MICRO_VERSION_CHECK" = 0 ; then
+                          AC_MSG_RESULT(no($MAGICK_VERSION))
+                          AC_MSG_WARN([*** Version 5.2.1 or higher is 
required.             ***])
+                          AC_MSG_WARN([*** ImageMagick input handler is 
disabled.           ***])
+@@ -92,7 +91,7 @@
+                               AC_SUBST(MAGICK_CFLAGS)
+                               AC_SUBST(MAGICK_LDFLAGS)
+                               HAVE_MAGICK=yes
+-                              AC_DEFINE(HAVE_MAGICK)
++                              AC_DEFINE([HAVE_MAGICK], 1, [Define to 1 if you 
have ImageMagick >= 5.2.1.])
+                       fi
+               else
+                       AC_MSG_WARN([*** Magick-config is found but 
magick/api.h is not found in $MAGICK_CFLAGS ***])
+@@ -182,7 +181,7 @@
+       if test "x$HAVE_LIBPNG" = "xyes" ; then
+               LIBPNG_LDFLAGS="-lpng -lz -lm"
+               AC_SUBST(LIBPNG_LDFLAGS)
+-              AC_DEFINE(HAVE_LIBPNG)
++              AC_DEFINE(HAVE_LIBPNG, 1, [Define to 1 if you have the `png' 
library (-lpng).])
+       else
+          AC_MSG_WARN([*** libpng exists but cannot find png_read_png in the 
libpng. ***])
+          AC_MSG_WARN([*** libpng might be old.                                
      ***])
+@@ -209,7 +208,7 @@
+       if test "$HAVE_LIBSWF" = "yes" ; then
+               LIBSWF_LDFLAGS="-lming -lm"
+               AC_SUBST(LIBSWF_LDFLAGS)
+-              AC_DEFINE(HAVE_LIBSWF)
++              AC_DEFINE(HAVE_LIBSWF, 1, [Define to 1 if you have the `ming' 
library (-lming).])
+       else
+               AC_MSG_WARN([*** Cannot find libming.    ***])
+               AC_MSG_WARN([*** SWF output is disabled. ***])
+@@ -250,11 +249,8 @@
+ dnl pstoedit library
+ dnl
+ HAVE_LIBPSTOEDIT=no
+-HAVE_LIBPSTOEDIT_320=no
+-HAVE_LIBPSTOEDIT_321=no
+ LIBPSTOEDIT_CFLAGS=
+ LIBPSTOEDIT_LIBS=
+-LIBPSTOEDIT_EXTRA_LIBS=
+ 
+ AC_ARG_WITH(pstoedit,
+ [  --with-pstoedit link with pstoedit library(default)
+@@ -263,53 +259,7 @@
+ dnl
+ dnl 
+ dnl
+-AC_PROG_CXX
+-dnl Standard C++ library and C++ Runtime
+-dnl --- WORKAROUND for pstoedit 3.32.0
+-CXX_RUNTIME_LIB=
+-CXX_STD_LIB=
+-if test x"$GXX" = xyes; then
+-   AC_CHECK_LIB(g++,main,CXX_RUNTIME_LIB=-lg++)
+-   AC_CHECK_LIB(stdc++,main,CXX_STD_LIB=-lstdc++,,${CXX_RUNTIME_LIB})
+-fi
+-AC_MSG_CHECKING([for C++ runtime])
+-LIBPSTOEDIT_EXTRA_LIBS="${CXX_STD_LIB} ${CXX_RUNTIME_LIB}"
+-AC_MSG_RESULT([${CXX_STD_LIB} ${CXX_RUNTIME_LIB}])
+-dnl dl library
+-dnl --- WORKAROUND for pstoedit 3.32.0
+-LIBLD_LDFLAGS=
+-AC_CHECK_LIB(dl,main,[LIBLD_LDFLAGS=-ldl])
+-if test "x${LIBLD_LDFLAGS}" != x; then
+-   LIBPSTOEDIT_EXTRA_LIBS="${LIBPSTOEDIT_EXTRA_LIBS} ${LIBLD_LDFLAGS}"
+-fi
+-
+-echo '*** Checking pstoedit existence TWICE(if needed) ***'
+-echo '*** This is the 1st check                        ***'
+-AM_PATH_PSTOEDIT(3.32.1,HAVE_LIBPSTOEDIT_321=yes)
+-if test ${HAVE_LIBPSTOEDIT_321} != yes; then
+-   echo '*** The 1st check is failed.                     ***'
+-   LIBS_BAKCUP=$LIBS
+-   LIBS="$LIBS ${LIBPSTOEDIT_EXTRA_LIBS}"
+-   echo '*** This is the 2nd check                        ***'
+-   AM_PATH_PSTOEDIT(3.32.0,HAVE_LIBPSTOEDIT_320=yes)
+-   LIBS=${LIBS_BAKCUP}
+-
+-   if test ${HAVE_LIBPSTOEDIT_320} = yes; then
+-      echo '*** The 2nd check is passed.                     ***'
+-        HAVE_LIBPSTOEDIT=yes
+-      AC_DEFINE(HAVE_LIBPSTOEDIT)
+-      LIBPSTOEDIT_LIBS="${PSTOEDIT_LIBS} ${LIBPSTOEDIT_EXTRA_LIBS}"
+-      LIBPSTOEDIT_CFLAGS="${PSTOEDIT_CFLAGS}"
+-   else
+-        echo '*** The 2nd check is failed.                     ***'
+-   fi
+-else
+-      echo '*** The 1st check is passed.                     ***'
+-      HAVE_LIBPSTOEDIT=yes
+-      AC_DEFINE(HAVE_LIBPSTOEDIT)
+-      LIBPSTOEDIT_LIBS="${PSTOEDIT_LIBS} ${LIBPSTOEDIT_EXTRA_LIBS}"   
+-      LIBPSTOEDIT_CFLAGS="${PSTOEDIT_CFLAGS}"
+-fi
++PKG_CHECK_MODULES(LIBPSTOEDIT, pstoedit, HAVE_LIBPSTOEDIT=yes, 
HAVE_LIBPSTOEDIT=no)
+ 
+ if test ${HAVE_LIBPSTOEDIT} = yes; then
+       AC_CHECK_FUNCS([mkstemp])
+@@ -317,6 +267,7 @@
+       echo '*** However, these are experimental functions in autotrace.     
***'
+       echo '*** If you get an error in building time about pstoedit,        
***'
+       echo '*** you can run configure with --without-pstoedit option again. 
***'
++      AC_DEFINE([HAVE_LIBPSTOEDIT], 1, [Define to 1 if you have the 
`pstoedit' library via pkg-config.])
+ else
+       AC_MSG_WARN([
+ *** Cannot find libpstoedit. ***

--- NEW FILE: t1lib5.info ---
Info2: <<
Package: t1lib5%type_pkg[-nox]
Version: 5.1.1
Revision: 3
Type: -nox (-nox -x11)
Depends: %N-shlibs (= %v-%r)
BuildDepends: fink (>= 0.27.2-1), (%type_raw[-nox] = -x11) x11-dev
BuildDependsOnly: True
Conflicts: t1lib1, t1lib5
Replaces: t1lib1, t1lib5
PatchScript: <<
  perl -pi -e 's/-o .* \$\(T1LIBX_OBJS\)/$& \$(X_LIBS) \$(XLIB)/' 
lib/Makefile.in
<<
ConfigureParams: (%type_raw[-nox] = -nox) --without-x
CompileScript: <<
 ./configure %c
 make without_doc
<<
InstallScript: <<
 #!/bin/sh -ev
 make install prefix=%i
 if [ %type_raw[-nox] = "-x11" ]; then 
 rm %i/bin/type1afm %i/include/t1lib.h %i/lib/libt1.*
 elif [ %type_raw[-nox] = "-nox" ]; then
 mv %i/share/t1lib/t1lib.config %i/share/t1lib/t1lib-nox.config
 fi
 mkdir -p %i/share/doc/%n
 mv %i/share/t1lib/doc/t1lib_doc.pdf %i/share/doc/%n
 /bin/rm -rf %i/share/t1lib/doc
<<
SplitOff: <<
  Package: %N-shlibs
  Depends: <<
    (%type_raw[-nox] = -x11) x11, 
    (%type_raw[-nox] = -x11) t1lib5-nox-shlibs
  <<
  Replaces: t1lib5-shlibs (<= 5.1.1-1)
  Files: lib/*.5*dylib
  Shlibs: <<
    (%type_raw[-nox] = -nox) %p/lib/libt1.5.dylib 7.0.0 %n (>= 5.1.1-2)
    (%type_raw[-nox] = -x11) %p/lib/libt1x.5.dylib 7.0.0 %n (>= 5.1.1-2)
  <<
  DocFiles: README.t1lib-%v LICENSE LGPL
  Description: Shared libs for generating Type 1 Font bitmaps
<<
License: GPL
DocFiles: README.t1lib-%v LICENSE LGPL
Source: http://sunsite.unc.edu/pub/linux/libs/graphics/t1lib-%v.tar.gz
Source-MD5: b1b86b5014364d92ab3b7cee6c81e29d
Homepage: http://sunsite.unc.edu/pub/linux/libs/graphics/
Description: Generates bitmaps from Type 1 fonts
DescPackaging: <<
 The x11-dependent portions of t1lib5 have now been made into a separate
 package.  Other packages would typically depend on either "t1lib5-nox-shlibs"
 or "t1lib5-nox-shlibs, t1lib5-x11-shlibs", depending on whether they were
 using x11 features or not.
<<
DescPort: <<
  Make sure libt1x, which uses x11, links against the x11 libs.
  libt1x also uses libt1, but cannot link against it because the
  libtool is tool old.
<<
Maintainer:  Dave Morrison <[EMAIL PROTECTED]>
<<

--- NEW FILE: greycstoration.info ---
Package: greycstoration
Version: 2.5.2
Revision: 1
BuildDepends: x11-dev, fftw3, libtiff, libpng3, libjpeg
Depends: fftw3-shlibs, x11, libtiff-shlibs, libpng3-shlibs, libjpeg-shlibs
Source: 
http://www.greyc.ensicaen.fr/~dtschump/greycstoration/data/GREYCstoration-%v.1.zip
Source-MD5: 83a64253424f06753e17c00163e41ffc
SourceDirectory: GREYCstoration-%v/src
License: OSI-Approved
Description: Tool for image denoising
DescDetail:<< 
GREYCstoration is an image regularization algorithm which is able to process a
color image by locally removing small variations of pixel intensities while 
preserving significant global image features, such as edges and corners. The 
most direct application of image regularization is image denoising. By 
extension, it can also be used to inpaint or resize images.
<<
Homepage: http://www.greyc.ensicaen.fr/~dtschump/greycstoration/
Maintainer: Pepe Barbe <[EMAIL PROTECTED]>

DocFiles: ../Licence_CeCILL_V2-en.txt ../README.txt

Patch: greycstoration.patch
CompileScript: make FFTW3_I=%p/include FFTW3_L=%p/lib olinux
InstallScript: <<
mkdir %i/bin
cp greycstoration %i/bin
<<
Index: autotrace.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/autotrace.info,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- autotrace.info      3 Aug 2006 06:03:07 -0000       1.5
+++ autotrace.info      19 Jul 2007 22:23:28 -0000      1.5.2.1
@@ -1,43 +1,98 @@
 Package: autotrace
 Version: 0.31.1
-Revision: 1016
+Revision: 1017
 GCC: 4.0
 Maintainer: None <[EMAIL PROTECTED]>
 BuildDependsOnly: true
-BuildDepends: freetype2, libjpeg, libpng3, libtiff, libxml2, gdbm, expat, 
tcltk-dev, ming, pstoedit (>= 3.40-1002), bzip2-dev, libiconv-dev, 
imagemagick-dev (>= 6.1.8-1002), imagemagick (>= 6.1.8-1002), lcms, libtool14, 
libemf
+BuildDepends: <<
+       autoconf (>= 2.60),
+       automake1.9,
+       bzip2-dev,
+       gd2,
+       imagemagick10-dev,
+       lcms,
+       libdjvulibre15-dev,
+       libiconv-dev,
+       libjpeg,
+       libpng3,
+       libtiff,
+       libtool14,
+       libxml2,
+       ming,
+       pkgconfig,
+       pstoedit (>= 3.44-1),
+       x11-dev
+<<
 Depends: %N-shlibs (= %v-%r)
+
 Source: http://ftp1.sourceforge.net/%n/%n-%v.tar.gz
 Source-MD5: 54eabbb38d2076ded6d271e1ee4d0783
+
 Patch: %n.patch
-PatchScript: perl -pi -e 's/(AC_DEFUN\()([^[]+)(,)/\1\[\2]\3/' autotrace.m4
+
 ConfigureParams: --mandir=%p/share/man
-InstallScript: <<
-make DESTDIR=%d install
+CompileScript: <<
+       autoreconf -f -i
+       ./configure %c
+       make
 <<
+
+InstallScript: make DESTDIR=%d install
+DocFiles: AUTHORS COPYING* ChangeLog FAQ HACKING NEWS README* THANKS TODO
+
 Splitoff: <<
-Package: %N-shlibs
-Description: Shared libraries for autotrace
-Depends: ming-shlibs, imagemagick-shlibs (>= 6.1.8-1002), pstoedit-shlibs (>= 
3.40-1002), libpng3-shlibs, bzip2-shlibs, lcms-shlibs, libemf-shlibs, 
libjpeg-shlibs, libtiff-shlibs, libxml2-shlibs, plotutils-shlibs
-Replaces: %N (<< 0.31.0-2)
-DocFiles: README COPYING
-Files: lib/libautotrace.3.dylib lib/libautotrace.3.0.0.dylib
-Shlibs: %p/lib/libautotrace.3.dylib 4.0.0 %n (>= 0.31.1-12)
+       Package: %N-shlibs
+       Description: Shared libraries for autotrace
+       Depends: <<
+               bzip2-shlibs,
+               gd2-shlibs,
+               imagemagick10-shlibs,
+               lcms-shlibs,
+               libiconv,
+               libjpeg-shlibs,
+               libpng3-shlibs,
+               libtiff-shlibs,
+               ming-shlibs,
+               pstoedit-shlibs (>= 3.44-1),
+               x11-shlibs
+       <<
+       Replaces: %N (<< 0.31.0-2)
+       DocFiles: AUTHORS COPYING* ChangeLog FAQ HACKING NEWS README* THANKS 
TODO
+       Files: lib/libautotrace.3.dylib lib/libautotrace.3.0.0.dylib
+       Shlibs: %p/lib/libautotrace.3.dylib 4.0.0 %n (>= 0.31.1-12)
 <<
+
 Splitoff2: <<
-Package: %N-bin
-Description: autotrace binary
-Depends: ming-shlibs, imagemagick-shlibs (>= 6.1.8-1002), pstoedit-shlibs (>= 
3.40-1002), libpng3-shlibs, %N-shlibs (= %v-%r)
-Replaces: %N (<< 0.31-13)
-DocFiles: README COPYING
-Files: bin/autotrace share/man/man1/autotrace.1
+       Package: %N-bin
+       Description: Main autotrace program
+       Depends: <<
+               %N-shlibs (= %v-%r),
+               bzip2-shlibs,
+               gd2-shlibs,
+               imagemagick10-shlibs,
+               lcms-shlibs,
+               libiconv,
+               libjpeg-shlibs,
+               libpng3-shlibs,
+               libtiff-shlibs,
+               ming-shlibs,
+               pstoedit-shlibs (>= 3.44-1),
+               x11-shlibs
+       <<
+       Replaces: %N (<< 0.31-13)
+       DocFiles: AUTHORS COPYING* ChangeLog FAQ HACKING NEWS README* THANKS 
TODO
+       Files: bin/autotrace share/man
 <<
+
 Description: Converts bitmap to vector graphics
 License: GPL
-DocFiles: README COPYING
 HomePage: http://autotrace.sourceforge.net
 DescPackaging: <<
- Originally packaged by Peter O'Gorman.
+       Originally packaged by Peter O'Gorman.
 
- Link the library against its dependent libs instead of relying on
- users of the lib to get the -l flags correct.
+       Link the library against its dependent libs instead of relying
+       on users of the lib to get the -l flags correct.
+
+       dmacks: hacked configure to accept pstoedit via pkgconfig and
+       imagemagick 6.x, and other upgrades to modern auto* standards.
 <<

--- NEW FILE: antiprism.patch ---
diff -Nurd -x'*`' antiprism-0.14.orig/Makefile.in antiprism-0.14/Makefile.in
--- antiprism-0.14.orig/Makefile.in     2007-06-20 04:07:13.000000000 -0400
+++ antiprism-0.14/Makefile.in  2007-06-22 14:53:12.000000000 -0400
@@ -168,8 +168,8 @@
 EXTRA_DIST = bootstrap doc Makefile_basic base/Makefile_basic \
              src/Makefile_basic aview/Makefile_basic 
 
-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
-doc_DATA = README NEWS AUTHORS 
+docdir = $(prefix)/share/doc/$(PACKAGE)
+doc_DATA = README NEWS AUTHORS COPYING
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
 
diff -Nurd -x'*`' antiprism-0.14.orig/configure antiprism-0.14/configure
--- antiprism-0.14.orig/configure       2007-06-20 04:07:14.000000000 -0400
+++ antiprism-0.14/configure    2007-06-22 14:47:58.000000000 -0400
@@ -3910,7 +3910,7 @@
 echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_gluBeginCurve" >&5
 echo "${ECHO_T}$ac_cv_lib_GLU_gluBeginCurve" >&6
 if test $ac_cv_lib_GLU_gluBeginCurve = yes; then
-  LIBS="-lGL $LIBS"
+  LIBS="-lGLU $LIBS"
 else
 
 
diff -Nurd -x'*`' antiprism-0.14.orig/src/minmax.cc antiprism-0.14/src/minmax.cc
--- antiprism-0.14.orig/src/minmax.cc   2007-02-08 09:27:17.000000000 -0500
+++ antiprism-0.14/src/minmax.cc        2007-06-22 15:10:36.000000000 -0400
@@ -53,7 +53,7 @@
       string ifile;
       string ofile;
 
-      mm_opts(): prog_opts("minmax"), num_iters(1000), algm('a'),
+      mm_opts(): prog_opts("minmax-antiprism"), num_iters(1000), algm('a'),
                  placement('n'), shorten_by(1.0), lengthen_by(0.0)
                  {}
 

Index: gd2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/gd2.info,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -d -r1.3.2.2 -r1.3.2.3
--- gd2.info    22 Feb 2007 13:09:22 -0000      1.3.2.2
+++ gd2.info    19 Jul 2007 22:23:28 -0000      1.3.2.3
@@ -1,12 +1,12 @@
 Package: gd2
-Version: 2.0.34
+Version: 2.0.35
 Revision: 1
 Depends: %N-shlibs (= %v-%r)
 BuildDepends: libpng3, libjpeg (>= 6b-3), fink (>= 0.9.9-1), x11, 
libiconv-dev, x11-dev, autoconf (>= 2.60-1)
-Conflicts: gd
-Replaces: gd, gd209, %N-bin (<< 2.0.33-3)
+Conflicts: gd, gd2-nox, gd209
+Replaces: gd, gd2-nox, gd209, %N-bin (<< 2.0.33-3)
 Source: http://www.libgd.org/releases/gd-%v.tar.bz2
-Source-MD5: 8c25c322f12030b1c24488efd577fec0
+Source-MD5: 6c6c3dbb7bf079e0bb5fbbfd3bb8a71c
 ConfigureParams: --with-freetype=/usr/X11R6
 DocFiles: COPYING INSTALL index.html README-JPEG.TXT README.TXT readme.jpn
 BuildDependsOnly: True
@@ -22,8 +22,8 @@
 SplitOff2: <<
   Package: %N-bin
   Depends: %N-shlibs, libjpeg-bin, x11
-  Conflicts: gd-bin
-  Replaces: gd-bin, gd209-bin
+  Conflicts: gd-bin, gd2-nox-bin, gd209-bin
+  Replaces: gd-bin, gd2-nox-bin, gd209-bin
   Files: <<
     bin/annotate
     bin/bdftogd

Index: reportlab-py.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/reportlab-py.info,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- reportlab-py.info   19 Jun 2007 21:17:00 -0000      1.3.2.1
+++ reportlab-py.info   19 Jul 2007 22:23:28 -0000      1.3.2.2
@@ -1,13 +1,13 @@
 Info2: <<
 Package: reportlab-py%type_pkg[python]
-Version: 2.0
+Version: 2.1
 Revision: 1
 Distribution: (%type_pkg[python] = 23) 10.3, (%type_pkg[python] = 23) 10.4
 Type: python (2.3 2.4 2.5)
 Description: PDF creation library for Python
-Source: http://reportlab.org/ftp/ReportLab_2_0.tgz
-Source-MD5: 0de80cdf310dac692ba6ea02beb4481b
-SourceDirectory: reportlab_2_0/reportlab
+Source: http://reportlab.org/ftp/ReportLab_2_1.tgz
+Source-MD5: d6eefe9e6e06aaa1315462045c9726ba
+SourceDirectory: reportlab_2_1/reportlab
 DocFiles: README MANIFEST.in changes license.txt
 GCC: 4.0
 License: BSD

--- NEW FILE: antiprism.info ---
Package: antiprism
Version: 0.14
Revision: 1002

BuildDepends: freeglut (>= 2.4.0-2), x11-dev
Depends: freeglut-shlibs (>= 2.4.0-2), x11
GCC: 4.0

Source: mirror:sourceforge:%n/%n-%v.tar.gz
Source-MD5: e92a37ed26b65ab9c195c2df4678f0e0

Patch: %n.patch
PatchScript: <<
        perl -pi -e 's/minmax/minmax-%n/g' doc/*.html NEWS
        mv doc/minmax.html doc/minmax-%n.html
<<

SetCPPFLAGS: -I/usr/X11R6/include
SetLDFLAGS: -L/usr/X11R6/lib
SetCFLAGS: -g -Os -Wall
SetCXXFLAGS: -g -Os -Wall
ConfigureParams: --disable-dependency-tracking

InstallScript: <<
        make install DESTDIR=%d
        mv %i/bin/minmax %i/bin/minmax-%n
<<

DescPackaging: <<
        Make sure all doc files wind up in consistent location.

        Need versioned freeglut dep to ensure libglut.la is present in
        case %n ever gets libtoolized.

        Rename the %p/bin/minmax command to "minmax-%n" to avoid
        collision with same command-name in gmt package.
<<
DescPort: <<
        Fix libGLU detection bug (avoid indirect symbol use).
<<
Description: Polyhedra manipulations and viewing
License: BSD
Homepage: http://www.antiprism.com
Maintainer: Daniel Macks <[EMAIL PROTECTED]>

Index: pstoedit.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/pstoedit.info,v
retrieving revision 1.7.2.3
retrieving revision 1.7.2.4
diff -u -d -r1.7.2.3 -r1.7.2.4
--- pstoedit.info       18 Mar 2007 14:05:58 -0000      1.7.2.3
+++ pstoedit.info       19 Jul 2007 22:23:28 -0000      1.7.2.4
@@ -1,18 +1,17 @@
 Package: pstoedit
 Version: 3.44
-Revision: 1002
+Revision: 1003
 GCC: 4.0
 Maintainer: None <[EMAIL PROTECTED]>
-Depends: %N-shlibs (= %v-%r), %N-bin (= %v-%r), pkgconfig
-BuildDepends: libtiff, libjpeg, libemf (>= 1.0.2-1011), ming (>= 0.2a-3), 
plotutils-dev (>= 2.4.1-1007), libpng3, lcms, libxml2, bzip2-dev, imagemagick, 
imagemagick10-dev, libtool14, libiconv-dev, x11-dev, gd2
+Depends: %N-shlibs (= %v-%r), %N-bin (= %v-%r)
+BuildDepends: libtiff, libjpeg, libemf (>= 1.0.2-1012), ming (>= 0.2a-3), 
plotutils-dev (>= 2.4.1-1007), libpng3, lcms, libxml2, bzip2-dev, imagemagick, 
imagemagick10-dev, libtool14, libiconv-dev, x11-dev, gd2, pkgconfig
 BuildDependsOnly: true
 Source: mirror:sourceforge:/%n/%n-%v.tar.gz
 Source-MD5: 13f24cb070da3f6af82ed84f4e53f049
-SetCPPFLAGS: -I%p/lib/pango-ft219/include/pango-1.0 
-I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2 
-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include -D__unix__
-NoSetLDFLAGS: true
-SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib 
-L%p/lib/fontconfig2/lib
+NoSetCPPFLAGS: True
+SetCPPFLAGS: -I/usr/X11R6/include/ -I%p/include -D__unix__
+NoSetLDFLAGS: True
 SetLIBS: -L%p/lib
-SetCFLAGS: -Os -pipe
 NoSetMAKEFLAGS: true
 SetMAKEFLAGS: -j1
 PatchScript: <<
@@ -35,7 +34,7 @@
 <<
 Splitoff: <<
   Package: %N-shlibs
-  Depends: libemf-shlibs (>= 1.0.2-1011), imagemagick10-shlibs, ming-shlibs 
(>= 0.2a-3), plotutils-shlibs (>= 2.4.1-1007), lcms-shlibs, gd2-shlibs, x11
+  Depends: libemf-shlibs (>= 1.0.2-1012), imagemagick10-shlibs, ming-shlibs 
(>= 0.2a-3), plotutils-shlibs (>= 2.4.1-1007), lcms-shlibs, gd2-shlibs, x11
   Files: <<
     lib/libpstoedit.0.0.0.dylib
     lib/libpstoedit.0.dylib


-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to