Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv12870/main/finkinfo/libs

Modified Files:
      Tag: pangocairo-branch
        db3.info db41.info db42.info db43.info db44.info fuse.info 
        libcurlpp0.info opengl-py.info poppler1.info poppler1.patch 
        slang.info system-openssl-dev.info 
Log Message:
merge from HEAD as of yesterday

Index: db43.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/db43.info,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- db43.info   4 Aug 2006 00:30:15 -0000       1.3
+++ db43.info   31 Jan 2007 19:18:01 -0000      1.3.2.1
@@ -1,6 +1,6 @@
 Package: db43
 Version: 4.3.29
-Revision: 1001
+Revision: 1002
 Source: ftp://ftp.sleepycat.com/releases/db-%v.NC.tar.gz
 Replaces: db, db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db41, db42-ssl, 
db42, db43-ssl,db44, db44-aes
 Conflicts: db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db41, db42-ssl, 
db42, db43-ssl, db44, db44-aes
@@ -30,7 +30,7 @@
 <<
 InstallScript: <<
 #! /bin/sh -ev
-(cd build_unix; make install prefix=%I docdir=%I/share/doc/db43-doc/docs 
includedir=%I/include/db4)
+(cd build_unix; make install prefix=%I docdir=%I/share/doc/db43-doc/docs 
includedir=%I/include/db4) || exit 1
 binfiles="db_archive db_checkpoint db_deadlock db_dump db_load db_printlog 
db_recover db_stat db_upgrade db_verify"
 for binfile in $binfiles ; do
  mv %i/bin/$binfile %i/bin/$binfile.%N

Index: libcurlpp0.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libcurlpp0.info,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- libcurlpp0.info     9 Dec 2006 22:52:51 -0000       1.4
+++ libcurlpp0.info     31 Jan 2007 19:18:02 -0000      1.4.2.1
@@ -1,9 +1,9 @@
 Package: libcurlpp0
-Version: 0.6.1
+Version: 0.7.0
 Revision: 1002
 Description: C++ bindings for libcurl
 Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
-Homepage: http://rrette.com/curlpp.html
+Homepage: http://rrette.com/textpattern/index.php?s=cURLpp
 License: BSD
 DescPackaging: <<
   Patch curlpp-config.in and curlpp.pc.in to make
@@ -12,11 +12,11 @@
   example programs.
 <<
 
-Source: http://rrette.com/downloads/sources/curlpp-%v.tar.gz
-Source-MD5: 9f843154cc3d23fd547cc6cbfdb99e90
+Source: http://rrette.com/files/curlpp/curlpp-0.7/curlpp-%v.tar.gz
+Source-MD5: 34cd0c82795b9f245930335bb5e2e764
 
 Depends: %N-shlibs (= %v-%r)
-BuildDepends: libcurl4, system-openssl-dev
+BuildDepends: libcurl4 (>= 7.16.1), system-openssl-dev, libssh2
 BuildDependsOnly: True
 
 Patch: %n.patch
@@ -34,7 +34,7 @@
 SplitOff: <<
   Package: %N-shlibs
   
-  Depends: libcurl4-shlibs
+  Depends: libcurl4-shlibs (>= 7.16.1), libssh2-shlibs
   
   Files: lib/libcurlpp.0.0.2.dylib lib/libcurlpp.0.dylib
   Shlibs: %p/lib/libcurlpp.0.dylib 1.0.0 %n (>= 0.6.0-0.pre3.1)

Index: poppler1.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/poppler1.info,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -u -d -r1.5.2.5 -r1.5.2.6
--- poppler1.info       28 Jan 2007 18:22:20 -0000      1.5.2.5
+++ poppler1.info       31 Jan 2007 19:18:02 -0000      1.5.2.6
@@ -55,7 +55,7 @@
 
        if [ -f %p/lib/fontconfig2/lib/libfontconfig.a ] && [ ! -f 
%p/lib/fontconfig2/lib/libfontconfig.dylib ]; then
                mkdir fink-fc
-               ( cd fink-fc && ar x %p/lib/fontconfig2/lib/libfontconfig.a )
+               ( cd fink-fc && ar x %p/lib/fontconfig2/lib/libfontconfig.a ) 
|| exit 1
                for a in poppler/.libs/libpoppler.a 
