Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv13262
Modified Files: libapr.0-shlibs.info libaprutil.0-mysql.info libaprutil.0-odbc.info libaprutil.0-postgresql.info libaprutil.0-shlibs.info libaprutil.0-sqlite2.info libaprutil.0-sqlite3.info Added Files: libaprutil.0-shlibs.patch Log Message: Take over with previous maintainer's permission, update to newest upstream and switch to db48. --- NEW FILE: libaprutil.0-shlibs.patch --- diff -ru apr-util-1.3.9.orig/apr-util.pc.in apr-util-1.3.9/apr-util.pc.in --- apr-util-1.3.9.orig/apr-util.pc.in 2008-05-23 17:27:59.000000000 -0400 +++ apr-util-1.3.9/apr-util.pc.in 2010-08-10 17:46:25.000000000 -0400 @@ -9,5 +9,5 @@ Version: @APRUTIL_DOTTED_VERSION@ # assume that apr-util requires libapr of same major version Requires: a...@aprutil_major_version@ -Libs: -L${libdir} -...@aprutil_libname@ @LDADD_ldap@ @APRUTIL_EXPORT_LIBS@ +Libs: -L${libdir} -...@aprutil_libname@ Cflags: -I${includedir} diff -ru apr-util-1.3.9.orig/apu-config.in apr-util-1.3.9/apu-config.in --- apr-util-1.3.9.orig/apu-config.in 2009-06-09 23:34:22.000000000 -0400 +++ apr-util-1.3.9/apu-config.in 2010-08-10 17:45:56.000000000 -0400 @@ -27,7 +27,7 @@ libdir="@libdir@" includedir="@includedir@" -LIBS="@APRUTIL_EXPORT_LIBS@" +LIBS="" INCLUDES="@APRUTIL_INCLUDES@" LDFLAGS="@APRUTIL_LDFLAGS@" LDAP_LIBS="@LDADD_ldap@" @@ -122,7 +122,7 @@ DBM_LIBS="" ;; --libs) - flags="$flags $LDAP_LIBS $DBM_LIBS $LIBS" + flags="$flags $LIBS" ;; --ldap-libs) flags="$flags $LDAP_LIBS" diff -ru apr-util-1.3.9.orig/build/dbm.m4 apr-util-1.3.9/build/dbm.m4 --- apr-util-1.3.9.orig/build/dbm.m4 2008-11-21 01:32:58.000000000 -0500 +++ apr-util-1.3.9/build/dbm.m4 2010-08-10 17:20:56.000000000 -0400 @@ -112,7 +112,7 @@ changequote([,]) unset $cache_id AC_CHECK_HEADER([$bdb_header], [ - if test "$1" = "3" -o "$1" = "4"; then + if test "$1" = "3" -o "$1" = "4" -o "$1" = "5"; then # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of @@ -522,6 +522,44 @@ apu_db_version=4 fi ]) +dnl +dnl APU_CHECK_DB48: is DB4.8 present? +dnl +dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version +dnl +AC_DEFUN([APU_CHECK_DB48], [ + places=$1 + if test -z "$places"; then + places="std /usr/local/BerkeleyDB.4.8 /boot/home/config" + fi + APU_CHECK_BERKELEY_DB("4", "8", "-1", + "$places", + "db48/db.h db4/db.h db.h", + "db-4.8 db4-4.8 db48 db4 db" + ) + if test "$apu_have_db" = "1"; then + apu_db_version=4 + fi +]) +dnl +dnl APU_CHECK_DB50: is DB5.0 present? +dnl +dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version +dnl +AC_DEFUN([APU_CHECK_DB50], [ + places=$1 + if test -z "$places"; then + places="std /usr/local/BerkeleyDB.5.0 /boot/home/config" + fi + APU_CHECK_BERKELEY_DB("5", "0", "-1", + "$places", + "db50/db.h db5/db.h db.h", + "db-5.0 db5-5.0 db50 db5 db" + ) + if test "$apu_have_db" = "1"; then + apu_db_version=5 + fi +]) AC_DEFUN([APU_CHECK_DB], [ requested=$1 @@ -606,6 +644,18 @@ AC_MSG_ERROR(Berkeley db4 not found) fi ;; + db48) + APU_CHECK_DB48("$check_places") + if test "$apu_db_version" != "4"; then + AC_MSG_ERROR(Berkeley db4 not found) + fi + ;; + db50) + APU_CHECK_DB50("$check_places") + if test "$apu_db_version" != "5"; then + AC_MSG_ERROR(Berkeley db5 not found) + fi + ;; default) APU_CHECK_DB_ALL("$check_places") ;; @@ -618,6 +668,10 @@ AC_DEFUN([APU_CHECK_DB_ALL], [ all_places=$1 + APU_CHECK_DB50("$all_places") + if test "$apu_db_version" != "5"; then + APU_CHECK_DB48("$all_places") + if test "$apu_db_version" != "4"; then APU_CHECK_DB47("$all_places") if test "$apu_db_version" != "4"; then APU_CHECK_DB46("$all_places") @@ -652,6 +706,8 @@ fi fi fi + fi + fi AC_MSG_CHECKING(for Berkeley DB) if test "$apu_have_db" = "1"; then AC_MSG_RESULT(found db$apu_db_version) @@ -679,11 +735,11 @@ apu_db_version=0 AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use. - DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47}])], + DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50}])], [ if test "$withval" = "yes"; then AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use. - One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47]) + One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47,db48,db50]) fi requested="$withval" ], [ @@ -882,6 +938,14 @@ apu_use_db=1 apu_default_dbm=db4 ;; + db48) + apu_use_db=1 + apu_default_dbm=db4 + ;; + db50) + apu_use_db=1 + apu_default_dbm=db5 + ;; default) dnl ### use more sophisticated DBMs for the default? apu_default_dbm="sdbm (default)" @@ -889,7 +953,7 @@ ;; *) AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type. - Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47]) + Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50]) ;; esac diff -ru apr-util-1.3.9.orig/dbm/apr_dbm_berkeleydb.c apr-util-1.3.9/dbm/apr_dbm_berkeleydb.c --- apr-util-1.3.9.orig/dbm/apr_dbm_berkeleydb.c 2008-11-21 03:22:35.000000000 -0500 +++ apr-util-1.3.9/dbm/apr_dbm_berkeleydb.c 2010-08-10 17:20:56.000000000 -0400 @@ -37,7 +37,9 @@ * DB_185, DB2, DB3, and DB4. */ -#if defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 4) +#if defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR > 4) +#define DB_VER 4 +#elif defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 4) /* We will treat anything greater than 4.1 as DB4. * We can treat 4.0 as DB3. */ diff -ru apr-util-1.3.9.orig/test/Makefile.in apr-util-1.3.9/test/Makefile.in --- apr-util-1.3.9.orig/test/Makefile.in 2009-05-31 07:53:31.000000000 -0400 +++ apr-util-1.3.9/test/Makefile.in 2010-08-10 17:47:07.000000000 -0400 @@ -23,7 +23,7 @@ TARGETS = $(PROGRAMS) -LOCAL_LIBS = ../l...@aprutil_libname@@aprutil_major_vers...@.la +LOCAL_LIBS = ../l...@aprutil_libname@.la CLEAN_TARGETS = manyfile.bin testfile.txt data/sqlite*.db Index: libaprutil.0-sqlite2.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libaprutil.0-sqlite2.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- libaprutil.0-sqlite2.info 17 Apr 2009 15:18:46 -0000 1.1 +++ libaprutil.0-sqlite2.info 19 Aug 2010 02:34:59 -0000 1.2 @@ -1,20 +1,40 @@ Package: libaprutil.0-sqlite2 -Version: 1.3.4 -Revision: 9 +Version: 1.3.9 +Revision: 1 -Depends: libaprutil.0-shlibs (= %v-%r), sqlite-shlibs, openldap24-shlibs -BuildDepends: db47-aes | db47, expat1, gdbm3, libapr.0-dev, libiconv-dev, sqlite-dev, openldap24-dev, pkgconfig +Depends: << + libaprutil.0-shlibs (= %v-%r), + openldap24-shlibs, + sqlite-shlibs +<< +BuildDepends: << + autoconf2.6, + automake1.11, + db48-aes | db48, + expat1, + fink (>= 0.24.12), + gdbm3, + libapr.0-dev (>= 1.4.2-1), + libaprutil.0-dev (= %v-%r), + libiconv-dev, + openldap24-dev, + pkgconfig, + sqlite-dev +<< Replaces: libaprutil0-shlibs, libaprutil.0-shlibs (<< 1.3.4-9) # a transient libaprutil0-shlibs accidentally installed something else at the install_name location -Source: mirror:apache:apr/apr-util-%v.tar.gz -Source-MD5: a10e2ca150ff07f484c724c36142211f +Source: mirror:apache:apr/apr-util-%v.tar.bz2 +Source-MD5: 29dd557f7bd891fc2bfdffcfa081db59 +PatchFile: libaprutil.0-shlibs.patch +PatchFile-MD5: 63c4b3bb379c350258be5c332c6bf27b 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 + ### Add support for db48 and 50 + %{default_script} + autoreconf -fi << ConfigureParams: << @@ -23,7 +43,7 @@ --with-ldap-include=%p/include \ --with-ldap-lib=%p/lib \ --with-ldap \ - --with-dbm=db47 \ + --with-dbm=db48 \ --with-gdbm=%p \ --with-berkeley-db=%p \ --without-pgsql \ @@ -46,11 +66,9 @@ make install-modules prefix=%i APU_MODULES=dbd/apr_dbd_sqlite2.la #No need for dependency_libs in .la files if not building static libs perl -pi -e "s/dependency_libs=.*$/dependency_libs=''/" %i/lib/apr-util-1/*la - #Delete static libs since there doesn't seem to be a way to disable them. - /bin/rm %i/lib/apr-util-1/*.a << -DocFiles: CHANGES LICENSE NOTICE README.MySQL +DocFiles: CHANGES LICENSE NOTICE README Description: APRUTIL sqlite2 backend DescDetail: << @@ -64,10 +82,12 @@ platform-specific deficiencies or features. << DescPackaging: << - This package must be kept in sync with libaprutil.0-shlibs. + Must keep the libaprutil.0-*.info versions in sync with this. + + Previously maintained by Justin F. Hallett <the...@users.sourceforge.net> << License: BSD -Maintainer: Justin F. Hallett <the...@users.sourceforge.net> +Maintainer: Daniel Johnson <dan...@daniel-johnson.org> Homepage: http://apr.apache.org/ InfoTest: TestScript: make check || exit 2 Index: libaprutil.0-shlibs.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libaprutil.0-shlibs.info,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- libaprutil.0-shlibs.info 17 Apr 2009 15:18:46 -0000 1.7 +++ libaprutil.0-shlibs.info 19 Aug 2010 02:34:59 -0000 1.8 @@ -1,22 +1,43 @@ Package: libaprutil.0-shlibs -Version: 1.3.4 -Revision: 9 +Version: 1.3.9 +Revision: 1 -Depends: db47-aes-shlibs | db47-shlibs, expat1-shlibs, gdbm3-shlibs, libapr.0-shlibs, openldap24-shlibs, libiconv -BuildDepends: db47-aes | db47, expat1, gdbm3, libapr.0-dev, openldap24-dev, libiconv-dev, pkgconfig +Depends: << + db48-aes-shlibs | db48-shlibs, + expat1-shlibs, + gdbm3-shlibs, + libapr.0-shlibs (>= 1.4.2-1), + libiconv, + openldap24-shlibs +<< +BuildDepends: << + autoconf2.6, + automake1.11, + db48-aes | db48, + expat1, + fink (>= 0.24.12), + gdbm3, + libapr.0-dev (>= 1.4.2-1), + libiconv-dev, + openldap24-dev, + pkgconfig +<< Replaces: libaprutil0-shlibs # a transient libaprutil0-shlibs accidentally installed something else at the install_name location Suggests: libaprutil.0-mysql, libaprutil.0-odbc, libaprutil.0-postgresql, libaprutil.0-sqlite2, libaprutil.0-sqlite3 -Source: mirror:apache:apr/apr-util-%v.tar.gz -Source-MD5: a10e2ca150ff07f484c724c36142211f +Source: mirror:apache:apr/apr-util-%v.tar.bz2 +Source-MD5: 29dd557f7bd891fc2bfdffcfa081db59 +PatchFile: %n.patch +PatchFile-MD5: 63c4b3bb379c350258be5c332c6bf27b 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 + ### Add support for db48 and 50 + %{default_script} + autoreconf -fi << ConfigureParams: << @@ -25,7 +46,7 @@ --with-ldap-include=%p/include \ --with-ldap-lib=%p/lib \ --with-ldap \ - --with-dbm=db47 \ + --with-dbm=db48 \ --with-gdbm=%p \ --with-berkeley-db=%p \ --without-pgsql \ @@ -40,15 +61,14 @@ NoSetLDFLAGS: true InstallScript: << - make install prefix=%i + make install DESTDIR=%d /bin/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 - #Delete static libs since there doesn't seem to be a way to disable them. - /bin/rm %i/lib/*.a %i/lib/apr-util-1/*.a + cd %i/lib && ln -s libaprutil.0.dylib libaprutil-1.dylib << -DocFiles: CHANGES LICENSE NOTICE README.MySQL +DocFiles: CHANGES LICENSE NOTICE README Shlibs: << %p/lib/libaprutil.0.dylib 4.0.0 %n (>= 1.3.4-4) @@ -67,8 +87,9 @@ lib/pkgconfig lib/libaprutil.la lib/libaprutil.dylib + lib/libaprutil-1.dylib << - DocFiles: LICENSE + DocFiles: CHANGES LICENSE NOTICE README << Description: APRUTIL shared libraries @@ -90,9 +111,11 @@ << DescPackaging: << Must keep the libaprutil.0-*.info versions in sync with this. + + Previously maintained by Justin F. Hallett <the...@users.sourceforge.net> << License: BSD -Maintainer: Justin F. Hallett <the...@users.sourceforge.net> +Maintainer: Daniel Johnson <dan...@daniel-johnson.org> Homepage: http://apr.apache.org/ InfoTest: TestScript: make check || exit 2 Index: libapr.0-shlibs.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libapr.0-shlibs.info,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- libapr.0-shlibs.info 4 Sep 2008 20:11:25 -0000 1.5 +++ libapr.0-shlibs.info 19 Aug 2010 02:34:59 -0000 1.6 @@ -1,22 +1,25 @@ Package: libapr.0-shlibs -Version: 1.3.3 -Revision: 6 +Version: 1.4.2 +Revision: 1 BuildDepends: pkgconfig Replaces: libapr0-shlibs # a transient libapr0-shlibs accidentally installed something else at the install_name location -Source: mirror:apache:apr/apr-%v.tar.gz -Source-MD5: b254a9abecaedb05efde71daa7517480 +Source: mirror:apache:apr/apr-%v.tar.bz2 +Source-MD5: 4b00e8f70c067893d075577962656b35 PatchScript: << ### Force use of awk over gawk perl -pi -e 's,gawk mawk nawk awk,awk mawk nawk gawk,g' configure ### Fix layout perl -pi -e 's,/usr/local,%p,g' config.layout + ### APR_OFF_T_FMT gets set incorrectly on 64 bit causing svn crashes. + ### Force it to be the same as APR_INT64_T_FMT everywhere. + perl -pi -e 's,\...@off_t_fmt\@,#define APR_OFF_T_FMT APR_INT64_T_FMT,' include/apr.h.in << -ConfigureParams: --enable-layout=GNU --enable-shared --enable-static --enable-threads --with-pic --with-sendfile=no --enable-threads +ConfigureParams: --enable-layout=GNU --enable-shared --disable-static --enable-threads --with-pic --with-sendfile=no NoSetCPPFLAGS: true NoSetLDFLAGS: true @@ -27,14 +30,15 @@ << InstallScript: << - make install prefix=%i + make install DESTDIR=%d rm %i/lib/apr.exp + cd %i/lib && ln -s libapr.0.dylib libapr-1.dylib << -DocFiles: CHANGES LICENSE NOTICE +DocFiles: CHANGES LICENSE NOTICE README Shlibs: << - %p/lib/libapr.0.dylib 4.0.0 %n (>= 1.3.3-3) + %p/lib/libapr.0.dylib 5.0.0 %n (>= 1.4.2-1) << SplitOff: << @@ -48,12 +52,12 @@ bin share/apache2 include - lib/libapr.a lib/libapr.la + lib/libapr-1.dylib lib/libapr.dylib lib/pkgconfig << - DocFiles: CHANGES LICENSE NOTICE README.dev + DocFiles: CHANGES LICENSE NOTICE README << Description: Apache Portable Runtime shared libraries @@ -76,7 +80,13 @@ This may break apache2 temporarily. << +DescPackaging: << + Previously maintained by Justin F. Hallett <the...@users.sourceforge.net> +<< License: BSD -Maintainer: Justin F. Hallett <the...@users.sourceforge.net> +Maintainer: Daniel Johnson <dan...@daniel-johnson.org> Homepage: http://apr.apache.org/ + +#2 failing tests in testfmt and testsock +#InfoTest: TestScript: make check || exit 2 Index: libaprutil.0-odbc.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libaprutil.0-odbc.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- libaprutil.0-odbc.info 17 Apr 2009 15:18:46 -0000 1.1 +++ libaprutil.0-odbc.info 19 Aug 2010 02:34:59 -0000 1.2 @@ -1,20 +1,40 @@ Package: libaprutil.0-odbc -Version: 1.3.4 -Revision: 9 +Version: 1.3.9 +Revision: 1 -Depends: libaprutil.0-shlibs (= %v-%r), unixodbc2-shlibs | unixodbc2-nox-shlibs, openldap24-shlibs -BuildDepends: db47-aes | db47, expat1, gdbm3, libapr.0-dev, libiconv-dev, unixodbc2 | unixodbc2-nox, openldap24-dev, pkgconfig +Depends: << + libaprutil.0-shlibs (= %v-%r), + openldap24-shlibs, + unixodbc2-shlibs | unixodbc2-nox-shlibs +<< +BuildDepends: << + autoconf2.6, + automake1.11, + db48-aes | db48, + expat1, + fink (>= 0.24.12), + gdbm3, + libapr.0-dev (>= 1.4.2-1), + libaprutil.0-dev (= %v-%r), + libiconv-dev, + openldap24-dev, + pkgconfig, + unixodbc2 | unixodbc2-nox +<< Replaces: libaprutil0-shlibs, libaprutil.0-shlibs (<< 1.3.4-9) # a transient libaprutil0-shlibs accidentally installed something else at the install_name location -Source: mirror:apache:apr/apr-util-%v.tar.gz -Source-MD5: a10e2ca150ff07f484c724c36142211f +Source: mirror:apache:apr/apr-util-%v.tar.bz2 +Source-MD5: 29dd557f7bd891fc2bfdffcfa081db59 +PatchFile: libaprutil.0-shlibs.patch +PatchFile-MD5: 63c4b3bb379c350258be5c332c6bf27b 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 + ### Add support for db48 and 50 + %{default_script} + autoreconf -fi << ConfigureParams: << @@ -23,7 +43,7 @@ --with-ldap-include=%p/include \ --with-ldap-lib=%p/lib \ --with-ldap \ - --with-dbm=db47 \ + --with-dbm=db48 \ --with-gdbm=%p \ --with-berkeley-db=%p \ --without-pgsql \ @@ -46,11 +66,9 @@ make install-modules prefix=%i APU_MODULES=dbd/apr_dbd_odbc.la #No need for dependency_libs in .la files if not building static libs perl -pi -e "s/dependency_libs=.*$/dependency_libs=''/" %i/lib/apr-util-1/*la - #Delete static libs since there doesn't seem to be a way to disable them. - /bin/rm %i/lib/apr-util-1/*.a << -DocFiles: CHANGES LICENSE NOTICE README.MySQL +DocFiles: CHANGES LICENSE NOTICE README Description: APRUTIL odbc backend DescDetail: << @@ -64,8 +82,10 @@ platform-specific deficiencies or features. << DescPackaging: << - This package must be kept in sync with libaprutil.0-shlibs. + Must keep the libaprutil.0-*.info versions in sync with this. + + Previously maintained by Justin F. Hallett <the...@users.sourceforge.net> << License: BSD -Maintainer: Justin F. Hallett <the...@users.sourceforge.net> +Maintainer: Daniel Johnson <dan...@daniel-johnson.org> Homepage: http://apr.apache.org/ Index: libaprutil.0-mysql.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libaprutil.0-mysql.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- libaprutil.0-mysql.info 17 Apr 2009 15:18:46 -0000 1.1 +++ libaprutil.0-mysql.info 19 Aug 2010 02:34:59 -0000 1.2 @@ -1,20 +1,40 @@ Package: libaprutil.0-mysql -Version: 1.3.4 -Revision: 9 +Version: 1.3.9 +Revision: 1 -Depends: libaprutil.0-shlibs (= %v-%r), mysql15-shlibs, openldap24-shlibs -BuildDepends: db47-aes | db47, expat1, gdbm3, libapr.0-dev, libiconv-dev, mysql15-dev, openldap24-dev, pkgconfig +Depends: << + libaprutil.0-shlibs (= %v-%r), + mysql-unified-shlibs, + openldap24-shlibs +<< +BuildDepends: << + autoconf2.6, + automake1.11, + db48-aes | db48, + expat1, + fink (>= 0.24.12), + gdbm3, + libapr.0-dev (>= 1.4.2-1), + libaprutil.0-dev (= %v-%r), + libiconv-dev, + mysql-unified-dev, + openldap24-dev, + pkgconfig +<< Replaces: libaprutil0-shlibs, libaprutil.0-shlibs (<< 1.3.4-9) # a transient libaprutil0-shlibs accidentally installed something else at the install_name location -Source: mirror:apache:apr/apr-util-%v.tar.gz -Source-MD5: a10e2ca150ff07f484c724c36142211f +Source: mirror:apache:apr/apr-util-%v.tar.bz2 +Source-MD5: 29dd557f7bd891fc2bfdffcfa081db59 +PatchFile: libaprutil.0-shlibs.patch +PatchFile-MD5: 63c4b3bb379c350258be5c332c6bf27b 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 + ### Add support for db48 and 50 + %{default_script} + autoreconf -fi << ConfigureParams: << @@ -23,7 +43,7 @@ --with-ldap-include=%p/include \ --with-ldap-lib=%p/lib \ --with-ldap \ - --with-dbm=db47 \ + --with-dbm=db48 \ --with-gdbm=%p \ --with-berkeley-db=%p \ --without-pgsql \ @@ -46,11 +66,9 @@ make install-modules prefix=%i APU_MODULES=dbd/apr_dbd_mysql.la #No need for dependency_libs in .la files if not building static libs perl -pi -e "s/dependency_libs=.*$/dependency_libs=''/" %i/lib/apr-util-1/*la - #Delete static libs since there doesn't seem to be a way to disable them. - /bin/rm %i/lib/apr-util-1/*.a << -DocFiles: CHANGES LICENSE NOTICE README.MySQL +DocFiles: CHANGES LICENSE NOTICE README Description: APRUTIL mysql backend DescDetail: << @@ -64,8 +82,10 @@ platform-specific deficiencies or features. << DescPackaging: << - This package must be kept in sync with libaprutil.0-shlibs. + Must keep the libaprutil.0-*.info versions in sync with this. + + Previously maintained by Justin F. Hallett <the...@users.sourceforge.net> << License: BSD -Maintainer: Justin F. Hallett <the...@users.sourceforge.net> +Maintainer: Daniel Johnson <dan...@daniel-johnson.org> Homepage: http://apr.apache.org/ Index: libaprutil.0-postgresql.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libaprutil.0-postgresql.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- libaprutil.0-postgresql.info 17 Apr 2009 15:18:46 -0000 1.1 +++ libaprutil.0-postgresql.info 19 Aug 2010 02:34:59 -0000 1.2 @@ -1,20 +1,40 @@ Package: libaprutil.0-postgresql -Version: 1.3.4 -Revision: 9 +Version: 1.3.9 +Revision: 1 -Depends: libaprutil.0-shlibs (= %v-%r), postgresql83-shlibs, openldap24-shlibs -BuildDepends: db47-aes | db47, expat1, gdbm3, libapr.0-dev, libiconv-dev, postgresql83-dev, openldap24-dev, pkgconfig +Depends: << + libaprutil.0-shlibs (= %v-%r), + openldap24-shlibs, + postgresql84-shlibs +<< +BuildDepends: << + autoconf2.6, + automake1.11, + db48-aes | db48, + expat1, + fink (>= 0.24.12), + gdbm3, + libapr.0-dev (>= 1.4.2-1), + libaprutil.0-dev (= %v-%r), + libiconv-dev, + openldap24-dev, + pkgconfig, + postgresql84-dev +<< Replaces: libaprutil0-shlibs, libaprutil.0-shlibs (<< 1.3.4-9) # a transient libaprutil0-shlibs accidentally installed something else at the install_name location -Source: mirror:apache:apr/apr-util-%v.tar.gz -Source-MD5: a10e2ca150ff07f484c724c36142211f +Source: mirror:apache:apr/apr-util-%v.tar.bz2 +Source-MD5: 29dd557f7bd891fc2bfdffcfa081db59 +PatchFile: libaprutil.0-shlibs.patch +PatchFile-MD5: 63c4b3bb379c350258be5c332c6bf27b 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 + ### Add support for db48 and 50 + %{default_script} + autoreconf -fi << ConfigureParams: << @@ -23,7 +43,7 @@ --with-ldap-include=%p/include \ --with-ldap-lib=%p/lib \ --with-ldap \ - --with-dbm=db47 \ + --with-dbm=db48 \ --with-gdbm=%p \ --with-berkeley-db=%p \ --with-pgsql=%p \ @@ -46,11 +66,9 @@ make install-modules prefix=%i APU_MODULES=dbd/apr_dbd_pgsql.la #No need for dependency_libs in .la files if not building static libs perl -pi -e "s/dependency_libs=.*$/dependency_libs=''/" %i/lib/apr-util-1/*la - #Delete static libs since there doesn't seem to be a way to disable them. - /bin/rm %i/lib/apr-util-1/*.a << -DocFiles: CHANGES LICENSE NOTICE README.MySQL +DocFiles: CHANGES LICENSE NOTICE README Description: APRUTIL postgresql backend DescDetail: << @@ -64,8 +82,10 @@ platform-specific deficiencies or features. << DescPackaging: << - This package must be kept in sync with libaprutil.0-shlibs. + Must keep the libaprutil.0-*.info versions in sync with this. + + Previously maintained by Justin F. Hallett <the...@users.sourceforge.net> << License: BSD -Maintainer: Justin F. Hallett <the...@users.sourceforge.net> +Maintainer: Daniel Johnson <dan...@daniel-johnson.org> Homepage: http://apr.apache.org/ Index: libaprutil.0-sqlite3.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libaprutil.0-sqlite3.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- libaprutil.0-sqlite3.info 17 Apr 2009 15:18:46 -0000 1.1 +++ libaprutil.0-sqlite3.info 19 Aug 2010 02:34:59 -0000 1.2 @@ -1,20 +1,40 @@ Package: libaprutil.0-sqlite3 -Version: 1.3.4 -Revision: 9 +Version: 1.3.9 +Revision: 1 -Depends: libaprutil.0-shlibs (= %v-%r), sqlite3-shlibs, openldap24-shlibs -BuildDepends: db47-aes | db47, expat1, gdbm3, libapr.0-dev, libiconv-dev, sqlite3-dev, openldap24-dev, pkgconfig +Depends: << + libaprutil.0-shlibs (= %v-%r), + openldap24-shlibs, + sqlite3-shlibs +<< +BuildDepends: << + autoconf2.6, + automake1.11, + db48-aes | db48, + expat1, + fink (>= 0.24.12), + gdbm3, + libapr.0-dev (>= 1.4.2-1), + libaprutil.0-dev (= %v-%r), + libiconv-dev, + openldap24-dev, + pkgconfig, + sqlite3-dev +<< Replaces: libaprutil0-shlibs, libaprutil.0-shlibs (<< 1.3.4-9) # a transient libaprutil0-shlibs accidentally installed something else at the install_name location -Source: mirror:apache:apr/apr-util-%v.tar.gz -Source-MD5: a10e2ca150ff07f484c724c36142211f +Source: mirror:apache:apr/apr-util-%v.tar.bz2 +Source-MD5: 29dd557f7bd891fc2bfdffcfa081db59 +PatchFile: libaprutil.0-shlibs.patch +PatchFile-MD5: 63c4b3bb379c350258be5c332c6bf27b 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 + ### Add support for db48 and 50 + %{default_script} + autoreconf -fi << ConfigureParams: << @@ -23,7 +43,7 @@ --with-ldap-include=%p/include \ --with-ldap-lib=%p/lib \ --with-ldap \ - --with-dbm=db47 \ + --with-dbm=db48 \ --with-gdbm=%p \ --with-berkeley-db=%p \ --without-pgsql \ @@ -46,11 +66,9 @@ make install-modules prefix=%i APU_MODULES=dbd/apr_dbd_sqlite3.la #No need for dependency_libs in .la files if not building static libs perl -pi -e "s/dependency_libs=.*$/dependency_libs=''/" %i/lib/apr-util-1/*la - #Delete static libs since there doesn't seem to be a way to disable them. - /bin/rm %i/lib/apr-util-1/*.a << -DocFiles: CHANGES LICENSE NOTICE README.MySQL +DocFiles: CHANGES LICENSE NOTICE README Description: APRUTIL sqlite3 backend DescDetail: << @@ -64,10 +82,12 @@ platform-specific deficiencies or features. << DescPackaging: << - This package must be kept in sync with libaprutil.0-shlibs. + Must keep the libaprutil.0-*.info versions in sync with this. + + Previously maintained by Justin F. Hallett <the...@users.sourceforge.net> << License: BSD -Maintainer: Justin F. Hallett <the...@users.sourceforge.net> +Maintainer: Daniel Johnson <dan...@daniel-johnson.org> Homepage: http://apr.apache.org/ InfoTest: TestScript: make check || exit 2 ------------------------------------------------------------------------------ This SF.net email is sponsored by Make an app they can't live without Enter the BlackBerry Developer Challenge http://p.sf.net/sfu/RIM-dev2dev _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs