mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00
Code Issues Releases Activity

databases/sqsh: Fix build with FreeTDS 1.2.

Browse Source 
Assume maintainership.

PR:		262942
MFH:		2022Q1
This commit is contained in:
Robert Clausecker 2022-03-30 21:33:11 +03:00 committed by Gleb Popov
parent 79611a867a
commit 4adb2b300c
4 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
databases/sqsh/Makefile
View File

@ -2,18 +2,19 @@
PORTNAME= sqsh PORTNAME= sqsh
PORTVERSION= 2.5.16.1 PORTVERSION= 2.5.16.1
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= databases CATEGORIES= databases
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R:R} MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R:R}
MAINTAINER= ports@FreeBSD.org PATCH_SITES= https://raw.githubusercontent.com/netzbasis/openbsd-ports/11f6e510cbdf022a7b6c71ee125a41ba443fe927/databases/sqsh/patches/
PATCHFILES= patch-src_cmd_connect_c
MAINTAINER= fuz@fuz.su
COMMENT= Interactive tool for querying Sybase database servers COMMENT= Interactive tool for querying Sybase database servers
LICENSE= GPLv2+ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN= cmd_connect.c:1897:17: error: use of undeclared identifier 'CS_MAX_CHAR'
LIB_DEPENDS= libct.so:databases/freetds LIB_DEPENDS= libct.so:databases/freetds
USES= readline tar:tgz USES= readline tar:tgz
@ -29,6 +30,7 @@ OPTIONS_DEFINE= X11
OPTIONS_DEFAULT=X11 OPTIONS_DEFAULT=X11
X11_USES= motif X11_USES= motif
X11_USE= xorg=x11,xext,xmu,xt
X11_CONFIGURE_ON= --with-motif --with-x X11_CONFIGURE_ON= --with-motif --with-x
post-patch: post-patch:

4
databases/sqsh/distinfo
View File

@ -1,3 +1,5 @@
TIMESTAMP = 1524247164 TIMESTAMP = 1648655356
SHA256 (sqsh-2.5.16.1.tgz) = d6641f365ace60225fc0fa48f82b9dbed77a4e506a0e497eb6889e096b8320f2 SHA256 (sqsh-2.5.16.1.tgz) = d6641f365ace60225fc0fa48f82b9dbed77a4e506a0e497eb6889e096b8320f2
SIZE (sqsh-2.5.16.1.tgz) = 623715 SIZE (sqsh-2.5.16.1.tgz) = 623715
SHA256 (patch-src_cmd_connect_c) = 1270ac466cacbac98952190315964cda0e8da0e955e01d14030a4091ed3ce9b7
SIZE (patch-src_cmd_connect_c) = 1579

18
databases/sqsh/files/patch-src_cmd__connect.c
View File

@ -1,6 +1,7 @@
--- src/cmd_connect.c 2014-04-04 08:22:38 --- src/cmd_connect.c.orig 2014-04-04 08:22:38 UTC
+++ src/cmd_connect.c 2018-04-20 18:26:38 +++ src/cmd_connect.c
@@ -861,6 +861,14 @@ @@ -860,8 +860,16 @@ int cmd_connect( argc, argv )
/* Then we use freetds which uses enum instead of defines */
else if (strcmp(tds_version, "7.0") == 0) else if (strcmp(tds_version, "7.0") == 0)
version = CS_TDS_70; version = CS_TDS_70;
+ else if (strcmp(tds_version, "7.1") == 0) + else if (strcmp(tds_version, "7.1") == 0)
@ -12,15 +13,15 @@
+ else if (strcmp(tds_version, "7.4") == 0) + else if (strcmp(tds_version, "7.4") == 0)
+ version = CS_TDS_74; + version = CS_TDS_74;
else if (strcmp(tds_version, "8.0") == 0) else if (strcmp(tds_version, "8.0") == 0)
- version = CS_TDS_80; version = CS_TDS_71;
+ version = CS_TDS_71; /* https://sourceforge.net/p/sqsh/discussion/365924/thread/29ae1664/#7f59/707f */
#endif #endif
else version = CS_TDS_50; /* default version */ else version = CS_TDS_50; /* default version */
@@ -1259,7 +1267,16 @@
@@ -1258,9 +1266,18 @@ int cmd_connect( argc, argv )
case CS_TDS_70:
env_set( g_env, "tds_version", "7.0" ); env_set( g_env, "tds_version", "7.0" );
break; break;
- case CS_TDS_80: case CS_TDS_71:
+ case CS_TDS_71:
env_set( g_env, "tds_version", "8.0" ); env_set( g_env, "tds_version", "8.0" );
break; break;
+ case CS_TDS_72: + case CS_TDS_72:
@ -34,3 +35,4 @@
+ break; + break;
#endif #endif
default: default:
env_set( g_env, "tds_version", "unknown" );

2
databases/sqsh/pkg-descr
View File

@ -1,4 +1,4 @@
This is alternative to ancient isql - interactive This is alternative to ancient isql - interactive
and comfortable database query tool for Sybase. and comfortable database query tool for Sybase.
WWW: http://www.sqsh.org/ WWW: https://sourceforge.net/projects/sqsh