Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11073

Modified Files:
        libaprutil.0-shlibs.info 
Log Message:
Update to db47 and openldap24. Cleaned .la of dependencies.

Index: libaprutil.0-shlibs.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libaprutil.0-shlibs.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- libaprutil.0-shlibs.info    4 Sep 2008 20:11:24 -0000       1.5
+++ libaprutil.0-shlibs.info    1 Mar 2009 23:04:21 -0000       1.6
@@ -1,9 +1,9 @@
 Package: libaprutil.0-shlibs
 Version: 1.3.4
-Revision: 7
+Revision: 8
 
-Depends: cyrus-sasl2-shlibs, db44-shlibs | db44-aes-shlibs, expat1-shlibs, 
gdbm3-shlibs, libapr.0-shlibs, libiconv, mysql15-shlibs | mysql-ssl15-shlibs, 
openldap23-shlibs (>= 2.3.40-1), postgresql83-shlibs, sqlite-shlibs, 
sqlite3-shlibs, unixodbc2-shlibs | unixodbc2-nox-shlibs
-BuildDepends: cyrus-sasl2-dev, db44 | db44-aes, expat1, gdbm3, libapr.0-dev, 
libiconv-dev, mysql15-dev | mysql-ssl15-dev, openldap23-dev (>= 2.3.40-1), 
postgresql83-dev, sqlite-dev, sqlite3-dev, unixodbc2 | unixodbc2-nox, 
system-openssl-dev, pkgconfig
+Depends: db47-aes-shlibs | db47-shlibs, expat1-shlibs, gdbm3-shlibs, 
libapr.0-shlibs, libiconv, mysql-ssl15-shlibs | mysql15-shlibs, 
openldap24-shlibs, postgresql83-shlibs, sqlite-shlibs, sqlite3-shlibs, 
unixodbc2-shlibs | unixodbc2-nox-shlibs
+BuildDepends: db47-aes | db47, expat1, gdbm3, libapr.0-dev, libiconv-dev, 
mysql-ssl15-dev | mysql15-dev, openldap24-dev, postgresql83-dev, sqlite-dev, 
sqlite3-dev, unixodbc2 | unixodbc2-nox, pkgconfig
 Replaces: libaprutil0-shlibs
 # a transient libaprutil0-shlibs accidentally installed something else at the 
install_name location
 
@@ -13,15 +13,19 @@
 PatchScript: <<
   ### Fix layout
   perl -pi -e 's,/usr/local,%p,g' config.layout
+  perl -pi -e 's,\...@ldadd_ldap\@|\...@aprutil_export_libs\@,,g' 
apr-util.pc.in apu-config.in
+  perl -pi -e 's,\...@aprutil_major_version\@,,' test/Makefile.in
 <<
 
-ConfigureParams: --enable-layout=GNU --with-apr=%p 
--with-ldap-include=%p/include --with-ldap-lib=%p/lib/system-openssl/lib 
--with-ldap --with-dbm=db44 --with-gdbm=%p --with-berkeley-db=%p 
--with-pgsql=%p --with-mysql=%p --with-sqlite2=%p --with-sqlite3=%p 
--with-expat=%p --with-iconv=%p
+ConfigureParams: --enable-layout=GNU --with-apr=%p 
--with-ldap-include=%p/include --with-ldap-lib=%p/lib --with-ldap 
--with-dbm=db47 --with-gdbm=%p --with-berkeley-db=%p --with-pgsql=%p 
--with-mysql=%p --with-sqlite2=%p --with-sqlite3=%p --with-expat=%p 
--with-iconv=%p --disable-static
 
 NoSetLDFLAGS: true
 
 InstallScript: <<
   make install prefix=%i
   rm %i/lib/aprutil.exp
+  #No need for dependency_libs in .la files if not building static libs
+  perl -pi -e "s/dependency_libs=.*$/dependency_libs=''/" %i/lib/*.la 
%i/lib/apr-util-1/*la
 <<
 
 DocFiles: CHANGES LICENSE NOTICE README.MySQL
@@ -41,7 +45,6 @@
     bin
     include
     lib/pkgconfig
-    lib/libaprutil.a
     lib/libaprutil.la
     lib/libaprutil.dylib
   <<
@@ -62,3 +65,5 @@
 License: BSD
 Maintainer: Justin F. Hallett <the...@users.sourceforge.net>
 Homepage: http://apr.apache.org/
+
+InfoTest: TestScript: make check || exit 2


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

Reply via email to