Rearrange configure script a little:

- Correct case statement moving "interix3*)" to before "interrix*)" since
  "interix3*)" wouldn't match and always match to "interix*)".

- Remove "interix3*" in the case condition which always "interix*" pattern.

This dosen't fix anything bulding on Interix3 (SFU 3.5) and on other
platforms, but fix obvious mistake in configure script.

3 files changed, 29 insertions, 47 deletions

diff --git a/lang/ruby18-base/distinfo b/lang/ruby18-base/distinfo
index 64e5a2da0cb..08badca169b 100644
--- a/lang/ruby18-base/distinfo
+++ b/lang/ruby18-base/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2005/09/18 13:38:50 taca Exp $
+$NetBSD: distinfo,v 1.4 2005/09/19 15:19:13 taca Exp $
 
 SHA1 (ruby/ruby-1.8.2.tar.gz) = 409a917d3a0aba41f45bd053b767c85b2bc35ffa
 RMD160 (ruby/ruby-1.8.2.tar.gz) = fc4dcdc2dda9bfbcf8ca19ca090aa55a18ea06a4
 Size (ruby/ruby-1.8.2.tar.gz) = 3627349 bytes
-SHA1 (patch-aa) = 5d000eaeac3d5166073863f002b1d7eb551405fa
-SHA1 (patch-ab) = 0b419b2948409e6375eb605bb33623f97bf0d91d
+SHA1 (patch-aa) = b0c96d7f10ff48245f97d7561e33ced4c4fed69d
+SHA1 (patch-ab) = eeb4048b99784392b7a09a904748e8ff23205580
 SHA1 (patch-ac) = 8a60292e7fd312df639404fc015c4f3eeef49137
 SHA1 (patch-al) = a62c126e971a0d45b00e873802bc9ee67786c47e
 SHA1 (patch-am) = fe000acf64e20245058c83319030e11606e75004
diff --git a/lang/ruby18-base/patches/patch-aa b/lang/ruby18-base/patches/patch-aa
index aa5b742d115..3f75b7c0923 100644
--- a/lang/ruby18-base/patches/patch-aa
+++ b/lang/ruby18-base/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:57 taca Exp $
+$NetBSD: patch-aa,v 1.2 2005/09/19 15:19:13 taca Exp $
 
 --- configure.in.orig	2004-12-23 00:16:55.000000000 +0900
 +++ configure.in
@@ -12,17 +12,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:57 taca Exp $
  freebsd*)	LIBS="-lm $LIBS"
  		AC_CACHE_CHECK([whether -lxpg4 has to be linked],
  		  rb_cv_lib_xpg4_needed,
-@@ -813,7 +816,7 @@ if test "$with_dln_a_out" != yes; then
-     openstep*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
-     rhapsody*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
-     darwin*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
--    human*|bsdi*|beos*|cygwin*|mingw*|aix*|interix*) ;;
-+    human*|interix3*|bsdi*|beos*|cygwin*|mingw*|aix*|interix*) ;;
-     *) CCDLFLAGS="$CCDLFLAGS -fPIC";;
-     esac
-   else
-@@ -875,6 +878,13 @@ if test "$with_dln_a_out" != yes; then
- 			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
+@@ -863,6 +866,13 @@ if test "$with_dln_a_out" != yes; then
+ 			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
  			fi
  			rb_cv_dlopen=yes ;;
 +	interix3*)	: ${LDSHARED='${CC} -shared'}
@@ -32,13 +23,13 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:57 taca Exp $
 +			LIBPATHFLAG=' -L%1$-s'
 +			RPATHFLAG=' -Wl,-R%1$-s'
 +			rb_cv_dlopen=yes ;;
