diff options
| author | Akinori MUSHA <knu@FreeBSD.org> | 2002-12-06 17:17:38 +0000 |
|---|---|---|
| committer | Akinori MUSHA <knu@FreeBSD.org> | 2002-12-06 17:17:38 +0000 |
| commit | 185ceb675cf8b26e316a037b83225c000ff26f23 (patch) | |
| tree | 529039d77da5b882444fb862a40d4fea197d5466 /textproc | |
| parent | Finish repo copy move: remove from old category, link into new, add (diff) | |
Introduce a knob RUBY_NO_RD_HTML and enable it by default on alpha. This
replaces the non-working NOPORTDOCS workaround and fixes build on the alpha,
where rd2 coredumps.
Tested on: the axp cluster
Approved by: kris
Notes
Notes:
svn path=/head/; revision=71402
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/eruby/Makefile | 18 | ||||
| -rw-r--r-- | textproc/eruby/pkg-plist | 2 | ||||
| -rw-r--r-- | textproc/ruby-sary/Makefile | 23 | ||||
| -rw-r--r-- | textproc/ruby-sary/pkg-plist | 8 |
4 files changed, 25 insertions, 26 deletions
diff --git a/textproc/eruby/Makefile b/textproc/eruby/Makefile index da85716a67ec..d3d72e62dc39 100644 --- a/textproc/eruby/Makefile +++ b/textproc/eruby/Makefile @@ -14,7 +14,6 @@ DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org USE_RUBY= yes -USE_RUBY_RDTOOL= yes CONFIGURE_ARGS= --enable-shared --with-charset="${DEFAULT_CHARSET}" INSTALL_TARGET= site-install @@ -24,18 +23,21 @@ DEFAULT_CHARSET?= ISO-8859-1 MAN1= eruby.1 -DOCS_EN= COPYING ChangeLog README.en eruby.html eruby.rd +RUBY_RD_FILES= eruby.rd + +DOCS_EN= COPYING ChangeLog README.en \ + ${RUBY_RD_FILES} \ + ${RUBY_RD_HTML_FILES} DOCS_JA= README.ja do-configure: @cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} configure.rb ${CONFIGURE_ARGS} -post-build: -.if !defined(NOPORTDOCS) - cd ${WRKSRC}; ${RUBY_RD2} eruby.rd > eruby.html -.endif +post-install: doc-install -post-install: +.include <bsd.port.mk> + +doc-install: .if !defined(NOPORTDOCS) ${MKDIR} ${RUBY_MODEXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/* ${RUBY_MODEXAMPLESDIR}/ @@ -47,5 +49,3 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/ .endfor .endif - -.include <bsd.port.mk> diff --git a/textproc/eruby/pkg-plist b/textproc/eruby/pkg-plist index 0290cea3bffa..936342446ce0 100644 --- a/textproc/eruby/pkg-plist +++ b/textproc/eruby/pkg-plist @@ -12,7 +12,7 @@ lib/liberuby.a %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/eruby.html +%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/eruby.html %%PORTDOCS%%%%RUBY_MODDOCDIR%%/eruby.rd %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja diff --git a/textproc/ruby-sary/Makefile b/textproc/ruby-sary/Makefile index f2ed6de3cc84..dbfe48b49334 100644 --- a/textproc/ruby-sary/Makefile +++ b/textproc/ruby-sary/Makefile @@ -19,24 +19,25 @@ LIB_DEPENDS= sary.8:${PORTSDIR}/textproc/sary USE_RUBY= yes USE_RUBY_EXTCONF= yes -USE_RUBY_RDTOOL= yes RUBY_WITH_PTHREAD= yes INSTALL_TARGET= site-install -DOCS_EN= ChangeLog *.en.* -DOCS_JA= *.ja.* +RUBY_RD_FILES= *.en.rd *.ja.rd -post-build: -.if !defined(NOPORTDOCS) - cd ${WRKSRC}; for f in *.rd; do \ - ${RUBY_RD2} $$f > $${f%.rd}.html; \ - done -.endif +DOCS_EN= ChangeLog \ + ${RUBY_RD_FILES:M*.en.rd} \ + ${RUBY_RD_HTML_FILES:M*.en.html} +DOCS_JA= ${RUBY_RD_FILES:M*.ja.rd} \ + ${RUBY_RD_HTML_FILES:M*.ja.html} -post-install: +post-install: doc-install ${INSTALL_SCRIPT} ${WRKSRC}/rsary.rb ${PREFIX}/bin/ + +.include <bsd.port.mk> + +doc-install: .if !defined(NOPORTDOCS) ${MKDIR} ${RUBY_MODDOCDIR}/ja .for f in ${DOCS_EN} @@ -46,5 +47,3 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/ .endfor .endif - -.include <bsd.port.mk> diff --git a/textproc/ruby-sary/pkg-plist b/textproc/ruby-sary/pkg-plist index 996ea25602fd..c19df584e113 100644 --- a/textproc/ruby-sary/pkg-plist +++ b/textproc/ruby-sary/pkg-plist @@ -1,13 +1,13 @@ bin/rsary.rb %%RUBY_SITEARCHLIBDIR%%/sary.so %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en.html +%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/README.en.html %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en.rd -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Reference.en.html +%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/Reference.en.html %%PORTDOCS%%%%RUBY_MODDOCDIR%%/Reference.en.rd -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja.html +%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/README.ja.html %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja.rd -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/Reference.ja.html +%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/Reference.ja.html %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/Reference.ja.rd %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%% |