- Update lang/ruby18 to 1.8.5p12 (bugfix release)

- Make RI generation disabled by default (it causes problems
  on slow hardware)
- PREFIX-cleaness fixes (in bsd.ruby.mk) [1]
- Take maintainership of bsd.ruby.mk [1]

The patch was tested in the tinderbox with all ruby-dependend ports.

Approved by:	portmgr (linimon)

Mk/bsd.ruby.mk

@@ -9,7 +9,7 @@
 .if !defined(Ruby_Include)
 
 Ruby_Include=			bsd.ruby.mk
-Ruby_Include_MAINTAINER=	knu@FreeBSD.org
+Ruby_Include_MAINTAINER=	stas@FreeBSD.org
 
 #
 # [variables that a user may define]
@@ -136,15 +136,18 @@ _RUBY_SITEDIR!=		${_RUBY_CONFIG} 'puts C["sitedir"]'
 RUBY?=			${LOCALBASE}/bin/${RUBY_NAME}
 
 .if defined(RUBY_VER) && ${RUBY_VER} == 1.8
-RUBY_VERSION?=		1.8.5
-#RUBY_DISTVERSION?=	${RUBY_VERSION}
+RUBY_RELVERSION=	1.8.5
+RUBY_PATCHLEVEL=	12
+RUBY_VERSION?=		${RUBY_RELVERSION}.${RUBY_PATCHLEVEL}
+RUBY_DISTVERSION?=	${RUBY_RELVERSION}-p${RUBY_PATCHLEVEL}
+RUBY_PORTREVISION=	0
 #RUBY_PATCHFILES?=	ruby-${RUBY_DISTVERSION}-yyyy.mm.dd.diff.bz2
 
 # Security patch
 RUBY_PATCHFILES?=	${RUBY_VERSION}-patch1.gz
 
 #RUBY_PORTVERSION?=	${RUBY_VERSION}
-RUBY_WRKSRC=		${WRKDIR}/ruby-${RUBY_VERSION}
+RUBY_WRKSRC=		${WRKDIR}/ruby-${RUBY_DISTVERSION}
 #MASTER_SITE_SUBDIR_RUBY=	snapshots
 .elif defined(RUBY_VER) && ${RUBY_VER} == 1.7
 IGNORE=	Ruby 1.7 is obsolete; set RUBY_VER to 1.8 instead.
