dists/10.3/unstable/main/finkinfo/gnome pango1-dev.info,1.7,1.8 pango1-shlibs.info,1.7,1.8 pango1-xft2-ft219.info,1.8,1.9 pango1-xft2-ft219.patch,1.4,1.5 pango1-xft2.info,1.16,1.17 pango1-xft2.patch,1

2005-08-15 Thread Daniel Macks
Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9634/10.3/unstable/main/finkinfo/gnome

Modified Files:
pango1-dev.info pango1-shlibs.info pango1-xft2-ft219.info 
pango1-xft2-ft219.patch pango1-xft2.info pango1-xft2.patch 
Log Message:
New version (1.10.0). Propagate libjpeg/ImageIO patch to all variants and dists.
No cairo support b/c no cairo package in fink.


Index: pango1-xft2-ft219.info
===
RCS file: 
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/pango1-xft2-ft219.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- pango1-xft2-ft219.info  22 Jun 2005 06:13:55 -  1.8
+++ pango1-xft2-ft219.info  16 Aug 2005 04:58:11 -  1.9
@@ -1,26 +1,43 @@
+
 Package: pango1-xft2-ft219
-Version: 1.8.1
-Revision: 4
+Version: 1.10.0
+
+### This .info has OS-specific features...don't blindly copy 10.3<->10.4!
+Revision: 1
+
 Depends: %N-shlibs (=%v-%r), libgettext3-shlibs, glib2 (>= 2.5.7-1), libiconv, 
expat-shlibs
 BuildDepends: <<
   glib2-dev (>= 2.5.7-1), pkgconfig (>= 0.15.0-2), gtk-doc (>= 1.2-1),
   x11-dev, xft2-dev, libgettext3-dev, libiconv-dev, gcc3.3,
   freetype219, fontconfig2-dev, expat
 <<
-Source: mirror:gnome:sources/pango/1.8/pango-%v.tar.bz2
-Source-MD5: 88aa6bf1876766db6864f3b93577887c
+Source: mirror:gnome:sources/pango/1.10/pango-%v.tar.bz2
+Source-MD5: c75489ec7f5fe77e31e4cbde71ad0c16
 PatchScript: <<
   #!/bin/bash -ev
   SYSCONFDIR=%p/lib/pango-ft219/etc
   perl -p -e 'BEGIN{$s=shift} s|[EMAIL PROTECTED]@|%p|; s|[EMAIL 
PROTECTED]@|$s|' $SYSCONFDIR <%a/%n.patch | patch -p1
   sed -e 's|query|ft219-query|' update-pango-modules > 
update-pango-ft219-modules
+
+# Fix jpeg/ImageIO problem
+cat <= 1.8.1-1)
-%p/lib/pango-ft219/lib/libpangoft2-1.0.0.dylib 801.0.0 %n (>= 1.8.1-1)
-%p/lib/pango-ft219/lib/libpangox-1.0.0.dylib 801.0.0 %n (>= 1.8.1-1)
-%p/lib/pango-ft219/lib/libpangoxft-1.0.0.dylib 801.0.0 %n (>= 1.8.1-1)
+%p/lib/pango-ft219/lib/libpango-1.0.0.dylib 1001.0.0 %n (>= 1.10.0-1)
+%p/lib/pango-ft219/lib/libpangoft2-1.0.0.dylib 1001.0.0 %n (>= 1.10.0-1)
+%p/lib/pango-ft219/lib/libpangox-1.0.0.dylib 1001.0.0 %n (>= 1.10.0-1)
+%p/lib/pango-ft219/lib/libpangoxft-1.0.0.dylib 1001.0.0 %n (>= 1.10.0-1)
   <<
   Description: GTK+ - i18n text shared libraries (for freetype >= 2.1.9)
   DocFiles: AUTHORS COPYING ChangeLog NEWS README TODO
@@ -99,6 +116,11 @@
   Currently, uses example pangox.aliases without modification. For
   future, it should be managed by font managing system like defoma
   (Debian font manager).
+
+  Fink has no cairo package yet, so patch configure to make sure we
+  don't accidentally detect some other cairo on the system. When a
+  package for cairo>=0.5.2-head becomes available, remove patch and
+  set (Build)Depends for it.
 <<
 DescPort: <<
   Instead of requiring xslt to build this package, we just manually
@@ -107,6 +129,10 @@
 
   check uses some C++ but it doesn't leak out into the installed
   package
+
+  When we get cairo, need to check whether we need to move
+  CAIRO_CFLAGS to appear after FREETYPE_CFLAGS (and maybe after
+  XFT_CFLAGS?) in the various Makefile.in
 <<
 DescUsage: <<
 Packages which install pango module(s) should call update-pango-ft219-modules

Index: pango1-shlibs.info
===
RCS file: 
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/pango1-shlibs.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pango1-shlibs.info  7 Jun 2005 14:03:54 -   1.7
+++ pango1-shlibs.info  16 Aug 2005 04:58:11 -  1.8
@@ -1,5 +1,5 @@
 Package: pango1-shlibs
-Version: 1.8.1
+Version: 1.10.0
 Revision: 1
 Type: bundle
 Depends: pango1-xft2-shlibs (>= %v-%r)

Index: pango1-xft2.info
===
RCS file: 
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/pango1-xft2.info,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- pango1-xft2.info22 Jun 2005 06:13:55 -  1.16
+++ pango1-xft2.info16 Aug 2005 04:58:11 -  1.17
@@ -1,6 +1,6 @@
 Package: pango1-xft2
-Version: 1.8.1
-Revision: 3
+Version: 1.10.0
+Revision: 1
 Depends: %N-shlibs (=%v-%r), libgettext3-shlibs, glib2 (>= 2.5.7-1), libiconv
 Provides: pango1
 Replaces: pango1
@@ -9,19 +9,32 @@
   glib2-dev (>= 2.5.7-1), pkgconfig (>= 0.15.0-2), gtk-doc (>= 1.2-1),
   x11-dev, xft2-dev, libgettext3-dev, libiconv-dev, gcc3.3
 <<
-Source: mirror:gnome:sources/pango/1.8/pango-%v.tar.bz2
-Source-MD5: 88aa6bf1876766db6864f3b93577887c
+Source: mirror:gnome:sources/pango/1.10/pango-%v.tar.bz2
+Source-MD5: c75489ec7f5fe77e31e4cbde71ad0c16
 PatchScript: <<
   #!/bin/bash -ev
   SYSCONFDIR=%p/etc
   perl -p -e 'BEGIN{$s=shift} s|[EMAIL PROTECTED]@|%p|; s|[EMAIL 
PROTECTED]@|$s|' $

dists/10.4-transitional/unstable/main/finkinfo/gnome pango1-dev.info,1.2,1.3 pango1-shlibs.info,1.2,1.3 pango1-xft2-ft219.info,1.5,1.6 pango1-xft2-ft219.patch,1.3,1.4 pango1-xft2.info,1.5,1.6 pango1-x

2005-08-15 Thread Daniel Macks
Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/gnome
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9634/10.4-transitional/unstable/main/finkinfo/gnome

Modified Files:
pango1-dev.info pango1-shlibs.info pango1-xft2-ft219.info 
pango1-xft2-ft219.patch pango1-xft2.info pango1-xft2.patch 
Log Message:
New version (1.10.0). Propagate libjpeg/ImageIO patch to all variants and dists.
No cairo support b/c no cairo package in fink.


Index: pango1-xft2-ft219.info
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/gnome/pango1-xft2-ft219.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pango1-xft2-ft219.info  7 Aug 2005 19:35:07 -   1.5
+++ pango1-xft2-ft219.info  16 Aug 2005 04:58:11 -  1.6
@@ -1,26 +1,42 @@
 Package: pango1-xft2-ft219
