Author: ranger
Date: Sun Mar  8 18:30:49 2009
New Revision: 1377

URL: 
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1377&repname=user%3a+ranger>
Log:
various updates

Added:
    trunk/experimental/common/main/finkinfo/devel/qtscriptgenerator.info
    trunk/experimental/common/main/finkinfo/kde/koffice2.patch
    trunk/experimental/common/main/finkinfo/libs/gmm.info
    trunk/experimental/common/main/finkinfo/libs/poppler2-qt4.info
    trunk/experimental/common/main/finkinfo/libs/poppler2-qt4.patch
    trunk/experimental/common/main/finkinfo/libs/poppler4-glib.info
    trunk/experimental/common/main/finkinfo/libs/poppler4-glib.patch
    trunk/experimental/common/main/finkinfo/libs/poppler4-qt4.info
    trunk/experimental/common/main/finkinfo/libs/poppler4-qt4.patch
    trunk/experimental/common/main/finkinfo/libs/poppler4-xpdf.info
    trunk/experimental/common/main/finkinfo/libs/poppler4-xpdf.patch
    trunk/experimental/common/main/finkinfo/libs/poppler4.info
Modified:
    trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.info
    trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.patch
    trunk/experimental/common/main/finkinfo/kde/kdelibs4.info
    trunk/experimental/common/main/finkinfo/kde/kdelibs4.patch
    trunk/experimental/common/main/finkinfo/kde/koffice2.info
    trunk/experimental/common/main/finkinfo/libs/poppler-data.info
    trunk/experimental/common/main/finkinfo/libs/poppler-qt3.info
    trunk/experimental/common/main/finkinfo/libs/poppler.info
    trunk/experimental/common/main/finkinfo/libs/poppler1.info
    trunk/experimental/common/main/finkinfo/libs/poppler2-glib.info
    trunk/experimental/common/main/finkinfo/libs/poppler2-qt3.info
    trunk/experimental/common/main/finkinfo/libs/poppler2-xpdf.info
    trunk/experimental/common/main/finkinfo/libs/poppler2.info
    trunk/experimental/common/main/finkinfo/x11/qt4-x11.info

Modified: trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.info
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.info&rev=1377&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.info Sun Mar  8 18:30:49 
2009
@@ -55,7 +55,7 @@
 SourceDirectory: kdelibs-%v
 PatchScript: sed -e 's,@KDEPREFIX@,%p/lib/%type_pkg[kde],g' %{PatchFile} | 
patch -p1
 PatchFile: kdelibs4.patch
-PatchFile-MD5: 1a98088a16e3f464bb6fca939f96fcc6
+PatchFile-MD5: f7d359fb7c2f41f6c4e81f33297c2335
 
 CompileScript: <<
 #!/bin/sh -ev

