From 96fa830f9ab230a13e443c8d6352f2020ab139b8 Mon Sep 17 00:00:00 2001
From: jeremy <jeremy@openbsd.org>
Date: Fri, 19 Nov 2010 15:57:43 +0000
Subject: [PATCH] Update from 1.5.3 to 1.5.5.

OK landry@
---
 lang/jruby/Makefile  |  9 +++++----
 lang/jruby/distinfo  | 10 +++++-----
 lang/jruby/pkg/PLIST |  7 +++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lang/jruby/Makefile b/lang/jruby/Makefile
index bb53ea17b18..23034d3eef0 100644
--- a/lang/jruby/Makefile
+++ b/lang/jruby/Makefile
@@ -1,17 +1,16 @@
-# $OpenBSD: Makefile,v 1.12 2010/11/17 08:05:17 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2010/11/19 15:57:43 jeremy Exp $
 
 SHARED_ONLY =	Yes
 
 COMMENT =	pure-Java implementation of the Ruby language
 
-V =		1.5.3
+V =		1.5.5
 DISTNAME =	jruby-src-${V}
 PKGNAME =	jruby-${V}
-REVISION =	0
 CATEGORIES =	lang lang/ruby
 DISTFILES =	${DISTNAME}.tar.gz \
 		wmeissner-jffi-1.0.2-0-ge0d10e9.tar.gz:0 \
-		jruby-${V}-ffi-${MACHINE_ARCH}.tar.gz:0
+		jruby-1.5.3-ffi-${MACHINE_ARCH}.tar.gz:0
 
 HOMEPAGE =	http://www.jruby.org/
 
@@ -50,6 +49,8 @@ SUBST_VARS =	JRUBY_HOME JFFI_ARCH FFI_ARCH
 
 post-extract:
 	mv ${WRKDIR}/wmeissner-jffi-e0d10e9 ${JFFI_HOME}