-Version: 1.8.1
-Revision: 25
+Version: 1.10.0
+
+### This .info has OS-specific features...don't blindly copy 10.3<->10.4!
+Revision: 101
+
 Depends: %N-shlibs (=%v-%r), libgettext3-shlibs, glib2 (>= 2.5.7-1), libiconv, 
expat-shlibs, fontconfig2-shlibs
 BuildDepends: <<
   glib2-dev (>= 2.5.7-1), pkgconfig (>= 0.15.0-2), gtk-doc (>= 1.2-1),
   x11-dev, xft2-dev, libgettext3-dev, libiconv-dev, gcc3.3,
   freetype219, fontconfig2-dev (>= 2.2.3-10), expat
 <<
-Source: mirror:gnome:sources/pango/1.8/pango-%v.tar.bz2
-Source-MD5: 88aa6bf1876766db6864f3b93577887c
+Source: mirror:gnome:sources/pango/1.10/pango-%v.tar.bz2
+Source-MD5: c75489ec7f5fe77e31e4cbde71ad0c16
 PatchScript: <<
   #!/bin/bash -ev
   SYSCONFDIR=%p/lib/pango-ft219/etc
   perl -p -e 'BEGIN{$s=shift} s|[EMAIL PROTECTED]@|%p|; s|[EMAIL 
PROTECTED]@|$s|' $SYSCONFDIR <%a/%n.patch | patch -p1
   sed -e 's|query|ft219-query|' update-pango-modules > 
update-pango-ft219-modules
+
+# Fix jpeg/ImageIO problem
+cat <= 1.8.1-1)
-%p/lib/pango-ft219/lib/libpangoft2-1.0.0.dylib 801.0.0 %n (>= 1.8.1-1)
-%p/lib/pango-ft219/lib/libpangox-1.0.0.dylib 801.0.0 %n (>= 1.8.1-1)
-%p/lib/pango-ft219/lib/libpangoxft-1.0.0.dylib 801.0.0 %n (>= 1.8.1-1)
+%p/lib/pango-ft219/lib/libpango-1.0.0.dylib 1001.0.0 %n (>= 1.10.0-1)
+%p/lib/pango-ft219/lib/libpangoft2-1.0.0.dylib 1001.0.0 %n (>= 1.10.0-1)
+%p/lib/pango-ft219/lib/libpangox-1.0.0.dylib 1001.0.0 %n (>= 1.10.0-1)
+%p/lib/pango-ft219/lib/libpangoxft-1.0.0.dylib 1001.0.0 %n (>= 1.10.0-1)
   <<
   Description: GTK+ - i18n text shared libraries (for freetype >= 2.1.9)
   DocFiles: AUTHORS COPYING ChangeLog NEWS README TODO
@@ -99,6 +115,11 @@
   Currently, uses example pangox.aliases without modification. For
   future, it should be managed by font managing system like defoma
   (Debian font manager).
+
+  Fink has no cairo package yet, so patch configure to make sure we
+  don't accidentally detect some other cairo on the system. When a
+  package for cairo>=0.5.2-head becomes available, remove patch and
+  set (Build)Depends for it.
 <<
 DescPort: <<
   Instead of requiring xslt to build this package, we just manually
@@ -107,6 +128,10 @@
 
   check uses some C++ but it doesn't leak out into the installed
   package
+
+  When we get cairo, need to check whether we need to move
+  CAIRO_CFLAGS to appear after FREETYPE_CFLAGS (and maybe after
+  XFT_CFLAGS?) in the various Makefile.in
 <<
 DescUsage: <<
 Packages which install pango module(s) should call update-pango-ft219-modules

Index: pango1-shlibs.info
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/gnome/pango1-shlibs.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pango1-shlibs.info  19 Jun 2005 02:45:44 -  1.2
+++ pango1-shlibs.info  16 Aug 2005 04:58:11 -  1.3
@@ -1,5 +1,5 @@
 Package: pango1-shlibs
-Version: 1.8.1
+Version: 1.10.0
 Revision: 1
 Type: bundle
 Depends: pango1-xft2-shlibs (>= %v-%r)

Index: pango1-xft2.info
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/gnome/pango1-xft2.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pango1-xft2.info22 Jun 2005 06:13:56 -  1.5
+++ pango1-xft2.info16 Aug 2005 04:58:11 -  1.6
@@ -1,6 +1,6 @@
 Package: pango1-xft2
-Version: 1.8.1
-Revision: 3
+Version: 1.10.0
+Revision: 1
 Depends: %N-shlibs (=%v-%r), libgettext3-shlibs, glib2 (>= 2.5.7-1), libiconv
 Provides: pango1
 Replaces: pango1
@@ -9,8 +9,8 @@
   glib2-dev (>= 2.5.7-1), pkgconfig (>= 0.15.0-2), gtk-doc (>= 1.2-1),
   x11-dev, xft2-dev, libgettext3-dev, libiconv-dev, gcc3.3
 <<
-Source: mirror:gnome:sources/pango/1.8/pango-%v.tar.bz2
-Source-MD5: 88aa6bf1876766db6864f3b93577887c
+Source: mirror:gnome:sources/pango/1.10/pango-%v.tar.bz2
+Source-MD5: c75489ec7f5fe77e31e4cbde71ad0c16
 PatchScript: <<
   #!/bin/bash -ev
   SYSCONFDIR=

dists/10.3/unstable/main/finkinfo/utils rdiff-backup.info,1.5,1.6 rdiff-backup.patch,1.4,1.5

2005-08-15 Thread Blair Zajac
Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv784

Modified Files:
rdiff-backup.info rdiff-backup.patch 
Log Message:
New upstream version.  Incorporates a patch included in the previous
version.


Index: rdiff-backup.patch
===
RCS file: 
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils/rdiff-backup.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rdiff-backup.patch  22 Jul 2005 05:29:12 -  1.4
+++ rdiff-backup.patch  16 Aug 2005 04:01:51 -  1.5
@@ -14,29 +14,3 @@
 -   ['CHANGELOG', 'COPYING', 'README', 
'FAQ.html'])])
 -
 +data_files = [('share/man/man1', ['rdiff-backup.1'])])
-
-# Patch from http://savannah.nongnu.org/bugs/?func=detailitem&item_id=12949 .
-
 rdiff-backup-0.13.6-orig/rdiff_backup/fs_abilities.py.orig 2005-05-31 
11:58:36.0 -0400
-+++ rdiff-backup-0.13.6/rdiff_backup/fs_abilities.py   2005-05-31 
14:45:32.0 -0400
-@@ -241,13 +241,15 @@
-   def supports_unusual_chars():
-   """Test handling of several chars sometimes not 
supported"""
-   for filename in [':', '\\', chr(175)]:
--  rp = subdir.append(filename)
--  try: rp.touch()
--  except IOError:
-+  try:
-+  rp = subdir.append(filename)
-+  rp.touch()
-+  except (IOError, OSError):
-   assert not rp.lstat()
-   return 0
--  assert rp.lstat()
--  rp.delete()
-+  else:
-+  assert rp.lstat()
-+  rp.delete()
-   return 1
- 
-   def sanity_check():

Index: rdiff-backup.info
===
RCS file: 
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils/rdiff-backup.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rdiff-backup.info   22 Jul 2005 05:29:12 -  1.5
+++ rdiff-backup.info   16 Aug 2005 04:01:51 -  1.6
@@ -1,6 +1,6 @@
 Package: rdiff-backup
-Version: 0.13.6
-Revision: 2
+Version: 1.0.0
+Revision: 1
 Description: Backup using mirrors and incrementals
 License: GPL
 Homepage: http://www.nongnu.org/rdiff-backup/
