Index: head/sysutils/uniutils/Makefile
===================================================================
--- head/sysutils/uniutils/Makefile	(revision 400130)
+++ head/sysutils/uniutils/Makefile	(revision 400131)
@@ -1,43 +1,43 @@
 # Created by: thierry@pompo.net
 # $FreeBSD$
 
 PORTNAME=	uniutils
 PORTVERSION=	2.27
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils textproc
 MASTER_SITES=	http://billposer.org/Software/Downloads/
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Unicode Description Utilities
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	ascii2binary:${PORTSDIR}/converters/ascii2binary
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib -lintl
 USES=		gettext
 
 TESTFILES=	Test1.ann Test1.u Test2.ann Test2.u Test3.ann Test3.u	\
 		Test4.ann Test4.u Test5.ann Test5.u
 PORTDOCS=	AUTHORS NEWS README
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 pre-configure:
-	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/Makefile.in
+	${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/Makefile.in
 	${REINPLACE_CMD} -e 's|TestData|${EXAMPLESDIR}|' ${WRKSRC}/README
 
 regression-test:
 	(cd ${WRKSRC} &&		\
 	./unidesc TestData/Test1.u &&	\
 	./uniname TestData/Test1.ann)
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${TESTFILES:S|^|${WRKSRC}/TestData/|} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/sysutils/uniutils/files/patch-utf8lookup
===================================================================
--- head/sysutils/uniutils/files/patch-utf8lookup	(revision 400130)
+++ head/sysutils/uniutils/files/patch-utf8lookup	(revision 400131)
@@ -1,11 +1,14 @@
---- utf8lookup.orig	Sun Jan 29 21:43:23 2006
-+++ utf8lookup	Tue Jan 31 00:11:48 2006
-@@ -10,7 +10,7 @@
+--- utf8lookup.orig	2007-06-30 05:31:37 UTC
++++ utf8lookup
+@@ -8,9 +8,10 @@
+ #       UTF-32   name
+ #	000543   ARMENIAN CAPITAL LETTER CHEH
  #
++[ $(( $(printf '\1' | od -dAn) )) -eq 1 ] && end=le || end=be
  echo 0x$1 |		 # feed command-line argument to ascii2binary's stdin
  ascii2binary -t ui |	 # convert text to unsigned integer
 -iconv -f utf32 -t utf8 | # convert utf-32 to utf-8 encoding
-+iconv -f ucs-4le -t utf-8 | # convert utf-32 to utf-8 encoding
++iconv -f ucs-4$end -t utf-8 | # convert utf-32 to utf-8 encoding
  uniname -b -c -e -g      # feed to uniname, suppressing byte and character offsets,
  			 # UTF-8 encoding, and glyph