diff options
| author | OKAZAKI Tetsurou <okazaki@FreeBSD.org> | 2000-12-18 06:34:19 +0000 |
|---|---|---|
| committer | OKAZAKI Tetsurou <okazaki@FreeBSD.org> | 2000-12-18 06:34:19 +0000 |
| commit | 110b14d765bcff12936b324c4b41b5b8e70cf9c0 (patch) | |
| tree | e9ad78b315b5a0d5c4824ebfc19d91440d4b434f /japanese | |
| parent | Fix an error on recent 4-STABLE and -CURRENT at `post-install'. (diff) | |
Fix last change.
Use ${PERL} to modify troffrc and eqnrc instead of
${PATCH} with a static diff `files/rc.diff'.
Remove entries of garbage files from `pkg-plist'.
Notes
Notes:
svn path=/head/; revision=36053
Diffstat (limited to 'japanese')
| -rw-r--r-- | japanese/groff/Makefile | 12 | ||||
| -rw-r--r-- | japanese/groff/files/rc.diff | 20 | ||||
| -rw-r--r-- | japanese/groff/pkg-plist | 2 |
3 files changed, 10 insertions, 24 deletions
diff --git a/japanese/groff/Makefile b/japanese/groff/Makefile index ef064f607816..ed272f949dd8 100644 --- a/japanese/groff/Makefile +++ b/japanese/groff/Makefile @@ -58,7 +58,7 @@ TMACFILES= tmac.an tmac.andoc tmac.orig_me tmac.vgrind \ PLIST_SUB+= TMAC_GROFF_AN:="" TMACFILES+= tmac.groff_an .else -PLIST_SUB+= TMAC_GROFF_AN:="@comment" +PLIST_SUB+= TMAC_GROFF_AN:="@comment " .endif MDOCFILES= doc-common doc-syms LOCALEFILES= locale-list eucJP @@ -81,6 +81,9 @@ PERL_ARGS+= -e 's,^.*hyphen.us-ru\n$$,,;' .endif .endif +TROFFRC_FILTER= -e 's,^(.do ds troffrc!koi8-r tmac.tty)$$,$$1\n.do ds troffrc!nippon tmac.tty,;' +EQNRC_FILTER= -e 's,^(ifdef koi8-r ! define n %1% !)$$,$$1\nifdef nippon ! define n %1% !,;' + #for not writing "/usr/local" explicitly in the patch post-patch: cd ${WRKSRC} \ @@ -108,7 +111,12 @@ post-install: .if defined(PERL_ARGS) && !empty(PERL_ARGS) ${PERL} -pi ${PERL_ARGS} ${TMPPLIST} .endif - ${PATCH} -d ${PREFIX}/${TMACDIR} < ${FILESDIR}/rc.diff +.if defined(TROFFRC_FILTER) && !empty(TROFFRC_FILTER) + ${PERL} -pi ${TROFFRC_FILTER} ${PREFIX}/${TMACDIR}/troffrc +.endif +.if defined(EQNRC_FILTER) && !empty(EQNRC_FILTER) + ${PERL} -pi ${EQNRC_FILTER} ${PREFIX}/${TMACDIR}/eqnrc +.endif install-documents: @${MKDIR} ${PREFIX}/${PORTDOCDIR} diff --git a/japanese/groff/files/rc.diff b/japanese/groff/files/rc.diff deleted file mode 100644 index 788fc3ef8ff9..000000000000 --- a/japanese/groff/files/rc.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- tmac/eqnrc.orig Thu Mar 16 10:18:38 2000 -+++ tmac/eqnrc Fri Apr 28 20:59:24 2000 -@@ -53,6 +53,7 @@ - ifdef ascii ! define n %1% ! - ifdef latin1 ! define n %1% ! - ifdef koi8-r ! define n %1% ! -+ifdef nippon ! define n %1% ! - ifdef n ! - set nroff 1 - ! ---- tmac/troffrc.orig Thu Mar 16 10:18:38 2000 -+++ tmac/troffrc Fri Apr 28 20:59:24 2000 -@@ -14,6 +14,7 @@ - .do ds troffrc!ascii tmac.tty - .do ds troffrc!latin1 tmac.tty - .do ds troffrc!koi8-r tmac.tty -+.do ds troffrc!nippon tmac.tty - .do ds troffrc!lj4 tmac.lj4 - .do ds troffrc!html tmac.html - .do if d troffrc!\*[.T] \ diff --git a/japanese/groff/pkg-plist b/japanese/groff/pkg-plist index e53195bcb17d..d35e970667df 100644 --- a/japanese/groff/pkg-plist +++ b/japanese/groff/pkg-plist @@ -304,7 +304,6 @@ share/groff/tmac/mm/ms.cov share/groff/tmac/mm/se_locale share/groff/tmac/mm/se_ms.cov share/groff/tmac/eqnrc -share/groff/tmac/eqnrc.orig share/groff/tmac/hyphen.us share/groff/tmac/man.local share/groff/tmac/tmac.X @@ -335,7 +334,6 @@ share/groff/tmac/tmac.tty share/groff/tmac/tmac.tty-char share/groff/tmac/tmac.vgrind share/groff/tmac/troffrc -share/groff/tmac/troffrc.orig %%PORTDOCDIR%%/ChangeLog.jp %%PORTDOCDIR%%/NEWS %%PORTDOCDIR%%/PROBLEMS |