Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17668
Modified Files: db3.info db4.info db41.info db42.info db43.info db44.info db47.info Log Message: 64 bitification. Index: db43.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/db43.info,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- db43.info 30 Nov 2008 19:16:50 -0000 1.6 +++ db43.info 22 Feb 2009 21:54:31 -0000 1.7 @@ -1,14 +1,30 @@ Package: db43 Version: 4.3.29 -Revision: 1003 +Revision: 1004 CustomMirror: << nam-US: http://download-east.oracle.com/berkeley-db/ nam-US: http://download-west.oracle.com/berkeley-db/ eur-UK: http://download-uk.oracle.com/berkeley-db/ << Source: mirror:custom:db-%v.NC.tar.gz -Replaces: db, db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db41, db42-ssl, db42, db43-ssl,db44, db44-aes, db47, db47-aes -Conflicts: db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db41, db42-ssl, db42, db43-ssl, db44, db44-aes, db47, db47-aes +Replaces: << + db, db3, db31 (<< 3.1.17-8), + db4-ssl, db4, + db41-ssl, db41, + db42-ssl, db42, + db43-ssl, db43, + db44-aes, db44, + db47-aes, db47, db47-aes-64bit, db47-64bit +<< +Conflicts: << + db, db3, db31 (<< 3.1.17-8), + db4-ssl, db4, + db41-ssl, db41, + db42-ssl, db42, + db43-ssl, db43, + db44-aes, db44, + db47-aes, db47, db47-aes-64bit, db47-64bit +<< Depends: db43-shlibs (= %v-%r) | db43-ssl-shlibs (=%v-%r) BuildDependsOnly: true NoSetLDFlags: true Index: db41.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/db41.info,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- db41.info 30 Nov 2008 19:16:50 -0000 1.7 +++ db41.info 22 Feb 2009 21:54:31 -0000 1.8 @@ -1,14 +1,30 @@ Package: db41 Version: 4.1.25 -Revision: 1025 +Revision: 1026 CustomMirror: << nam-US: http://download-east.oracle.com/berkeley-db/ nam-US: http://download-west.oracle.com/berkeley-db/ eur-UK: http://download-uk.oracle.com/berkeley-db/ << Source: mirror:custom:db-%v.NC.tar.gz -Replaces: db, db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db42, db42-ssl, db43-ssl, db43, db44, db44-aes, db47, db47-aes -Conflicts: db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db42, db42-ssl, db43-ssl, db43, db44, db44-aes, db47, db47-aes +Replaces: << + db, db3, db31 (<< 3.1.17-8), + db4-ssl, db4, + db41-ssl, db41, + db42-ssl, db42, + db43-ssl, db43, + db44-aes, db44, + db47-aes, db47, db47-aes-64bit, db47-64bit +<< +Conflicts: << + db, db3, db31 (<< 3.1.17-8), + db4-ssl, db4, + db41-ssl, db41, + db42-ssl, db42, + db43-ssl, db43, + db44-aes, db44, + db47-aes, db47, db47-aes-64bit, db47-64bit +<< Depends: db41-shlibs (= %v-%r) | db41-ssl-shlibs (=%v-%r) BuildDepends: fink (>= 0.24.12-1) BuildDependsOnly: true Index: db42.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/db42.info,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- db42.info 30 Nov 2008 19:16:50 -0000 1.7 +++ db42.info 22 Feb 2009 21:54:31 -0000 1.8 @@ -1,14 +1,30 @@ Package: db42 Version: 4.2.52 -Revision: 1019 +Revision: 1020 CustomMirror: << nam-US: http://download-east.oracle.com/berkeley-db/ nam-US: http://download-west.oracle.com/berkeley-db/ eur-UK: http://download-uk.oracle.com/berkeley-db/ << Source: mirror:custom:db-%v.NC.tar.gz -Replaces: db, db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db41, db42-ssl, db43-ssl, db43, db44, db44-aes, db47, db47-aes -Conflicts: db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db41, db42-ssl, db43-ssl, db43, db44, db44-aes, db47, db47-aes +Replaces: << + db, db3, db31 (<< 3.1.17-8), + db4-ssl, db4, + db41-ssl, db41, + db42-ssl, db42, + db43-ssl, db43, + db44-aes, db44, + db47-aes, db47, db47-aes-64bit, db47-64bit +<< +Conflicts: << + db, db3, db31 (<< 3.1.17-8), + db4-ssl, db4, + db41-ssl, db41, + db42-ssl, db42, + db43-ssl, db43, + db44-aes, db44, + db47-aes, db47, db47-aes-64bit, db47-64bit +<< Depends: db42-shlibs (= %v-%r) | db42-ssl-shlibs (=%v-%r) BuildDepends: fink (>= 0.24.12-1) BuildDependsOnly: true Index: db44.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/db44.info,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- db44.info 30 Nov 2008 19:16:50 -0000 1.6 +++ db44.info 22 Feb 2009 21:54:31 -0000 1.7 @@ -1,14 +1,30 @@ Package: db44 Version: 4.4.20 -Revision: 1003 +Revision: 1004 CustomMirror: << nam-US: http://download-east.oracle.com/berkeley-db/ nam-US: http://download-west.oracle.com/berkeley-db/ eur-UK: http://download-uk.oracle.com/berkeley-db/ << Source: mirror:custom:db-%v.NC.tar.gz -Replaces: db, db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db41, db42-ssl, db42, db43-ssl, db43, db44-aes, db47, db47-aes -Conflicts: db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db41, db42-ssl, db42, db43-ssl, db43, db44-aes, db47, db47-aes +Replaces: << + db, db3, db31 (<< 3.1.17-8), + db4-ssl, db4, + db41-ssl, db41, + db42-ssl, db42, + db43-ssl, db43, + db44-aes, db44, + db47-aes, db47, db47-aes-64bit, db47-64bit +<< +Conflicts: << + db, db3, db31 (<< 3.1.17-8), + db4-ssl, db4, + db41-ssl, db41, + db42-ssl, db42, + db43-ssl, db43, + db44-aes, db44, + db47-aes, db47, db47-aes-64bit, db47-64bit +<< Depends: db44-shlibs (= %v-%r) | db44-aes-shlibs (=%v-%r) BuildDependsOnly: true NoSetLDFlags: true Index: db47.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/db47.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- db47.info 28 Jan 2009 16:15:12 -0000 1.2 +++ db47.info 22 Feb 2009 21:54:31 -0000 1.3 @@ -1,24 +1,42 @@ -Package: db47 +Info4: << +Package: db47%type_pkg[-64bit] Version: 4.7.25 -Revision: 2 +Revision: 3 +Type: -64bit (boolean) CustomMirror: << nam-US: http://download-east.oracle.com/berkeley-db/ nam-US: http://download-west.oracle.com/berkeley-db/ eur-UK: http://download-uk.oracle.com/berkeley-db/ << Source: mirror:custom:db-%v.NC.tar.gz -Replaces: db, db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db41, db42-ssl, db42, db43-ssl, db43, db44, db44-aes, db47-aes -Conflicts: db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db41, db42-ssl, db42, db43-ssl, db43, db44, db44-aes, db47-aes -Depends: db47-shlibs (= %v-%r) | db47-aes-shlibs (=%v-%r) -BuildDepends: fink (>= 0.24.12) +Replaces: << + db, db3, db31 (<< 3.1.17-8), + db4-ssl, db4, + db41-ssl, db41, + db42-ssl, db42, + db43-ssl, db43, + db44-aes, db44, + db47-aes, db47, db47-aes-64bit, db47-64bit +<< +Conflicts: << + db, db3, db31 (<< 3.1.17-8), + db4-ssl, db4, + db41-ssl, db41, + db42-ssl, db42, + db43-ssl, db43, + db44-aes, db44, + db47-aes, db47, db47-aes-64bit, db47-64bit +<< +Depends: db47%type_pkg[-64bit]-shlibs (= %v-%r) | db47-aes%type_pkg[-64bit]-shlibs (=%v-%r), ( %type_raw[-64bit] = -64bit ) 64bit-cpu +BuildDepends: fink (>= 0.26.2) BuildDependsOnly: true NoSetLDFlags: true NoSetCPPFlags: true SetCFlags: -Os SetCXXFlags: -Os -PatchFile: %n.patch +PatchFile: %{ni}.patch PatchFile-MD5: 8c7011b31f9c71c8f97d09d821aca079 -ConfigureParams: --enable-compat185 --enable-cxx --enable-dump185 --includedir=%p/include/db4 +ConfigureParams: --enable-compat185 --enable-cxx --enable-dump185 --includedir=%p/include/db4 --libdir='${prefix}/%lib' --disable-static GCC: 4.0 CompileScript: << #! /bin/sh -ex @@ -26,18 +44,25 @@ LIBDB="libdb-4.7.la" LIBDBCXX="libdb_cxx-4.7.la" cd build_unix; +if [ "%type_raw[-64bit]" == "-64bit" ]; then + export CC="gcc -m64" + export CXX="g++ -m64" +else + export CC="gcc" + export CXX="g++" +fi F77=no ../dist/configure %c perl -pi.bak -e 's,api_java,,g' Makefile make UTIL_PROGS="" rm ".libs/$LIBDB" $LIBDB -make SOLINK="\$(LIBTOOL) --mode=link --tag=CC gcc $VERSIONS" UTIL_PROGS="" +make SOLINK="\$(LIBTOOL) --mode=link --tag=CC $CC $VERSIONS" UTIL_PROGS="" rm ".libs/$LIBDBCXX" $LIBDBCXX -make XSOLINK="\$(LIBTOOL) --mode=link --tag=CXX g++ $VERSIONS" UTIL_PROGS="" +make XSOLINK="\$(LIBTOOL) --mode=link --tag=CXX $CXX $VERSIONS" UTIL_PROGS="" make << InstallScript: << #! /bin/sh -ev -(cd build_unix; make install prefix=%I docdir=%I/share/doc/db47-doc/docs includedir=%I/include/db4) || exit 1 +(cd build_unix; make install prefix=%I docdir=%I/share/doc/db47-doc/docs includedir=%I/include/db4 libdir=%I/%lib) || exit 1 binfiles="db_archive db_checkpoint db_codegen db_deadlock db_dump db_dump185 db_hotbackup db_load db_printlog db_recover db_stat db_upgrade db_verify" for binfile in $binfiles ; do mv %i/bin/$binfile %i/bin/$binfile.%N @@ -45,22 +70,33 @@ << SplitOff: << Package: %N-shlibs - Replaces: db47-aes-shlibs - Conflicts: db47-aes-shlibs - Description: Shared Libraries for db47 - Files: lib/libdb-4.7.dylib lib/libdb_cxx-4.7.dylib lib/libdb-4.7.la lib/libdb_cxx-4.7.la + Depends: ( %type_raw[-64bit] = -64bit ) 64bit-cpu + Replaces: << + ( %type_raw[-64bit] = . ) db47-aes-shlibs, + ( %type_raw[-64bit] = . ) db47-shlibs, + ( %type_raw[-64bit] = -64bit ) db47-aes-64bit-shlibs, + ( %type_raw[-64bit] = -64bit ) db47-64bit-shlibs + << + Conflicts: << + ( %type_raw[-64bit] = . ) db47-aes-shlibs, + ( %type_raw[-64bit] = . ) db47-shlibs, + ( %type_raw[-64bit] = -64bit ) db47-aes-64bit-shlibs, + ( %type_raw[-64bit] = -64bit ) db47-64bit-shlibs + << + Description: Shared Libraries for %N + Files: %lib/libdb-4.7.dylib %lib/libdb_cxx-4.7.dylib %lib/libdb-4.7.la %lib/libdb_cxx-4.7.la Shlibs: << - %p/lib/libdb-4.7.dylib 4.7.0 %n (>= 4.7.25-1) - %p/lib/libdb_cxx-4.7.dylib 4.7.0 %n (>= 4.7.25-1) + %p/%lib/libdb-4.7.dylib 4.7.0 %n (>= 4.7.25-1) %type_num[-64bit] + %p/%lib/libdb_cxx-4.7.dylib 4.7.0 %n (>= 4.7.25-1) %type_num[-64bit] << DocFiles: LICENSE << SplitOff2: << Package: %N-bin - Depends: %N-shlibs (= %v-%r) + Depends: %N-shlibs (= %v-%r), ( %type_raw[-64bit] = -64bit ) 64bit-cpu Conflicts: db3-bin (<< 3.3.11-25), db31 (<< 3.1.17-2), db4-ssl-bin (<< 4.0.14-24), db4-bin (<< 4.0.14-24), db41-ssl-bin (<< 4.1.25-20), db42-ssl-bin (<< 4.2.52-14), db41-bin (<< 4.1.25-20), db42-bin (<< 4.2.52-14), db43-ssl-bin Replaces: db3-bin, db4 (<< 4.0.14-4), db31 (<< 3.1.17-2), db4-ssl-bin (<< 4.0.14-24), db4-bin (<< 4.0.14-24), db41-ssl-bin (<< 4.1.25-20), db42-ssl-bin (<< 4.2.52-14), db41-bin (<< 4.1.25-20), db42-bin (<< 4.2.52-14), db43-ssl-bin - Description: Binary utilities for db47 + Description: Binary utilities for %N Files: bin DocFiles: LICENSE PostInstScript: << @@ -81,9 +117,9 @@ << SplitOff3: << Package: %N-doc - Conflicts: db47-aes-doc - Replaces: db47-aes-doc - Description: Documentation for db47 + Conflicts: db47-aes-doc, db47-doc, db47-aes-64bit-doc, db47-64bit-doc + Replaces: db47-aes-doc, db47-doc, db47-aes-64bit-doc, db47-64bit-doc + Description: Documentation for %N Files: share/doc/db47-doc DocFiles: LICENSE << @@ -95,3 +131,4 @@ Source-MD5: 073ab7f20d24b3872a51ca762f5090e7 InfoTest: TestScript: cd test_micro; sh test_micro || exit 2 +<< Index: db3.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/db3.info,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- db3.info 30 Nov 2008 19:16:50 -0000 1.6 +++ db3.info 22 Feb 2009 21:54:31 -0000 1.7 @@ -1,6 +1,6 @@ Package: db3 Version: 3.3.11 -Revision: 1029 +Revision: 1030 CustomMirror: << nam-US: http://download-east.oracle.com/berkeley-db/ nam-US: http://download-west.oracle.com/berkeley-db/ @@ -9,8 +9,24 @@ Source: mirror:custom:db-%v.tar.gz PatchFile: %n.patch PatchFile-MD5: b7722b58d6959624bd638198ce487f93 -Conflicts: db, db4, db4-ssl, db31 (<< 3.1.17-8), db41, db41-ssl, db42-ssl, db42, db43-ssl, db43, db44, db44-aes, db47, db47-aes -Replaces: db, db4, db4-ssl, db31 (<< 3.1.17-8), db41, db41-ssl, db42-ssl, db42, db43-ssl, db43, db44, db44-aes, db47, db47-aes +Replaces: << + db, db3, db31 (<< 3.1.17-8), + db4-ssl, db4, + db41-ssl, db41, + db42-ssl, db42, + db43-ssl, db43, + db44-aes, db44, + db47-aes, db47, db47-aes-64bit, db47-64bit +<< +Conflicts: << + db, db3, db31 (<< 3.1.17-8), + db4-ssl, db4, + db41-ssl, db41, + db42-ssl, db42, + db43-ssl, db43, + db44-aes, db44, + db47-aes, db47, db47-aes-64bit, db47-64bit +<< Provides: db Depends: db3-shlibs (= %v-%r) BuildDepends: fink (>= 0.24.12-1) Index: db4.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/db4.info,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- db4.info 30 Nov 2008 19:16:50 -0000 1.6 +++ db4.info 22 Feb 2009 21:54:31 -0000 1.7 @@ -1,14 +1,30 @@ Package: db4 Version: 4.0.14 -Revision: 1027 +Revision: 1028 CustomMirror: << nam-US: http://download-east.oracle.com/berkeley-db/ nam-US: http://download-west.oracle.com/berkeley-db/ eur-UK: http://download-uk.oracle.com/berkeley-db/ << Source: mirror:custom:db-%v.tar.gz -Replaces: db, db3, db31 (<< 3.1.17-8), db4-ssl, db41, db41-ssl, db42-ssl, db42, db43-ssl, db43, db44, db44-aes, db47, db47-aes -Conflicts: db3, db31 (<< 3.1.17-8), db4-ssl, db41, db41-ssl, db42-ssl, db42, db43-ssl, db43, db44, db44-aes, db47, db47-aes +Replaces: << + db, db3, db31 (<< 3.1.17-8), + db4-ssl, db4, + db41-ssl, db41, + db42-ssl, db42, + db43-ssl, db43, + db44-aes, db44, + db47-aes, db47, db47-aes-64bit, db47-64bit +<< +Conflicts: << + db, db3, db31 (<< 3.1.17-8), + db4-ssl, db4, + db41-ssl, db41, + db42-ssl, db42, + db43-ssl, db43, + db44-aes, db44, + db47-aes, db47, db47-aes-64bit, db47-64bit +<< Depends: db4-shlibs (= %v-%r) BuildDepends: fink (>= 0.24.12-1) BuildDependsOnly: true ------------------------------------------------------------------------------ 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