12 files changed, 30 insertions, 208 deletions

diff --git a/databases/libodbc++/Makefile b/databases/libodbc++/Makefile
index 6dac8384dde7..32a332b46414 100644
--- a/databases/libodbc++/Makefile
+++ b/databases/libodbc++/Makefile
@@ -6,14 +6,19 @@
 #
 
 PORTNAME=	libodbc++
-PORTVERSION=	0.2.3
-PORTREVISION=	8
+PORTVERSION=	0.2.5
+PORTREVISION=	0
 CATEGORIES=	databases devel
 MASTER_SITES=	SF/libodbcxx/libodbc%2B%2B/${PORTVERSION}
 
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	A C++ class library and toolset for ODBC access to data sources
 
+LICENSE=	GPLv2
+
+BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	pkgconfig
@@ -21,35 +26,33 @@ USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-isqlxx
 CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}"
 CXXFLAGS+=	${PTHREAD_CFLAGS}
+CPPFLAGS+=	-I${LOCALBASE}/include
 
-# libodbc++ needs an ODBC driver manager to be installed, and it supports
-# both iODBC and unixODBC.
+OPTIONS_SINGLE=	ODBC
+OPTIONS_SINGLE_ODBC=	IODBC UNIXODBC
+OPTIONS_DEFAULT=	ODBC IODBC
 
-.if defined(WITH_IODBC) && defined(WITH_UNIXODBC)
-IGNORE=		selected mutually exclusive options: WITH_IODBC and WITH_UNIXODBC
-.endif
+.include <bsd.port.options.mk>
 
-.if !defined(WITH_IODBC) && !defined(WITH_UNIXODBC)
-WITH_UNIXODBC?=	yes
-.endif
-
-.if defined(WITH_IODBC)
+.if ${PORT_OPTIONS:MIODBC}
 LIB_DEPENDS=	iodbc.3:${PORTSDIR}/databases/libiodbc
 CONFIGURE_ARGS+=	--with-iodbc=${LOCALBASE}
-.elif defined(WITH_UNIXODBC)
+.endif
+
+.if ${PORT_OPTIONS:MUNIXODBC}
 LIB_DEPENDS=	odbc.2:${PORTSDIR}/databases/unixODBC
 CONFIGURE_ARGS+=	--with-odbc=${LOCALBASE}
 .endif
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
-PORTDOCS=	INSTALL progref
+PORTDOCS=	progref
 
-.ifdef NOPORTDOCS
+.if defined(NOPORTDOCS)
 post-patch:
-	${REINPLACE_CMD} '/install-data-am:/s/install-data-local//' \
-		${WRKSRC}/doc/Makefile.in
-	${REINPLACE_CMD} '/install-data-am:/s/install-data-local//' \
-		${WRKSRC}/doc/progref/Makefile.in
+	${REINPLACE_CMD} '/^SUBDIRS/s/=.*/=/' ${WRKSRC}/doc/Makefile.in
+.else
+post-extract:
+	${RM} -f ${WRKSRC}/doc/progref/progref-stamp
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/libodbc++/distinfo b/databases/libodbc++/distinfo
index b1ffd96fd785..470a069593f6 100644
--- a/databases/libodbc++/distinfo
+++ b/databases/libodbc++/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libodbc++-0.2.3.tar.gz) = 06f93e2f828eeedaa51be51b65c8bb9324b52ce2e39530da6f9ce43f91991758
-SIZE (libodbc++-0.2.3.tar.gz) = 450097
+SHA256 (libodbc++-0.2.5.tar.bz2) = ba3030a27b34e4aafbececa2ddbbf42a38815e9534f34c051620540531b5e23e
+SIZE (libodbc++-0.2.5.tar.bz2) = 362310
diff --git a/databases/libodbc++/files/patch-Makefile.in b/databases/libodbc++/files/patch-Makefile.in
index 36d200f087e6..c91622aa820a 100644
--- a/databases/libodbc++/files/patch-Makefile.in
+++ b/databases/libodbc++/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Thu May 13 04:22:06 2004
-+++ Makefile.in	Thu May 13 04:22:20 2004
-@@ -140,7 +140,7 @@
+--- Makefile.in.orig	2009-08-21 04:41:27.000000000 +0700
++++ Makefile.in	2012-11-03 18:11:42.000000000 +0700
+@@ -244,7 +244,7 @@
+ 	m4/ac_check_odbc.m4
  
  ACLOCAL_AMFLAGS = -I m4
