Date: Wed, 26 Sep 2012 02:21:21 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/171975: databases/sqsh: Support USE_READLINE Message-ID: <20120926022121.436dbc670a36b16296952c0a@yahoo.com> Resent-Message-ID: <201209251810.q8PIAEVw018116@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 171975
>Category: ports
>Synopsis: databases/sqsh: Support USE_READLINE
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Sep 25 18:10:14 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Add LICENSE
- Add MAKE_JOBS_SAFE
- Disable gettext detection
- Support USE_READLINE
- Support PLIST_FILES
Remove file:
pkg-plist
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/databases/sqsh/Makefile databases/sqsh/Makefile
--- /usr/ports/databases/sqsh/Makefile 2012-05-10 21:48:55.000000000 +0900
+++ databases/sqsh/Makefile 2012-09-25 03:18:21.000000000 +0900
@@ -1,7 +1,4 @@
-# New ports collection makefile for: sqsh
-# Date created: 14 Jan 2000
-# Whom: Domas Mituzas <midom@dammit.lt>
-#
+# Created by: Domas Mituzas <midom@dammit.lt>
# $FreeBSD: ports/databases/sqsh/Makefile,v 1.37 2012/05/10 12:48:55 wen Exp $
PORTNAME= sqsh
@@ -12,21 +9,30 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= Interactive tool for querying Sybase database servers
+LICENSE= GPLv2 # (or later)
+
LIB_DEPENDS= ct:${PORTSDIR}/databases/freetds
-USE_GETTEXT= yes
+OPTIONS_DEFINE= X11
+OPTIONS_DEFAULT=X11
+
+USE_READLINE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= SYBASE="${LOCALBASE}"
CONFIGURE_ARGS= --with-readline
-ALL_TARGET= -j`${SYSCTL} -n hw.ncpu` build
+ALL_TARGET= build
+MAKE_JOBS_SAFE= yes
-MAN1= sqsh.1
+MAN1= sqsh.1
+PLIST_FILES= bin/sqsh etc/sqshrc.default
-.if defined(WITHOUT_X11)
-PKGNAMESUFFIX= -nox11
-.else
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MX11}
USE_MOTIF= yes
CONFIGURE_ARGS+= --with-motif --with-x
+.else
+PKGNAMESUFFIX= -nox11
.endif
post-patch:
diff -urN /usr/ports/databases/sqsh/files/patch-configure databases/sqsh/files/patch-configure
--- /usr/ports/databases/sqsh/files/patch-configure 2004-12-13 02:00:14.000000000 +0900
+++ databases/sqsh/files/patch-configure 2012-05-04 14:35:03.000000000 +0900
@@ -1,9 +1,20 @@
---- configure Fri Nov 9 14:58:04 2001
-+++ configure Tue Oct 15 13:51:29 2002
-@@ -1196,5 +1195,5 @@
+--- configure.orig 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*)
SYBASE_OS="-ldl -lm";;
- sunos*)
+ sunos*|*bsd*)
SYBASE_OS="-lm";;
solaris*)
+ SYBASE_OS="-lnsl -ldl -lm";;
diff -urN /usr/ports/databases/sqsh/files/patch-doc::global.sqshrc databases/sqsh/files/patch-doc::global.sqshrc
--- /usr/ports/databases/sqsh/files/patch-doc::global.sqshrc 2002-11-07 01:47:17.000000000 +0900
+++ databases/sqsh/files/patch-doc::global.sqshrc 2012-05-04 14:41:33.000000000 +0900
@@ -6,7 +6,7 @@
+
+# DO NOT EDIT -- the changes will be lost if you reinstall
+# or upgrade sqsh port/package. Instead, create your own
-+# %%LOCALBASE%%/etc/sqshrc
++# %%PREFIX%%/etc/sqshrc
+# if you wish to make system-wide customizations.
+# User-specific customizations can be made in ~/.sqshrc files.
diff -urN /usr/ports/databases/sqsh/pkg-plist databases/sqsh/pkg-plist
--- /usr/ports/databases/sqsh/pkg-plist 2002-10-15 22:18:00.000000000 +0900
+++ databases/sqsh/pkg-plist 1970-01-01 09:00:00.000000000 +0900
@@ -1,2 +0,0 @@
-bin/sqsh
-etc/sqshrc.default
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120926022121.436dbc670a36b16296952c0a>