glib/.libs/libpoppler-glib.a; do
                        ar d $a libfontconfig.a
                        ar d $a libfontconfig.a

Index: system-openssl-dev.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/system-openssl-dev.info,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- system-openssl-dev.info     28 Dec 2006 17:50:19 -0000      1.2.2.1
+++ system-openssl-dev.info     31 Jan 2007 19:18:02 -0000      1.2.2.2
@@ -34,8 +34,8 @@
 accidentally linking against the Fink versions of these libraries.
 
 For more information on using this package, see
-http://wiki.opendarwin.org/index.php/Fink:Policy:system-openssl
+http://wiki.finkproject.org/index.php/Fink:Policy:system-openssl
 <<
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
-Homepage: http://wiki.opendarwin.org/index.php/Fink:Policy:system-openssl
+Homepage: http://wiki.finkproject.org/index.php/Fink:Policy:system-openssl
 License: OSI-Approved

Index: db41.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/db41.info,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- db41.info   31 May 2006 14:26:49 -0000      1.2
+++ db41.info   31 Jan 2007 19:18:01 -0000      1.2.2.1
@@ -1,6 +1,6 @@
 Package: db41
 Version: 4.1.25
-Revision: 1023
+Revision: 1024
 Source: http://www.sleepycat.com/update/snapshot/db-%v.NC.tar.gz
 Replaces: db, db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db42, db42-ssl, 
db43-ssl, db43, db44, db44-aes
 Conflicts: db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db42, db42-ssl, 
db43-ssl, db43, db44, db44-aes
@@ -29,7 +29,7 @@
 <<
 InstallScript: <<
 #! /bin/sh -ev
-(cd build_unix; make install prefix=%I docdir=%I/share/doc/db41-doc/docs 
includedir=%I/include/db4)
+(cd build_unix; make install prefix=%I docdir=%I/share/doc/db41-doc/docs 
includedir=%I/include/db4) || exit 1
 binfiles="db_archive db_checkpoint db_deadlock db_dump db_load db_printlog 
db_recover db_stat db_upgrade db_verify"
 for binfile in $binfiles ; do
  mv %i/bin/$binfile %i/bin/$binfile.%N

Index: db42.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/db42.info,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- db42.info   31 May 2006 14:26:49 -0000      1.2
+++ db42.info   31 Jan 2007 19:18:01 -0000      1.2.2.1
@@ -1,6 +1,6 @@
 Package: db42
 Version: 4.2.52
-Revision: 1017
+Revision: 1018
 Source: http://www.sleepycat.com/update/snapshot/db-%v.NC.tar.gz
 Replaces: db, db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db41, db42-ssl, 
db43-ssl, db43, db44, db44-aes
 Conflicts: db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db41, db42-ssl, 
db43-ssl, db43, db44, db44-aes
@@ -30,7 +30,7 @@
 <<
 InstallScript: <<
 #! /bin/sh -ev
-(cd build_unix; make install prefix=%I docdir=%I/share/doc/db42-doc/docs 
includedir=%I/include/db4)
+(cd build_unix; make install prefix=%I docdir=%I/share/doc/db42-doc/docs 
includedir=%I/include/db4) || exit 1
 binfiles="db_archive db_checkpoint db_deadlock db_dump db_load db_printlog 
db_recover db_stat db_upgrade db_verify"
 for binfile in $binfiles ; do
  mv %i/bin/$binfile %i/bin/$binfile.%N

Index: db44.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/db44.info,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- db44.info   16 Aug 2006 00:55:33 -0000      1.3
+++ db44.info   31 Jan 2007 19:18:01 -0000      1.3.2.1
@@ -1,6 +1,6 @@
 Package: db44
 Version: 4.4.20
-Revision: 1001
+Revision: 1002
 Source: ftp://ftp.sleepycat.com/releases/db-%v.NC.tar.gz
 Replaces: db, db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db41, db42-ssl, 
db42, db43-ssl, db43, db44-aes
 Conflicts: db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db41, db42-ssl, 
db42, db43-ssl, db43, db44-aes
@@ -30,7 +30,7 @@
 <<
 InstallScript: <<
 #! /bin/sh -ev
