diff options
| -rw-r--r-- | databases/libiodbc/Makefile | 9 | ||||
| -rw-r--r-- | databases/libiodbc/distinfo | 6 | ||||
| -rw-r--r-- | databases/libiodbc/files/patch-include::sqltypes.h | 18 | ||||
| -rw-r--r-- | databases/libiodbc/files/patch-iodbc__trace__trace.c | 22 | ||||
| -rw-r--r-- | databases/libiodbc/files/patch-iodbcinst__unicode.c | 18 |
5 files changed, 16 insertions, 57 deletions
diff --git a/databases/libiodbc/Makefile b/databases/libiodbc/Makefile index f6a3b82965ec..0d657d7d8e19 100644 --- a/databases/libiodbc/Makefile +++ b/databases/libiodbc/Makefile @@ -9,11 +9,10 @@ # databases/unixODBC. PORTNAME= libiodbc -PORTVERSION= 3.52.5 +PORTVERSION= 3.52.6 CATEGORIES= databases MASTER_SITES= http://www.iodbc.org/downloads/iODBC/ \ - ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= iodbc + SF/iodbc MAINTAINER= ports@FreeBSD.org COMMENT= An ODBC 3.x driver manager, for universal data source access @@ -22,7 +21,7 @@ CONFLICTS= unixODBC-[0-9]* USE_GNOME= gnomehack gnometarget pkgconfig USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-iodbc-inidir=${INIDIR} USE_LDCONFIG= yes @@ -34,7 +33,7 @@ LDFLAGS= ${PTHREAD_LIBS} INIDIR= ${PREFIX}/etc/${PORTNAME} .if defined(WITH_GUI) -USE_GNOME+= gtk12 +USE_GNOME+= gtk20 MAN1+= iodbcadm-gtk.1 PLIST_SUB+= GUI="" .else diff --git a/databases/libiodbc/distinfo b/databases/libiodbc/distinfo index 17efceacf011..31cd83501218 100644 --- a/databases/libiodbc/distinfo +++ b/databases/libiodbc/distinfo @@ -1,3 +1,3 @@ -MD5 (libiodbc-3.52.5.tar.gz) = 550234c4f9fbaf45e6e5d74c460dff0d -SHA256 (libiodbc-3.52.5.tar.gz) = 368b0ae7ae08d487dd53be399868530f767af9c91affd5da4cbfa89ff440d9b3 -SIZE (libiodbc-3.52.5.tar.gz) = 752941 +MD5 (libiodbc-3.52.6.tar.gz) = 761ad547467bd63ac0b2b4f3ee4b5afb +SHA256 (libiodbc-3.52.6.tar.gz) = 82e0d6a8c29759570fb92c47fcb98579caaf7951eabb7b65c414bb1209f49f20 +SIZE (libiodbc-3.52.6.tar.gz) = 757876 diff --git a/databases/libiodbc/files/patch-include::sqltypes.h b/databases/libiodbc/files/patch-include::sqltypes.h index db55629a9219..3c6c0b2a35b6 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 Thu Jan 26 18:50:59 2006 -+++ include/sqltypes.h Tue Jan 31 13:45:45 2006 -@@ -398,6 +398,7 @@ - defined(_WCHAR_T) || \ +--- include/sqltypes.h.orig Sun Oct 7 22:44:49 2007 ++++ include/sqltypes.h Sat Oct 20 01:06:36 2007 +@@ -399,6 +399,7 @@ defined(_WCHAR_T_DEFINED) || \ - defined(_WCHAR_T_DECLARED) || \ -+ defined(__FreeBSD__) || \ - defined(_BSD_WCHAR_T_DEFINED_) || \ - defined(_BSD_WCHAR_T_) - typedef wchar_t SQLWCHAR; + defined(_WCHAR_T_DEFINED_) || \ + defined(_WCHAR_T_DECLARED) || \ ++ defined(__FreeBSD__) || \ + defined(_BSD_WCHAR_T_DEFINED_) || \ + defined(_BSD_WCHAR_T_) || \ + defined(_BSD_CT_RUNE_T_) diff --git a/databases/libiodbc/files/patch-iodbc__trace__trace.c b/databases/libiodbc/files/patch-iodbc__trace__trace.c deleted file mode 100644 index 54449f40c238..000000000000 --- a/databases/libiodbc/files/patch-iodbc__trace__trace.c +++ /dev/null @@ -1,22 +0,0 @@ ---- iodbc/trace/trace.c.orig Wed Jan 3 23:21:46 2007 -+++ iodbc/trace/trace.c Wed Jan 10 16:04:57 2007 -@@ -670,6 +670,10 @@ - extern char *odbcapi_symtab[]; - char *ptr = "invalid retcode"; - -+#ifdef HAVE_GETTIMEOFDAY -+ struct timeval tv; -+#endif -+ - /* - * Guard against tracefile getting too big - */ -@@ -684,8 +688,6 @@ - * Calculate timestamp - */ - #ifdef HAVE_GETTIMEOFDAY -- struct timeval tv; -- - gettimeofday (&tv, NULL); - tv.tv_sec -= starttime.tv_sec; - tv.tv_usec -= starttime.tv_usec; diff --git a/databases/libiodbc/files/patch-iodbcinst__unicode.c b/databases/libiodbc/files/patch-iodbcinst__unicode.c deleted file mode 100644 index 30234f1cee86..000000000000 --- a/databases/libiodbc/files/patch-iodbcinst__unicode.c +++ /dev/null @@ -1,18 +0,0 @@ ---- 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) - { - #if defined (__APPLE__) && !defined (NO_FRAMEWORKS) -@@ -218,7 +219,6 @@ - return wc; - #endif - } --#endif - #endif - - #if !defined(HAVE_WCSNCASECMP) |