- Unbreak with the new g++.

Reported by:	bento

- Pass "--with-swig=swig1.1" to configure.rb.

2 files changed, 13 insertions, 1 deletions

diff --git a/devel/swigruby/Makefile b/devel/swigruby/Makefile
index ed8eb78adbb0..a284637746bd 100644
--- a/devel/swigruby/Makefile
+++ b/devel/swigruby/Makefile
@@ -25,7 +25,7 @@ DOCS_JA=	README.ja
 
 do-configure:
 	@cd ${WRKSRC}; \
-	${SETENV} ${CONFIGURE_ENV} ${RUBY} configure.rb
+	${SETENV} ${CONFIGURE_ENV} ${RUBY} configure.rb --with-swig=swig1.1
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/devel/swigruby/files/patch-ruby.cxx b/devel/swigruby/files/patch-ruby.cxx
new file mode 100644
index 000000000000..93e75bfbec58
--- /dev/null
+++ b/devel/swigruby/files/patch-ruby.cxx
@@ -0,0 +1,12 @@
+--- ruby.cxx.orig	Thu May 25 01:18:29 2000
++++ ruby.cxx	Fri Nov  8 03:05:43 2002
+@@ -840,3 +840,3 @@
+ // ---------------------------------------------------------------------
+-char *RUBY::ruby_typemap_lookup(char *op, DataType *type, char *pname, char *source, char *target, WrapperFunction *f = 0) {
++char *RUBY::ruby_typemap_lookup(char *op, DataType *type, char *pname, char *source, char *target, WrapperFunction *f) {
+   static String s;
+@@ -903,3 +903,3 @@
+ // ---------------------------------------------------------------------
+-char *RUBY::to_VALUE(DataType *type, char *value, int raw = 0) {
++char *RUBY::to_VALUE(DataType *type, char *value, int raw) {
+   static String str;