The slippery pthread support for systems prior to 502102 has been

dropped and the lang/ruby16_r and lang/ruby18_r ports have been
removed, since no one seems to appreciate the partially working
solution.

Good news is that the pthread support of lang/ruby18 is now enabled by
default for newer systems, which means the ruby interpreter is linked
with libpthread.  This will allow threaded extension libraries to run
and work properly on those systems.

The --march=cputype flag is disabled because it gets ruby to
malfunction and fail to build.  I don't know if the problem is in
libpthread or in gcc.

(It really makes me wonder if they had actually tested before asking
me to do this somewhat risky change ;-)

15 files changed, 86 insertions, 117 deletions

diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index 709f0fcc175f..52763942de67 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -27,7 +27,6 @@ Ruby_Include_MAINTAINER=	knu@FreeBSD.org
 # RUBY_NO_BUILD_DEPENDS	- Says that the port should not build-depend on ruby.
 # RUBY_NO_RUN_DEPENDS	- Says that the port should not run-depend on ruby.
 # USE_LIBRUBY		- Says that the port uses libruby.
-# RUBY_WITH_PTHREAD	- Says that the port needs to be compiled with pthread.
 # USE_RUBY_EXTCONF	- Says that the port uses extconf.rb to configure.  Implies USE_RUBY.
 # RUBY_EXTCONF		- Set to the alternative name of extconf.rb (default: extconf.rb).
 # RUBY_EXTCONF_SUBDIRS	- Set to list of subdirectories, if multiple modules are included.
@@ -70,8 +69,7 @@ Ruby_Include_MAINTAINER=	knu@FreeBSD.org
 #
 # RUBY_SHLIBVER		- Major version of libruby (see below for current value).
 # RUBY_ARCH		- Set to target architecture name. (e.g. i386-freebsdelf4.3)
-# RUBY_R		- Extra suffix only defined when RUBY_WITH_PTHREAD is defined. (_r)
-# RUBY_SUFFIX		- Suffix for ruby binaries and directories (${RUBY_VER:S/.//}${RUBY_R}).
+# RUBY_SUFFIX		- Suffix for ruby binaries and directories (${RUBY_VER:S/.//}).
 # RUBY_WITHOUT_SUFFIX	- Always ${LOCALBASE}/bin/ruby.
 # RUBY_WITH_SUFFIX	- Always ${RUBY_WITHOUT_SUFFIX}${RUBY_SUFFIX}.
 # RUBY_NAME		- Ruby's name with trailing suffix.
@@ -156,9 +154,9 @@ MASTER_SITE_SUBDIR_RUBY=	snapshots
 .endif
 #      defined(RUBY_VER) && ${RUBY_VER} == 1.8
 
-CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL:C/\..*//}${RUBY_R}
+CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL:C/\..*//}
 
