Author: ranger
Date: Sun Nov 11 17:12:53 2007
New Revision: 1054

URL: 
http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1054&repname=user%3a+ranger
Log:
mostly in unstable, opennms needs a little work

Added:
    trunk/experimental/common/main/finkinfo/libs/perlmods/text-iconv-pm.info
Modified:
    trunk/experimental/10.4/main/finkinfo/kde/arts.info
    trunk/experimental/10.4/main/finkinfo/kde/kdebase3-apidox.info
    trunk/experimental/10.4/main/finkinfo/kde/kdebase3-unified.info
    trunk/experimental/10.4/main/finkinfo/kde/kdeedu3.info
    trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-apidox.info
    trunk/experimental/10.4/main/finkinfo/libs/poppler-qt3.info
    trunk/experimental/10.4/main/finkinfo/libs/poppler-qt4.info
    trunk/experimental/10.4/main/finkinfo/libs/poppler1.info
    trunk/experimental/10.4/main/finkinfo/libs/poppler2-glib.info
    trunk/experimental/10.4/main/finkinfo/libs/poppler2-qt3.info
    trunk/experimental/10.4/main/finkinfo/libs/poppler2.info
    trunk/experimental/10.4/main/finkinfo/x11/fontconfig2-dev-10.5.info
    trunk/experimental/3rdparty/common/main/finkinfo/graphics/freetype219.info
    trunk/experimental/common/main/finkinfo/kde/arts.info
    trunk/experimental/common/main/finkinfo/kde/kdebase3-apidox.info
    trunk/experimental/common/main/finkinfo/kde/kdebase3-unified.info
    trunk/experimental/common/main/finkinfo/kde/kdeedu3.info
    trunk/experimental/common/main/finkinfo/kde/kdelibs3-apidox.info
    trunk/experimental/common/main/finkinfo/libs/poppler-qt3.info
    trunk/experimental/common/main/finkinfo/libs/poppler-qt4.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.info
    trunk/experimental/common/main/finkinfo/net/opennms.info
    trunk/experimental/common/main/finkinfo/net/opennms.patch
    trunk/experimental/common/main/finkinfo/x11/fontconfig2-dev-10.5.info
    trunk/experimental/generate-infofiles.pl

Modified: trunk/experimental/10.4/main/finkinfo/kde/arts.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/arts.info&rev=1054&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/arts.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/arts.info Sun Nov 11 17:12:53 2007
@@ -1,6 +1,7 @@
+Info3: <<
 Package: arts
 Version: 1.5.8
-Revision: 1
+Revision: 1021
 Description: KDE - analog realtime synthesizer
 License: GPL
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
@@ -23,6 +24,7 @@
        esound,
        expat1,
        fink (>= 0.26.0-1),
+       #       fontconfig2-dev (>= 2.4.1-1),
        freetype219,
        libgettext3-dev,
        gettext-bin,
@@ -70,8 +72,6 @@
        export PREFIX="%p" USE_UNSERMAKE=1
        . ./environment-helper.sh
 
-       export CC=gcc CXX=g++
-
        ./build-helper.sh cvs       %N %v %r make -f admin/Makefile.common cvs
        ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
 
@@ -99,6 +99,7 @@
                audiofile-shlibs,
                esound-shlibs,
                expat1-shlibs,
+               #               fontconfig2-shlibs (>= 2.4.1-1),
                freetype219-shlibs,
                libgettext3-shlibs,
                glib2-shlibs (>= 2.12.0-1),
@@ -301,18 +302,18 @@
 <<
 
 DaemonicFile: <<
-       <service>
-               <description>Analog Realtime Synthesizer Server</description>
-               <message>Analog Realtime Synthesizer Server</message>
-
-               <daemon name="artsd">
-                       <executable background="yes">%p/bin/artsd</executable>
-                       <!-- the daemon will background itself, but may take a 
while
-                            to start up to the point where it does so -->
-                       <pidfile>%p/var/run/arts.pid</pidfile>
-               </daemon>
-
-       </service>
+<service>
+       <description>Analog Realtime Synthesizer Server</description>
+       <message>Analog Realtime Synthesizer Server</message>
+
+       <daemon name="artsd">
+               <executable background="yes">%p/bin/artsd</executable>
+               <!-- the daemon will background itself, but may take a while
+                    to start up to the point where it does so -->
+               <pidfile>%p/var/run/arts.pid</pidfile>
+       </daemon>
+
+</service>
 <<
 DaemonicName: arts
 
@@ -382,4 +383,5 @@
 
   sudo apt-get remove kdenetwork3-base
 <<
-
+<<
+

Modified: trunk/experimental/10.4/main/finkinfo/kde/kdebase3-apidox.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdebase3-apidox.info&rev=1054&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdebase3-apidox.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdebase3-apidox.info Sun Nov 11 
17:12:53 2007
@@ -1,13 +1,13 @@
 Package: kdebase3-apidox
 Version: 3.5.8
-Revision: 1
+Revision: 1021
 Description: KDE - base system (API documentation)
 License: GPL/LGPL
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
 
-Depends: kdebase3-unified (>= %v-1)
+Depends: kdebase3-unified (>= %v-1021)
 BuildDepends: <<
-       arts-dev (>= 1.5.5-1),
+       arts-dev (>= 1.5.8-1021),
        audiofile,
        autoconf (>= 2.60-1),
        cctools-single-module,
@@ -22,7 +22,7 @@
        libgettext3-dev,
        gettext-tools,
        glib2-dev (>= 2.12.0-1),