@@ -167,7 +170,7 @@ CONFIGURE_TARGET?=	${ARCH}-portbld-freebsd${OSREL:C/\..*//}
 RUBY_ARCH?=		${ARCH}-freebsd${OSREL:C/\..*//}
 RUBY_NAME?=		ruby${RUBY_SUFFIX}
 
-_RUBY_SYSLIBDIR?=	${LOCALBASE}/lib
+_RUBY_SYSLIBDIR?=	${PREFIX}/lib
 _RUBY_SITEDIR?=		${_RUBY_SYSLIBDIR}/ruby/site_ruby
 .endif
 #      defined(RUBY)
@@ -182,7 +185,7 @@ RUBY_DISTNAME?=		ruby-${RUBY_DISTVERSION}
 RUBY_WRKSRC?=		${WRKDIR}/${RUBY_DISTNAME}
 
 RUBY_VERSION_CODE?=	${RUBY_VERSION:S/.//g}
-RUBY_VER=		${RUBY_VERSION:R}
+RUBY_VER=		${RUBY_VERSION:C/([[:digit:]]+\.[[:digit:]]+).*/\1/}
 RUBY_SUFFIX=		${RUBY_VER:S/.//}
 
 RUBY_WITHOUT_SUFFIX?=	${LOCALBASE}/bin/ruby
@@ -229,35 +232,35 @@ RUBY_LIBDIR?=		${_RUBY_SYSLIBDIR}/ruby/${RUBY_VER}
 RUBY_ARCHLIBDIR?=	${RUBY_LIBDIR}/${RUBY_ARCH}
 RUBY_SITELIBDIR?=	${_RUBY_SITEDIR}/${RUBY_VER}
 RUBY_SITEARCHLIBDIR?=	${RUBY_SITELIBDIR}/${RUBY_ARCH}
-RUBY_DOCDIR?=		${LOCALBASE}/share/doc/${RUBY_NAME}
-RUBY_EXAMPLESDIR?=	${LOCALBASE}/share/examples/${RUBY_NAME}
-RUBY_RIDIR?=		${LOCALBASE}/share/ri/${RUBY_VER}/system
-RUBY_SITERIDIR?=	${LOCALBASE}/share/ri/${RUBY_VER}/site
+RUBY_DOCDIR?=		${PREFIX}/share/doc/${RUBY_NAME}
+RUBY_EXAMPLESDIR?=	${PREFIX}/share/examples/${RUBY_NAME}
+RUBY_RIDIR?=		${PREFIX}/share/ri/${RUBY_VER}/system
+RUBY_SITERIDIR?=	${PREFIX}/share/ri/${RUBY_VER}/site
 RUBY_MODDOCDIR?=	${RUBY_DOCDIR}/${RUBY_MODNAME}
 RUBY_MODEXAMPLESDIR?=	${RUBY_EXAMPLESDIR}/${RUBY_MODNAME}
-RUBY_ELISPDIR?=		${_RUBY_SYSLIBDIR}/ruby/elisp
+RUBY_ELISPDIR?=		${PREFIX}/lib/ruby/elisp
 
 # PLIST
 PLIST_RUBY_DIRS=	RUBY_LIBDIR="${RUBY_LIBDIR}" \
 			RUBY_ARCHLIBDIR="${RUBY_ARCHLIBDIR}" \
 			RUBY_SITELIBDIR="${RUBY_SITELIBDIR}" \
 			RUBY_SITEARCHLIBDIR="${RUBY_SITEARCHLIBDIR}" \
+			RUBY_MODDOCDIR="${RUBY_MODDOCDIR}" \
+			RUBY_MODEXAMPLESDIR="${RUBY_MODEXAMPLESDIR}" \
 			RUBY_DOCDIR="${RUBY_DOCDIR}" \
 			RUBY_EXAMPLESDIR="${RUBY_EXAMPLESDIR}" \
 			RUBY_RIDIR="${RUBY_RIDIR}" \
 			RUBY_SITERIDIR="${RUBY_SITERIDIR}" \
-			RUBY_MODDOCDIR="${RUBY_MODDOCDIR}" \
-			RUBY_MODEXAMPLESDIR="${RUBY_MODEXAMPLESDIR}" \
 			RUBY_ELISPDIR="${RUBY_ELISPDIR}"
 
-PLIST_SUB+=		RUBY_VERSION="${RUBY_VERSION}" \
+PLIST_SUB+=	${PLIST_RUBY_DIRS:C,DIR="(${LOCALBASE}|${PREFIX})/,DIR=",} \
+			RUBY_VERSION="${RUBY_VERSION}" \
 			RUBY_VER="${RUBY_VER}" \
 			RUBY_SHLIBVER="${RUBY_SHLIBVER}" \
 			RUBY_ARCH="${RUBY_ARCH}" \
 			RUBY_SUFFIX="${RUBY_SUFFIX}" \
 			RUBY_NAME="${RUBY_NAME}" \
-			RUBY_DEFAULT_SUFFIX="${RUBY_DEFAULT_SUFFIX}" \
-			${PLIST_RUBY_DIRS:S,DIR="${LOCALBASE}/,DIR=",}
+			RUBY_DEFAULT_SUFFIX="${RUBY_DEFAULT_SUFFIX}"
 
 .if ${RUBY_VER} >= 1.7
 RUBY18_ONLY=		""

lang/ruby18/Makefile

@@ -7,11 +7,12 @@
 
 PORTNAME=	ruby
 PORTVERSION=	${RUBY_PORTVERSION}
-PORTREVISION=	5
+PORTREVISION=	${RUBY_PORTREVISION}
 PORTEPOCH=	1
 CATEGORIES=	lang ruby ipv6
 MASTER_SITES=		${MASTER_SITE_RUBY}
 MASTER_SITE_SUBDIR=	${MASTER_SITE_SUBDIR_RUBY}
+DISTNAME=	${RUBY_DISTNAME}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	stas@FreeBSD.org
@@ -25,6 +26,8 @@ CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} \
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${RUBY_DISTVERSION}
+
 RUBY_VER=		1.8
 USE_RUBY=		yes
 RUBY_NO_BUILD_DEPENDS=	yes
@@ -34,7 +37,7 @@ _RUBY_SYSLIBDIR=	${PREFIX}/lib
 OPTIONS=	PTHREADS "Enable pthreads support (may break some apps)" off \
 		ONIGURUMA "Build with oniguruma regular expressions lib" off \
 		IPV6 "Enable IPv6 support" on \
-		RDOC "Build and install Rdoc indexes" on \
+		RDOC "Build and install Rdoc indexes" off \
 		DEBUG "Compile-in debug info" off
 
 .include <bsd.port.pre.mk>
@@ -68,12 +71,10 @@ STRIP=		# none
 #
 # Disable doc generation if requested or docs disabled at all
 #
-.if !defined(WITHOUT_RDOC) && !defined(NOPORTDOCS)
+.if defined(WITH_RDOC) && !defined(NOPORTDOCS)
 CONFIGURE_ARGS+=	--enable-install-doc
-PLIST_SUB+=		RDOC=""
 .else
 CONFIGURE_ARGS+=	--disable-install-doc
-PLIST_SUB+=		RDOC="@comment "
 .endif
 
 .if ${OSVERSION} < 502102
@@ -94,8 +95,6 @@ PLIST_SUB+=	IF_DEFAULT=""
 PLIST_SUB+=	IF_DEFAULT="@comment "
 .endif
 
-OBSOLETED_MODULES!=	${CAT} ${FILESDIR}/obsoleted
-
 INSTALLED_SCRIPTS=	irb erb h2rb rdoc ri ruby testrb
 
 EXTSAMPLES=	bigdecimal/sample/*.rb	\
@@ -107,6 +106,7 @@ EXTSAMPLES=	bigdecimal/sample/*.rb	\
 		pty/expect_sample.rb	\
 		pty/script.rb		\
 		pty/shl.rb
+
 EXTDOCS=	bigdecimal/bigdecimal_*.html	\
 		digest/digest.txt*		\
 		dl/doc/dl.txt			\
@@ -224,17 +224,17 @@ post-install:
 			${WRKSRC}/README*	\
 			${RUBY_DOCDIR}/
 .endif
-	@${ECHO} "Deinstalling obsoleted packages that are now part of ruby..."
-	@cd ${PKG_DBDIR}; for portname in ${OBSOLETED_MODULES}; do \
-		for pkg in ${RUBY_PKGNAMEPREFIX}$$portname-*; do \
-			if [ -d $$pkg ]; then \
-				${ECHO} "---> $$pkg"; \
-				${PKG_DELETE} -f $$pkg; \
-			fi; \
-		done; \
-	done
-	@${ECHO_CMD} "@exec ${ECHO_CMD} \"Deinstalling obsoleted packages that are now part of ruby...\"" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec cd ${PKG_DBDIR} && for portname in ${OBSOLETED_MODULES}; do for pkg in ${RUBY_PKGNAMEPREFIX}\$$portname-*; do if [ -d \$$pkg ]; then ${ECHO_CMD} \"---> \$$pkg\"; ${PKG_DELETE} -f \$$pkg; fi; done; done" >> ${TMPPLIST}
+
+	@${FIND} -ds ${RUBY_RIDIR}/ ! -type d ! -name created.rid | \
+		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
+	@${FIND} -ds ${RUBY_RIDIR}/ -type d -mindepth 1 | \
+		${SED} -E -e 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+
+	@${ECHO_CMD} "@unexec rmdir %D/${RUBY_SITERIDIR:S,^${PREFIX}/,,} 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/${RUBY_RIDIR:S,^${PREFIX}/,,} 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/share/ri/${RUBY_VER} 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/share/ri 2>/dev/null || true" >> ${TMPPLIST}
+
 	@${CAT} ${PKGMESSAGE}
 
 plist::
@@ -247,18 +247,18 @@ plist::
 	@${ECHO_CMD} "lib/lib%%RUBY_NAME%%.so" >> pkg-plist
 	@${ECHO_CMD} "lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%" >> pkg-plist
 
-	@${FIND} ${RUBY_DOCDIR}/ ! -type d ! -name .keep_me | \
+	@${FIND} -ds ${RUBY_DOCDIR}/ ! -type d ! -name .keep_me | \
 		${SED} 's,^${RUBY_DOCDIR},%%PORTDOCS%%%%RUBY_DOCDIR%%,' \
 		 >> pkg-plist
-	@${FIND} ${RUBY_DOCDIR}/ -type d -mindepth 1 | ${SORT} -r | \
+	@${FIND} -ds ${RUBY_DOCDIR}/ -type d -mindepth 1 | ${SORT} -r | \
 		${SED} -E -e \
 		's,^${RUBY_DOCDIR}(.*),%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%\1,' \
 		>> pkg-plist
 
-	@${FIND} ${RUBY_EXAMPLESDIR}/ ! -type d ! -name .keep_me | \
+	@${FIND} -ds ${RUBY_EXAMPLESDIR}/ ! -type d ! -name .keep_me | \
 		${SED} 's,^${RUBY_EXAMPLESDIR},%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%,' \
 		 >> pkg-plist
-	@${FIND} ${RUBY_EXAMPLESDIR}/ -type d -mindepth 1 | ${SORT} -r | \
+	@${FIND} -ds ${RUBY_EXAMPLESDIR}/ -type d -mindepth 1 | ${SORT} -r | \
 		${SED} -E -e \
 		's,^${RUBY_EXAMPLESDIR}(.*),%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%\1,' \
 		>> pkg-plist
@@ -272,29 +272,19 @@ plist::
 	@${ECHO_CMD} "%%RUBY_ELISPDIR%%/.keep_me.%%RUBY_NAME%%" >> pkg-plist
 	@${ECHO_CMD} "@dirrmtry %%RUBY_ELISPDIR%%" >> pkg-plist
 
-	@${FIND} ${RUBY_RIDIR}/ ! -type d ! -name created.rid | \
-		${SED} 's,^${RUBY_RIDIR},%%RDOC%%%%RUBY_RIDIR%%,' >> pkg-plist
-	@${FIND} ${RUBY_RIDIR}/ -type d -mindepth 1| ${SORT} -r | \
-		${SED} -E -e 's,^${RUBY_RIDIR}(.*),%%RDOC%%@dirrm %%RUBY_RIDIR%%\1,' \
-		>> pkg-plist
-
 	@${ECHO_CMD} "@exec /bin/mkdir -p %D/%%RUBY_RIDIR%%" >> pkg-plist
 	@${ECHO_CMD} "@exec env LC_TIME=C /bin/date > %D/%%RUBY_RIDIR%%/created.rid" >> pkg-plist
-	@${ECHO_CMD} "@unexec /bin/rm -f %D/%%RUBY_RIDIR%%/created.rid" >> pkg-plist
+	@${ECHO_CMD} "@unexec /bin/rm -f %D/%%RUBY_RIDIR%%/created.rid" \
+		>> pkg-plist
 
 	@${ECHO_CMD} "@exec /bin/mkdir -p %D/%%RUBY_SITERIDIR%%" >> pkg-plist
 	@${ECHO_CMD} "@exec env LC_TIME=C /bin/date > %D/%%RUBY_SITERIDIR%%/created.rid"  >> pkg-plist
 	@${ECHO_CMD} "@unexec /bin/rm -f %D/%%RUBY_SITERIDIR%%/created.rid" \
 		>> pkg-plist
 
-	@${ECHO_CMD} "@dirrmtry %%RUBY_SITERIDIR%%" >> pkg-plist
-	@${ECHO_CMD} "@dirrmtry %%RUBY_RIDIR%%" >> pkg-plist
-	@${ECHO_CMD} "@dirrmtry share/ri/%%RUBY_VER%%" >> pkg-plist
-	@${ECHO_CMD} "@dirrmtry share/ri" >> pkg-plist
-
-	@${FIND} ${RUBY_LIBDIR}/ ! -type d | \
+	@${FIND} -ds ${RUBY_LIBDIR}/ ! -type d | \
 		${SED} 's,^${RUBY_LIBDIR},%%RUBY_LIBDIR%%,' >> pkg-plist
-	@${FIND} ${RUBY_LIBDIR}/ -type d | ${SORT} -r | \
+	@${FIND} -ds ${RUBY_LIBDIR}/ -type d | ${SORT} -r | \
 		${SED} -E -e 's,^${RUBY_LIBDIR}(.*),@dirrm %%RUBY_LIBDIR%%\1,' >> pkg-plist
 
 	@${ECHO_CMD} "%%RUBY_SITEARCHLIBDIR%%/.keep_me" >> pkg-plist

lang/ruby18/distinfo

@@ -1,3 +1,3 @@
-MD5 (ruby/ruby-1.8.5.tar.gz) = 3fbb02294a8ca33d4684055adba5ed6f
-SHA256 (ruby/ruby-1.8.5.tar.gz) = 19590e972b80333e26a6514c34d976c2037138361481a16f27b75e5d33f33a58
-SIZE (ruby/ruby-1.8.5.tar.gz) = 4438603
+MD5 (ruby/ruby-1.8.5-p12.tar.gz) = d7d12dd9124c9b7d55cdbbee313e3931
+SHA256 (ruby/ruby-1.8.5-p12.tar.gz) = c72ad433adee87c79ece02f506008afa9ea783a11d1acdaf4107306caede5d0a
+SIZE (ruby/ruby-1.8.5-p12.tar.gz) = 4526961

lang/ruby18/files/obsoleted

@@ -1,26 +0,0 @@
-bigfloat
-csv
-dl
-drb
-erb
-fileutils
-gserver
-openssl
-optparse
-racc-runtime
-rdoc
-rexml
-ri
-sha1
-shell
-soap
-strscan
-syslog
-testunit
-timex
-urb
-uri
-webrick
-xmlrpc
-yaml
-zlib

lang/ruby18/files/patch-ext-dbm-extconf.rb

@@ -1,11 +0,0 @@
---- ext/dbm/extconf.rb.orig	Sat Aug 26 20:04:57 2006
-+++ ext/dbm/extconf.rb	Sat Aug 26 21:48:20 2006
-@@ -55,7 +55,7 @@
- 
- have_header("cdefs.h") 
- have_header("sys/cdefs.h") 
--if /DBM_HDR/ =~ $CFLAGS and have_func(db_prefix("dbm_open"))
-+if $defs.each { |d| /DBM_HDR/ =~ d } and have_func(db_prefix("dbm_open"))
-   have_func(db_prefix("dbm_clearerr")) unless $dbm_conf_have_gdbm
-   create_makefile("dbm")
- end

lang/ruby18/files/patch-lib_cgi.rb

@@ -1,36 +0,0 @@
---- lib/cgi.rb.orig	Tue Aug 22 13:38:19 2006
-+++ lib/cgi.rb	Mon Dec  4 23:22:42 2006
-@@ -967,6 +967,7 @@
-     def read_multipart(boundary, content_length)
-       params = Hash.new([])
-       boundary = "--" + boundary
-+      quoted_boundary = Regexp.quote(boundary, "n")
-       buf = ""
-       bufsize = 10 * 1024
-       boundary_end=""
-@@ -998,7 +999,7 @@
-         end
-         body.binmode if defined? body.binmode
- 
--        until head and /#{boundary}(?:#{EOL}|--)/n.match(buf)
-+        until head and /#{quoted_boundary}(?:#{EOL}|--)/n.match(buf)
- 
-           if (not head) and /#{EOL}#{EOL}/n.match(buf)
-             buf = buf.sub(/\A((?:.|\n)*?#{EOL})#{EOL}/n) do
-@@ -1018,14 +1019,14 @@
-               else
-                 stdinput.read(content_length)
-               end
--          if c.nil?
-+          if c.nil? || c.empty?
-             raise EOFError, "bad content body"
-           end
-           buf.concat(c)
-           content_length -= c.size
-         end
- 
--        buf = buf.sub(/\A((?:.|\n)*?)(?:[\r\n]{1,2})?#{boundary}([\r\n]{1,2}|--)/n) do
-+        buf = buf.sub(/\A((?:.|\n)*?)(?:[\r\n]{1,2})?#{quoted_boundary}([\r\n]{1,2}|--)/n) do
-           body.print $1
-           if "--" == $2
-             content_length = -1