Update to 0.53

PR:		33126
Submitted by:	tkato@prontomail.com

12 files changed, 130 insertions, 72 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>
diff --git a/databases/freetds-devel/distinfo b/databases/freetds-devel/distinfo
index c6964ec4d411..5d01cd729cd3 100644
--- a/databases/freetds-devel/distinfo
+++ b/databases/freetds-devel/distinfo
@@ -1 +1 @@
-MD5 (freetds-0.52.tgz) = a6cf1736705d15165adec67bd5f43612
+MD5 (freetds-0.53.tgz) = 78586f3db87f53a8097d7665a4d8f892
diff --git a/databases/freetds-devel/files/patch-aa b/databases/freetds-devel/files/patch-aa
deleted file mode 100644
index bff22c8815bb..000000000000
--- a/databases/freetds-devel/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in	Sun Jul  1 20:15:54 2001
-+++ Makefile.in.new	Thu Jul 12 09:47:43 2001
-@@ -82,7 +82,7 @@
- 
- EXTRA_DIST = interfaces freetds.conf samples/debug.c PWD BUGS
- 
--DEFDIR = $(prefix)
-+DEFDIR = $(prefix)/etc/freetds
- ETC = $(sysconfdir)
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/databases/freetds-devel/files/patch-ac b/databases/freetds-devel/files/patch-ac
deleted file mode 100644
index 6b5dc62f69b2..000000000000
--- a/databases/freetds-devel/files/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
---- include/sybdb.h	Sun Jul  1 17:57:40 2001
-+++ include/sybdb.h.new	Thu Jul 12 09:50:28 2001
-@@ -298,6 +298,11 @@
- extern	RETCODE    DBSETLUSER(LOGINREC *login, char *username);
- extern	RETCODE    DBSETLHOST(LOGINREC *login, char *hostname);
- extern	RETCODE    DBSETLAPP(LOGINREC *login, char *application);
-+
-+#ifndef DBMFIX
-+#define DBMFIX
-+#endif
-+
- #ifdef DBMFIX
- extern	DBPROCESS *tdsdbopen(LOGINREC *login,char *server);
- #define   dbopen(x,y) tdsdbopen(x,y)
diff --git a/databases/freetds-devel/files/patch-ltmain.sh b/databases/freetds-devel/files/patch-ltmain.sh
new file mode 100644
index 000000000000..682f198bad05
--- /dev/null
+++ b/databases/freetds-devel/files/patch-ltmain.sh
@@ -0,0 +1,25 @@
+--- ltmain.sh.orig	Mon Dec 17 00:39:30 2001
++++ ltmain.sh	Sun Dec 23 15:21:53 2001
+@@ -2408,6 +2408,9 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+@@ -4175,10 +4178,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/databases/freetds-devel/pkg-plist b/databases/freetds-devel/pkg-plist
index f1a58b6ca2e6..15a645c3f03c 100644
--- a/databases/freetds-devel/pkg-plist
+++ b/databases/freetds-devel/pkg-plist
@@ -24,10 +24,13 @@ lib/libct.so
 lib/libct.so.0
 lib/libsybdb.a
 lib/libsybdb.so
-lib/libsybdb.so.0
+lib/libsybdb.so.1
 lib/libtds.a
 lib/libtds.so
 lib/libtds.so.0
+%%ODBC%%lib/libtdsodbc.a
+%%ODBC%%lib/libtdsodbc.so
+%%ODBC%%lib/libtdsodbc.so.0
 lib/libtdssrv.a
 lib/libtdssrv.so
 lib/libtdssrv.so.0
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 618cae7c0029..d783c712a58c 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/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>
diff --git a/databases/freetds/distinfo b/databases/freetds/distinfo
index c6964ec4d411..5d01cd729cd3 100644
--- a/databases/freetds/distinfo
+++ b/databases/freetds/distinfo
@@ -1 +1 @@
-MD5 (freetds-0.52.tgz) = a6cf1736705d15165adec67bd5f43612
+MD5 (freetds-0.53.tgz) = 78586f3db87f53a8097d7665a4d8f892
diff --git a/databases/freetds/files/patch-aa b/databases/freetds/files/patch-aa
deleted file mode 100644
index bff22c8815bb..000000000000
--- a/databases/freetds/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in	Sun Jul  1 20:15:54 2001
-+++ Makefile.in.new	Thu Jul 12 09:47:43 2001
-@@ -82,7 +82,7 @@
- 
- EXTRA_DIST = interfaces freetds.conf samples/debug.c PWD BUGS
- 
--DEFDIR = $(prefix)
-+DEFDIR = $(prefix)/etc/freetds
- ETC = $(sysconfdir)
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/databases/freetds/files/patch-ac b/databases/freetds/files/patch-ac
deleted file mode 100644
index 6b5dc62f69b2..000000000000
--- a/databases/freetds/files/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
---- include/sybdb.h	Sun Jul  1 17:57:40 2001
-+++ include/sybdb.h.new	Thu Jul 12 09:50:28 2001
-@@ -298,6 +298,11 @@
- extern	RETCODE    DBSETLUSER(LOGINREC *login, char *username);
- extern	RETCODE    DBSETLHOST(LOGINREC *login, char *hostname);
- extern	RETCODE    DBSETLAPP(LOGINREC *login, char *application);
-+
-+#ifndef DBMFIX
-+#define DBMFIX
-+#endif
-+
- #ifdef DBMFIX
- extern	DBPROCESS *tdsdbopen(LOGINREC *login,char *server);
- #define   dbopen(x,y) tdsdbopen(x,y)
diff --git a/databases/freetds/files/patch-ltmain.sh b/databases/freetds/files/patch-ltmain.sh
new file mode 100644
index 000000000000..682f198bad05
--- /dev/null
+++ b/databases/freetds/files/patch-ltmain.sh
@@ -0,0 +1,25 @@
+--- ltmain.sh.orig	Mon Dec 17 00:39:30 2001
++++ ltmain.sh	Sun Dec 23 15:21:53 2001
+@@ -2408,6 +2408,9 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+@@ -4175,10 +4178,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/databases/freetds/pkg-plist b/databases/freetds/pkg-plist
index f1a58b6ca2e6..15a645c3f03c 100644
--- a/databases/freetds/pkg-plist
+++ b/databases/freetds/pkg-plist
@@ -24,10 +24,13 @@ lib/libct.so
 lib/libct.so.0
 lib/libsybdb.a
 lib/libsybdb.so
-lib/libsybdb.so.0
+lib/libsybdb.so.1
 lib/libtds.a
 lib/libtds.so
 lib/libtds.so.0
+%%ODBC%%lib/libtdsodbc.a
+%%ODBC%%lib/libtdsodbc.so
+%%ODBC%%lib/libtdsodbc.so.0
 lib/libtdssrv.a
 lib/libtdssrv.so
 lib/libtdssrv.so.0