-       kdelibs3-unified-dev (>= %v-1),
+       kdelibs3-unified-dev (>= %v-1021),
        lesstif (>= 0.93.18-6),
        libart2,
        libjpeg,

Modified: trunk/experimental/10.4/main/finkinfo/kde/kdebase3-unified.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdebase3-unified.info&rev=1054&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdebase3-unified.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdebase3-unified.info Sun Nov 11 
17:12:53 2007
@@ -1,18 +1,19 @@
+Info3: <<
 Package: kdebase3-unified
 Version: 3.5.8
-Revision: 1
+Revision: 1021
 Description: KDE - base system
 License: GPL/LGPL
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
 
 Depends: <<
        %N-shlibs (>= %v-%r),
-       kdelibs3-unified (>= %v-1),
+       kdelibs3-unified (>= %v-1021),
        remap-bad-apple-keys,
        xfontpath
 <<
 BuildDepends: <<
-       arts-dev (>= 1.5.5-1),
+       arts-dev (>= 1.5.8-1021),
        audiofile,
        autoconf (>= 2.60-1),
        cctools-single-module,
@@ -23,11 +24,12 @@
        esound,
        expat1,
        fink (>= 0.26.0-1),
+       #       fontconfig2-dev (>= 2.4.1-1),
        freetype219,
        libgettext3-dev,
        gettext-tools,
        glib2-dev (>= 2.12.0-1),
-       kdelibs3-unified-dev (>= %v-1),
+       kdelibs3-unified-dev (>= %v-1021),
        lesstif (>= 0.93.18-6),
        libart2,
        libjpeg,
@@ -231,7 +233,7 @@
        Description: KDE - base shared libraries
        Depends: <<
                cyrus-sasl2-shlibs,
-               kdelibs3-unified-shlibs (>= %v-1),
+               kdelibs3-unified-shlibs (>= %v-1021),
                libusb-shlibs
        <<
        Replaces: <<
@@ -738,25 +740,25 @@
 <<
 
 PostInstScript: <<
-       update-alternatives --install /etc/pam.d/kde          pam.d-kde         
 %p/etc/pam.d/kde          50
-       update-alternatives --install /etc/pam.d/kdm          pam.d-kdm         
 %p/etc/pam.d/kdm          50
-       update-alternatives --install /etc/pam.d/kcheckpass   pam.d-kcheckpass  
 %p/etc/pam.d/kcheckpass   50
-       update-alternatives --install /etc/pam.d/kscreensaver 
pam.d-kscreensaver %p/etc/pam.d/kscreensaver 50
-       if test -x "%p/bin/xfontpath"; then
-               "%p/bin/xfontpath" --silent install konsole
-       fi
-       if [ -x "%p/bin/kde-update-caches.sh" ]; then
-               %p/bin/kde-update-caches.sh >/dev/null 2>&1 || :
-       fi
+update-alternatives --install /etc/pam.d/kde          pam.d-kde          
%p/etc/pam.d/kde          50
+update-alternatives --install /etc/pam.d/kdm          pam.d-kdm          
%p/etc/pam.d/kdm          50
+update-alternatives --install /etc/pam.d/kcheckpass   pam.d-kcheckpass   
%p/etc/pam.d/kcheckpass   50
+update-alternatives --install /etc/pam.d/kscreensaver pam.d-kscreensaver 
%p/etc/pam.d/kscreensaver 50
+if test -x "%p/bin/xfontpath"; then
+       "%p/bin/xfontpath" --silent install konsole
+fi
+if [ -x "%p/bin/kde-update-caches.sh" ]; then
+       %p/bin/kde-update-caches.sh >/dev/null 2>&1 || :
+fi
 <<
 PreRmScript: <<
-       update-alternatives --remove pam.d-kde          %p/etc/pam.d/kde
-       update-alternatives --remove pam.d-kdm          %p/etc/pam.d/kdm
-       update-alternatives --remove pam.d-kcheckpass   %p/etc/pam.d/kcheckpass
-       update-alternatives --remove pam.d-kscreensaver 
%p/etc/pam.d/kscreensaver
-       if test -x "%p/bin/xfontpath"; then
-               "%p/bin/xfontpath" --silent remove konsole
-       fi
+update-alternatives --remove pam.d-kde          %p/etc/pam.d/kde
+update-alternatives --remove pam.d-kdm          %p/etc/pam.d/kdm
+update-alternatives --remove pam.d-kcheckpass   %p/etc/pam.d/kcheckpass
+update-alternatives --remove pam.d-kscreensaver %p/etc/pam.d/kscreensaver
+if test -x "%p/bin/xfontpath"; then
+       "%p/bin/xfontpath" --silent remove konsole
+fi
 <<
 
 DescDetail: Core applications for the K Desktop Environment.
@@ -815,4 +817,5 @@
 
   sudo apt-get remove kdenetwork3-base
 <<
-
+<<
+

Modified: trunk/experimental/10.4/main/finkinfo/kde/kdeedu3.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdeedu3.info&rev=1054&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdeedu3.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdeedu3.info Sun Nov 11 17:12:53 
2007
@@ -1,6 +1,6 @@
 Package: kdeedu3
 Version: 3.5.8
-Revision: 1
+Revision: 1021
 Description: KDE - educational software
 License: GPL/LGPL
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
@@ -27,7 +27,7 @@
        kturtle (>= %v-%r)
 <<
 BuildDepends: <<
