Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/database
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9524
Modified Files:
unixodbc2-nox.info unixodbc2-nox.patch unixodbc2.info
unixodbc2.patch
Log Message:
move to stable with maintainer's permission
Index: unixodbc2-nox.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/stable/main/finkinfo/database/unixodbc2-nox.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- unixodbc2-nox.info 16 Aug 2004 13:48:42 -0000 1.4
+++ unixodbc2-nox.info 16 Apr 2005 20:41:07 -0000 1.5
@@ -1,9 +1,9 @@
Package: unixodbc2-nox
-Version: 2.2.6
+Version: 2.2.11
Revision: 10
###
-Depends: readline-shlibs (>= 4.3-15), %N-shlibs (= %v-%r)
-BuildDepends: readline (>= 4.3-15), libiconv-dev
+Depends: readline5-shlibs, %N-shlibs (= %v-%r)
+BuildDepends: readline5, libiconv-dev
BuildDependsOnly: True
Conflicts: unixodbc, unixodbc2, unixodbc-nox
Replaces: unixodbc, unixodbc2, unixodbc-nox
@@ -14,18 +14,28 @@
<<
###
Source: mirror:custom:unixODBC-%v.tar.gz
-Source-MD5: 748ce54e34b2b339c99a8b1ddaee54f5
+Source-MD5: 9ae806396844e38244cf65ad26ba0f23
###
PatchScript: <<
### FIX shared lib loading
patch -p1 < %a/%n.patch
### FIX libltdl linking
+ perl -pi -e 's,-flat_namespace -undefined suppress,-undefined
dynamic_lookup,g' libltdl/configure
perl -pi -e 's,-all_load \$convenience,-all_load,g' libltdl/configure
perl -pi -e 's,\$nonopt \$\(test \"x\$module\" = xyes \&\& echo -bundle \|\|
echo -dynamiclib\) \$allow_undefined_flag -o \$lib \$libobjs
\$deplibs\$linker_flags -install_name \$rpath/\$soname \$verstring,\$nonopt
\$\(test \"x\$module\" = xyes \&\& echo -bundle \$allow_undefined_flag \|\|
echo -dynamiclib\) -o \$lib \$libobjs \$deplibs\$linker_flags \$\(test
\"x\$module\" \!= xyes \&\& echo -install_name \$rpath/\$soname
\$verstring\),g' libltdl/configure
### FIX main linking
+ perl -pi -e 's,-flat_namespace -undefined suppress,-undefined
dynamic_lookup,g' configure
perl -pi -e 's,-all_load \$convenience,-all_load,g' configure
perl -pi -e 's,need_relink=yes,need_relink=no,g' ltmain.sh
perl -pi -e 's,\$nonopt \$\(test \"x\$module\" = xyes \&\& echo -bundle \|\|
echo -dynamiclib\) \$allow_undefined_flag -o \$lib \$libobjs
\$deplibs\$linker_flags -install_name \$rpath/\$soname \$verstring,\$nonopt
\$\(test \"x\$module\" = xyes \&\& echo -bundle \$allow_undefined_flag \|\|
echo -dynamiclib\) -o \$lib \$libobjs \$deplibs\$linker_flags \$\(test
\"x\$module\" \!= xyes \&\& echo -install_name \$rpath/\$soname
\$verstring\),g' libltdl/configure
+ ### Not sure why this was set to i386 for OSX??
+ perl -pi -e 's,i386,sys,g' Drivers/txt/SQLTables.c
+ ### Loadable modules shouldn't be versioned
+ cd Drivers; for i in `find . -name Makefile\*`; do perl -pi -e
's,version-info( [1-2]:0:0)?,avoid-version,g' $i; done
+ perl -pi -e 's,-avoid-version,-avoid-version -module,g'
Drivers/template/Makefile.in
+ cd DRVConfig; for i in `find . -name Makefile\*`; do perl -pi -e
's,version-info( [1-2]:0:0)?,avoid-version,g' $i; done
+ perl -pi -e 's,version-info( [1-2]:0:0)?,avoid-version,g'
odbcinstQ/Makefile.in
+ perl -pi -e 's,version-info [EMAIL PROTECTED]@,avoid-version,g'
samples/Makefile.in
<<
###
GCC: 3.3
@@ -51,9 +61,8 @@
Shlibs: <<
%p/lib/libgtrtst.1.dylib 2.0.0 unixodbc-nox-shlibs (>= 2.2.5-11)
%p/lib/libodbc.1.dylib 2.0.0 unixodbc-nox-shlibs (>= 2.2.5-11)
- %p/lib/libodbcextras.1.dylib 2.0.0 unixodbc-nox-shlibs (>= 2.2.5-11)
+ %p/lib/libodbccr.1.dylib 2.0.0 unixodbc-nox-shlibs (>= 2.2.11-10)
%p/lib/libodbcinst.1.dylib 2.0.0 unixodbc-nox-shlibs (>= 2.2.5-11)
- %p/lib/libtemplate.1.dylib 2.0.0 unixodbc-nox-shlibs (>= 2.2.5-11)
<<
DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README*
Drivers/MySQL/README:README.MySQL
<<
Index: unixodbc2.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/stable/main/finkinfo/database/unixodbc2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- unixodbc2.patch 18 Jun 2004 11:45:44 -0000 1.1
+++ unixodbc2.patch 16 Apr 2005 20:41:07 -0000 1.2
@@ -1,15 +1,12 @@
diff -uNr unixODBC-2.2.6/odbcinst/SQLManageDataSources.c
unixODBC-2.2.6-new/odbcinst/SQLManageDataSources.c
--- unixODBC-2.2.6/odbcinst/SQLManageDataSources.c Mon Jul 21 07:04:45 2003
+++ unixODBC-2.2.6-new/odbcinst/SQLManageDataSources.c Wed Nov 26 19:21:07 2003
-@@ -89,10 +89,17 @@
+@@ -89,10 +89,14 @@
*/
#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);
++ sprintf( szGUILibFile, "%s/libodbcinstQ.so", DEFLIB_PATH);
+#else //Darwin
if ( strlen( SHLIBEXT ) > 0 )
sprintf( szGUILibFile, "libodbcinstQ%s.1", SHLIBEXT );
Index: unixodbc2.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/stable/main/finkinfo/database/unixodbc2.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- unixodbc2.info 16 Aug 2004 13:48:42 -0000 1.4
+++ unixodbc2.info 16 Apr 2005 20:41:07 -0000 1.5
@@ -1,9 +1,9 @@
Package: unixodbc2
-Version: 2.2.6
+Version: 2.2.11
Revision: 10
###
-Depends: readline-shlibs (>= 4.3-15), libpng3-shlibs, qt3-shlibs (>=
3.2.1-11), %N-shlibs (= %v-%r)
-BuildDepends: readline (>= 4.3-15), libpng3, qt3 (>= 3.2.1-11), libiconv-dev,
libtool14
+Depends: readline5-shlibs, libpng3-shlibs, qt3-shlibs (>= 3.2.1-11), %N-shlibs
(= %v-%r)
+BuildDepends: readline5, libpng3, qt3 (>= 3.2.1-11), libiconv-dev, libtool14
BuildDependsOnly: True
Conflicts: unixodbc-nox, unixodbc2-nox, unixodbc
Replaces: unixodbc-nox, unixodbc2-nox, unixodbc
@@ -14,18 +14,28 @@
<<
###
Source: mirror:custom:unixODBC-%v.tar.gz
-Source-MD5: 748ce54e34b2b339c99a8b1ddaee54f5
+Source-MD5: 9ae806396844e38244cf65ad26ba0f23
###
PatchScript: <<
### FIX shared lib loading
patch -p1 < %a/%n.patch
### FIX libltdl linking
+ perl -pi -e 's,-flat_namespace -undefined suppress,-undefined
dynamic_lookup,g' libltdl/configure
perl -pi -e 's,-all_load \$convenience,-all_load,g' libltdl/configure
perl -pi -e 's,\$nonopt \$\(test \"x\$module\" = xyes \&\& echo -bundle \|\|
echo -dynamiclib\) \$allow_undefined_flag -o \$lib \$libobjs
\$deplibs\$linker_flags -install_name \$rpath/\$soname \$verstring,\$nonopt
\$\(test \"x\$module\" = xyes \&\& echo -bundle \$allow_undefined_flag \|\|
echo -dynamiclib\) -o \$lib \$libobjs \$deplibs\$linker_flags \$\(test
\"x\$module\" \!= xyes \&\& echo -install_name \$rpath/\$soname
\$verstring\),g' libltdl/configure
### FIX main linking
+ perl -pi -e 's,-flat_namespace -undefined suppress,-undefined
dynamic_lookup,g' configure
perl -pi -e 's,-all_load \$convenience,-all_load,g' configure
perl -pi -e 's,need_relink=yes,need_relink=no,g' ltmain.sh
perl -pi -e 's,\$nonopt \$\(test \"x\$module\" = xyes \&\& echo -bundle \|\|
echo -dynamiclib\) \$allow_undefined_flag -o \$lib \$libobjs
\$deplibs\$linker_flags -install_name \$rpath/\$soname \$verstring,\$nonopt
\$\(test \"x\$module\" = xyes \&\& echo -bundle \$allow_undefined_flag \|\|
echo -dynamiclib\) -o \$lib \$libobjs \$deplibs\$linker_flags \$\(test
\"x\$module\" \!= xyes \&\& echo -install_name \$rpath/\$soname
\$verstring\),g' libltdl/configure
+ ### Not sure why this was set to i386 for OSX??
+ perl -pi -e 's,i386,sys,g' Drivers/txt/SQLTables.c
+ ### Loadable modules shouldn't be versioned
+ cd Drivers; for i in `find . -name Makefile\*`; do perl -pi -e
's,version-info( [1-2]:0:0)?,avoid-version,g' $i; done
+ perl -pi -e 's,-avoid-version,-avoid-version -module,g'
Drivers/template/Makefile.in
+ cd DRVConfig; for i in `find . -name Makefile\*`; do perl -pi -e
's,version-info( [1-2]:0:0)?,avoid-version,g' $i; done
+ perl -pi -e 's,version-info( [1-2]:0:0)?,avoid-version,g'
odbcinstQ/Makefile.in
+ perl -pi -e 's,version-info [EMAIL PROTECTED]@,avoid-version,g'
samples/Makefile.in
<<
###
GCC: 3.3
@@ -51,9 +61,8 @@
Shlibs: <<
%p/lib/libgtrtst.1.dylib 2.0.0 unixodbc-shlibs (>= 2.2.5-11)
%p/lib/libodbc.1.dylib 2.0.0 unixodbc-shlibs (>= 2.2.5-11)
- %p/lib/libodbcextras.1.dylib 2.0.0 unixodbc-shlibs (>= 2.2.5-11)
+ %p/lib/libodbccr.1.dylib 2.0.0 unixodbc-shlibs (>= 2.2.11-10)
%p/lib/libodbcinst.1.dylib 2.0.0 unixodbc-shlibs (>= 2.2.5-11)
- %p/lib/libtemplate.1.dylib 2.0.0 unixodbc-shlibs (>= 2.2.5-11)
<<
DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README*
Drivers/MySQL/README:README.MySQL
<<
Index: unixodbc2-nox.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/stable/main/finkinfo/database/unixodbc2-nox.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- unixodbc2-nox.patch 18 Jun 2004 11:45:44 -0000 1.1
+++ unixodbc2-nox.patch 16 Apr 2005 20:41:07 -0000 1.2
@@ -1,15 +1,12 @@
diff -uNr unixODBC-2.2.6/odbcinst/SQLManageDataSources.c
unixODBC-2.2.6-new/odbcinst/SQLManageDataSources.c
--- unixODBC-2.2.6/odbcinst/SQLManageDataSources.c Mon Jul 21 07:04:45 2003
+++ unixODBC-2.2.6-new/odbcinst/SQLManageDataSources.c Wed Nov 26 19:21:07 2003
-@@ -89,10 +89,17 @@
+@@ -89,10 +89,14 @@
*/
#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);
++ sprintf( szGUILibFile, "%s/libodbcinstQ.so", DEFLIB_PATH);
+#else //Darwin
if ( strlen( SHLIBEXT ) > 0 )
sprintf( szGUILibFile, "libodbcinstQ%s.1", SHLIBEXT );
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