@@ -11,8 +11,8 @@
 Depends: python24, librsync-shlibs (>= 0.9.7-1)
 
 # Unpack Phase.
-Source: http://www.nongnu.org/%n/%n-%v.tar.gz
-Source-MD5: 97141e12bc8ac0ca873fae84b7f39ac1
+Source: http://savannah.nongnu.org/download/%n/%n-%v.tar.gz
+Source-MD5: bfd0cd4361a8c34423f12a69fdd31517
 
 # Patch Phase.
 Patch: %n.patch



---
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


dists/10.4-transitional/unstable/main/finkinfo/gnome pango1-xft2-ft219.patch,1.2,1.3 pango1-xft2.patch,1.2,1.3

2005-08-15 Thread Daniel Macks
Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/gnome
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13107/10.4-transitional/unstable/main/finkinfo/gnome

Modified Files:
pango1-xft2-ft219.patch pango1-xft2.patch 
Log Message:
Minor clean-ups.


Index: pango1-xft2.patch
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/gnome/pango1-xft2.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pango1-xft2.patch   19 Jun 2005 02:45:44 -  1.2
+++ pango1-xft2.patch   16 Aug 2005 02:07:35 -  1.3
@@ -6,14 +6,14 @@
  AUTOMAKE_OPTIONS = 1.7
  
 -SUBDIRS = pango modules examples docs tools tests
-+SUBDIRS = pango modules docs tools tests
++SUBDIRS = pango modules  docs tools tests
  
  EXTRA_DIST = \
pango.pc.in \
 diff -ruN pango-1.6.0-orig/ltmain.sh pango-1.6.0/ltmain.sh
 --- pango-1.6.0-orig/ltmain.sh 2004-12-31 01:47:39.0 -0800
 +++ pango-1.6.0/ltmain.sh  2004-12-31 01:47:52.0 -0800
-@@ -5266,10 +5266,10 @@
+@@ -5266,10 +5266,6 @@
  
  # Directory that this library needs to be installed in:
  libdir='$install_libdir'"
@@ -21,10 +21,6 @@
 -  $echo >> $output "\
 -relink_command=\"$relink_command\""
 -fi
-+#   if test "$installed" = no && test "$need_relink" = yes; then
-+# $echo >> $output "\
-+#relink_command=\"$relink_command\""
-+#   fi
done
fi
  

Index: pango1-xft2-ft219.patch
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/gnome/pango1-xft2-ft219.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pango1-xft2-ft219.patch 19 Jun 2005 02:45:44 -  1.2
+++ pango1-xft2-ft219.patch 16 Aug 2005 02:07:35 -  1.3
@@ -6,7 +6,7 @@
  AUTOMAKE_OPTIONS = 1.7
  
 -SUBDIRS = pango modules examples docs tools tests
-+SUBDIRS = pango modules docs tools tests
++SUBDIRS = pango modules  docs tools tests
  
  EXTRA_DIST = \
pango.pc.in \
@@ -56,7 +56,7 @@
 diff -ruN pango-1.6.0-orig/ltmain.sh pango-1.6.0/ltmain.sh
 --- pango-1.6.0-orig/ltmain.sh 2004-12-31 01:47:39.0 -0800
 +++ pango-1.6.0/ltmain.sh  2004-12-31 01:47:52.0 -0800
-@@ -5266,10 +5266,10 @@
+@@ -5266,10 +5266,6 @@
  
  # Directory that this library needs to be installed in:
  libdir='$install_libdir'"
@@ -64,10 +64,6 @@
 -  $echo >> $output "\
 -relink_command=\"$relink_command\""
 -fi
-+#   if test "$installed" = no && test "$need_relink" = yes; then
-+# $echo >> $output "\
-+#relink_command=\"$relink_command\""
-+#   fi
done
fi
  



---
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


dists/10.3/unstable/main/finkinfo/gnome pango1-xft2-ft219.patch,1.3,1.4 pango1-xft2.patch,1.9,1.10

2005-08-15 Thread Daniel Macks
Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13107/10.3/unstable/main/finkinfo/gnome

Modified Files:
pango1-xft2-ft219.patch pango1-xft2.patch 
Log Message:
Minor clean-ups.


Index: pango1-xft2.patch
===
RCS file: 
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/pango1-xft2.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- pango1-xft2.patch   7 Jun 2005 14:03:54 -   1.9
+++ pango1-xft2.patch   16 Aug 2005 02:07:35 -  1.10
@@ -6,14 +6,14 @@
  AUTOMAKE_OPTIONS = 1.7
  
 -SUBDIRS = pango modules examples docs tools tests
-+SUBDIRS = pango modules docs tools tests
++SUBDIRS = pango modules  docs tools tests
  
  EXTRA_DIST = \
pango.pc.in \
 diff -ruN pango-1.6.0-orig/ltmain.sh pango-1.6.0/ltmain.sh
 --- pango-1.6.0-orig/ltmain.sh 2004-12-31 01:47:39.0 -0800
 +++ pango-1.6.0/ltmain.sh  2004-12-31 01:47:52.0 -0800
-@@ -5266,10 +5266,10 @@
+@@ -5266,10 +5266,6 @@
  
  # Directory that this library needs to be installed in:
  libdir='$install_libdir'"
@@ -21,10 +21,6 @@
 -  $echo >> $output "\
 -relink_command=\"$relink_command\""
 -fi
-+#   if test "$installed" = no && test "$need_relink" = yes; then
-+# $echo >> $output "\
-+#relink_command=\"$relink_command\""
-+#   fi
done
fi
  

Index: pango1-xft2-ft219.patch
===
RCS file: 
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/pango1-xft2-ft219.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pango1-xft2-ft219.patch 7 Jun 2005 14:03:54 -   1.3
+++ pango1-xft2-ft219.patch 16 Aug 2005 02:07:35 -  1.4
@@ -6,7 +6,7 @@
  AUTOMAKE_OPTIONS = 1.7
  
 -SUBDIRS = pango modules examples docs tools tests
-+SUBDIRS = pango modules docs tools tests
++SUBDIRS = pango modules  docs tools tests
  
  EXTRA_DIST = \
pango.pc.in \
@@ -56,7 +56,7 @@
 diff -ruN pango-1.6.0-orig/ltmain.sh pango-1.6.0/ltmain.sh
 --- pango-1.6.0-orig/ltmain.sh 2004-12-31 01:47:39.0 -0800
 +++ pango-1.6.0/ltmain.sh  2004-12-31 01:47:52.0 -0800
-@@ -5266,10 +5266,10 @@
+@@ -5266,10 +5266,6 @@
  
  # Directory that this library needs to be installed in:
  libdir='$install_libdir'"
@@ -64,10 +64,6 @@
 -  $echo >> $output "\
 -relink_command=\"$relink_command\""
 -fi
-+#   if test "$installed" = no && test "$need_relink" = yes; then
-+# $echo >> $output "\
-+#relink_command=\"$relink_command\""
-+#   fi
done
fi
  



---
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


dists/10.3/unstable/main/finkinfo/sci xcircuit.info,1.19,1.20

2005-08-15 Thread Alexander Hansen
Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4893/sci

Modified Files:
xcircuit.info 
Log Message:
Good for 10.3


Index: xcircuit.info
===
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/xcircuit.info,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- xcircuit.info   27 Jul 2005 11:09:47 -  1.19
+++ xcircuit.info   16 Aug 2005 01:11:35 -  1.20
@@ -1,10 +1,10 @@
 Package: xcircuit
-Version: 3.3.29
+Version: 3.3.31
 Revision: 1
 Depends: x11, ghostscript, tcltk
 BuildDepends: m4, tcltk-dev, x11-dev
 Source: http://xcircuit.ece.jhu.edu/archive/%n-%v.tgz