-       arts-dev (>= 1.5.5-1),
+       arts-dev (>= 1.5.8-1021),
        audiofile,
        autoconf (>= 2.60-1),
        cctools-single-module,
@@ -37,7 +37,7 @@
        freetype219,
        gettext-tools,
        glib2-dev,
-       kdelibs3-unified-dev (>= %v-1),
+       kdelibs3-unified-dev (>= %v-1021),
        libart2,
        libgettext3-dev,
        libiconv-dev,
@@ -1343,7 +1343,7 @@
        Description: KDE - kdeedu development headers and libraries
        Depends: <<
                %N (>= %v-%r),
-               kdelibs3-unified (>= %v-1)
+               kdelibs3-unified (>= %v-1021)
        <<
        Replaces: <<
                %N (<< %v-%r),
@@ -1351,8 +1351,8 @@
                kstars (<< %v-%r)
        <<
        Recommends: <<
-               arts-dev (>= 1.5.3-1),
-               kdelibs3-unified-dev (>= %v-1),
+               arts-dev (>= 1.5.8-1021),
+               kdelibs3-unified-dev (>= %v-1021),
                libart2,
                libpng3 (>= 1.2.8-1),
                qt3 (>= 3.3.8-1021)
@@ -1423,14 +1423,14 @@
 SplitOff22: <<
        Package: %N-base
        Description: KDE - kdeedu base package
-       Depends: kdebase3-unified (>= %v-1)
+       Depends: kdebase3-unified (>= %v-1021)
        Replaces: <<
                %N (<< %v-%r),
                %N-shlibs (<< %v-%r)
        <<
        Recommends: <<
                %N (>= %v-%r),
-               kdebase3-unified (>= %v-1)
+               kdebase3-unified (>= %v-1021)
        <<
        Files: share/doc/installed-packages/%N-base
        DescUsage: <<

Modified: trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-apidox.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-apidox.info&rev=1054&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-apidox.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-apidox.info Sun Nov 11 
17:12:53 2007
@@ -1,13 +1,13 @@
 Package: kdelibs3-apidox
 Version: 3.5.8
-Revision: 1
+Revision: 1021
 Description: KDE - essential libraries (API documentation)
 License: GPL/LGPL
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
 
-Depends: kdelibs3-unified (>= %v-1)
+Depends: kdelibs3-unified (>= %v-1021)
 BuildDepends: <<
-       arts-dev (>= 1.5.5-1),
+       arts-dev (>= 1.5.8-1021),
        aspell-dev,
        audiofile,
        autoconf (>= 2.60-1),

Modified: trunk/experimental/10.4/main/finkinfo/libs/poppler-qt3.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/libs/poppler-qt3.info&rev=1054&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/libs/poppler-qt3.info (original)
+++ trunk/experimental/10.4/main/finkinfo/libs/poppler-qt3.info Sun Nov 11 
17:12:53 2007
@@ -25,7 +25,7 @@
 PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1 --fuzz=4
 
 SetCPPFLAGS: -I%p/lib/freetype219/include 
-I%p/lib/freetype219/include/freetype2 -I%p/lib/fontconfig2/include -I%p/include
-SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib
+SetLDFLAGS: -L%p/lib/freetype219/lib -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
 SetLIBS: -L%p/lib
 NoSetCPPFLAGS: true
 NoSetLDFLAGS: true

Modified: trunk/experimental/10.4/main/finkinfo/libs/poppler-qt4.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/libs/poppler-qt4.info&rev=1054&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/libs/poppler-qt4.info (original)
+++ trunk/experimental/10.4/main/finkinfo/libs/poppler-qt4.info Sun Nov 11 
17:12:53 2007
@@ -36,7 +36,7 @@
 PatchScript: sed 's|@PREFIX@|%p|g' <%a/poppler-qt4.patch | patch -p1 --fuzz=4
 
 SetCPPFLAGS: -I%p/lib/freetype219/include 
-I%p/lib/freetype219/include/freetype2 -I%p/lib/fontconfig2/include -I%p/include
-SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib
+SetLDFLAGS: -L%p/lib/freetype219/lib -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
 SetLIBS: -L%p/lib
 NoSetCPPFLAGS: true
 NoSetLDFLAGS: true

Modified: trunk/experimental/10.4/main/finkinfo/libs/poppler1.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/libs/poppler1.info&rev=1054&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/libs/poppler1.info (original)
+++ trunk/experimental/10.4/main/finkinfo/libs/poppler1.info Sun Nov 11 
17:12:53 2007
@@ -49,7 +49,7 @@
 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
 SetCXXFLAGS: -Os
-SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib 
-L%p/lib/fontconfig2/lib -L%p/lib
+SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib 
-L%p/lib/fontconfig2/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
 SetLIBS: -L%p/lib -lexpat
 NoSetCPPFLAGS: true
 NoSetLDFLAGS: true

Modified: trunk/experimental/10.4/main/finkinfo/libs/poppler2-glib.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/libs/poppler2-glib.info&rev=1054&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/libs/poppler2-glib.info (original)
+++ trunk/experimental/10.4/main/finkinfo/libs/poppler2-glib.info Sun Nov 11 
17:12:53 2007
@@ -35,7 +35,7 @@
 PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | 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
+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
 NoSetCPPFLAGS: true
 NoSetLDFLAGS: true
 ConfigureParams: --mandir=%p/share/man SYSTEM_XPDFRC=%p/etc/xpdfrc.poppler2 
