From 736936006e345a724c7e976538ba9573df2d6269 Mon Sep 17 00:00:00 2001 From: Ion-Mihai Tetcu Date: Mon, 17 Nov 2008 20:43:55 +0000 Subject: [PATCH] - use DOCSDIR macro - fix plist for -DNOPORTDOCS - bump PORTREVISION Prompted by: QAT QA run --- japanese/cdrom2/Makefile | 7 +++++-- japanese/cdrom2/pkg-plist | 26 +++++++++++++------------- japanese/chasen-base/Makefile | 6 +++--- japanese/chasen-base/pkg-plist | 6 +++--- 4 files changed, 24 insertions(+), 21 deletions(-) diff --git a/japanese/cdrom2/Makefile b/japanese/cdrom2/Makefile index b60faece78ff..dae0dadbaf35 100644 --- a/japanese/cdrom2/Makefile +++ b/japanese/cdrom2/Makefile @@ -7,6 +7,7 @@ PORTNAME= cdrom2 PORTVERSION= 1996.06.16 +PORTREVISION= 1 CATEGORIES= japanese MASTER_SITES= http://www.nerimadors.or.jp/~jiro/cdrom2/ DISTNAME= euc @@ -20,15 +21,17 @@ DOCS= errata.doc gaiji.txt index.doc install.doc kekka.txt \ kojien3.doc menu.doc readers.doc readme.doc readme.org \ ruigo.doc x_option.doc +SUB_FILES+= pkg-message + do-configure: @${ECHO_MSG} "Copying custom Makefile." @${CP} ${FILESDIR}/Makefile ${WRKSRC} .if !defined(NOPORTDOCS) post-install: - @${MKDIR} ${PREFIX}/share/doc/cdrom2 + @${MKDIR} ${DOCSDIR} .for f in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/doc/cdrom2 + @${INSTALL_DATA} ${WRKSRC}/$f ${DOCSDIR} .endfor @${CAT} ${PKGMESSAGE} .endif diff --git a/japanese/cdrom2/pkg-plist b/japanese/cdrom2/pkg-plist index 350e69f7d3f9..d7a432c9dade 100644 --- a/japanese/cdrom2/pkg-plist +++ b/japanese/cdrom2/pkg-plist @@ -2,17 +2,17 @@ bin/cdgaiji bin/cdrom2 lib/cdrom2/kojien3.tbl lib/cdrom2/ruigo.tbl -share/doc/cdrom2/errata.doc -share/doc/cdrom2/gaiji.txt -share/doc/cdrom2/index.doc -share/doc/cdrom2/install.doc -share/doc/cdrom2/kekka.txt -share/doc/cdrom2/kojien3.doc -share/doc/cdrom2/menu.doc -share/doc/cdrom2/readers.doc -share/doc/cdrom2/readme.doc -share/doc/cdrom2/readme.org -share/doc/cdrom2/ruigo.doc -share/doc/cdrom2/x_option.doc -@dirrm share/doc/cdrom2 +%%PORTDOCS%%%%DOCSDIR%%/errata.doc +%%PORTDOCS%%%%DOCSDIR%%/gaiji.txt +%%PORTDOCS%%%%DOCSDIR%%/index.doc +%%PORTDOCS%%%%DOCSDIR%%/install.doc +%%PORTDOCS%%%%DOCSDIR%%/kekka.txt +%%PORTDOCS%%%%DOCSDIR%%/kojien3.doc +%%PORTDOCS%%%%DOCSDIR%%/menu.doc +%%PORTDOCS%%%%DOCSDIR%%/readers.doc +%%PORTDOCS%%%%DOCSDIR%%/readme.doc +%%PORTDOCS%%%%DOCSDIR%%/readme.org +%%PORTDOCS%%%%DOCSDIR%%/ruigo.doc +%%PORTDOCS%%%%DOCSDIR%%/x_option.doc +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm lib/cdrom2 diff --git a/japanese/chasen-base/Makefile b/japanese/chasen-base/Makefile index 9d9e0be44d90..174f859e65cb 100644 --- a/japanese/chasen-base/Makefile +++ b/japanese/chasen-base/Makefile @@ -8,7 +8,7 @@ PORTNAME= chasen PORTVERSION= 2.3.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= japanese textproc MASTER_SITES= http://chasen.aist-nara.ac.jp/stable/chasen/ PKGNAMESUFFIX= -base @@ -32,8 +32,8 @@ post-install: ${RM} -f ${PREFIX}/lib/libchasen.la ${MKDIR} ${PREFIX}/share/chasen/dic .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/chasen/doc - ${INSTALL_DATA} ${WRKSRC}/doc/manual* ${PREFIX}/share/chasen/doc/ + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/manual* ${DOCSDIR} .endif .include diff --git a/japanese/chasen-base/pkg-plist b/japanese/chasen-base/pkg-plist index accf6ff18300..887bc21c3283 100644 --- a/japanese/chasen-base/pkg-plist +++ b/japanese/chasen-base/pkg-plist @@ -10,7 +10,7 @@ libexec/chasen/makemat @dirrm libexec/chasen @exec mkdir -p %D/share/chasen/dic >/dev/null 2>&1 || true @dirrm share/chasen/dic -share/chasen/doc/manual-j.pdf -share/chasen/doc/manual-j.tex -@dirrm share/chasen/doc +%%PORTDOCS%%%%DOCSDIR%%/manual-j.pdf +%%PORTDOCS%%%%DOCSDIR%%share/chasen/doc/manual-j.tex +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm share/chasen