From owner-svn-ports-head@FreeBSD.ORG  Mon Jul 16 11:11:16 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 99CA7106568D;
	Mon, 16 Jul 2012 11:11:16 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6B4808FC25;
	Mon, 16 Jul 2012 11:11:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6GBBG8s034710;
	Mon, 16 Jul 2012 11:11:16 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6GBBGeQ034706;
	Mon, 16 Jul 2012 11:11:16 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201207161111.q6GBBGeQ034706@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 16 Jul 2012 11:11:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r300939 - in head/textproc/bsdsort: . files
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Jul 2012 11:11:16 -0000

Author: gabor
Date: Mon Jul 16 11:11:15 2012
New Revision: 300939
URL: http://svn.freebsd.org/changeset/ports/300939

Log:
  - Update to 20120716
  
  Note for -CURRENT users: BSD sort is already the default in recent -CURRENT
  but with threading disabled. You can easily try threaded BSD sort by
  installing this port.

Deleted:
  head/textproc/bsdsort/files/
Modified:
  head/textproc/bsdsort/Makefile
  head/textproc/bsdsort/distinfo

Modified: head/textproc/bsdsort/Makefile
==============================================================================
--- head/textproc/bsdsort/Makefile	Mon Jul 16 10:47:28 2012	(r300938)
+++ head/textproc/bsdsort/Makefile	Mon Jul 16 11:11:15 2012	(r300939)
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sort
-PORTVERSION=	20120508
-PORTREVISION=	1
+PORTVERSION=	20120716
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	gabor
@@ -25,28 +24,29 @@ MAN1=		sort.1
 MAKE_ENV+=	BINDIR="${PREFIX}/bin" \
 		MANDIR="${MANPREFIX}/man/man" \
 		CATDIR="${MANPREFIX}/man/man" \
-		NLSDIR="${PREFIX}/share/nls"
+		NLSDIR="${PREFIX}/share/nls" \
+		MK_GNU_SORT="no"
 
 CFLAGS+=	-std=c99
 
-OPTIONS=	THREADS		"Compile with threads support"	on \
-		NLS		"Compile with NLS support"	on \
-		OVERWRITE_BASE	"Replaces base GNU sort"	off
+OPTIONS_DEFINE=		THREADS NLS OVERWRITE_BASE
+OVERWRITE_BASE_DESC=	"Replaces base GNU sort"
+OPTIONS_DEFAULT=	THREADS NLS
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
+PLIST_SUB+=	NLS=""
+.else
 MAKE_ENV+=	WITHOUT_NLS=yes
 PLIST_SUB+=	NLS="@comment "
-.else
-PLIST_SUB+=	NLS=""
 .endif
 
-.if defined(WITHOUT_THREADS)
-MAKE_ENV+=	WITHOUT_THREADS=yes
+.if ${PORT_OPTIONS:MTHREADS}
+MAKE_ENV+=	WITH_THREADS=yes
 .endif
 
-.if defined(WITH_OVERWRITE_BASE)
+.if ${PORT_OPTIONS:MOVERWRITE_BASE}
 PREFIX=		/usr
 PLIST_SUB+=	OVERWRITE_BASE="" NO_OVERWRITE_BASE="@comment "
 .else

Modified: head/textproc/bsdsort/distinfo
==============================================================================
--- head/textproc/bsdsort/distinfo	Mon Jul 16 10:47:28 2012	(r300938)
+++ head/textproc/bsdsort/distinfo	Mon Jul 16 11:11:15 2012	(r300939)
@@ -1,2 +1,2 @@
-SHA256 (sort-20120508.tar.gz) = df0f9a7a776cccbc224b85fdf484de4babc7793b67a74df19ab3a9b156340522
-SIZE (sort-20120508.tar.gz) = 51759
+SHA256 (sort-20120716.tar.gz) = a30c577b78730f6acf2fe6aed154dbe906fc6834998c8f67c9b7e30fb10755a4
+SIZE (sort-20120716.tar.gz) = 40754