--disable-dependency-tracking --enable-zlib --enable-poppler-glib 
--disable-poppler-qt --disable-poppler-qt4 
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config 
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/pango-ft219/lib/pkgconfig:$PKG_CONFIG_PATH"

Modified: trunk/experimental/10.4/main/finkinfo/libs/poppler2-qt3.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/libs/poppler2-qt3.info&rev=1054&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/libs/poppler2-qt3.info (original)
+++ trunk/experimental/10.4/main/finkinfo/libs/poppler2-qt3.info Sun Nov 11 
17:12:53 2007
@@ -28,7 +28,7 @@
 <<
 
 SetCPPFLAGS: -I%p/lib/freetype219/include 
-I%p/lib/freetype219/include/freetype2 -I%p/lib/fontconfig2/include -I%p/include
-SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib -L%p/lib
+SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/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
 NoSetCPPFLAGS: true
 NoSetLDFLAGS: true
 ConfigureParams: --mandir=%p/share/man SYSTEM_XPDFRC=%p/etc/xpdfrc.poppler2 
--disable-dependency-tracking --enable-zlib --disable-poppler-glib 
--disable-poppler-qt4 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config 
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"

Modified: trunk/experimental/10.4/main/finkinfo/libs/poppler2.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/libs/poppler2.info&rev=1054&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/libs/poppler2.info (original)
+++ trunk/experimental/10.4/main/finkinfo/libs/poppler2.info Sun Nov 11 
17:12:53 2007
@@ -45,7 +45,7 @@
 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
 SetCXXFLAGS: -Os
-SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib 
-L%p/lib/fontconfig2/lib -L%p/lib
+SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib 
-L%p/lib/fontconfig2/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
 SetLIBS: -L%p/lib -lexpat
 NoSetCPPFLAGS: true
 NoSetLDFLAGS: true

Modified: trunk/experimental/10.4/main/finkinfo/x11/fontconfig2-dev-10.5.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/x11/fontconfig2-dev-10.5.info&rev=1054&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/x11/fontconfig2-dev-10.5.info 
(original)
+++ trunk/experimental/10.4/main/finkinfo/x11/fontconfig2-dev-10.5.info Sun Nov 
11 17:12:53 2007
@@ -22,13 +22,13 @@
        X11_ROOT="/usr/X11"
 
        install -d -m 755 $FC_ROOT/{bin,include,lib,lib/pkgconfig}
-       ln -sfh $X11_ROOT/include/fontconfig "$FC_ROOT/include/fontconfig"
-       ln -sfh $X11_ROOT/lib/pkgconfig/fontconfig.pc 
"$FC_ROOT/lib/pkgconfig/fontconfig.pc"
+       /bin/ln -sfh $X11_ROOT/include/fontconfig "$FC_ROOT/include/fontconfig"
+       /bin/ln -sfh $X11_ROOT/lib/pkgconfig/fontconfig.pc 
"$FC_ROOT/lib/pkgconfig/fontconfig.pc"
        for file in libfontconfig.1.1.0.dylib libfontconfig.1.dylib 
libfontconfig.dylib libfontconfig.la; do
-               ln -sfh "$X11_ROOT/lib/$file" "$FC_ROOT/lib/$file"
+               /bin/ln -sfh "$X11_ROOT/lib/$file" "$FC_ROOT/lib/$file"
        done
        for file in fc-cache fc-cat fc-list fc-match; do
-               ln -sfh "$X11_ROOT/bin/$file" "$FC_ROOT/bin/$file"
+               /bin/ln -sfh "$X11_ROOT/bin/$file" "$FC_ROOT/bin/$file"
        done
 <<
 SplitOff: <<

Modified: 
trunk/experimental/3rdparty/common/main/finkinfo/graphics/freetype219.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/3rdparty/common/main/finkinfo/graphics/freetype219.info&rev=1054&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/3rdparty/common/main/finkinfo/graphics/freetype219.info 
(original)
+++ trunk/experimental/3rdparty/common/main/finkinfo/graphics/freetype219.info 
Sun Nov 11 17:12:53 2007
@@ -1,6 +1,6 @@
 Package: freetype219
 Version: 2.3.5
-Revision: 1
+Revision: 2
 Depends: %N-shlibs (= %v-%r)
 Conflicts: freetype219-hinting
 Replaces: freetype219-hinting
@@ -21,7 +21,7 @@
 CompileScript: <<
 #!/bin/sh -ev
        export CPATH=%p/include
-       ./configure --prefix=%p/lib/%N --with-old-mac-fonts 
--mandir=%p/share/man --infodir=%p/share/info
+       ./configure --prefix=%p/lib/%N --without-old-mac-fonts 
--mandir=%p/share/man --infodir=%p/share/info
        make
 <<
 InstallScript: <<
@@ -37,7 +37,7 @@
        Replaces:  freetype219-hinting-shlibs, freetype2 (<< 2.0.8-2)
        Conflicts: freetype219-hinting-shlibs
        Files: lib/%N/lib/libfreetype.6*dylib
-       Shlibs: %p/lib/%N/lib/libfreetype.6.dylib 10.0.0 %n (>= 2.1.9-1)
+       Shlibs: %p/lib/%N/lib/libfreetype.6.dylib 10.0.0 %n (>= 2.3.5-2)
        DocFiles: README docs/LICENSE.TXT
        Description: TrueType font rendering library, shared libs
 <<

