Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 23 Jun 2016 14:18:37 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r417376 - in head/databases/sqsh: . files
Message-ID:  <201606231418.u5NEIbZb085074@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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" );
+ 		}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606231418.u5NEIbZb085074>