+	mv ${WRKDIR}/jruby-1.5.3/lib/ruby/site_ruby/shared/ffi/platform/${FFI_ARCH}/*.rb \
+		${WRKSRC}/lib/ruby/site_ruby/shared/ffi/platform/${FFI_ARCH}/
 
 do-build:
 	cd ${JFFI_HOME} && ${ANT_CMD} jar test && \
diff --git a/lang/jruby/distinfo b/lang/jruby/distinfo
index 418f9faf851..8c3025da675 100644
--- a/lang/jruby/distinfo
+++ b/lang/jruby/distinfo
@@ -1,20 +1,20 @@
 MD5 (jruby-1.5.3-ffi-amd64.tar.gz) = F0QI27+PBO8SumCf7ALlcQ==
 MD5 (jruby-1.5.3-ffi-i386.tar.gz) = 5HvPvaNgAkDn+4kFRI8hEQ==
-MD5 (jruby-src-1.5.3.tar.gz) = rdfaM6QcZHdIW93mxdInrA==
+MD5 (jruby-src-1.5.5.tar.gz) = tPMFAKhyDMHwZOZo9R6xag==
 MD5 (wmeissner-jffi-1.0.2-0-ge0d10e9.tar.gz) = mOyRmYChedDeeXyUmTVBog==
 RMD160 (jruby-1.5.3-ffi-amd64.tar.gz) = I+p3WWaDwOFPPo4QevT3cb7YRM4=
 RMD160 (jruby-1.5.3-ffi-i386.tar.gz) = cBhflqxbrjZBNn+08GONos56kbA=
-RMD160 (jruby-src-1.5.3.tar.gz) = WU+oKxWkTp8PzzztESHmitet/tU=
+RMD160 (jruby-src-1.5.5.tar.gz) = W55Cydu+Ked7c1kSQ6WfXu9OBSY=
 RMD160 (wmeissner-jffi-1.0.2-0-ge0d10e9.tar.gz) = lTBayILxwHuGltkNqDMvfjn0+kM=
 SHA1 (jruby-1.5.3-ffi-amd64.tar.gz) = 3KLOnf99XdgCwNJNIMNBANAIqjU=
 SHA1 (jruby-1.5.3-ffi-i386.tar.gz) = rZv3IsO/FQoT6OjaQRLVaf6r9Pw=
-SHA1 (jruby-src-1.5.3.tar.gz) = 0x6l2d173IOLgs1c1k6y6rg8qSs=
+SHA1 (jruby-src-1.5.5.tar.gz) = yGOaxMycIiY04UZ/A+n3a5kRrTU=
 SHA1 (wmeissner-jffi-1.0.2-0-ge0d10e9.tar.gz) = ocUg1SbvOliOtPrMEBIY0sOEK90=
 SHA256 (jruby-1.5.3-ffi-amd64.tar.gz) = mZpkmWu1uUOt4etXSGjsdXS4wo7KRi2z2w8fYXZDWl0=
 SHA256 (jruby-1.5.3-ffi-i386.tar.gz) = w2bHLErg9UIvPPD2DHr8Vrn9ic1eawHzXJpDGSH9hOs=
-SHA256 (jruby-src-1.5.3.tar.gz) = OAWzbdViEjUsTKNfdhN3YE91ISyc5qfHNccjLtd+l6U=
+SHA256 (jruby-src-1.5.5.tar.gz) = 9EHs//4BCw/kR7e05XMjqTNLtzMfXqHuzg/48zqIbb8=
 SHA256 (wmeissner-jffi-1.0.2-0-ge0d10e9.tar.gz) = ybtb8CunJ/jql9zzBZnz2eYWXc08etMsiuWso0nas1c=
 SIZE (jruby-1.5.3-ffi-amd64.tar.gz) = 17158
 SIZE (jruby-1.5.3-ffi-i386.tar.gz) = 17142
-SIZE (jruby-src-1.5.3.tar.gz) = 11262937
+SIZE (jruby-src-1.5.5.tar.gz) = 11152670
 SIZE (wmeissner-jffi-1.0.2-0-ge0d10e9.tar.gz) = 1728176
diff --git a/lang/jruby/pkg/PLIST b/lang/jruby/pkg/PLIST
index bfb2a59eb85..6633a0940b2 100644
--- a/lang/jruby/pkg/PLIST
+++ b/lang/jruby/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2010/10/28 01:45:44 jeremy Exp $
+@comment $OpenBSD: PLIST,v 1.6 2010/11/19 15:57:43 jeremy Exp $
 jruby/
 jruby/bin/
 jruby/bin/autospec
@@ -20,9 +20,6 @@ jruby/lib/jruby.jar
 jruby/lib/native/
 jruby/lib/native/${JFFI_ARCH}/
 jruby/lib/native/${JFFI_ARCH}/libjffi-1.0.so
-jruby/lib/profile-all.properties
-jruby/lib/profile-ruby.properties
-jruby/lib/profile.jar
 jruby/lib/ruby/
 jruby/lib/ruby/1.8/
 jruby/lib/ruby/1.8/.document
@@ -4399,6 +4396,8 @@ jruby/lib/ruby/site_ruby/shared/jruby/openssl/gem.rb
 jruby/lib/ruby/site_ruby/shared/jruby/openssl/gem_only.rb
 jruby/lib/ruby/site_ruby/shared/jruby/openssl/stub.rb
 jruby/lib/ruby/site_ruby/shared/jruby/vm.rb
+jruby/lib/ruby/site_ruby/shared/jruby/win32ole/
+jruby/lib/ruby/site_ruby/shared/jruby/win32ole/stub.rb
 jruby/lib/ruby/site_ruby/shared/pty.rb
 jruby/lib/ruby/site_ruby/shared/securerandom.rb
 jruby/lib/ruby/site_ruby/shared/syslog.rb