aboutsummaryrefslogtreecommitdiff
path: root/databases/unixODBC
diff options
context:
space:
mode:
authorKirill Ponomarev <krion@FreeBSD.org>2004-11-01 17:54:04 +0000
committerKirill Ponomarev <krion@FreeBSD.org>2004-11-01 17:54:04 +0000
commit197cc790699daab32822b8f8227cb60f15733b00 (patch)
tree4c12e5625f93d64c908964ed7947be8e6fd46a06 /databases/unixODBC
parenta0053c3cd436efd5d13969a0eeb769106ea582b0 (diff)
downloadports-197cc790699daab32822b8f8227cb60f15733b00.tar.gz
ports-197cc790699daab32822b8f8227cb60f15733b00.zip
Notes
Diffstat (limited to 'databases/unixODBC')
-rw-r--r--databases/unixODBC/Makefile7
-rw-r--r--databases/unixODBC/distinfo4
-rw-r--r--databases/unixODBC/files/patch-DataManager::Makefile.in14
-rw-r--r--databases/unixODBC/files/patch-DataManagerII::Makefile.in14
-rw-r--r--databases/unixODBC/files/patch-Drivers-MiniSQL-Makefile.in19
-rw-r--r--databases/unixODBC/files/patch-ODBCConfig::Makefile.in10
-rw-r--r--databases/unixODBC/files/patch-odbcinstQ::Makefile.in10
-rw-r--r--databases/unixODBC/files/patch-odbctest::Makefile.in14
-rw-r--r--databases/unixODBC/pkg-plist19
9 files changed, 50 insertions, 61 deletions
diff --git a/databases/unixODBC/Makefile b/databases/unixODBC/Makefile
index 30d9a529d5f2..40b38d574ecb 100644
--- a/databases/unixODBC/Makefile
+++ b/databases/unixODBC/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= unixODBC
-PORTVERSION= 2.2.9
-PORTREVISION= 1
+PORTVERSION= 2.2.10
CATEGORIES= databases
MASTER_SITES= http://www.unixodbc.org/
@@ -16,9 +15,9 @@ COMMENT= ODBC library suite for Unix
CONFLICTS= libiodbc-*
-USE_GNOME= gnomehack gnometarget lthack
+USE_GNOME= gnomehack gnometarget
USE_ICONV= yes
-USE_INC_LIBTOOL_VER= 13
+USE_LIBTOOL_VER= 15
CONFIGURE_ARGS= --enable-static --enable-shared \
--with-libiconv-prefix=${LOCALBASE}
INSTALLS_SHLIB= yes
diff --git a/databases/unixODBC/distinfo b/databases/unixODBC/distinfo
index 332725c1d7db..64cdbd34e016 100644
--- a/databases/unixODBC/distinfo
+++ b/databases/unixODBC/distinfo
@@ -1,2 +1,2 @@
-MD5 (unixODBC-2.2.9.tar.gz) = 94f904febc43e8ae7e17c719908afa8e
-SIZE (unixODBC-2.2.9.tar.gz) = 2361066
+MD5 (unixODBC-2.2.10.tar.gz) = a2e9d440c70e12c22d2548aa452c43ef
+SIZE (unixODBC-2.2.10.tar.gz) = 2405528
diff --git a/databases/unixODBC/files/patch-DataManager::Makefile.in b/databases/unixODBC/files/patch-DataManager::Makefile.in
index 481f28789846..ec00104bc257 100644
--- a/databases/unixODBC/files/patch-DataManager::Makefile.in
+++ b/databases/unixODBC/files/patch-DataManager::Makefile.in
@@ -1,11 +1,11 @@
---- DataManager/Makefile.in.orig Fri Aug 23 21:15:16 2002
-+++ DataManager/Makefile.in Tue Oct 1 06:48:32 2002
-@@ -188,7 +188,7 @@
+--- DataManager/Makefile.in.orig Tue Sep 28 17:48:15 2004
++++ DataManager/Makefile.in Sun Oct 31 02:04:31 2004
+@@ -200,7 +200,7 @@
@QT_TRUE@bin_PROGRAMS = DataManager
--@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@
-+@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@ @QT_INCLUDES@ @USER_INCLUDES@
-
- @QT_TRUE@DataManager_LDADD = @X_LDFLAGS@ @QT_LDFLAGS@ @USER_LDFLAGS@ @LIB_QT@ ../odbcinst/libodbcinst.la ../DriverManager/libodbc.la
+-@QT_TRUE@INCLUDES = -I@top_srcdir@/include @QT_INCLUDES@
++@QT_TRUE@INCLUDES = -I@top_srcdir@/include @X_INCLUDES@ @QT_INCLUDES@ @USER_INCLUDES@
+ @QT_TRUE@DataManager_LDADD = @X_LDFLAGS@ \
+ @QT_TRUE@ @QT_LDFLAGS@ \
diff --git a/databases/unixODBC/files/patch-DataManagerII::Makefile.in b/databases/unixODBC/files/patch-DataManagerII::Makefile.in
index 34fe5b020841..619b51b045d8 100644
--- a/databases/unixODBC/files/patch-DataManagerII::Makefile.in
+++ b/databases/unixODBC/files/patch-DataManagerII::Makefile.in
@@ -1,11 +1,11 @@
---- DataManagerII/Makefile.in.orig Fri Aug 23 21:15:18 2002
-+++ DataManagerII/Makefile.in Tue Oct 1 06:49:39 2002
-@@ -188,7 +188,7 @@
+--- DataManagerII/Makefile.in.orig Sun Oct 31 02:06:57 2004
++++ DataManagerII/Makefile.in Sun Oct 31 02:06:57 2004
+@@ -200,7 +200,7 @@
@QT_TRUE@bin_PROGRAMS = DataManagerII
--@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@
-+@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@ @QT_INCLUDES@ @USER_INCLUDES@
-
- @QT_TRUE@DataManagerII_LDADD = @X_LDFLAGS@ @QT_LDFLAGS@ @USER_LDFLAGS@ @LIB_QT@ ../odbcinst/libodbcinst.la ../DriverManager/libodbc.la
+-@QT_TRUE@INCLUDES = -I@top_srcdir@/include @QT_INCLUDES@
++@QT_TRUE@INCLUDES = -I@top_srcdir@/include @X_INCLUDES@ @QT_INCLUDES@ @USER_INCLUDES@
+ @QT_TRUE@DataManagerII_LDADD = @X_LDFLAGS@ \
+ @QT_TRUE@ @QT_LDFLAGS@ \
diff --git a/databases/unixODBC/files/patch-Drivers-MiniSQL-Makefile.in b/databases/unixODBC/files/patch-Drivers-MiniSQL-Makefile.in
index 49d63d284aa0..edc1850a2a6d 100644
--- a/databases/unixODBC/files/patch-Drivers-MiniSQL-Makefile.in
+++ b/databases/unixODBC/files/patch-Drivers-MiniSQL-Makefile.in
@@ -1,13 +1,13 @@
---- Drivers/MiniSQL/Makefile.in.orig Tue Jun 1 03:53:12 2004
-+++ Drivers/MiniSQL/Makefile.in Tue Jun 1 03:54:45 2004
-@@ -173,13 +173,13 @@
- target_alias = @target_alias@
+--- Drivers/MiniSQL/Makefile.in.orig Tue Sep 28 17:48:19 2004
++++ Drivers/MiniSQL/Makefile.in Sun Oct 31 02:09:32 2004
+@@ -197,13 +197,13 @@
+ qt_libraries = @qt_libraries@
x_includes = @x_includes@
x_libraries = @x_libraries@
-@MSQL_TRUE@lib_LTLIBRARIES = libodbcmini.la
+#@MSQL_TRUE@lib_LTLIBRARIES = libodbcmini.la
- @MSQL_TRUE@INCLUDES = -I../../include -I. -I@msql_headers@ -I${INCLTDL}
+ @MSQL_TRUE@INCLUDES = -I@top_srcdir@/include -I. -I@msql_headers@ -I${INCLTDL}
# PAH - Redundant?
@@ -16,3 +16,12 @@
@MSQL_TRUE@libodbcmini_la_SOURCES = \
@MSQL_TRUE@ SQLAllocConnect.c \
@MSQL_TRUE@ SQLAllocEnv.c \
+@@ -439,7 +439,7 @@
+ @MSQL_TRUE@ sqlFreeConnect.lo sqlFreeEnv.lo sqlFreeStmt.lo
+ libodbcmini_la_OBJECTS = $(am_libodbcmini_la_OBJECTS)
+
+-DEFS = @DEFS@
++#DEFS = @DEFS@
+ DEFAULT_INCLUDES = -I. -I$(srcdir)
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
diff --git a/databases/unixODBC/files/patch-ODBCConfig::Makefile.in b/databases/unixODBC/files/patch-ODBCConfig::Makefile.in
index ec3a8bb89c0a..864515369a8f 100644
--- a/databases/unixODBC/files/patch-ODBCConfig::Makefile.in
+++ b/databases/unixODBC/files/patch-ODBCConfig::Makefile.in
@@ -1,11 +1,11 @@
---- ODBCConfig/Makefile.in.orig Thu Feb 27 02:42:19 2003
-+++ ODBCConfig/Makefile.in Tue Apr 22 06:22:54 2003
-@@ -176,7 +176,7 @@
+--- ODBCConfig/Makefile.in.orig Tue Sep 28 17:48:25 2004
++++ ODBCConfig/Makefile.in Sun Oct 31 02:09:58 2004
+@@ -200,7 +200,7 @@
@QT_TRUE@bin_PROGRAMS = ODBCConfig
--@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@ \
-+@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@ @QT_INCLUDES@ @USER_INCLUDES@ \
+-@QT_TRUE@INCLUDES = -I@top_srcdir@/include @QT_INCLUDES@ \
++@QT_TRUE@INCLUDES = -I@top_srcdir@/include @X_INCLUDES@ @QT_INCLUDES@ @USER_INCLUDES@ \
@QT_TRUE@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
diff --git a/databases/unixODBC/files/patch-odbcinstQ::Makefile.in b/databases/unixODBC/files/patch-odbcinstQ::Makefile.in
index 3221a6934e2b..23d5371f2d93 100644
--- a/databases/unixODBC/files/patch-odbcinstQ::Makefile.in
+++ b/databases/unixODBC/files/patch-odbcinstQ::Makefile.in
@@ -1,11 +1,11 @@
---- odbcinstQ/Makefile.in.orig Thu Feb 27 02:40:20 2003
-+++ odbcinstQ/Makefile.in Tue Apr 22 06:21:33 2003
-@@ -182,7 +182,7 @@
+--- odbcinstQ/Makefile.in.orig Tue Sep 28 17:48:35 2004
++++ odbcinstQ/Makefile.in Sun Oct 31 02:10:20 2004
+@@ -206,7 +206,7 @@
@QT_TRUE@lib_LTLIBRARIES = libodbcinstQ.la
--@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@ \
-+@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@ @QT_INCLUDES@ @USER_INCLUDES@ \
+-@QT_TRUE@INCLUDES = -I@top_srcdir@/include @QT_INCLUDES@ \
++@QT_TRUE@INCLUDES = -I@top_srcdir@/include @X_INCLUDES@ @QT_INCLUDES@ @USER_INCLUDES@ \
@QT_TRUE@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
diff --git a/databases/unixODBC/files/patch-odbctest::Makefile.in b/databases/unixODBC/files/patch-odbctest::Makefile.in
index bf4b3c667cb9..abc6df04a196 100644
--- a/databases/unixODBC/files/patch-odbctest::Makefile.in
+++ b/databases/unixODBC/files/patch-odbctest::Makefile.in
@@ -1,11 +1,11 @@
---- odbctest/Makefile.in.orig Fri Aug 23 21:15:20 2002
-+++ odbctest/Makefile.in Tue Oct 1 06:50:44 2002
-@@ -188,7 +188,7 @@
+--- odbctest/Makefile.in.orig Tue Sep 28 17:48:35 2004
++++ odbctest/Makefile.in Sun Oct 31 02:10:44 2004
+@@ -200,7 +200,7 @@
@QT_TRUE@bin_PROGRAMS = odbctest
--@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" $(INCLTDL)
-+@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@ @QT_INCLUDES@ @USER_INCLUDES@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" $(INCLTDL)
-
- @QT_TRUE@odbctest_LDADD = @X_LDFLAGS@ @QT_LDFLAGS@ @USER_LDFLAGS@ @LIB_QT@ ../odbcinst/libodbcinst.la ../DriverManager/libodbc.la $(LIBLTDL) $(LIBADD_DL)
+-@QT_TRUE@INCLUDES = -I@top_srcdir@/include @QT_INCLUDES@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" $(INCLTDL)
++@QT_TRUE@INCLUDES = -I@top_srcdir@/include @X_INCLUDES@ @QT_INCLUDES@ @USER_INCLUDES@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" $(INCLTDL)
+ @QT_TRUE@odbctest_LDADD = @X_LDFLAGS@ \
+ @QT_TRUE@ @QT_LDFLAGS@ \
diff --git a/databases/unixODBC/pkg-plist b/databases/unixODBC/pkg-plist
index 55658be7406e..f87a75c7869c 100644
--- a/databases/unixODBC/pkg-plist
+++ b/databases/unixODBC/pkg-plist
@@ -17,31 +17,24 @@ include/sqlext.h
include/sqltypes.h
include/sqlucode.h
include/uodbc_stats.h
-lib/libboundparam.a
lib/libboundparam.so
lib/libboundparam.so.1
-lib/libesoobS.a
lib/libesoobS.so
lib/libesoobS.so.1
lib/libgtrtst.a
lib/libgtrtst.so
lib/libgtrtst.so.1
-lib/libmimerS.a
lib/libmimerS.so
lib/libmimerS.so.1
-lib/libnn.a
lib/libnn.so
lib/libnn.so.1
lib/libodbc.a
lib/libodbc.so
lib/libodbc.so.1
-lib/libodbccr.a
lib/libodbccr.so
lib/libodbccr.so.1
-lib/libodbcdrvcfg1S.a
lib/libodbcdrvcfg1S.so
lib/libodbcdrvcfg1S.so.1
-lib/libodbcdrvcfg2S.a
lib/libodbcdrvcfg2S.so
lib/libodbcdrvcfg2S.so.1
lib/libodbcextras.a
@@ -50,41 +43,29 @@ lib/libodbcextras.so.1
lib/libodbcinst.a
lib/libodbcinst.so
lib/libodbcinst.so.1
-%%GUI:%%lib/libodbcinstQ.a
%%GUI:%%lib/libodbcinstQ.so
%%GUI:%%lib/libodbcinstQ.so.1
-lib/libodbcminiS.a
lib/libodbcminiS.so
lib/libodbcminiS.so.1
-lib/libodbcmyS.a
lib/libodbcmyS.so
lib/libodbcmyS.so.1
-lib/libodbcnnS.a
lib/libodbcnnS.so
lib/libodbcnnS.so.1
-lib/libodbcpsql.a
lib/libodbcpsql.so
lib/libodbcpsql.so.1
lib/libodbcpsql.so.2
-lib/libodbcpsqlS.a
lib/libodbcpsqlS.so
lib/libodbcpsqlS.so.1
-lib/libodbctxt.a
lib/libodbctxt.so
lib/libodbctxt.so.1
-lib/libodbctxtS.a
lib/libodbctxtS.so
lib/libodbctxtS.so.1
-lib/liboplodbcS.a
lib/liboplodbcS.so
lib/liboplodbcS.so.1
-lib/liboraodbcS.a
lib/liboraodbcS.so
lib/liboraodbcS.so.1
-lib/libsapdbS.a
lib/libsapdbS.so
lib/libsapdbS.so.1
-lib/libtdsS.a
lib/libtdsS.so
lib/libtdsS.so.1
lib/libtemplate.a