-(cd build_unix; make install prefix=%I docdir=%I/share/doc/db44-doc/docs 
includedir=%I/include/db4)
+(cd build_unix; make install prefix=%I docdir=%I/share/doc/db44-doc/docs 
includedir=%I/include/db4) || exit 1
 binfiles="db_archive db_checkpoint db_deadlock db_dump db_dump185 db_hotbackup 
db_load db_printlog db_recover db_stat db_upgrade db_verify"
 for binfile in $binfiles ; do
  mv %i/bin/$binfile %i/bin/$binfile.%N

Index: fuse.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/fuse.info,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -u -d -r1.6.2.3 -r1.6.2.4
--- fuse.info   23 Jan 2007 18:39:48 -0000      1.6.2.3
+++ fuse.info   31 Jan 2007 19:18:01 -0000      1.6.2.4
@@ -1,11 +1,14 @@
 Package: fuse
-Version: 0.1.7
+Version: 0.1.9
 Revision: 1
 Source: http://dev.kublai.com/macfuse-%v.tar.gz
-Source-MD5: a71745a8b8f9afe3391e64848ebcd84d
+Source-MD5: 59a40c5eabd25bf272bc65287036307b
 Source2: mirror:sourceforge:%n/%n-2.6.1.tar.gz
 Source2-MD5: 13e1873086a1d7a95f470bbc7428c528
 
+# Broken with xcode 2.2, tested with 2.4.1
+BuildDepends: gcc4.0 (>= 4.0.1-5367)
+
 PatchScript: <<
 sed -i.bak -e 's,/Library/Extensions/,%p/lib/%n/,' fusefs/load/load_fusefs.c
 sed -i.bak -e 's,/Library/Extensions/,%p/lib/%n/,' \
@@ -40,14 +43,14 @@
 #chown -R root:wheel /System/Library/Filesystems/fusefs.fs
 chmod u+s %p/lib/%n/fusefs.kext/Contents/Resources/load_fusefs
 <<
-DocFiles: COPYING HOWTO
+DocFiles: COPYING.txt CHANGELOG.txt HOWTO.txt README.txt
 
 SplitOff: <<
   Package: fuse-dev
   Depends: fuse-shlibs (= %v-%r), pkgconfig
   Replaces: fuse (<< 0.1.0b006-3)
   BuildDependsOnly: True
-  DocFiles: COPYING
+  DocFiles: COPYING.txt
   Files: <<
     include 
     lib/libfuse.dylib lib/libfuse.a lib/libfuse.la
@@ -64,7 +67,7 @@
   Package: fuse-shlibs
   Depends: fuse (= %v-%r)
   Replaces: fuse (<< 0.1.0b006-3)
-  DocFiles: COPYING
+  DocFiles: COPYING.txt
   Files: <<
     lib/libfuse.0.dylib
     lib/libulockmgr.1.dylib
@@ -84,5 +87,5 @@
 SSH access (sshfs is packaged separately).
 <<
 License: BSD
-Homepage: http://fuse.sourceforge.net/
+Homepage: http://code.google.com/p/macfuse/
 Maintainer: Brendan Cully <[EMAIL PROTECTED]>

Index: opengl-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/opengl-py.info,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- opengl-py.info      24 Sep 2006 15:37:18 -0000      1.4
+++ opengl-py.info      31 Jan 2007 19:18:02 -0000      1.4.2.1
@@ -1,7 +1,7 @@
 Info2: <<
 Package: opengl%type_pkg[-nox]-py%type_pkg[python]
 Version: 2.0.1.09
-Revision: 3
+Revision: 4
 Type: -nox (boolean), python (2.3 2.4 2.5)
 BuildDepends: <<
  swig (>= 1.3.20),
@@ -59,7 +59,7 @@
 
  if [ "%type_raw[-nox]" == "." ]; then
   tclver=`echo 'puts $tcl_version' | %p/bin/tclsh`
-  ( cd src/Togl-1.6 && make )
+  ( cd src/Togl-1.6 && make ) || exit 1
   cp src/Togl-1.6/togl.so build/Togl-1.6-tk${tclver}/
  fi
 <<

