Update of /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv23946/crypto/finkinfo

Modified Files:
      Tag: pangocairo-branch
        monotone.info openoffice.org-firefox.info openoffice.org.info 
        wine.info 
Log Message:
merge from trunk

Index: wine.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/wine.info,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.8 -r1.1.2.9
--- wine.info   19 Jan 2008 21:13:36 -0000      1.1.2.8
+++ wine.info   14 Feb 2008 14:07:16 -0000      1.1.2.9
@@ -1,9 +1,10 @@
 Package: wine
-Version: 0.9.52
+Version: 0.9.55
 Revision: 1
 Description: Microsoft Windows compatibility layer
 License: LGPL
 Maintainer: Robert Cusick <[EMAIL PROTECTED]>
+# This version updated by Damian Dimmich
 
 #Much love to costabel, jfmertens, and other finkers for rebooting this 
package.
 #
@@ -17,7 +18,7 @@
 # I may have gone overboard on these dependencies, but better safe than sorry.
 BuildDepends: <<
  arts-dev, audiofile, bison, dbus-dev, esound, fontconfig2-dev, flex (>= 2.5),
- fontforge, freetype2-hinting-dev | freetype2-dev, gcc4.0, giflib | libungif,
+ fontforge, freetype219-shlibs, freetype219, gcc4.0, giflib | libungif,
  glib2-dev, jack-dev, lcms, lcms-bin, libgettext3-dev, libiconv-dev, 
libicu32-dev | libicu36-dev,
  libjpeg, libusb, libxml2, libxml2-bin, libxslt, libxslt-bin, mesa (>= 
6.5.2-1),
  openldap23-dev, openssl097-dev, sane-backends-dev (>= 1.0.18-1), x11-dev, 
libgphoto2,
@@ -25,7 +26,7 @@
 <<
 Depends: <<
  arts-shlibs, audiofile-shlibs, dbus-shlibs, esound-shlibs, fontconfig2-shlibs,
- freetype2-hinting-shlibs | freetype2-shlibs, giflib-shlibs | libungif-shlibs,
+ freetype219-shlibs, giflib-shlibs | libungif-shlibs,
  glib2-shlibs, jack-shlibs, lcms-shlibs, libgettext3-shlibs, libiconv, 
libjpeg-shlibs,
  libusb-shlibs, libxml2-shlibs, libxslt-shlibs, mesa-shlibs (>= 6.5.2-1),
  openldap23-shlibs, openssl097-shlibs, sane-backends-shlibs (>= 1.0.18-1), 
x11, libgphoto2-shlibs,
@@ -35,7 +36,7 @@
  msttcorefonts
 <<
 Source: mirror:sourceforge:%n/%n-%v.tar.bz2
-Source-MD5: c3b14ac84f049a2db28cd41c3f71998b
+Source-MD5: bf4e8fb1b9f33e29ccc6efcfef2697f4
 
 NoSetCPPFLAGS: true
 SetCPPFLAGS: -DDBUS_API_SUBJECT_TO_CHANGE
@@ -48,7 +49,7 @@
  export LDFLAGS="-L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib"
  export X_CFLAGS=-I%p/include/mesa X_LIBS=-L%p/lib/mesa
  export LD_LIBRARY_PATH=%p/lib
- export PATH=%p/lib/freetype2/bin:$PATH
+ export PATH=%p/lib/freetype219/bin:$PATH
  export CPPFLAGS="-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include"
  # change the library detection so that the full path name of the library is 
retained
  perl -pi.bak -e 's|\^\.\*\\\/\\\(lib|^[^\\/]*\\\(.*lib|g' configure

Index: openoffice.org-firefox.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/openoffice.org-firefox.info,v
retrieving revision 1.8.2.29
retrieving revision 1.8.2.30
diff -u -d -r1.8.2.29 -r1.8.2.30
--- openoffice.org-firefox.info 29 Jan 2008 16:54:39 -0000      1.8.2.29
+++ openoffice.org-firefox.info 14 Feb 2008 14:07:15 -0000      1.8.2.30
@@ -173,6 +173,7 @@
 
 PatchScript: <<
   /usr/bin/patch -p0 < %a/openoffice.org.patch
+  perl -pi -e 's,-DCURL_NO_OLDIES,,' ucb/source/ucp/ftp/makefile.mk
   chmod a+x languagepack-splitoff
 <<
 

Index: monotone.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/monotone.info,v
retrieving revision 1.9.2.6
retrieving revision 1.9.2.7
diff -u -d -r1.9.2.6 -r1.9.2.7
--- monotone.info       3 Nov 2007 20:25:22 -0000       1.9.2.6
+++ monotone.info       14 Feb 2008 14:07:15 -0000      1.9.2.7
@@ -1,8 +1,8 @@
 Package: monotone
-Version: 0.37
+Version: 0.38
 Revision: 1
 Source: http://www.monotone.ca/downloads/%v/monotone-%v.tar.gz
-Source-MD5: d06193f2738626570692bed2173144c1
+Source-MD5: c1a0d2619f451a664289b042c104860d
 #PatchScript: sed -e 's|@SW@|%p|g' < %a/%n.patch | patch -p1
 BuildDepends:<<
   boost1.33, libgettext3-dev, libiconv-dev

Index: openoffice.org.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/openoffice.org.info,v
retrieving revision 1.9.2.30
retrieving revision 1.9.2.31
diff -u -d -r1.9.2.30 -r1.9.2.31
--- openoffice.org.info 29 Jan 2008 16:54:39 -0000      1.9.2.30
+++ openoffice.org.info 14 Feb 2008 14:07:16 -0000      1.9.2.31
@@ -64,6 +64,7 @@
 PatchScript: <<
   #!/bin/bash -ev
   /usr/bin/sed 's|@PREFIX@|%p|g;s|@PKGNAME@|%n|g' %{PatchFile} | 
/usr/bin/patch -p0
+  perl -pi -e 's,-DCURL_NO_OLDIES,,' ucb/source/ucp/ftp/makefile.mk
   chmod a+x languagepack-splitoff
   /bin/ln ../unowinreg.dll ./external/unowinreg/
 


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to