From owner-svn-ports-all@freebsd.org  Tue Dec  1 14:05:31 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EAD3FA3E3D3;
 Tue,  1 Dec 2015 14:05:31 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A9EDE1086;
 Tue,  1 Dec 2015 14:05:31 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB1E5UqH064387;
 Tue, 1 Dec 2015 14:05:30 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB1E5UqT064386;
 Tue, 1 Dec 2015 14:05:30 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201512011405.tB1E5UqT064386@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Tue, 1 Dec 2015 14:05:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r402741 - head/textproc/msort
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Dec 2015 14:05:32 -0000

Author: amdmi3
Date: Tue Dec  1 14:05:30 2015
New Revision: 402741
URL: https://svnweb.freebsd.org/changeset/ports/402741

Log:
  - Add LICENSE_FILE
  - Switch to new test system (note that some tests fail)

Modified:
  head/textproc/msort/Makefile

Modified: head/textproc/msort/Makefile
==============================================================================
--- head/textproc/msort/Makefile	Tue Dec  1 14:04:57 2015	(r402740)
+++ head/textproc/msort/Makefile	Tue Dec  1 14:05:30 2015	(r402741)
@@ -11,11 +11,13 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Sorting files in sophisticated ways
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libtre.so:${PORTSDIR}/textproc/libtre \
     		libuninum.so:${PORTSDIR}/devel/libuninum \
 		libutf8proc.so:${PORTSDIR}/textproc/utf8proc
 RUN_DEPENDS=	iwidgets>=0:${PORTSDIR}/x11-toolkits/iwidgets
+TEST_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
 
 CONFIGURE_ENV=	ac_cv_lib_tre_regwcomp=yes
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -23,20 +25,13 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV+=	INCLUDES="-I${LOCALBASE}/include"
 GNU_CONFIGURE=	yes
 USES=		gettext tk:wrapper,run
+TEST_TARGET=	test
+TEST_ENV=	LC_ALL=C
 
 PLIST_FILES=	bin/msg bin/msort man/man1/msort.1.gz
 
-.ifdef(MAINTAINER_MODE)
-BUILD_DEPENDS+= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
-
 post-patch:
-	${REINPLACE_CMD} -e "s|bash|${LOCALBASE}/bin/bash|g" ${WRKSRC}/RegressionTests/Makefile
-	${REINPLACE_CMD} -e "s|msort|../&|g" ${WRKSRC}/RegressionTests/RunTests.sh \
-		${WRKSRC}/RegressionTests/RunLocaleTests.sh
-
-test: build
-	@(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} test)
-
-.endif
+	@${REINPLACE_CMD} -e "s|bash|${LOCALBASE}/bin/bash|g" ${WRKSRC}/RegressionTests/Makefile
+	@${REINPLACE_CMD} -e "s|msort|../&|g" ${WRKSRC}/RegressionTests/RunTests.sh \
 
 .include <bsd.port.mk>