-Source-MD5: 3e56eb544dc893c643c55fb8d61b6a6e
+Source-MD5: e65e01eacd2669ba4b4eaf2fdf98c7c3
 ConfigureParams: --with-gnu-ld --mandir=%p/share/man
 SetCFLAGS: -I/usr/X11R6/include -fno-common
 # Patch: %n.patch



---
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


scripts/installer/dmg/faq faq.en.html,1.57,1.58

2005-08-15 Thread Alexander Hansen
Update of /cvsroot/fink/scripts/installer/dmg/faq
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8490/scripts/installer/dmg/faq

Modified Files:
faq.en.html 
Log Message:

FAQ update


Index: faq.en.html
===
RCS file: /cvsroot/fink/scripts/installer/dmg/faq/faq.en.html,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- faq.en.html 13 Aug 2005 17:20:49 -  1.57
+++ faq.en.html 15 Aug 2005 21:06:09 -  1.58
@@ -686,6 +686,7 @@
 # Official binary distribution: download location for updated
 # packages built between releases
 deb http://bindist.finkmirrors.net/bindist 10.3/current main crypto
+(The above of course assumes you're on 10.3.  If you're on a different OS 
replace 10.3 with what your current 
distribution is.
 Then save your work and quit the editor.  Now update your binary package 
list again.
 
 
@@ -1487,4 +1488,4 @@
 provided the document and this copyright notice remain complete and
 unmodified. Any commercial reproduction and any online publication
 requires the explicit consent of the author.
-Generated from $Fink: faq.en.xml,v 1.56 2005/08/13 17:19:12 alexkhansen 
Exp $
+Generated from $Fink: faq.en.xml,v 1.57 2005/08/15 21:03:45 alexkhansen 
Exp $



---
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


web/faq comp-general.en.php,1.55,1.56 comp-packages.en.php,1.54,1.55 faq.en.html,1.59,1.60 general.en.php,1.53,1.54 index.en.php,1.58,1.59 mirrors.en.php,1.53,1.54 relations.en.php,1.53,1.54 upgrade-f

2005-08-15 Thread Alexander Hansen
Update of /cvsroot/fink/web/faq
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8490/web/faq

Modified Files:
comp-general.en.php comp-packages.en.php faq.en.html 
general.en.php index.en.php mirrors.en.php relations.en.php 
upgrade-fink.en.php usage-fink.en.php usage-general.en.php 
usage-packages.en.php 
Log Message:

FAQ update


Index: usage-general.en.php
===
RCS file: /cvsroot/fink/web/faq/usage-general.en.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- usage-general.en.php13 Aug 2005 17:20:50 -  1.54
+++ usage-general.en.php15 Aug 2005 21:06:09 -  1.55
@@ -1,7 +1,7 @@
 ';
 
 

Index: usage-fink.en.php
===
RCS file: /cvsroot/fink/web/faq/usage-fink.en.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- usage-fink.en.php   13 Aug 2005 17:20:50 -  1.54
+++ usage-fink.en.php   15 Aug 2005 21:06:09 -  1.55
@@ -1,7 +1,7 @@
 ';
 
 
@@ -498,6 +498,7 @@
 # Official binary distribution: download location for updated
 # packages built between releases
 deb http://bindist.finkmirrors.net/bindist 10.3/current main crypto
+(The above of course assumes you're on 10.3.  If you're on a different OS 
replace 10.3 with what your current distribution is.
 Then save your work and quit the editor.  Now update your binary package 
list again.
 
 

Index: mirrors.en.php
===
RCS file: /cvsroot/fink/web/faq/mirrors.en.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- mirrors.en.php  13 Aug 2005 17:20:50 -  1.53
+++ mirrors.en.php  15 Aug 2005 21:06:09 -  1.54
@@ -1,7 +1,7 @@
 ';
 
 

Index: upgrade-fink.en.php
===
RCS file: /cvsroot/fink/web/faq/upgrade-fink.en.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- upgrade-fink.en.php 13 Aug 2005 17:20:50 -  1.53
+++ upgrade-fink.en.php 15 Aug 2005 21:06:09 -  1.54
@@ -1,7 +1,7 @@
 ';
 
 

Index: index.en.php
===
RCS file: /cvsroot/fink/web/faq/index.en.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- index.en.php13 Aug 2005 17:20:50 -  1.58
+++ index.en.php15 Aug 2005 21:06:09 -  1.59
@@ -1,7 +1,7 @@
 ';
 
 
@@ -76,7 +76,7 @@
 gnome-session won't open a window manager.9.10 I upgraded to 
Apple's X11 in Panther and now my window title bars
 are missing.9.11 I installed 
Apple's X11 but Fink keeps asking to install
 XFree86 or X.org.9.12 I switched 
from the 10.2 Fink version to 10.2-gcc3.3 or 10.3, I have Apple's X11, and Fink 
asks me to install XFree86 or X.org.9.13 I'm still having 
problems with X11 and Fink.9.14 After updating to Tiger (OS 
10.4), whenever I use a GTK app, I get errors involving 
_EVP_idea_cbc.
-
+
 
 
 

Index: relations.en.php
===
RCS file: /cvsroot/fink/web/faq/relations.en.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- relations.en.php13 Aug 2005 17:20:50 -  1.53
+++ relations.en.php15 Aug 2005 21:06:09 -  1.54
@@ -1,7 +1,7 @@
 ';
 
 

Index: comp-packages.en.php
===
RCS file: /cvsroot/fink/web/faq/comp-packages.en.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- comp-packages.en.php13 Aug 2005 17:20:50 -  1.54
+++ comp-packages.en.php15 Aug 2005 21:06:09 -  1.55
@@ -1,7 +1,7 @@
 ';
 
 

Index: comp-general.en.php
===
RCS file: /cvsroot/fink/web/faq/comp-general.en.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- comp-general.en.php 13 Aug 2005 17:20:50 -  1.55
+++ comp-general.en.php 15 Aug 2005 21:06:09 -  1.56
@@ -1,7 +1,7 @@
 ';
 
 

Index: faq.en.html
===
RCS file: /cvsroot/fink/web/faq/faq.en.html,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- faq.en.html 13 Aug 2005 17:20:50 -  1.59
+++ faq.en.html 15 Aug 2005 21:06:09 -  1.60
@@ -686,6 +686,7 @@
 # Official binary distribution: download location for updated
 # packages built between releases
 deb http://bindist.finkmirrors.net/bindist 10.3/current main crypto
+(The above of course assumes you're on 10.3.  If you're on a different OS 
replace 10.3 with what your current 
distribution is.
 Then save your work and quit the editor.  Now update your 

web/xml/faq faq.en.xml,1.56,1.57

2005-08-15 Thread Alexander Hansen
Update of /cvsroot/fink/web/xml/faq
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7648

Modified Files:
faq.en.xml 
Log Message:

Reduce prospects for cut-paste problems from "Error 403" FAQ


Index: faq.en.xml
===
RCS file: /cvsroot/fink/web/xml/faq/faq.en.xml,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- faq.en.xml  13 Aug 2005 17:19:12 -  1.56
+++ faq.en.xml  15 Aug 2005 21:03:45 -  1.57
@@ -960,6 +960,7 @@
 # Official binary distribution: download location for updated
 # packages built between releases
 deb http://bindist.finkmirrors.net/bindist 10.3/current main crypto
+(The above of course assumes you're on 10.3.  If you're on a different OS 
replace 10.3 with what your current distribution is.
 Then save your work and quit the editor.  Now update your binary package 
list again.
 
 



---
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


fink ChangeLog,1.304.2.25,1.304.2.26 VERSION,1.79.2.8,1.79.2.9

2005-08-15 Thread David R. Morrison
Update of /cvsroot/fink/fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22403

Modified Files:
  Tag: branch_0_24
ChangeLog VERSION 
Log Message:
releasing 0.24.9


Index: VERSION
===
RCS file: /cvsroot/fink/fink/VERSION,v
retrieving revision 1.79.2.8
retrieving revision 1.79.2.9
diff -u -d -r1.79.2.8 -r1.79.2.9
--- VERSION 28 Jul 2005 19:37:39 -  1.79.2.8
+++ VERSION 15 Aug 2005 17:41:27 -  1.79.2.9
@@ -1 +1 @@
-0.24.8.cvs
+0.24.9.cvs

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/ChangeLog,v
retrieving revision 1.304.2.25
retrieving revision 1.304.2.26
diff -u -d -r1.304.2.25 -r1.304.2.26
--- ChangeLog   28 Jul 2005 19:37:39 -  1.304.2.25
+++ ChangeLog   15 Aug 2005 17:41:27 -  1.304.2.26
@@ -1,3 +1,8 @@
+2005-08-15  Dave Morrison  <[EMAIL PROTECTED]>
+
+   * VERSION: Bumped package manager version to 0.24.9, a release
+   on branch_0_24
+
 2005-07-28  Dave Vasilevsky  <[EMAIL PROTECTED]>
 
* VERSION: Bumped package manager version to 0.24.8, a release



---
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


fink/10.4-transitional ChangeLog,1.1.4.1,1.1.4.2 base-files.info,1.1.4.2,1.1.4.3 fink-mirrors.info,1.1.4.2,1.1.4.3

2005-08-15 Thread David R. Morrison
Update of /cvsroot/fink/fink/10.4-transitional
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14216

Modified Files:
  Tag: branch_0_24
ChangeLog base-files.info fink-mirrors.info 
Log Message:
new version


Index: fink-mirrors.info
===
RCS file: /cvsroot/fink/fink/10.4-transitional/fink-mirrors.info,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- fink-mirrors.info   28 Apr 2005 10:19:49 -  1.1.4.2
+++ fink-mirrors.info   15 Aug 2005 17:13:28 -  1.1.4.3
@@ -1,9 +1,9 @@
 Package: fink-mirrors
-Version: 0.24.4.1
+Version: 0.24.8.1
 Revision: 1
 Essential: yes
 Source: mirror:custom:fink/%n-%v.tar.gz
-Source-MD5: 1496ac9bf8efee017ece2a81d504cd11
+Source-MD5: ec354141dade6a5fe9e58f1f65caa4fc
 Depends: fink (>= 0.17.3-1)
 Replaces: fink (<< 0.17.2-1)
 CompileScript:  sed -e "s|@PREFIX@|%p|g" < postinstall.pl.in > postinstall.pl

Index: base-files.info
===
RCS file: /cvsroot/fink/fink/10.4-transitional/base-files.info,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- base-files.info 6 Aug 2005 15:02:50 -   1.1.4.2
+++ base-files.info 15 Aug 2005 17:13:28 -  1.1.4.3
@@ -1,9 +1,9 @@
 Package: base-files
-Version: 1.9.6
+Version: 1.9.7
 Revision: 1
 Source: mirror:custom:fink/%n-%v.tar.gz
 Essential: yes
-Source-MD5: 53953588cf8d2072ab8bb7ab470808e7
+Source-MD5: 9b02cdb4e052e3dbd280f5ec36590816
 CompileScript: ./setup.sh %p
 InstallScript: ./install.sh %i
 #

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/10.4-transitional/ChangeLog,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- ChangeLog   12 Jul 2005 01:29:15 -  1.1.4.1
+++ ChangeLog   15 Aug 2005 17:13:28 -  1.1.4.2
@@ -1,3 +1,7 @@
+2005-08-15  Dave Morrison  <[EMAIL PROTECTED]>
+
+   * base-files.info, fink-mirrors.info: new versions
+
 2005-07-11  Dave Vasilevsky  <[EMAIL PROTECTED]>
 
* apt.info, apt.patch, cctools-extra.info, dpkg-bootstrap.info, 
dpkg.info,



---
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


fink/10.3 ChangeLog,1.17.2.4,1.17.2.5 base-files.info,1.6.4.2,1.6.4.3 fink-mirrors.info,1.5.6.1,1.5.6.2

2005-08-15 Thread David R. Morrison
Update of /cvsroot/fink/fink/10.3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14116

Modified Files:
  Tag: branch_0_24
ChangeLog base-files.info fink-mirrors.info 
Log Message:
new version


Index: fink-mirrors.info
===
RCS file: /cvsroot/fink/fink/10.3/fink-mirrors.info,v
retrieving revision 1.5.6.1
retrieving revision 1.5.6.2
diff -u -d -r1.5.6.1 -r1.5.6.2
--- fink-mirrors.info   14 Jul 2005 02:07:03 -  1.5.6.1
+++ fink-mirrors.info   15 Aug 2005 17:12:51 -  1.5.6.2
@@ -1,9 +1,9 @@
 Package: fink-mirrors
-Version: 0.24.4.1
+Version: 0.24.8.1
 Revision: 1
 Essential: yes
 Source: mirror:custom:fink/%n-%v.tar.gz
-Source-MD5: 1496ac9bf8efee017ece2a81d504cd11
+Source-MD5: ec354141dade6a5fe9e58f1f65caa4fc
 Depends: fink (>= 0.17.3-1)
 Replaces: fink (<< 0.17.2-1)
 CompileScript:  sed -e "s|@PREFIX@|%p|g" < postinstall.pl.in > postinstall.pl

Index: base-files.info
===
RCS file: /cvsroot/fink/fink/10.3/base-files.info,v
retrieving revision 1.6.4.2
retrieving revision 1.6.4.3
diff -u -d -r1.6.4.2 -r1.6.4.3
--- base-files.info 6 Aug 2005 15:02:49 -   1.6.4.2
+++ base-files.info 15 Aug 2005 17:12:51 -  1.6.4.3
@@ -1,9 +1,9 @@
 Package: base-files
-Version: 1.9.6
+Version: 1.9.7
 Revision: 1
 Source: mirror:custom:fink/%n-%v.tar.gz
 Essential: yes
-Source-MD5: 53953588cf8d2072ab8bb7ab470808e7
+Source-MD5: 9b02cdb4e052e3dbd280f5ec36590816
 CompileScript: ./setup.sh %p
 InstallScript: ./install.sh %i
 #

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/10.3/ChangeLog,v
retrieving revision 1.17.2.4
retrieving revision 1.17.2.5
diff -u -d -r1.17.2.4 -r1.17.2.5
--- ChangeLog   22 Jul 2005 04:02:11 -  1.17.2.4
+++ ChangeLog   15 Aug 2005 17:12:51 -  1.17.2.5
@@ -1,3 +1,7 @@
+2005-08-15  Dave Morrison  <[EMAIL PROTECTED]>
+
+   * base-files.info, fink-mirrors.info: new versions
+
 2005-07-22  Daniel Macks  <[EMAIL PROTECTED]>
 
* cctools-extra.info: No gcc3.3 needed



---
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


fink/10.3 ChangeLog,1.26,1.27 base-files.info,1.9,1.10 fink-mirrors.info,1.7,1.8

2005-08-15 Thread David R. Morrison
Update of /cvsroot/fink/fink/10.3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13443

Modified Files:
ChangeLog base-files.info fink-mirrors.info 
Log Message:
new version


Index: fink-mirrors.info
===
RCS file: /cvsroot/fink/fink/10.3/fink-mirrors.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- fink-mirrors.info   1 Jul 2005 05:06:31 -   1.7
+++ fink-mirrors.info   15 Aug 2005 17:11:03 -  1.8
@@ -1,11 +1,10 @@
 Package: fink-mirrors
-Version: 0.24.4.1
+Version: 0.24.8.1
 Revision: 1
 Essential: yes
 Source: mirror:custom:fink/%n-%v.tar.gz
-Source-MD5: 1496ac9bf8efee017ece2a81d504cd11
+Source-MD5: ec354141dade6a5fe9e58f1f65caa4fc
 Depends: fink (>= 0.17.3-1)
-AddShlibDeps: true
 Replaces: fink (<< 0.17.2-1)
 CompileScript:  sed -e "s|@PREFIX@|%p|g" < postinstall.pl.in > postinstall.pl
 InstallScript: ./install.sh %i

Index: base-files.info
===
RCS file: /cvsroot/fink/fink/10.3/base-files.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- base-files.info 6 Aug 2005 15:01:59 -   1.9
+++ base-files.info 15 Aug 2005 17:11:03 -  1.10
@@ -1,9 +1,9 @@
 Package: base-files
-Version: 1.9.6
+Version: 1.9.7
 Revision: 1
 Source: mirror:custom:fink/%n-%v.tar.gz
 Essential: yes
-Source-MD5: 53953588cf8d2072ab8bb7ab470808e7
+Source-MD5: 9b02cdb4e052e3dbd280f5ec36590816
 CompileScript: ./setup.sh %p
 InstallScript: ./install.sh %i
 #

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/10.3/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- ChangeLog   22 Jul 2005 03:59:14 -  1.26
+++ ChangeLog   15 Aug 2005 17:11:03 -  1.27
@@ -1,3 +1,7 @@
+2005-08-15  Dave Morrison  <[EMAIL PROTECTED]>
+
+   * base-files.info, fink-mirrors.info: new versions
+
 2005-07-21  Daniel Macks  <[EMAIL PROTECTED]>
 
* cctools-extra.info: no gcc-3.3 so no BDep:gcc3.3



---
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


fink/10.4-transitional ChangeLog,1.3,1.4 base-files.info,1.3,1.4 fink-mirrors.info,1.2,1.3

2005-08-15 Thread David R. Morrison
Update of /cvsroot/fink/fink/10.4-transitional
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13931

Modified Files:
ChangeLog base-files.info fink-mirrors.info 
Log Message:
new version


Index: fink-mirrors.info
===
RCS file: /cvsroot/fink/fink/10.4-transitional/fink-mirrors.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fink-mirrors.info   28 Apr 2005 09:52:20 -  1.2
+++ fink-mirrors.info   15 Aug 2005 17:11:40 -  1.3
@@ -1,9 +1,9 @@
 Package: fink-mirrors
-Version: 0.24.4.1
+Version: 0.24.8.1
 Revision: 1
 Essential: yes
 Source: mirror:custom:fink/%n-%v.tar.gz
-Source-MD5: 1496ac9bf8efee017ece2a81d504cd11
+Source-MD5: ec354141dade6a5fe9e58f1f65caa4fc
 Depends: fink (>= 0.17.3-1)
 Replaces: fink (<< 0.17.2-1)
 CompileScript:  sed -e "s|@PREFIX@|%p|g" < postinstall.pl.in > postinstall.pl

Index: base-files.info
===
RCS file: /cvsroot/fink/fink/10.4-transitional/base-files.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- base-files.info 6 Aug 2005 15:01:59 -   1.3
+++ base-files.info 15 Aug 2005 17:11:40 -  1.4
@@ -1,9 +1,9 @@
 Package: base-files
-Version: 1.9.6
+Version: 1.9.7
 Revision: 1
 Source: mirror:custom:fink/%n-%v.tar.gz
 Essential: yes
-Source-MD5: 53953588cf8d2072ab8bb7ab470808e7
+Source-MD5: 9b02cdb4e052e3dbd280f5ec36590816
 CompileScript: ./setup.sh %p
 InstallScript: ./install.sh %i
 #

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/10.4-transitional/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ChangeLog   5 Jul 2005 15:14:44 -   1.3
+++ ChangeLog   15 Aug 2005 17:11:40 -  1.4
@@ -1,3 +1,7 @@
+2005-08-15  Dave Morrison  <[EMAIL PROTECTED]>
+
+   * base-files.info, fink-mirrors.info: new versions
+
 2005-07-05  Peter O'Gorman  <[EMAIL PROTECTED]>
 
* dpkg.info, dpkg.patch, dpkg-bootstrap.info, gettext.info,



---
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


experimental/asari openoffice.org.info,1.12,1.13 openoffice.org.patch,1.9,1.10

2005-08-15 Thread ASARI Takashi
Update of /cvsroot/fink/experimental/asari
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24979

Modified Files:
openoffice.org.info openoffice.org.patch 
Log Message:
Applied the patches from OOo IssueZilla

Index: openoffice.org.patch
===
RCS file: /cvsroot/fink/experimental/asari/openoffice.org.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- openoffice.org.patch15 Aug 2005 09:07:13 -  1.9
+++ openoffice.org.patch15 Aug 2005 16:01:36 -  1.10
@@ -1,4 +1,4 @@
-### scp2 patches to use correct libxml
+### scp2 patches to use correct system libxml
 Index: scp2/source/base/file_base.scp
 ===
 RCS file: /cvs/installation/scp2/source/base/file_base.scp,v
@@ -346,3 +346,407 @@
   AC_MSG_CHECKING(portaudio version)
   AC_LANG(C)
   AC_TRY_LINK([#include ], [
+
+
+### patches to detect locale correctly; IsuueZilla #25416
+### compile fails
+
+
+### patch to remove unwanted symlinks of python; IssueZilla #46314
+Index: shellscripts_pyuno.txt
+===
+RCS file: 
/cvs/installation/instsetoo_native/inc_openoffice/unix/shellscripts_pyuno.txt,v
+retrieving revision 1.5
+diff -c -r1.5 shellscripts_pyuno.txt
+*** instsetoo_native/inc_openoffice/unix/shellscripts_pyuno.txt11 Feb 
2005 16:51:58 -  1.5
+--- shellscripts_pyuno.txt 17 Jul 2005 11:37:03 -
+***
+*** 59,63 
+--- 59,74 
+;;
+  esac
+  
++ if [ -h $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core ]
++ then
++   rm -f $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core 
>/dev/null 2>&1
++ fi
++ 
++ if [ -h $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python ]
++ then
++   rm -f $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python 
>/dev/null 2>&1
++ fi
++ 
++ 
+  exit 0
+  END
+
+
+### patches for enabling the use of a scanner on Mac OSX; IssueZilla #48285
+--- extensions/source/scanner/sane.cxx 2003-04-17 17:14:24.0 +0200
 sane_new.cxx   2005-07-15 17:36:55.0 +0200
+@@ -213,12 +213,22 @@
+ 
+ void Sane::Init()
+ {
++#ifdef MACOSX
++  pSaneLib = dlopen( "libsane.dylib", RTLD_LAZY );
++if( ! pSaneLib )
++pSaneLib = dlopen( "libsane.dylib.1", RTLD_LAZY );
++  // try reasonable places that might not be in the library search path
++  if( ! pSaneLib )
++  pSaneLib = dlopen( "/usr/local/lib/libsane.dylib", RTLD_LAZY );
++#else
+   pSaneLib = dlopen( "libsane.so", RTLD_LAZY );
+-if( ! pSaneLib )
+-pSaneLib = dlopen( "libsane.so.1", RTLD_LAZY );
++   if( ! pSaneLib )
++   pSaneLib = dlopen( "libsane.so.1", RTLD_LAZY );
+   // try reasonable places that might not be in the library search path
+   if( ! pSaneLib )
+   pSaneLib = dlopen( "/usr/local/lib/libsane.so", RTLD_LAZY );
++#endif
++
+   if( pSaneLib )
+   {
+   bSaneSymbolLoadFailed = FALSE;
+@@ -268,7 +278,11 @@
+   }
+ #if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL
+   else
++#ifdef MACOSX
++  fprintf( stderr, "libsane.dylib could not be opened: %s\n",
++#else
+   fprintf( stderr, "libsane.so could not be opened: %s\n",
++#endif
+dlerror() );
+ #endif
+ }
+
+
+### patches to fix incorrect UI language detection on Mac OS X; IssueZilla 
#51246
+--- shell/source/backends/localebe/localebackend.cxx   Fri Oct 22 18:16:56 2004
 localebackend.cxx.new  Fri Jun 24 07:53:16 2005
+@@ -76,9 +76,9 @@
+ 
+ #include 
+ 
+-#ifdef UNX
+-#include 
++#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || 
defined(FREEBSD)
+ 
++#include 
+ #include 
+ #include 
+ 
+@@ -126,8 +126,105 @@
+ return aLocaleBuffer.makeStringAndClear();
+ }
+ 
+-#endif // UNX
++#elif defined(MACOSX) 
+ 
++#include 
++#include 
++#include 
++
++#include 
++#include 
++#include 
++#include 
++
++namespace /* private */
++{
++
++  void OUStringBufferAppendCFString(rtl::OUStringBuffer& buffer, const 
CFStringRef s)
++  {
++  CFIndex lstr = CFStringGetLength(s);
++  for (CFIndex i = 0; i < lstr; i++)
++  buffer.append(CFStringGetCharacterAtIndex(s, i));
++  }
++
++  template 
++  class CFGuard
++  {
++  public:
++  explicit CFGuard(T* pT) : pT_(pT) {}
++  ~CFGuard() { if (pT_) CFRelease(*pT_); }
++  private:
++  T* pT_;
++  };
++
++  typedef CFGuard CFArrayGuard;
++  typedef CFGuard CFStringGuard;
++  typedef CFGuard CFTypeRefGuard;
++
++  /* For more information on the Apple locale concept please refer to 
++  
http://developer.apple.com/documentation/CoreFoundation/Conceptual/CFLocales/Articles/CFLocaleC

dists/10.4-transitional/unstable/main/finkinfo/base fink-mirrors.info,1.1,1.2

2005-08-15 Thread David R. Morrison
Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11231

Modified Files:
fink-mirrors.info 
Log Message:
new version


Index: fink-mirrors.info
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/base/fink-mirrors.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fink-mirrors.info   27 Apr 2005 03:25:28 -  1.1
+++ fink-mirrors.info   15 Aug 2005 17:06:43 -  1.2
@@ -1,9 +1,9 @@
 Package: fink-mirrors
-Version: 0.24.4.1
+Version: 0.24.8.1
 Revision: 1
 Essential: yes
 Source: mirror:custom:fink/%n-%v.tar.gz
-Source-MD5: 1496ac9bf8efee017ece2a81d504cd11
+Source-MD5: ec354141dade6a5fe9e58f1f65caa4fc
 Depends: fink (>= 0.17.3-1)
 Replaces: fink (<< 0.17.2-1)
 CompileScript:  sed -e "s|@PREFIX@|%p|g" < postinstall.pl.in > postinstall.pl



---
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


dists/10.3/unstable/main/finkinfo/base fink-mirrors.info,1.12,1.13

2005-08-15 Thread David R. Morrison
Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10929

Modified Files:
fink-mirrors.info 
Log Message:
new version


Index: fink-mirrors.info
===
RCS file: 
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/base/fink-mirrors.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- fink-mirrors.info   23 Apr 2005 12:44:59 -  1.12
+++ fink-mirrors.info   15 Aug 2005 17:06:16 -  1.13
@@ -1,9 +1,9 @@
 Package: fink-mirrors
-Version: 0.24.4.1
+Version: 0.24.8.1
 Revision: 1
 Essential: yes
 Source: mirror:custom:fink/%n-%v.tar.gz
-Source-MD5: 1496ac9bf8efee017ece2a81d504cd11
+Source-MD5: ec354141dade6a5fe9e58f1f65caa4fc
 Depends: fink (>= 0.17.3-1)
 Replaces: fink (<< 0.17.2-1)
 CompileScript:  sed -e "s|@PREFIX@|%p|g" < postinstall.pl.in > postinstall.pl



---
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


dists/10.4-transitional/unstable/main/finkinfo/sci mosflm.info,NONE,1.1

2005-08-15 Thread William Scott
Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3432

Added Files:
mosflm.info 
Log Message:
mosflm default display version, program version update, 10.4 unst sci

--- NEW FILE: mosflm.info ---
Package: mosflm
Version: 6.2.5
Revision: 1
#Type: nosource  
Source: 
http://www.mrc-lmb.cam.ac.uk/harry/mosflm/ver625/build-it-yourself/mosflm625.tgz
#
SourceDirectory: mosflm625
# NoSourceDirectory: true
Source-MD5: 08c0730fa588d71bed219a7763322672 
Depends: x11, ccp4, ccp4lib, libjpeg-shlibs, ccp4lib-shlibs
#Replaces: mosflm
BuildDepends: g77, ccp4, x11, libjpeg, ccp4lib-shlibs, ccp4lib
PatchScript: <<
#!/bin/zsh -f
print $PWD
perl -pi.bak -e 's|-lcc_dynamic||g' setup
#cp -R $CCP4/x-windows/Mosflm .
<<
CompileScript: << 
#!/bin/zsh -f
#cd Mosflm
print $PWD
#make clean
#mv bin/ipmosflm bin/ipmosflm-big
#./to_small.csh
#make
./build
cd bin
mv ipmosflm ipmosflm-625
<<
InstallScript: <<
#!/bin/zsh -f
 mkdir -p %i/bin
 cd bin
 cp ipmosflm-* %i/bin/.
 cp ipmosflm-* %i/bin/ipmosflm
 cp ipmosflm-* %i/bin/mosflm
<<
Description: X-ray data processing, default display version
DescDetail: <<
Mosflm is a program for integrating single crystal diffraction data 
from area detectors. It is assumed that the experiment was conducted
using the Arndt-Wonacott oscillation method, and also that 
monochromatic radiation was used.
Mosflm can process data from a wide variety of modern area 
detectors, e.g. from Mar Research, Rigaku/MSC, ADSC, DIP etc.

Invoke with "ipmosflm" or "ipmosflm-625" or "mosflm"

Authors:  
Harry Powell and 
Andrew G.W. Leslie
MRC Laboratory of Molecular Biology
Hills Road,
Cambridge CB2 2QH
UK
E-mail: harry AT mrc-lmb DOT cam DOT ac DOT uk
http://www.mrc-lmb.cam.ac.uk/harry/frames/
<<
License: GPL
Maintainer: W. G. Scott <[EMAIL PROTECTED]> 



---
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


dists/10.4-transitional/unstable/main/finkinfo/sci mosflm-small.info,1.1,1.2

2005-08-15 Thread William Scott
Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3095

Modified Files:
mosflm-small.info 
Log Message:
mosflm small display version, program version update, 10.4 unst sci

Index: mosflm-small.info
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci/mosflm-small.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mosflm-small.info   24 Jun 2005 19:31:46 -  1.1
+++ mosflm-small.info   15 Aug 2005 16:39:15 -  1.2
@@ -1,35 +1,37 @@
 Package: mosflm-small
-Version: 6.2.4
+Version: 6.2.5
 Revision: 1
-Type: nosource  
-#Source: 
http://www.mrc-lmb.cam.ac.uk/harry/mosflm/ver622/build-it-yourself/mosflm622.tgz
+#Type: nosource  
+Source: 
http://www.mrc-lmb.cam.ac.uk/harry/mosflm/ver625/build-it-yourself/mosflm625.tgz
 #
-# SourceDirectory: mosflm624
-NoSourceDirectory: true
-# Source-MD5: 857ee0e0ba94e29e633d2f2accd7e9cb 
+SourceDirectory: mosflm625
+# NoSourceDirectory: true
+Source-MD5: 08c0730fa588d71bed219a7763322672 
 Depends: x11, ccp4, ccp4lib, libjpeg-shlibs, ccp4lib-shlibs
 #Replaces: mosflm
 BuildDepends: g77, ccp4, x11, libjpeg, ccp4lib-shlibs, ccp4lib
 PatchScript: <<
 #!/bin/zsh -f
 print $PWD
-cp -R $CCP4/x-windows/Mosflm .
+perl -pi.bak -e 's|-lcc_dynamic||g' setup
+#cp -R $CCP4/x-windows/Mosflm .
 <<
 CompileScript: << 
 #!/bin/zsh -f
-cd Mosflm
+#cd Mosflm
 print $PWD
-make clean
+#make clean
 mv bin/ipmosflm bin/ipmosflm-big
 ./to_small.csh
-make
+#make
+./build
 cd bin
 mv ipmosflm ipmosflm-small
 <<
 InstallScript: <<
 #!/bin/zsh -f
  mkdir -p %i/bin
- cd Mosflm/bin
+ cd bin
  cp ipmosflm-* %i/bin
 <<
 Description: X-ray data processing, small display version
@@ -43,8 +45,8 @@
 
 This small display version is suitable for laptops and 
 lower-resolution monitors.  The large version is included in CCP4 by
-default and is not available separately.  The small version requires
-ccp4 to be installed.
+default and the latest version is in the mosflm fink
+package.  
 
 Invoke with "ipmosflm-small"
 



---
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


experimental/asari openoffice.org.info,1.11,1.12 openoffice.org.patch,1.8,1.9

2005-08-15 Thread ASARI Takashi
Update of /cvsroot/fink/experimental/asari
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11257

Modified Files:
openoffice.org.info openoffice.org.patch 
Log Message:
Version bumped. Now OOo build needs autoconf

Index: openoffice.org.patch
===
RCS file: /cvsroot/fink/experimental/asari/openoffice.org.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- openoffice.org.patch14 Aug 2005 10:07:59 -  1.8
+++ openoffice.org.patch15 Aug 2005 09:07:13 -  1.9
@@ -1,90 +1,4 @@
-diff -ur package/inc/ZipPackageFolder.hxx package_new/inc/ZipPackageFolder.hxx
 package/inc/ZipPackageFolder.hxx   2005-07-12 14:28:10.0 +0200
-+++ package_new/inc/ZipPackageFolder.hxx   2005-07-14 17:30:52.0 
+0200
-@@ -121,7 +121,7 @@
-   }
- 
-   void setPackageFormat_Impl( sal_Bool bPackageFormat ) { 
m_bPackageFormat = bPackageFormat; }
--  void setRemoveOnInsertMode_Impl( sal_Bool bRemove ) { 
ZipPackageEntry::mbAllowRemoveOnInsert = bRemove; }
-+  void setRemoveOnInsertMode_Impl( sal_Bool bRemove ) { 
this->mbAllowRemoveOnInsert = bRemove; }
- 
-   // Recursive functions
-   void  saveContents(rtl::OUString &rPath, std::vector < 
com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > > 
&rManList, ZipOutputStream & rZipOut, com::sun::star::uno::Sequence < sal_Int8 
> &rEncryptionKey, rtlRandomPool & rRandomPool)
-diff -ur package/source/zippackage/ZipPackageFolder.cxx 
package_new/source/zippackage/ZipPackageFolder.cxx
 package/source/zippackage/ZipPackageFolder.cxx 2005-07-12 
14:31:33.0 +0200
-+++ package_new/source/zippackage/ZipPackageFolder.cxx 2005-07-14 
17:31:14.0 +0200
-@@ -128,7 +128,7 @@
- {
-   OSL_ENSURE( m_xFactory.is(), "No factory is provided to the package 
folder!" );
- 
--  ZipPackageEntry::mbAllowRemoveOnInsert = bAllowRemoveOnInsert;
-+  this->mbAllowRemoveOnInsert = bAllowRemoveOnInsert;
- 
-   SetFolder ( sal_True );
-   aEntry.nVersion = -1;
-diff -ur package/source/zippackage/ZipPackageStream.cxx 
package_new/source/zippackage/ZipPackageStream.cxx
 package/source/zippackage/ZipPackageStream.cxx 2005-07-12 
14:31:48.0 +0200
-+++ package_new/source/zippackage/ZipPackageStream.cxx 2005-07-14 
17:32:10.0 +0200
-@@ -137,7 +137,7 @@
- { 
-   OSL_ENSURE( m_xFactory.is(), "No factory is provided to 
ZipPackageStream!\n" );
- 
--  ZipPackageEntry::mbAllowRemoveOnInsert = bAllowRemoveOnInsert;
-+  this->mbAllowRemoveOnInsert = bAllowRemoveOnInsert;
- 
-   SetFolder ( sal_False );
-   aEntry.nVersion = -1;
 config_office/configure2005-08-04 00:25:19.0 +0900
-+++ config_office/configure.fink   2005-08-04 09:22:19.0 +0900
-@@ -8099,7 +8099,7 @@
- ac_ext=cc
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS 
conftest.$ac_ext $LIBS >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS [EMAIL 
PROTECTED]@/lib conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
- fi
-@@ -9954,7 +9954,8 @@
-python_include=`$PYTHON -c "import distutils.sysconfig; print 
distutils.sysconfig.get_config_var('INCLUDEPY');"`
-python_version=`$PYTHON -c "import distutils.sysconfig; print 
distutils.sysconfig.get_config_var('VERSION');"`
-PYTHON_CFLAGS="-I$python_include"
--   PYTHON_LIBS="-lpython$python_version"
-+   PYTHON_LIBS=`$PYTHON -c "import distutils.sysconfig; print 
distutils.sysconfig.get_config_var('LIBPL');"`
-+   PYTHON_LIBS="-L$PYTHON_LIBS -lpython$python_version"
- 
-   save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
-@@ -13954,7 +13955,7 @@
-{ (exit 1); exit 1; }; } # Exit
-fi
-CFLAGS=$X_CFLAGS
--   LDFLAGS="$X_LDFLAGS $X_LIBS"
-+   LDFLAGS="[EMAIL PROTECTED]@/lib $X_LDFLAGS $X_LIBS"
-echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5
- echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
- if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
-@@ -15106,7 +15107,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lportaudio  $LIBS"
-+LIBS="-framework CoreAudio -framework AudioToolBox -lportaudio  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -15169,7 +15170,7 @@
- #define HAVE_LIBPORTAUDIO 1
- _ACEOF
- 
--  LIBS="-lportaudio $LIBS"
-+  LIBS="-framework CoreAudio -framework AudioToolBox -lportaudio $LIBS"
- 
- else
-   { { echo "$as_me:$LINENO: error: portaudio library not found or functional" 
>&5
-
-
-
+### scp2 patches to use correct libxml
 Index: scp2/source/base/file_base.scp
 ===
 RCS file: /cvs/installation/scp2/source/base/file_base.scp,v
@@