- Fix pkg-plist in NOPORTDOCS and NOPORTEXAMPLES case.

- Some style clean-ups.

3 files changed, 9 insertions, 19 deletions

diff --git a/japanese/xjtext/Makefile b/japanese/xjtext/Makefile
index 3d325ee140d1..05bfb3f007aa 100644
--- a/japanese/xjtext/Makefile
+++ b/japanese/xjtext/Makefile
@@ -19,17 +19,22 @@ USE_BISON=	build
 USE_GNOME=	imlib
 
 SUB_FILES=	pkg-message
+PLIST_FILES=	bin/xjtext
+PORTDOCS=	README.txt
+PORTEXAMPLES=	FSS README YAMA Ao.png Back2.png Brown.png Royal.png Royal2.png
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xjtext ${PREFIX}/bin
+
+post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
+.if !deinfed(NOPORTEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}
-.for file in FSS README YAMA Ao.png Back2.png Brown.png Royal.png Royal2.png
-	${INSTALL_DATA} ${WRKSRC}/${file} ${EXAMPLESDIR}
-.endfor
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}
+.endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/japanese/xjtext/pkg-descr b/japanese/xjtext/pkg-descr
index c4e443ccfc95..7dc240b5bfcb 100644
--- a/japanese/xjtext/pkg-descr
+++ b/japanese/xjtext/pkg-descr
@@ -2,6 +2,3 @@ Xjtext displays Japanese text in vertical form. Special effects can be
 created by inserting directives into the input text.
 
 WWW: http://plaza.harmonix.ne.jp/~onizuka/Software.html
-
-- SADA Kenji
-sada@FreeBSD.org
diff --git a/japanese/xjtext/pkg-plist b/japanese/xjtext/pkg-plist
deleted file mode 100644
index c89734ff458f..000000000000
--- a/japanese/xjtext/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-bin/xjtext
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
-%%EXAMPLESDIR%%/Ao.png
-%%EXAMPLESDIR%%/Back2.png
-%%EXAMPLESDIR%%/Brown.png
-%%EXAMPLESDIR%%/FSS
-%%EXAMPLESDIR%%/README
-%%EXAMPLESDIR%%/Royal.png
-%%EXAMPLESDIR%%/Royal2.png
-%%EXAMPLESDIR%%/YAMA
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%EXAMPLESDIR%%