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

Modified Files:
      Tag: pangocairo-branch
        php5-10.5.info php5.info sip-py.info sip-py.patch sip.info 
Log Message:
rv majorly over-globbed commit:(


Index: sip-py.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/sip-py.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- sip-py.patch        15 Feb 2008 14:38:05 -0000      1.1.2.1
+++ sip-py.patch        15 Feb 2008 14:41:36 -0000      1.1.2.2
@@ -1,49 +1,13 @@
-diff -Nurd -x'*~' sip-4.7.3.orig/siputils.py sip-4.7.3/siputils.py
---- sip-4.7.3.orig/siputils.py 2007-12-06 09:15:09.000000000 -0500
-+++ sip-4.7.3/siputils.py      2008-01-31 19:40:40.000000000 -0500
-@@ -1086,7 +1086,7 @@
-         if self.generator == "UNIX":
-             dst = "$(DESTDIR)" + dst
- 
--        mfile.write("[EMAIL PROTECTED] %s " % (self.chkdir, _quote(dst)))
-+        mfile.write("\t%s %s " % (self.chkdir, _quote(dst)))
- 
-         if self.generator == "UNIX":
-             mfile.write("|| ")
-@@ -1168,14 +1168,7 @@
-         mfile.write("\n" + target + ":\n")
- 
-         for d in self._subdirs:
--            if self.generator == "MINGW":
--                mfile.write("[EMAIL PROTECTED](MAKE) -C %s%s\n" % (d, tname))
--            elif self.generator == "UNIX":
--                mfile.write("\t@(cd %s; $(MAKE)%s)\n" % (d, tname))
--            else:
--                mfile.write("\tcd %s\n" % d)
--                mfile.write("\t$(MAKE)%s\n" % tname)
--                mfile.write("[EMAIL PROTECTED] ..\n")
-+            mfile.write("\t$(MAKE) -C %s%s\n" % (d, tname))
- 
- 
- class PythonModuleMakefile(Makefile):
-@@ -1324,10 +1317,7 @@
-             # can handle extension modules that are bundles or dynamic
-             # libraries, but python.org versions need bundles (unless built
-             # with DYNLOADFILE=dynload_shlib.o).
--            if sys.platform == "darwin":
--                lflags_plugin = ["-bundle"]
--            else:
--                lflags_plugin = self.optional_list("LFLAGS_PLUGIN")
-+            lflags_plugin = self.optional_list("LFLAGS_PLUGIN")
- 
-             if not lflags_plugin:
-                 lflags_plugin = self.optional_list("LFLAGS_SHLIB")
-@@ -1336,7 +1326,7 @@
+--- sip/siputils.py.orig       Tue Nov  1 11:11:19 2005
++++ sip/siputils.py    Tue Nov  1 11:11:59 2005
+@@ -1040,8 +1040,8 @@
  
          self.LFLAGS.extend(self.optional_list(lflags_console))
  
 -        if sys.platform == "darwin":
-+        if 0:
-             # We use the -F flag to explictly specify the directory containing
-             # the Python framework rather than rely on the default search 
path.
-             # This allows Apple's Python to be used even if a later python.org
+-            self.LFLAGS.append("-framework Python")
++        #if sys.platform == "darwin":
++        #    self.LFLAGS.append("-framework Python")
+ 
+         Makefile.finalise(self)
+ 

Index: sip-py.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/sip-py.info,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -d -r1.4.2.3 -r1.4.2.4
--- sip-py.info 15 Feb 2008 14:38:05 -0000      1.4.2.3
+++ sip-py.info 15 Feb 2008 14:41:36 -0000      1.4.2.4
@@ -1,56 +1,35 @@
 Info2: <<
 
 Package: sip-py%type_pkg[python]
-Version: 4.7.3
-Revision: 1
+Version: 4.3.1
+Revision: 1006
 Distribution: (%type_pkg[python] = 23) 10.3, (%type_pkg[python] = 23) 10.4
-Type: python (2.3 2.4 2.5)
-
-Source: http://www.riverbankcomputing.com/Downloads/sip4/sip-%v.tar.gz
-Source-MD5: a792c58d4d211c65949dac6005eb652b
-
 GCC: 4.0
-Depends: qt3-shlibs (>= 3.3.8-1), python%type_pkg[python]
-BuildDepends: qt3 (>= 3.3.8-1), fink (>= 0.24.12-1)
-
+Maintainer: None <[EMAIL PROTECTED]>
+Source: http://www.river-bank.demon.co.uk/download/sip/sip-%v.tar.gz
+Source-MD5: c561d8dc19fbe3a8bffc4b10bd56910f
+Description: Create Python bindings for C and C++ Libs
+Depends: qt3-shlibs (>= 3.3.5-1023), python%type_pkg[python]
+BuildDepends: qt3 (>= 3.3.5-1023), fink (>= 0.24.12-1)
+Type: python (2.3 2.4)
 PatchFile: %{ni}.patch
-PatchFile-MD5: 893761acb60e6487b9491c4a053c19d2
-
+PatchFile-MD5: f6a3e8e453ec042b39b6be1a37905c98
 CompileScript: <<
-       %p/bin/python%type_raw[python] configure.py \
-               -p macx-g++ \
-               -v %p/share/sip-py%type_pkg[python] \
-               INCDIR_OPENGL=/usr/X11R6/include \
-               LFLAGS_PLUGIN="-bundle -undefined dynamic_lookup"
-       make
+%p/bin/python%type_raw[python] configure.py -p macx-g++ -b %i/bin -d 
%i/lib/python%type_raw[python]/site-packages -e 
%i/include/python%type_raw[python] -v %i/share/sip-py%type_pkg[python] 
INCDIR_QT=%p/include/qt INCDIR_OPENGL=/usr/X11R6/include LFLAGS_PLUGIN="-bundle 
-undefined dynamic_lookup"
+make
 <<
-
 InstallScript: <<
-       make install DESTDIR=%d
+make install
+perl -pi -e 's|%i|%p|g' 
%i/lib/python%type_raw[python]/site-packages/sipconfig.py
 <<
-DocFiles: ChangeLog LICENSE NEWS README
-
 SplitOff: <<
-       Package: %N-bin
-       Conflicts: <<
-               sip-py23-bin, sip-py24-bin, sip-py25-bin
-       <<
-       Replaces: <<
-               sip-py24 (<= 4.3.1-3), sip-py23 (<= 4.3.1-3), sip (<< 
4.3.1-1006),
-               sip-py23-bin, sip-py24-bin, sip-py25-bin
-       <<
-       Files: bin
-       DocFiles: ChangeLog LICENSE NEWS README
-       License: GPL
-<<
-
-DescPackaging: <<
-       Disable requirement of framework-built python on darwin.
-       Don't over-ride specs/ for plugin compiler flags on darwin.
+  Package: %N-bin
+  Replaces: sip-py24 (<= 4.3.1-3), sip-py23 (<= 4.3.1-3), sip (<< 4.3.1-1006)
+  Files: bin
+  DocFiles: ChangeLog LICENSE NEWS README
+  License: GPL
 <<
-Description: Create Python bindings for C and C++ Libs
-Homepage: http://www.riverbankcomputing.co.uk/sip
+DocFiles: ChangeLog LICENSE NEWS README
 License: GPL
-Maintainer: None <[EMAIL PROTECTED]>
 
 <<

Index: php5-10.5.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/php5-10.5.info,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- php5-10.5.info      15 Feb 2008 14:38:05 -0000      1.1.2.3
+++ php5-10.5.info      15 Feb 2008 14:41:36 -0000      1.1.2.4
@@ -1,9 +1,9 @@
 Package: php5
 Version: 5.1.4
-Revision: 18
+Revision: 17
 Distribution: 10.5
 ###
-BuildDepends: aprutil-dev, apr-dev (>= 0.9.12-10), libtool14, libgettext3-dev, 
libiconv-dev, gd2, mysql15-dev, sqlite-dev, postgresql80-unified-dev (>= 
8.0.6-1026), libcurl3-unified, expat, libmhash (>= 0.8.18-2), libmcrypt, 
libxml2, libxslt, openldap23-dev (>= 2.3.11-1002), ming, t1lib5, libpng3, 
apache2-dev (>= 2.0.58-10), unixodbc2 (>= 2.2.11-1010) | unixodbc2-nox (>= 
2.2.11-1010), gdbm3, net-snmp-unified, net-snmp-unified15-dev, db44-aes, 
libtiff, x11-dev, gmp (>= 4.1.4-1), libmpfr1, libc-client1-dev, libjpeg, 
cyrus-sasl2-dev, system-openssl-dev
+BuildDepends: aprutil-dev, apr-dev (>= 0.9.12-10), libtool14, libgettext3-dev, 
libiconv-dev, gd2, mysql15-dev, sqlite-dev, postgresql80-unified-dev (>= 
8.0.6-1026), libcurl3-unified, expat, libmhash (>= 0.8.18-2), libmcrypt, 
libxml2, libxslt, openldap23-dev (>= 2.3.11-1002), ming, t1lib5, libpng3, 
apache2-dev (>= 2.0.58-10), unixodbc2 (>= 2.2.11-1010) | unixodbc2-nox (>= 
2.2.11-1010), gdbm3, net-snmp-unified, net-snmp-unified15-dev, db44-aes, 
libtiff, x11-dev, gmp (>= 4.1.4-1), libmpfr1, uw-imap-c-client (>=  2004e-10), 
libjpeg, cyrus-sasl2-dev, system-openssl-dev
 Replaces: php5-apache2-ssl
 ###
 CustomMirror: <<
@@ -67,6 +67,8 @@
 ###
 Source: mirror:custom:distributions/php-%v.tar.bz2
 Source-MD5: 66a806161d4a2d3b5153ebe4cd0f2e1c
+Source2: ftp://ftp.cac.washington.edu/imap/old/imap-2004e.tar.Z
+Source2-MD5: deee044b2dcaf6fe12dc545673906ac5
 Source3: http://pear.php.net/install-pear-nozlib.phar
 Source3-MD5: 1030f325e0ce140db7cb3063bda52d3b
 ###
@@ -75,9 +77,9 @@
   ### Apple's GCC 4 prohibits nested functions
   sed 's|@FINKPREFIX@|%p|g' < %a/%n.patch | patch -p1
 
-#  ### Fix c-client
-#  cd ../imap-2004e; perl -pi -e 's,[EMAIL PROTECTED] Do you want to continue 
this build anyway\?  Type y or n please\:,[EMAIL PROTECTED] Do you want to 
continue this build anyway\?  Type y or n please\:\nnone:\n,g' Makefile
-#  cd ../imap-2004e; perl -pi -e 's,SPOOLDIR=/var/spool 
MAILSPOOL=/var/mail,SPOOLDIR=%p/var/spool MAILSPOOL=%p/var/mail,g' 
src/osdep/unix/Makefile
+  ### Fix c-client
+  cd ../imap-2004e; perl -pi -e 's,[EMAIL PROTECTED] Do you want to continue 
this build anyway\?  Type y or n please\:,[EMAIL PROTECTED] Do you want to 
continue this build anyway\?  Type y or n please\:\nnone:\n,g' Makefile
+  cd ../imap-2004e; perl -pi -e 's,SPOOLDIR=/var/spool 
MAILSPOOL=/var/mail,SPOOLDIR=%p/var/spool MAILSPOOL=%p/var/mail,g' 
src/osdep/unix/Makefile
 
   ### setpgrp chagned to setpgui on 10.5 for UNIX03 cert
   cd ../imap-2004e; perl -pi -e 's,setpgrp,setpgid,g' src/osdep/unix/env_unix.c
@@ -150,7 +152,7 @@
   mkdir -p apache-build/ext/dba/libcdb
   mkdir -p apache-build/ext/dba/libflatfile
   mkdir -p apache-build/ext/sqlite/libsqlite/src
-  cd apache-build; YACC="/usr/bin/bison -y" ../configure %c 
--with-apxs2=%p/bin/apxs2 --with-config-file-path=%p/etc/php5/apache2 
--with-imap-ssl=/usr --with-xmlrpc=shared --with-xsl=shared,%p 
--with-gmp=shared,%p --with-curl=shared,%p --with-gd=shared,%p 
--with-tiff-dir=%p --with-jpeg-dir=%p --with-xpm-dir=shared,/usr/X11R6 
--with-png-dir=%p --with-freetype-dir=shared,%p --with-imap=shared,%p 
--with-ldap=shared,%p --with-ldap-sasl=%p --with-mhash=shared,%p 
--with-mcrypt=shared,%p --with-mysql=shared,%p --with-sqlite=shared,%p 
--with-mysqli=shared,%p/bin/mysql_config --with-pgsql=shared,%p 
--with-unixODBC=shared,%p --with-t1lib=%p --with-ttf=%p --with-snmp=shared,%p
+  cd apache-build; YACC="/usr/bin/bison -y" ../configure %c 
--with-apxs2=%p/bin/apxs2 --with-config-file-path=%p/etc/php5/apache2 
--with-imap-ssl=/usr --with-xmlrpc=shared --with-xsl=shared,%p 
--with-gmp=shared,%p --with-curl=shared,%p --with-gd=shared,%p 
--with-tiff-dir=%p --with-jpeg-dir=%p --with-xpm-dir=shared,/usr/X11R6 
--with-png-dir=%p --with-freetype-dir=shared,%p 
--with-imap=shared,%p/share/c-client --with-ldap=shared,%p --with-ldap-sasl=%p 
--with-mhash=shared,%p --with-mcrypt=shared,%p --with-mysql=shared,%p 
--with-sqlite=shared,%p --with-mysqli=shared,%p/bin/mysql_config 
--with-pgsql=shared,%p --with-unixODBC=shared,%p --with-t1lib=%p --with-ttf=%p 
--with-snmp=shared,%p
 
   ### Fix for dlcompat
   perl -pi -e 's,#define HAVE_MACH_O_DYLD_H 1,#undef HAVE_MACH_O_DYLD_H,g' 
apache-build/main/php_config.h
@@ -166,13 +168,13 @@
   ### Fix for dlcompat
   perl -pi -e 's,#define HAVE_MACH_O_DYLD_H 1,#undef HAVE_MACH_O_DYLD_H,g' 
cgi-build/main/php_config.h
 
-#  ### Build c-client objects
-#  cd ../imap-2004e; make osx SSLTYPE=unix SSLDIR=/usr SSLCERTS=%p/etc/ssl 
EXTRACFLAGS=-fno-common
+  ### Build c-client objects
+  cd ../imap-2004e; make osx SSLTYPE=unix SSLDIR=/usr SSLCERTS=%p/etc/ssl 
EXTRACFLAGS=-fno-common
 
-#  ### copy objects to ext/imap dir for linking
-#  for i in dummy fdstring flstring imap4r1 mail mbx mh misc mmdf mtx mx 
netmsg news newsrc nntp osdep phile pop3 pseudo rfc822 siglocal smanager smtp 
tenex unix utf8; do cp %b/../imap-2004e/c-client/$i.o 
%b/apache-build/ext/imap/$i.o; done
+  ### copy objects to ext/imap dir for linking
+  for i in dummy fdstring flstring imap4r1 mail mbx mh misc mmdf mtx mx netmsg 
news newsrc nntp osdep phile pop3 pseudo rfc822 siglocal smanager smtp tenex 
unix utf8; do cp %b/../imap-2004e/c-client/$i.o %b/apache-build/ext/imap/$i.o; 
done
 
-#perl -pi -e 's,-lc-client,ext/imap/osdep.o ext/imap/mail.o ext/imap/misc.o 
ext/imap/newsrc.o ext/imap/smanager.o ext/imap/utf8.o ext/imap/siglocal.o 
ext/imap/dummy.o ext/imap/pseudo.o ext/imap/netmsg.o ext/imap/flstring.o 
ext/imap/fdstring.o ext/imap/rfc822.o ext/imap/nntp.o ext/imap/smtp.o 
ext/imap/imap4r1.o ext/imap/pop3.o ext/imap/unix.o ext/imap/mbx.o 
ext/imap/mmdf.o ext/imap/tenex.o ext/imap/mtx.o ext/imap/news.o 
ext/imap/phile.o ext/imap/mh.o ext/imap/mx.o,g' apache-build/Makefile
+perl -pi -e 's,-lc-client,ext/imap/osdep.o ext/imap/mail.o ext/imap/misc.o 
ext/imap/newsrc.o ext/imap/smanager.o ext/imap/utf8.o ext/imap/siglocal.o 
ext/imap/dummy.o ext/imap/pseudo.o ext/imap/netmsg.o ext/imap/flstring.o 
ext/imap/fdstring.o ext/imap/rfc822.o ext/imap/nntp.o ext/imap/smtp.o 
ext/imap/imap4r1.o ext/imap/pop3.o ext/imap/unix.o ext/imap/mbx.o 
ext/imap/mmdf.o ext/imap/tenex.o ext/imap/mtx.o ext/imap/news.o 
ext/imap/phile.o ext/imap/mh.o ext/imap/mx.o,g' apache-build/Makefile
 
   ### No idea why this is needed on 10.5
   cp -R Zend/* apache-build/Zend/

Index: php5.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/php5.info,v
retrieving revision 1.14.2.4
retrieving revision 1.14.2.5
diff -u -d -r1.14.2.4 -r1.14.2.5
--- php5.info   15 Feb 2008 14:38:05 -0000      1.14.2.4
+++ php5.info   15 Feb 2008 14:41:36 -0000      1.14.2.5
@@ -1,9 +1,9 @@
 Package: php5
 Version: 5.1.4
-Revision: 18
+Revision: 17
 Distribution: 10.4
 ###
-BuildDepends: aprutil-dev, apr-dev (>= 0.9.12-10), libtool14, libgettext3-dev, 
libiconv-dev, gd2, mysql-ssl15-dev | mysql15-dev, sqlite-dev, 
postgresql80-unified-dev (>= 8.0.6-1026), libcurl4, expat1, libmhash (>= 
0.8.18-2), libmcrypt, libxml2, libxslt, openldap23-dev (>= 2.3.11-1002), ming, 
t1lib5-x11, libpng3, apache2-dev (>= 2.0.58-10), unixodbc2 (>= 2.2.11-1010) | 
unixodbc2-nox (>= 2.2.11-1010), gdbm3, net-snmp-unified, 
net-snmp-unified15-dev, db44-aes, libtiff, x11-dev, gmp (>= 4.1.4-1), libmpfr1, 
libc-client1-dev, libjpeg, cyrus-sasl2-dev, system-openssl-dev
+BuildDepends: aprutil-dev, apr-dev (>= 0.9.12-10), libtool14, libgettext3-dev, 
libiconv-dev, gd2, mysql15-dev, sqlite-dev, postgresql80-unified-dev (>= 
8.0.6-1026), libcurl3-unified, expat, libmhash (>= 0.8.18-2), libmcrypt, 
libxml2, libxslt, openldap23-dev (>= 2.3.11-1002), ming, t1lib5, libpng3, 
apache2-dev (>= 2.0.58-10), unixodbc2 (>= 2.2.11-1010) | unixodbc2-nox (>= 
2.2.11-1010), gdbm3, net-snmp-unified, net-snmp-unified15-dev, db44-aes, 
libtiff, x11-dev, gmp (>= 4.1.4-1), libmpfr1, uw-imap-c-client (>=  2004e-10), 
libjpeg, cyrus-sasl2-dev, system-openssl-dev
 Replaces: php5-apache2-ssl
 ###
 CustomMirror: <<
@@ -67,6 +67,8 @@
 ###
 Source: mirror:custom:distributions/php-%v.tar.bz2
 Source-MD5: 66a806161d4a2d3b5153ebe4cd0f2e1c
+Source2: ftp://ftp.cac.washington.edu/imap/old/imap-2004e.tar.Z
+Source2-MD5: deee044b2dcaf6fe12dc545673906ac5
 Source3: http://pear.php.net/install-pear-nozlib.phar
 Source3-MD5: 1030f325e0ce140db7cb3063bda52d3b
 ###
@@ -75,6 +77,10 @@
   ### Apple's GCC 4 prohibits nested functions
   sed 's|@FINKPREFIX@|%p|g' < %a/%n.patch | patch -p1
 
+  ### Fix c-client
+  cd ../imap-2004e; perl -pi -e 's,[EMAIL PROTECTED] Do you want to continue 
this build anyway\?  Type y or n please\:,[EMAIL PROTECTED] Do you want to 
continue this build anyway\?  Type y or n please\:\nnone:\n,g' Makefile
+  cd ../imap-2004e; perl -pi -e 's,SPOOLDIR=/var/spool 
MAILSPOOL=/var/mail,SPOOLDIR=%p/var/spool MAILSPOOL=%p/var/mail,g' 
src/osdep/unix/Makefile
+
   ### Fix for fink's bison
   perl -pi -e 's,bison -,/usr/bin/bison -,g' configure
   perl -pi -e 's,bison -,/usr/bin/bison -,g' genfiles
@@ -142,7 +148,7 @@
   mkdir -p apache-build/ext/dba/libcdb
   mkdir -p apache-build/ext/dba/libflatfile
   mkdir -p apache-build/ext/sqlite/libsqlite/src
-  cd apache-build; YACC="/usr/bin/bison -y" ../configure %c 
--with-apxs2=%p/bin/apxs2 --with-config-file-path=%p/etc/php5/apache2 
--with-imap-ssl=/usr --with-xmlrpc=shared --with-xsl=shared,%p 
--with-gmp=shared,%p --with-curl=shared,%p --with-gd=shared,%p 
--with-tiff-dir=%p --with-jpeg-dir=%p --with-xpm-dir=shared,/usr/X11R6 
--with-png-dir=%p --with-freetype-dir=shared,%p --with-imap=shared,%p 
--with-ldap=shared,%p --with-ldap-sasl=%p --with-mhash=shared,%p 
--with-mcrypt=shared,%p --with-mysql=shared,%p --with-sqlite=shared,%p 
--with-mysqli=shared,%p/bin/mysql_config --with-pgsql=shared,%p 
--with-unixODBC=shared,%p --with-t1lib=%p --with-ttf=%p --with-snmp=shared,%p
+  cd apache-build; YACC="/usr/bin/bison -y" ../configure %c 
--with-apxs2=%p/bin/apxs2 --with-config-file-path=%p/etc/php5/apache2 
--with-imap-ssl=/usr --with-xmlrpc=shared --with-xsl=shared,%p 
--with-gmp=shared,%p --with-curl=shared,%p --with-gd=shared,%p 
--with-tiff-dir=%p --with-jpeg-dir=%p --with-xpm-dir=shared,/usr/X11R6 
--with-png-dir=%p --with-freetype-dir=shared,%p 
--with-imap=shared,%p/share/c-client --with-ldap=shared,%p --with-ldap-sasl=%p 
--with-mhash=shared,%p --with-mcrypt=shared,%p --with-mysql=shared,%p 
--with-sqlite=shared,%p --with-mysqli=shared,%p/bin/mysql_config 
--with-pgsql=shared,%p --with-unixODBC=shared,%p --with-t1lib=%p --with-ttf=%p 
--with-snmp=shared,%p
 
   ### Fix for dlcompat
   perl -pi -e 's,#define HAVE_MACH_O_DYLD_H 1,#undef HAVE_MACH_O_DYLD_H,g' 
apache-build/main/php_config.h
@@ -158,6 +164,13 @@
   ### Fix for dlcompat
   perl -pi -e 's,#define HAVE_MACH_O_DYLD_H 1,#undef HAVE_MACH_O_DYLD_H,g' 
cgi-build/main/php_config.h
 
+  ### Build c-client objects
+  cd ../imap-2004e; make osx SSLTYPE=unix SSLDIR=/usr SSLCERTS=%p/etc/ssl 
EXTRACFLAGS=-fno-common
+
+  ### copy objects to ext/imap dir for linking
+  for i in dummy fdstring flstring imap4r1 mail mbx mh misc mmdf mtx mx netmsg 
news newsrc nntp osdep phile pop3 pseudo rfc822 siglocal smanager smtp tenex 
unix utf8; do cp %b/../imap-2004e/c-client/$i.o %b/apache-build/ext/imap/$i.o; 
done
+
+perl -pi -e 's,-lc-client,ext/imap/osdep.o ext/imap/mail.o ext/imap/misc.o 
ext/imap/newsrc.o ext/imap/smanager.o ext/imap/utf8.o ext/imap/siglocal.o 
ext/imap/dummy.o ext/imap/pseudo.o ext/imap/netmsg.o ext/imap/flstring.o 
ext/imap/fdstring.o ext/imap/rfc822.o ext/imap/nntp.o ext/imap/smtp.o 
ext/imap/imap4r1.o ext/imap/pop3.o ext/imap/unix.o ext/imap/mbx.o 
ext/imap/mmdf.o ext/imap/tenex.o ext/imap/mtx.o ext/imap/news.o 
ext/imap/phile.o ext/imap/mh.o ext/imap/mx.o,g' apache-build/Makefile
   ### Make for apache2
   cd apache-build; make
 
@@ -241,7 +254,7 @@
 ###
 SplitOff: <<
   Package: libapache2-mod-php5
-  Depends: apache2 (>= 2.0.58-10), bzip2-shlibs, db44-aes-shlibs, 
expat1-shlibs, gdbm3-shlibs, libapr0-shlibs, libaprutil0-shlibs, 
libgettext3-shlibs, libiconv, libxml2-shlibs (>= 2.6.1-1), ming-shlibs, 
openldap23-shlibs (>= 2.3.24-10), %N (= %v-%r)
+  Depends: apache2 (>= 2.0.58-10), bzip2-shlibs, db44-aes-shlibs, 
expat-shlibs, gdbm3-shlibs, libapr0-shlibs, libaprutil0-shlibs, 
libgettext3-shlibs, libiconv, libxml2-shlibs (>= 2.6.1-1), ming-shlibs, 
openldap23-shlibs (>= 2.3.24-10), %N (= %v-%r)
   Replaces: libapache2-ssl-mod-php5
   Conflicts: libapache2-mod-php4, libapache2-ssl-mod-php4
   ConfFiles: <<
@@ -402,7 +415,7 @@
 <<
 SplitOff5: <<
   Package: %N-curl
-  Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (= 
%v-%r), libcurl4-shlibs
+  Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (= 
%v-%r), libcurl3-unified-shlibs
   Replaces: php5-apache2-ssl-curl
   Files: lib/php5/20050922-zts/curl.so
   DocFiles: LICENSE
@@ -449,7 +462,7 @@
 <<
 SplitOff6: <<
   Package: %N-gd
-  Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (= 
%v-%r), gd2-shlibs, libpng3-shlibs (>= 1.2.5-4), libjpeg-shlibs, 
t1lib5-x11-shlibs, libiconv
+  Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (= 
%v-%r), gd2-shlibs, libpng3-shlibs (>= 1.2.5-4), libjpeg-shlibs, t1lib5-shlibs, 
libiconv
   Replaces: php5-apache2-ssl-gd
   Files: lib/php5/20050922-zts/gd.so
   DocFiles: LICENSE
@@ -685,7 +698,7 @@
 <<
 SplitOff11: <<
   Package: %N-mysql
-  Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (= 
%v-%r), mysql-ssl15-shlibs | mysql15-shlibs
+  Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (= 
%v-%r), mysql15-shlibs
   Replaces: php5-apache2-ssl-mysql
   Files: lib/php5/20050922-zts/mysql.so
   DocFiles: LICENSE
@@ -733,7 +746,7 @@
 <<
 SplitOff12: <<
   Package: %N-mysqli
-  Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (= 
%v-%r), mysql-ssl15-shlibs | mysql15-shlibs
+  Depends: libapache2-mod-php5 (= %v-%r) | %N-cgi (= %v-%r) | %N-cli (= 
%v-%r), mysql15-shlibs
   Replaces: php5-apache2-ssl-mysqli
   Files: lib/php5/20050922-zts/mysqli.so
   DocFiles: LICENSE

Index: sip.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/sip.info,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- sip.info    15 Feb 2008 14:38:05 -0000      1.3.2.1
+++ sip.info    15 Feb 2008 14:41:36 -0000      1.3.2.2
@@ -1,7 +1,7 @@
 Package: sip
-Version: 4.7.3
-Revision: 1
+Version: 4.3.1
+Revision: 1007
 Type: bundle
-Depends: sip-py23-bin (>= %v-1) | sip-py24-bin (>= %v-1) | sip-py25-bin (>= 
%v-1)
+Depends: sip-py24-bin (>= 4.3.1-6) | sip-py23-bin (>= 4.3.1-6)
 Maintainer: None <[EMAIL PROTECTED]>
 Description: Convenience bundle for any python version


-------------------------------------------------------------------------
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
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to