From owner-svn-ports-head@freebsd.org Fri Apr 20 21:10:26 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 250F8FA24AA; Fri, 20 Apr 2018 21:10:26 +0000 (UTC) (envelope-from mi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F0EE57C1F1; Fri, 20 Apr 2018 21:10:25 +0000 (UTC) (envelope-from mi@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EA3C31D7CD; Fri, 20 Apr 2018 21:10:25 +0000 (UTC) (envelope-from mi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3KLAPF6057010; Fri, 20 Apr 2018 21:10:25 GMT (envelope-from mi@FreeBSD.org) Received: (from mi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3KLAPQu057006; Fri, 20 Apr 2018 21:10:25 GMT (envelope-from mi@FreeBSD.org) Message-Id: <201804202110.w3KLAPQu057006@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mi set sender to mi@FreeBSD.org using -f From: Mikhail Teterin Date: Fri, 20 Apr 2018 21:10:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467845 - in head/databases/sqsh: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mi X-SVN-Commit-Paths: in head/databases/sqsh: . files X-SVN-Commit-Revision: 467845 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Apr 2018 21:10:26 -0000 Author: mi Date: Fri Apr 20 21:10:25 2018 New Revision: 467845 URL: https://svnweb.freebsd.org/changeset/ports/467845 Log: Upgrade from 2.1.8 to 2.5.6.1 Deleted: head/databases/sqsh/files/patch-src_sqsh__readline.c Modified: head/databases/sqsh/Makefile head/databases/sqsh/distinfo head/databases/sqsh/files/patch-configure head/databases/sqsh/files/patch-src_cmd__connect.c Modified: head/databases/sqsh/Makefile ============================================================================== --- head/databases/sqsh/Makefile Fri Apr 20 21:08:58 2018 (r467844) +++ head/databases/sqsh/Makefile Fri Apr 20 21:10:25 2018 (r467845) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= sqsh -PORTVERSION= 2.1.8 -PORTREVISION= 1 +PORTVERSION= 2.5.16.1 CATEGORIES= databases -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R:R} MAINTAINER= ports@FreeBSD.org COMMENT= Interactive tool for querying Sybase database servers @@ -15,11 +14,12 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libct.so:databases/freetds -USES= readline +USES= readline tar:tgz GNU_CONFIGURE= yes CONFIGURE_ENV= SYBASE="${LOCALBASE}" CONFIGURE_ARGS= --with-readline ALL_TARGET= build +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R:R} PLIST_FILES= bin/sqsh etc/sqshrc.default man/man1/sqsh.1.gz Modified: head/databases/sqsh/distinfo ============================================================================== --- head/databases/sqsh/distinfo Fri Apr 20 21:08:58 2018 (r467844) +++ head/databases/sqsh/distinfo Fri Apr 20 21:10:25 2018 (r467845) @@ -1,2 +1,3 @@ -SHA256 (sqsh-2.1.8.tar.gz) = 35afae6a5584d941cbbf60c6ef2fa39b4b29a695859548af7b0ce7823d3384f7 -SIZE (sqsh-2.1.8.tar.gz) = 521251 +TIMESTAMP = 1524247164 +SHA256 (sqsh-2.5.16.1.tgz) = d6641f365ace60225fc0fa48f82b9dbed77a4e506a0e497eb6889e096b8320f2 +SIZE (sqsh-2.5.16.1.tgz) = 623715 Modified: head/databases/sqsh/files/patch-configure ============================================================================== --- head/databases/sqsh/files/patch-configure Fri Apr 20 21:08:58 2018 (r467844) +++ head/databases/sqsh/files/patch-configure Fri Apr 20 21:10:25 2018 (r467845) @@ -1,14 +1,5 @@ ---- configure.orig 2012-05-02 20:27:55.000000000 +0900 +--- configure 2012-05-02 20:27:55.000000000 +0900 +++ configure 2012-05-04 14:34:22.000000000 +0900 -@@ -3463,7 +3463,7 @@ - - SYBASE_LIBS= - -- for i in blk cs ct tcl comn intl unic -+ for i in blk cs ct tcl comn unic - do - x= - if test -f $SYBASE_LIBDIR/lib${i}.a; then @@ -3531,7 +3531,7 @@ SYBASE_OS="-lnsl -lm";; ncr*) Modified: head/databases/sqsh/files/patch-src_cmd__connect.c ============================================================================== --- head/databases/sqsh/files/patch-src_cmd__connect.c Fri Apr 20 21:08:58 2018 (r467844) +++ head/databases/sqsh/files/patch-src_cmd__connect.c Fri Apr 20 21:10:25 2018 (r467845) @@ -1,27 +1,36 @@ ---- 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 */ +--- src/cmd_connect.c 2014-04-04 08:22:38 ++++ src/cmd_connect.c 2018-04-20 18:26:38 +@@ -861,6 +861,14 @@ else if (strcmp(tds_version, "7.0") == 0) version = CS_TDS_70; -+#if defined(CS_TDS_80) ++ else if (strcmp(tds_version, "7.1") == 0) ++ version = CS_TDS_71; ++ else if (strcmp(tds_version, "7.2") == 0) ++ version = CS_TDS_72; ++ else if (strcmp(tds_version, "7.3") == 0) ++ version = CS_TDS_73; ++ 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_80; ++ version = CS_TDS_71; /* https://sourceforge.net/p/sqsh/discussion/365924/thread/29ae1664/#7f59/707f */ #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; +@@ -1259,7 +1267,16 @@ + env_set( g_env, "tds_version", "7.0" ); + break; +- case CS_TDS_80: ++ case CS_TDS_71: + env_set( g_env, "tds_version", "8.0" ); + break; ++ case CS_TDS_72: ++ env_set( g_env, "tds_version", "7.2" ); ++ break; ++ case CS_TDS_73: ++ env_set( g_env, "tds_version", "7.2" ); ++ break; ++ case CS_TDS_74: ++ env_set( g_env, "tds_version", "7.2" ); ++ break; #endif -+#endif - default: - env_set( g_env, "tds_version", "unknown" ); - } + default: