diff options
| author | Sylvio Cesar Teixeira <sylvio@FreeBSD.org> | 2011-08-16 18:28:58 +0000 |
|---|---|---|
| committer | Sylvio Cesar Teixeira <sylvio@FreeBSD.org> | 2011-08-16 18:28:58 +0000 |
| commit | 8f71e18f51f19fc09cc0deb4e8af9ac960749331 (patch) | |
| tree | d1de0d5d837b8df663efd2a4b6bb24b52c58afa0 | |
| parent | 332533f3080bc58dbb43f639284ba7485d50a847 (diff) | |
| download | ports-8f71e18f51f19fc09cc0deb4e8af9ac960749331.tar.gz ports-8f71e18f51f19fc09cc0deb4e8af9ac960749331.zip | |
Notes
| -rw-r--r-- | databases/sqsh/Makefile | 3 | ||||
| -rw-r--r-- | databases/sqsh/distinfo | 4 | ||||
| -rw-r--r-- | databases/sqsh/files/patch-src_cmd_bcp_c | 58 |
3 files changed, 3 insertions, 62 deletions
diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile index 618bbb0ead53..e0509c6cebdd 100644 --- a/databases/sqsh/Makefile +++ b/databases/sqsh/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= sqsh -PORTVERSION= 2.1.6 -PORTREVISION= 2 +PORTVERSION= 2.1.7 CATEGORIES= databases MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/databases/sqsh/distinfo b/databases/sqsh/distinfo index 4a24d7d70573..d6d22809d586 100644 --- a/databases/sqsh/distinfo +++ b/databases/sqsh/distinfo @@ -1,2 +1,2 @@ -SHA256 (sqsh-2.1.6.tar.gz) = d2547e5bcac2805da0ccb630c9eef11a6da8ae8e279ec614fad8321efec5de5e -SIZE (sqsh-2.1.6.tar.gz) = 557271 +SHA256 (sqsh-2.1.7.tar.gz) = f6a0a453c9e7595f4966bbc61f75ac2a86f832694ffc45312c2e8b1b98aa8b03 +SIZE (sqsh-2.1.7.tar.gz) = 793166 diff --git a/databases/sqsh/files/patch-src_cmd_bcp_c b/databases/sqsh/files/patch-src_cmd_bcp_c deleted file mode 100644 index c2c445a24137..000000000000 --- a/databases/sqsh/files/patch-src_cmd_bcp_c +++ /dev/null @@ -1,58 +0,0 @@ -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 --*/ |