diff options
author | knu <knu@FreeBSD.org> | 2002-12-06 17:17:38 +0000 |
---|---|---|
committer | knu <knu@FreeBSD.org> | 2002-12-06 17:17:38 +0000 |
commit | 9c46f078394d114e50ad01ff921a88b74dda7eb1 (patch) | |
tree | 4810246f6e2ebdc6787c76cd4552ffabb88ae682 /devel/ruby-sdl | |
parent | 1900d9b4804ade641a7bbef2252af134e5f2ba8f (diff) | |
download | FreeBSD-ports-9c46f078394d114e50ad01ff921a88b74dda7eb1.zip FreeBSD-ports-9c46f078394d114e50ad01ff921a88b74dda7eb1.tar.gz |
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
Diffstat (limited to 'devel/ruby-sdl')
-rw-r--r-- | devel/ruby-sdl/Makefile | 24 | ||||
-rw-r--r-- | devel/ruby-sdl/pkg-plist | 4 |
2 files changed, 12 insertions, 16 deletions
diff --git a/devel/ruby-sdl/Makefile b/devel/ruby-sdl/Makefile index 9e19496..29ed31e 100644 --- a/devel/ruby-sdl/Makefile +++ b/devel/ruby-sdl/Makefile @@ -26,7 +26,6 @@ RUBY_OPENGL_WRKSRC_CMD= cd ${RUBY_OPENGL_PORTDIR}; ${MAKE} -V WRKSRC USE_RUBY= yes USE_RUBY_EXTCONF= yes -USE_RUBY_RDTOOL= yes RUBY_WITH_PTHREAD= yes CONFIGURE_ARGS= --with-sdl-config="sdl11-config" \ @@ -34,13 +33,15 @@ CONFIGURE_ARGS= --with-sdl-config="sdl11-config" \ --with-x11-dir="${X11BASE}" INSTALL_TARGET= site-install -RD_DOCS_EN= rubysdl_doc.en.rd -RD_DOCS_JA= rubysdl_doc.rd +RUBY_RD_FILES= rubysdl_doc.en.rd \ + rubysdl_doc.rd DOCS_EN= NEWS.en README.en rubysdl_const_list.txt \ - ${RD_DOCS_EN} ${RD_DOCS_EN:S/.rd$/.html/} + ${RUBY_RD_FILES:M*.en.rd} \ + ${RUBY_RD_HTML_FILES:M*.en.html} DOCS_JA= NEWS.ja README.ja \ - ${RD_DOCS_JA} ${RD_DOCS_JA:S/.rd$/.html/} + ${RUBY_RD_FILES:N*.en.rd} \ + ${RUBY_RD_HTML_FILES:N*.en.html} post-extract: dir=`${RUBY_OPENGL_WRKSRC_CMD}`; \ @@ -52,14 +53,11 @@ post-patch: ${RUBY} -i -pe '/require \x27mkmf\x27/ and $$_ += "dir_config(\x27x11\x27)\n"' \ ${WRKSRC}/${RUBY_EXTCONF} -post-build: -.if !defined(NOPORTDOCS) -.for f in ${RD_DOCS_EN} ${RD_DOCS_JA} - @cd ${WRKSRC}; ${RUBY_RD2} ${f} > ${f:S/.rd$/.html/} -.endfor -.endif +post-install: doc-install -post-install: +.include <bsd.port.mk> + +doc-install: .if !defined(NOPORTDOCS) ${MKDIR} ${RUBY_MODEXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/ @@ -71,5 +69,3 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/ .endfor .endif - -.include <bsd.port.mk> diff --git a/devel/ruby-sdl/pkg-plist b/devel/ruby-sdl/pkg-plist index a520a67..bd227cb 100644 --- a/devel/ruby-sdl/pkg-plist +++ b/devel/ruby-sdl/pkg-plist @@ -25,11 +25,11 @@ %%PORTDOCS%%%%RUBY_MODDOCDIR%%/NEWS.en %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rubysdl_const_list.txt -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rubysdl_doc.en.html +%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/rubysdl_doc.en.html %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rubysdl_doc.en.rd %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/NEWS.ja %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/rubysdl_doc.html +%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/rubysdl_doc.html %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/rubysdl_doc.rd %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%% |