- 
 -pkgconfdir = $(libdir)/pkgconfig
 +pkgconfdir = $(prefix)/libdata/pkgconfig
  pkgconf_DATA = libodbc++.pc
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/databases/libodbc++/files/patch-include-odbc++-drivermanager.h b/databases/libodbc++/files/patch-include-odbc++-drivermanager.h
deleted file mode 100644
index e97854a1fa44..000000000000
--- a/databases/libodbc++/files/patch-include-odbc++-drivermanager.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/odbc++/drivermanager.h.orig	Sat Dec 16 16:35:49 2006
-+++ include/odbc++/drivermanager.h	Sat Dec 16 16:36:48 2006
-@@ -30,6 +30,7 @@
- namespace odbc {
- 
-   class Connection;
-+  class ErrorHandler;
-   
-   /** An ODBC Driver with it's information.
-    */
diff --git a/databases/libodbc++/files/patch-src-datahandler.cpp b/databases/libodbc++/files/patch-src-datahandler.cpp
deleted file mode 100644
index 7ecba7724b29..000000000000
--- a/databases/libodbc++/files/patch-src-datahandler.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/datahandler.cpp.orig	Sun Nov 12 13:34:06 2006
-+++ src/datahandler.cpp	Sun Nov 12 13:33:23 2006
-@@ -269,7 +269,7 @@
-   };
-   this->setupBuffer(bs);
- 
--  dataStatus_=new SQLINTEGER[rows_];
-+  dataStatus_=new SQLLEN[rows_];
- 
-   //set everything to NULL
-   for(unsigned int i=0; i<rows_; i++) {
diff --git a/databases/libodbc++/files/patch-src-datahandler.h b/databases/libodbc++/files/patch-src-datahandler.h
deleted file mode 100644
index 64250dae8270..000000000000
--- a/databases/libodbc++/files/patch-src-datahandler.h
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/datahandler.h.orig	Sun Nov 12 13:34:24 2006
-+++ src/datahandler.h	Sun Nov 12 13:33:01 2006
-@@ -48,7 +48,7 @@
-     size_t rows_;
-     char* buffer_;
-     size_t bufferSize_;
--    SQLINTEGER* dataStatus_;
-+    SQLLEN* dataStatus_;
-     bool isStreamed_;
-     ODBCXX_STREAM* stream_;
-     bool ownStream_;
-@@ -84,11 +84,11 @@
-       return &buffer_[bufferSize_*currentRow_];
-     }
- 
--    void setDataStatus(SQLINTEGER i) {
-+    void setDataStatus(SQLLEN i) {
-       dataStatus_[currentRow_]=i;
-     }
-     
--    SQLINTEGER getDataStatus() const {
-+    SQLLEN getDataStatus() const {
-       return dataStatus_[currentRow_];
-     }
- 
diff --git a/databases/libodbc++/files/patch-src-datastream.cpp b/databases/libodbc++/files/patch-src-datastream.cpp
deleted file mode 100644
index b3a220c20798..000000000000
--- a/databases/libodbc++/files/patch-src-datastream.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/datastream.cpp.orig	Sun Nov 12 13:36:46 2006
-+++ src/datastream.cpp	Sun Nov 12 13:39:05 2006
-@@ -30,7 +30,7 @@
- #if !defined(ODBCXX_QT)
- 
- DataStreamBuf::DataStreamBuf(ErrorHandler* eh, SQLHSTMT hstmt, int col, 
--			     int cType,SQLINTEGER& dataStatus)
-+			     int cType,SQLLEN& dataStatus)
-   :errorHandler_(eh), 
-    hstmt_(hstmt), 
-    column_(col), 
-@@ -78,7 +78,7 @@
-   
-   //after the call, this is the number of bytes that were 
-   //available _before_ the call
--  SQLINTEGER bytes;
-+  SQLLEN bytes;
- 
-   //the actual number of bytes that should end up in our buffer
-   //we don't care about NULL termination
-@@ -134,7 +134,7 @@
- // really ugly
- 
- DataStream::DataStream(ErrorHandler* eh, SQLHSTMT hstmt, int col, 
--		       int cType,SQLINTEGER& dataStatus)
-+		       int cType,SQLLEN& dataStatus)
-   :errorHandler_(eh), 
-    hstmt_(hstmt), 
-    column_(col), 
diff --git a/databases/libodbc++/files/patch-src-datastream.h b/databases/libodbc++/files/patch-src-datastream.h
deleted file mode 100644
index a33c0f879f27..000000000000
--- a/databases/libodbc++/files/patch-src-datastream.h
+++ /dev/null
@@ -1,44 +0,0 @@
---- src/datastream.h.orig	Mon Apr 21 16:28:38 2003
-+++ src/datastream.h	Sun Nov 12 13:36:35 2006
-@@ -49,7 +49,7 @@
-     SQLHSTMT hstmt_;
-     int column_;
-     int cType_;
--    SQLINTEGER& dataStatus_;
-+    SQLLEN& dataStatus_;
-     size_t bufferSize_;
- 
-     virtual int underflow();
-@@ -63,7 +63,13 @@
-       return 0;
-     }
-     
--    virtual int showmanyc() {
-+    virtual
-+#if !defined(ODBCXX_HAVE_ISO_CXXLIB) 
-+    int
-+#else
-+    std::streamsize
-+#endif
-+    showmanyc() {
-       if(this->gptr() < this->egptr()) {
- 	return this->egptr() - this->gptr();
-       }
-@@ -71,7 +77,7 @@
-     }
- 
-     DataStreamBuf(ErrorHandler* eh, SQLHSTMT hstmt, int col, int cType,
--		  SQLINTEGER& dataStatus);
-+		  SQLLEN& dataStatus);
-     virtual ~DataStreamBuf();
-   };
- 
-@@ -102,7 +108,7 @@
-     friend class Rowset;
-   private:
-     DataStream(ErrorHandler* eh, SQLHSTMT hstmt, int column, int cType,
--	       SQLINTEGER& ds)
-+	       SQLLEN& ds)
-       :
- #if !defined(ODBCXX_HAVE_ISO_CXXLIB)
-       DataStreamBase(eh,hstmt,column,cType,ds),std::istream(this->rdbuf())
diff --git a/databases/libodbc++/files/patch-src-preparedstatement.cpp b/databases/libodbc++/files/patch-src-preparedstatement.cpp
deleted file mode 100644
index c40fed6ed88e..000000000000
--- a/databases/libodbc++/files/patch-src-preparedstatement.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/preparedstatement.cpp.orig	Tue Jun 12 10:38:32 2001
-+++ src/preparedstatement.cpp	Fri Feb 23 05:23:46 2007
-@@ -161,7 +161,7 @@
-   numParams_=np;
-   
-   SQLSMALLINT sqlType;
--  SQLUINTEGER prec;
-+  SQLULEN prec;
-   SQLSMALLINT scale;
-   SQLSMALLINT nullable;
- 
-@@ -303,7 +303,7 @@
-       r=SQLParamData(hstmt_,&currentCol);
-       this->_checkStmtError(hstmt_,r,"SQLParamData failure");
-       if(r==SQL_NEED_DATA) {
--	DataHandler* dh=rowset_->getColumn((int)currentCol);
-+	DataHandler* dh=rowset_->getColumn((long)currentCol);
- 
- 	assert(dh->isStreamed_);
- 	
diff --git a/databases/libodbc++/files/patch-src-resultset.cpp b/databases/libodbc++/files/patch-src-resultset.cpp
deleted file mode 100644
index fee2c3925aae..000000000000
--- a/databases/libodbc++/files/patch-src-resultset.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/resultset.cpp.orig	Fri Feb 23 05:24:16 2007
-+++ src/resultset.cpp	Fri Feb 23 05:24:27 2007
-@@ -528,7 +528,7 @@
-       r=SQLParamData(hstmt_,&currentCol);
-       this->_checkStmtError(hstmt_,r,"SQLParamData failure");
-       if(r==SQL_NEED_DATA) {
--	DataHandler* dh=rowset_->getColumn((int)currentCol);
-+	DataHandler* dh=rowset_->getColumn((long)currentCol);
- 
- 	assert(dh->isStreamed_);
- 
diff --git a/databases/libodbc++/files/patch-src-resultsetmetadata.cpp b/databases/libodbc++/files/patch-src-resultsetmetadata.cpp
deleted file mode 100644
index febd474e7c47..000000000000
--- a/databases/libodbc++/files/patch-src-resultsetmetadata.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/resultsetmetadata.cpp.orig	Sun Nov 12 13:38:01 2006
-+++ src/resultsetmetadata.cpp	Sun Nov 12 13:38:32 2006
-@@ -39,7 +39,7 @@
- int ResultSetMetaData::_getNumericAttribute(unsigned int col,
- 					   SQLUSMALLINT attr)
- {
--  SQLINTEGER res=0;
-+  SQLLEN res=0;
-   SQLRETURN r=
-     ODBC3_C(SQLColAttribute,SQLColAttributes)(resultSet_->hstmt_,
- 					      (SQLUSMALLINT)col,
-@@ -63,7 +63,7 @@
-   odbc::Deleter<char> _buf(buf,true);
-   buf[maxlen]=0;
- 
--  SQLINTEGER res=0;
-+  SQLLEN res=0;
-   SQLSMALLINT len=0;
- 
-   SQLRETURN r=
diff --git a/databases/libodbc++/files/patch-src-statement.cpp b/databases/libodbc++/files/patch-src-statement.cpp
deleted file mode 100644
index 2f0e536d65d1..000000000000
--- a/databases/libodbc++/files/patch-src-statement.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/statement.cpp.orig	Sun Nov 12 13:26:35 2006
-+++ src/statement.cpp	Sun Nov 12 13:26:47 2006
-@@ -672,7 +672,7 @@
- 
-   if(lastExecute_!=ODBC3_C(SQL_NO_DATA,SQL_NO_DATA_FOUND)) {
- 
--    SQLINTEGER res;
-+    SQLLEN res;
-     SQLRETURN r=SQLRowCount(hstmt_,&res);
-     this->_checkStmtError(hstmt_,r,"Error fetching update count");
-     return res;