From 9e5bc37306b8f567db7f9ae34a37379edd24e189 Mon Sep 17 00:00:00 2001 From: jcs Date: Sun, 18 May 2003 16:57:18 +0000 Subject: [PATCH] freetds-0.61 --- databases/freetds/Makefile | 10 ++++----- databases/freetds/distinfo | 6 ++--- databases/freetds/patches/patch-Makefile_in | 22 ++++++++----------- databases/freetds/patches/patch-configure | 12 +++++----- .../freetds/patches/patch-include-sybdb_h | 14 ------------ .../patches/patch-odbc_unittests_Makefile_in | 16 +++++++------- .../patch-src_ctlib_unittests_Makefile_in | 16 +++++++------- .../freetds/patches/patch-src_dblib_bcp_c | 20 ++++++++--------- .../patch-src_dblib_unittests_Makefile_in | 16 +++++++------- .../patch-src_tds_unittests_Makefile_in | 16 +++++++------- databases/freetds/pkg/PFRAG.shared | 10 ++++----- databases/freetds/pkg/PLIST | 9 ++++---- 12 files changed, 74 insertions(+), 93 deletions(-) delete mode 100644 databases/freetds/patches/patch-include-sybdb_h diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile index ec76dead1c3..dece8c0f531 100644 --- a/databases/freetds/Makefile +++ b/databases/freetds/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.11 2003/02/08 17:21:41 jcs Exp $ +# $OpenBSD: Makefile,v 1.12 2003/05/18 16:57:18 jcs Exp $ -DISTNAME= freetds-0.60 +DISTNAME= freetds-0.61 PKGNAME= ${DISTNAME}p1 CATEGORIES= databases @@ -12,7 +12,7 @@ PERMIT_DISTFILES_FTP= Yes COMMENT= "project to document and implement the TDS protocol" HOMEPAGE= http://www.freetds.org/ -MASTER_SITES= ${MASTER_SITE_SUNSITE:=ALPHA/freetds/} +MASTER_SITES= http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/ EXTRACT_SUFX= .tgz MAINTAINER= Joshua Stein @@ -24,8 +24,8 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ MAKE_ENV= RM=rm MODULES= gettext -post-configure: - @chmod 644 ${WRKSRC}/include/tds_configs.h +#post-configure: +# @chmod 644 ${WRKSRC}/include/tds_configs.h post-install: @sed -e "s:@sysconfdir@:${SYSCONFDIR}:g" ${WRKSRC}/freetds.conf > \ diff --git a/databases/freetds/distinfo b/databases/freetds/distinfo index 4dc01dd11ba..fbbec39b9a2 100644 --- a/databases/freetds/distinfo +++ b/databases/freetds/distinfo @@ -1,3 +1,3 @@ -MD5 (freetds-0.60.tgz) = bf719c9e1a5f8cd080dec6f9664e7f44 -RMD160 (freetds-0.60.tgz) = 28af14dbab995ca564dd39319489ce0139e05ac8 -SHA1 (freetds-0.60.tgz) = f03aa17139ef58648331fe538845a9ee2c162172 +MD5 (freetds-0.61.tgz) = 15cc9829beb534606deb3020b3118eb9 +RMD160 (freetds-0.61.tgz) = 085122da3ea62785f5c0d0c5626bea53bb3a1ce4 +SHA1 (freetds-0.61.tgz) = 3b86f6cf08775ec1f36b2ead289638bcbb273f70 diff --git a/databases/freetds/patches/patch-Makefile_in b/databases/freetds/patches/patch-Makefile_in index 37ae6d02744..a8dadcec097 100644 --- a/databases/freetds/patches/patch-Makefile_in +++ b/databases/freetds/patches/patch-Makefile_in @@ -1,21 +1,17 @@ -$OpenBSD: patch-Makefile_in,v 1.3 2002/09/12 00:12:48 jcs Exp $ ---- Makefile.in.orig Wed Sep 11 18:46:55 2002 -+++ Makefile.in Wed Sep 11 18:47:37 2002 -@@ -349,17 +349,6 @@ +$OpenBSD: patch-Makefile_in,v 1.4 2003/05/18 16:57:18 jcs Exp $ +--- Makefile.in.orig Sun May 18 11:18:36 2003 ++++ Makefile.in Sun May 18 11:18:45 2003 +@@ -538,13 +538,6 @@ install-data-local: -- $(mkinstalldirs) $(DEFDIR) $(ETC) -- if [ -f $(ETC)/freetds.conf ]; \ -- then :; \ -- else \ +- $(mkinstalldirs) $(ETC) +- if test ! -f $(ETC)/freetds.conf; then \ - $(INSTALL_DATA) $(srcdir)/freetds.conf $(ETC)/freetds.conf; \ - fi -- if [ -f $(ETC)/locales.conf ]; \ -- then :; \ -- else \ +- if test ! -f $(ETC)/locales.conf; then \ - $(INSTALL_DATA) $(srcdir)/locales.conf $(ETC)/locales.conf; \ - fi - test: - @echo "The 'make test' option has been replaced with 'make check'"; + # for default we do not uninstall configuration (they can be changed) + @DISTCHECK_BUILD_TRUE@uninstall-local: diff --git a/databases/freetds/patches/patch-configure b/databases/freetds/patches/patch-configure index 37d7c8ca472..b23886b6604 100644 --- a/databases/freetds/patches/patch-configure +++ b/databases/freetds/patches/patch-configure @@ -1,12 +1,12 @@ -$OpenBSD: patch-configure,v 1.2 2002/09/12 00:12:48 jcs Exp $ ---- configure.orig Wed Sep 11 18:47:55 2002 -+++ configure Wed Sep 11 18:48:19 2002 -@@ -3520,6 +3520,8 @@ - CFLAGS="$CFLAGS -DIODBC"; +$OpenBSD: patch-configure,v 1.3 2003/05/18 16:57:18 jcs Exp $ +--- configure.orig Sun May 18 11:20:43 2003 ++++ configure Sun May 18 11:20:44 2003 +@@ -9981,6 +9981,8 @@ ODBC_INC=$with_iodbc/include; + LDFLAGS="$LDFLAGS -L$with_iodbc/lib" odbc=true +else + odbc=false fi - # Check whether --with-unixodbc or --without-unixodbc was given. + diff --git a/databases/freetds/patches/patch-include-sybdb_h b/databases/freetds/patches/patch-include-sybdb_h deleted file mode 100644 index adee7c4f12b..00000000000 --- a/databases/freetds/patches/patch-include-sybdb_h +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-include-sybdb_h,v 1.1.1.1 2001/08/11 15:31:43 naddy Exp $ ---- include/sybdb.h.orig Mon Jul 2 02:57:40 2001 -+++ include/sybdb.h Sat Aug 11 02:58:00 2001 -@@ -287,6 +287,10 @@ enum { - #define IN 1 - #define OUT 2 - -+#ifndef DBMFIX -+#define DBMFIX -+#endif -+ - #define DBSINGLE 0 - #define DBDOUBLE 1 - #define DBBOTH 2 diff --git a/databases/freetds/patches/patch-odbc_unittests_Makefile_in b/databases/freetds/patches/patch-odbc_unittests_Makefile_in index e81609c0df0..39196f8dc70 100644 --- a/databases/freetds/patches/patch-odbc_unittests_Makefile_in +++ b/databases/freetds/patches/patch-odbc_unittests_Makefile_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-odbc_unittests_Makefile_in,v 1.1 2003/02/08 17:21:41 jcs Exp $ ---- src/odbc/unittests/Makefile.in.orig Sat Feb 8 11:10:26 2003 -+++ src/odbc/unittests/Makefile.in Sat Feb 8 11:10:35 2003 -@@ -295,7 +295,7 @@ +$OpenBSD: patch-odbc_unittests_Makefile_in,v 1.2 2003/05/18 16:57:18 jcs Exp $ +--- src/odbc/unittests/Makefile.in.orig Sun May 18 11:24:19 2003 ++++ src/odbc/unittests/Makefile.in Sun May 18 11:24:21 2003 +@@ -472,7 +472,7 @@ + + installdirs: - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am +install: - uninstall-am: uninstall-includeHEADERS + install-exec: install-exec-am + install-data: install-data-am uninstall: uninstall-am - all-am: Makefile $(HEADERS) diff --git a/databases/freetds/patches/patch-src_ctlib_unittests_Makefile_in b/databases/freetds/patches/patch-src_ctlib_unittests_Makefile_in index 9c25f166b91..2badac517cf 100644 --- a/databases/freetds/patches/patch-src_ctlib_unittests_Makefile_in +++ b/databases/freetds/patches/patch-src_ctlib_unittests_Makefile_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-src_ctlib_unittests_Makefile_in,v 1.1 2003/02/08 17:21:41 jcs Exp $ ---- src/ctlib/unittests/Makefile.in.orig Sat Feb 8 11:10:00 2003 -+++ src/ctlib/unittests/Makefile.in Sat Feb 8 11:10:13 2003 -@@ -350,7 +350,7 @@ +$OpenBSD: patch-src_ctlib_unittests_Makefile_in,v 1.2 2003/05/18 16:57:18 jcs Exp $ +--- src/ctlib/unittests/Makefile.in.orig Sun May 18 11:25:04 2003 ++++ src/ctlib/unittests/Makefile.in Sun May 18 11:25:14 2003 +@@ -509,7 +509,7 @@ + + installdirs: - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am +install: - uninstall-am: uninstall-includeHEADERS + install-exec: install-exec-am + install-data: install-data-am uninstall: uninstall-am - all-am: Makefile $(HEADERS) diff --git a/databases/freetds/patches/patch-src_dblib_bcp_c b/databases/freetds/patches/patch-src_dblib_bcp_c index 152b09a9b49..7e23940cd7d 100644 --- a/databases/freetds/patches/patch-src_dblib_bcp_c +++ b/databases/freetds/patches/patch-src_dblib_bcp_c @@ -1,12 +1,12 @@ -$OpenBSD: patch-src_dblib_bcp_c,v 1.1 2002/12/13 07:38:04 pvalchev Exp $ ---- src/dblib/bcp.c.orig Thu Dec 12 00:39:21 2002 -+++ src/dblib/bcp.c Thu Dec 12 00:39:38 2002 -@@ -858,7 +858,7 @@ RETCODE _bcp_get_term_data(FILE *hostfil +$OpenBSD: patch-src_dblib_bcp_c,v 1.2 2003/05/18 16:57:18 jcs Exp $ +--- src/dblib/bcp.c.orig Sun May 18 11:26:57 2003 ++++ src/dblib/bcp.c Sun May 18 11:27:19 2003 +@@ -918,7 +918,7 @@ - int j = 0; - int termfound = 1; --char x; -+int x; + int j = 0; + int termfound = 1; +-char x; ++int x; char *tester = NULL; - int bufpos = 0; - int found = 0; + int bufpos = 0; + int found = 0; diff --git a/databases/freetds/patches/patch-src_dblib_unittests_Makefile_in b/databases/freetds/patches/patch-src_dblib_unittests_Makefile_in index 150d3c9ac2f..01ddb3b6978 100644 --- a/databases/freetds/patches/patch-src_dblib_unittests_Makefile_in +++ b/databases/freetds/patches/patch-src_dblib_unittests_Makefile_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-src_dblib_unittests_Makefile_in,v 1.1 2003/02/08 17:21:41 jcs Exp $ ---- src/dblib/unittests/Makefile.in.orig Sat Feb 8 11:09:31 2003 -+++ src/dblib/unittests/Makefile.in Sat Feb 8 11:09:49 2003 -@@ -467,7 +467,7 @@ +$OpenBSD: patch-src_dblib_unittests_Makefile_in,v 1.2 2003/05/18 16:57:18 jcs Exp $ +--- src/dblib/unittests/Makefile.in.orig Sun May 18 11:28:07 2003 ++++ src/dblib/unittests/Makefile.in Sun May 18 11:28:13 2003 +@@ -672,7 +672,7 @@ + + installdirs: - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am +install: - uninstall-am: uninstall-includeHEADERS + install-exec: install-exec-am + install-data: install-data-am uninstall: uninstall-am - all-am: Makefile $(HEADERS) diff --git a/databases/freetds/patches/patch-src_tds_unittests_Makefile_in b/databases/freetds/patches/patch-src_tds_unittests_Makefile_in index 0b9210a3399..98ecc377f1c 100644 --- a/databases/freetds/patches/patch-src_tds_unittests_Makefile_in +++ b/databases/freetds/patches/patch-src_tds_unittests_Makefile_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-src_tds_unittests_Makefile_in,v 1.1 2003/02/08 17:21:41 jcs Exp $ ---- src/tds/unittests/Makefile.in.orig Sat Feb 8 11:08:00 2003 -+++ src/tds/unittests/Makefile.in Sat Feb 8 11:08:29 2003 -@@ -360,7 +360,7 @@ +$OpenBSD: patch-src_tds_unittests_Makefile_in,v 1.2 2003/05/18 16:57:18 jcs Exp $ +--- src/tds/unittests/Makefile.in.orig Sun May 18 11:29:00 2003 ++++ src/tds/unittests/Makefile.in Sun May 18 11:29:05 2003 +@@ -497,7 +497,7 @@ + + installdirs: - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am +install: - uninstall-am: uninstall-includeHEADERS + install-exec: install-exec-am + install-data: install-data-am uninstall: uninstall-am - all-am: Makefile $(HEADERS) diff --git a/databases/freetds/pkg/PFRAG.shared b/databases/freetds/pkg/PFRAG.shared index cb1f44f971d..7f6ce373656 100644 --- a/databases/freetds/pkg/PFRAG.shared +++ b/databases/freetds/pkg/PFRAG.shared @@ -1,6 +1,6 @@ -@comment $OpenBSD: PFRAG.shared,v 1.3 2002/09/12 00:12:48 jcs Exp $ -lib/libct.so.0.0 -lib/libsybdb.so.1.0 -lib/libtds.so.0.0 -lib/libtdssrv.so.0.0 +@comment $OpenBSD: PFRAG.shared,v 1.4 2003/05/18 16:57:18 jcs Exp $ +lib/libct.so.1.0 +lib/libsybdb.so.3.0 +lib/libtds.so.2.0 +lib/libtdssrv.so.1.0 DYNLIBDIR(%D/lib) diff --git a/databases/freetds/pkg/PLIST b/databases/freetds/pkg/PLIST index 566ce97b960..2108a66bc36 100644 --- a/databases/freetds/pkg/PLIST +++ b/databases/freetds/pkg/PLIST @@ -1,5 +1,6 @@ -@comment $OpenBSD: PLIST,v 1.5 2003/02/08 17:21:41 jcs Exp $ +@comment $OpenBSD: PLIST,v 1.6 2003/05/18 16:57:18 jcs Exp $ bin/freebcp +bin/tdspool bin/tsql include/bkpublic.h include/cspublic.h @@ -7,17 +8,15 @@ include/cstypes.h include/ctlib.h include/ctpublic.h include/dblib.h -include/freebcp.h include/sqldb.h include/sqlfront.h include/sybdb.h include/syberror.h include/sybfront.h include/tds.h -include/tds_configs.h +include/tds_sysdep_public.h include/tdsconvert.h -include/tdsodbc.h -include/tdsutil.h +include/tdssrv.h include/tdsver.h lib/libct.a lib/libct.la