diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index e1de65e8baad..3435db30efea 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -1,95 +1,97 @@
 PORTNAME=	freetds
 PORTVERSION=	1.4.144
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	https://www.freetds.org/files/current/ \
 		ftp://ftp.freetds.org/pub/freetds/current/
 PKGNAMESUFFIX=	-devel
 DISTNAME=	${PORTNAME}-dev.${PORTVERSION}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Sybase/Microsoft TDS protocol library - nightly snapshot
 WWW=		http://www.freetds.org/
 
 LICENSE=	LGPL20
 
-USES=		autoreconf compiler:c11 cpe gettext-tools gmake iconv \
+USES=		compiler:c11 cpe gettext-tools gmake iconv \
 	libtool:keepla localbase:ldflags pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--prefix=${PREFIX} \
+		--docdir=${DOCSDIR} \
 		--enable-msdblib \
 		--enable-sybase-compat \
 		--sysconfdir=${ETCDIR} \
-		--with-tdsver=${TDS_VER}
+		--with-tdsver=${TDS_VER} \
+		--mandir=${PREFIX}/share/man
 
 INSTALL_TARGET=	install-strip
 
 CONFLICTS_INSTALL=	freetds # etc/freetds/freetds.conf.sample
 
 PORTSCOUT=	limit:^\d+\.\d+\.\d{3}$
 SUB_FILES=	pkg-message
 WRKSRC=		${WRKDIR}/${PORTNAME}-dev.${PORTVERSION}
 
 PORTDOCS=	*
 
 TDS_VER?=	7.4
 
 OPTIONS_DEFINE=		DOCS ODBCWIDE
 OPTIONS_DEFAULT=	OPENSSL
 OPTIONS_RADIO=		ODBC
 OPTIONS_RADIO_ODBC=	IODBC UNIXODBC
 OPTIONS_SINGLE=		SSL
 OPTIONS_SINGLE_SSL=	GNUTLS OPENSSL
 ODBCWIDE_DESC=		Enable Wide ODBC Support
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ON=	--with-gnutls
 IODBC_LIB_DEPENDS=	libiodbc.so:databases/libiodbc
 IODBC_CONFIGURE_ON=	--with-iodbc=${LOCALBASE}
 IODBC_CPPFLAGS=		-I${LOCALBASE}/include/libiodbc
 ODBCWIDE_CONFIGURE_ON=	--enable-odbc-wide
 OPENSSL_USES=		ssl
 OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
 UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 UNIXODBC_CONFIGURE_ON=	--with-unixodbc=${LOCALBASE}
 
 .include <bsd.port.options.mk>
 .if ${PORT_OPTIONS:MIODBC} || ${PORT_OPTIONS:MUNIXODBC}
 PLIST_SUB+=	ODBC=""
 .else
 PLIST_SUB+=	ODBC="@comment "
 .endif
 
 post-extract:
 	@cd ${WRKSRC} && ${LN} -s freetds.conf freetds.conf.sample
 	@cd ${WRKSRC} && ${LN} -s locales.conf locales.conf.sample
 	@cd ${WRKSRC}/src/pool && ${LN} -s pool.conf pool.conf.sample
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|libgnutls-config|pkg-config gnutls|g' \
 		${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.am" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|/pool.conf|/pool.conf.sample|g ; \
-		 s| common.h||g ; \
-		 s|%%DOCSDIR%%|${STAGEDIR}${DOCSDIR}|g ; \
-		 s|%%ICONV_LIB%%|${ICONV_LIB}|'
+	@${REINPLACE_CMD} -e 's|/pool.conf|/pool.conf.sample|g' \
+		${WRKSRC}/src/pool/Makefile.in
 	@${REINPLACE_CMD} -e 's|/freetds.conf|/freetds.conf.sample|g ; \
-		 s|/locales.conf|/locales.conf.sample|g' ${WRKSRC}/Makefile.am
+		s|/locales.conf|/locales.conf.sample|g' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|$$ODBC_INC/isql.h|$$ODBC_INC/libiodbc/isql.h|g ; \
 		s|$$ODBC_INC/isqlext.h|$$ODBC_INC/libiodbc/isqlext.h|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|@LIBS@|@LIBS@ ${ICONV_LIB}|g' \
