- Update to version 2.50.39

- Add more mirrors to MASTER_SITES
- Add a knob to control whether it gets compiled with support for iODBC or
  unixODBC
- Install some (optional) docs in DOCSDIR

Approved by:	No response from maintainer for 5 days.

8 files changed, 86 insertions, 24 deletions

diff --git a/databases/myodbc/Makefile b/databases/myodbc/Makefile
index 408cd3a..3995532 100644
--- a/databases/myodbc/Makefile
+++ b/databases/myodbc/Makefile
@@ -5,19 +5,48 @@
 # $FreeBSD$
 #
 
-PORTNAME=	MyODBC
-PORTVERSION=	2.50.34
+PORTNAME=	myodbc
+PORTVERSION=	2.50.39
 CATEGORIES=	databases
-MASTER_SITES=	ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MyODBC/
+MASTER_SITES=	http://www.mysql.com/Downloads/MyODBC/ \
+		ftp://sunsite.dk/mirrors/mysql/Downloads/MyODBC/ \
+		ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MyODBC/
+DISTNAME=	MyODBC-${PORTVERSION}
 
 MAINTAINER=	ebakke@trolltech.com
 
-LIB_DEPENDS=	iodbc.2:${PORTSDIR}/databases/libiodbc \
-		mysqlclient.10:${PORTSDIR}/databases/mysql323-client
+LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
-USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--with-mysql-libs=${PREFIX}/lib/mysql \
-		--with-mysql-includes=${PREFIX}/include/mysql
 USE_GMAKE=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ARGS=	--with-mysql-libs=${LOCALBASE}/lib/mysql \
+		--with-mysql-includes=${LOCALBASE}/include/mysql
+
+# MyODBC needs an ODBC driver manager to be installed, and it supports both
+# iODBC and unixODBC.  The following variable may be set at built-time to
+# either "iodbc" or "unixodbc", with the former being the default:
+DRIVER_MANAGER?=	iodbc
+
+.if ${DRIVER_MANAGER} == "unixodbc"
+CONFIGURE_ARGS+=	--with-odbc-ini=${LOCALBASE}/etc/odbc.ini
+LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
+.else	# assume we're using iodbc
+LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
+CONFIGURE_ARGS+=	--with-odbc-ini=${LOCALBASE}/etc/libiodbc/odbc.ini
+.endif
+
+# XXX untested
+.if defined(STATIC)
+CONFIGURE_ARGS+=	--enable-shared=no \
+			--enable-static=yes
+.endif
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@ ${MKDIR} ${DOCSDIR}
+# Install the INSTALL file as well, since it describes how to set up odbc.ini
+	@ ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCSDIR}
+	@ ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/databases/myodbc/distinfo b/databases/myodbc/distinfo
index 95f0649..33bfd6b 100644
--- a/databases/myodbc/distinfo
+++ b/databases/myodbc/distinfo
@@ -1 +1 @@
-MD5 (MyODBC-2.50.34.tar.gz) = 77df600ef2ee20472f53b9d33794abd6
+MD5 (MyODBC-2.50.39.tar.gz) = 30765641c87b7fc2c2c67dcf1cb85d7a
diff --git a/databases/myodbc/pkg-descr b/databases/myodbc/pkg-descr
index d6138e5..95e74ce 100644
--- a/databases/myodbc/pkg-descr
+++ b/databases/myodbc/pkg-descr
@@ -1,5 +1,4 @@
-MyODBC is an ODBC driver for interfacing to MySQL
-databases
+MyODBC is an ODBC driver for interfacing to MySQL databases.
 
 - Erik H. Bakke
 erikhb@bgnett.no
diff --git a/databases/myodbc/pkg-plist b/databases/myodbc/pkg-plist
index 18d05d8..bce4292 100644
--- a/databases/myodbc/pkg-plist
+++ b/databases/myodbc/pkg-plist
@@ -1,2 +1,5 @@
-lib/libmyodbc-2.50.34.so
+%%PORTDOCS%%share/doc/myodbc/INSTALL
+%%PORTDOCS%%share/doc/myodbc/README
+lib/libmyodbc-2.50.39.so
 lib/libmyodbc.so
