6 files changed, 81 insertions, 11 deletions

diff --git a/databases/libiodbc/Makefile b/databases/libiodbc/Makefile
index 424ca992b0f2..ef868a9c42e9 100644
--- a/databases/libiodbc/Makefile
+++ b/databases/libiodbc/Makefile
@@ -4,15 +4,34 @@
 #
 # $FreeBSD$
 #
+# Note:  The location of ${INIDIR} and the installed name of the "odbctest"
+#        binary were chosen such that this port does not conflict with
+#        databases/unixODBC.
 
 PORTNAME=	libiodbc
-PORTVERSION=	2.50.3
+PORTVERSION=	3.0.5
 CATEGORIES=	databases
-MASTER_SITES=	ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MyODBC/
+MASTER_SITES=	http://www.iodbc.org/dist/
 
 MAINTAINER=	erikhb@bgnett.no
 
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
+USE_GTK=	yes
+INSTALLS_SHLIB=	yes
+INIDIR=		${PREFIX}/etc/${PORTNAME}
+CONFIGURE_ARGS=	--with-iodbc-inidir=${INIDIR}
+
+post-install:
+	@ ${MKDIR} ${PREFIX}/bin && ${INSTALL_PROGRAM} \
+	  ${WRKSRC}/samples/odbctest ${PREFIX}/bin/iodbc-odbctest
+	@ ${MKDIR} ${INIDIR} && \
+	  ${INSTALL_DATA} ${WRKSRC}/etc/odbc*.ini.sample ${INIDIR}
+.if !defined(NOPORTDOCS)
+	@ ${MKDIR} ${DOCSDIR}
+.for docfile in AUTHORS COPYING ChangeLog NEWS README
+	@ ${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR}
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/databases/libiodbc/distinfo b/databases/libiodbc/distinfo
index 47357eef1a6f..155b1db958b2 100644
--- a/databases/libiodbc/distinfo
+++ b/databases/libiodbc/distinfo
@@ -1 +1 @@
-MD5 (libiodbc-2.50.3.tar.gz) = 5d23b748d4c57d61a004395cea5ff0f0
+MD5 (libiodbc-3.0.5.tar.gz) = fea3df52843bec96293ff37a08cf1478
diff --git a/databases/libiodbc/files/patch-configure b/databases/libiodbc/files/patch-configure
new file mode 100644
index 000000000000..a1227006a8fc
--- /dev/null
+++ b/databases/libiodbc/files/patch-configure
@@ -0,0 +1,13 @@
+--- configure.orig	Mon Jun 11 16:30:50 2001
++++ configure	Tue Oct  2 12:25:50 2001
+@@ -6458,8 +6458,8 @@
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+ 
+-# Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++# Always use FreeBSD's libtool port.
++LIBTOOL='libtool'
+ 
+ # Prevent multiple expansion
+ 
diff --git a/databases/libiodbc/pkg-comment b/databases/libiodbc/pkg-comment
index f358694be834..547b40d6a56b 100644
--- a/databases/libiodbc/pkg-comment
+++ b/databases/libiodbc/pkg-comment
@@ -1 +1 @@
-ODBC library, for universal database access
+An ODBC 3.x driver manager, for universal data source access
diff --git a/databases/libiodbc/pkg-descr b/databases/libiodbc/pkg-descr
index 31c1b2c2c1ed..c33001b5a89f 100644
--- a/databases/libiodbc/pkg-descr
+++ b/databases/libiodbc/pkg-descr
@@ -1,5 +1,14 @@
-libiodbc is an ODBC implementation that allows access to a variety
-of databases
+iODBC (intrinsic Open Database Connectivity) is an ODBC driver manager that
+is compatible with the ODBC 2.x and 3.x specifications.  It performs the
+standard tasks of a driver manager, i.e. driver loading, parameter and
+function sequence checking, driver function invocation, etc.
 
-- Erik H. Bakke
-erikhb@bgnett.no
+Applications linked with the iODBC driver manager will be able - through ODBC
+function calls - to access simultaneously different types of data sources
+within one process through suitable ODBC drivers. 
+		
+iODBC is freely redistributable under either the GNU Library General Public
+Licence (LGPL) or the BSD licence.
+
+Authors: <iodbc@openlinksw.com>
+WWW:     http://www.iodbc.org/
diff --git a/databases/libiodbc/pkg-plist b/databases/libiodbc/pkg-plist
index a0e352315c47..c9d47c6158dc 100644
--- a/databases/libiodbc/pkg-plist
+++ b/databases/libiodbc/pkg-plist
@@ -1,9 +1,38 @@
-lib/libiodbc.so.2
-lib/libiodbc.so
-lib/libiodbc.a
+%%PORTDOCS%%share/doc/libiodbc/AUTHORS
+%%PORTDOCS%%share/doc/libiodbc/COPYING
+%%PORTDOCS%%share/doc/libiodbc/ChangeLog
+%%PORTDOCS%%share/doc/libiodbc/NEWS
+%%PORTDOCS%%share/doc/libiodbc/README
+bin/iodbc-config
+bin/iodbc-odbctest
+bin/iodbcadm-gtk
+etc/libiodbc/odbc.ini.sample
+etc/libiodbc/odbcinst.ini.sample
+include/iodbcinst.h
 include/isql.h
 include/isqlext.h
 include/isqltypes.h
 include/sql.h
 include/sqlext.h
 include/sqltypes.h
+lib/libdrvproxy-gtk.a
+lib/libdrvproxy-gtk.la
+lib/libdrvproxy.a
+lib/libdrvproxy.la
+lib/libdrvproxy.so
+lib/libdrvproxy.so.3
+lib/libiodbc.a
+lib/libiodbc.la
+lib/libiodbc.so
+lib/libiodbc.so.3
+lib/libiodbcadm-gtk.a
+lib/libiodbcadm-gtk.la
+lib/libiodbcadm.a
+lib/libiodbcadm.la
+lib/libiodbcadm.so
+lib/libiodbcadm.so.3
+lib/libiodbcinst.a
+lib/libiodbcinst.la
+lib/libiodbcinst.so
+lib/libiodbcinst.so.3
+%%PORTDOCS%%@dirrm share/doc/libiodbc