- 	openbsd*) 	: ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"}
- 			if test "$rb_cv_binary_elf" = yes; then
- 			    LDFLAGS="$LDFLAGS -Wl,-E"
-@@ -1172,6 +1182,14 @@ if test "$enable_shared" = 'yes'; then
- 	   LIBRUBY_ALIASES=""
- 	fi
-  	;;
+ 	interix*) 	: ${LDSHARED="$CC -shared"}
+ 			XLDFLAGS="$XLDFLAGS -Wl,-E"
+ 			LIBPATHFLAG=" -L'%1\$-s'"
+@@ -1216,6 +1226,14 @@ if test "$enable_shared" = 'yes'; then
+ 	LIBRUBY_DLDFLAGS='-install_name $(libdir)/lib$(RUBY_SO_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
+ 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib'
+ 	;;
 +    interix3*)
 +	SOLIBS='$(LIBS)'
 +	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
@@ -47,6 +38,6 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:57 taca Exp $
 +	LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)'
 +	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
 + 	;;
-     openbsd*)
- 	SOLIBS='$(LIBS)'
- 	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
+     interix*)
+ 	LIBRUBYARG_SHARED='-L${libdir} -L. -l$(RUBY_SO_NAME)'
+ 	;;
diff --git a/lang/ruby18-base/patches/patch-ab b/lang/ruby18-base/patches/patch-ab
index e6232c576be..32589a7c3a9 100644
--- a/lang/ruby18-base/patches/patch-ab
+++ b/lang/ruby18-base/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/03/06 16:36:57 taca Exp $
+$NetBSD: patch-ab,v 1.2 2005/09/19 15:19:13 taca Exp $
 
 --- configure.orig	2004-12-25 19:58:38.000000000 +0900
 +++ configure
@@ -12,17 +12,8 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/03/06 16:36:57 taca Exp $
  freebsd*)	LIBS="-lm $LIBS"
  		echo "$as_me:$LINENO: checking whether -lxpg4 has to be linked" >&5
  echo $ECHO_N "checking whether -lxpg4 has to be linked... $ECHO_C" >&6
-@@ -13953,7 +13956,7 @@ echo $ECHO_N "checking whether OS depend
-     openstep*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
-     rhapsody*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
-     darwin*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
--    human*|bsdi*|beos*|cygwin*|mingw*|aix*|interix*) ;;
-+    human*|interix3*|bsdi*|beos*|cygwin*|mingw*|aix*|interix*) ;;
-     *) CCDLFLAGS="$CCDLFLAGS -fPIC";;
-     esac
-   else
-@@ -14015,6 +14018,13 @@ echo $ECHO_N "checking whether OS depend
- 			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
+@@ -14003,6 +14006,13 @@ echo $ECHO_N "checking whether OS depend
+ 			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
  			fi
  			rb_cv_dlopen=yes ;;
 +	interix3*)	: ${LDSHARED='${CC} -shared'}
@@ -32,13 +23,13 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/03/06 16:36:57 taca Exp $
 +			LIBPATHFLAG=' -L%1$-s'
 +			RPATHFLAG=' -Wl,-R%1$-s'
 +			rb_cv_dlopen=yes ;;
- 	openbsd*) 	: ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"}
- 			if test "$rb_cv_binary_elf" = yes; then
- 			    LDFLAGS="$LDFLAGS -Wl,-E"
-@@ -14732,6 +14742,14 @@ if test "$enable_shared" = 'yes'; then
- 	   LIBRUBY_ALIASES=""
- 	fi
-  	;;
+ 	interix*) 	: ${LDSHARED="$CC -shared"}
+ 			XLDFLAGS="$XLDFLAGS -Wl,-E"
+ 			LIBPATHFLAG=" -L'%1\$-s'"
+@@ -14776,6 +14786,14 @@ if test "$enable_shared" = 'yes'; then
+ 	LIBRUBY_DLDFLAGS='-install_name $(libdir)/lib$(RUBY_SO_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
+ 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib'
+ 	;;
 +    interix3*)
 +	SOLIBS='$(LIBS)'
 +	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
@@ -47,6 +38,6 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/03/06 16:36:57 taca Exp $
 +	LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)'
 +	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
 + 	;;
-     openbsd*)
- 	SOLIBS='$(LIBS)'
- 	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
+     interix*)
+ 	LIBRUBYARG_SHARED='-L${libdir} -L. -l$(RUBY_SO_NAME)'
+ 	;;