Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 13 Dec 2012 04:33:28 +0000 (UTC)
From:      Marcelo Araujo <araujo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r308819 - in head/databases/sqsh: . files
Message-ID:  <201212130433.qBD4XStc041061@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: araujo
Date: Thu Dec 13 04:33:28 2012
New Revision: 308819
URL: http://svnweb.freebsd.org/changeset/ports/308819

Log:
  - Add LICENSE.
  - Add MAKE_JOBS_SAFE.
  - Disable gettext detection.
  - Support USE_READLINE.
  - Support PLIST_FILES instead of pkg-plist.
  - Trim header.
  
  PR:		ports/171975
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Modified:
  head/databases/sqsh/Makefile
  head/databases/sqsh/files/patch-configure
  head/databases/sqsh/files/patch-doc::global.sqshrc
  head/databases/sqsh/pkg-plist

Modified: head/databases/sqsh/Makefile
==============================================================================
--- head/databases/sqsh/Makefile	Thu Dec 13 04:32:09 2012	(r308818)
+++ head/databases/sqsh/Makefile	Thu Dec 13 04:33:28 2012	(r308819)
@@ -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$
 
 PORTNAME=	sqsh
@@ -12,21 +9,30 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 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:

Modified: head/databases/sqsh/files/patch-configure
==============================================================================
--- head/databases/sqsh/files/patch-configure	Thu Dec 13 04:32:09 2012	(r308818)
+++ head/databases/sqsh/files/patch-configure	Thu Dec 13 04:33:28 2012	(r308819)
@@ -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";;

Modified: head/databases/sqsh/files/patch-doc::global.sqshrc
==============================================================================
--- head/databases/sqsh/files/patch-doc::global.sqshrc	Thu Dec 13 04:32:09 2012	(r308818)
+++ head/databases/sqsh/files/patch-doc::global.sqshrc	Thu Dec 13 04:33:28 2012	(r308819)
@@ -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.
  

Modified: head/databases/sqsh/pkg-plist
==============================================================================
--- head/databases/sqsh/pkg-plist	Thu Dec 13 04:32:09 2012	(r308818)
+++ head/databases/sqsh/pkg-plist	Thu Dec 13 04:33:28 2012	(r308819)
@@ -1,2 +0,0 @@
-bin/sqsh
-etc/sqshrc.default



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