4 files changed, 46 insertions, 17 deletions

diff --git a/devel/ruby-metaruby/Makefile b/devel/ruby-metaruby/Makefile
index f96717092e7e..881d32596096 100644
--- a/devel/ruby-metaruby/Makefile
+++ b/devel/ruby-metaruby/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	metaruby
-PORTVERSION=	0.6
+PORTVERSION=	0.7
 CATEGORIES=	devel ruby
 MASTER_SITES=	http://hostname.2y.net/~matju/MetaRuby/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -16,16 +16,11 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 
 USE_RUBY=	yes
+USE_RUBY_EXTCONF=	yes
 
-NO_BUILD=	yes
+DOCS=		ChangeLog	Overview	TODO		doc/*
 
-DOCS=		ChangeLog	Overview	TODO
-
-post-patch:
-	${RUBY} -i -ne '%r|^\$$: <<| or print' ${WRKSRC}/samples/*
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/lib/* ${RUBY_SITELIBDIR}/
+post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/samples/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
diff --git a/devel/ruby-metaruby/distinfo b/devel/ruby-metaruby/distinfo
index 2266ddb3d488..53d60fa0fd3d 100644
--- a/devel/ruby-metaruby/distinfo
+++ b/devel/ruby-metaruby/distinfo
@@ -1 +1 @@
-MD5 (ruby/MetaRuby-0.6.tar.gz) = c3bcb80dab70a886bbee409ed9ebfda7
+MD5 (ruby/MetaRuby-0.7.tar.gz) = f857a90d69cf18a6b1c3195acefe741e
diff --git a/devel/ruby-metaruby/files/patch-extconf.rb b/devel/ruby-metaruby/files/patch-extconf.rb
new file mode 100644
index 000000000000..d7dcbad3f6c1
--- /dev/null
+++ b/devel/ruby-metaruby/files/patch-extconf.rb
@@ -0,0 +1,25 @@
+--- extconf.rb.orig	Tue Sep 18 11:03:21 2001
++++ extconf.rb	Tue Sep 18 18:10:04 2001
+@@ -34,18 +34,18 @@
+ 	f.puts
+ 
+ 	f.puts "install::"
+-	f.puts "\t@mkdir $(DESTDIR)/Hollow $(DESTDIR)/lgram || true"
++	f.puts "\t@mkdir -p $(DESTDIR)/Hollow $(DESTDIR)/lgram"
+ 	FILES1.each {|fn1|
+ 		fn2 = fn1
+-		f.puts "\tinstall --mode 644 #{fn2} $(DESTDIR)/#{fn2}"
++		f.puts "\tinstall -m 644 #{fn2} $(DESTDIR)/#{fn2}"
+ 	}
+ 	FILES2.each {|fn1|
+ 		fn2 = "Hollow/#{fn1}"
+-		f.puts "\tinstall --mode 644 #{fn2} $(DESTDIR)/#{fn2}"
++		f.puts "\tinstall -m 644 #{fn2} $(DESTDIR)/#{fn2}"
+ 	}
+ 	FILES3.each {|fn1|
+ 		fn2 = "lgram/#{fn1}"
+-		f.puts "\tinstall --mode 644 #{fn2} $(DESTDIR)/#{fn2}"
++		f.puts "\tinstall -m 644 #{fn2} $(DESTDIR)/#{fn2}"
+ 	}
+ }
+ 
diff --git a/devel/ruby-metaruby/pkg-plist b/devel/ruby-metaruby/pkg-plist
index aa8622ab46fe..6d698275ad01 100644
--- a/devel/ruby-metaruby/pkg-plist
+++ b/devel/ruby-metaruby/pkg-plist
@@ -1,14 +1,23 @@
-%%RUBY_SITELIBDIR%%/ArrayMixin.rb
-%%RUBY_SITELIBDIR%%/IOMixin.rb
-%%RUBY_SITELIBDIR%%/HashMixin.rb
-%%RUBY_SITELIBDIR%%/ListMixin.rb
-%%RUBY_SITELIBDIR%%/StringMixin.rb
-%%RUBY_SITELIBDIR%%/ToSource.rb
+%%RUBY_SITELIBDIR%%/Contract.rb
+%%RUBY_SITELIBDIR%%/MainLoop.rb
+%%RUBY_SITELIBDIR%%/RubySchema.rb
+%%RUBY_SITELIBDIR%%/SProfiler.rb
+%%RUBY_SITELIBDIR%%/Type.rb
+%%RUBY_SITELIBDIR%%/UndoQueue.rb
+%%RUBY_SITELIBDIR%%/Version.rb
+%%RUBY_SITELIBDIR%%/Hollow/Array.rb
+%%RUBY_SITELIBDIR%%/Hollow/Hash.rb
+%%RUBY_SITELIBDIR%%/Hollow/List.rb
+%%RUBY_SITELIBDIR%%/Hollow/String.rb
+%%RUBY_SITELIBDIR%%/lgram/Marshal.rb
+@dirrm %%RUBY_SITELIBDIR%%/Hollow
+@dirrm %%RUBY_SITELIBDIR%%/lgram
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/metaruby/BitArray.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/metaruby/ProcAsArray.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/metaruby/UndoableArray.rb
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/metaruby
 %%PORTDOCS%%%%RUBY_DOCDIR%%/metaruby/ChangeLog
+%%PORTDOCS%%%%RUBY_DOCDIR%%/metaruby/Hollow.txt
+%%PORTDOCS%%%%RUBY_DOCDIR%%/metaruby/LGram.txt
 %%PORTDOCS%%%%RUBY_DOCDIR%%/metaruby/Overview
 %%PORTDOCS%%%%RUBY_DOCDIR%%/metaruby/TODO
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/metaruby