5 files changed, 63 insertions, 22 deletions

diff --git a/lang/ruby-perl/Makefile b/lang/ruby-perl/Makefile
index 924adf5f86ff..cd837e8091e7 100644
--- a/lang/ruby-perl/Makefile
+++ b/lang/ruby-perl/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	perl
-PORTVERSION=	0.2.7
-PORTREVISION=	1
+PORTVERSION=	0.2.9
 CATEGORIES=	lang ruby perl5
 MASTER_SITES=	http://www.yoshidam.net/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -38,12 +37,14 @@ post-build:
 post-install:
 	@cd ${WRKSRC}/Ruby; \
 	${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} pure_install
-.if !defined(NOPORTDOCS)
+.if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 .for f in ${EXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/samples/${f} ${RUBY_MODEXAMPLESDIR}/
 .endfor
-	${MKDIR} ${RUBY_MODDOCDIR}/ja
+.endif
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${RUBY_MODDOCDIR}/ja/
 	${INSTALL_DATA} ${WRKSRC}/README.ja ${RUBY_MODDOCDIR}/ja/
 .endif
 
diff --git a/lang/ruby-perl/distinfo b/lang/ruby-perl/distinfo
index 0b2855cf59aa..6394ec5e3997 100644
--- a/lang/ruby-perl/distinfo
+++ b/lang/ruby-perl/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby/perl-0.2.7.tar.gz) = 7738cc94f825eeee26a56d775c298fab
-SHA256 (ruby/perl-0.2.7.tar.gz) = b1dc4936c39e919b24026b169012da80045263ada02d1d2bf3aaa67758a58c83
-SIZE (ruby/perl-0.2.7.tar.gz) = 11100
+MD5 (ruby/perl-0.2.9.tar.gz) = e007c29f2cbb57522b54d3a11e2fe91f
+SHA256 (ruby/perl-0.2.9.tar.gz) = 67af313cf1e0f0135a0da52fece6f95afde25c47a14c512c0dcdcf926b019dd3
+SIZE (ruby/perl-0.2.9.tar.gz) = 14234
diff --git a/lang/ruby-perl/files/patch-Makefile.PL b/lang/ruby-perl/files/patch-Makefile.PL
deleted file mode 100644
index 23108bb977ed..000000000000
--- a/lang/ruby-perl/files/patch-Makefile.PL
+++ /dev/null
@@ -1,7 +0,0 @@
---- Ruby/Makefile.PL.orig	Fri Sep 15 09:45:40 2000
-+++ Ruby/Makefile.PL	Sat Jun  9 11:03:11 2001
-@@ -7,3 +7,3 @@
- ##$archdir = `$RUBY -rrbconfig -e 'include Config; print CONFIG["libdir"]+"/"+CONFIG["ruby_install_name"]+"/"+CONFIG["arch"], "\n"'`;
--$archdir = `$RUBY -rmkmf -e 'print \$hdrdir,"\n"'`;
-+$archdir = `$RUBY -rmkmf -e 'puts Config::CONFIG["archdir"] || \$hdrdir'`;
- 
diff --git a/lang/ruby-perl/files/patch-perl.c b/lang/ruby-perl/files/patch-perl.c
new file mode 100644
index 000000000000..8323016d971d
--- /dev/null
+++ b/lang/ruby-perl/files/patch-perl.c
@@ -0,0 +1,47 @@
+--- ./perl.c.orig	2009-06-18 03:30:23.290690879 -0400
++++ ./perl.c	2009-06-18 03:30:13.000000000 -0400
+@@ -296,7 +296,7 @@
+ 
+   ret = perl_eval_pv(RSTRING(pv)->ptr, Qfalse);
+   if (SvTRUE(ERRSV)) {
+-    rb_raise(ePerlError, SvPVx(ERRSV, PL_na));
++    rb_raise(ePerlError, SvPVx_nolen(ERRSV));
+   }
+ 
+   return perl__Sv2Object(ret);
+@@ -352,7 +352,7 @@
+   LEAVE;
+ 
+   if (SvTRUE(ERRSV)) {
+-    rb_raise(ePerlError, SvPVx(ERRSV, PL_na));
++    rb_raise(ePerlError, SvPVx_nolen(ERRSV));
+   }
+ 
+   return ret;
+@@ -394,7 +394,7 @@
+   LEAVE;
+ 
+   if (SvTRUE(ERRSV)) {
+-    rb_raise(ePerlError, SvPVx(ERRSV, PL_na));
++    rb_raise(ePerlError, SvPVx_nolen(ERRSV));
+   }
+ 
+   return ret;
+@@ -453,7 +453,7 @@
+   LEAVE;
+ 
+   if (SvTRUE(ERRSV)) {
+-    rb_raise(ePerlError, SvPVx(ERRSV, PL_na));
++    rb_raise(ePerlError, SvPVx_nolen(ERRSV));
+   }
+ 
+   return ret;
+@@ -490,7 +490,7 @@
+   LEAVE;
+ 
+   if (SvTRUE(ERRSV)) {
+-    rb_raise(ePerlError, SvPVx(ERRSV, PL_na));
++    rb_raise(ePerlError, SvPVx_nolen(ERRSV));
+   }
+ 
+   return ret;
diff --git a/lang/ruby-perl/pkg-plist b/lang/ruby-perl/pkg-plist
index 82abc52fb36f..d569531b22df 100644
--- a/lang/ruby-perl/pkg-plist
+++ b/lang/ruby-perl/pkg-plist
@@ -1,12 +1,12 @@
 %%RUBY_SITEARCHLIBDIR%%/perl.so
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/htmlparse.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/http.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/perllib.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ping.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xmlparser.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/htmlparse.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/http.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/perllib.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/ping.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/xmlparser.rb
+%%PORTEXAMPLES%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTEXAMPLES%%%%RUBY_MODDOCDIR%%/ja/README.ja
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
 %%SITE_PERL%%/%%PERL_ARCH%%/Ruby.pm