From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jan 13 01:10:08 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C197F16A4CE for ; Tue, 13 Jan 2004 01:10:08 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1DCE443D58 for ; Tue, 13 Jan 2004 01:10:03 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i0D9A3FR046409 for ; Tue, 13 Jan 2004 01:10:03 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i0D9A3GS046408; Tue, 13 Jan 2004 01:10:03 -0800 (PST) (envelope-from gnats) Resent-Date: Tue, 13 Jan 2004 01:10:03 -0800 (PST) Resent-Message-Id: <200401130910.i0D9A3GS046408@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alex Kiesel Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4CC0B16A4CE for ; Tue, 13 Jan 2004 01:04:22 -0800 (PST) Received: from mxintern.schlund.de (mxintern.kundenserver.de [212.227.126.204]) by mx1.FreeBSD.org (Postfix) with ESMTP id 959CB43D6A for ; Tue, 13 Jan 2004 01:04:06 -0800 (PST) (envelope-from kiesel@schlund.de) Received: from [172.17.29.6] (helo=alex.i.schlund.de) by mxintern.kundenserver.de with smtp (Exim 3.35 #1) id 1AgKSz-0007uB-00 for FreeBSD-gnats-submit@freebsd.org; Tue, 13 Jan 2004 10:04:05 +0100 Received: (qmail 79055 invoked by uid 519); 13 Jan 2004 09:04:05 -0000 Message-Id: <20040113090405.79054.qmail@alex.i.schlund.de> Date: 13 Jan 2004 09:04:05 -0000 From: Alex Kiesel To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/61302: [Maintainer-update] databases/freetds to 0.62 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Alex Kiesel List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Jan 2004 09:10:09 -0000 >Number: 61302 >Category: ports >Synopsis: [Maintainer-update] databases/freetds to 0.62 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Jan 13 01:10:02 PST 2004 >Closed-Date: >Last-Modified: >Originator: Alex Kiesel >Release: FreeBSD 5.1-RELEASE-p11 i386 >Organization: >Environment: System: FreeBSD alex.i.schlund.de 5.1-RELEASE-p11 FreeBSD 5.1-RELEASE-p11 #1: Mon Dec 29 11:58:32 CET 2003 root@alex.i.schlund.de:/usr/obj/usr/src/sys/BOOST i386 >Description: This pr includes the update of the freetds port to 0.62. Additionally all dependent ports are patched, so the ports check for the correct file when checking if freetds is installed. The diffs also bump the PORTREVISION for every port included. I'm willing to take maintainership of databases/sqsh - so I included a patch which updates the LIB_DEPENDS, PORTREVISION and the MAINTAINER variable. For the freetds port, please add exp-patch-src-tds-read.c.diff to the files/ subdirectory. >How-To-Repeat: >Fix: Apply the patches. --- freetds.diff begins here --- ? databases/freetds/files/exp-patch-src-tds-read.c.diff Index: databases/freetds//Makefile =================================================================== RCS file: /home/ncvs/ports/databases/freetds/Makefile,v retrieving revision 1.30 diff -u -r1.30 Makefile --- databases/freetds//Makefile 7 Nov 2003 08:26:27 -0000 1.30 +++ databases/freetds//Makefile 13 Jan 2004 08:53:54 -0000 @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= freetds -PORTVERSION= 0.61.2 +PORTVERSION= 0.62 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= ALPHA/freetds/stable @@ -14,7 +14,6 @@ COMMENT= Sybase/Microsoft TDS protocol library LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv -BUILD_DEPENDS= ${LOCALBASE}/bin/automake17:${PORTSDIR}/devel/automake17 USE_REINPLACE= yes USE_GMAKE= yes @@ -27,6 +26,7 @@ CONFIGURE_ARGS= --with-tdsver=5.0 INSTALLS_SHLIB= yes +DOCSDIR= ${PREFIX}/share/doc/freetds-${PORTVERSION} MAN1= freebcp.1 tsql.1 .if defined(WITH_IODBC) @@ -45,10 +45,17 @@ PLIST_SUB+= ODBC="@comment " .endif +.if defined(WITH_MSDBLIB) +CONFIGURE_ARGS+= --enable-msdblib +.endif + post-extract: @cd ${WRKSRC} && ${LN} -s freetds.conf freetds.conf.dist @cd ${WRKSRC} && ${LN} -s locales.conf locales.conf.dist @cd ${WRKSRC}/src/pool && ${LN} -s pool.conf pool.conf.dist +.if defined(WITH_EXPERIMENTAL_PATCH) + cd ${WRKSRC} && ${PATCH} < ${FILESDIR}/exp-patch-src-tds-read.c.diff +.endif post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ @@ -57,11 +64,6 @@ s|/locales.conf|/locales.conf.dist|g ; \ s|/pool.conf|/pool.conf.dist|g ; \ s| common.h||g' - -post-configure: - @cd ${WRKSRC} && ${REINPLACE_CMD} -e \ - 's|automake-1..|automake17|g ; \ - s|aclocal-1..|aclocal17|g' Makefile post-install: @${MKDIR} ${PREFIX}/etc/freetds Index: databases/freetds//distinfo =================================================================== RCS file: /home/ncvs/ports/databases/freetds/distinfo,v retrieving revision 1.8 diff -u -r1.8 distinfo --- databases/freetds//distinfo 7 Nov 2003 08:26:27 -0000 1.8 +++ databases/freetds//distinfo 13 Jan 2004 08:53:54 -0000 @@ -1 +1 @@ -MD5 (freetds-0.61.2.tar.gz) = 95e91d26ddfdeed255771f3fa2c28129 +MD5 (freetds-0.62.tar.gz) = 8dfeedf975362bf4fad3bba7d8936a3c Index: databases/freetds//pkg-plist =================================================================== RCS file: /home/ncvs/ports/databases/freetds/pkg-plist,v retrieving revision 1.13 diff -u -r1.13 pkg-plist --- databases/freetds//pkg-plist 7 Nov 2003 08:26:27 -0000 1.13 +++ databases/freetds//pkg-plist 13 Jan 2004 08:53:54 -0000 @@ -8,7 +8,6 @@ include/bkpublic.h include/cspublic.h include/cstypes.h -include/ctlib.h include/ctpublic.h include/dblib.h include/sqldb.h @@ -25,17 +24,186 @@ share/nls/en_US.US-ASCII lib/libct.a lib/libct.so -lib/libct.so.1 +lib/libct.so.2 lib/libsybdb.a lib/libsybdb.so -lib/libsybdb.so.3 +lib/libsybdb.so.4 lib/libtds.a lib/libtds.so -lib/libtds.so.2 +lib/libtds.so.3 %%ODBC%%lib/libtdsodbc.a %%ODBC%%lib/libtdsodbc.so %%ODBC%%lib/libtdsodbc.so.0 lib/libtdssrv.a lib/libtdssrv.so lib/libtdssrv.so.1 +%%DOCSDIR%%/userguide/gfdl-11.htm +%%DOCSDIR%%/userguide/index.htm +%%DOCSDIR%%/userguide/about.htm +%%DOCSDIR%%/userguide/what.htm +%%DOCSDIR%%/userguide/tdshistory.htm +%%DOCSDIR%%/userguide/freetdshistory.htm +%%DOCSDIR%%/userguide/projects.htm +%%DOCSDIR%%/userguide/build.htm +%%DOCSDIR%%/userguide/packages.htm +%%DOCSDIR%%/userguide/config.htm +%%DOCSDIR%%/userguide/osissues.htm +%%DOCSDIR%%/userguide/install.htm +%%DOCSDIR%%/userguide/choosingtdsprotocol.htm +%%DOCSDIR%%/userguide/freetdsconf.htm +%%DOCSDIR%%/userguide/locales.htm +%%DOCSDIR%%/userguide/envvar.htm +%%DOCSDIR%%/userguide/configurations.htm +%%DOCSDIR%%/userguide/confirminstall.htm +%%DOCSDIR%%/userguide/prepodbc.htm +%%DOCSDIR%%/userguide/odbcconnattr.htm +%%DOCSDIR%%/userguide/php.htm +%%DOCSDIR%%/userguide/dsnless.htm +%%DOCSDIR%%/userguide/odbcinionly.htm +%%DOCSDIR%%/userguide/odbcombo.htm +%%DOCSDIR%%/userguide/odbcdiagnose.htm +%%DOCSDIR%%/userguide/configs.htm +%%DOCSDIR%%/userguide/nonwestern.htm +%%DOCSDIR%%/userguide/domains.htm +%%DOCSDIR%%/userguide/appendmode.htm +%%DOCSDIR%%/userguide/tdspool.htm +%%DOCSDIR%%/userguide/stunnel.htm +%%DOCSDIR%%/userguide/software.htm +%%DOCSDIR%%/userguide/perl.htm +%%DOCSDIR%%/userguide/sybsql.htm +%%DOCSDIR%%/userguide/python.htm +%%DOCSDIR%%/userguide/troubleshooting.htm +%%DOCSDIR%%/userguide/serverthere.htm +%%DOCSDIR%%/userguide/logging.htm +%%DOCSDIR%%/userguide/pagenodata.htm +%%DOCSDIR%%/userguide/seemtooslow.htm +%%DOCSDIR%%/userguide/help.htm +%%DOCSDIR%%/userguide/mailinglist.htm +%%DOCSDIR%%/userguide/askingforhelp.htm +%%DOCSDIR%%/userguide/contrib.htm +%%DOCSDIR%%/userguide/advocacy.htm +%%DOCSDIR%%/userguide/programming.htm +%%DOCSDIR%%/userguide/apireference.htm +%%DOCSDIR%%/userguide/dblib.api.summary.htm +%%DOCSDIR%%/userguide/ctlib.api.summary.htm +%%DOCSDIR%%/userguide/odbc.api.summary.htm +%%DOCSDIR%%/userguide/samplecode.htm +%%DOCSDIR%%/userguide/acknowledgments.htm +%%DOCSDIR%%/userguide/contributors.htm +%%DOCSDIR%%/userguide/interfacesfile.htm +%%DOCSDIR%%/userguide/interfaceslocation.htm +%%DOCSDIR%%/userguide/interfacespurpose.htm +%%DOCSDIR%%/userguide/interfacesformat.htm +%%DOCSDIR%%/userguide/aboutunicode.htm +%%DOCSDIR%%/userguide/iso8859.htm +%%DOCSDIR%%/userguide/unicode.htm +%%DOCSDIR%%/userguide/unicodegoodbad.htm +%%DOCSDIR%%/userguide/gfdl.htm +%%DOCSDIR%%/userguide/unicodeutf.htm +%%DOCSDIR%%/userguide/unicodefreetds.htm +%%DOCSDIR%%/userguide/gfdl-1.htm +%%DOCSDIR%%/userguide/gfdl-2.htm +%%DOCSDIR%%/userguide/gfdl-3.htm +%%DOCSDIR%%/userguide/gfdl-4.htm +%%DOCSDIR%%/userguide/gfdl-5.htm +%%DOCSDIR%%/userguide/gfdl-6.htm +%%DOCSDIR%%/userguide/gfdl-7.htm +%%DOCSDIR%%/userguide/gfdl-8.htm +%%DOCSDIR%%/userguide/gfdl-9.htm +%%DOCSDIR%%/userguide/gfdl-10.htm +%%DOCSDIR%%/userguide/index.html +%%DOCSDIR%%/reference/todo.html +%%DOCSDIR%%/reference/a00057.html +%%DOCSDIR%%/reference/a00063.html +%%DOCSDIR%%/reference/a00064.html +%%DOCSDIR%%/reference/a00065.html +%%DOCSDIR%%/reference/a00066.html +%%DOCSDIR%%/reference/a00070.html +%%DOCSDIR%%/reference/a00126.html +%%DOCSDIR%%/reference/a00129.html +%%DOCSDIR%%/reference/a00160.html +%%DOCSDIR%%/reference/a00163.html +%%DOCSDIR%%/reference/a00164.html +%%DOCSDIR%%/reference/a00177.html +%%DOCSDIR%%/reference/a00181.html +%%DOCSDIR%%/reference/a00196.html +%%DOCSDIR%%/reference/a00218.html +%%DOCSDIR%%/reference/a00265.html +%%DOCSDIR%%/reference/a00268.html +%%DOCSDIR%%/reference/a00292.html +%%DOCSDIR%%/reference/a00293.html +%%DOCSDIR%%/reference/a00294.html +%%DOCSDIR%%/reference/a00295.html +%%DOCSDIR%%/reference/a00296.html +%%DOCSDIR%%/reference/a00297.html +%%DOCSDIR%%/reference/a00298.html +%%DOCSDIR%%/reference/a00299.html +%%DOCSDIR%%/reference/a00300.html +%%DOCSDIR%%/reference/a00301.html +%%DOCSDIR%%/reference/a00302.html +%%DOCSDIR%%/reference/a00303.html +%%DOCSDIR%%/reference/a00304.html +%%DOCSDIR%%/reference/a00305.html +%%DOCSDIR%%/reference/a00306.html +%%DOCSDIR%%/reference/a00307.html +%%DOCSDIR%%/reference/a00308.html +%%DOCSDIR%%/reference/a00309.html +%%DOCSDIR%%/reference/a00310.html +%%DOCSDIR%%/reference/a00312.html +%%DOCSDIR%%/reference/a00314.html +%%DOCSDIR%%/reference/a00315.html +%%DOCSDIR%%/reference/a00316.html +%%DOCSDIR%%/reference/a00317.html +%%DOCSDIR%%/reference/a00318.html +%%DOCSDIR%%/reference/a00319.html +%%DOCSDIR%%/reference/a00320.html +%%DOCSDIR%%/reference/a00321.html +%%DOCSDIR%%/reference/a00322.html +%%DOCSDIR%%/reference/a00323.html +%%DOCSDIR%%/reference/a00324.html +%%DOCSDIR%%/reference/a00325.html +%%DOCSDIR%%/reference/a00326.html +%%DOCSDIR%%/reference/a00327.html +%%DOCSDIR%%/reference/a00328.html +%%DOCSDIR%%/reference/a00329.html +%%DOCSDIR%%/reference/a00330.html +%%DOCSDIR%%/reference/a00331.html +%%DOCSDIR%%/reference/a00332.html +%%DOCSDIR%%/reference/a00333.html +%%DOCSDIR%%/reference/a00334.html +%%DOCSDIR%%/reference/a00335.html +%%DOCSDIR%%/reference/a00336.html +%%DOCSDIR%%/reference/a00337.html +%%DOCSDIR%%/reference/a00338.html +%%DOCSDIR%%/reference/a00339.html +%%DOCSDIR%%/reference/a00340.html +%%DOCSDIR%%/reference/a00341.html +%%DOCSDIR%%/reference/a00342.html +%%DOCSDIR%%/reference/a00343.html +%%DOCSDIR%%/reference/a00345.html +%%DOCSDIR%%/reference/a00347.html +%%DOCSDIR%%/reference/a00348.html +%%DOCSDIR%%/reference/a00349.html +%%DOCSDIR%%/reference/a00350.html +%%DOCSDIR%%/reference/a00351.html +%%DOCSDIR%%/reference/a00352.html +%%DOCSDIR%%/reference/a00353.html +%%DOCSDIR%%/reference/annotated.html +%%DOCSDIR%%/reference/bug.html +%%DOCSDIR%%/reference/doxygen.css +%%DOCSDIR%%/reference/doxygen.png +%%DOCSDIR%%/reference/files.html +%%DOCSDIR%%/reference/functions.html +%%DOCSDIR%%/reference/globals.html +%%DOCSDIR%%/reference/index.html +%%DOCSDIR%%/reference/modules.html +%%DOCSDIR%%/reference/pages.html +%%DOCSDIR%%/reference/a00046.html +%%DOCSDIR%%/images/important.gif +%%DOCSDIR%%/images/note.gif +%%DOCSDIR%%/images/tip.gif +@dirrm %%DOCSDIR%%/userguide +@dirrm %%DOCSDIR%%/reference +@dirrm %%DOCSDIR%%/images +@dirrm %%DOCSDIR%% @dirrm etc/freetds --- freetds.diff ends here --- --- exp-patch-src-tds-read.c.diff begins here --- Index: src/tds/read.c =================================================================== RCS file: /home/cvs/mirror/freetds/freetds/src/tds/read.c,v retrieving revision 1.78 diff -u -r1.78 read.c --- src/tds/read.c 29 Dec 2003 16:08:35 -0000 1.78 +++ src/tds/read.c 10 Jan 2004 23:53:21 -0000 @@ -164,6 +164,13 @@ buflen -= len; got += len; } + + /* When we get a timeout on select(), return 0. Don't return -1, because + * that would lead to a disconnect + * OTOH, do not let this pass to prevent an infinite loop when there is + * no data on the wire */ + if (retcode == 0) + return 0; OK_TIMEOUT: now = time(NULL); --- exp-patch-src-tds-read.c.diff ends here --- --- sqsh.diff begins here --- Index: databases/sqsh/Makefile =================================================================== RCS file: /home/ncvs/ports/databases/sqsh/Makefile,v retrieving revision 1.19 diff -u -r1.19 Makefile --- databases/sqsh/Makefile 26 Aug 2003 20:25:39 -0000 1.19 +++ databases/sqsh/Makefile 13 Jan 2004 08:58:46 -0000 @@ -6,15 +6,15 @@ PORTNAME= sqsh PORTVERSION= 2.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= databases MASTER_SITES= http://www.sqsh.org/ EXTRACT_SUFX= -src.tar.gz -MAINTAINER= ports@FreeBSD.org +MAINTAINER= kiesel@schlund.de COMMENT= Interactive tool for querying Sybase database servers -LIB_DEPENDS= tds.2:${PORTSDIR}/databases/freetds \ +LIB_DEPENDS= ct.2:${PORTSDIR}/databases/freetds \ intl.5:${PORTSDIR}/devel/gettext USE_REINPLACE= yes --- sqsh.diff ends here --- --- freetds-update.diff begins here --- Index: lang/php4/Makefile =================================================================== RCS file: /home/ncvs/ports/lang/php4/Makefile,v retrieving revision 1.43 diff -u -r1.43 Makefile --- lang/php4/Makefile 10 Jan 2004 16:53:01 -0000 1.43 +++ lang/php4/Makefile 13 Jan 2004 08:58:22 -0000 @@ -21,7 +21,7 @@ PORTNAME= php4 PORTVERSION= 4.3.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES?= lang devel www MASTER_SITES= http://www.php.net/distributions/:release \ http://it.php.net/distributions/:release \ @@ -464,7 +464,7 @@ .endif .if defined(WITH_SYBASECT) -LIB_DEPENDS+= ct.1:${PORTSDIR}/databases/freetds +LIB_DEPENDS+= ct.2:${PORTSDIR}/databases/freetds CONFIGURE_ARGS+=--with-sybase-ct=${LOCALBASE} .endif Index: lang/php5/Makefile =================================================================== RCS file: /home/ncvs/ports/lang/php5/Makefile,v retrieving revision 1.37 diff -u -r1.37 Makefile --- lang/php5/Makefile 10 Jan 2004 16:49:00 -0000 1.37 +++ lang/php5/Makefile 13 Jan 2004 08:58:22 -0000 @@ -21,7 +21,7 @@ PORTNAME= php5 PORTVERSION= 5.0.0.a4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= lang devel www MASTER_SITES= http://www.php.net/distributions/:release \ http://it.php.net/distributions/:release \ @@ -450,7 +450,7 @@ .endif .if defined(WITH_SYBASECT) -LIB_DEPENDS+= ct.1:${PORTSDIR}/databases/freetds +LIB_DEPENDS+= ct.2:${PORTSDIR}/databases/freetds CONFIGURE_ARGS+=--with-sybase-ct=${LOCALBASE} .endif Index: databases/p5-DBD-Sybase/Makefile =================================================================== RCS file: /home/ncvs/ports/databases/p5-DBD-Sybase/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- databases/p5-DBD-Sybase/Makefile 10 Oct 2003 14:55:43 -0000 1.12 +++ databases/p5-DBD-Sybase/Makefile 13 Jan 2004 08:58:22 -0000 @@ -7,6 +7,7 @@ PORTNAME= DBD-Sybase PORTVERSION= 1.01 +PORTREVISION= 1 CATEGORIES= databases perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= DBD @@ -15,7 +16,7 @@ MAINTAINER= sheldonh@FreeBSD.org COMMENT= A Sybase DBI driver for Perl 5 -LIB_DEPENDS= ct.1:${PORTSDIR}/databases/freetds \ +LIB_DEPENDS= ct.2:${PORTSDIR}/databases/freetds \ intl.5:${PORTSDIR}/devel/gettext PERL_CONFIGURE= yes Index: databases/sqlrelay/Makefile =================================================================== RCS file: /home/ncvs/ports/databases/sqlrelay/Makefile,v retrieving revision 1.22 diff -u -r1.22 Makefile --- databases/sqlrelay/Makefile 14 Oct 2003 22:39:51 -0000 1.22 +++ databases/sqlrelay/Makefile 13 Jan 2004 08:58:22 -0000 @@ -7,7 +7,7 @@ PORTNAME= ${SQLRELAY_PORTNAME} PORTVERSION= ${SQLRELAY_PORTVERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= sqlrelay @@ -115,7 +115,7 @@ .endif .if defined(WITH_FREETDS) && ${WITH_FREETDS:L} != no -LIB_DEPENDS+= tds.2:${PORTSDIR}/databases/freetds +LIB_DEPENDS+= tds.3:${PORTSDIR}/databases/freetds CONFIGURE_ARGS+= --with-freetds-prefix="${LOCALBASE}" IF_FREETDS= "" .else --- freetds-update.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: >Ho-wTo-Repeat: