From owner-freebsd-gnome@FreeBSD.ORG Thu Jun 26 04:15:32 2008 Return-Path: Delivered-To: gnome@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E7C081065679; Thu, 26 Jun 2008 04:15:32 +0000 (UTC) (envelope-from mi+kde@aldan.algebra.com) Received: from aldan.algebra.com (aldan.algebra.com [216.254.65.224]) by mx1.freebsd.org (Postfix) with ESMTP id 170488FC0C; Thu, 26 Jun 2008 04:15:31 +0000 (UTC) (envelope-from mi+kde@aldan.algebra.com) Received: from aldan.algebra.com (localhost [127.0.0.1]) by aldan.algebra.com (8.14.2/8.14.1) with ESMTP id m5Q3iTkJ010140 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 25 Jun 2008 23:44:29 -0400 (EDT) (envelope-from mi+kde@aldan.algebra.com) Received: from localhost (localhost [[UNIX: localhost]]) by aldan.algebra.com (8.14.2/8.14.1/Submit) id m5Q3iQIZ010139; Wed, 25 Jun 2008 23:44:26 -0400 (EDT) (envelope-from mi+kde@aldan.algebra.com) From: Mikhail Teterin To: ale@FreeBSD.org, bamby@sippysoft.com, ditesh@gathani.org, gnb@itga.com.au, gnome@FreeBSD.org, idefix@fechner.net, jfkimura@yahoo.co.jp, mayo@oyam.ca, perky@FreeBSD.org, pneumann@gmail.com, sobomax@FreeBSD.org Date: Wed, 25 Jun 2008 23:44:24 -0400 User-Agent: KMail/1.9.9 X-Face: %UW#n0|w>ydeGt/b@1-.UFP=K^~-:0f#O:D7whJ5G_<5143Bb3kOIs9XpX+"V+~$adGP:J|SLieM31VIhqXeLBli" X-Mailman-Approved-At: Thu, 26 Jun 2008 11:07:39 +0000 Cc: portmgr@FreeBSD.org Subject: updating databases/freetds X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jun 2008 04:15:33 -0000 --Boundary-00=_aCxYIZGRmiNWmUv Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Hello! The most recent release of FreeTDS is 0.82, which is quite ahead of our 0.64. The patch below updates the port itself and gives some clue as to how to update the dependant ports (on the example of databases/sqsh) -- backwards compatibility seems not to have been a priority for the FreeTDS folks -- some libraries and headers are no longer installed at all, for example... Please, update your ports -- they should be buildable with either version of FreeTDS, really, but the new one is "less forgiving". Thanks. Yours, -mi --Boundary-00=_aCxYIZGRmiNWmUv Content-Type: text/x-diff; charset="us-ascii"; name="freetds.update.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="freetds.update.diff" Index: freetds/Makefile =================================================================== RCS file: /home/pcvs/ports/databases/freetds/Makefile,v retrieving revision 1.49 diff -U2 -r1.49 Makefile --- freetds/Makefile 5 Oct 2007 20:25:32 -0000 1.49 +++ freetds/Makefile 26 Jun 2008 03:22:12 -0000 @@ -6,9 +6,10 @@ PORTNAME= freetds -PORTVERSION= 0.64 -PORTREVISION= 1 +PORTVERSION= 0.82 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= ALPHA/freetds/stable +PATCHFILES= SQLGetData.utf8.odbc.c-r1.diff +PATCH_SITES= http://dside.dyndns.org/tmp/ MAINTAINER?= ports@FreeBSD.org @@ -17,6 +18,6 @@ TDS_VER?= 5.0 +PATCH_DIST_STRIP=-p1 USE_ICONV= yes -USE_GMAKE= yes GNU_GONFIGURE= yes USE_AUTOTOOLS= autoconf:261:env libtool:15 @@ -25,4 +26,5 @@ CONFIGURE_ARGS= --with-tdsver=${TDS_VER} USE_LDCONFIG= yes +ALL_TARGET= -j`${SYSCTL} -n hw.ncpu` DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} @@ -54,4 +56,7 @@ .if defined(WITH_MSDBLIB) CONFIGURE_ARGS+= --enable-msdblib +CONFLICTS+= freetds-[0-9]* +.else +CONFLICTS+= freetds-msdblib* .endif Index: freetds/distinfo =================================================================== RCS file: /home/pcvs/ports/databases/freetds/distinfo,v retrieving revision 1.15 diff -U2 -r1.15 distinfo --- freetds/distinfo 3 Mar 2007 14:18:19 -0000 1.15 +++ freetds/distinfo 26 Jun 2008 03:22:12 -0000 @@ -1,3 +1,6 @@ -MD5 (freetds-0.64.tar.gz) = ecfee5d6c96932172a1f29fb215c9d23 -SHA256 (freetds-0.64.tar.gz) = 27eeef4049590f459189f859fa73dae27604ea0bf4f197e304f9934c39312c3b -SIZE (freetds-0.64.tar.gz) = 1414954 +MD5 (freetds-0.82.tar.gz) = 3df6b2e83fd420e90f1becbd1162990a +SHA256 (freetds-0.82.tar.gz) = e2731483614bd992c8cb133bcc38432de13cfa243cc1327f37412db50c99b2b6 +SIZE (freetds-0.82.tar.gz) = 1596755 +MD5 (SQLGetData.utf8.odbc.c-r1.diff) = 554b1cc54aef80c69453cba667f208d2 +SHA256 (SQLGetData.utf8.odbc.c-r1.diff) = eb32b59a11ed2c02c326fc565370bfed09fadcdd828e2ce8851a8614161beec2 +SIZE (SQLGetData.utf8.odbc.c-r1.diff) = 6680 Index: freetds/pkg-plist =================================================================== RCS file: /home/pcvs/ports/databases/freetds/pkg-plist,v retrieving revision 1.18 diff -U2 -r1.18 pkg-plist --- freetds/pkg-plist 3 Mar 2007 14:18:19 -0000 1.18 +++ freetds/pkg-plist 26 Jun 2008 03:22:12 -0000 @@ -18,9 +18,5 @@ include/syberror.h include/sybfront.h -include/tds.h include/tds_sysdep_public.h -include/tdsconvert.h -include/tdssrv.h -include/tdsver.h lib/libct.a lib/libct.la @@ -31,146 +27,52 @@ lib/libsybdb.so lib/libsybdb.so.5 -lib/libtds.a -lib/libtds.la -lib/libtds.so -lib/libtds.so.5 -lib/libtdssrv.a -lib/libtdssrv.la -lib/libtdssrv.so -lib/libtdssrv.so.2 %%ODBC%%lib/libtdsodbc.so %%ODBC%%lib/libtdsodbc.so.0 @comment %%ODBC%%lib/libtdsodbc.a -%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-11.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/index.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/about.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/what.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/tdshistory.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/freetdshistory.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/projects.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/build.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/packages.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/config.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/osissues.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/install.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/choosingtdsprotocol.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/freetdsconf.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/locales.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/envvar.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/configurations.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/confirminstall.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/prepodbc.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/odbcconnattr.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/php.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/dsnless.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/odbcinionly.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/odbcombo.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/odbcdiagnose.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/configs.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/nonwestern.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/domains.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/appendmode.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/tdspool.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/stunnel.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/software.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/perl.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/sybsql.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/python.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/troubleshooting.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/serverthere.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/logging.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/pagenodata.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/seemtooslow.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/help.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/mailinglist.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/askingforhelp.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/contrib.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/advocacy.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/programming.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/apireference.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/dblib.api.summary.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/ctlib.api.summary.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/odbc.api.summary.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/samplecode.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/acknowledgments.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/contributors.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/interfacesfile.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/interfaceslocation.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/interfacespurpose.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/interfacesformat.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/aboutunicode.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/iso8859.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/unicode.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/unicodegoodbad.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/unicodeutf.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/unicodefreetds.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-1.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-2.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-3.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-4.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-5.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-6.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-7.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-8.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-9.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-10.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/index.html -%%PORTDOCS%%%%DOCSDIR%%/userguide/userguide.css -%%PORTDOCS%%%%DOCSDIR%%/reference/todo.html -%%PORTDOCS%%%%DOCSDIR%%/reference/annotated.html -%%PORTDOCS%%%%DOCSDIR%%/reference/bug.html -%%PORTDOCS%%%%DOCSDIR%%/reference/doxygen.css -%%PORTDOCS%%%%DOCSDIR%%/reference/doxygen.png -%%PORTDOCS%%%%DOCSDIR%%/reference/files.html -%%PORTDOCS%%%%DOCSDIR%%/reference/functions.html -%%PORTDOCS%%%%DOCSDIR%%/reference/globals.html -%%PORTDOCS%%%%DOCSDIR%%/reference/index.html -%%PORTDOCS%%%%DOCSDIR%%/reference/modules.html -%%PORTDOCS%%%%DOCSDIR%%/reference/pages.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00069.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00080.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00086.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00087.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00088.html +%%PORTDOCS%%%%DOCSDIR%%/images/callouts/1.gif +%%PORTDOCS%%%%DOCSDIR%%/images/callouts/10.gif +%%PORTDOCS%%%%DOCSDIR%%/images/callouts/2.gif +%%PORTDOCS%%%%DOCSDIR%%/images/callouts/3.gif +%%PORTDOCS%%%%DOCSDIR%%/images/callouts/4.gif +%%PORTDOCS%%%%DOCSDIR%%/images/callouts/5.gif +%%PORTDOCS%%%%DOCSDIR%%/images/callouts/6.gif +%%PORTDOCS%%%%DOCSDIR%%/images/callouts/7.gif +%%PORTDOCS%%%%DOCSDIR%%/images/callouts/8.gif +%%PORTDOCS%%%%DOCSDIR%%/images/callouts/9.gif +%%PORTDOCS%%%%DOCSDIR%%/images/caution.gif +%%PORTDOCS%%%%DOCSDIR%%/images/important.gif +%%PORTDOCS%%%%DOCSDIR%%/images/note.gif +%%PORTDOCS%%%%DOCSDIR%%/images/tip.gif +%%PORTDOCS%%%%DOCSDIR%%/images/warning.gif +%%PORTDOCS%%%%DOCSDIR%%/reference/a00009.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00010.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00079.html %%PORTDOCS%%%%DOCSDIR%%/reference/a00090.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00092.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00121.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00122.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00123.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00124.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00125.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00126.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00127.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00096.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00097.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00098.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00100.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00102.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00106.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00107.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00108.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00112.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00133.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00134.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00135.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00136.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00137.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00138.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00139.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00140.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00141.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00142.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00143.html %%PORTDOCS%%%%DOCSDIR%%/reference/a00144.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00147.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00170.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00172.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00248.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00249.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00250.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00251.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00252.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00253.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00254.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00255.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00256.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00257.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00258.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00259.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00260.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00261.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00262.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00263.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00264.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00265.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00266.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00267.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00268.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00269.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00270.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00271.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00272.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00273.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00145.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00160.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00163.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00193.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00195.html %%PORTDOCS%%%%DOCSDIR%%/reference/a00274.html %%PORTDOCS%%%%DOCSDIR%%/reference/a00275.html @@ -213,4 +115,31 @@ %%PORTDOCS%%%%DOCSDIR%%/reference/a00312.html %%PORTDOCS%%%%DOCSDIR%%/reference/a00313.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00314.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00315.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00316.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00317.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00318.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00319.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00320.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00321.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00322.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00323.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00324.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00325.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00326.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00327.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00328.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00329.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00330.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00331.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00332.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00333.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00334.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00335.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00336.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00337.html +%%PORTDOCS%%%%DOCSDIR%%/reference/a00338.html +%%PORTDOCS%%%%DOCSDIR%%/reference/annotated.html +%%PORTDOCS%%%%DOCSDIR%%/reference/bug.html %%PORTDOCS%%%%DOCSDIR%%/reference/dir_000000.html %%PORTDOCS%%%%DOCSDIR%%/reference/dir_000001.html @@ -228,16 +157,102 @@ %%PORTDOCS%%%%DOCSDIR%%/reference/dir_000013.html %%PORTDOCS%%%%DOCSDIR%%/reference/dir_000014.html +%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000015.html %%PORTDOCS%%%%DOCSDIR%%/reference/dirs.html +%%PORTDOCS%%%%DOCSDIR%%/reference/doxygen.css +%%PORTDOCS%%%%DOCSDIR%%/reference/doxygen.png +%%PORTDOCS%%%%DOCSDIR%%/reference/files.html +%%PORTDOCS%%%%DOCSDIR%%/reference/functions.html %%PORTDOCS%%%%DOCSDIR%%/reference/functions_vars.html +%%PORTDOCS%%%%DOCSDIR%%/reference/globals.html %%PORTDOCS%%%%DOCSDIR%%/reference/globals_defs.html %%PORTDOCS%%%%DOCSDIR%%/reference/globals_enum.html +%%PORTDOCS%%%%DOCSDIR%%/reference/globals_eval.html %%PORTDOCS%%%%DOCSDIR%%/reference/globals_func.html %%PORTDOCS%%%%DOCSDIR%%/reference/globals_type.html %%PORTDOCS%%%%DOCSDIR%%/reference/globals_vars.html -%%PORTDOCS%%%%DOCSDIR%%/images/important.gif -%%PORTDOCS%%%%DOCSDIR%%/images/note.gif -%%PORTDOCS%%%%DOCSDIR%%/images/tip.gif +%%PORTDOCS%%%%DOCSDIR%%/reference/index.html +%%PORTDOCS%%%%DOCSDIR%%/reference/modules.html +%%PORTDOCS%%%%DOCSDIR%%/reference/pages.html +%%PORTDOCS%%%%DOCSDIR%%/reference/todo.html +%%PORTDOCS%%%%DOCSDIR%%/userguide/about.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/aboutunicode.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/acknowledgments.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/advocacy.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/apireference.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/appendmode.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/askingforhelp.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/build.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/choosingtdsprotocol.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/config.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/configs.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/confirminstall.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/contrib.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/contributors.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/ctlib.api.summary.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/dblib.api.summary.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/domains.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/dsnless.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/envvar.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/freetdsconf.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/freetdshistory.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-1.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-10.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-11.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-2.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-3.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-4.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-5.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-6.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-7.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-8.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-9.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/help.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/index.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/index.html +%%PORTDOCS%%%%DOCSDIR%%/userguide/install.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/interfacesfile.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/interfacesformat.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/interfaceslocation.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/interfacespurpose.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/iso8859.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/locales.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/localization.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/logging.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/mailinglist.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/odbc.api.summary.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/odbcconnattr.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/odbcdiagnose.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/odbcinionly.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/odbcombo.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/osissues.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/packages.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/pagenodata.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/perl.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/php.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/portoverride.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/prepodbc.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/programming.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/projects.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/python.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/samplecode.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/seemtooslow.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/serverthere.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/software.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/stunnel.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/sybsql.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/tdshistory.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/tdspool.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/troubleshooting.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/unicode.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/unicodefreetds.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/unicodegoodbad.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/unicodeutf.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/usefreetds.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/userguide.css +%%PORTDOCS%%%%DOCSDIR%%/userguide/what.htm %%PORTDOCS%%@dirrm %%DOCSDIR%%/userguide %%PORTDOCS%%@dirrm %%DOCSDIR%%/reference +%%PORTDOCS%%@dirrm %%DOCSDIR%%/images/callouts %%PORTDOCS%%@dirrm %%DOCSDIR%%/images %%PORTDOCS%%@dirrm %%DOCSDIR%% Index: sqsh/Makefile =================================================================== RCS file: /home/pcvs/ports/databases/sqsh/Makefile,v retrieving revision 1.31 diff -U2 -r1.31 Makefile --- sqsh/Makefile 6 Jun 2008 13:17:09 -0000 1.31 +++ sqsh/Makefile 26 Jun 2008 03:22:12 -0000 @@ -7,5 +7,5 @@ PORTNAME= sqsh PORTVERSION= 2.1.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= SF Index: sqsh/files/patch-src_cmd_bcp_c =================================================================== RCS file: sqsh/files/patch-src_cmd_bcp_c diff -N sqsh/files/patch-src_cmd_bcp_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sqsh/files/patch-src_cmd_bcp_c 26 Jun 2008 03:22:12 -0000 @@ -0,0 +1,58 @@ +The latest FreeTDS defines CS_VERSION_foo without also defining +BLK_VERSION_foo. So we have to check these defines independently. + + -mi + +--- src/cmd_bcp.c 2004-11-22 02:10:23.000000000 -0500 ++++ src/cmd_bcp.c 2008-06-25 22:39:55.000000000 -0400 +@@ -341,24 +341,37 @@ + + /*-- Find the appropriate BLK_VERSION_xxx value --*/ ++ if (blk_ver == -1) ++ switch(g_cs_ver) { + #if defined(CS_VERSION_150) +- if(blk_ver == -1 && g_cs_ver == CS_VERSION_150) { +- blk_ver = BLK_VERSION_150; +- } ++ case CS_VERSION_150: ++# if defined(BLK_VERSION_150) ++ blk_ver = BLK_VERSION_150; ++ break; ++# endif + #endif + #if defined(CS_VERSION_125) +- if(blk_ver == -1 && g_cs_ver == CS_VERSION_125) { +- blk_ver = BLK_VERSION_125; +- } ++ case CS_VERSION_125: ++# if defined(BLK_VERSION_125) ++ blk_ver = BLK_VERSION_125; ++ break; ++# endif + #endif +-#if defined(CS_VERSION_120) +- if(blk_ver == -1 && g_cs_ver == CS_VERSION_120) +- blk_ver = BLK_VERSION_120; ++#if defined(CS_VERSION_120) && CS_VERSION_120 != CS_VERSION_110 ++ case CS_VERSION_120: ++# if defined(BLK_VERSION_120) ++ blk_ver = BLK_VERSION_120; ++ break; ++# endif + #endif + #if defined(CS_VERSION_110) +- if(blk_ver == -1 && g_cs_ver == CS_VERSION_110) +- blk_ver = BLK_VERSION_110; ++ case CS_VERSION_110: ++# if defined(BLK_VERSION_110) ++ blk_ver = BLK_VERSION_110; ++ break; ++# endif + #endif +- if(blk_ver == -1) +- blk_ver = BLK_VERSION_100; ++ default: ++ blk_ver = BLK_VERSION_100; ++ } + + /*-- Initialize the command --*/ --Boundary-00=_aCxYIZGRmiNWmUv--