Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 1 Dec 2015 14:05:30 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r402741 - head/textproc/msort
Message-ID:  <201512011405.tB1E5UqT064386@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



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