Modified: trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.patch
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.patch&rev=1377&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.patch (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.patch Sun Mar  8 
18:30:49 2009
@@ -75,7 +75,7 @@
 +              QProcess qp;
 +              qp.setTextModeEnabled(true);
 +
-+              qp.start(externalProc, QStringList() << "load" << 
"/sw/lib/mac/share/dbus/launchd/org.finkproject.dbus-session.plist");
++              qp.start(externalProc, QStringList() << "load" << 
"@KDEPREFIX@/lib/mac/share/dbus/launchd/org.finkproject.dbus-session.plist");
 +              if (!qp.waitForFinished(timeout)) {
 +                      kDebug() << "error running" << externalProc << 
qp.errorString();
 +              }

Added: trunk/experimental/common/main/finkinfo/devel/qtscriptgenerator.info
URL: 
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/main/finkinfo/devel/qtscriptgenerator.info&rev=1377&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/devel/qtscriptgenerator.info (added)
+++ trunk/experimental/common/main/finkinfo/devel/qtscriptgenerator.info Sun 
Mar  8 18:30:49 2009
@@ -1,0 +1,112 @@
+Info2: <<
+Package: amarok2-%type_pkg[kde]
+Version: 2.0.2
+Revision: 1
+Type: kde (x11 mac)
+Description: KDE4 - music player
+License: GPL/LGPL
+Maintainer: Benjamin Reed <[email protected]>
+
+DescDetail: <<
+Amarok is the music player for Linux and Unix with an intuitive interface.
+Amarok makes playing the music you love easier than ever before - and
+looks good doing it. 
+<<
+
+Source: mirror:kde:stable/amarok/%v/src/amarok-%v.tar.bz2
+Source-MD5: 98b78372ec6ea3432faba356c90c6dbe
+PatchFile: amarok2.patch
+PatchFile-MD5: 09bbe745f68f8f302973728e4e5428d1
+
+Depends: <<
+       dbus (>= 1.2.12-1),
+       kdebase4-%type_pkg[kde] (>= 4.2.0-1),
+       libmp4v21-shlibs,
+       loudmouth-shlibs,
+       mysql15-shlibs,
+       soprano-%type_pkg[kde]-shlibs (>= 2.2.1-1),
+       strigi-shlibs (>= 0.6.3-1),
+       taglib-shlibs (>= 1.5-1)
+<<
+
+# TODO:
+# Gdk, 2.0.x: Support for artwork on iPod audio devices via GdkPixbuf 
<http://developer.gnome.org/arch/imaging/gdkpixbuf.html>
+# libgpod, 0.6.0: Support Apple iPod audio devices 
<http://sourceforge.net/projects/gtkpod/>
+# mysql, 4.1.0: Store Collection in a mysql database instead of a sqlite one 
<http://www.mysql.com>
+# libmtp, 0.3.0: Enable Support for portable media devices that use the media 
transfer protocol <http://libmtp.sourceforge.net/>
+# loudmouth: Loudmouth is the communication backend needed by mp3tunes for 
synching. <http://www.loudmouth-project.org>
+# kdemultimedia, 4.0: Support for playing audio cds <http://www.kde.org>
+
+BuildDepends: <<
+       automoc-%type_pkg[kde],
+       cmake (>= 2.6.3-1),
+       dbus-dev (>= 1.2.12-1),
+       fink (>= 0.28.0-1),
+       fontconfig2-dev (>= 2.4.1-1),
+       freetype219 (>= 2.3.7-7),
+       glib2-dev (>= 2.14.0-1),
+       kde4-buildenv (>= 4.2-3),
+       kdebase4-%type_pkg[kde]-dev (>= 4.2.0-1),
+       kdelibs4-%type_pkg[kde]-dev (>= 4.2.0-1),
+       libgettext3-dev,
+       libgpod4,
+       libmp4v21-dev,
+       libxml2,
+       libxslt,
+       loudmouth,
+       mysql15-dev,
+       pkgconfig (>= 0.22-3),
+       qt4-%type_pkg[kde] (>= 4.4.0-1),
+       soprano-%type_pkg[kde]-dev (>= 2.2.1-1),
+       strigi-dev (>= 0.6.3-1),
+       taglib (>= 1.5-1),
+       (%type_pkg[kde] = x11) x11-dev,
+       system-openssl-dev
+<<
+GCC: 4.0
+
+NoSetMAKEFLAGS: true
+SetMAKEFLAGS: -j1
+  
+CompileScript: <<
+#!/bin/sh -ev
+
+       export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[kde]"
+       . %p/sbin/kde4-buildenv.sh
+       export CMAKE_INCLUDE_PATH="%p/include/mysql:$CMAKE_INCLUDE_PATH"
+       export CMAKE_LIBRARY_PATH="%P/LIB/MYSQL:$CMAKE_LIBRARY_PATH"
+
+       mkdir -p build
+       pushd build
+               touch config.h
+               cmake $KDE4_CMAKE_ARGS -DBUILD_po:BOOL=OFF 
__KDE_HAVE_GCC_VISIBILITY:BOOL=OFF ..
+               make VERBOSE=1
+       popd
+<<
+
+InstallScript: <<
+#!/bin/sh -ev
+
+       pushd build
+               make -j1 install DESTDIR="%d"
+       popd
+       mv %i/lib/%type_pkg[kde]/bin/amarok.app 
%i/lib/%type_pkg[kde]/bin/Amarok.app
+       rsync -avr build/src/Amarok.app/ %i/lib/%type_pkg[kde]/bin/Amarok.app/
+
+       rm -rf %i/lib/%type_pkg[kde]/lib/libamarok_taglib.dylib
+       rm -rf %i/lib/%type_pkg[kde]/lib/libamaroklib.dylib
+       rm -rf %i/lib/%type_pkg[kde]/lib/libamarokplasma.dylib
+       rm -rf %i/lib/%type_pkg[kde]/lib/libamarokpud.dylib
+<<
+
+Shlibs: <<
+       !%p/lib/%type_pkg[kde]/lib/libamarok_service_liblastfm.dylib
+       !%p/lib/%type_pkg[kde]/lib/libamarok_taglib.1.dylib
+       !%p/lib/%type_pkg[kde]/lib/libamaroklib.1.dylib
+       !%p/lib/%type_pkg[kde]/lib/libamarokplasma.2.dylib
+       !%p/lib/%type_pkg[kde]/lib/libamarokpud.1.dylib
+<<
+
+PostInstScript: %p/lib/%type_pkg[kde]/bin/kbuildsycoca-global.sh >/dev/null 
2>&1 || :
+
+<<

Modified: trunk/experimental/common/main/finkinfo/kde/kdelibs4.info
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdelibs4.info&rev=1377&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdelibs4.info (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdelibs4.info Sun Mar  8 
18:30:49 2009
@@ -54,7 +54,7 @@
 Source-MD5: fa4206dd747890c4e4283c8adb831e6c
 SourceDirectory: kdelibs-%v
 PatchFile: kdelibs4.patch
-PatchFile-MD5: 1a98088a16e3f464bb6fca939f96fcc6
+PatchFile-MD5: f7d359fb7c2f41f6c4e81f33297c2335
 PatchScript: sed -e 's,@KDEPREFIX@,%p/lib/%type_pkg[kde],g' %{PatchFile} | 
patch -p1
 
 CompileScript: <<

Modified: trunk/experimental/common/main/finkinfo/kde/kdelibs4.patch
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdelibs4.patch&rev=1377&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdelibs4.patch (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdelibs4.patch Sun Mar  8 
18:30:49 2009
@@ -75,7 +75,7 @@
 +              QProcess qp;
 +              qp.setTextModeEnabled(true);
 +
-+              qp.start(externalProc, QStringList() << "load" << 
"/sw/lib/mac/share/dbus/launchd/org.finkproject.dbus-session.plist");
++              qp.start(externalProc, QStringList() << "load" << 
"@KDEPREFIX@/lib/mac/share/dbus/launchd/org.finkproject.dbus-session.plist");
 +              if (!qp.waitForFinished(timeout)) {
 +                      kDebug() << "error running" << externalProc << 
qp.errorString();
 +              }

Modified: trunk/experimental/common/main/finkinfo/kde/koffice2.info
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/koffice2.info&rev=1377&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/koffice2.info (original)
+++ trunk/experimental/common/main/finkinfo/kde/koffice2.info Sun Mar  8 
18:30:49 2009
@@ -1,4 +1,4 @@
-Info2: <<
+Info4: <<
 Package: koffice2-%type_pkg[kde]
 Version: 1.9.98.7
 Revision: 1
@@ -13,31 +13,43 @@
 
 Source: mirror:kde:unstable/koffice-%v/src/koffice-%v.tar.bz2
 Source-MD5: 1b44eb284f35d148ea6aacb0f2408277
-#PatchFile: koffice2.patch
-#PatchFile-MD5: 09bbe745f68f8f302973728e4e5428d1
-
-#      %N-shlibs (= %v-%r),
+PatchFile: koffice2.patch
+PatchFile-MD5: 48a61ecc1eb85de9cd0715138842d164
+
 Depends: <<
-       dbus (>= 1.2.12-1),
-       kdebase4-%type_pkg[kde] (>= 4.2.0-1),
-       kdelibs4-%type_pkg[kde] (>= 4.2.0-1)
+       karbon2 (>= %v-%r),
+       kchart2 (>= %v-%r),
+       kplato2 (>= %v-%r),
+       kpresenter2 (>= %v-%r),
+       krita2 (>= %v-%r),
+       kspread2 (>= %v-%r),
+       kword2 (>= %v-%r),
 <<
 
 BuildDepends: <<
        automoc-%type_pkg[kde],
        cmake (>= 2.6.3-1),
        dbus-dev (>= 1.2.12-1),
+       eigen2,
        fink (>= 0.28.0-1),
        fontconfig2-dev (>= 2.4.1-1),
        freetype219 (>= 2.3.7-7),
+       glew (>= 1.3.5-1),
        glib2-dev (>= 2.14.0-1),
+       gmm,
+       graphicsmagick-dev (>= 1.1-1),
+       gsl (>= 1.7-1),
        kde4-buildenv (>= 4.2-3),
        kdebase4-%type_pkg[kde]-dev (>= 4.2.0-1),
        kdelibs4-%type_pkg[kde]-dev (>= 4.2.0-1),
+       lcms,
        libgettext3-dev,
+       libwpd-0.8-dev,
        libxml2,
        libxslt,
        pkgconfig (>= 0.22-3),
+       poppler2,
+       poppler2-qt4,
        qt4-%type_pkg[kde] (>= 4.4.0-1),
        soprano-%type_pkg[kde]-dev (>= 2.2.1-1),
        strigi-dev (>= 0.6.3-1),
@@ -70,4 +82,132 @@
 
 PostInstScript: %p/lib/%type_pkg[kde]/bin/kbuildsycoca-global.sh >/dev/null 
2>&1 || :
 
-<<
+SplitOff: <<
+       Package: karbon2
+       Depends: %N-base (>= %v-%r)
+       Files: <<
+               lib/%type_pkg[kde]/bin/karbon*
+               lib/%type_pkg[kde]/lib/kde4/karbon*
+               lib/%type_pkg[kde]/lib/libkarboncommon.5*.dylib
+               lib/%type_pkg[kde]/lib/libkarbonui.5*.dylib
+               lib/%type_pkg[kde]/lib/libkdeinit4_karbon.dylib
+       <<
+<<
+SplitOff2: <<
+       Package: kchart2
+       Depends: %N-base (>= %v-%r)
+       Files: <<
+               lib/%type_pkg[kde]/bin/kchart*
+               lib/%type_pkg[kde]/lib/kde4/chartshape*
+               lib/%type_pkg[kde]/lib/libchartshapelib.5*.dylib
+               lib/%type_pkg[kde]/lib/libkchartcommon.5*.dylib
+               lib/%type_pkg[kde]/lib/libkdchart.5*.dylib
+       <<
+<<
+SplitOff2: <<
+       Package: kplato2
+       Depends: %N-base (>= %v-%r)
+       Files: <<
+               lib/%type_pkg[kde]/bin/kplato*
+               lib/%type_pkg[kde]/lib/libkdeinit4_kplato.dylib
+               lib/%type_pkg[kde]/lib/libkplatokernel.5*.dylib
+               lib/%type_pkg[kde]/lib/libkplatomodels.5*.dylib
+               lib/%type_pkg[kde]/lib/libkplatoprivate.5*.dylib
+               lib/%type_pkg[kde]/lib/libkplatoui.5*.dylib
+       <<
+<<
+SplitOff3: <<
+       Package: kpresenter2
+       Depends: %N-base (>= %v-%r)
+       Files: <<
+               lib/%type_pkg[kde]/bin/kpresenter*
+               lib/%type_pkg[kde]/lib/kde4/kpr*
+               lib/%type_pkg[kde]/lib/libkdeinit4_kpresenter.dylib
+               lib/%type_pkg[kde]/lib/libkpresenterprivate.5*.dylib
+       <<
+<<
+SplitOff5: <<
+       Package: krita2
+       Depends: <<
+               glew-shlibs (>= 1.3.5-1),
+               graphicsmagick-shlibs (>= 1.1-1),
+               poppler2-qt4-shlibs,
+               %N-base (>= %v-%r)
+       <<
+       Files: <<
+               lib/%type_pkg[kde]/bin/krita*
+               lib/%type_pkg[kde]/lib/libkdeinit4_krita.dylib
+               lib/%type_pkg[kde]/lib/kde4/krita*
+               lib/%type_pkg[kde]/lib/libKritaRulerAssistantCommon.5*.dylib
+               lib/%type_pkg[kde]/lib/libkrita*.5*.dylib
+               lib/%type_pkg[kde]/lib/libkrossmodulekrita.5*.dylib
+       <<
+<<
+SplitOff4: <<
+       Package: kspread2
+       Depends: <<
+               gsl-shlibs (>= 1.7-1),
+               %N-base (>= %v-%r)
+       <<
+       Files: <<
+               lib/%type_pkg[kde]/bin/kspread*
+               lib/%type_pkg[kde]/lib/libkdeinit4_kspread.dylib
+               lib/%type_pkg[kde]/lib/libkspreadcommon.5*.dylib
+       <<
+<<
+SplitOff6: <<
+       Package: kword2
+       Depends: %N-base (>= %v-%r)
+       Files: <<
+               lib/%type_pkg[kde]/bin/kword*
+               lib/%type_pkg[kde]/lib/libkdeinit4_kword.dylib
+               lib/%type_pkg[kde]/lib/libkwordprivate.5*.dylib
+       <<
+<<
+SplitOff7: <<
+       Package: %N-shlibs
+       Depends: <<
+               %N-base (>= %v-%r),
+               lcms-shlibs,
+       <<
+       Files: <<
+               lib/%type_pkg[kde]/lib/kde4
+               lib/%type_pkg[kde]/lib/libflake.5*.dylib
+               lib/%type_pkg[kde]/lib/libkochart.5*.dylib
+               lib/%type_pkg[kde]/lib/libkoffice*.5*.dylib
+               lib/%type_pkg[kde]/lib/libkoguiutils.5*.dylib
+               lib/%type_pkg[kde]/lib/libkokross.5*.dylib
+               lib/%type_pkg[kde]/lib/libkomain.5*.dylib
+               lib/%type_pkg[kde]/lib/libkoodf.5*.dylib
+               lib/%type_pkg[kde]/lib/libkopageapp.5*.dylib
+               lib/%type_pkg[kde]/lib/libkoresources.5*.dylib
+               lib/%type_pkg[kde]/lib/libkostore.5*.dylib
+               lib/%type_pkg[kde]/lib/libkotext.5*.dylib
+               lib/%type_pkg[kde]/lib/libkowmf.5*.dylib
+               lib/%type_pkg[kde]/lib/libkwmf.5*.dylib
+               lib/%type_pkg[kde]/lib/libkwordexportfilters.5*.dylib
+               lib/%type_pkg[kde]/lib/libpigmentcms.5*.dylib
+       <<
+<<
+SplitOff7: <<
+       Package: %N-base
+       Depends: <<
+               kdebase4-%type_pkg[kde]-shlibs (>= 4.2.1-1),
+               kdelibs4-%type_pkg[kde]-shlibs (>= 4.2.1-1),
+       <<
+       Files: <<
+               %i/lib/%type_pkg[kde]/lib/libkdeinit_*.dylib
+       <<
+<<
+
+SplitOff7: <<
+       Package: %N-dev
+       Depends: %N (>= %v-%r)
+       Files: <<
+               lib/%type_pkg[kde]/include
+               lib/%type_pkg[kde]/lib/*.la
+               lib/%type_pkg[kde]/lib/pkgconfig
+       <<
+<<
+
+<<

Added: trunk/experimental/common/main/finkinfo/kde/koffice2.patch
URL: 
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/main/finkinfo/kde/koffice2.patch&rev=1377&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/koffice2.patch (added)
+++ trunk/experimental/common/main/finkinfo/kde/koffice2.patch Sun Mar  8 
18:30:49 2009
@@ -1,0 +1,21 @@
+diff -Nurd koffice-1.9.98.7/kchart/kdchart/kdablibfakes/src/KDABLibFakes.h 
koffice-1.9.98.7-new/kchart/kdchart/kdablibfakes/src/KDABLibFakes.h
+--- koffice-1.9.98.7/kchart/kdchart/kdablibfakes/src/KDABLibFakes.h    
2009-02-25 16:50:21.000000000 -0500
++++ koffice-1.9.98.7-new/kchart/kdchart/kdablibfakes/src/KDABLibFakes.h        
2009-03-07 10:09:07.000000000 -0500
+@@ -43,7 +43,7 @@
+ #ifndef KDAB_LIB_FAKES_H
+ #define KDAB_LIB_FAKES_H
+ 
+-#if defined Q_OS_DARWIN
++#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
+ /* On Mac OS X, ensure that <cmath> will define std::isnan */
+ #define _GLIBCPP_USE_C99 1
+ #endif
+@@ -72,7 +72,7 @@
+ #include <float.h>
+ #define ISNAN(x ) _isnan(x )
+ #define ISINF(x ) (!(_finite(x ) + _isnan(x ) ) )
+-#elif defined (Q_OS_DARWIN) || defined (Q_OS_CYGWIN)
++#elif defined (Q_OS_DARWIN) || defined(Q_OS_MAC) || defined (Q_OS_CYGWIN)
+ #define ISNAN(x) std::isnan(x)
+ #define ISINF(x) std::isinf(x)
+ #else

Added: trunk/experimental/common/main/finkinfo/libs/gmm.info
URL: 
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/main/finkinfo/libs/gmm.info&rev=1377&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/gmm.info (added)
+++ trunk/experimental/common/main/finkinfo/libs/gmm.info Sun Mar  8 18:30:49 
2009
@@ -1,0 +1,11 @@
+Package: gmm
+Version: 3.1
+Revision: 1
+Source: http://download.gna.org/getfem/stable/%n-%v.tar.gz
+Source-MD5: 5706d23bf3bb6d06d3d7e5889cf8554d
+BuildDependsOnly: true
+DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README
+Description: C++ template library for matrices
+Maintainer: Benjamin Reed <[email protected]>
+Homepage: http://home.gna.org/getfem/gmm_intro.html
+License: LGPL

Modified: trunk/experimental/common/main/finkinfo/libs/poppler-data.info
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/poppler-data.info&rev=1377&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler-data.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/poppler-data.info Sun Mar  8 
18:30:49 2009
@@ -1,5 +1,5 @@
 Package: poppler-data
-Version: 0.2.0
+Version: 0.2.1
 Revision: 1
 Epoch: 1
 Description: Character-encoding files for poppler
@@ -14,7 +14,7 @@
 <<
 
 Source: http://poppler.freedesktop.org/%n-%v.tar.gz
-Source-MD5: b7f98e84a4d2a2c794271d746ec7ee0b
+Source-MD5: bca78b8786746c7b48b324283992d658
 
 CompileScript: #
 

Modified: trunk/experimental/common/main/finkinfo/libs/poppler-qt3.info
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/poppler-qt3.info&rev=1377&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler-qt3.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/poppler-qt3.info Sun Mar  8 
18:30:49 2009
@@ -8,15 +8,16 @@
 Depends: %N-shlibs (>= %v-%r)
 BuildDepends: <<
        atk1 (>= 1.20.0-1),
-       cairo (>= 1.8-1),
+       cairo (>= 1.6-1),
        expat1,
+       fink (>= 0.24.12),
        fontconfig2-dev (>= 2.4.1-1),
-       freetype219 (>= 2.3.7-7),
+       freetype219 (>= 2.3.5-1),
        glitz,
        libjpeg,
        libpng3,
        pango1-xft2-ft219-dev (>= 1.18.4-4),
-       pixman (>= 0.12.0-1),
+       pixman (>= 0.10.0-1),
        pkgconfig (>= 0.21-1),
        poppler1 (>= %v-1001),
        qt3 (>= 3.3.8-1021),
@@ -30,7 +31,9 @@
 Replaces: poppler2-qt3
 Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
 Source-MD5: 053fdfd70533ecce1a06353fa945f061
-PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1 --fuzz=4
+PatchFile: %n.patch
+PatchFile-MD5: c76672b54d186c6a33587029bd23ccd8
+PatchScript: sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1 --fuzz=4
 
 NoSetCPPFLAGS: true
 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 -I%p/include 
-I%p/include/sys

Modified: trunk/experimental/common/main/finkinfo/libs/poppler.info
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/poppler.info&rev=1377&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/poppler.info Sun Mar  8 
18:30:49 2009
@@ -1,18 +1,18 @@
 Package: poppler
 Version: 0.5.0
-Revision: 1125
+Revision: 1126
 Description: PDF rendering library
 License: GPL
-Maintainer: Sebastien Maret <[email protected]>
+Maintainer: None <[email protected]>
 Depends: %N-shlibs (= %v-%r)
 BuildDepends: <<
-  atk1 (>= 1.20.0-1), libpng3, cairo (>= 1.8-1), glitz,
-  expat1, fontconfig2-dev (>= 2.4.1-1), freetype219 (>= 2.3.7-7), glib2-dev 
(>= 2.14.0-1), gettext-bin,
+  atk1 (>= 1.20.0-1), libpng3, cairo (>= 1.6-1), glitz,
+  expat1, fink (>= 0.24.12), fontconfig2-dev (>= 2.4.1-1), freetype219 (>= 
2.3.5-1), glib2-dev (>= 2.14.0-1), gettext-bin,
   gettext-tools, gtk+2-dev (>= 2.12.0-1), libgettext3-dev, libiconv-dev,
-  libjpeg, pango1-xft2-ft219-dev (>= 1.18.4-4), pixman (>= 0.12.0-1), 
pkgconfig (>= 0.21-1), x11-dev, xft2-dev
+  libjpeg, pango1-xft2-ft219-dev (>= 1.18.4-4), pixman (>= 0.10.0-1), 
pkgconfig (>= 0.21-1), x11-dev, xft2-dev
 <<
-Conflicts: poppler1
-Replaces: poppler1
+Conflicts: poppler1, poppler2, poppler4
+Replaces: poppler1, poppler2, poppler4
 BuildDependsOnly: True
 Source: http://poppler.freedesktop.org/%n-%v.tar.gz
 Source-MD5: c84c1be19f43e4a84872ff08234c1960
@@ -25,7 +25,9 @@
 SetCFLAGS: -Os
 SetCXXFLAGS: -Os
 ConfigureParams: --mandir=%p/share/man --disable-cairo-output 
SYSTEM_XPDFRC=%p/etc/xpdfrc.poppler --disable-dependency-tracking --enable-zlib 
--disable-poppler-qt --disable-poppler-qt4 
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config 
PKG_CONFIG_PATH=%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig
-PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
+PatchFile: %n.patch
+PatchFile-MD5: 4c3b7091749506c9ad6e977be21ffe39
+PatchScript: sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1
 GCC: 3.3
 InstallScript: <<
   make -j1 install DESTDIR=%d
@@ -36,7 +38,7 @@
 SplitOff: <<
   Package: %N-shlibs
   Depends: <<
-    expat1-shlibs, fontconfig2-shlibs (>= 2.4.1-1), freetype219-shlibs (>= 
2.3.7-7),
+    expat1-shlibs, fontconfig2-shlibs (>= 2.4.1-1), freetype219-shlibs (>= 
2.3.5-1),
     glib2-shlibs (>= 2.14.0-1), gtk+2-shlibs (>= 2.12.0-1), 
libgettext3-shlibs, libiconv,
     libjpeg-shlibs, pango1-xft2-ft219-shlibs (>= 1.18.4-4), x11-shlibs
   <<

Modified: trunk/experimental/common/main/finkinfo/libs/poppler1.info
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/poppler1.info&rev=1377&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler1.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/poppler1.info Sun Mar  8 
18:30:49 2009
@@ -1,6 +1,6 @@
 Package: poppler1
 Version: 0.5.4
-Revision: 1027
+Revision: 1028
 Description: PDF rendering library
 License: GPL
 Maintainer: Benjamin Reed <[email protected]>
@@ -12,10 +12,11 @@
 <<
 BuildDepends: <<
        atk1 (>= 1.20.0-1),
-       cairo (>= 1.8-1),
+       cairo (>= 1.6-1),
        expat1,
+       fink (>= 0.24.12),
        fontconfig2-dev (>= 2.4.1-1),
-       freetype219 (>= 2.3.7-7),
+       freetype219 (>= 2.3.5-1),
        glib2-dev (>= 2.14.0-1),
        glitz,
        gettext-bin,
@@ -26,7 +27,7 @@
        libjpeg,
        libpng3,
        pango1-xft2-ft219-dev (>= 1.18.4-4),
-       pixman (>= 0.12.0-1),
+       pixman (>= 0.10.0-1),
        pkgconfig (>= 0.21-1),
        x11-dev,
        xft2-dev
@@ -34,19 +35,25 @@
 Conflicts: <<
        poppler,
        poppler2,
-       poppler2-glib
+       poppler2-glib,
+       poppler4,
+       poppler4-glib
 <<
 Replaces: <<
        poppler,
        poppler2,
-       poppler2-glib
+       poppler2-glib,
+       poppler4,
+       poppler4-glib
 <<
 BuildDependsOnly: True
 GCC: 4.0
 
 Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
 Source-MD5: 053fdfd70533ecce1a06353fa945f061
-PatchScript: sed -e 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
+PatchFile: %n.patch
+PatchFile-MD5: 715d072c66509ba23009115d265602c7
+PatchScript: sed -e 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1
 
 SetCFLAGS: -Os
 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 -I%p/include 
-I%p/include/sys

Modified: trunk/experimental/common/main/finkinfo/libs/poppler2-glib.info
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/poppler2-glib.info&rev=1377&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler2-glib.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/poppler2-glib.info Sun Mar  8 
18:30:49 2009
@@ -1,7 +1,7 @@
 Package: poppler2-glib
 # NOTE: Must keep %v in sync among all poppler2* packages!
 Version: 0.6.4
-Revision: 1
+Revision: 2
 Description: PDF rendering library (GLIB Interface)
 License: GPL
 Maintainer: Benjamin Reed <[email protected]>
@@ -12,10 +12,11 @@
 <<
 BuildDepends: <<
        atk1 (>= 1.20.0-1),
-       cairo (>= 1.8-1),
+       cairo (>= 1.6-1),
        expat1,
+       fink (>= 0.24.12),
        fontconfig2-dev (>= 2.4.1-1),
-       freetype219 (>= 2.3.7-7),
+       freetype219 (>= 2.3.5-1),
        glib2-dev (>= 2.14.0-1),
        glitz,
        gtk+2-dev (>= 2.12.0-1),
@@ -25,20 +26,22 @@
        libpng3,
        libxml2,
        pango1-xft2-ft219-dev (>= 1.18.4-4),
-       pixman (>= 0.12.0-1),
+       pixman (>= 0.10.0-1),
        pkgconfig (>= 0.21-1),
        poppler2 (>= %v-1),
        x11-dev,
        xft2-dev
 <<
-Conflicts: poppler1
-Replaces: poppler1
+Conflicts: poppler1, poppler4-glib
+Replaces: poppler1, poppler4-glib
 BuildDependsOnly: True
 GCC: 4.0
 
 Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
 Source-MD5: 13d12ca4e349574cfbbcf4a9b2b3ae52
-PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1 --fuzz=4
+PatchFile: %n.patch
+PatchFile-MD5: 24575f137add7e61fb98cac06ebe3c29
+PatchScript: sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1 --fuzz=4
 
 SetCPPFLAGS: -I%p/lib/freetype219/include 
-I%p/lib/freetype219/include/freetype2 -I%p/lib/fontconfig2/include 
-I%p/lib/pango-ft219/include -I%p/include
 SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib 
-L%p/lib/pango-ft219/lib -L%p/lib 
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib

Modified: trunk/experimental/common/main/finkinfo/libs/poppler2-qt3.info
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/poppler2-qt3.info&rev=1377&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler2-qt3.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/poppler2-qt3.info Sun Mar  8 
18:30:49 2009
@@ -9,8 +9,9 @@
 Depends: %N-shlibs (>= %v-%r)
 BuildDepends: <<
        expat1,
+       fink (>= 0.24.12),
        fontconfig2-dev,
-       freetype219 (>= 2.3.7-7),
+       freetype219,
        libiconv-dev,
        libjpeg,
        libxml2 (>= 2.6.30-1),
@@ -26,8 +27,10 @@
 
 Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
 Source-MD5: 13d12ca4e349574cfbbcf4a9b2b3ae52
+PatchFile: %n.patch
+PatchFile-MD5: 076fe6ee3e4600f40692d9a737209834
 PatchScript: <<
-       sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1 --fuzz=4
+       sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1 --fuzz=4
        perl -pi -e 's,libqt-mt.so,libqt-mt.dylib,g' configure
 <<
 

Added: trunk/experimental/common/main/finkinfo/libs/poppler2-qt4.info
URL: 
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/main/finkinfo/libs/poppler2-qt4.info&rev=1377&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler2-qt4.info (added)
+++ trunk/experimental/common/main/finkinfo/libs/poppler2-qt4.info Sun Mar  8 
18:30:49 2009
@@ -1,0 +1,74 @@
+Info3: <<
+Package: poppler2-qt4-%type_pkg[qt]
+# NOTE: Must keep %v in sync among all poppler2* packages!
+Version: 0.6.4
+Revision: 1
+Type: qt (x11 mac)
+Description: PDF rendering library (Qt4 binding)
+License: GPL
+Maintainer: Benjamin Reed <[email protected]>
+
+BuildDependsOnly: true
+BuildDepends: <<
+       fink (>= 0.28.0-1),
+       kde4-buildenv (>= 4.2.1-2),
+       qt4-%type_pkg[qt] (>= 4.5.0-1),
+       poppler2 (>= %v-1)
+<<
+Depends: <<
+       %N-shlibs (>= %v-1)
+<<
+GCC: 4.0
+
+Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
+Source-MD5: 13d12ca4e349574cfbbcf4a9b2b3ae52
+PatchFile: poppler2-qt4.patch
+PatchFile-MD5: 2c52ce7e49e16ed607f2158b392d82b3
+
+CompileScript: <<
+#!/bin/sh -ev
+
+       export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[qt]"
+       . %p/sbin/kde4-buildenv.sh
+
+       ./configure \
+               --prefix=%p/lib/%type_pkg[qt] \
+               --mandir=%p/share/man \
+               --disable-dependency-tracking --disable-static \
+               --enable-zlib --enable-libopenjpeg --enable-cairo-output \
+               --disable-poppler-glib --disable-gdk --disable-gtk-test \
+               --disable-poppler-qt --enable-poppler-qt4 \
+               
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/qt4-%type_pkg[qt]/lib/pkgconfig:$PKG_CONFIG_PATH"
+       pushd qt4
+               make -j1
+       popd
+       make -j1 poppler-qt4.pc
+<<
+InstallScript: <<
+#!/bin/sh -ev
+
+       pushd qt4
+               make -j1 install DESTDIR=%d
+       popd
+       make -j1 install-pkgconfigDATA DESTDIR=%d pkgconfig_DATA=poppler-qt4.pc
+       perl -pi -e 's,%b/build,%p,g' %i/lib/%type_pkg[qt]/lib/*.la 
%i/lib/%type_pkg[qt]/lib/pkgconfig/*.pc
+<<
+DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
+
+SplitOff: <<
+       Package: %N-shlibs
+       Depends: <<
+               poppler2-shlibs (>= %v-1),
+               qt4-%type_pkg[qt]-gui-shlibs (>= 4.5.0-1)
+       <<
+       Files: <<
+               lib/%type_pkg[qt]/lib/libpoppler-qt4.2*.dylib
+       <<
+       Shlibs: <<
+               %p/lib/%type_pkg[qt]/lib/libpoppler-qt4.2.dylib 3.0.0 %n (>= 
0.6.4-1)
+       <<
+<<
+
+Homepage: http://poppler.freedesktop.org/
+DescDetail: Poppler is a PDF rendering library based on the xpdf-3.0 code base.
+<<

Added: trunk/experimental/common/main/finkinfo/libs/poppler2-qt4.patch
URL: 
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/main/finkinfo/libs/poppler2-qt4.patch&rev=1377&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler2-qt4.patch (added)
+++ trunk/experimental/common/main/finkinfo/libs/poppler2-qt4.patch Sun Mar  8 
18:30:49 2009
@@ -1,0 +1,54 @@
+diff -Nurd poppler-0.6.4/qt4/src/Makefile.in 
poppler-0.6.4-new/qt4/src/Makefile.in
+--- poppler-0.6.4/qt4/src/Makefile.in  2008-01-25 17:12:28.000000000 -0500
++++ poppler-0.6.4-new/qt4/src/Makefile.in      2009-03-07 11:41:57.000000000 
-0500
+@@ -38,7 +38,7 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ @build_splash_output_t...@am__append_1 = \
+...@build_splash_output_true@  $(top_builddir)/poppler/libpoppler-arthur.la
+...@build_splash_output_true@  
+ 
+ subdir = qt4/src
+ DIST_COMMON = $(poppler_include_HEADERS) $(srcdir)/Makefile.am \
+@@ -64,9 +64,9 @@
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+...@build_splash_output_true@am__DEPENDENCIES_2 = 
$(top_builddir)/poppler/libpoppler-arthur.la
+...@build_splash_output_true@am__DEPENDENCIES_2 = 
+ libpoppler_qt4_la_DEPENDENCIES =  \
+-      $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \
++      $(am__DEPENDENCIES_1) \
+       $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+ am_libpoppler_qt4_la_OBJECTS = poppler-document.lo poppler-page.lo \
+       poppler-fontinfo.lo poppler-embeddedfile.lo poppler-textbox.lo \
+@@ -299,7 +299,7 @@
+       poppler-annotation-private.h            \
+       poppler-private.h
+ 
+-libpoppler_qt4_la_LIBADD = $(top_builddir)/poppler/libpoppler.la \
++libpoppler_qt4_la_LIBADD = -lpoppler \
+       $(FONTCONFIG_LIBS) $(POPPLER_QT4_LIBS) $(am__append_1)
+ libpoppler_qt4_la_LDFLAGS = -version-info 2:0:0
+ all: all-am
+diff -Nurd poppler-0.6.4/qt4/tests/Makefile.in 
poppler-0.6.4-new/qt4/tests/Makefile.in
+--- poppler-0.6.4/qt4/tests/Makefile.in        2008-01-25 17:12:28.000000000 
-0500
++++ poppler-0.6.4-new/qt4/tests/Makefile.in    2009-03-07 11:42:09.000000000 
-0500
+@@ -67,7 +67,7 @@
+ @BUILD_POPPLER_QT4_TRUE@      check_attachments.$(OBJEXT)
+ check_attachments_OBJECTS = $(am_check_attachments_OBJECTS)
+ am__DEPENDENCIES_1 =
+-am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler.la \
++am__DEPENDENCIES_2 = \
+       $(top_builddir)/qt4/src/libpoppler-qt4.la \
+       $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ @build_poppler_qt4_t...@check_attachments_dependencies =  \
+@@ -337,7 +337,7 @@
+       $(POPPLER_QT4_CFLAGS)
+ 
+ LDADDS = \
+-      $(top_builddir)/poppler/libpoppler.la   \
++      -lpoppler \
+       $(top_builddir)/qt4/src/libpoppler-qt4.la       \
+       $(FONTCONFIG_LIBS)                              \
+       $(POPPLER_QT4_LIBS)

Modified: trunk/experimental/common/main/finkinfo/libs/poppler2-xpdf.info
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/poppler2-xpdf.info&rev=1377&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler2-xpdf.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/poppler2-xpdf.info Sun Mar  8 
18:30:49 2009
@@ -1,8 +1,7 @@
 Package: poppler2-xpdf
 # NOTE: Must keep %v in sync among all poppler2* packages!
 Version: 0.6.4
-Revision: 1
-Distribution: 10.4, 10.5
+Revision: 2
 Description: PDF rendering library (alternate interface)
 License: GPL
 Maintainer: Benjamin Reed <[email protected]>
@@ -12,6 +11,12 @@
 <<
 Depends: <<
        poppler2-shlibs (>= %v-1)
+<<
+Conflicts: <<
+       poppler4-xpdf
+<<
+Replaces: <<
+       poppler4-xpdf
 <<
 BuildDependsOnly: True
 GCC: 4.0

Modified: trunk/experimental/common/main/finkinfo/libs/poppler2.info
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/poppler2.info&rev=1377&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler2.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/poppler2.info Sun Mar  8 
18:30:49 2009
@@ -1,8 +1,7 @@
 Package: poppler2
 # NOTE: Must keep %v in sync among all poppler2* packages!
 Version: 0.6.4
-Revision: 1
-Distribution: 10.4, 10.5
+Revision: 3
 Description: PDF rendering library
 License: GPL
 Maintainer: Benjamin Reed <[email protected]>
@@ -12,10 +11,11 @@
        poppler-data (>= 1:0.2-1)
 <<
 BuildDepends: <<
-       cairo (>= 1.8-1),
+       cairo (>= 1.6-1),
        expat1,
+       fink (>= 0.24.12),
        fontconfig2-dev (>= 2.4.1-1),
-       freetype219 (>= 2.3.7-7),
+       freetype219 (>= 2.3.5-1),
        glitz,
        gettext-bin,
        gettext-tools,
@@ -24,25 +24,29 @@
        libjpeg,
        libpng3,
        libxml2,
-       pixman (>= 0.12.0-1),
+       pixman (>= 0.10.0-1),
        pkgconfig (>= 0.21-1),
        x11-dev,
        xft2-dev
 <<
 Conflicts: <<
        poppler,
-       poppler1
+       poppler1,
+       poppler4
 <<
 Replaces: <<
        poppler,
-       poppler1
+       poppler1,
+       poppler4
 <<
 BuildDependsOnly: True
 GCC: 4.0
 
 Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
 Source-MD5: 13d12ca4e349574cfbbcf4a9b2b3ae52
-PatchScript: sed -e 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
+PatchFile: %n.patch
+PatchFile-MD5: 2861ebd784da096922419e7558497b30
+PatchScript: sed -e 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1
 
 SetCFLAGS: -Os
 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 -I%p/include 
-I%p/include/sys
@@ -84,7 +88,7 @@
        Depends: <<
                poppler-data (>= 1:0.2-1),
                fontconfig2-shlibs (>= 2.4.1-1),
-               freetype219-shlibs (>= 2.3.7-7),
+               freetype219-shlibs (>= 2.3.5-1),
                libgettext3-shlibs,
                libiconv,
                libxml2-shlibs,

Added: trunk/experimental/common/main/finkinfo/libs/poppler4-glib.info
URL: 
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/main/finkinfo/libs/poppler4-glib.info&rev=1377&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler4-glib.info (added)
+++ trunk/experimental/common/main/finkinfo/libs/poppler4-glib.info Sun Mar  8 
18:30:49 2009
@@ -1,0 +1,110 @@
+Package: poppler4-glib
+# NOTE: Must keep %v in sync among all poppler4* packages!
+Version: 0.10.2
+Revision: 1
+Description: PDF rendering library (GLIB Interface)
+License: GPL
+Maintainer: Benjamin Reed <[email protected]>
+
+Depends: <<
+       %N-shlibs (>= %v-%r),
+       pkgconfig (>= 0.21-1)
+<<
+BuildDepends: <<
+       cairo (>= 1.8-1),
+       expat1,
+       fontconfig2-dev (>= 2.4.1-1),
+       freetype219 (>= 2.3.7-7),
+       glib2-dev (>= 2.18.0-1),
+       glitz,
+       gtk+2-dev (>= 2.14.0-1),
+       libgettext3-dev,
+       libiconv-dev,
+       libjpeg,
+       libopenjpeg,
+       libpng3,
+       libxml2,
+       pango1-xft2-ft219-dev (>= 1.22.0-4),
+       pixman (>= 0.12.0-1),
+       pkgconfig (>= 0.23),
+       poppler4 (>= %v-1),
+       x11-dev,
+       xft2-dev
+<<
+Conflicts: <<
+       poppler1,
+       poppler2-glib
+<<
+Replaces: <<
+       poppler1,
+       poppler2-glib
+<<
+BuildDependsOnly: True
+GCC: 4.0
+
+Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
+Source-MD5: a802a178d12f453f1d0176d67f923c7d
+PatchScript: <<
+       find . -name Makefile.in | xargs perl -pi -e 
's,\$\(top_builddir\)/poppler/libpoppler.la,\$\(prefix\)/lib/libpoppler.la,'g
+<<
+
+SetCPPFLAGS: -I%p/lib/fontconfig2/include
+SetLDFLAGS: -L%p/lib/fontconfig2/lib 
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+ConfigureParams: <<
+       --mandir=%p/share/man \
+       --disable-dependency-tracking --disable-static \
+       --enable-zlib --enable-libopenjpeg --enable-cairo-output \
+       --enable-poppler-glib --enable-gdk  --disable-gtk-test \
+       --disable-poppler-qt --disable-poppler-qt4 \
+       PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
+<<
+CompileScript: <<
+       ./configure %c
+       make -C poppler libpoppler-cairo.la
+       make -C glib
+       make poppler-glib.pc
+<<
+
+InstallScript: <<
+       make -C glib -j1 install DESTDIR=%d
+       install -d -m 755 %i/lib/pkgconfig
+       install -c -m 644 poppler-glib.pc %i/lib/pkgconfig/
+<<
+DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
+SplitOff: <<
+       Package: %N-shlibs
+       Depends: <<
+               cairo-shlibs (>= 1.8-1),
+               expat1-shlibs,
+               fontconfig2-shlibs (>= 2.4.1-1),
+               freetype219-shlibs (>= 2.3.7-7),
+               glib2-shlibs (>= 0.18.0-1),
+               glitz-shlibs,
+               gtk+2-shlibs (>= 2.14.0-1),
+               libgettext3-shlibs,
+               libiconv,
+               libjpeg-shlibs,
+               libopenjpeg-shlibs,
+               libpng3-shlibs,
+               libxml2-shlibs,
+               pango1-xft2-ft219-shlibs (>= 1.22.0-4),
+               pixman-shlibs (>= 0.12.0-1),
+               poppler4-shlibs (>= %v-1)
+       <<
+       DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
+       Files: lib/libpoppler-glib.4.*
+       Shlibs: %p/lib/libpoppler-glib.4.dylib 5.0.0 %n (>= 0.10.0-1)
+<<
+
+Homepage: http://poppler.freedesktop.org/
+DescDetail: <<
+Poppler is a PDF rendering library based on the xpdf-3.0 code base.
+
+This is the GLIB plugin for Poppler.
+<<
+DescPackaging: <<
+       Don't bother compiling the demo: it isn't installed and it
+       requires additional gnomish dependencies.
+
+       Match --enable/--disable features to the poppler4 package.
+<<

Added: trunk/experimental/common/main/finkinfo/libs/poppler4-glib.patch
URL: 
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/main/finkinfo/libs/poppler4-glib.patch&rev=1377&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler4-glib.patch (added)
+++ trunk/experimental/common/main/finkinfo/libs/poppler4-glib.patch Sun Mar  8 
18:30:49 2009
@@ -1,0 +1,94 @@
+diff -uNr poppler-0.6.3/glib/Makefile.in poppler-0.6.3-new/glib/Makefile.in
+--- poppler-0.6.3/glib/Makefile.in     2007-12-12 13:51:42.000000000 -0500
++++ poppler-0.6.3-new/glib/Makefile.in 2007-12-12 22:54:33.000000000 -0500
+@@ -66,7 +66,7 @@
+ @build_cairo_output_t...@am__dependencies_2 = 
$(top_builddir)/poppler/libpoppler-cairo.la \
+ @BUILD_CAIRO_OUTPUT_TRUE@     $(am__DEPENDENCIES_1)
+ libpoppler_glib_la_DEPENDENCIES =  \
+-      $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \
++      $(am__DEPENDENCIES_1) \
+       $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+       $(am__DEPENDENCIES_2)
+ am__objects_1 = poppler-enums.lo
+@@ -78,7 +78,7 @@
+ am_test_poppler_glib_OBJECTS = test-poppler-glib.$(OBJEXT)
+ test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS)
+ test_poppler_glib_DEPENDENCIES =  \
+-      $(top_builddir)/poppler/libpoppler.la libpoppler-glib.la \
++      libpoppler-glib.la \
+       $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+       $(am__DEPENDENCIES_2)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
+@@ -291,11 +291,10 @@
+       -DG_LOG_DOMAIN=\"Poppler\"              \
+       -I$(top_srcdir)                         \
+       -I$(top_srcdir)/poppler                 \
+-      $(cairo_includes)                       \
+-      $(POPPLER_GLIB_CFLAGS)                  \
+       $(FREETYPE_CFLAGS)                      \
+       $(FONTCONFIG_CFLAGS)                    \
+-      $(cairo_includes)                       
++      $(cairo_includes) \
++      $(POPPLER_GLIB_CFLAGS)
+ 
+ stamp_files = stamp-poppler-enums.h
+ poppler_glib_public_headers = \
+@@ -324,10 +323,10 @@
+       poppler-private.h
+ 
+ libpoppler_glib_la_LIBADD = \
+-      $(top_builddir)/poppler/libpoppler.la           \
+-      $(POPPLER_GLIB_LIBS)                            \
++      $(prefix)/lib/libpoppler.la \
+       $(FREETYPE_LIBS)                                \
+       $(FONTCONFIG_LIBS)                              \
++      $(POPPLER_GLIB_LIBS)                            \
+       $(cairo_libs)
+ 
+ libpoppler_glib_la_LDFLAGS = -version-info 2:0:0
+@@ -335,10 +334,10 @@
+        test-poppler-glib.cc
+ 
+ test_poppler_glib_LDADD = \
+-      $(top_builddir)/poppler/libpoppler.la   \
++      $(prefix)/lib/libpoppler.la \
++      $(FREETYPE_LIBS)                        \
+       libpoppler-glib.la                      \
+       $(POPPLER_GLIB_LIBS)                    \
+-      $(FREETYPE_LIBS)                        \
+       $(cairo_libs)
+ 
+ BUILT_SOURCES = \
+diff -uNr poppler-0.6.3/glib/demo/Makefile.in 
poppler-0.6.3-new/glib/demo/Makefile.in
+--- poppler-0.6.3/glib/demo/Makefile.in        2007-12-12 13:51:42.000000000 
-0500
++++ poppler-0.6.3-new/glib/demo/Makefile.in    2007-12-12 22:52:51.000000000 
-0500
+@@ -58,7 +58,7 @@
+ am__DEPENDENCIES_1 =
+ poppler_glib_demo_DEPENDENCIES =  \
+       $(top_builddir)/glib/libpoppler-glib.la \
+-      $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1)
++      $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -263,7 +263,7 @@
+ 
+ LDADD = \
+       $(top_builddir)/glib/libpoppler-glib.la \
+-      $(top_builddir)/poppler/libpoppler.la   \
++      $(prefix)/lib/libpoppler.la     \
+       $(GTK_TEST_LIBS)
+ 
+ all: all-am
+diff -uNr poppler-0.6.3/glib/reference/Makefile.in 
poppler-0.6.3-new/glib/reference/Makefile.in
+--- poppler-0.6.3/glib/reference/Makefile.in   2007-12-12 13:51:43.000000000 
-0500
++++ poppler-0.6.3-new/glib/reference/Makefile.in       2007-12-12 
22:52:51.000000000 -0500
+@@ -294,7 +294,7 @@
+       $(POPPLER_GLIB_CFLAGS)                          \
+       $(FREETYPE_CFLAGS)
+ 
+-GTKDOC_LIBS = $(top_builddir)/poppler/libpoppler.la   \
++GTKDOC_LIBS = $(prefix)/lib/libpoppler.la     \
+       $(top_builddir)/glib/libpoppler-glib.la         \
+       $(POPPLER_GLIB_LIBS)                            \
+       $(FREETYPE_LIBS)                                \

Added: trunk/experimental/common/main/finkinfo/libs/poppler4-qt4.info
URL: 
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/main/finkinfo/libs/poppler4-qt4.info&rev=1377&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler4-qt4.info (added)
+++ trunk/experimental/common/main/finkinfo/libs/poppler4-qt4.info Sun Mar  8 
18:30:49 2009
@@ -1,0 +1,74 @@
+Info3: <<
+Package: poppler4-qt4-%type_pkg[qt]
+# NOTE: Must keep %v in sync among all poppler4* packages!
+Version: 0.10.2
+Revision: 1
+Type: qt (x11 mac)
+Description: PDF rendering library (Qt4 binding)
+License: GPL
+Maintainer: Benjamin Reed <[email protected]>
+
+BuildDependsOnly: true
+BuildDepends: <<
+       fink (>= 0.28.0-1),
+       kde4-buildenv (>= 4.2.1-2),
+       qt4-%type_pkg[qt] (>= 4.5.0-1),
+       poppler4 (>= %v-1)
+<<
+Depends: <<
+       %N-shlibs (>= %v-1)
+<<
+GCC: 4.0
+
+Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
+Source-MD5: a802a178d12f453f1d0176d67f923c7d
+PatchFile: poppler4-qt4.patch
+PatchFile-MD5: c0f576c6f34db60550c24ff19946d74f
+
+CompileScript: <<
+#!/bin/sh -ev
+
+       export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[qt]"
+       . %p/sbin/kde4-buildenv.sh
+
+       ./configure \
+               --prefix=%p/lib/%type_pkg[qt] \
+               --mandir=%p/share/man \
+               --disable-dependency-tracking --disable-static \
+               --enable-zlib --enable-libopenjpeg --enable-cairo-output \
+               --disable-poppler-glib --disable-gdk --disable-gtk-test \
+               --disable-poppler-qt --enable-poppler-qt4 \
+               
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/qt4-%type_pkg[qt]/lib/pkgconfig:$PKG_CONFIG_PATH"
+       pushd qt4
+               make -j1
+       popd
+       make -j1 poppler-qt4.pc
+<<
+InstallScript: <<
+#!/bin/sh -ev
+
+       pushd qt4
+               make -j1 install DESTDIR=%d
+       popd
+       make -j1 install-pkgconfigDATA DESTDIR=%d pkgconfig_DATA=poppler-qt4.pc
+       perl -pi -e 's,%b/build,%p,g' %i/lib/%type_pkg[qt]/lib/*.la 
%i/lib/%type_pkg[qt]/lib/pkgconfig/*.pc
+<<
+DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
+
+SplitOff: <<
+       Package: %N-shlibs
+       Depends: <<
+               poppler4-shlibs (>= %v-1),
+               qt4-%type_pkg[qt]-gui-shlibs (>= 4.5.0-1)
+       <<
+       Files: <<
+               lib/%type_pkg[qt]/lib/libpoppler-qt4.3*.dylib
+       <<
+       Shlibs: <<
+               %p/lib/%type_pkg[qt]/lib/libpoppler-qt4.3.dylib 5.0.0 %n (>= 
0.10.2-1)
+       <<
+<<
+
+Homepage: http://poppler.freedesktop.org/
+DescDetail: Poppler is a PDF rendering library based on the xpdf-3.0 code base.
+<<

Added: trunk/experimental/common/main/finkinfo/libs/poppler4-qt4.patch
URL: 
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/main/finkinfo/libs/poppler4-qt4.patch&rev=1377&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler4-qt4.patch (added)
+++ trunk/experimental/common/main/finkinfo/libs/poppler4-qt4.patch Sun Mar  8 
18:30:49 2009
@@ -1,0 +1,73 @@
+diff -Nurd poppler-0.10.2/qt4/demos/Makefile.in 
poppler-0.10.2-new/qt4/demos/Makefile.in
+--- poppler-0.10.2/qt4/demos/Makefile.in       2008-12-09 17:53:29.000000000 
-0500
++++ poppler-0.10.2-new/qt4/demos/Makefile.in   2009-03-07 11:18:09.000000000 
-0500
+@@ -55,7 +55,7 @@
+       toc.$(OBJEXT) viewer.$(OBJEXT)
+ poppler_qt4viewer_OBJECTS = $(am_poppler_qt4viewer_OBJECTS)
+ am__DEPENDENCIES_1 =
+-am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler.la \
++am__DEPENDENCIES_2 = \
+       $(top_builddir)/qt4/src/libpoppler-qt4.la \
+       $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ poppler_qt4viewer_DEPENDENCIES = $(am__DEPENDENCIES_2)
+@@ -249,7 +249,7 @@
+       $(POPPLER_QT4_CFLAGS)
+ 
+ LDADDS = \
+-      $(top_builddir)/poppler/libpoppler.la   \
++      -lpoppler \
+       $(top_builddir)/qt4/src/libpoppler-qt4.la       \
+       $(FONTCONFIG_LIBS)                              \
+       $(POPPLER_QT4_LIBS)
+diff -Nurd poppler-0.10.2/qt4/src/Makefile.in 
poppler-0.10.2-new/qt4/src/Makefile.in
+--- poppler-0.10.2/qt4/src/Makefile.in 2008-12-09 17:53:29.000000000 -0500
++++ poppler-0.10.2-new/qt4/src/Makefile.in     2009-03-07 11:18:56.000000000 
-0500
+@@ -33,8 +33,7 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+...@build_splash_output_true@am__append_1 = \
+...@build_splash_output_true@  $(top_builddir)/poppler/libpoppler-arthur.la
+...@build_splash_output_true@am__append_1 = 
+ 
+ subdir = qt4/src
+ DIST_COMMON = $(poppler_include_HEADERS) $(srcdir)/Makefile.am \
+@@ -62,7 +61,7 @@
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ libpoppler_qt4_la_DEPENDENCIES =  \
+-      $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \
++      $(am__DEPENDENCIES_1) \
+       $(am__DEPENDENCIES_1) $(am__append_1)
+ am_libpoppler_qt4_la_OBJECTS = poppler-document.lo poppler-page.lo \
+       poppler-fontinfo.lo poppler-embeddedfile.lo poppler-textbox.lo \
+@@ -308,7 +307,7 @@
+       poppler-export.h                        \
+       poppler-private.h
+ 
+-libpoppler_qt4_la_LIBADD = $(top_builddir)/poppler/libpoppler.la \
++libpoppler_qt4_la_LIBADD = -lpoppler \
+       $(FONTCONFIG_LIBS) $(POPPLER_QT4_LIBS) $(am__append_1)
+ libpoppler_qt4_la_LDFLAGS = -version-info 4:0:1
+ all: all-am
+diff -Nurd poppler-0.10.2/qt4/tests/Makefile.in 
poppler-0.10.2-new/qt4/tests/Makefile.in
+--- poppler-0.10.2/qt4/tests/Makefile.in       2008-12-09 17:53:30.000000000 
-0500
++++ poppler-0.10.2-new/qt4/tests/Makefile.in   2009-03-07 11:19:10.000000000 
-0500
+@@ -78,7 +78,7 @@
+ @BUILD_POPPLER_QT4_TRUE@      check_actualtext.$(OBJEXT)
+ check_actualtext_OBJECTS = $(am_check_actualtext_OBJECTS)
+ am__DEPENDENCIES_1 =
+-am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler.la \
++am__DEPENDENCIES_2 = \
+       $(top_builddir)/qt4/src/libpoppler-qt4.la \
+       $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ @build_poppler_qt4_t...@check_actualtext_dependencies =  \
+@@ -374,7 +374,7 @@
+       $(POPPLER_QT4_CFLAGS)
+ 
+ LDADDS = \
+-      $(top_builddir)/poppler/libpoppler.la   \
++      -lpoppler \
+       $(top_builddir)/qt4/src/libpoppler-qt4.la       \
+       $(FONTCONFIG_LIBS)                              \
+       $(POPPLER_QT4_LIBS)

Added: trunk/experimental/common/main/finkinfo/libs/poppler4-xpdf.info
URL: 
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/main/finkinfo/libs/poppler4-xpdf.info&rev=1377&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler4-xpdf.info (added)
+++ trunk/experimental/common/main/finkinfo/libs/poppler4-xpdf.info Sun Mar  8 
18:30:49 2009
@@ -1,0 +1,53 @@
+Package: poppler4-xpdf
+# NOTE: Must keep %v in sync among all poppler4* packages!
+Version: 0.10.2
+Revision: 1
+Description: PDF rendering library (alternate interface)
+License: GPL
+Maintainer: Benjamin Reed <[email protected]>
+
+BuildDepends: <<
+       fink (>= 0.24.12-1)
+<<
+Depends: <<
+       poppler4-shlibs (>= %v-1)
+<<
+Conflicts: <<
+       poppler2-xpdf
+<<
+Replaces: <<
+       poppler2-xpdf
+<<
+BuildDependsOnly: True
+GCC: 4.0
+
+Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
+Source-MD5: a802a178d12f453f1d0176d67f923c7d
+
+PatchFile: %n.patch
+PatchFile-MD5: 85cf2391e28efbbd1f7ef897dfd44a5e
+PatchScript: <<
+#!/bin/sh -ev
+       %{default_script}
+       for mfdir in goo poppler splash; do
+               perl -n -e 'print if s/if ENABLE_XPDF_HEADERS// .. s/endif//' < 
${mfdir}/Makefile.am > ${mfdir}/Makefile
+       done
+<<     
+CompileScript: #
+InstallScript: <<
+#!/bin/sh -ev
+       for mfdir in goo poppler splash; do
+               make -j1 -C ${mfdir} install DESTDIR=%d includedir=%p/include
+       done
+<<
+DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
+
+Homepage: http://poppler.freedesktop.org/
+DescDetail: Poppler is a PDF rendering library based on the xpdf-3.0 code base.
+DescPackaging: <<
+       This is just the older-interface headers, which are installed
+       by poppler iff it's configured with --enable-xpdf-headers. We
+       just hack the makefiles we need and use just the xpdf headers
+       parts of them instead of actually building the poppler package
+       and stripping out the parts we don't need.
+<<

Added: trunk/experimental/common/main/finkinfo/libs/poppler4-xpdf.patch
URL: 
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/main/finkinfo/libs/poppler4-xpdf.patch&rev=1377&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler4-xpdf.patch (added)
+++ trunk/experimental/common/main/finkinfo/libs/poppler4-xpdf.patch Sun Mar  8 
18:30:49 2009
@@ -1,0 +1,39 @@
+diff -Nurd -x'*~' poppler-0.10.0.orig/goo/Makefile.am 
poppler-0.10.0/goo/Makefile.am
+--- poppler-0.10.0.orig/goo/Makefile.am        2008-07-24 16:45:05.000000000 
-0400
++++ poppler-0.10.0/goo/Makefile.am     2008-10-30 02:16:25.000000000 -0400
+@@ -15,6 +15,9 @@
+       gfile.h                                 \
+       FixedPoint.h
+ 
++install:
++      mkdir -p $(DESTDIR)$(prefix)/$(poppler_goo_includedir)
++      install -m644 $(poppler_goo_include_HEADERS) 
$(DESTDIR)$(prefix)/$(poppler_goo_includedir)
+ endif
+ 
+ libgoo_la_SOURCES =                           \
+diff -Nurd -x'*~' poppler-0.10.0.orig/poppler/Makefile.am 
poppler-0.10.0/poppler/Makefile.am
+--- poppler-0.10.0.orig/poppler/Makefile.am    2008-09-09 16:50:37.000000000 
-0400
++++ poppler-0.10.0/poppler/Makefile.am 2008-10-30 02:16:25.000000000 -0400
+@@ -204,6 +204,9 @@
+       Sound.h                 \
+       poppler-config.h
+ 
++install:
++      mkdir -p $(DESTDIR)$(prefix)/$(poppler_includedir)
++      install -m644 $(poppler_include_HEADERS) 
$(DESTDIR)$(prefix)/$(poppler_includedir)
+ endif
+ 
+ libpoppler_la_SOURCES =               \
+diff -Nurd -x'*~' poppler-0.10.0.orig/splash/Makefile.am 
poppler-0.10.0/splash/Makefile.am
+--- poppler-0.10.0.orig/splash/Makefile.am     2008-07-24 16:45:06.000000000 
-0400
++++ poppler-0.10.0/splash/Makefile.am  2008-10-30 02:16:25.000000000 -0400
+@@ -33,6 +33,9 @@
+       SplashXPath.h                           \
+       SplashXPathScanner.h
+ 
++install:
++      mkdir -p $(DESTDIR)$(prefix)/$(poppler_splash_includedir)
++      install -m644 $(poppler_splash_include_HEADERS) 
$(DESTDIR)$(prefix)/$(poppler_splash_includedir)
+ endif
+ 
+ libsplash_la_SOURCES =                                \

Added: trunk/experimental/common/main/finkinfo/libs/poppler4.info
URL: 
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/main/finkinfo/libs/poppler4.info&rev=1377&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler4.info (added)
+++ trunk/experimental/common/main/finkinfo/libs/poppler4.info Sun Mar  8 
18:30:49 2009
@@ -1,0 +1,112 @@
+Package: poppler4
+# NOTE: Must keep %v in sync among all poppler4* packages!
+Version: 0.10.2
+Revision: 1
+Description: PDF rendering library
+License: GPL
+Maintainer: Benjamin Reed <[email protected]>
+
+Depends: <<
+       %N-shlibs (= %v-%r)
+<<
+BuildDepends: <<
+       cairo (>= 1.8-1),
+       expat1,
+       fontconfig2-dev (>= 2.4.1-1),
+       freetype219 (>= 2.3.7-7),
+       glitz,
+       gettext-bin,
+       gettext-tools,
+       libgettext3-dev,
+       libiconv-dev,
+       libjpeg,
+       libopenjpeg,
+       libpng3,
+       libxml2,
+       pixman (>= 0.12.0-1),
+       pkgconfig (>= 0.23),
+       x11-dev,
+       xft2-dev
+<<
+Conflicts: <<
+       poppler,
+       poppler1,
+       poppler2
+<<
+Replaces: <<
+       poppler,
+       poppler1,
+       poppler2
+<<
+BuildDependsOnly: True
+GCC: 4.0
+
+Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
+Source-MD5: a802a178d12f453f1d0176d67f923c7d
+
+SetCFLAGS: -Os
+SetCXXFLAGS: -Os
+SetCPPFLAGS: -I%p/lib/fontconfig2/include
+SetLDFLAGS: -L%p/lib/fontconfig2/lib 
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+ConfigureParams: <<
+       --mandir=%p/share/man \
+       --disable-dependency-tracking --disable-static \
+       --enable-zlib --enable-libopenjpeg --enable-cairo-output \
+       --disable-poppler-glib --disable-gdk --disable-gtk-test \
+       --disable-poppler-qt --disable-poppler-qt4 \
+       PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
+<<
+
+InstallScript: <<
+       make -j1 install DESTDIR=%d
+<<
+DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
+SplitOff: <<
+       Package: %N-shlibs
+       Depends: <<
+               poppler-data (>= 1:0.2.1-1),
+               expat1-shlibs,
+               fontconfig2-shlibs (>= 2.4.1-1),
+               freetype219-shlibs (>= 2.3.7-7),
+               libiconv,
+               libopenjpeg-shlibs,
+               libjpeg-shlibs,
+               libxml2-shlibs
+       <<
+       DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
+       Files: lib/libpoppler.4.*
+       Shlibs: %p/lib/libpoppler.4.dylib 5.0.0 %n (>= 0.10.0-1)
+<<
+SplitOff2: <<
+       Package: poppler-bin
+       Depends: <<
+               %N-shlibs (>= %v-%r),
+               poppler-data (>= 1:0.2.1-1),
+               expat1-shlibs,
+               fontconfig2-shlibs (>= 2.4.1-1),
+               freetype219-shlibs (>= 2.3.7-7),
+               libiconv,
+               libjpeg-shlibs,
+               libopenjpeg-shlibs,
+               libxml2-shlibs
+       <<
+       Conflicts: xpdf
+       Replaces: <<
+               poppler,
+               xpdf
+       <<
+       DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
+       Files: bin share/man
+<<
+
+Homepage: http://poppler.freedesktop.org/
+DescDetail: Poppler is a PDF rendering library based on the xpdf-3.0 code base.
+DescPackaging: <<
+#      Cairo output is disabled because cairo depends on poppler too,
+#      circular dependencies are bad.  :P
+^--cairo pkg disables poppler detection
+
+       dmacks: Switch from internal jpeg2000 to external libopenjpeg
+       as of 0.10.2-1 per package's recommendations now that fink has
+       that library.
+<<

Modified: trunk/experimental/common/main/finkinfo/x11/qt4-x11.info
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/x11/qt4-x11.info&rev=1377&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/x11/qt4-x11.info (original)
+++ trunk/experimental/common/main/finkinfo/x11/qt4-x11.info Sun Mar  8 
18:30:49 2009
@@ -170,7 +170,7 @@
                lib/%N/plugins/iconengines
                lib/%N/plugins/imageformats
                lib/%N/plugins/inputmethods
-               lib/%N/plugins/scripts
+#              lib/%N/plugins/scripts
        <<
        Shlibs: <<
                %p/lib/%N/lib/libQt3Support.4.dylib        4.5.0 %n (>= 4.5.0-1)


------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to