Index: db3.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/db3.info,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- db3.info    31 May 2006 14:26:49 -0000      1.2
+++ db3.info    31 Jan 2007 19:18:01 -0000      1.2.2.1
@@ -1,6 +1,6 @@
 Package: db3
 Version: 3.3.11
-Revision: 1027
+Revision: 1028
 Source: http://www.sleepycat.com/update/snapshot/db-%v.tar.gz
 Patch: %n.patch
 Conflicts: db, db4, db4-ssl, db31 (<< 3.1.17-8), db41, db41-ssl, db42-ssl, 
db42, db43-ssl, db43, db44, db44-aes
@@ -26,7 +26,7 @@
 <<
 InstallScript: <<
 #! /bin/sh -ev
-(cd build_unix; make install prefix=%I docdir=%I/share/doc/db3-doc/docs 
includedir=%I/include/db3)
+(cd build_unix; make install prefix=%I docdir=%I/share/doc/db3-doc/docs 
includedir=%I/include/db3) || exit 1
 binfiles="db_archive db_checkpoint db_deadlock db_dump db_load db_printlog 
db_recover db_stat db_upgrade db_verify"
 for binfile in $binfiles ; do
  mv %i/bin/$binfile %i/bin/$binfile.%N

Index: slang.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/slang.info,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- slang.info  28 Dec 2006 17:50:19 -0000      1.1.2.1
+++ slang.info  31 Jan 2007 19:18:02 -0000      1.1.2.2
@@ -16,20 +16,25 @@
 
 Package: slang
 Version: 1.4.9
-Revision: 11
+Revision: 12
 Maintainer: Max Horn <[EMAIL PROTECTED]>
 Depends: %N-shlibs (= %v-%r)
 BuildDependsOnly: True
-Source: ftp://space.mit.edu/pub/davis/slang/v1.4/%n-%v.tar.bz2
-#Source: mirror:sourceforge:fink/%n-%v.tar.bz2
+CustomMirror: <<
+A: ftp://space.mit.edu/pub/davis/slang/
+B: ftp://ftp.fu-berlin.de/pub/unix/misc/slang/
+C: ftp://ftp.ntua.gr/pub/lang/slang/slang/
+D: ftp://ftp.plig.org/pub/slang/
+<<
+Source: mirror:custom:v1.4/%n-%v.tar.bz2
 Source-MD5: 4fbb1a7f1257e065ca830deefe13d350
 SetCFLAGS: -I%p/include
 CompileScript: <<
- ./configure %c
- make all elf install_doc_dir=%p/share/doc/%n
+  ./configure %c
+  make all elf install_doc_dir=%p/share/doc/%n
 <<
 InstallScript: <<
- make install-elf install-links DESTDIR=%d install_doc_dir=%p/share/doc/%n
+  make install-elf install-links DESTDIR=%d install_doc_dir=%p/share/doc/%n
 <<
 #
 SplitOff: <<
@@ -37,7 +42,7 @@
   Replaces: %N (<= 1.4.5-2)
   Files: lib/libslang.*.dylib
   Shlibs: %p/lib/libslang.1.dylib 1.0.0 %n (>= 1.4.5-3)
-  DocFiles: COPYING* COPYRIGHT README NEWS UPGRADE.txt
+  DocFiles: COPYING* COPYRIGHT README
 <<
 DocFiles: COPYING* COPYRIGHT README NEWS UPGRADE.txt
 Description: Embedable extension language and console I/O lib
@@ -53,12 +58,10 @@
 Previous revisions by Jeremy Higgs and Christoph Pfisterer.
 <<
 DescPort: <<
-To use the terminfo database provided by the sltermin.c file is patched with 
the path.
-
 Module loading should work thanks to dlcompat, but the shipped modules
 are not built right now.
 
 CPPFLAGS is ignored, so we use CFLAGS instead.
 <<
 License: Artistic
-Homepage: http://space.mit.edu/~davis/slang/
+Homepage: http://www.jedsoft.org/slang/

Index: poppler1.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/poppler1.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- poppler1.patch      24 Jan 2007 17:04:22 -0000      1.1.2.1
+++ poppler1.patch      31 Jan 2007 19:18:02 -0000      1.1.2.2
@@ -1,6 +1,6 @@
-
+diff -uNr poppler-0.5.4/configure poppler-0.5.4-new/configure
 --- poppler-0.5.4/configure    2006-09-21 20:54:32.000000000 -0400
