- Switch to USES=localbase

- Switch to new test framework
- Fix portlint by switching to static plist

Approved by:	portmgr blanket

2 files changed, 12 insertions, 16 deletions

diff --git a/textproc/unrtf/Makefile b/textproc/unrtf/Makefile
index 46659bb78604..37df47e045a0 100644
--- a/textproc/unrtf/Makefile
+++ b/textproc/unrtf/Makefile
@@ -12,23 +12,13 @@ COMMENT=	Converter from RTF to several formats, including HTML and LaTeX
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		autoreconf cpe gmake iconv
+USES=		autoreconf cpe gmake iconv localbase:ldflags
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libdir=${PREFIX}/share
 CPE_VENDOR=	unrtf_project
+TEST_TARGET=	check
 
-PLIST_FILES=	bin/unrtf \
-		%%DATADIR%%/SYMBOL.charmap \
-		%%DATADIR%%/html.conf \
-		%%DATADIR%%/latex.conf \
-		%%DATADIR%%/rtf.conf \
-		%%DATADIR%%/text.conf \
-		%%DATADIR%%/troff_mm.conf \
-		%%DATADIR%%/vt.conf \
-		man/man1/unrtf.1.gz
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
+LDFLAGS+=	${ICONV_LIB}
 
 post-patch:
 	@${FIND} -X ${WRKSRC} -type f -and -name "*.[1h]" | ${XARGS} \
@@ -37,7 +27,4 @@ post-patch:
 	@${REINPLACE_CMD} -e '/^attr_get_param/,/^}/s/return;/return NULL;/' \
 		${WRKSRC}/src/attr.c
 
-check regression-test test: build
-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} check)
-
 .include <bsd.port.mk>
diff --git a/textproc/unrtf/pkg-plist b/textproc/unrtf/pkg-plist
new file mode 100644
index 000000000000..8b0373599da2
--- /dev/null
+++ b/textproc/unrtf/pkg-plist
@@ -0,0 +1,9 @@
+bin/unrtf
+man/man1/unrtf.1.gz
+%%DATADIR%%/SYMBOL.charmap
+%%DATADIR%%/html.conf
+%%DATADIR%%/latex.conf
+%%DATADIR%%/rtf.conf
+%%DATADIR%%/text.conf
+%%DATADIR%%/troff_mm.conf
+%%DATADIR%%/vt.conf