Upgrade from 2.1.5 to 2.1.6, released in August.

This commit is contained in:
Mikhail Teterin 2009-12-08 20:10:09 +00:00
parent a618f26b48
commit 7b06a2cc59
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=245424
3 changed files with 63 additions and 7 deletions

View File

@ -5,11 +5,9 @@
# $FreeBSD$
PORTNAME= sqsh
PORTVERSION= 2.1.5
PORTREVISION= 1
PORTVERSION= 2.1.6
CATEGORIES= databases
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
EXTRACT_SUFX= .tgz
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Interactive tool for querying Sybase database servers

View File

@ -1,3 +1,3 @@
MD5 (sqsh-2.1.5.tgz) = 6169fb449e6b0b7a26be703f350f4e46
SHA256 (sqsh-2.1.5.tgz) = afa0b1010ea794e58aa9ed379bcf05a232d8d4081cd1cef63e77e5de175bfcd4
SIZE (sqsh-2.1.5.tgz) = 401429
MD5 (sqsh-2.1.6.tar.gz) = 32bca47e73c8cf1665a4b610e07931c0
SHA256 (sqsh-2.1.6.tar.gz) = d2547e5bcac2805da0ccb630c9eef11a6da8ae8e279ec614fad8321efec5de5e
SIZE (sqsh-2.1.6.tar.gz) = 557271

View File

@ -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 --*/