+%%PORTDOCS%%@dirrm share/doc/myodbc
diff --git a/databases/mysql-connector-odbc/Makefile b/databases/mysql-connector-odbc/Makefile
index 408cd3a..3995532 100644
--- a/databases/mysql-connector-odbc/Makefile
+++ b/databases/mysql-connector-odbc/Makefile
@@ -5,19 +5,48 @@
 # $FreeBSD$
 #
 
-PORTNAME=	MyODBC
-PORTVERSION=	2.50.34
+PORTNAME=	myodbc
+PORTVERSION=	2.50.39
 CATEGORIES=	databases
-MASTER_SITES=	ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MyODBC/
+MASTER_SITES=	http://www.mysql.com/Downloads/MyODBC/ \
+		ftp://sunsite.dk/mirrors/mysql/Downloads/MyODBC/ \
+		ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MyODBC/
+DISTNAME=	MyODBC-${PORTVERSION}
 
 MAINTAINER=	ebakke@trolltech.com
 
-LIB_DEPENDS=	iodbc.2:${PORTSDIR}/databases/libiodbc \
-		mysqlclient.10:${PORTSDIR}/databases/mysql323-client
+LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
-USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--with-mysql-libs=${PREFIX}/lib/mysql \
-		--with-mysql-includes=${PREFIX}/include/mysql
 USE_GMAKE=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ARGS=	--with-mysql-libs=${LOCALBASE}/lib/mysql \
+		--with-mysql-includes=${LOCALBASE}/include/mysql
+
+# MyODBC needs an ODBC driver manager to be installed, and it supports both
+# iODBC and unixODBC.  The following variable may be set at built-time to
+# either "iodbc" or "unixodbc", with the former being the default:
+DRIVER_MANAGER?=	iodbc
+
+.if ${DRIVER_MANAGER} == "unixodbc"
+CONFIGURE_ARGS+=	--with-odbc-ini=${LOCALBASE}/etc/odbc.ini
+LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
+.else	# assume we're using iodbc
+LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
+CONFIGURE_ARGS+=	--with-odbc-ini=${LOCALBASE}/etc/libiodbc/odbc.ini
+.endif
+
+# XXX untested
+.if defined(STATIC)
+CONFIGURE_ARGS+=	--enable-shared=no \
+			--enable-static=yes
+.endif
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@ ${MKDIR} ${DOCSDIR}
+# Install the INSTALL file as well, since it describes how to set up odbc.ini
+	@ ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCSDIR}
+	@ ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/databases/mysql-connector-odbc/distinfo b/databases/mysql-connector-odbc/distinfo
index 95f0649..33bfd6b 100644
--- a/databases/mysql-connector-odbc/distinfo
+++ b/databases/mysql-connector-odbc/distinfo
@@ -1 +1 @@
-MD5 (MyODBC-2.50.34.tar.gz) = 77df600ef2ee20472f53b9d33794abd6
+MD5 (MyODBC-2.50.39.tar.gz) = 30765641c87b7fc2c2c67dcf1cb85d7a
diff --git a/databases/mysql-connector-odbc/pkg-descr b/databases/mysql-connector-odbc/pkg-descr
index d6138e5..95e74ce 100644
--- a/databases/mysql-connector-odbc/pkg-descr
+++ b/databases/mysql-connector-odbc/pkg-descr
@@ -1,5 +1,4 @@
-MyODBC is an ODBC driver for interfacing to MySQL
-databases
+MyODBC is an ODBC driver for interfacing to MySQL databases.
 
 - Erik H. Bakke
 erikhb@bgnett.no
diff --git a/databases/mysql-connector-odbc/pkg-plist b/databases/mysql-connector-odbc/pkg-plist
index 18d05d8..bce4292 100644
--- a/databases/mysql-connector-odbc/pkg-plist
+++ b/databases/mysql-connector-odbc/pkg-plist
@@ -1,2 +1,5 @@
-lib/libmyodbc-2.50.34.so
+%%PORTDOCS%%share/doc/myodbc/INSTALL
+%%PORTDOCS%%share/doc/myodbc/README
+lib/libmyodbc-2.50.39.so
 lib/libmyodbc.so
+%%PORTDOCS%%@dirrm share/doc/myodbc