Index: head/sysutils/uniutils/Makefile
===================================================================
--- head/sysutils/uniutils/Makefile	(revision 461288)
+++ head/sysutils/uniutils/Makefile	(revision 461289)
@@ -1,43 +1,46 @@
 # Created by: thierry@pompo.net
 # $FreeBSD$
 
 PORTNAME=	uniutils
 PORTVERSION=	2.27
 PORTREVISION=	2
 CATEGORIES=	sysutils textproc
 MASTER_SITES=	http://billposer.org/Software/Downloads/
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Unicode Description Utilities
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	ascii2binary:converters/ascii2binary
 
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib -lintl
-USES=		gettext
+USES=		gettext localbase
 
+LIBS+=		-lintl
+
 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|${PREFIX}|' ${WRKSRC}/Makefile.in
-	${REINPLACE_CMD} -e 's|TestData|${EXAMPLESDIR}|' ${WRKSRC}/README
+	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|TestData|${EXAMPLESDIR}|' ${WRKSRC}/README
 
-regression-test:
+do-test:
 	(cd ${WRKSRC} &&		\
 	./unidesc TestData/Test1.u &&	\
 	./uniname TestData/Test1.ann)
 
-post-install:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+
+post-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${TESTFILES:S|^|${WRKSRC}/TestData/|} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>