14 files changed, 50 insertions, 146 deletions

diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index 97d2390e8af2..97759a7e983b 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	freetds
-PORTVERSION=	0.53
-PORTREVISION=	2
+PORTVERSION=	0.60
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/freetds
@@ -16,14 +15,16 @@ MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
+USE_GMAKE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-tdsver=4.2
 INSTALLS_SHLIB=	yes
 
+MAN1=		freebcp.1 tsql.1
+
 .if defined(WITH_IODBC)
 LIB_DEPENDS+=	iodbc:${PORTSDIR}/databases/libiodbc
 CONFIGURE_ARGS+=	--with-iodbc=${LOCALBASE}
@@ -35,18 +36,17 @@ CONFIGURE_ARGS+=	--with-unixodbc=${LOCALBASE}
 .endif
 
 .if defined(WITH_IODBC) || defined(WITH_UNIXODBC)
-USE_GNOMENG=	yes
-USE_GNOME=	glib12
 PLIST_SUB+=	ODBC=""
 .else
 PLIST_SUB+=	ODBC="@comment "
 .endif
 
+post-extract:
+	@cd ${WRKSRC} && ${LN} -s freetds.conf freetds.conf.dist
+
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -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:
diff --git a/databases/freetds-devel/distinfo b/databases/freetds-devel/distinfo
index 5d01cd729cd3..f315ef067070 100644
--- a/databases/freetds-devel/distinfo
+++ b/databases/freetds-devel/distinfo
@@ -1 +1 @@
-MD5 (freetds-0.53.tgz) = 78586f3db87f53a8097d7665a4d8f892
+MD5 (freetds-0.60.tgz) = bf719c9e1a5f8cd080dec6f9664e7f44
diff --git a/databases/freetds-devel/files/patch-ab b/databases/freetds-devel/files/patch-ab
deleted file mode 100644
index bef8119b47e0..000000000000
--- a/databases/freetds-devel/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/tds/config.c	Tue Jun 19 05:22:00 2001
-+++ src/tds/config.c.new	Thu Jul 12 09:49:08 2001
-@@ -609,7 +609,7 @@
-       char  *sybase = getenv("SYBASE");
-       if (sybase!=NULL && sybase[0]!='\0')
-       {
--         search_interface_file(sybase, "interfaces", server, ip_addr, ip_port, tds_ver);
-+         search_interface_file(sybase, "etc/freetds/interfaces", server, ip_addr, ip_port, tds_ver);
-       } else {
-          search_interface_file("/etc/freetds", "interfaces", server, ip_addr, ip_port, tds_ver);
-       }
diff --git a/databases/freetds-devel/files/patch-configure b/databases/freetds-devel/files/patch-configure
new file mode 100644
index 000000000000..2b918f44ba6d
--- /dev/null
+++ b/databases/freetds-devel/files/patch-configure
@@ -0,0 +1,12 @@
+--- configure.orig	Thu Sep 12 01:35:52 2002
++++ configure	Fri Sep 13 20:20:20 2002
+@@ -2241,7 +2241,8 @@
+ 
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
++LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/databases/freetds-devel/files/patch-iconv-linkage b/databases/freetds-devel/files/patch-iconv-linkage
deleted file mode 100644
index 21ea02f658eb..000000000000
--- a/databases/freetds-devel/files/patch-iconv-linkage
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/ctlib/Makefile.in.orig	Sat Mar 30 17:14:45 2002
-+++ src/ctlib/Makefile.in	Sat Mar 30 17:15:17 2002
-@@ -104,3 +104,3 @@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ $(LIBICONV)
- libct_la_LDFLAGS = 
---- src/dblib/Makefile.in.orig	Sat Mar 30 17:14:45 2002
-+++ src/dblib/Makefile.in	Sat Mar 30 17:15:30 2002
-@@ -105,3 +105,3 @@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ $(LIBICONV)
- libsybdb_la_DEPENDENCIES =  $(patsubst %, $(TDSDIR)/%, $(patsubst %.c, \
---- src/odbc/Makefile.in.orig	Sat Mar 30 17:14:45 2002
-+++ src/odbc/Makefile.in	Sat Mar 30 17:15:50 2002
-@@ -103,3 +103,3 @@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ $(LIBICONV)
- libtdsodbc_la_LDFLAGS = 
---- src/tds/Makefile.in.orig	Sat Mar 30 17:14:45 2002
-+++ src/tds/Makefile.in	Sat Mar 30 17:16:42 2002
-@@ -90,3 +90,3 @@
- INCLUDES = -I$(top_srcdir)/include
--LIBS = @LIBICONV@
-+LIBS = @LIBICONV@ $(LIBICONV)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/databases/freetds-devel/files/patch-ltmain.sh b/databases/freetds-devel/files/patch-ltmain.sh
deleted file mode 100644
index 682f198bad05..000000000000
--- a/databases/freetds-devel/files/patch-ltmain.sh
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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 15a645c3f03c..de049b6cc628 100644
--- a/databases/freetds-devel/pkg-plist
+++ b/databases/freetds-devel/pkg-plist
@@ -1,6 +1,9 @@
+bin/freebcp
+bin/tsql
 @unexec if cmp -s %D/etc/freetds.conf.dist %D/etc/freetds.conf; then rm -f %D/etc/freetds.conf; fi
 etc/freetds.conf.dist
 @exec if [ ! -f %D/etc/freetds.conf ]; then cp %D/etc/%f %D/etc/freetds.conf; fi
+etc/locales.conf
 etc/freetds/interfaces
 include/bkpublic.h
 include/cspublic.h
@@ -8,6 +11,7 @@ include/cstypes.h
 include/ctlib.h
 include/ctpublic.h
 include/dblib.h
+include/freebcp.h
 include/sqldb.h
 include/sqlfront.h
 include/sybdb.h
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 97d2390e8af2..97759a7e983b 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	freetds
-PORTVERSION=	0.53
-PORTREVISION=	2
+PORTVERSION=	0.60
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/freetds
@@ -16,14 +15,16 @@ MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
+USE_GMAKE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-tdsver=4.2
 INSTALLS_SHLIB=	yes
 
+MAN1=		freebcp.1 tsql.1
+
 .if defined(WITH_IODBC)
 LIB_DEPENDS+=	iodbc:${PORTSDIR}/databases/libiodbc
 CONFIGURE_ARGS+=	--with-iodbc=${LOCALBASE}
@@ -35,18 +36,17 @@ CONFIGURE_ARGS+=	--with-unixodbc=${LOCALBASE}
 .endif
 
 .if defined(WITH_IODBC) || defined(WITH_UNIXODBC)
-USE_GNOMENG=	yes
-USE_GNOME=	glib12
 PLIST_SUB+=	ODBC=""
 .else
 PLIST_SUB+=	ODBC="@comment "
 .endif
 
+post-extract:
+	@cd ${WRKSRC} && ${LN} -s freetds.conf freetds.conf.dist
+
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -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:
diff --git a/databases/freetds/distinfo b/databases/freetds/distinfo
index 5d01cd729cd3..f315ef067070 100644
--- a/databases/freetds/distinfo
+++ b/databases/freetds/distinfo
@@ -1 +1 @@
-MD5 (freetds-0.53.tgz) = 78586f3db87f53a8097d7665a4d8f892
+MD5 (freetds-0.60.tgz) = bf719c9e1a5f8cd080dec6f9664e7f44
diff --git a/databases/freetds/files/patch-ab b/databases/freetds/files/patch-ab
deleted file mode 100644
index bef8119b47e0..000000000000
--- a/databases/freetds/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/tds/config.c	Tue Jun 19 05:22:00 2001
-+++ src/tds/config.c.new	Thu Jul 12 09:49:08 2001
-@@ -609,7 +609,7 @@
-       char  *sybase = getenv("SYBASE");
-       if (sybase!=NULL && sybase[0]!='\0')
-       {
--         search_interface_file(sybase, "interfaces", server, ip_addr, ip_port, tds_ver);
-+         search_interface_file(sybase, "etc/freetds/interfaces", server, ip_addr, ip_port, tds_ver);
-       } else {
-          search_interface_file("/etc/freetds", "interfaces", server, ip_addr, ip_port, tds_ver);
-       }
diff --git a/databases/freetds/files/patch-configure b/databases/freetds/files/patch-configure
new file mode 100644
index 000000000000..2b918f44ba6d
--- /dev/null
+++ b/databases/freetds/files/patch-configure
@@ -0,0 +1,12 @@
+--- configure.orig	Thu Sep 12 01:35:52 2002
++++ configure	Fri Sep 13 20:20:20 2002
+@@ -2241,7 +2241,8 @@
+ 
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
++LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/databases/freetds/files/patch-iconv-linkage b/databases/freetds/files/patch-iconv-linkage
deleted file mode 100644
index 21ea02f658eb..000000000000
--- a/databases/freetds/files/patch-iconv-linkage
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/ctlib/Makefile.in.orig	Sat Mar 30 17:14:45 2002
-+++ src/ctlib/Makefile.in	Sat Mar 30 17:15:17 2002
-@@ -104,3 +104,3 @@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ $(LIBICONV)
- libct_la_LDFLAGS = 
---- src/dblib/Makefile.in.orig	Sat Mar 30 17:14:45 2002
-+++ src/dblib/Makefile.in	Sat Mar 30 17:15:30 2002
-@@ -105,3 +105,3 @@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ $(LIBICONV)
- libsybdb_la_DEPENDENCIES =  $(patsubst %, $(TDSDIR)/%, $(patsubst %.c, \
---- src/odbc/Makefile.in.orig	Sat Mar 30 17:14:45 2002
-+++ src/odbc/Makefile.in	Sat Mar 30 17:15:50 2002
-@@ -103,3 +103,3 @@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ $(LIBICONV)
- libtdsodbc_la_LDFLAGS = 
---- src/tds/Makefile.in.orig	Sat Mar 30 17:14:45 2002
-+++ src/tds/Makefile.in	Sat Mar 30 17:16:42 2002
-@@ -90,3 +90,3 @@
- INCLUDES = -I$(top_srcdir)/include
--LIBS = @LIBICONV@
-+LIBS = @LIBICONV@ $(LIBICONV)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/databases/freetds/files/patch-ltmain.sh b/databases/freetds/files/patch-ltmain.sh
deleted file mode 100644
index 682f198bad05..000000000000
--- a/databases/freetds/files/patch-ltmain.sh
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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 15a645c3f03c..de049b6cc628 100644
--- a/databases/freetds/pkg-plist
+++ b/databases/freetds/pkg-plist
@@ -1,6 +1,9 @@
+bin/freebcp
+bin/tsql
 @unexec if cmp -s %D/etc/freetds.conf.dist %D/etc/freetds.conf; then rm -f %D/etc/freetds.conf; fi
 etc/freetds.conf.dist
 @exec if [ ! -f %D/etc/freetds.conf ]; then cp %D/etc/%f %D/etc/freetds.conf; fi
+etc/locales.conf
 etc/freetds/interfaces
 include/bkpublic.h
 include/cspublic.h
@@ -8,6 +11,7 @@ include/cstypes.h
 include/ctlib.h
 include/ctpublic.h
 include/dblib.h
+include/freebcp.h
 include/sqldb.h
 include/sqlfront.h
 include/sybdb.h