Add no_ri_docs PSUEDO_FLAVOR to skip building the ri documentation,

which should allow building on arches without enough memory to
generate the ri files.  Also, set PKG_ARCH=* for the ri_docs
subpackage, so that such arches can still use the documentation,
idea from sthen@. Original idea for PSUEDO_FLAVOR from phessler@.

OK sthen@

lang/ruby/1.8/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2011/11/08 23:40:05 jeremy Exp $
+# $OpenBSD: Makefile,v 1.17 2011/11/15 00:05:16 jeremy Exp $
 
 COMMENT-main=		object oriented script language with threads
 COMMENT-iconv=		libiconv interface for ruby
@@ -20,7 +20,9 @@ REVISION-main=		2
 REVISION-iconv=		1
 REVISION-gdbm=		1
 REVISION-tk=		1
+REVISION-ri_docs=	0
 
+PKG_ARCH-ri_docs=	*
 PKGSPEC-main=		ruby->=1.8,<1.9
 
 CONFIGURE_ARGS=		--program-suffix=18 \
@@ -38,10 +40,10 @@ WANTLIB-main= 		c m readline termcap util crypto ncurses ssl z
 LIB_DEPENDS-main=
 RUN_DEPENDS-main=
 
-PSEUDO_FLAVORS= 	no_x11
+PSEUDO_FLAVORS= 	no_x11 no_ri_docs
 FLAVOR?=
 
-MULTI_PACKAGES=		-main -iconv -gdbm -ri_docs
+MULTI_PACKAGES=		-main -iconv -gdbm
 
 WANTLIB-iconv =		${MODLIBICONV_WANTLIB} c m ruby18
 LIB_DEPENDS-iconv =	${MODLIBICONV_LIB_DEPENDS} \
@@ -64,6 +66,12 @@ LIB_DEPENDS-tk =		tk->=8.5,<8.6:x11/tk/8.5 \
 RUN_DEPENDS-tk =		
 .endif
 
+.if !${FLAVOR:L:Mno_ri_docs}
+MULTI_PACKAGES +=	-ri_docs
+ALL_TARGET =		all rdoc
+INSTALL_TARGET =	install install-doc
+.endif
+
 # Known regression failures in OpenSSL extension on sparc64
 # Known regression failure in IO.readpartial on all arch
 # Known regression failure in test_connection_refused_in_request on all arch

lang/ruby/1.8/patches/patch-common_mk

@@ -1,16 +1,16 @@
-$OpenBSD: patch-common_mk,v 1.1 2010/09/23 21:58:50 jeremy Exp $
+$OpenBSD: patch-common_mk,v 1.2 2011/11/15 00:05:16 jeremy Exp $
 
-Build the docs and the ext stuff during the build phase so we don't have to
+Build the ext stuff during the build phase so we don't have to
 run 'make clean' as root.
 
---- common.mk.orig	Thu Dec 24 10:01:58 2009
-+++ common.mk	Sat Dec 26 15:31:27 2009
+--- common.mk.orig	Sun Nov 21 23:22:16 2010
++++ common.mk	Mon Nov 14 04:14:50 2011
 @@ -79,7 +79,9 @@ PRE_LIBRUBY_UPDATE = $(MINIRUBY) -e 'ARGV[1] or File.u
  TESTSDIR      = $(srcdir)/test
  TESTWORKDIR   = testwork
  
 -all: $(MKFILES) $(PREP) $(RBCONFIG) $(LIBRUBY)
-+all: $(MKFILES) $(PREP) $(RBCONFIG) $(LIBRUBY) all-extmk rdoc
++all: $(MKFILES) $(PREP) $(RBCONFIG) $(LIBRUBY) all-extmk
 +
 +all-extmk:
  	@$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS)

lang/ruby/1.9/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2011/11/09 19:23:35 jeremy Exp $
+# $OpenBSD: Makefile,v 1.20 2011/11/15 00:04:15 jeremy Exp $
 
 COMMENT-main =		object oriented script language with threads
 COMMENT-gdbm =		gdbm interface for ruby
@@ -18,6 +18,9 @@ PKGNAME-tk =		ruby-tk-${VERSION}.${PATCHLEVEL}
 PKGNAME-ri_docs =	ruby-ri_docs-${VERSION}.${PATCHLEVEL}
 
 REVISION-main =		0
+REVISION-ri_docs=	0
+
+PKG_ARCH-ri_docs=	*
 
 PKGSPEC-main =		ruby->=1.9,<1.10
 
@@ -31,8 +34,8 @@ CONFIGURE_ENV =		LIBruby19_VERSION=${LIBruby19_VERSION} \
 			ac_cv_prog_DOXYGEN="" \
 			ac_cv_prog_DOT=""
 
-ALL_TARGET =		all V=1
-INSTALL_TARGET =	install-all V=1
+ALL_TARGET =		V=1 main
+INSTALL_TARGET =	V=1 install-nodoc
 
 MODULES =		converters/libiconv
 USE_GROFF =		Yes
@@ -44,10 +47,10 @@ LIB_DEPENDS-main =	${MODLIBICONV_LIB_DEPENDS} \
 			devel/libffi
 RUN_DEPENDS-main =	${MODLIBICONV_RUN_DEPENDS}
 
-PSEUDO_FLAVORS=		no_x11
+PSEUDO_FLAVORS=		no_x11 no_ri_docs
 FLAVOR?=
 
-MULTI_PACKAGES =	-main -gdbm -dbm -ri_docs
+MULTI_PACKAGES =	-main -gdbm -dbm
 
 WANTLIB-gdbm =		c m gdbm ruby19
 LIB_DEPENDS-gdbm =	databases/gdbm \
@@ -70,6 +73,12 @@ LIB_DEPENDS-tk =	tk->=8.5,<8.6:x11/tk/8.5 \
 RUN_DEPENDS-tk =	
 .endif
 
+.if !${FLAVOR:L:Mno_ri_docs}
+MULTI_PACKAGES +=	-ri_docs
+ALL_TARGET +=		rdoc
+INSTALL_TARGET +=	install-doc
+.endif
+
 SUBST_VARS +=		RUBYLIBREV
 
 REGRESS_DEPENDS =	${FULLPKGNAME-main}:${BUILD_PKGPATH}

lang/ruby/1.9/patches/patch-common_mk

@@ -0,0 +1,15 @@
+$OpenBSD: patch-common_mk,v 1.3 2011/11/15 00:04:15 jeremy Exp $
+
+Don't regenerate rdoc documentation during install.
+
+--- common.mk.orig	Mon Nov 14 05:01:15 2011
++++ common.mk	Mon Nov 14 05:01:18 2011
+@@ -393,7 +393,7 @@ dont-install-man: $(PREP)
+ post-no-install-man::
+ 	@$(NULLCMD)
+ 
+-install-doc: rdoc pre-install-doc do-install-doc post-install-doc
++install-doc: pre-install-doc do-install-doc post-install-doc
+ pre-install-doc:: install-prereq
+ do-install-doc: $(PROGRAM)
+ 	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)"