- Add staging support

- Remove leading article from COMMENT
- Switch to PLIST_FILES
- Define DOCS option

2 files changed, 14 insertions, 20 deletions

diff --git a/japanese/ctags/Makefile b/japanese/ctags/Makefile
index 9ddf36080472..1ae61d2c39d4 100644
--- a/japanese/ctags/Makefile
+++ b/japanese/ctags/Makefile
@@ -7,26 +7,26 @@ CATEGORIES=	japanese devel
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA025040/ctags/downloads/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A feature-filled tagfile generator with Japanese support
-
-WRKSRC=	${WRKDIR}/${DISTNAME:S/j1//}
+COMMENT=	Feature-filled tagfile generator with Japanese support
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-macro-patterns --with-readlib
+WRKSRC=		${WRKDIR}/${DISTNAME:S/j1//}
+SUB_FILES=	pkg-message
 
-MAN1=		jexctags.1
+PLIST_FILES=	bin/jexctags include/readtags.h lib/readtags.o \
+		man/man1/jexctags.1.gz
+PORTDOCS=	README README_J.TXT
 
-SUB_FILES=	pkg-message
+OPTIONS_DEFINE=	DOCS
+
+post-patch:
+	@${REINPLACE_CMD} -E '/^DEST_/ s,(bin|lib|inc|man1)dir),DESTDIR)$$(&,g' \
+		${WRKSRC}/Makefile.in
 
-NO_STAGE=	yes
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in README README_J.TXT
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
-	@${STRIP_CMD} ${PREFIX}/bin/jexctags
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/jexctags
 
 .include <bsd.port.mk>
diff --git a/japanese/ctags/pkg-plist b/japanese/ctags/pkg-plist
deleted file mode 100644
index c8ea535c5037..000000000000
--- a/japanese/ctags/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/jexctags
-include/readtags.h
-lib/readtags.o
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README_J.TXT
-@dirrm %%DOCSDIR%%