Index: head/textproc/msort/Makefile
===================================================================
--- head/textproc/msort/Makefile	(revision 402740)
+++ head/textproc/msort/Makefile	(revision 402741)
@@ -1,42 +1,37 @@
 # Created by: Gea-Suan Lin <gslin@gslin.org>
 # $FreeBSD$
 
 PORTNAME=	msort
 PORTVERSION=	8.53
 PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://billposer.org/Software/Downloads/
 
 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
 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>