From: Justin F. H. <th...@us...> - 2003-03-13 23:16:01
|
Update of /cvsroot/fink/dists/10.2/stable/main/finkinfo/database In directory sc8-pr-cvs1:/tmp/cvs-serv17155 Added Files: unixodbc2-2.2.5-1.info unixodbc2-2.2.5-1.patch unixodbc2-nox-2.2.5-1.info unixodbc2-nox-2.2.5-1.patch Log Message: Finally qt3 3.1 made it to stable, now so does unixodbc as per possitive feedback --- NEW FILE: unixodbc2-2.2.5-1.info --- Package: unixodbc2 Version: 2.2.5 Revision: 1 ### Depends: dlcompat-shlibs, readline-shlibs, libpng3-shlibs, qt3-shlibs, %N-shlibs (= %v-%r) BuildDepends: dlcompat-dev, readline, libpng3, qt3 BuildDependsOnly: True Conflicts: unixodbc-nox, unixodbc2-nox, unixodbc Replaces: unixodbc-nox, unixodbc2-nox, unixodbc ### CustomMirror: << Primary: http://www.unixodbc.com/ Secondary: ftp://ftp.easysoft.com/pub/beta/unixODBC/ << ### Source: mirror:custom:unixODBC-%v.tar.gz Source-MD5: 3d65cc539bf406fb8a49749f600ce6e5 ### Patch: %f.patch ### GCC: 3.1 ### DocFiles: COPYING ChangeLog ### ConfigureParams: --with-extra-includes=/usr/X11R6/include --with-extra-libs=/usr/X11R6/lib --disable-stats --enable-gui --with-pic --enable-shared --enable-static --with-qt-dir=%p --with-qt-includes=%p/include/qt --with-qt-libraries=%p/lib --with-libiconv-prefix=%p --mandir=%i/share/man --infodir=%p/share/info --libexecdir=%p/lib ### InstallScript: << make install prefix=%i mv %i/include/sql.h %i/include/sql.h.unixodbc mv %i/include/sqlext.h %i/include/sqlext.h.unixodbc mv %i/include/sqltypes.h %i/include/sqltypes.h.unixodbc << ### SplitOff: << Package: %N-shlibs Depends: dlcompat-shlibs Conflicts: unixodbc-nox-shlibs, unixodbc-shlibs, unixodbc2-nox-shlibs Replaces: unixodbc, unixodbc-nox, unixodbc-nox-shlibs, unixodbc-shlibs, unixodbc2-nox-shlibs Files: << lib/lib*.*.dylib << Shlibs: << %p/lib/libgtrtst.1.dylib 2.0.0 unixodbc-shlibs (>= 2.2.1-15) %p/lib/libodbc.1.dylib 2.0.0 unixodbc-shlibs (>= 2.2.1-15) %p/lib/libodbcextras.1.dylib 2.0.0 unixodbc-shlibs (>= 2.2.1-15) %p/lib/libodbcinst.1.dylib 2.0.0 unixodbc-shlibs (>= 2.2.1-15) %p/lib/libtemplate.1.dylib 2.0.0 unixodbc-shlibs (>= 2.2.1-15) << DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README* Drivers/MySQL/README:README.MySQL << ### PostInstScript: << update-alternatives --install %p/include/sql.h sql.h %p/include/sql.h.unixodbc 60 update-alternatives --install %p/include/sqlext.h sqlext.h %p/include/sqlext.h.unixodbc 60 update-alternatives --install %p/include/sqltypes.h sqltypes.h %p/include/sqltypes.h.unixodbc 60 << PreRmScript: << if [ $1 != "upgrade" ]; then update-alternatives --remove sql.h %p/include/sql.h.unixodbc update-alternatives --remove sqlext.h %p/include/sqlext.h.unixodbc update-alternatives --remove sqltypes.h %p/include/sqltypes.h.unixodbc fi << ### Description: Provides ODBC 3 connectivity for Unix DescDetail: << The unixODBC project provides UNIX applications with the same ODBC 3.51 API and facilities available under Windows. It provides a Driver Manager that supports the full ODBC API and performs the ODBC 3 to ODBC 2 translations with UNICODE to ANSI conversion. It also includes a set of graphical utilities that allow users to specify connections to DBMSes to be used by applications, a collection of ODBC drivers including a simple text based driver, an NNTP driver, a Postgres driver and others, and a selection of templates and libraries that to aid in the construction of ODBC drivers. It works with MySQL, Postgres, StarOffice, Applixware, iHTML, PHP, Perl DBD::ODBC, Paradox 9, and many other applications and drivers. Connection pooling is also provided to increase performance with applications such as PHP. << ### License: LGPL Maintainer: Justin F. Hallett <th...@us...> Homepage: http://www.unixodbc.org/ --- NEW FILE: unixodbc2-2.2.5-1.patch --- diff -ruN unixODBC-2.2.5.orig/configure unixODBC-2.2.5/configure --- unixODBC-2.2.5.orig/configure Wed Feb 26 10:39:13 2003 +++ unixODBC-2.2.5/configure Fri Feb 28 12:56:39 2003 @@ -6718,12 +6718,12 @@ # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not # yet detect zsh echo's removal of \ escapes. - archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' + archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags $(test "x$module" != xyes && echo -install_name $rpath/$soname $verstring)' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes hardcode_shlibpath_var=no - whole_archive_flag_spec='-all_load $convenience' + whole_archive_flag_spec='' ;; freebsd1*) diff -ruN unixODBC-2.2.5.orig/ltmain.sh unixODBC-2.2.5/ltmain.sh --- unixODBC-2.2.5.orig/ltmain.sh Fri Nov 15 11:21:00 2002 +++ unixODBC-2.2.5/ltmain.sh Fri Feb 28 16:23:53 2003 @@ -1742,7 +1742,7 @@ if test "$installed" = no; then notinst_deplibs="$notinst_deplibs $lib" - need_relink=yes + need_relink=no fi if test -n "$old_archive_from_expsyms_cmds"; then diff -ruN unixODBC-2.2.5.orig/odbcinst/SQLManageDataSources.c unixODBC-2.2.5/odbcinst/SQLManageDataSources.c --- unixODBC-2.2.5.orig/odbcinst/SQLManageDataSources.c Mon Feb 10 09:59:46 2003 +++ unixODBC-2.2.5/odbcinst/SQLManageDataSources.c Sat Mar 1 14:25:28 2003 @@ -72,10 +72,17 @@ * we need to find the extension to use as well */ #ifdef SHLIBEXT +#if defined(__APPLE__) && defined(__GNUC__) //Darwin + if ( strlen( SHLIBEXT ) > 0 ) + sprintf( szGUILibFile, "%s/libodbcinstQ.1.%s", DEFLIB_PATH, SHLIBEXT ); + else + sprintf( szGUILibFile, "%s/libodbcinstQ.1.so", DEFLIB_PATH); +#else //Darwin if ( strlen( SHLIBEXT ) > 0 ) sprintf( szGUILibFile, "libodbcinstQ%s.1", SHLIBEXT ); else sprintf( szGUILibFile, "libodbcinstQ.so.1" ); +#endif //Darwin #else sprintf( szGUILibFile, "libodbcinstQ.so.1" ); #endif --- NEW FILE: unixodbc2-nox-2.2.5-1.info --- Package: unixodbc2-nox Version: 2.2.5 Revision: 1 ### Depends: dlcompat-shlibs, readline-shlibs, %N-shlibs (= %v-%r) BuildDepends: dlcompat-dev, readline BuildDependsOnly: True Conflicts: unixodbc, unixodbc2, unixodbc-nox Replaces: unixodbc, unixodbc2, unixodbc-nox ### CustomMirror: << Primary: http://www.unixodbc.com/ Secondary: ftp://ftp.easysoft.com/pub/beta/unixODBC/ << ### Source: mirror:custom:unixODBC-%v.tar.gz Source-MD5: 3d65cc539bf406fb8a49749f600ce6e5 ### Patch: %f.patch ### GCC: 3.1 ### DocFiles: COPYING ChangeLog ### ConfigureParams: --disable-stats --with-libiconv-prefix=%p --disable-gui --with-pic --enable-shared --enable-static --mandir=%i/share/man --infodir=%p/share/info --libexecdir=%p/lib ### InstallScript: << make install prefix=%i mv %i/include/sql.h %i/include/sql.h.unixodbc mv %i/include/sqlext.h %i/include/sqlext.h.unixodbc mv %i/include/sqltypes.h %i/include/sqltypes.h.unixodbc << ### SplitOff: << Package: %N-shlibs Depends: dlcompat-shlibs Conflicts: unixodbc-shlibs, unixodbc-nox-shlibs, unixodbc2-shlibs Replaces: unixodbc-nox (<= 2.2.1-1), unixodbc (<= 2.2.1-2), unixodbc-shlibs, unixodbc-nox-shlibs, unixodbc2-shlibs Files: << lib/lib*.*.dylib << Shlibs: << %p/lib/libgtrtst.1.dylib 2.0.0 unixodbc-nox-shlibs (>= 2.2.1-15) %p/lib/libodbc.1.dylib 2.0.0 unixodbc-nox-shlibs (>= 2.2.1-15) %p/lib/libodbcextras.1.dylib 2.0.0 unixodbc-nox-shlibs (>= 2.2.1-15) %p/lib/libodbcinst.1.dylib 2.0.0 unixodbc-nox-shlibs (>= 2.2.1-15) %p/lib/libtemplate.1.dylib 2.0.0 unixodbc-nox-shlibs (>= 2.2.1-15) << DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README* Drivers/MySQL/README:README.MySQL << ### ### PostInstScript: << update-alternatives --install %p/include/sql.h sql.h %p/include/sql.h.unixodbc 60 update-alternatives --install %p/include/sqlext.h sqlext.h %p/include/sqlext.h.unixodbc 60 update-alternatives --install %p/include/sqltypes.h sqltypes.h %p/include/sqltypes.h.unixodbc 60 << PreRmScript: << if [ $1 != "upgrade" ]; then update-alternatives --remove sql.h %p/include/sql.h.unixodbc update-alternatives --remove sqlext.h %p/include/sqlext.h.unixodbc update-alternatives --remove sqltypes.h %p/include/sqltypes.h.unixodbc fi << ### Description: Provides ODBC 3 connectivity for Unix (No GUI) DescDetail: << The unixODBC project provides UNIX applications with the same ODBC 3.51 API and facilities available under Windows. It provides a Driver Manager that supports the full ODBC API and performs the ODBC 3 to ODBC 2 translations with UNICODE to ANSI conversion. It also includes a set of graphical utilities that allow users to specify connections to DBMSes to be used by applications, a collection of ODBC drivers including a simple text based driver, an NNTP driver, a Postgres driver and others, and a selection of templates and libraries that to aid in the construction of ODBC drivers. It works with MySQL, Postgres, StarOffice, Applixware, iHTML, PHP, Perl DBD::ODBC, Paradox 9, and many other applications and drivers. Connection pooling is also provided to increase performance with applications such as PHP. << ### License: LGPL Maintainer: Justin F. Hallett <th...@us...> Homepage: http://www.unixodbc.org/ --- NEW FILE: unixodbc2-nox-2.2.5-1.patch --- diff -ruN unixODBC-2.2.5.orig/configure unixODBC-2.2.5/configure --- unixODBC-2.2.5.orig/configure Wed Feb 26 10:39:13 2003 +++ unixODBC-2.2.5/configure Fri Feb 28 12:56:39 2003 @@ -6718,12 +6718,12 @@ # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not # yet detect zsh echo's removal of \ escapes. - archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' + archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags $(test "x$module" != xyes && echo -install_name $rpath/$soname $verstring)' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes hardcode_shlibpath_var=no - whole_archive_flag_spec='-all_load $convenience' + whole_archive_flag_spec='' ;; freebsd1*) diff -ruN unixODBC-2.2.5.orig/ltmain.sh unixODBC-2.2.5/ltmain.sh --- unixODBC-2.2.5.orig/ltmain.sh Fri Nov 15 11:21:00 2002 +++ unixODBC-2.2.5/ltmain.sh Fri Feb 28 16:23:53 2003 @@ -1742,7 +1742,7 @@ if test "$installed" = no; then notinst_deplibs="$notinst_deplibs $lib" - need_relink=yes + need_relink=no fi if test -n "$old_archive_from_expsyms_cmds"; then diff -ruN unixODBC-2.2.5.orig/odbcinst/SQLManageDataSources.c unixODBC-2.2.5/odbcinst/SQLManageDataSources.c --- unixODBC-2.2.5.orig/odbcinst/SQLManageDataSources.c Mon Feb 10 09:59:46 2003 +++ unixODBC-2.2.5/odbcinst/SQLManageDataSources.c Sat Mar 1 14:25:28 2003 @@ -72,10 +72,17 @@ * we need to find the extension to use as well */ #ifdef SHLIBEXT +#if defined(__APPLE__) && defined(__GNUC__) //Darwin + if ( strlen( SHLIBEXT ) > 0 ) + sprintf( szGUILibFile, "%s/libodbcinstQ.1.%s", DEFLIB_PATH, SHLIBEXT ); + else + sprintf( szGUILibFile, "%s/libodbcinstQ.1.so", DEFLIB_PATH); +#else //Darwin if ( strlen( SHLIBEXT ) > 0 ) sprintf( szGUILibFile, "libodbcinstQ%s.1", SHLIBEXT ); else sprintf( szGUILibFile, "libodbcinstQ.so.1" ); +#endif //Darwin #else sprintf( szGUILibFile, "libodbcinstQ.so.1" ); #endif |