From nobody Wed Mar 30 18:43:02 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E9E731A48963; Wed, 30 Mar 2022 18:43:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KTFgB68dlz3Fcj; Wed, 30 Mar 2022 18:43:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648665782; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H0MhGHdoSwiIG0w80XOHiNP5rUSQ+EbgCMkPQyII9lU=; b=veonTD7cnd2gcImLqiXE8CeDG93u5La9lvjSyuPewfm0KQT28Q8BNfwcwryUIN7NVxpXx8 t75z8Ar/FbvYMapzXXd+z4rnceR23aUGJAAKDz1C3sXCPoxz6ZXcDNW6RRDVXdKtxpTJ68 67zXFT8WKSr6UmB0uVVWk1kxA11Ug8CXfkUf4oywh/pfOf6FB1uObuBtQJ2yrTK8aHvIXU SnbRrIMVp6t/gK7vX1v7o8HLjKtGbJAoikNssPUAU+KrwIyS0uVfBpyvWg+V2zWwZ2Ri4t 4WwIqVJ+uuXNfJEplFy+hl/P6DTf8Zq1RsCjniUonleiInI4DtXcFZHGJI9vcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B33E618B09; Wed, 30 Mar 2022 18:43:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22UIh2fV063126; Wed, 30 Mar 2022 18:43:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22UIh2Uf063125; Wed, 30 Mar 2022 18:43:02 GMT (envelope-from git) Date: Wed, 30 Mar 2022 18:43:02 GMT Message-Id: <202203301843.22UIh2Uf063125@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 4adb2b300ce7 - main - databases/sqsh: Fix build with FreeTDS 1.2. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4adb2b300ce7447c7cad200741beb9b55884d1a5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648665782; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H0MhGHdoSwiIG0w80XOHiNP5rUSQ+EbgCMkPQyII9lU=; b=na9R0Y6mZ+29g8183up72X04ton/wnh3Cch2/jFD3HllEwpVA+PRePd6t/NpOZN4tdDHsi PMuqc1d/U+tV3iFR5lYU+NrVyWInzY6Tz3yqVINAyDj0GO9MrRsi1UOV+lMt+0NornRn38 umYUqQGZwHlFT345ITxU8X97T5U4rVc3zHN+6Z+byJax3ad2Af6Z5OGSrn9uZQP7OWa9Ww 7xfaR4/u8qC6+hwgQUB96+/nmyXvFg14w0d3lHAs02iy33c/010Qc68b41EoUfZJOD4pj/ 19Hm3QIIN8eD6lnV8FfZH/0gUUmVwKY+LqwqmrOGhyzQIjghHT8r6sf/qELb1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648665782; a=rsa-sha256; cv=none; b=xZ5zTuhnw2TZrC6rxRBcjx3/u5+M94Ao4g9cs8lsSNzD9DUvS30Tat15WMZhifG4NbsFHX pmeHNJOE0TD0XeAATqMFUW60SSLGZobdq5fsIAz7H4LvMbyT0nYvT295btVOj/nt42VXPb TGOHi2rA/WPVUyCwmZzu0VFzAfZipgsJoOxmsuXg8SdajSu5Kkee4izLOBvUVUQNqDqE5z L24YxNgS2z7MO1bwT3KfjyTNaPff4G+bFlA6GiveC0MoO2FZ0F6F4wpHtA5bvVLgNtm6y8 w6sMMVGjiJzpRXOkzOSYOkahEaWj7j2e6BeJzfjBvw6IKb5Odt8tyh3yZzrcfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=4adb2b300ce7447c7cad200741beb9b55884d1a5 commit 4adb2b300ce7447c7cad200741beb9b55884d1a5 Author: Robert Clausecker AuthorDate: 2022-03-30 18:33:11 +0000 Commit: Gleb Popov CommitDate: 2022-03-30 18:42:39 +0000 databases/sqsh: Fix build with FreeTDS 1.2. Assume maintainership. PR: 262942 MFH: 2022Q1 --- databases/sqsh/Makefile | 10 ++++++---- databases/sqsh/distinfo | 4 +++- databases/sqsh/files/patch-src_cmd__connect.c | 18 ++++++++++-------- databases/sqsh/pkg-descr | 2 +- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile index 8ee7591e525e..0833f5d592ca 100644 --- a/databases/sqsh/Makefile +++ b/databases/sqsh/Makefile @@ -2,18 +2,19 @@ PORTNAME= sqsh PORTVERSION= 2.5.16.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases 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 LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= cmd_connect.c:1897:17: error: use of undeclared identifier 'CS_MAX_CHAR' - LIB_DEPENDS= libct.so:databases/freetds USES= readline tar:tgz @@ -29,6 +30,7 @@ OPTIONS_DEFINE= X11 OPTIONS_DEFAULT=X11 X11_USES= motif +X11_USE= xorg=x11,xext,xmu,xt X11_CONFIGURE_ON= --with-motif --with-x post-patch: diff --git a/databases/sqsh/distinfo b/databases/sqsh/distinfo index a57f371e1677..5e4278b49237 100644 --- a/databases/sqsh/distinfo +++ b/databases/sqsh/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1524247164 +TIMESTAMP = 1648655356 SHA256 (sqsh-2.5.16.1.tgz) = d6641f365ace60225fc0fa48f82b9dbed77a4e506a0e497eb6889e096b8320f2 SIZE (sqsh-2.5.16.1.tgz) = 623715 +SHA256 (patch-src_cmd_connect_c) = 1270ac466cacbac98952190315964cda0e8da0e955e01d14030a4091ed3ce9b7 +SIZE (patch-src_cmd_connect_c) = 1579 diff --git a/databases/sqsh/files/patch-src_cmd__connect.c b/databases/sqsh/files/patch-src_cmd__connect.c index b2c79eee90b9..dc77a7dc194b 100644 --- a/databases/sqsh/files/patch-src_cmd__connect.c +++ b/databases/sqsh/files/patch-src_cmd__connect.c @@ -1,6 +1,7 @@ ---- src/cmd_connect.c 2014-04-04 08:22:38 -+++ src/cmd_connect.c 2018-04-20 18:26:38 -@@ -861,6 +861,14 @@ +--- src/cmd_connect.c.orig 2014-04-04 08:22:38 UTC ++++ src/cmd_connect.c +@@ -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) version = CS_TDS_70; + else if (strcmp(tds_version, "7.1") == 0) @@ -12,15 +13,15 @@ + else if (strcmp(tds_version, "7.4") == 0) + version = CS_TDS_74; else if (strcmp(tds_version, "8.0") == 0) -- version = CS_TDS_80; -+ version = CS_TDS_71; /* https://sourceforge.net/p/sqsh/discussion/365924/thread/29ae1664/#7f59/707f */ + version = CS_TDS_71; #endif 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" ); break; -- case CS_TDS_80: -+ case CS_TDS_71: + case CS_TDS_71: env_set( g_env, "tds_version", "8.0" ); break; + case CS_TDS_72: @@ -34,3 +35,4 @@ + break; #endif default: + env_set( g_env, "tds_version", "unknown" ); diff --git a/databases/sqsh/pkg-descr b/databases/sqsh/pkg-descr index e74832bc3699..9f9350a19d1c 100644 --- a/databases/sqsh/pkg-descr +++ b/databases/sqsh/pkg-descr @@ -1,4 +1,4 @@ This is alternative to ancient isql - interactive and comfortable database query tool for Sybase. -WWW: http://www.sqsh.org/ +WWW: https://sourceforge.net/projects/sqsh