diff options
| -rw-r--r-- | databases/sqsh/Makefile | 8 | ||||
| -rw-r--r-- | databases/sqsh/distinfo | 5 | ||||
| -rw-r--r-- | databases/sqsh/files/patch-configure | 11 | ||||
| -rw-r--r-- | databases/sqsh/files/patch-src_cmd__connect.c | 51 | ||||
| -rw-r--r-- | databases/sqsh/files/patch-src_sqsh__readline.c | 11 |
5 files changed, 38 insertions, 48 deletions
diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile index 41a60c9ae7be..4c5f69ae1b3f 100644 --- a/databases/sqsh/Makefile +++ b/databases/sqsh/Makefile @@ -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 diff --git a/databases/sqsh/distinfo b/databases/sqsh/distinfo index 1f33d9ecf024..a57f371e1677 100644 --- a/databases/sqsh/distinfo +++ b/databases/sqsh/distinfo @@ -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 diff --git a/databases/sqsh/files/patch-configure b/databases/sqsh/files/patch-configure index c994759479cb..28abb5279b67 100644 --- a/databases/sqsh/files/patch-configure +++ b/databases/sqsh/files/patch-configure @@ -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*) diff --git a/databases/sqsh/files/patch-src_cmd__connect.c b/databases/sqsh/files/patch-src_cmd__connect.c index 2a8385c156c1..b2c79eee90b9 100644 --- a/databases/sqsh/files/patch-src_cmd__connect.c +++ b/databases/sqsh/files/patch-src_cmd__connect.c @@ -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: diff --git a/databases/sqsh/files/patch-src_sqsh__readline.c b/databases/sqsh/files/patch-src_sqsh__readline.c deleted file mode 100644 index 208e22a97af8..000000000000 --- a/databases/sqsh/files/patch-src_sqsh__readline.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/sqsh_readline.c.orig 2012-03-29 16:25:46.000000000 +0000 -+++ src/sqsh_readline.c -@@ -145,7 +145,7 @@ int sqsh_readline_init() - - rl_readline_name = "sqsh" ; - rl_completion_entry_function = (rl_compentry_func_t*)sqsh_completion ; -- rl_attempted_completion_function = (CPPFunction*)sqsh_completion ; -+ rl_attempted_completion_function = (rl_completion_func_t *)sqsh_completion ; - - /* - * sqsh-2.1.8 - Remove '@' and '$' from the readline default list of word break |