4 files changed, 13 insertions, 13 deletions

diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index 0f2115bae91a..709f0fcc175f 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -139,9 +139,9 @@ RUBY?=			${LOCALBASE}/bin/${RUBY_NAME}
 
 .if defined(RUBY_VER) && ${RUBY_VER} == 1.8
 RUBY_VERSION?=		1.8.2
-RUBY_DISTVERSION?=	${RUBY_VERSION}-preview4
+#RUBY_DISTVERSION?=	${RUBY_VERSION}
 #RUBY_PATCHFILES?=	ruby-${RUBY_DISTVERSION}-yyyy.mm.dd.diff.bz2
-RUBY_PORTVERSION?=	${RUBY_VERSION}.p4
+#RUBY_PORTVERSION?=	${RUBY_VERSION}
 RUBY_WRKSRC=		${WRKDIR}/ruby-${RUBY_VERSION}
 #MASTER_SITE_SUBDIR_RUBY=	snapshots
 .elif defined(RUBY_VER) && ${RUBY_VER} == 1.7
diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index e1558869f663..01d7a23c1f86 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	ruby${RUBY_R}
 PORTVERSION=	${RUBY_PORTVERSION}
-PORTREVISION=	1
 CATEGORIES=	lang ruby ipv6
 MASTER_SITES=		${MASTER_SITE_RUBY}
 MASTER_SITE_SUBDIR=	${MASTER_SITE_SUBDIR_RUBY}
diff --git a/lang/ruby18/distinfo b/lang/ruby18/distinfo
index 3de08574f3fc..da1e72a0eb95 100644
--- a/lang/ruby18/distinfo
+++ b/lang/ruby18/distinfo
@@ -1,2 +1,2 @@
-MD5 (ruby/ruby-1.8.2-preview4.tar.gz) = 2f53d4dc4b24e37799143645772aabd0
-SIZE (ruby/ruby-1.8.2-preview4.tar.gz) = 3602003
+MD5 (ruby/ruby-1.8.2.tar.gz) = 918fc7e14305a08f5f0d81d7b0219c1b
+SIZE (ruby/ruby-1.8.2.tar.gz) = 3627362
diff --git a/lang/ruby18/pkg-plist b/lang/ruby18/pkg-plist
index 02a6fb4bf33d..5714dd82573a 100644
--- a/lang/ruby18/pkg-plist
+++ b/lang/ruby18/pkg-plist
@@ -572,7 +572,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 @exec /bin/mkdir -p %D/%%RUBY_SITEARCHLIBDIR%%
 @dirrm %%RUBY_SITEARCHLIBDIR%%
 %%RUBYLIB%%@dirrm %%RUBY_SITELIBDIR%%
-@unexec rmdir %D/lib/ruby/site_ruby 2>/dev/null || true
+@unexec /bin/rmdir %D/lib/ruby/site_ruby 2>/dev/null || true
 @dirrm %%RUBY_ARCHLIBDIR%%
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/yaml
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/xsd/xmlparser
@@ -643,10 +643,10 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/cgi
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/bigdecimal
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%
-@unexec rmdir -p %D/lib/xemacs/site-lisp 2>/dev/null || true
+@unexec /bin/rmdir -p %D/lib/xemacs/site-lisp 2>/dev/null || true
 %%RUBY_ELISPDIR%%/.keep_me.%%RUBY_NAME%%
-@unexec rmdir %D/%%RUBY_ELISPDIR%% 2>/dev/null || true
-@unexec rmdir %D/lib/ruby 2>/dev/null || true
+@unexec /bin/rmdir %D/%%RUBY_ELISPDIR%% 2>/dev/null || true
+@unexec /bin/rmdir %D/lib/ruby 2>/dev/null || true
 %%PORTDOCS%%%%RUBY_DOCDIR%%/COPYING
 %%PORTDOCS%%%%RUBY_DOCDIR%%/COPYING.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/ChangeLog
@@ -684,7 +684,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/pty
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/irb
 %%RUBY_DOCDIR%%/.keep_me
-@unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
+@unexec /bin/rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/README
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/biorhythm.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/cal.rb
@@ -937,7 +937,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/dl
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/curses
 %%RUBY_EXAMPLESDIR%%/.keep_me
-@unexec rmdir %D/%%RUBY_EXAMPLESDIR%% 2>/dev/null || true
+@unexec /bin/rmdir %D/%%RUBY_EXAMPLESDIR%% 2>/dev/null || true
 %%PORTDOCS%%%%RUBY_RIDIR%%/Abbrev/abbrev-i.yaml
 %%PORTDOCS%%%%RUBY_RIDIR%%/Abbrev/cdesc-Abbrev.yaml
 %%PORTDOCS%%%%RUBY_RIDIR%%/ArgumentError/cdesc-ArgumentError.yaml
@@ -1532,6 +1532,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_RIDIR%%/FileUtils/fu_each_src_dest-i.yaml
 %%PORTDOCS%%%%RUBY_RIDIR%%/FileUtils/fu_each_src_dest0-i.yaml
 %%PORTDOCS%%%%RUBY_RIDIR%%/FileUtils/fu_list-i.yaml
+%%PORTDOCS%%%%RUBY_RIDIR%%/FileUtils/fu_mkdir-i.yaml
 %%PORTDOCS%%%%RUBY_RIDIR%%/FileUtils/fu_output_message-i.yaml
 %%PORTDOCS%%%%RUBY_RIDIR%%/FileUtils/fu_same%3f-i.yaml
 %%PORTDOCS%%%%RUBY_RIDIR%%/FileUtils/fu_stream_blksize-i.yaml
@@ -3169,8 +3170,8 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 @exec /bin/mkdir -p %D/%%RUBY_RIDIR%%
 @exec env LC_TIME=C /bin/date > %D/%%RUBY_RIDIR%%/created.rid
 @unexec /bin/rm -f %D/%%RUBY_RIDIR%%/created.rid
-@unexec /bin/rmdir -p %D/%%RUBY_RIDIR%%
+@unexec /bin/rmdir -p %D/%%RUBY_RIDIR%% 2>/dev/null || true
 @exec /bin/mkdir -p %D/%%RUBY_SITERIDIR%%
 @exec env LC_TIME=C /bin/date > %D/%%RUBY_SITERIDIR%%/created.rid
 @unexec /bin/rm -f %D/%%RUBY_SITERIDIR%%/created.rid
-@unexec /bin/rmdir -p %D/%%RUBY_SITERIDIR%%
+@unexec /bin/rmdir -p %D/%%RUBY_SITERIDIR%% 2>/dev/null || true