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

8 files changed, 48 insertions, 49 deletions

diff --git a/graphics/ruby-evas/Makefile b/graphics/ruby-evas/Makefile
index f627917b13f5..78e85cd03302 100644
--- a/graphics/ruby-evas/Makefile
+++ b/graphics/ruby-evas/Makefile
@@ -19,22 +19,25 @@ LIB_DEPENDS=	evas.6:${PORTSDIR}/graphics/evas
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-USE_RUBY_RDTOOL=	yes
+
+RUBY_RD_FILES=	# defined
 
 CONFIGURE_WRKSRC=	${WRKSRC}/src
 BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 INSTALL_TARGET=	site-install
 
-DOCS=		README doc/evas.rd doc/evas.html
+DOCS=		README doc/evas.*
+
+post-install: doc-install
+
+.include <bsd.port.mk>
 
-post-build:
+doc-install:
 .if !defined(NOPORTDOCS)
+.if !defined(RUBY_NO_RD_HTML)
 	cd ${WRKSRC}/doc; ${MAKE}
 .endif
-
-post-install:
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 	${CP} -R ${WRKSRC}/tests/* ${RUBY_MODEXAMPLESDIR}/
 	${MKDIR} ${RUBY_MODDOCDIR}
@@ -42,5 +45,3 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
-
-.include <bsd.port.mk>
diff --git a/graphics/ruby-evas/pkg-plist b/graphics/ruby-evas/pkg-plist
index 6d1605225e34..ea641fbcff11 100644
--- a/graphics/ruby-evas/pkg-plist
+++ b/graphics/ruby-evas/pkg-plist
@@ -9,6 +9,6 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/nonblock.rb
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/evas.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/evas.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/evas.rd
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/graphics/ruby-image_size/Makefile b/graphics/ruby-image_size/Makefile
index 9e53d1bff802..23936a69d29c 100644
--- a/graphics/ruby-image_size/Makefile
+++ b/graphics/ruby-image_size/Makefile
@@ -17,31 +17,31 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 
 USE_RUBY=	yes
-USE_RUBY_RDTOOL=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-DOCS=		readme.en.html
-DOCS_JA=	readme.ja.rd readme.ja.html
+NO_BUILD=	yes
 
-do-build:
-.if !defined(NOPORTDOCS)
-	@cd ${WRKSRC}; \
-	${RUBY_RD2} image_size.rb > readme.en.html
-	@cd ${WRKSRC}; \
-	${RUBY_RD2} readme.ja.rd > readme.ja.html
-.endif
+RUBY_RD_FILES=	image_size.rb readme.ja.rd
+
+DOCS_EN=	${RUBY_RD_HTML_FILES:N*.ja.html}
+DOCS_JA=	${RUBY_RD_FILES:M*.ja.rd} \
+		${RUBY_RD_HTML_FILES:M*.ja.html}
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/image_size.rb ${RUBY_SITELIBDIR}/
+
+post-install: doc-install
+
+.include <bsd.port.mk>
+
+doc-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODDOCDIR}/ja
-.for f in ${DOCS}
+.for f in ${DOCS_EN}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .for f in ${DOCS_JA}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
-
-.include <bsd.port.mk>
diff --git a/graphics/ruby-image_size/pkg-plist b/graphics/ruby-image_size/pkg-plist
index bd050d2bd058..27c45616a960 100644
--- a/graphics/ruby-image_size/pkg-plist
+++ b/graphics/ruby-image_size/pkg-plist
@@ -1,6 +1,6 @@
 %%RUBY_SITELIBDIR%%/image_size.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/readme.en.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/image_size.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/readme.ja.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/readme.ja.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/readme.ja.html
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/graphics/ruby-libexif/Makefile b/graphics/ruby-libexif/Makefile
index 749125c3ec27..37f7e7109087 100644
--- a/graphics/ruby-libexif/Makefile
+++ b/graphics/ruby-libexif/Makefile
@@ -19,21 +19,22 @@ LIB_DEPENDS=	exif.8:${PORTSDIR}/graphics/libexif
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-USE_RUBY_RDTOOL=	yes
 
 INSTALL_TARGET=	site-install
 
-DOCS_EN=	ChangeLog	README	exif.rd.en	exif.en.html
-DOCS_JA=				exif.rd.ja	exif.ja.html
+RUBY_RD_FILES=	exif.rd.en	exif.rd.ja
 
-.if !defined(NOPORTDOCS)
-post-build:
-.for lang in en ja
-	cd ${WRKSRC}; ${RUBY_RD2} exif.rd.${lang} > exif.${lang}.html
-.endfor
-.endif
+DOCS_EN=	ChangeLog	README \
+		${RUBY_RD_FILES:M*.rd.en} \
+		${RUBY_RD_HTML_FILES:M*.en.html}
+DOCS_JA=	${RUBY_RD_FILES:M*.rd.ja} \
+		${RUBY_RD_HTML_FILES:M*.ja.html}
+
+post-install: doc-install
 
-post-install:
+.include <bsd.port.mk>
+
+doc-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS_EN}
@@ -43,5 +44,3 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
-
-.include <bsd.port.mk>
diff --git a/graphics/ruby-libexif/pkg-plist b/graphics/ruby-libexif/pkg-plist
index 81df550ac323..9dbc0195c4f6 100644
--- a/graphics/ruby-libexif/pkg-plist
+++ b/graphics/ruby-libexif/pkg-plist
@@ -1,9 +1,9 @@
 %%RUBY_SITEARCHLIBDIR%%/exif.so
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/exif.ja.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/exif.ja.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/exif.rd.ja
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/exif.en.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/exif.en.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/exif.rd.en
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/graphics/ruby-libpng/Makefile b/graphics/ruby-libpng/Makefile
index 285a51d6bfad..45f699ae638b 100644
--- a/graphics/ruby-libpng/Makefile
+++ b/graphics/ruby-libpng/Makefile
@@ -22,23 +22,24 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-USE_RUBY_RDTOOL=	yes
 
 INSTALL_TARGET=	site-install
 
-DOCS_JA=	readme.ja.html	readme.ja.rd	readme.ja.txt
+RUBY_RD_FILES=	readme.ja.rd
+
+DOCS_JA=	readme.ja.txt \
+		${RUBY_RD_FILES} \
+		${RUBY_RD_HTML_FILES}
 EXAMPLES_EN=	es.png		png.rb		pngtest.rb	pngtest.sh	\
 		sample/0.png	sample/1.png	sample/2.png	sample/3.png	\
 		sample/4.png	sample/5.png	sample/6.png	sample/7.png	\
 		sample/8.png	sample/9.png	sample/pngcat.rb
 
-.if !defined(NOPORTDOCS)
-post-build:
-	@cd ${WRKSRC}; \
-	${RUBY_RD2} readme.ja.rd > readme.ja.html
-.endif
+post-install: doc-install
 
-post-install:
+.include <bsd.port.mk>
+
+doc-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 .for f in ${EXAMPLES_EN}
@@ -49,5 +50,3 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
-
-.include <bsd.port.mk>
diff --git a/graphics/ruby-libpng/pkg-plist b/graphics/ruby-libpng/pkg-plist
index 66bc90e9ab12..3ddabeb36bb4 100644
--- a/graphics/ruby-libpng/pkg-plist
+++ b/graphics/ruby-libpng/pkg-plist
@@ -15,7 +15,7 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/9.png
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pngcat.rb
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%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/readme.ja.txt
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja