From 9fe80155bd281e3588e0b1c45839ecbbd31d90f2 Mon Sep 17 00:00:00 2001
From: jeremy <jeremy@openbsd.org>
Date: Tue, 19 Jul 2011 17:06:39 +0000
Subject: [PATCH] Override the arch setting to remove OpenBSD version from it,
 so ports don't have to be bumped when OpenBSD version changes.

OK landry@, jcs@
---
 lang/rubinius/Makefile                |  6 +++---
 lang/rubinius/patches/patch-configure | 16 ++++++++++++++++
 lang/ruby/1.8/Makefile                | 10 +++++-----
 lang/ruby/1.8/patches/patch-configure | 22 +++++++++++++++++++---
 4 files changed, 43 insertions(+), 11 deletions(-)
 create mode 100644 lang/rubinius/patches/patch-configure

diff --git a/lang/rubinius/Makefile b/lang/rubinius/Makefile
index 4388f4b976b..1c54f483b99 100644
--- a/lang/rubinius/Makefile
+++ b/lang/rubinius/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2011/07/18 19:06:36 naddy Exp $
+# $OpenBSD: Makefile,v 1.13 2011/07/19 17:09:56 jeremy Exp $
 
 SHARED_ONLY=	Yes
 
@@ -7,7 +7,7 @@ COMMENT =	Ruby virtual machine and core library
 V=		1.2.3
 DISTNAME =	rubinius-${V}-20110315
 PKGNAME =	rubinius-$V
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	lang lang/ruby
 
@@ -38,7 +38,7 @@ MODULES =	lang/ruby
 USE_GMAKE =	Yes
 USE_LIBTOOL=	Yes
 
-RBX_ARCH =	${MACHINE_ARCH}-openbsd${OSREV}
+RBX_ARCH =	${MACHINE_ARCH}-openbsd
 RAKE_VER =	0.8.7
 RAKE_COMPILER_VER = 0.6.0
 RDOC_VER =	2.5.1
diff --git a/lang/rubinius/patches/patch-configure b/lang/rubinius/patches/patch-configure
new file mode 100644
index 00000000000..da1fc650c31
--- /dev/null
+++ b/lang/rubinius/patches/patch-configure
@@ -0,0 +1,16 @@
+$OpenBSD: patch-configure,v 1.1 2011/07/19 17:09:56 jeremy Exp $
+
+Override the os setting to remove OpenBSD version from it,
+so ports don't have to be bumped when OpenBSD version changes.
+
+--- configure.orig	Mon Jul 18 16:42:20 2011
++++ configure	Mon Jul 18 16:42:55 2011
+@@ -24,7 +24,7 @@ class Configure
+     # TODO: conditionalize for Windows
+     @host = `./rakelib/config.guess`.chomp
+     /([^-]+)-([^-]+)-(.*)/ =~ @host
+-    @cpu, @vendor, @os = $1, $2, $3
++    @cpu, @vendor, @os = $1, $2, "openbsd"
+     @little_endian = false
+     @sizeof_long = 0
+ 
diff --git a/lang/ruby/1.8/Makefile b/lang/ruby/1.8/Makefile
index 36681c5e6c6..ab08b80234d 100644
--- a/lang/ruby/1.8/Makefile
+++ b/lang/ruby/1.8/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2011/07/18 19:06:37 naddy Exp $
+# $OpenBSD: Makefile,v 1.15 2011/07/19 17:06:39 jeremy Exp $
 
 COMMENT-main=		object oriented script language with threads
 COMMENT-iconv=		libiconv interface for ruby
@@ -14,10 +14,10 @@ PKGNAME-iconv=		ruby-iconv-${VERSION}.${PATCHLEVEL}
 PKGNAME-gdbm=		ruby-gdbm-${VERSION}.${PATCHLEVEL}
 PKGNAME-tk=		ruby-tk-${VERSION}.${PATCHLEVEL}
 
-REVISION-main=		0
-REVISION-iconv=		0
-REVISION-gdbm=		0
-REVISION-tk=		0
+REVISION-main=		1
+REVISION-iconv=		1
+REVISION-gdbm=		1
+REVISION-tk=		1
 
 PKGSPEC-main=		ruby->=1.8,<1.9
 
diff --git a/lang/ruby/1.8/patches/patch-configure b/lang/ruby/1.8/patches/patch-configure
index 10804fc23bc..65f131a3bc8 100644
--- a/lang/ruby/1.8/patches/patch-configure
+++ b/lang/ruby/1.8/patches/patch-configure
@@ -1,6 +1,10 @@
-$OpenBSD: patch-configure,v 1.2 2011/05/25 17:50:45 jasper Exp $
---- configure.orig	Fri Feb 18 13:42:58 2011
-+++ configure	Wed May 25 19:46:16 2011
+$OpenBSD: patch-configure,v 1.3 2011/07/19 17:06:39 jeremy Exp $
+
+Override the arch setting to remove OpenBSD version from it,
+so ports don't have to be bumped when OpenBSD version changes.
+
+--- configure.orig	Sat Jul  2 02:54:02 2011
++++ configure	Mon Jul 18 15:21:06 2011
 @@ -10706,7 +10706,7 @@ if test "$enable_shared" = 'yes'; then
   	;;
      openbsd*)
@@ -10,3 +14,15 @@ $OpenBSD: patch-configure,v 1.2 2011/05/25 17:50:45 jasper Exp $
  	;;
      solaris*)
  	SOLIBS='$(LIBS)'
+@@ -11009,7 +11009,10 @@ _ACEOF
+ _ACEOF
+ 
+ else
+-    arch="${target_cpu}-${target_os}"
++    case "$target_os" in
++      openbsd*) arch="$target_cpu-openbsd" ;;
++      *) arch="${target_cpu}-${target_os}" ;;
++    esac
+     cat >>confdefs.h <<_ACEOF
+ #define RUBY_PLATFORM "${arch}"
+ _ACEOF