From 58d0cc0c1153bc9189175e1d969fc2b0a0944acc Mon Sep 17 00:00:00 2001
From: amdmi3 <amdmi3@FreeBSD.org>
Date: Thu, 23 Jun 2016 14:18:37 +0000
Subject: - Add LICENSE_FILE - Fix build with newer databases/freetds

---
 databases/sqsh/Makefile                       |  7 ++++---
 databases/sqsh/files/patch-src_cmd__connect.c | 27 +++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 databases/sqsh/files/patch-src_cmd__connect.c

(limited to 'databases')

diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile
index cb882f71c95e..d4bc6f24fff5 100644
--- a/databases/sqsh/Makefile
+++ b/databases/sqsh/Makefile
@@ -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
 
diff --git a/databases/sqsh/files/patch-src_cmd__connect.c b/databases/sqsh/files/patch-src_cmd__connect.c
new file mode 100644
index 000000000000..2a8385c156c1
--- /dev/null
+++ b/databases/sqsh/files/patch-src_cmd__connect.c
@@ -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" );
+ 		}
-- 
cgit