1 files changed, 35 insertions, 9 deletions

diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index 618cae7c0029..d783c712a58c 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	freetds
-PORTVERSION=	0.52
+PORTVERSION=	0.53
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/freetds
@@ -13,22 +13,48 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
+LIB_DEPENDS=	giconv.2:${PORTSDIR}/converters/libiconv
+
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--with-tdsver=4.2 \
-		--enable-dbmfix
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--with-tdsver=4.2
 INSTALLS_SHLIB=	yes
 
+.if defined(WITH_IODBC)
+LIB_DEPENDS+=	iodbc:${PORTSDIR}/databases/libiodbc
+CONFIGURE_ARGS+=	--with-iodbc=${LOCALBASE}
+.endif
+
+.if defined(WITH_UNIXODBC)
+LIB_DEPENDS+=	odbc:${PORTSDIR}/databases/unixODBC
+CONFIGURE_ARGS+=	--with-unixodbc=${LOCALBASE}
+.endif
+
+.if defined(WITH_IODBC) || defined(WITH_UNIXODBC)
+USE_GLIB=	yes
+PLIST_SUB+=	ODBC=""
+.else
+PLIST_SUB+=	ODBC="@comment "
+.endif
+
 post-patch:
-	@find ${WRKSRC}/src -name Makefile.in | xargs ${PERL} -pi -e \
-		's| install-includeHEADERS||g'
-	@${PERL} -pi -e 's!/freetds.conf!/freetds.conf.dist!g' \
-		${WRKSRC}/Makefile.in
-	@${PERL} -pi -e 's!malloc.h!stdlib.h!' ${WRKSRC}/include/tds.h.in
+.for file in configure include/tds.h.in src/tds/iconv.c
+	@${PERL} -pi -e 's|<iconv.h>|<giconv.h>|g ; \
+		 s|-liconv|-lgiconv|g' ${WRKSRC}/${file}
+.endfor
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|/freetds.conf|/freetds.conf.dist|g ; \
+		 s|glib-config|\$$\(GLIB_CONFIG\)|g ; \
+		 s|-lglib|`\$$\(GLIB_CONFIG\) --libs glib`|g ; \
+		 s| common.h||g'
 
 post-install:
 .if !exists(${PREFIX}/etc/freetds.conf)
 	@${CP} ${PREFIX}/etc/freetds.conf.dist ${PREFIX}/etc/freetds.conf
 .endif
+	@${MKDIR} ${PREFIX}/etc/freetds
+	${INSTALL_DATA} ${WRKSRC}/interfaces ${PREFIX}/etc/freetds
 
 .include <bsd.port.mk>