From owner-svn-ports-all@freebsd.org Thu Jun 23 14:18:39 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 32133AC5CFE; Thu, 23 Jun 2016 14:18:39 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DA2C5134F; Thu, 23 Jun 2016 14:18:38 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5NEIcgw085076; Thu, 23 Jun 2016 14:18:38 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5NEIbZb085074; Thu, 23 Jun 2016 14:18:37 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201606231418.u5NEIbZb085074@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 23 Jun 2016 14:18:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417376 - in head/databases/sqsh: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jun 2016 14:18:39 -0000 Author: amdmi3 Date: Thu Jun 23 14:18:37 2016 New Revision: 417376 URL: https://svnweb.freebsd.org/changeset/ports/417376 Log: - Add LICENSE_FILE - Fix build with newer databases/freetds Added: head/databases/sqsh/files/patch-src_cmd__connect.c (contents, props changed) Modified: head/databases/sqsh/Makefile Modified: head/databases/sqsh/Makefile ============================================================================== --- head/databases/sqsh/Makefile Thu Jun 23 13:23:13 2016 (r417375) +++ head/databases/sqsh/Makefile Thu Jun 23 14:18:37 2016 (r417376) @@ -10,12 +10,10 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Interactive tool for querying Sybase database servers LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libct.so:databases/freetds -OPTIONS_DEFINE= X11 -OPTIONS_DEFAULT=X11 - USES= readline GNU_CONFIGURE= yes CONFIGURE_ENV= SYBASE="${LOCALBASE}" @@ -24,6 +22,9 @@ ALL_TARGET= build PLIST_FILES= bin/sqsh etc/sqshrc.default man/man1/sqsh.1.gz +OPTIONS_DEFINE= X11 +OPTIONS_DEFAULT=X11 + X11_USES= motif X11_CONFIGURE_ON= --with-motif --with-x Added: head/databases/sqsh/files/patch-src_cmd__connect.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/sqsh/files/patch-src_cmd__connect.c Thu Jun 23 14:18:37 2016 (r417376) @@ -0,0 +1,27 @@ +--- src/cmd_connect.c.orig 2012-03-14 09:17:51 UTC ++++ src/cmd_connect.c +@@ -805,9 +805,11 @@ int cmd_connect( argc, argv ) + /* Then we use freetds */ + else if (strcmp(tds_version, "7.0") == 0) + version = CS_TDS_70; ++#if defined(CS_TDS_80) + else if (strcmp(tds_version, "8.0") == 0) + version = CS_TDS_80; + #endif ++#endif + else version = CS_TDS_50; /* default version */ + + +@@ -1061,10 +1063,12 @@ int cmd_connect( argc, argv ) + case CS_TDS_70: + env_set( g_env, "tds_version", "7.0" ); + break; ++#if defined(CS_TDS_80) + case CS_TDS_80: + env_set( g_env, "tds_version", "8.0" ); + break; + #endif ++#endif + default: + env_set( g_env, "tds_version", "unknown" ); + }