-RUBY_ARCH?=		${ARCH}-freebsd${OSREL:C/\..*//}${RUBY_R}
+RUBY_ARCH?=		${ARCH}-freebsd${OSREL:C/\..*//}
 RUBY_NAME?=		ruby${RUBY_SUFFIX}
 
 _RUBY_SYSLIBDIR?=	${LOCALBASE}/lib
@@ -177,7 +175,7 @@ RUBY_WRKSRC?=		${WRKDIR}/${RUBY_DISTNAME}
 
 RUBY_VERSION_CODE?=	${RUBY_VERSION:S/.//g}
 RUBY_VER=		${RUBY_VERSION:R}
-RUBY_SUFFIX=		${RUBY_VER:S/.//}${RUBY_R}
+RUBY_SUFFIX=		${RUBY_VER:S/.//}
 
 RUBY_WITHOUT_SUFFIX?=	${LOCALBASE}/bin/ruby
 RUBY_WITH_SUFFIX?=	${RUBY_WITHOUT_SUFFIX}${RUBY_SUFFIX}
@@ -187,21 +185,7 @@ RUBY_SHLIBVER?=		${RUBY_VER:S/.//}
 
 RUBY_CONFIGURE_ARGS+=	--program-prefix=""
 
-# PORTDIRNAME is not defined yet
-_IS_RUBY_R_PORT=	${.CURDIR:M*_r}
-.if ${OSVERSION} >= 501000 && empty(_IS_RUBY_R_PORT)
-.undef RUBY_WITH_PTHREAD
-.endif
-
-.if defined(RUBY_WITH_PTHREAD)
-RUBY_CONFIGURE_ARGS+=	--with-libc_r=yes
-RUBY_R=			_r
-.else
-RUBY_CONFIGURE_ARGS+=	--with-libc_r=no
-RUBY_R=			# none
-.endif
-
-DEPENDS_ARGS+=		RUBY_VER="${RUBY_VER}" RUBY_R="${RUBY_R}"
+DEPENDS_ARGS+=		RUBY_VER="${RUBY_VER}"
 
 RUBY_CONFIGURE_ARGS+=	--program-suffix="${RUBY_SUFFIX}"
 
@@ -213,7 +197,7 @@ RUBY_RDOC?=		${LOCALBASE}/bin/rdoc
 
 # Ports
 RUBY_BASE_PORT?=	lang/ruby${RUBY_VER:S/.//}
-RUBY_PORT?=		${RUBY_BASE_PORT}${RUBY_R}
+RUBY_PORT?=		${RUBY_BASE_PORT}
 RUBY_SHIM18_PORT?=	lang/ruby16-shim-ruby18
 RUBY_AMSTD_PORT?=	devel/ruby-amstd
 RUBY_RDTOOL_PORT?=	textproc/ruby-rdtool
@@ -264,7 +248,6 @@ PLIST_SUB+=		RUBY_VERSION="${RUBY_VERSION}" \
 			RUBY_ARCH="${RUBY_ARCH}" \
 			RUBY_SUFFIX="${RUBY_SUFFIX}" \
 			RUBY_NAME="${RUBY_NAME}" \
-			RUBY_R="${RUBY_R}" \
 			RUBY_DEFAULT_SUFFIX="${RUBY_DEFAULT_SUFFIX}" \
 			${PLIST_RUBY_DIRS:S,DIR="${LOCALBASE}/,DIR=",}
 
@@ -327,9 +310,7 @@ RUBY_FLAGS+=	-d
 USE_RUBY=		yes
 
 RUBY_EXTCONF?=		extconf.rb
-CONFIGURE_ARGS+=	--with-opt-dir="${LOCALBASE}" \
-			--with-pthread-cflags="${PTHREAD_CFLAGS}" \
-			--with-pthread-libs="${PTHREAD_LIBS}"
+CONFIGURE_ARGS+=	--with-opt-dir="${LOCALBASE}"
 
 do-configure:	ruby-extconf-configure
 
@@ -337,29 +318,11 @@ ruby-extconf-configure:
 .if defined(RUBY_EXTCONF_SUBDIRS)
 .for d in ${RUBY_EXTCONF_SUBDIRS}
 	@${ECHO_MSG} "===>  Running ${RUBY_EXTCONF} in ${d} to configure"
-.if defined(RUBY_WITH_PTHREAD)
-	cd ${CONFIGURE_WRKSRC}/${d}; \
-	${RUBY} ${RUBY_FLAGS} -i -pe '~ /\brequire\s+[\047"]mkmf[\047"]/ \
-	and $$_ += %Q|\
-		$$libs.sub!(/-lc\\b/, "")\n \
-		$$libs += " " + with_config("pthread-libs") + " "\n \
-		$$CFLAGS += " " + with_config("pthread-cflags") + " "\n \
-	|' ${RUBY_EXTCONF}
-.endif
 	@cd ${CONFIGURE_WRKSRC}/${d}; \
 	${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_EXTCONF} ${CONFIGURE_ARGS}
 .endfor
 .else
 	@${ECHO_MSG} "===>  Running ${RUBY_EXTCONF} to configure"
-.if defined(RUBY_WITH_PTHREAD)
-	cd ${CONFIGURE_WRKSRC}; if [ ! -e ${CONFIGURE_WRKSRC}/${RUBY_EXTCONF}.pth.orig ]; then \
-	${RUBY} ${RUBY_FLAGS} -i.pth.orig -pe '~ /\brequire\s+[\047"]mkmf[\047"]/ \
-	and $$_ += %Q|\
-		$$libs.sub!(/-lc\\b/, "")\n \
-		$$libs += " " + with_config("pthread-libs") + " "\n \
-		$$CFLAGS += " " + with_config("pthread-cflags") + " "\n \
-	|' ${RUBY_EXTCONF}; fi
-.endif
 	@cd ${CONFIGURE_WRKSRC}; \
 	${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_EXTCONF} ${CONFIGURE_ARGS}
 .endif
diff --git a/UPDATING b/UPDATING
index 8f5d6a2101ab..ae59482138ec 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,19 @@ You should get into the habit of checking this file for changes each
 time you update your ports collection, before attempting any port
 upgrades.
 
+20050205:
+  AFFECTS: users of lang/ruby16_r, lang/ruby18_r and lang/ruby18
+  AUTHOR: knu@FreeBSD.org
+
+  The slippery pthread support for systems prior to 502102 has been
+  dropped and lang/ruby16_r and lang/ruby18_r ports have been removed,
+  since no one seems to appreciate the partially working solution.
+
+  Good news is that the pthread support of lang/ruby18 is now enabled
+  by default for newer systems, which means the ruby interpreter is
+  linked with libpthread.  This will allow threaded extension
+  libraries to run and work properly on those systems.
+
 20050201:
   AFFECTS: users of lang/perl5 and lang/perl5.8
   AUTHOR: tobez@FreeBSD.org
diff --git a/devel/ruby-gnustep/Makefile b/devel/ruby-gnustep/Makefile
index 6179beddb636..34f9d317a74c 100644
--- a/devel/ruby-gnustep/Makefile
+++ b/devel/ruby-gnustep/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnustep
 PORTVERSION=	0.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel ruby
 MASTER_SITES=	ftp://ftp.gnustep.org/pub/gnustep/libs/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -36,7 +36,6 @@ RUN_DEPENDS+=	${COMBOLIBDIR}/libobjc.so:${PORTSDIR}/${GNUSTEP_OBJC_PORT}
 .endif
 
 USE_RUBY=	yes
-RUBY_WITH_PTHREAD=	yes
 USE_GMAKE=	yes
 CC=		gcc32
 CXX=		g++32
@@ -60,6 +59,9 @@ COMBOLIBDIR=	${SYSLIBDIR}
 MAKE_ENV+=	GNUSTEP_FLATTENED=yes
 
 .include <bsd.port.pre.mk>
+.if ${OSVERSION} < 502102
+BROKEN=		"Systems prior to FreeBSD 502102 are out of support"
+.endif
 
 .if ${MACHINE_ARCH} == "i386"
 GNU_ARCH=	ix86
diff --git a/devel/ruby-pcsc-lite/Makefile b/devel/ruby-pcsc-lite/Makefile
index 931dbf1fcd32..2a2d33a5939a 100644
--- a/devel/ruby-pcsc-lite/Makefile
+++ b/devel/ruby-pcsc-lite/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pcsc-lite
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	devel ruby
 MASTER_SITES=	http://soth.at/PCSC-ruby/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -20,7 +21,6 @@ LIB_DEPENDS=	pcsclite.0:${PORTSDIR}/devel/pcsc-lite
 
 USE_RUBY=	yes
 RUBY_VER=	1.8
-RUBY_WITH_PTHREAD=	yes
 CONFIGURE_ARGS+=	--with-pcsclite-dir="${PREFIX}"
 USE_RUBY_EXTCONF=	yes
 RUBY_SETUP=	install.rb
@@ -30,6 +30,11 @@ WRKSRC=		${WRKDIR}/PCSC-ruby
 DOCS=		README.txt
 EXAMPLES=	examples/test.rb examples/pcsclient.rb
 
+.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 502102
+BROKEN=		"Systems prior to FreeBSD 502102 are out of support"
+.endif
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODDOCDIR}/
@@ -42,4 +47,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/ruby-sdl/Makefile b/devel/ruby-sdl/Makefile
index 648ad9fd9508..8f8addfb9f1d 100644
--- a/devel/ruby-sdl/Makefile
+++ b/devel/ruby-sdl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sdl
 PORTVERSION=	0.9.3
+PORTREVISION=	1
 CATEGORIES=	devel graphics audio ruby
 MASTER_SITES=	http://www.kmc.gr.jp/~ohai/rubysdl/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -24,7 +25,6 @@ RUBY_OPENGL_WRKSRC_CMD=	cd ${RUBY_OPENGL_PORTDIR}; ${MAKE} -V WRKSRC
 USE_SDL=	mixer image ttf sdl
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-RUBY_WITH_PTHREAD=	yes
 
 CONFIGURE_ARGS=	--with-sdl-config="sdl11-config" \
 		--enable-opengl --linkoglmodule \
@@ -42,6 +42,9 @@ DOCS_JA=	NEWS.ja README.ja \
 		${RUBY_RD_HTML_FILES:N*.en.html}
 
 .include <bsd.port.pre.mk>
+.if ${OSVERSION} < 502102
+BROKEN=		"Systems prior to FreeBSD 502102 are out of support"
+.endif
 
 post-extract:
 	dir=`${RUBY_OPENGL_WRKSRC_CMD}`; \
diff --git a/graphics/ruby-opengl/Makefile b/graphics/ruby-opengl/Makefile
index 74e631dd456a..9cdac7bdae85 100644
--- a/graphics/ruby-opengl/Makefile
+++ b/graphics/ruby-opengl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	opengl
 PORTVERSION=	0.32b
+PORTREVISION=	1
 CATEGORIES=	graphics ruby
 MASTER_SITES=	http://www2.giganet.net/~yoshi/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -22,12 +23,15 @@ USE_RUBY_EXTCONF=	yes
 
 USE_MESA=	yes
 
-RUBY_WITH_PTHREAD=	yes
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
 CONFIGURE_ARGS=	--with-ruby-dir="${LOCALBASE}" --with-x11-dir="${X11BASE}"
 INSTALL_TARGET=	site-install
 
+.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 502102
+BROKEN=		"Systems prior to FreeBSD 502102 are out of support"
+.endif
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
@@ -37,4 +41,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README.EUC ${RUBY_MODDOCDIR}/ja/
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/Makefile b/lang/Makefile
index 042d031f216e..69f9bc872f2c 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -234,10 +234,8 @@
     SUBDIR += ruby-usersguide
     SUBDIR += ruby16
     SUBDIR += ruby16-shim-ruby18
-    SUBDIR += ruby16_r
     SUBDIR += ruby16_static
     SUBDIR += ruby18
-    SUBDIR += ruby18_r
     SUBDIR += ruby18_static
     SUBDIR += sbcl
     SUBDIR += scheme48
diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile
index 884e968e1b09..7212c8bb08ba 100644
--- a/lang/ruby16/Makefile
+++ b/lang/ruby16/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTNAME=	ruby${RUBY_R}
+PORTNAME=	ruby
 PORTVERSION=	${RUBY_PORTVERSION}
 PORTREVISION=	1
 CATEGORIES=	lang ruby ipv6
@@ -68,7 +68,7 @@ CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
 .if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
-MLINKS=		${RUBY_NAME}.1 ruby${RUBY_R}.1
+MLINKS=		${RUBY_NAME}.1 ruby.1
 IF_DEFAULT=	""
 .else
 IF_DEFAULT=	"@comment "
@@ -115,10 +115,9 @@ post-install:
 .endif
 .if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
 # Link just installed "ruby" to "ruby16", etc.
-	${LN} -f ${RUBY_WITH_SUFFIX} ${RUBY_WITHOUT_SUFFIX}${RUBY_R}
-	${LN} -f ${PREFIX}/man/man1/${RUBY_NAME}.1 ${PREFIX}/man/man1/ruby${RUBY_R}.1
+	${LN} -f ${RUBY_WITH_SUFFIX} ${RUBY_WITHOUT_SUFFIX}
 	for f in ${INSTALLED_SCRIPTS}; do \
-		${LN} -f $${f}${RUBY_SUFFIX} $${f}${RUBY_R}; \
+		${LN} -f $${f}${RUBY_SUFFIX} $${f}; \
 	done
 .endif
 	${LDCONFIG} -m ${PREFIX}/lib
diff --git a/lang/ruby16/pkg-plist b/lang/ruby16/pkg-plist
index ece180bb53e8..8035fbe8e051 100644
--- a/lang/ruby16/pkg-plist
+++ b/lang/ruby16/pkg-plist
@@ -1,6 +1,6 @@
-%%IF_DEFAULT%%bin/irb%%RUBY_R%%
+%%IF_DEFAULT%%bin/irb
 bin/irb%%RUBY_SUFFIX%%
-%%IF_DEFAULT%%bin/ruby%%RUBY_R%%
+%%IF_DEFAULT%%bin/ruby
 bin/ruby%%RUBY_SUFFIX%%
 lib/lib%%RUBY_NAME%%.so
 lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
diff --git a/lang/ruby16_r/Makefile b/lang/ruby16_r/Makefile
deleted file mode 100644
index 7e47ee16e543..000000000000
--- a/lang/ruby16_r/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# New ports collection makefile for:	ruby_r
-# Date created:			3 June 2001
-# Whom:				Akinori MUSHA aka knu <knu@idaemons.org>
-#
-# $FreeBSD$
-#
-
-MASTERDIR=	${.CURDIR}/../ruby16
-
-BUILD_DEPENDS=	${RUBY_WITHOUT_SUFFIX}${RUBY_VER:S/.//}:${MASTERDIR}
-RUN_DEPENDS=	${RUBY_WITHOUT_SUFFIX}${RUBY_VER:S/.//}:${MASTERDIR}
-
-NOPORTDOCS=	yes
-NORUBYLIB=	yes
-
-RUBY_WITH_PTHREAD=	yes
-
-.include "${MASTERDIR}/Makefile"
diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index e1558869f663..5f82a9ac67df 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/Makefile
@@ -1,13 +1,13 @@
-# New ports collection makefile for:	ruby-devel
+# New ports collection makefile for:	ruby18
 # Date created:		6 May 2001
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	ruby${RUBY_R}
+PORTNAME=	ruby
 PORTVERSION=	${RUBY_PORTVERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang ruby ipv6
 MASTER_SITES=		${MASTER_SITE_RUBY}
 MASTER_SITE_SUBDIR=	${MASTER_SITE_SUBDIR_RUBY}
@@ -58,6 +58,17 @@ MAN1=		${RUBY_NAME}.1
 LATEST_LINK=	ruby-devel
 
 .include <bsd.port.pre.mk>
+.if ${OSVERSION} >= 502102
+RUBY_ENABLE_PTHREAD?=	public demand
+.endif
+
+.if defined(RUBY_ENABLE_PTHREAD) && ${RUBY_ENABLE_PTHREAD} != "no"
+CONFIGURE_ARGS+=	--enable-pthread
+
+# There seems to be a bug in either gcc or libpthread that gets
+# (mini)ruby to malfunction..
+CFLAGS:=	${CFLAGS:N-march=*}
+.endif
 
 .if ${ARCH} == "ia64"
 BROKEN=		"Segfault during build on ia64"
@@ -70,7 +81,7 @@ CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
 .if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
-MLINKS=		${RUBY_NAME}.1 ruby${RUBY_R}.1
+MLINKS=		${RUBY_NAME}.1 ruby.1
 IF_DEFAULT=	""
 .else
 IF_DEFAULT=	"@comment "
@@ -145,10 +156,9 @@ post-install:
 .endif
 .if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
 # Link just installed "ruby" to "ruby18", etc.
-	${LN} -f ${RUBY_WITH_SUFFIX} ${RUBY_WITHOUT_SUFFIX}${RUBY_R}
-	${LN} -f ${PREFIX}/man/man1/${RUBY_NAME}.1 ${PREFIX}/man/man1/ruby${RUBY_R}.1
+	${LN} -f ${RUBY_WITH_SUFFIX} ${RUBY_WITHOUT_SUFFIX}
 	for f in ${INSTALLED_SCRIPTS}; do \
-		${LN} -f $${f}${RUBY_SUFFIX} $${f}${RUBY_R}; \
+		${LN} -f $${f}${RUBY_SUFFIX} $${f}; \
 	done
 .endif
 	${LDCONFIG} -m ${PREFIX}/lib
diff --git a/lang/ruby18/pkg-plist b/lang/ruby18/pkg-plist
index 5714dd82573a..6c733438a53b 100644
--- a/lang/ruby18/pkg-plist
+++ b/lang/ruby18/pkg-plist
@@ -1,16 +1,16 @@
-%%IF_DEFAULT%%bin/erb%%RUBY_R%%
+%%IF_DEFAULT%%bin/erb
 bin/erb%%RUBY_SUFFIX%%
-%%IF_DEFAULT%%bin/h2rb%%RUBY_R%%
+%%IF_DEFAULT%%bin/h2rb
 bin/h2rb%%RUBY_SUFFIX%%
-%%IF_DEFAULT%%bin/irb%%RUBY_R%%
+%%IF_DEFAULT%%bin/irb
 bin/irb%%RUBY_SUFFIX%%
-%%IF_DEFAULT%%bin/rdoc%%RUBY_R%%
+%%IF_DEFAULT%%bin/rdoc
 bin/rdoc%%RUBY_SUFFIX%%
-%%IF_DEFAULT%%bin/ri%%RUBY_R%%
+%%IF_DEFAULT%%bin/ri
 bin/ri%%RUBY_SUFFIX%%
-%%IF_DEFAULT%%bin/ruby%%RUBY_R%%
+%%IF_DEFAULT%%bin/ruby
 bin/ruby%%RUBY_SUFFIX%%
-%%IF_DEFAULT%%bin/testrb%%RUBY_R%%
+%%IF_DEFAULT%%bin/testrb
 bin/testrb%%RUBY_SUFFIX%%
 lib/lib%%RUBY_NAME%%-static.a
 lib/lib%%RUBY_NAME%%.so
diff --git a/lang/ruby18_r/Makefile b/lang/ruby18_r/Makefile
deleted file mode 100644
index d5f4d5e76308..000000000000
--- a/lang/ruby18_r/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# New ports collection makefile for:	ruby_r-devel
-# Date created:			3 June 2001
-# Whom:				Akinori MUSHA aka knu <knu@idaemons.org>
-#
-# $FreeBSD$
-#
-
-MASTERDIR=	${.CURDIR}/../ruby18
-
-BUILD_DEPENDS=	${RUBY_WITHOUT_SUFFIX}${RUBY_VER:S/.//}:${MASTERDIR}
-RUN_DEPENDS=	${RUBY_WITHOUT_SUFFIX}${RUBY_VER:S/.//}:${MASTERDIR}
-
-NOPORTDOCS=	yes
-NORUBYLIB=	yes
-
-RUBY_WITH_PTHREAD=	yes
-
-.include "${MASTERDIR}/Makefile"
diff --git a/print/ruby-panda/Makefile b/print/ruby-panda/Makefile
index e69137a616a2..c223acb1c88e 100644
--- a/print/ruby-panda/Makefile
+++ b/print/ruby-panda/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	panda
 PORTVERSION=	0.0.7
+PORTREVISION=	1
 CATEGORIES=	print ruby
 MASTER_SITES=	http://www2s.biglobe.ne.jp/~Nori/ruby/dist/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -23,7 +24,6 @@ LIB_DEPENDS=	panda.0:${PORTSDIR}/print/panda \
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-RUBY_WITH_PTHREAD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 INSTALL_TARGET=	site-install
@@ -34,6 +34,11 @@ DOCS_JA=	ChangeLog.ja	README.ja	TODO.ja	\
 		doc/ref_ja.html	doc/ref_ja.rd
 EXAMPLES_EN=	circles.rb	main.rb		morecircles.rb	template.rb
 
+.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 502102
+BROKEN=		"Systems prior to FreeBSD 502102 are out of support"
+.endif
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
@@ -50,4 +55,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/textproc/ruby-sary/Makefile b/textproc/ruby-sary/Makefile
index c6a7890bc9ec..863e8d3f08fe 100644
--- a/textproc/ruby-sary/Makefile
+++ b/textproc/ruby-sary/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sary
 PORTVERSION=	0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc ruby
 MASTER_SITES=	http://prime.sourceforge.jp/freebsd/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -22,8 +22,6 @@ LIB_DEPENDS=	sary.9:${PORTSDIR}/textproc/sary
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
-RUBY_WITH_PTHREAD=	yes
-
 INSTALL_TARGET=	site-install
 
 RUBY_RD_FILES=	*.en.rd *.ja.rd
@@ -34,10 +32,15 @@ DOCS_EN=	ChangeLog \
 DOCS_JA=	${RUBY_RD_FILES:M*.ja.rd} \
 		${RUBY_RD_HTML_FILES:M*.ja.html}
 
+.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 502102
+BROKEN=		"Systems prior to FreeBSD 502102 are out of support"
+.endif
+
 post-install: doc-install
 	${INSTALL_SCRIPT} ${WRKSRC}/rsary.rb ${PREFIX}/bin/
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
 
 doc-install:
 .if !defined(NOPORTDOCS)