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

2 files changed, 20 insertions, 19 deletions

diff --git a/www/mod_ruby/Makefile b/www/mod_ruby/Makefile
index 213573634bc2..a19b93c70734 100644
--- a/www/mod_ruby/Makefile
+++ b/www/mod_ruby/Makefile
@@ -18,7 +18,6 @@ LIB_DEPENDS=	eruby.09:${PORTSDIR}/textproc/eruby
 RUN_DEPENDS=	${APXS}:${APACHE_PORT}
 
 USE_RUBY=	yes
-USE_RUBY_RDTOOL=	yes
 
 APXS?=		${LOCALBASE}/sbin/apxs
 APACHE_PORT?=	${PORTSDIR}/www/apache13
@@ -30,6 +29,8 @@ CONFIGURE_ARGS=	--with-apxs="${APXS}" \
 MAKE_ARGS=	RUBY="${RUBY}"
 INSTALL_TARGET=	site-install
 
+RUBY_RD_FILES=	# empty
+
 DOCS_EN=	COPYING ChangeLog README.en doc/default.css doc/*.en.*
 DOCS_JA=	README.ja doc/default.css doc/*.ja.*
 
@@ -41,14 +42,16 @@ post-patch:
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_FLAGS} configure.rb ${CONFIGURE_ARGS}
 
-post-build:
-.if !defined(NOPORTDOCS)
-	@cd ${WRKSRC}/doc; ${MAKE}
-.endif
-
-post-install:
+post-install: doc-install
 	${INSTALL_DATA} ${WRKSRC}/examples/httpd.conf `${APXS} -q SYSCONFDIR`/httpd.conf.${PORTNAME}
+
+.include <bsd.port.mk>
+
+doc-install:
 .if !defined(NOPORTDOCS)
+.if !defined(RUBY_NO_RD_HTML)
+	cd ${WRKSRC}/doc; ${MAKE}
+.endif
 	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS_EN}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
@@ -58,5 +61,3 @@ post-install:
 .endfor
 .endif
 	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/www/mod_ruby/pkg-plist b/www/mod_ruby/pkg-plist
index 7155791aef95..8c6386406777 100644
--- a/www/mod_ruby/pkg-plist
+++ b/www/mod_ruby/pkg-plist
@@ -11,28 +11,28 @@ libexec/apache/mod_ruby.so
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes.en.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/classes.en.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes.en.rd
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/default.css
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/directives.en.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/directives.en.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/directives.en.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/faq.en.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/faq.en.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/faq.en.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.en.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/index.en.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.en.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/install.en.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/install.en.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/install.en.rd
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/classes.ja.euc.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/classes.ja.jis.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/classes.ja.jis.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/default.css
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/directives.ja.euc.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/directives.ja.jis.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/directives.ja.jis.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/faq.ja.euc.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/faq.ja.jis.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/faq.ja.jis.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/index.ja.euc.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/index.ja.jis.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/index.ja.jis.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/install.ja.euc.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/install.ja.jis.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/install.ja.jis.html
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%