aboutsummaryrefslogtreecommitdiffstats
path: root/devel/ruby-sdl
diff options
context:
space:
mode:
authorknu <knu@FreeBSD.org>2002-12-07 01:17:38 +0800
committerknu <knu@FreeBSD.org>2002-12-07 01:17:38 +0800
commit9c46f078394d114e50ad01ff921a88b74dda7eb1 (patch)
tree4810246f6e2ebdc6787c76cd4552ffabb88ae682 /devel/ruby-sdl
parent1900d9b4804ade641a7bbef2252af134e5f2ba8f (diff)
downloadfreebsd-ports-gnome-9c46f078394d114e50ad01ff921a88b74dda7eb1.tar.gz
freebsd-ports-gnome-9c46f078394d114e50ad01ff921a88b74dda7eb1.tar.zst
freebsd-ports-gnome-9c46f078394d114e50ad01ff921a88b74dda7eb1.zip
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/Makefile24
-rw-r--r--devel/ruby-sdl/pkg-plist4
2 files changed, 12 insertions, 16 deletions
diff --git a/devel/ruby-sdl/Makefile b/devel/ruby-sdl/Makefile
index 9e19496fba7d..29ed31e2b35b 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 a520a6794b8d..bd227cb50f53 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%%