- Add staging support

- Convert to new options framework
- Switch to PLIST_FILES
- Remove leading article from COMMENT

2 files changed, 12 insertions, 17 deletions

diff --git a/japanese/srd-fpw-package/Makefile b/japanese/srd-fpw-package/Makefile
index eba663410820..8222ca21e5f7 100644
--- a/japanese/srd-fpw-package/Makefile
+++ b/japanese/srd-fpw-package/Makefile
@@ -8,28 +8,29 @@ CATEGORIES=	japanese elisp
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/srd/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A supplement file for lookup to use "Random House"
+COMMENT=	Supplement file for lookup to use "Random House"
 
 RUN_DEPENDS=	display:${PORTSDIR}/graphics/ImageMagick
 # Your PC does not have an audio card always.
 #		realplay:${PORTSDIR}/multimedia/linux-realplayer
 
 NO_BUILD=	yes
-PLIST_SUB=	PKGNAME=${PKGNAME}
 USES=		perl5
 
-PKG_DIR=	${PREFIX}/share/dict/lookup-package
+PKG_DIR=	${STAGEDIR}${PREFIX}/share/dict/lookup-package
+
+PLIST_FILES=	share/dict/lookup-package/srd-fpw.el \
+		share/dict/lookup-package/extract-srd.pl
+PLIST_DIRS=	share/dict/lookup-package
+PORTDOCS=	ChangeLog README.TXT
+
+OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${PKG_DIR}
+	@${MKDIR} ${PKG_DIR}
 	${INSTALL_DATA} ${WRKSRC}/srd-fpw.el ${PKG_DIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/extract-srd.pl ${PKG_DIR}
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for file in ChangeLog README.TXT
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA}	${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/japanese/srd-fpw-package/pkg-plist b/japanese/srd-fpw-package/pkg-plist
deleted file mode 100644
index 1e1057d5f030..000000000000
--- a/japanese/srd-fpw-package/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-share/dict/lookup-package/srd-fpw.el
-share/dict/lookup-package/extract-srd.pl
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README.TXT
-@dirrm share/dict/lookup-package
-%%PORTDOCS%%@dirrm %%DOCSDIR%%