Index: head/textproc/msort/Makefile
===================================================================
--- head/textproc/msort/Makefile	(revision 441309)
+++ head/textproc/msort/Makefile	(revision 441310)
@@ -1,40 +1,39 @@
 # Created by: Gea-Suan Lin <gslin@gslin.org>
 # $FreeBSD$
 
 PORTNAME=	msort
 PORTVERSION=	8.53
 PORTREVISION=	3
 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
 
-BROKEN=		fails to build
-
 LIB_DEPENDS=	libtre.so:textproc/libtre \
 		libuninum.so:devel/libuninum \
 		libutf8proc.so:textproc/utf8proc
 RUN_DEPENDS=	iwidgets>=0:x11-toolkits/iwidgets
-TEST_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
 BROKEN_aarch64=	Fails to link: missing sbrk
 
+USES=		gettext localbase tk:wrapper,run
 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
 
 PLIST_FILES=	bin/msg bin/msort man/man1/msort.1.gz
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|bash|${LOCALBASE}/bin/bash|g" ${WRKSRC}/RegressionTests/Makefile
-	@${REINPLACE_CMD} -e "s|msort|../&|g" ${WRKSRC}/RegressionTests/RunTests.sh \
+	@${MV} ${WRKSRC}/limits.h ${WRKSRC}/${PORTNAME}_limits.h
+	@${REINPLACE_CMD} -e 's,limits\.h,${PORTNAME}_&,' \
+		${WRKSRC}/Makefile.in ${WRKSRC}/info.c \
+		${WRKSRC}/input.c ${WRKSRC}/msort.c
+	@${REINPLACE_CMD} -e 's|bash|sh|' ${WRKSRC}/RegressionTests/Makefile
+	@${REINPLACE_CMD} -e 's|msort|../&|' \
+		${WRKSRC}/RegressionTests/RunTests.sh
 
 .include <bsd.port.mk>
Index: head/textproc/msort/files/patch-RegressionTests_RunTests.sh
===================================================================
--- head/textproc/msort/files/patch-RegressionTests_RunTests.sh	(nonexistent)
+++ head/textproc/msort/files/patch-RegressionTests_RunTests.sh	(revision 441310)
@@ -0,0 +1,11 @@
+--- RegressionTests/RunTests.sh.orig	2009-08-05 03:09:24 UTC
++++ RegressionTests/RunTests.sh
+@@ -54,7 +54,7 @@ msort -j -q -l -w -c n -Q < CheckOnlyTes
+ rstat2=$?
+ cmp -s CheckOnlyTest01B.result CheckOnlyTest01.norm
+ cstat2=$?
+-if [[($rstat1 == 0) && ($cstat1 == 0) && ($cstat2 == 0) && ($rstat2 > 0)]];
++if [ $rstat1 -eq 0 -a $cstat1 -eq 0 -a $cstat2 -eq 0 -a $rstat2 -gt 0 ];
+ then echo "PASSED" >> TestResults;
+ else echo $'\x1b[1m\x1b[31mFAILED\x1b[0m' >> TestResults;
+ fi

Property changes on: head/textproc/msort/files/patch-RegressionTests_RunTests.sh
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property