-+++ poppler-0.5.4-new/configure        2006-10-30 16:18:30.000000000 -0500
++++ poppler-0.5.4-new/configure        2007-01-25 21:36:45.000000000 -0500
 @@ -24268,7 +24268,7 @@
  fi
  
@@ -10,8 +10,64 @@
  
  jpeg_incdir=NO
  for i in $jpeg_incdirs;
+diff -uNr poppler-0.5.4/glib/Makefile.in poppler-0.5.4-new/glib/Makefile.in
+--- poppler-0.5.4/glib/Makefile.in     2006-09-21 20:54:20.000000000 -0400
++++ poppler-0.5.4-new/glib/Makefile.in 2007-01-25 21:45:15.000000000 -0500
+@@ -283,9 +283,9 @@
+       -DG_LOG_DOMAIN=\"Poppler\"              \
+       -I$(top_srcdir)                         \
+       -I$(top_srcdir)/poppler                 \
++      $(FREETYPE_CFLAGS)                      \
+       $(cairo_includes)                       \
+       $(POPPLER_GLIB_CFLAGS)                  \
+-      $(FREETYPE_CFLAGS)                      \
+       $(cairo_includes)                       
+ 
+ stamp_files = stamp-poppler-enums.h
+@@ -314,8 +314,8 @@
+ 
+ libpoppler_glib_la_LIBADD = \
+       $(top_builddir)/poppler/libpoppler.la           \
+-      $(POPPLER_GLIB_LIBS)                            \
+       $(FREETYPE_LIBS)                                \
++      $(POPPLER_GLIB_LIBS)                            \
+       $(cairo_libs)
+ 
+ libpoppler_glib_la_LDFLAGS = -version-info 1:0:0
+@@ -325,8 +325,8 @@
+ test_poppler_glib_LDADD = \
+       $(top_builddir)/poppler/libpoppler.la   \
+       libpoppler-glib.la                      \
+-      $(POPPLER_GLIB_LIBS)                    \
+       $(FREETYPE_LIBS)                        \
++      $(POPPLER_GLIB_LIBS)                    \
+       $(cairo_libs)
+ 
+ BUILT_SOURCES = \
+diff -uNr poppler-0.5.4/glib/reference/Makefile.in 
poppler-0.5.4-new/glib/reference/Makefile.in
+--- poppler-0.5.4/glib/reference/Makefile.in   2006-09-21 20:54:21.000000000 
-0400
++++ poppler-0.5.4-new/glib/reference/Makefile.in       2007-01-25 
21:45:49.000000000 -0500
+@@ -283,14 +283,14 @@
+ # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
+ # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
+ INCLUDES = -I$(top_srcdir)/glib -I$(top_builddir)/glib        \
++      $(FREETYPE_CFLAGS) \
+       $(CAIRO_CFLAGS)                                 \
+-      $(POPPLER_GLIB_CFLAGS)                          \
+-      $(FREETYPE_CFLAGS)
++      $(POPPLER_GLIB_CFLAGS)                  
+ 
+ GTKDOC_LIBS = $(top_builddir)/poppler/libpoppler.la   \
+       $(top_builddir)/glib/libpoppler-glib.la         \
+-      $(POPPLER_GLIB_LIBS)                            \
+       $(FREETYPE_LIBS)                                \
++      $(POPPLER_GLIB_LIBS)                            \
+       $(cairo_libs)
+ 
+ @[EMAIL PROTECTED] = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
+diff -uNr poppler-0.5.4/poppler/Makefile.in 
poppler-0.5.4-new/poppler/Makefile.in
 --- poppler-0.5.4/poppler/Makefile.in  2006-09-21 20:54:23.000000000 -0400
-+++ poppler-0.5.4-new/poppler/Makefile.in      2006-10-30 16:19:53.000000000 
-0500
++++ poppler-0.5.4-new/poppler/Makefile.in      2007-01-25 21:36:45.000000000 
-0500
 @@ -366,11 +366,11 @@
  INCLUDES = \
        -I$(top_srcdir)                         \
