[47896] trunk/dports/databases/unixODBC

[alakazam at macports.org]

Revision: 47896
          http://trac.macports.org/changeset/47896
Author:   alakazam at macports.org
Date:     2009-03-09 11:32:43 -0700 (Mon, 09 Mar 2009)
Log Message:
-----------
Fix empty defines in the UnixODBC headers. Closes #18769

Modified Paths:
--------------
    trunk/dports/databases/unixODBC/Portfile

Added Paths:
-----------
    trunk/dports/databases/unixODBC/files/patch-odbc-config.c.diff
    trunk/dports/databases/unixODBC/files/patch-sqltypes.h.diff

Modified: trunk/dports/databases/unixODBC/Portfile
===================================================================
--- trunk/dports/databases/unixODBC/Portfile	2009-03-09 17:52:27 UTC (rev 47895)
+++ trunk/dports/databases/unixODBC/Portfile	2009-03-09 18:32:43 UTC (rev 47896)
@@ -4,6 +4,7 @@
 
 name                unixODBC
 version             2.2.14
+revision            1
 categories          databases
 platforms           darwin
 maintainers         alakazam simon at cotsworth.com
@@ -35,7 +36,7 @@
 
 depends_lib         port:libiconv port:readline
 
-patchfiles          patch-ltmain.sh
+patchfiles          patch-ltmain.sh patch-odbc-config.c.diff patch-sqltypes.h.diff
 
 configure.args      --enable-static --enable-shared --enable-gui=no \
                     --with-libiconv-prefix=${prefix}

Added: trunk/dports/databases/unixODBC/files/patch-odbc-config.c.diff
===================================================================
--- trunk/dports/databases/unixODBC/files/patch-odbc-config.c.diff	                        (rev 0)
+++ trunk/dports/databases/unixODBC/files/patch-odbc-config.c.diff	2009-03-09 18:32:43 UTC (rev 47896)
@@ -0,0 +1,19 @@
+--- exe/odbc-config.c.orig	2008-05-20 08:58:17.000000000 -0400
++++ exe/odbc-config.c	2009-03-08 14:04:15.000000000 -0400
+@@ -66,12 +66,12 @@
+     printf( "#ifndef HAVE_LONG_LONG\n #define HAVE_LONG_LONG\n#endif\n" );
+ #endif
+ 
+-#ifdef ODBCINT64
+-    printf( "#ifndef ODBCINT64\n #define ODBCINT64\n#endif\n" );
++#ifdef ODBCINT64_TYPE
++    printf( "#ifndef ODBCINT64\n #define ODBCINT64 %s\n#endif\n", ODBCINT64_TYPE );
+ #endif
+ 
+-#ifdef UODBCINT64
+-    printf( "#ifndef UODBCINT64\n #define UODBCINT64\n#endif\n" );
++#ifdef UODBCINT64_TYPE
++    printf( "#ifndef UODBCINT64\n #define UODBCINT64 %s\n#endif\n", UODBCINT64_TYPE );
+ #endif
+ 
+ #ifdef DISABLE_INI_CACHING

Added: trunk/dports/databases/unixODBC/files/patch-sqltypes.h.diff
===================================================================
--- trunk/dports/databases/unixODBC/files/patch-sqltypes.h.diff	                        (rev 0)
+++ trunk/dports/databases/unixODBC/files/patch-sqltypes.h.diff	2009-03-09 18:32:43 UTC (rev 47896)
@@ -0,0 +1,35 @@
+--- include/sqltypes.h.orig	2009-03-08 14:07:26.000000000 -0400
++++ include/sqltypes.h	2009-03-08 14:07:28.000000000 -0400
+@@ -49,7 +49,7 @@
+  */
+ 
+ #ifndef SIZEOF_LONG_INT
+-#include <unixodbc_conf.h>
++#include "unixodbc_conf.h"
+ #endif
+ 
+ #ifndef SIZEOF_LONG_INT
+@@ -371,10 +371,14 @@
+ # if (SIZEOF_LONG_INT == 8)
+ #   define ODBCINT64	    long
+ #   define UODBCINT64	unsigned long
++#   define ODBCINT64_TYPE	    "long"
++#   define UODBCINT64_TYPE	"unsigned long"
+ # else
+ #  ifdef HAVE_LONG_LONG
+ #   define ODBCINT64	    long long
+ #   define UODBCINT64	unsigned long long
++#   define ODBCINT64_TYPE	    "long long"
++#   define UODBCINT64_TYPE	"unsigned long long"
+ #  else
+ /*
+  * may fail in some cases, but what else can we do ?
+@@ -391,6 +395,8 @@
+ };
+ #   define ODBCINT64	    struct __bigint_struct
+ #   define UODBCINT64	struct __bigint_struct_u
++#   define ODBCINT64_TYPE	    "struct __bigint_struct"
++#   define UODBCINT64_TYPE	"struct __bigint_struct_u"
+ #  endif
+ # endif
+ #endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090309/6d394366/attachment.html>