Modified: trunk/experimental/common/main/finkinfo/kde/arts.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/arts.info&rev=1054&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/arts.info (original)
+++ trunk/experimental/common/main/finkinfo/kde/arts.info Sun Nov 11 17:12:53 
2007
@@ -1,6 +1,7 @@
+Info3: <<
 Package: arts
 Version: 1.5.8
-Revision: 1
+Revision: 1021
 Description: KDE - analog realtime synthesizer
 License: GPL
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
@@ -13,6 +14,7 @@
        esound,
        expat1,
        fink (>= 0.24-1),
+#      fontconfig2-dev (>= 2.4.1-1),
        freetype219,
        libgettext3-dev,
        gettext-bin,
@@ -31,7 +33,7 @@
        x11-dev
 <<
 Replaces: %N-dev (<< %v-%r)
-GCC: 3.3
+GCC: 4.0
 
 CustomMirror: RangerMirror
 Source: mirror:kde:stable/3.5.8/src/%n-%v.tar.bz2
@@ -54,8 +56,6 @@
 
        export PREFIX="%p" USE_UNSERMAKE=1
        . ./environment-helper.sh
-
-       export CC=gcc-3.3 CXX=g++-3.3
 
        ./build-helper.sh cvs       %N %v %r make -f admin/Makefile.common cvs
        ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
@@ -84,6 +84,7 @@
                audiofile-shlibs,
                esound-shlibs,
                expat1-shlibs,
+#              fontconfig2-shlibs (>= 2.4.1-1),
                freetype219-shlibs,
                libgettext3-shlibs,
                glib2-shlibs (>= 2.2.1-4),
@@ -187,3 +188,4 @@
 small modules like oscillators for creating waveforms, various filters,
 mixers, faders, etc.
 <<
+<<

