[21261] trunk/dports/databases/unixODBC
source_changes at macosforge.org
source_changes at macosforge.org
Wed Jan 17 22:15:28 PST 2007
Revision: 21261
http://trac.macosforge.org/projects/macports/changeset/21261
Author: markd at macports.org
Date: 2007-01-17 22:15:28 -0800 (Wed, 17 Jan 2007)
Log Message:
-----------
Closes #10950. Update to 2.2.12.
Modified Paths:
--------------
trunk/dports/databases/unixODBC/Portfile
Removed Paths:
-------------
trunk/dports/databases/unixODBC/files/patch-Drivers__txt__SQLTables.c
trunk/dports/databases/unixODBC/files/patch-SQLManageDataSources.c
trunk/dports/databases/unixODBC/files/patch-configure
Modified: trunk/dports/databases/unixODBC/Portfile
===================================================================
--- trunk/dports/databases/unixODBC/Portfile 2007-01-18 03:52:57 UTC (rev 21260)
+++ trunk/dports/databases/unixODBC/Portfile 2007-01-18 06:15:28 UTC (rev 21261)
@@ -2,7 +2,7 @@
PortSystem 1.0
name unixODBC
-version 2.2.11
+version 2.2.12
categories databases
platforms darwin
maintainers simon at cotsworth.com
@@ -24,23 +24,21 @@
master_sites ${homepage} \
ftp://ftp.easysoft.com/pub/beta/unixODBC/
-checksums md5 9ae806396844e38244cf65ad26ba0f23
+checksums md5 9a116aad4059c31d231b626ffdf1869a
# sha1 a8869c38d0f1bb18b33e5165a2a79dd8770f98b3
-depends_lib lib:libiconv.2:libiconv lib:readline:readline
+depends_lib port:libiconv port:readline
-patchfiles patch-ltmain.sh patch-Drivers__txt__SQLTables.c
+patchfiles patch-ltmain.sh
configure.env LDFLAGS=-L${prefix}/lib CPPFLAGS=-I${prefix}/include
-configure.args --enable-gui=no --with-libiconv-prefix=${prefix}
+configure.args --enable-static --enable-shared --enable-gui=no --with-libiconv-prefix=${prefix}
platform darwin 6 {
- depends_lib-append lib:libdl:dlcompat
+ depends_lib-append port:dlcompat
}
-variant darwin {
- patchfiles-append patch-configure patch-SQLManageDataSources.c
global _cc _ccr _psq1 _psq2 _nn _odbc _ex1 _ex2
set _cc "/usr/bin/gcc -bundle -flat_namespace -undefined suppress -o"
set _ccr libodbccr.1.0.0
@@ -48,10 +46,9 @@
set _psq2 libodbcpsql.2.0.0
set _nn libnn.1.0.0
set _odbc libodbc.1.0.0
-}
variant gui {
- depends_lib-append lib:libqt-mt.3:qt3 lib:libX11.6:XFree86
+ depends_lib-append lib:libX11.6:XFree86 port:qt3
configure.env-append QTDIR=${prefix}
configure.args-delete --enable-gui=no
configure.args-append --enable-gui \
@@ -64,36 +61,6 @@
}
post-destroot {
- # darwin Mach-O bundles
- if { [variant_isset darwin] } {
- system "cd ${worksrcpath}/DriverManager && \
- ${_cc} ${_odbc}.so .libs/libodbc.1.0.0.dylib && \
- ln -fs ${_odbc}.so ${destroot}${prefix}/lib/libodbc.1.so && \
- ln -fs ${_odbc}.so ${destroot}${prefix}/lib/libodbc.so"
- system "cd ${worksrcpath}/cur && \
- ${_cc} ${_ccr}.so *.o && \
- ln -fs ${_ccr}.so ${destroot}${prefix}/lib/libodbccr.1.so && \
- ln -fs ${_ccr}.so ${destroot}${prefix}/lib/libodbccr.so"
- system "cd ${worksrcpath}/Drivers/PostgreSQL && \
- ${_cc} ${_psq1}.so *.o && \
- ln -fs ${_psq1}.dylib ${destroot}${prefix}/lib/libodbcpsql.1.dylib"
- system "cd ${worksrcpath}/Drivers/Postgre7.1 && \
- ${_cc} ${_psq2}.so *.o && \
- ln -fs ${_psq2}.dylib ${destroot}${prefix}/lib/libodbcpsql.2.dylib && \
- ln -fs ${_psq2}.dylib ${destroot}${prefix}/lib/libodbcpsql.dylib"
- system "cd ${worksrcpath}/Drivers/nn && \
- ${_cc} ${_nn}.so *.o && \
- ln -fs ${_nn}.dylib ${destroot}${prefix}/lib/libnn.1.dylib && \
- ln -fs ${_nn}.dylib ${destroot}${prefix}/lib/libnn.dylib"
-
- foreach lib [list ${_psq1} ${_psq2} ${_nn}] {
- system "mv ${destroot}${prefix}/lib/$lib.so ${destroot}${prefix}/lib/$lib.dylib"
- }
-
- foreach new [list cur/${_ccr} DriverManager/${_odbc} Drivers/PostgreSQL/${_psq1} Drivers/Postgre7.1/${_psq2} Drivers/nn/${_nn}] {
- xinstall -m 0755 ${worksrcpath}/$new.so ${destroot}${prefix}/lib
- }
- }
# DOCS
xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${name}
foreach doc [glob ${worksrcpath}/\[A-Z\]*\[A-Z\]\[A-Z\]\[A-Z\] ${worksrcpath}/doc/*.\[a-z\]\[a-z\]\[a-z\]*] {
@@ -127,3 +94,4 @@
}
destroot.keepdirs ${destroot}${prefix}/etc/ODBCDataSources
}
+
Deleted: trunk/dports/databases/unixODBC/files/patch-Drivers__txt__SQLTables.c
===================================================================
--- trunk/dports/databases/unixODBC/files/patch-Drivers__txt__SQLTables.c 2007-01-18 03:52:57 UTC (rev 21260)
+++ trunk/dports/databases/unixODBC/files/patch-Drivers__txt__SQLTables.c 2007-01-18 06:15:28 UTC (rev 21261)
@@ -1,13 +0,0 @@
---- Drivers/txt/SQLTables.c.orig 2005-09-20 14:38:17.000000000 -0700
-+++ Drivers/txt/SQLTables.c 2005-09-20 14:38:42.000000000 -0700
-@@ -10,10 +10,6 @@
- *
- **********************************************************************/
-
--#ifdef OSXHEADER
--#include <i386/types.h>
--#endif
--
- #if defined(__bsdi__)
- # include <sys/types.h>
- #endif
Deleted: trunk/dports/databases/unixODBC/files/patch-SQLManageDataSources.c
===================================================================
--- trunk/dports/databases/unixODBC/files/patch-SQLManageDataSources.c 2007-01-18 03:52:57 UTC (rev 21260)
+++ trunk/dports/databases/unixODBC/files/patch-SQLManageDataSources.c 2007-01-18 06:15:28 UTC (rev 21261)
@@ -1,27 +0,0 @@
---- odbcinst/SQLManageDataSources.c.orig Mon Feb 10 09:59:46 2003
-+++ odbcinst/SQLManageDataSources.c Sat Mar 1 14:25:28 2003
-@@ -89,12 +89,19 @@
- */
-
- #ifdef SHLIBEXT
-- if ( strlen( SHLIBEXT ) > 0 )
-- sprintf( szGUILibFile, "libodbcinstQ%s.1", SHLIBEXT );
-- else
-- sprintf( szGUILibFile, "libodbcinstQ.so.1" );
-+#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" );
-+ sprintf( szGUILibFile, "libodbcinstQ.so.1" );
- #endif
-
- if ( lt_dladdsearchdir( DEFLIB_PATH ) )
Deleted: trunk/dports/databases/unixODBC/files/patch-configure
===================================================================
--- trunk/dports/databases/unixODBC/files/patch-configure 2007-01-18 03:52:57 UTC (rev 21260)
+++ trunk/dports/databases/unixODBC/files/patch-configure 2007-01-18 06:15:28 UTC (rev 21261)
@@ -1,17 +0,0 @@
---- configure.orig Wed Feb 26 10:39:13 2003
-+++ configure Fri Feb 28 12:56:39 2003
-@@ -6754,12 +6754,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*)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070117/da40d6b0/attachment.html
More information about the macports-changes
mailing list