From e55ca75deeff3f6f15b9085f665d0c94f9c77c45 Mon Sep 17 00:00:00 2001 From: jcs Date: Thu, 27 Dec 2001 02:56:38 +0000 Subject: [PATCH] Update to freetds-0.53 --- databases/freetds/Makefile | 16 ++++++++-------- databases/freetds/distinfo | 3 +++ databases/freetds/patches/patch-Makefile_in | 15 +++++---------- databases/freetds/patches/patch-configure | 19 +++++++++++++++++++ .../freetds/patches/patch-include-tds_h_in | 12 ------------ databases/freetds/pkg/PFRAG.shared | 6 +++--- databases/freetds/pkg/PLIST | 2 +- 7 files changed, 39 insertions(+), 34 deletions(-) create mode 100644 databases/freetds/distinfo create mode 100644 databases/freetds/patches/patch-configure delete mode 100644 databases/freetds/patches/patch-include-tds_h_in diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile index 14aa824dc1f..beffe0082a6 100644 --- a/databases/freetds/Makefile +++ b/databases/freetds/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.6 2001/11/01 02:40:55 jcs Exp $ +# $OpenBSD: Makefile,v 1.7 2001/12/27 02:56:38 jcs Exp $ -DISTNAME= freetds-0.52 +DISTNAME= freetds-0.53 CATEGORIES= databases -NEED_VERSION= 1.433 +NEED_VERSION= 1.503 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes @@ -17,15 +17,15 @@ EXTRACT_SUFX= .tgz MAINTAINER= Joshua Stein -PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.3-ltconfig \ - ${PORTSDIR}/infrastructure/patches/patch-lt1.3.3-ltmain_sh \ - patch-* - CONFIGURE_STYLE= gnu CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ --enable-static \ - --enable-dbmfix + --with-libiconv-prefix="${LOCALBASE}" MAKE_ENV= RM=rm +MODULES= gettext + +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 new file mode 100644 index 00000000000..dc322db9894 --- /dev/null +++ b/databases/freetds/distinfo @@ -0,0 +1,3 @@ +MD5 (freetds-0.53.tgz) = 78586f3db87f53a8097d7665a4d8f892 +RMD160 (freetds-0.53.tgz) = d3319316c6c162e99c53abc1b2d646df657075f7 +SHA1 (freetds-0.53.tgz) = 7ae8e843ad91c357e9fa91e28176775737584af3 diff --git a/databases/freetds/patches/patch-Makefile_in b/databases/freetds/patches/patch-Makefile_in index e2feb645ec7..8093e9bc6d8 100644 --- a/databases/freetds/patches/patch-Makefile_in +++ b/databases/freetds/patches/patch-Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_in,v 1.1.1.1 2001/08/11 15:31:43 naddy Exp $ ---- Makefile.in.orig Mon Jul 2 05:15:54 2001 -+++ Makefile.in Sat Aug 11 02:57:59 2001 -@@ -80,7 +80,7 @@ smallint = @smallint@ +$OpenBSD: patch-Makefile_in,v 1.2 2001/12/27 02:56:38 jcs Exp $ +--- Makefile.in.orig Wed Dec 26 20:12:09 2001 ++++ Makefile.in Wed Dec 26 20:13:23 2001 +@@ -85,7 +85,7 @@ SUBDIRS = include src @@ -10,16 +10,11 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2001/08/11 15:31:43 naddy Exp $ DEFDIR = $(prefix) ETC = $(sysconfdir) -@@ -335,17 +335,6 @@ maintainer-clean-generic clean mostlycle +@@ -369,12 +369,6 @@ install-data-local: - $(mkinstalldirs) $(DEFDIR) $(ETC) -- if [ -f $(DEFDIR)/interfaces ]; \ -- then :; \ -- else \ -- $(INSTALL_DATA) interfaces $(DEFDIR); \ -- fi - if [ -f $(ETC)/freetds.conf ]; \ - then :; \ - else \ diff --git a/databases/freetds/patches/patch-configure b/databases/freetds/patches/patch-configure new file mode 100644 index 00000000000..2cc5db86c1f --- /dev/null +++ b/databases/freetds/patches/patch-configure @@ -0,0 +1,19 @@ +$OpenBSD: patch-configure,v 1.1 2001/12/27 02:56:38 jcs Exp $ +--- configure.orig Wed Dec 26 20:36:39 2001 ++++ configure Wed Dec 26 20:37:43 2001 +@@ -5934,11 +5934,13 @@ + CFLAGS="$CFLAGS -DIODBC"; + ODBC_INC=$with_iodbc/include; + odbc=true ++else ++ odbc=false + fi + + # Check whether --with-iodbc or --without-iodbc was given. +-if test "${with_iodbc+set}" = set; then +- withval="$with_iodbc" ++if test "${with_unixodbc+set}" = set; then ++ withval="$with_unixodbc" + : + fi + diff --git a/databases/freetds/patches/patch-include-tds_h_in b/databases/freetds/patches/patch-include-tds_h_in deleted file mode 100644 index 69e567bc7f5..00000000000 --- a/databases/freetds/patches/patch-include-tds_h_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-include-tds_h_in,v 1.1.1.1 2001/08/11 15:31:43 naddy Exp $ ---- include/tds.h.in.orig Sun Jun 10 03:35:55 2001 -+++ include/tds.h.in Sat Aug 11 02:58:00 2001 -@@ -53,7 +53,7 @@ static void *no_unused_tds_h_warn[]={rcs - #include - /* FIX ME -- use autoconf for the existance of malloc.h */ - #ifndef __APPLE__ --#include -+/* #include */ - #endif - #include - #endif diff --git a/databases/freetds/pkg/PFRAG.shared b/databases/freetds/pkg/PFRAG.shared index 83a35f175ab..145e12a1494 100644 --- a/databases/freetds/pkg/PFRAG.shared +++ b/databases/freetds/pkg/PFRAG.shared @@ -1,6 +1,6 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2001/08/11 15:31:43 naddy Exp $ +@comment $OpenBSD: PFRAG.shared,v 1.2 2001/12/27 02:56:38 jcs Exp $ lib/libct.so.0.0 -lib/libsybdb.so.0.0 +lib/libsybdb.so.1.0 lib/libtds.so.0.0 lib/libtdssrv.so.0.0 -DYNLIBDIR(%B) +DYNLIBDIR(%D/lib) diff --git a/databases/freetds/pkg/PLIST b/databases/freetds/pkg/PLIST index a2e95aa536d..f4791114d84 100644 --- a/databases/freetds/pkg/PLIST +++ b/databases/freetds/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2001/10/06 19:58:33 jcs Exp $ +@comment $OpenBSD: PLIST,v 1.3 2001/12/27 02:56:38 jcs Exp $ include/bkpublic.h include/cspublic.h include/cstypes.h