Modified: trunk/experimental/common/main/finkinfo/kde/kdebase3-apidox.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdebase3-apidox.info&rev=1054&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdebase3-apidox.info (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdebase3-apidox.info Sun Nov 11 
17:12:53 2007
@@ -1,13 +1,13 @@
 Package: kdebase3-apidox
 Version: 3.5.8
-Revision: 1
+Revision: 1021
 Description: KDE - base system (API documentation)
 License: GPL/LGPL
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
 
-Depends: kdebase3-unified (>= %v-1)
+Depends: kdebase3-unified (>= %v-1021)
 BuildDepends: <<
-       arts-dev (>= 1.5.5-1),
+       arts-dev (>= 1.5.8-1021),
        audiofile,
        autoconf (>= 2.59-1),
        cctools-single-module,
@@ -22,7 +22,7 @@
        libgettext3-dev,
        gettext-tools,
        glib2-dev (>= 2.2.1-4),
-       kdelibs3-unified-dev (>= %v-1),
+       kdelibs3-unified-dev (>= %v-1021),
        lesstif (>= 0.93.18-6),
        libart2,
        libjpeg,

Modified: trunk/experimental/common/main/finkinfo/kde/kdebase3-unified.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdebase3-unified.info&rev=1054&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdebase3-unified.info (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdebase3-unified.info Sun Nov 
11 17:12:53 2007
@@ -1,14 +1,15 @@
+Info3: <<
 Package: kdebase3-unified
 Version: 3.5.8
-Revision: 1
+Revision: 1021
 Description: KDE - base system
 License: GPL/LGPL
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
 
 Suggests: krename
-Depends: %N-shlibs (>= %v-%r), kdelibs3-unified (>= %v-1), 
remap-bad-apple-keys, xfontpath
+Depends: %N-shlibs (>= %v-%r), kdelibs3-unified (>= %v-1021), 
remap-bad-apple-keys, xfontpath
 BuildDepends: <<
-       arts-dev (>= 1.5.5-1),
+       arts-dev (>= 1.5.8-1021),
        audiofile,
        autoconf (>= 2.59-1),
        cctools-single-module,
@@ -19,11 +20,12 @@
        esound,
        expat1,
        fink (>= 0.26.0-1),
+#      fontconfig2-dev (>= 2.4.1-1),
        freetype219,
        libgettext3-dev,
        gettext-tools,
        glib2-dev (>= 2.2.1-4),
-       kdelibs3-unified-dev (>= %v-1),
+       kdelibs3-unified-dev (>= %v-1021),
        lesstif (>= 0.93.18-6),
        libart2,
        libjpeg,
@@ -46,7 +48,7 @@
 Conflicts: kio-fish
 Replaces: kdelibs3, kdelibs3-ssl, kdebase3, kdebase3-ssl, kdebase3-dev, 
kdebase3-ssl-dev, kdebase3-shlibs, kdebase3-ssl-shlibs, kio-fish, lisa, 
kdenetwork3 (<< 3.2.0-1), kdepasswd (<< 3.3.1-1), kde-extra-themes (<< 
3.4.0-1), kdeedu3 (<< 3.4.0-1)
 Provides: kate, kdm, konqueror, konsole, kwrite
-GCC: 3.3
+GCC: 4.0
 
 CustomMirror: RangerMirror
 Source: mirror:kde:stable/%v/src/kdebase-%v.tar.bz2
@@ -162,7 +164,7 @@
 SplitOff2: <<
        Package: %N-shlibs
        Description: KDE - base shared libraries
-       Depends: cyrus-sasl2-shlibs, kdelibs3-unified-shlibs (>= %v-1), 
libusb-shlibs
+       Depends: cyrus-sasl2-shlibs, kdelibs3-unified-shlibs (>= %v-1021), 
libusb-shlibs
        Replaces: kdebase3, kdebase3-ssl, kdebase3-dev, kdebase3-ssl-dev, 
kdebase3-shlibs, kdebase3-ssl-shlibs, kde-extra-themes
        Recommends: %N (>= %v-%r)
        Files: <<
@@ -251,3 +253,4 @@
 DescDetail: <<
 Core applications for the K Desktop Environment.
 <<
+<<

Modified: trunk/experimental/common/main/finkinfo/kde/kdeedu3.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdeedu3.info&rev=1054&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdeedu3.info (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdeedu3.info Sun Nov 11 
17:12:53 2007
@@ -1,13 +1,13 @@
 Package: kdeedu3
 Version: 3.5.8
-Revision: 1
+Revision: 1021
 Description: KDE - educational software
 License: GPL/LGPL
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
 
 Depends: blinken (>= %v-%r), kalzium (>= %v-%r), kanagram (>= %v-%r), kbruch 
(>= %v-%r), keduca (>= %v-%r), kgeography (>= %v-%r), khangman (>= %v-%r), kig 
(>= %v-%r), kiten (>= %v-%r), klatin (>= %v-%r), klettres (>= %v-%r), kmplot 
(>= %v-%r), kpercentage (>= %v-%r), kstars (>= %v-%r), ktouch (>= %v-%r), 
kverbos (>= %v-%r), kvoctrain (>= %v-%r), kwordquiz (>= %v-%r), kturtle (>= 
%v-%r)
 BuildDepends: <<
-       arts-dev (>= 1.5.5-1),
+       arts-dev (>= 1.5.8-1021),
        audiofile,
        autoconf (>= 2.59-1),
        cctools-single-module,
@@ -17,7 +17,7 @@
        freetype219,
        gettext-tools,
        glib2-dev,
-       kdelibs3-unified-dev (>= %v-1),
+       kdelibs3-unified-dev (>= %v-1021),
        libart2,
        libgettext3-dev,
        libiconv-dev,
@@ -804,8 +804,8 @@
 SplitOff21: <<
        Package: %N-dev
        Description: KDE - kdeedu development headers and libraries
-       Depends: %N (>= %v-%r), kdelibs3-unified (>= %v-1)
-       Recommends: arts-dev (>= 1.5.3-1), kdelibs3-unified-dev (>= %v-1), 
libart2, libpng3 (>= 1.2.5-4), qt3 (>= 3.3.5-3)
+       Depends: %N (>= %v-%r), kdelibs3-unified (>= %v-1021)
+       Recommends: arts-dev (>= 1.5.8-1021), kdelibs3-unified-dev (>= 
%v-1021), libart2, libpng3 (>= 1.2.5-4), qt3 (>= 3.3.5-3)
        Replaces: %N (<< %v-%r), %N-shlibs (<< %v-%r), kstars (<< %v-%r)
        BuildDependsOnly: true
        Files: <<
@@ -818,9 +818,9 @@
 SplitOff22: <<
        Package: %N-base
        Description: KDE - kdeedu base package
-       Depends: kdebase3-unified (>= %v-1)
+       Depends: kdebase3-unified (>= %v-1021)
        Replaces: %N (<< %v-%r), %N-shlibs (<< %v-%r)
-       Recommends: %N (>= %v-%r), kdebase3-unified (>= %v-1)
+       Recommends: %N (>= %v-%r), kdebase3-unified (>= %v-1021)
        Files: <<
                share/doc/installed-packages/%N-base
        <<

Modified: trunk/experimental/common/main/finkinfo/kde/kdelibs3-apidox.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdelibs3-apidox.info&rev=1054&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdelibs3-apidox.info (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdelibs3-apidox.info Sun Nov 11 
17:12:53 2007
@@ -1,13 +1,13 @@
 Package: kdelibs3-apidox
 Version: 3.5.8
-Revision: 1
+Revision: 1021
 Description: KDE - essential libraries (API documentation)
 License: GPL/LGPL
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
 
-Depends: kdelibs3-unified (>= %v-1)
+Depends: kdelibs3-unified (>= %v-1021)
 BuildDepends: <<
-       arts-dev (>= 1.5.5-1),
+       arts-dev (>= 1.5.8-1021),
        aspell-dev,
        audiofile,
        autoconf (>= 2.59-1),

Added: trunk/experimental/common/main/finkinfo/libs/perlmods/text-iconv-pm.info
URL: 
http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/main/finkinfo/libs/perlmods/text-iconv-pm.info&rev=1054&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/perlmods/text-iconv-pm.info 
(added)
+++ trunk/experimental/common/main/finkinfo/libs/perlmods/text-iconv-pm.info 
Sun Nov 11 17:12:53 2007
@@ -1,0 +1,35 @@
+Info2: <<
+Package: text-iconv-pm%type_pkg[perl]
+Version: 1.7
+Revision: 1
+###
+Depends: perl%type_pkg[perl]-core, libiconv
+BuildDepends: libiconv-dev
+Replaces: text-iconv-pm (<= 1.2-1)
+###
+Source: mirror:cpan:modules/by-module/Text/Text-Iconv-%v.tar.gz
+Source-MD5: 81b26e069eaebb084e91ea3c009b67ae
+###
+Type: perl (5.8.6 5.8.8)
+UpdatePOD: True
+###
+ConfigureParams: INC=-I%p/include LIBS=-L%p/lib
+###
+InstallScript: <<
+  %{default_script}
+  mv %i/share/man %i/lib/perl5/%type_raw[perl]
+<<
+DocFiles: README Changes
+###
+Description: The iconv() character set conversion function
+DescDetail: <<
+  This module provides a Perl interface to the iconv() codeset
+  conversion function, as defined by the Single UNIX Specification.  For
+  more details see the POD documentation embedded in the file Iconv.pm,
+  which will also be installed as Text::Iconv(3) man page.
+<<
+###
+License: Artistic
+Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
+Homepage: http://search.cpan.org/dist/Text-Iconv
+<<

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=1054&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler-qt3.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/poppler-qt3.info Sun Nov 11 
17:12:53 2007
@@ -19,7 +19,7 @@
 NoSetCPPFLAGS: true
 SetCPPFLAGS: -I%p/lib/freetype219/include 
-I%p/lib/freetype219/include/freetype2 -I%p/lib/fontconfig2/include -I%p/include
 NoSetLDFLAGS: true
-SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib
+SetLDFLAGS: -L%p/lib/freetype219/lib -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
 SetLIBS: -L%p/lib
 BuildDependsOnly: True
 Source: http://poppler.freedesktop.org/poppler-%v.tar.gz

Modified: trunk/experimental/common/main/finkinfo/libs/poppler-qt4.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/poppler-qt4.info&rev=1054&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler-qt4.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/poppler-qt4.info Sun Nov 11 
17:12:53 2007
@@ -20,7 +20,7 @@
 NoSetCPPFLAGS: true
 SetCPPFLAGS: -I%p/lib/freetype219/include 
-I%p/lib/freetype219/include/freetype2 -I%p/lib/fontconfig2/include -I%p/include
 NoSetLDFLAGS: true
-SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib
+SetLDFLAGS: -L%p/lib/freetype219/lib -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
 SetLIBS: -L%p/lib
 BuildDependsOnly: True
 Source: http://poppler.freedesktop.org/poppler-%v.tar.gz

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=1054&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler1.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/poppler1.info Sun Nov 11 
17:12:53 2007
@@ -37,7 +37,7 @@
 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
 NoSetLDFLAGS: true
-SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib 
-L%p/lib/fontconfig2/lib -L%p/lib
+SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib 
-L%p/lib/fontconfig2/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
 SetCFLAGS: -Os
 SetCXXFLAGS: -Os
 PatchScript: sed -e 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1

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=1054&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler2-glib.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/poppler2-glib.info Sun Nov 11 
17:12:53 2007
@@ -29,7 +29,7 @@
 NoSetCPPFLAGS: true
 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
 NoSetLDFLAGS: true
-SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib 
-L%p/lib/pango-ft219/lib -L%p/lib
+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
 BuildDependsOnly: True
 Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
 Source-MD5: 78a5f8ff1a3464eddb127577eea7a191

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=1054&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler2-qt3.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/poppler2-qt3.info Sun Nov 11 
17:12:53 2007
@@ -19,7 +19,7 @@
 NoSetCPPFLAGS: true
 SetCPPFLAGS: -I%p/lib/freetype219/include 
-I%p/lib/freetype219/include/freetype2 -I%p/lib/fontconfig2/include -I%p/include
 NoSetLDFLAGS: true
-SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib -L%p/lib
+SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/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
 BuildDependsOnly: True
 Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
 Source-MD5: 78a5f8ff1a3464eddb127577eea7a191

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=1054&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler2.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/poppler2.info Sun Nov 11 
17:12:53 2007
@@ -35,7 +35,7 @@
 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
 NoSetLDFLAGS: true
-SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib 
-L%p/lib/fontconfig2/lib -L%p/lib
+SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib 
-L%p/lib/fontconfig2/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
 SetCFLAGS: -Os
 SetCXXFLAGS: -Os
 PatchScript: sed -e 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1

Modified: trunk/experimental/common/main/finkinfo/net/opennms.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/net/opennms.info&rev=1054&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/net/opennms.info (original)
+++ trunk/experimental/common/main/finkinfo/net/opennms.info Sun Nov 11 
17:12:53 2007
@@ -1,12 +1,12 @@
 Package: opennms
-Version: 1.3.7
-Revision: 2
+Version: 1.3.8
+Revision: 1
 
 Source: mirror:sourceforge:%n/%n-source-%v-1.tar.gz
-Source-MD5: 1208371d45c2cd4775232d7b7adc904d
+Source-MD5: 50746e2968ad0b3a6dc1194bea99b866
 SourceDirectory: %n-%v-1/source
-Source2: mirror:sourceforge:%n/%n-m2-repository-1.3.7.tar.gz
-Source2-MD5: 5ac21b1a3517f38dfebf0dff549ae247
+#Source2: mirror:sourceforge:%n/%n-m2-repository-1.3.7.tar.gz
+#Source2-MD5: 5ac21b1a3517f38dfebf0dff549ae247
 
 Distribution: 10.4, 10.5
 Recommends: mib2opennms (>= %v-1)

Modified: trunk/experimental/common/main/finkinfo/net/opennms.patch
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/net/opennms.patch&rev=1054&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/net/opennms.patch (original)
+++ trunk/experimental/common/main/finkinfo/net/opennms.patch Sun Nov 11 
17:12:53 2007
@@ -1,20 +1,21 @@
-diff -uNr opennms-1.3.6-1/source/maven-settings.xml 
opennms-1.3.6-1-new/source/maven-settings.xml
---- opennms-1.3.6-1/source/maven-settings.xml  1969-12-31 18:00:00.000000000 
-0600
-+++ opennms-1.3.6-1-new/source/maven-settings.xml      2007-07-30 
19:20:08.000000000 -0500
+diff -Nurd opennms-1.3.8-1/source/maven-settings.xml 
opennms-1.3.8-1-new/source/maven-settings.xml
+--- opennms-1.3.8-1/source/maven-settings.xml  1969-12-31 19:00:00.000000000 
-0500
++++ opennms-1.3.8-1-new/source/maven-settings.xml      2007-11-07 
21:44:16.000000000 -0500
 @@ -0,0 +1,5 @@
 +<settings>
 + <localRepository>@REPOROOT@</localRepository>
-+ <interactiveMode>false</interactiveMode>
-+ <offline>true</offline>
++ <!-- <interactiveMode>false</interactiveMode>
++ <offline>true</offline> -->
 +</settings>
-diff -uNr 
opennms-1.3.6-1/source/opennms-install/src/main/java/org/opennms/install/Installer.java
 
opennms-1.3.6-1-new/source/opennms-install/src/main/java/org/opennms/install/Installer.java
---- 
opennms-1.3.6-1/source/opennms-install/src/main/java/org/opennms/install/Installer.java
    2007-07-25 17:10:54.000000000 -0500
-+++ 
opennms-1.3.6-1-new/source/opennms-install/src/main/java/org/opennms/install/Installer.java
        2007-07-30 19:22:28.000000000 -0500
-@@ -810,6 +810,7 @@
-                       path = defaultPath;
-               }
-       }
-+      path += File.pathSeparator + "@FINKPREFIX@/lib";
-       
-       if (path != null) {
-               String[] paths = path.split(File.pathSeparator);
+diff -Nurd 
opennms-1.3.8-1/source/opennms-install/src/main/java/org/opennms/install/Installer.java
 
opennms-1.3.8-1-new/source/opennms-install/src/main/java/org/opennms/install/Installer.java
+--- 
opennms-1.3.8-1/source/opennms-install/src/main/java/org/opennms/install/Installer.java
    2007-10-25 13:08:21.000000000 -0400
++++ 
opennms-1.3.8-1-new/source/opennms-install/src/main/java/org/opennms/install/Installer.java
        2007-11-07 21:44:57.000000000 -0500
+@@ -756,7 +756,7 @@
+         }
+ 
+       if (!System.getProperty("os.name").contains("Windows")) {
+-          String[] defaults = { "/usr/lib/jni", "/usr/lib", "/usr/local/lib" 
};
++          String[] defaults = { "@FINKPREFIX@/lib", "/usr/lib/jni", 
"/usr/lib", "/usr/local/lib" };
+           for (String entry : defaults) {
+               searchPaths.add(entry);
+           }

Modified: trunk/experimental/common/main/finkinfo/x11/fontconfig2-dev-10.5.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/x11/fontconfig2-dev-10.5.info&rev=1054&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/x11/fontconfig2-dev-10.5.info 
(original)
+++ trunk/experimental/common/main/finkinfo/x11/fontconfig2-dev-10.5.info Sun 
Nov 11 17:12:53 2007
@@ -14,13 +14,13 @@
        X11_ROOT="/usr/X11"
 
        install -d -m 755 $FC_ROOT/{bin,include,lib,lib/pkgconfig}
-       ln -sfh $X11_ROOT/include/fontconfig "$FC_ROOT/include/fontconfig"
-       ln -sfh $X11_ROOT/lib/pkgconfig/fontconfig.pc 
"$FC_ROOT/lib/pkgconfig/fontconfig.pc"
+       /bin/ln -sfh $X11_ROOT/include/fontconfig "$FC_ROOT/include/fontconfig"
+       /bin/ln -sfh $X11_ROOT/lib/pkgconfig/fontconfig.pc 
"$FC_ROOT/lib/pkgconfig/fontconfig.pc"
        for file in libfontconfig.1.1.0.dylib libfontconfig.1.dylib 
libfontconfig.dylib libfontconfig.la; do
-               ln -sfh "$X11_ROOT/lib/$file" "$FC_ROOT/lib/$file"
+               /bin/ln -sfh "$X11_ROOT/lib/$file" "$FC_ROOT/lib/$file"
        done
        for file in fc-cache fc-cat fc-list fc-match; do
-               ln -sfh "$X11_ROOT/bin/$file" "$FC_ROOT/bin/$file"
+               /bin/ln -sfh "$X11_ROOT/bin/$file" "$FC_ROOT/bin/$file"
        done
 <<
 PreInstScript: <<

Modified: trunk/experimental/generate-infofiles.pl
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/generate-infofiles.pl&rev=1054&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/generate-infofiles.pl (original)
+++ trunk/experimental/generate-infofiles.pl Sun Nov 11 17:12:53 2007
@@ -761,6 +761,8 @@
        } elsif (($package, $comparator, $version) = $dep_spec =~ 
/^(\S+)\s+\(([\>\=\<]+)\s*([^\-\s]+)\)$/) {
                #print "transform_dependency[$dep_spec]: $package matched 
incorrect dep\n";
                $revision = 0;
+       } elsif ($dep_spec =~ /^\#/) {
+               # don't do anything, it's a comment
        } else {
                warn "transform_dependency[$dep_spec]: unhandled dependency 
specification\n";
        }


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to