+		${WRKSRC}/src/tds/Makefile.in
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/interfaces ${STAGEDIR}${ETCDIR}/interfaces.sample
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/userguide
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/reference
 	@${FIND} ${WRKSRC}/doc/userguide \( -type f -o -type l \) \
 		-exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/userguide ';'
 	@${FIND} ${WRKSRC}/doc/reference \( -type f -o -type l \) \
 		-exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/reference ';'
 	@cd ${WRKSRC}/doc && \
 		${COPYTREE_SHARE} images ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/freetds-devel/files/patch-src_tds_Makefile.in b/databases/freetds-devel/files/patch-src_tds_Makefile.in
deleted file mode 100644
index ee7e9d3d1888..000000000000
--- a/databases/freetds-devel/files/patch-src_tds_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/tds/Makefile.in.orig	2015-05-24 09:01:31 UTC
-+++ src/tds/Makefile.in
-@@ -297,7 +297,7 @@ LIBADD_DLOPEN = @LIBADD_DLOPEN@
- LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
- LIBICONV = @LIBICONV@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ %%ICONV_LIB%%
- LIBTOOL = @LIBTOOL@
- LIPO = @LIPO@
- LN_S = @LN_S@
diff --git a/databases/freetds-devel/pkg-plist b/databases/freetds-devel/pkg-plist
index a0980bcb75a6..b0eb285899d0 100644
--- a/databases/freetds-devel/pkg-plist
+++ b/databases/freetds-devel/pkg-plist
@@ -1,48 +1,48 @@
 bin/bsqldb
 bin/datacopy
 bin/defncopy
 bin/fisql
 bin/freebcp
 bin/osql
 bin/tdspool
 bin/tsql
 @sample %%ETCDIR%%/freetds.conf.sample
 @sample %%ETCDIR%%/interfaces.sample
 @sample %%ETCDIR%%/locales.conf.sample
 @sample %%ETCDIR%%/pool.conf.sample
 include/bkpublic.h
 include/cspublic.h
 include/cstypes.h
 include/ctpublic.h
 include/sqldb.h
 include/sqlfront.h
 include/sybdb.h
 include/syberror.h
 include/sybfront.h
 include/tds_sysdep_public.h
 include/odbcss.h
-man/man1/datacopy.1.gz
-man/man1/freebcp.1.gz
-man/man1/tsql.1.gz
-man/man1/bsqldb.1.gz
-man/man1/bsqlodbc.1.gz
-man/man1/defncopy.1.gz
-man/man1/fisql.1.gz
-man/man1/osql.1.gz
-man/man5/freetds.conf.5.gz
+share/man/man1/datacopy.1.gz
+share/man/man1/freebcp.1.gz
+share/man/man1/tsql.1.gz
+share/man/man1/bsqldb.1.gz
+share/man/man1/bsqlodbc.1.gz
+share/man/man1/defncopy.1.gz
+share/man/man1/fisql.1.gz
+share/man/man1/osql.1.gz
+share/man/man5/freetds.conf.5.gz
 lib/libct.a
 lib/libct.la
 lib/libct.so
 lib/libct.so.4
 lib/libct.so.4.0.0
 lib/libsybdb.a
 lib/libsybdb.la
 lib/libsybdb.so
 lib/libsybdb.so.5
 lib/libsybdb.so.5.1.0
 %%ODBC%%lib/libtdsodbc.so.0.0.0
 %%ODBC%%lib/libtdsodbc.so.0
 %%ODBC%%lib/libtdsodbc.so
 %%ODBC%%lib/libtdsodbc.la
 %%ODBC%%lib/libtdsodbc.a
 %%ODBC%%bin/bsqlodbc