aboutsummaryrefslogtreecommitdiff
path: root/databases/libiodbc
diff options
context:
space:
mode:
authorSimon Barner <barner@FreeBSD.org>2006-01-31 21:28:38 +0000
committerSimon Barner <barner@FreeBSD.org>2006-01-31 21:28:38 +0000
commit3cd345f14fbd25b2fac040f92b8e517e91b35edd (patch)
tree763c6869a20a1fb80e27edd5395c6458760cca41 /databases/libiodbc
parentc81e0aecca1aee03ad022396542d435fa90a52a4 (diff)
downloadports-3cd345f14fbd25b2fac040f92b8e517e91b35edd.tar.gz
ports-3cd345f14fbd25b2fac040f92b8e517e91b35edd.zip
Notes
Diffstat (limited to 'databases/libiodbc')
-rw-r--r--databases/libiodbc/Makefile4
-rw-r--r--databases/libiodbc/distinfo6
-rw-r--r--databases/libiodbc/files/patch-include::sqltypes.h12
-rw-r--r--databases/libiodbc/files/patch-iodbcinst__unicode.c (renamed from databases/libiodbc/files/patch-iodbc__unicode.c)10
4 files changed, 16 insertions, 16 deletions
diff --git a/databases/libiodbc/Makefile b/databases/libiodbc/Makefile
index 4a4cd8ef78a2..41b7cb13a0d9 100644
--- a/databases/libiodbc/Makefile
+++ b/databases/libiodbc/Makefile
@@ -9,7 +9,7 @@
# databases/unixODBC.
PORTNAME= libiodbc
-PORTVERSION= 3.52.3
+PORTVERSION= 3.52.4
CATEGORIES= databases
MASTER_SITES= http://www.iodbc.org/downloads/iODBC/ \
${MASTER_SITE_SOURCEFORGE}
@@ -18,7 +18,7 @@ MASTER_SITE_SUBDIR= iodbc
MAINTAINER= ports@FreeBSD.org
COMMENT= An ODBC 3.x driver manager, for universal data source access
-CONFLICTS= unixODBC-*
+CONFLICTS= unixODBC-[0-9]*
USE_GNOME= gnomehack gnometarget pkgconfig
USE_REINPLACE= yes
diff --git a/databases/libiodbc/distinfo b/databases/libiodbc/distinfo
index 0d6eaa113fec..9a1a5b78d053 100644
--- a/databases/libiodbc/distinfo
+++ b/databases/libiodbc/distinfo
@@ -1,3 +1,3 @@
-MD5 (libiodbc-3.52.3.tar.gz) = bdaca2c8b1c1b39bb3fa35ee66615373
-SHA256 (libiodbc-3.52.3.tar.gz) = 25697a711e9816b9ce33c8ab02fdee44644d85a62e620921da86215dc89482c8
-SIZE (libiodbc-3.52.3.tar.gz) = 720332
+MD5 (libiodbc-3.52.4.tar.gz) = 65ddf72600ff5d15fcd6002e2ed36307
+SHA256 (libiodbc-3.52.4.tar.gz) = 5532278a175649de2a5852085bc8cf509a88006e0653e65b1e518196ad6abc3f
+SIZE (libiodbc-3.52.4.tar.gz) = 722305
diff --git a/databases/libiodbc/files/patch-include::sqltypes.h b/databases/libiodbc/files/patch-include::sqltypes.h
index c521292aadd9..db55629a9219 100644
--- a/databases/libiodbc/files/patch-include::sqltypes.h
+++ b/databases/libiodbc/files/patch-include::sqltypes.h
@@ -1,10 +1,10 @@
---- include/sqltypes.h.orig Wed Sep 29 19:14:06 2004
-+++ include/sqltypes.h Sat Nov 13 15:26:42 2004
-@@ -387,6 +387,7 @@
- # if defined(_WCHAR_T) || \
+--- include/sqltypes.h.orig Thu Jan 26 18:50:59 2006
++++ include/sqltypes.h Tue Jan 31 13:45:45 2006
+@@ -398,6 +398,7 @@
+ defined(_WCHAR_T) || \
defined(_WCHAR_T_DEFINED) || \
defined(_WCHAR_T_DECLARED) || \
+ defined(__FreeBSD__) || \
- defined(_BSD_WCHAR_T_DEFINED_)
+ defined(_BSD_WCHAR_T_DEFINED_) || \
+ defined(_BSD_WCHAR_T_)
typedef wchar_t SQLWCHAR;
- # else
diff --git a/databases/libiodbc/files/patch-iodbc__unicode.c b/databases/libiodbc/files/patch-iodbcinst__unicode.c
index 58c4b2ec9951..30234f1cee86 100644
--- a/databases/libiodbc/files/patch-iodbc__unicode.c
+++ b/databases/libiodbc/files/patch-iodbcinst__unicode.c
@@ -1,14 +1,14 @@
---- iodbc/unicode.c.orig Tue Aug 30 22:24:12 2005
-+++ iodbc/unicode.c Thu Nov 10 13:35:19 2005
-@@ -192,6 +192,7 @@
+--- iodbcinst/unicode.c.orig Mon Jan 23 19:30:26 2006
++++ iodbcinst/unicode.c Tue Jan 31 13:51:36 2006
+@@ -197,6 +197,7 @@
#if !defined(HAVE_TOWLOWER)
#if (defined(__APPLE__) && !defined (_LP64)) || defined (macintosh)
#include <Carbon/Carbon.h>
+#endif
wchar_t towlower(wchar_t wc)
{
- #ifdef __APPLE__
-@@ -213,7 +214,6 @@
+ #if defined (__APPLE__) && !defined (NO_FRAMEWORKS)
+@@ -218,7 +219,6 @@
return wc;
#endif
}