@@ -43,8 +99,71 @@
  
  libpoppler_la_LDFLAGS = -version-info 1:0:0
  @[EMAIL PROTECTED] = $(includedir)/poppler
+diff -uNr poppler-0.5.4/qt/Makefile.in poppler-0.5.4-new/qt/Makefile.in
+--- poppler-0.5.4/qt/Makefile.in       2006-09-21 20:54:24.000000000 -0400
++++ poppler-0.5.4-new/qt/Makefile.in   2007-01-25 21:49:20.000000000 -0500
+@@ -259,10 +259,10 @@
+ INCLUDES = \
+       -I$(top_srcdir)                         \
+       -I$(top_srcdir)/poppler                 \
++      $(FREETYPE_CFLAGS)                       \
+       $(cairo_includes)                       \
+       $(POPPLER_QT_CXXFLAGS)                  \
+-      $(SPLASH_CFLAGS)                        \
+-      $(FREETYPE_CFLAGS)                      
++      $(SPLASH_CFLAGS)                        
+ 
+ poppler_includedir = $(includedir)/poppler
+ poppler_include_HEADERS = \
+@@ -282,8 +282,8 @@
+ 
+ libpoppler_qt_la_LIBADD = \
+       $(top_builddir)/poppler/libpoppler.la   \
+-      $(POPPLER_QT_LIBS)                      \
+-      $(FREETYPE_LIBS)
++      $(FREETYPE_LIBS) \
++      $(POPPLER_QT_LIBS)                      
+ 
+ libpoppler_qt_la_LDFLAGS = -version-info 1:0:0
+ test_poppler_qt_SOURCES = \
+@@ -292,8 +292,8 @@
+ test_poppler_qt_LDADD = \
+       $(top_builddir)/poppler/libpoppler.la   \
+       libpoppler-qt.la                        \
+-      $(POPPLER_QT_LIBS)                      \
+-      $(FREETYPE_LIBS)
++      $(FREETYPE_LIBS) \
++      $(POPPLER_QT_LIBS)                      
+ 
+ all: all-am
+ 
+diff -uNr poppler-0.5.4/test/Makefile.in poppler-0.5.4-new/test/Makefile.in
+--- poppler-0.5.4/test/Makefile.in     2006-09-21 20:54:27.000000000 -0400
++++ poppler-0.5.4-new/test/Makefile.in 2007-01-25 21:49:50.000000000 -0500
+@@ -257,8 +257,8 @@
+ @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_GTK_TEST_TRUE@        pdf_inspector
+ 
+ @BUILD_CAIRO_OUTPUT_TRUE@@[EMAIL PROTECTED] = \
[EMAIL PROTECTED]@@BUILD_GTK_TEST_TRUE@ $(CAIRO_CFLAGS)                         
\
[EMAIL PROTECTED]@@BUILD_GTK_TEST_TRUE@ $(FREETYPE_CFLAGS)
[EMAIL PROTECTED]@@BUILD_GTK_TEST_TRUE@ $(FREETYPE_CFLAGS) \
[EMAIL PROTECTED]@@BUILD_GTK_TEST_TRUE@ $(CAIRO_CFLAGS)                         
+ 
+ INCLUDES = \
+       -I$(top_srcdir)                         \
+@@ -290,8 +290,8 @@
+ pdf_inspector_LDADD = \
+       $(top_builddir)/poppler/libpoppler.la           \
+       $(top_builddir)/poppler/libpoppler-cairo.la     \
+-      $(CAIRO_LIBS)                                   \
+       $(FREETYPE_LIBS)                                \
++      $(CAIRO_LIBS)                                   \
+       $(GTK_TEST_LIBS)
+ 
+ EXTRA_DIST = \
+diff -uNr poppler-0.5.4/xpdfrc.poppler1 poppler-0.5.4-new/xpdfrc.poppler1
 --- poppler-0.5.4/xpdfrc.poppler1      1969-12-31 19:00:00.000000000 -0500
-+++ poppler-0.5.4-new/xpdfrc.poppler1  2006-10-30 16:18:30.000000000 -0500
++++ poppler-0.5.4-new/xpdfrc.poppler1  2007-01-25 21:36:45.000000000 -0500
 @@ -0,0 +1,91 @@
 +#========================================================================
 +#


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to