4 files changed, 75 insertions, 2 deletions

diff --git a/textproc/eruby/Makefile b/textproc/eruby/Makefile
index 4a03ce26b975..399f97657dc2 100644
--- a/textproc/eruby/Makefile
+++ b/textproc/eruby/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	eruby
-PORTVERSION=	1.0.0
+PORTVERSION=	1.0.1
 CATEGORIES=	textproc www ruby
 MASTER_SITES=	http://www.modruby.net/archive/
 DIST_SUBDIR=	ruby
diff --git a/textproc/eruby/distinfo b/textproc/eruby/distinfo
index 84e22183396d..55bf08fb69e1 100644
--- a/textproc/eruby/distinfo
+++ b/textproc/eruby/distinfo
@@ -1 +1 @@
-MD5 (ruby/eruby-1.0.0.tar.gz) = 085c34fb74ee9aaace59a4b03b9b2905
+MD5 (ruby/eruby-1.0.1.tar.gz) = b3ae6b388d3ce9ef3565a57593de1e3f
diff --git a/textproc/eruby/files/patch-Makefile.in b/textproc/eruby/files/patch-Makefile.in
new file mode 100644
index 000000000000..c29fcb394836
--- /dev/null
+++ b/textproc/eruby/files/patch-Makefile.in
@@ -0,0 +1,25 @@
+Index: Makefile.in
+===================================================================
+RCS file: /src/eruby/Makefile.in,v
+retrieving revision 1.14
+diff -u -r1.14 Makefile.in
+--- Makefile.in	6 Dec 2002 06:21:53 -0000	1.14
++++ Makefile.in	18 Jan 2003 13:17:50 -0000
+@@ -6,6 +6,7 @@
+ VPATH = $(srcdir)
+ 
+ arch = @arch@
++sitearch = @arch@
+ ruby_version = @ruby_version@
+ 
+ DESTDIR = @drive@
+@@ -136,7 +137,8 @@
+ 	@-$(RANLIB) $@ 2> /dev/null || true
+ 
+ $(LIBERUBY_SO): $(LIBERUBY_OBJS)
+-	$(LDSHARED) $(DLDFLAGS) $(LIBERUBY_OBJS) $(EXT_LIBRUBYARG) $(LIBS) -o $@
++	$(LDSHARED) $(DLDFLAGS) $(XLDFLAGS) $(LIBERUBY_OBJS) \
++		$(EXT_LIBRUBYARG) $(LIBS) -o $@
+ 	@-$(RUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \
+ 		File.symlink "$(LIBERUBY_SO)", link}' $(LIBERUBY_ALIASES)
+ 
diff --git a/textproc/eruby/files/patch-configure.rb b/textproc/eruby/files/patch-configure.rb
new file mode 100644
index 000000000000..0c798bbfbf60
--- /dev/null
+++ b/textproc/eruby/files/patch-configure.rb
@@ -0,0 +1,48 @@
+Index: configure.rb.in
+===================================================================
+RCS file: /src/eruby/configure.rb.in,v
+retrieving revision 1.9
+diff -u -r1.9 configure.rb.in
+--- configure.rb.in	3 Sep 2001 07:37:13 -0000	1.9
++++ configure.rb.in	18 Jan 2003 13:17:50 -0000
+@@ -146,7 +146,7 @@
+       $MKDLLIB << "\tenv LIB='$(subst /,\\\\,$(LIBPATH)); $(EXT_LIBRUBYARG) $(LIB)' \\\n\t"
+     end
+   end
+-  $MKDLLIB << "$(LDSHARED) $(EXT_DLDFLAGS) -o $(DLLIB) $(EXT_OBJS) $(LIBERUBYARG) $(EXT_LIBRUBYARG) $(LIBS)"
++  $MKDLLIB << "$(LDSHARED) $(EXT_DLDFLAGS) -o $(DLLIB) $(EXT_OBJS) $(XLDFLAGS) $(LIBERUBYARG) $(EXT_LIBRUBYARG) $(LIBS)"
+   if /mswin32/ =~ RUBY_PLATFORM && /nmake/i =~ $make
+     $MKDLLIB << " -link /INCREMENTAL:no /EXPORT:Init_eruby"
+   end
+Index: configure.rb
+===================================================================
+RCS file: /src/eruby/configure.rb,v
+retrieving revision 1.20
+diff -u -r1.20 configure.rb
+--- configure.rb	8 Jan 2003 08:24:20 -0000	1.20
++++ configure.rb	18 Jan 2003 13:17:50 -0000
+@@ -283,6 +283,7 @@
+ $VPATH = ""
+ 
+ $arch = CONFIG["arch"]
++$sitearch = CONFIG["sitearch"]
+ $ruby_version = Config::CONFIG["ruby_version"] ||
+   CONFIG["MAJOR"] + "." + CONFIG["MINOR"]
+ 
+@@ -346,6 +347,7 @@
+ AC_SUBST("VPATH")
+ 
+ AC_SUBST("arch")
++AC_SUBST("sitearch")
+ AC_SUBST("ruby_version")
+ AC_SUBST("drive")
+ AC_SUBST("prefix")
+@@ -531,7 +533,7 @@
+       $MKDLLIB << "\tenv LIB='$(subst /,\\\\,$(LIBPATH)); $(EXT_LIBRUBYARG) $(LIB)' \\\n\t"
+     end
+   end
+-  $MKDLLIB << "$(LDSHARED) $(EXT_DLDFLAGS) -o $(DLLIB) $(EXT_OBJS) $(LIBERUBYARG) $(EXT_LIBRUBYARG) $(LIBS)"
++  $MKDLLIB << "$(LDSHARED) $(EXT_DLDFLAGS) -o $(DLLIB) $(EXT_OBJS) $(XLDFLAGS) $(LIBERUBYARG) $(EXT_LIBRUBYARG) $(LIBS)"
+   if /mswin32/ =~ RUBY_PLATFORM && /nmake/i =~ $make
+     $MKDLLIB << " -link /INCREMENTAL:no /EXPORT:Init_eruby"
+   end