- Update to version 5.1.9 [1]

- Fix build when WITH_IODBC=true

PR:		ports/161832 [1]
SUbmitted by:	maintainer

1 files changed, 9 insertions, 50 deletions

diff --git a/databases/mysql-connector-odbc/Makefile b/databases/mysql-connector-odbc/Makefile
index 92145576c4de..d2e24ed38e88 100644
--- a/databases/mysql-connector-odbc/Makefile
+++ b/databases/mysql-connector-odbc/Makefile
@@ -6,33 +6,24 @@
 #
 
 PORTNAME=	mysql-connector-odbc
-PORTVERSION=	3.51.26
-DISTVERSIONSUFFIX=	r1127
-PORTREVISION=	4
+PORTVERSION=	5.1.9
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR=	Connector-ODBC/3.51
+MASTER_SITE_SUBDIR=	Connector-ODBC/5.1
 PKGNAMESUFFIX=	-${DRIVER_MANAGER}-mysql${MYSQL_VER}
 
 MAINTAINER=	sergey@network-asp.biz
 COMMENT=	ODBC driver for MySQL${MYSQL_VER} / ${DRIVER_MANAGER}
 
-USE_MYSQL=		yes
-DEFAULT_MYSQL_VER=	51
-IGNORE_WITH_MYSQL=	55
-
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool libltdl
 USE_LDCONFIG=	yes
-CFLAGS+=		-L${LOCALBASE}/lib
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--with-mysql-path=${LOCALBASE} --without-samples \
-		--disable-gui --enable-test=no
+USE_MYSQL=	yes
+DEFAULT_MYSQL_VER=	51
+USE_CMAKE=	yes
 
 PLIST_SUB=	VER=${PORTVERSION}
 
-PORTDOCS=	ChangeLog INSTALL LICENSE.exceptions LICENSE.gpl \
-		README README.debug
+PORTDOCS=	ChangeLog INSTALL \
+		README README.debug COPYING Licenses_for_Third-Party_Components.txt
 
 # MyODBC needs an ODBC driver manager to be installed, and it supports both
 # iODBC and unixODBC.
@@ -48,44 +39,12 @@ WITH_UNIXODBC?=	yes
 .if defined(WITH_UNIXODBC)
 LIB_DEPENDS+=		odbc.2:${PORTSDIR}/databases/unixODBC
 BUILD_DEPENDS=		unixODBC>=2.2.14_1:${PORTSDIR}/databases/unixODBC
-CONFIGURE_ARGS+=	--with-odbc-ini=${LOCALBASE}/etc/odbc.ini \
-			--with-unixODBC=${LOCALBASE}
-CFLAGS+=		${PTHREAD_LIBS}
+CMAKE_ARGS              += -DWITH_UNIXODBC=1
 DRIVER_MANAGER=		unixodbc
 .elif defined(WITH_IODBC)
 LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
-CONFIGURE_ARGS+=	--with-iODBC=${LOCALBASE} \
-			--with-iodbc-includes=${LOCALBASE}/include \
-			--with-iodbc-libs=${LOCALBASE}/lib \
-			--with-odbc-ini=${LOCALBASE}/etc/libiodbc/odbc.ini
-EXTRA_PATCHES=		${PATCHDIR}/myodbc-iodbc-patch
 DRIVER_MANAGER=		iodbc
-.endif
-
-post-patch:
-# Allow a new value of ODBCVER to be set at build-time
-.if defined(ODBCVER)
-	@${REINPLACE_CMD} -e "s|ODBCVER 0x0250|ODBCVER ${ODBCVER}|" ${WRKSRC}/myodbc.h
-.endif
-	@${REINPLACE_CMD} -e "s|^\(readmedir =\).*|\1 ${DOCSDIR}|" ${WRKSRC}/Makefile.in
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e " \
-	/^	/s|install-readmeDATA||; \
-	/^install-data-am:/s|install-readmeDATA||; \
-	" ${WRKSRC}/Makefile.in
-.endif
-
-# XXX untested
-.if defined(STATIC)
-CONFIGURE_ARGS+=	--enable-shared=no --enable-static=yes
-.endif
-
-post-install:
-.if !exists(${PREFIX}/lib/libmyodbc3.so.0)
-	@${LN} -s ${PREFIX}/lib/libmyodbc3-${PORTVERSION}.so ${PREFIX}/lib/libmyodbc3.so.0
-.endif
-.if !exists(${PREFIX}/lib/libmyodbc3_r.so.0)
-	@${LN} -s ${PREFIX}/lib/libmyodbc3_r-${PORTVERSION}.so ${PREFIX}/lib/libmyodbc3_r.so.0
+CFLAGS+=		-I${LOCALBASE}/include
 .endif
 
 .include <bsd.port.mk>