aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.ruby.mk4
-rw-r--r--lang/ruby20/Makefile4
-rw-r--r--lang/ruby20/pkg-plist4
-rw-r--r--lang/ruby21/Makefile2
-rw-r--r--lang/ruby21/pkg-plist5
5 files changed, 13 insertions, 6 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index 5ba245e0b68e..4bb7b29cc6c3 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -193,7 +193,7 @@ RUBY21= "@comment "
# Ruby 2.0
#
RUBY_RELVERSION= 2.0.0
-RUBY_PORTREVISION= 2
+RUBY_PORTREVISION= 3
RUBY_PORTEPOCH= 1
RUBY_PATCHLEVEL= 576
@@ -209,7 +209,7 @@ RUBY21= "@comment "
# Ruby 2.1
#
RUBY_RELVERSION= 2.1.3
-RUBY_PORTREVISION= 2
+RUBY_PORTREVISION= 3
RUBY_PORTEPOCH= 1
RUBY_PATCHLEVEL= 0
diff --git a/lang/ruby20/Makefile b/lang/ruby20/Makefile
index 2402b70bc4ac..6f1c7df38e1e 100644
--- a/lang/ruby20/Makefile
+++ b/lang/ruby20/Makefile
@@ -86,9 +86,7 @@ CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.if ${OPSYS} == "FreeBSD"
-.if exists(/usr/sbin/dtrace) && \
- ((${ARCH} == "i386" && ${OSVERSION} > 1010000) || \
- (${ARCH} == "amd64" && ${OSVERSION} > 903000))
+.if exists(/usr/sbin/dtrace) && (${OSVERSION} > 1100032)
CONFIGURE_ARGS+= --enable-dtrace
.else
CONFIGURE_ARGS+= --disable-dtrace
diff --git a/lang/ruby20/pkg-plist b/lang/ruby20/pkg-plist
index 4dd29c798e5e..b3ee81b81305 100644
--- a/lang/ruby20/pkg-plist
+++ b/lang/ruby20/pkg-plist
@@ -17128,3 +17128,7 @@ man/man1/%%RUBY_NAME%%.1.gz
%%RDOC%%%%RUBY_RIDIR%%/syntax/page-modules_and_classes_rdoc.ri
%%RDOC%%%%RUBY_RIDIR%%/syntax/page-precedence_rdoc.ri
%%RDOC%%%%RUBY_RIDIR%%/syntax/page-refinements_rdoc.ri
+@dir %%RUBY_LIBDIR%%/racc/rdoc
+@dir %%RUBY_SITEARCHLIBDIR%%
+@dir %%RUBY_VENDORARCHLIBDIR%%
+@dir %%RUBY_SITERIDIR%%
diff --git a/lang/ruby21/Makefile b/lang/ruby21/Makefile
index 56dc3c677863..fff5efda5b25 100644
--- a/lang/ruby21/Makefile
+++ b/lang/ruby21/Makefile
@@ -85,7 +85,7 @@ CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.if ${OPSYS} == "FreeBSD"
-.if (${ARCH} == "i386" && ${OSVERSION} > 1010000) || (${ARCH} == "amd64" && ${OSVERSION} > 903000)
+.if exists(/usr/sbin/dtrace) && (${OSVERSION} > 1100032)
CONFIGURE_ARGS+= --enable-dtrace
.else
CONFIGURE_ARGS+= --disable-dtrace
diff --git a/lang/ruby21/pkg-plist b/lang/ruby21/pkg-plist
index 4ddf954e376e..5ea9ffe05d31 100644
--- a/lang/ruby21/pkg-plist
+++ b/lang/ruby21/pkg-plist
@@ -16907,3 +16907,8 @@ man/man1/%%RUBY_NAME%%.1.gz
%%RDOC%%%%RUBY_RIDIR%%/syntax/page-precedence_rdoc.ri
%%RDOC%%%%RUBY_RIDIR%%/syntax/page-refinements_rdoc.ri
%%RDOC%%%%RUBY_RIDIR%%/unknown/cdesc-unknown.ri
+@dir %%RUBY_LIBDIR%%/racc/rdoc
+@dir %%RUBY_SITEARCHLIBDIR%%
+@dir %%RUBY_VENDORARCHLIBDIR%%
+@dir %%RUBY_EXAMPLESDIR%%/curses
+@dir %%RUBY_SITERIDIR%%