Index: head/vietnamese/vnlpr/Makefile
===================================================================
--- head/vietnamese/vnlpr/Makefile	(revision 348446)
+++ head/vietnamese/vnlpr/Makefile	(revision 348447)
@@ -1,37 +1,36 @@
 # Created by: David O'Brien (obrien@cs.ucdavis.edu)
 # $FreeBSD$
 
 PORTNAME=	vnlpr
 PORTVERSION=	2.0
 CATEGORIES=	vietnamese print
 MASTER_SITES=	ftp://ftp.monash.edu.au/pub/vietnam/unix/
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	obrien@FreeBSD.org
 COMMENT=	Shell script and set of fonts to print Vietnamese text on PostScript printer
 
 RUN_DEPENDS=	vn7to8:${PORTSDIR}/vietnamese/vn7to8 \
 		vnpstext:${PORTSDIR}/vietnamese/vnpstext
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
 pre-patch:
 	@${MV} ${WRKSRC}/vnlpr ${WRKSRC}/vnlpr.in
 
 do-build:
 	${SED} -e "s:^set VNLIB=./:set VNLIB=${PREFIX}/share/vn-fonts:"  \
 	    -e 's/^set PRINTER="barrons"/#set PRINTER="postscript"/'  \
 		${WRKSRC}/vnlpr.in > ${WRKSRC}/vnlpr
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/vnlpr ${PREFIX}/bin
-	@${MKDIR} ${PREFIX}/share/vn-fonts
-	${INSTALL_DATA} ${WRKSRC}/*.ps ${PREFIX}/share/vn-fonts
-	${INSTALL_DATA} ${WRKSRC}/*.gsf ${PREFIX}/share/vn-fonts
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/INSTALL ${DOCSDIR}
-.endif
+	${INSTALL_SCRIPT} ${WRKSRC}/vnlpr ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/vn-fonts
+	${INSTALL_DATA} ${WRKSRC}/*.ps ${STAGEDIR}${PREFIX}/share/vn-fonts
+	${INSTALL_DATA} ${WRKSRC}/*.gsf ${STAGEDIR}${PREFIX}/share/vn-fonts
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/vietnamese/vnlpr/pkg-plist
===================================================================
--- head/vietnamese/vnlpr/pkg-plist	(revision 348446)
+++ head/vietnamese/vnlpr/pkg-plist	(revision 348447)
@@ -1,18 +1,21 @@
 bin/vnlpr
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
 share/vn-fonts/pr-am.ps
 share/vn-fonts/pr-hm.ps
 share/vn-fonts/pr-hy.ps
 share/vn-fonts/pr-mq.ps
 share/vn-fonts/pr-pt.ps
 share/vn-fonts/pr-th.ps
 share/vn-fonts/pr-uh.ps
 share/vn-fonts/am_11.gsf
 share/vn-fonts/hm_11.gsf
 share/vn-fonts/hy_11.gsf
 share/vn-fonts/mq_11.gsf
 share/vn-fonts/pt_11.gsf
 share/vn-fonts/th_11.gsf
 share/vn-fonts/uh_11.gsf
+share/vn-fonts/initcour.ps
+share/vn-fonts/initcourb.ps
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm share/vn-fonts