From 5a981949096f91c8d63a878b8a8185a6b3fce1f8 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Sat, 3 Nov 2012 20:03:02 +0000
Subject: Do as advertised for the last commit and really use the AS limit.
 Thanks to veego for noticing.

---
 lang/openjdk7/distinfo         | 4 ++--
 lang/openjdk7/patches/patch-aa | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'lang')

diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo
index fa891b21c35..bed4bc6f875 100644
--- a/lang/openjdk7/distinfo
+++ b/lang/openjdk7/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2012/11/02 22:28:54 joerg Exp $
+$NetBSD: distinfo,v 1.19 2012/11/03 20:03:02 joerg Exp $
 
 SHA1 (openjdk7/61e08e67b176.tar.bz2) = 3db5488f3c0ea1b9c83a74632d300d8717c9b478
 RMD160 (openjdk7/61e08e67b176.tar.bz2) = c0dd67a6ae982f09b3675c164b5decab4f7e140f
@@ -54,7 +54,7 @@ Size (openjdk7/openjdk-7-fcs-src-b147-27_jun_2011.tar.bz2) = 44635821 bytes
 SHA1 (openjdk7/rhino1_7R3.zip) = 81f39d6e24529d62b23a6a92a1a09af95495d7c1
 RMD160 (openjdk7/rhino1_7R3.zip) = 3fdc3e1540d0fa35ba7dec1bf34a70b0d41cedd0
 Size (openjdk7/rhino1_7R3.zip) = 4651597 bytes
-SHA1 (patch-aa) = a718f471ef56b494daa144167c1053a7515b8168
+SHA1 (patch-aa) = 55c9f870c2bc7281e22ac19a7f72068b72763832
 SHA1 (patch-ab) = 5d6ccee7e3a1a06cfb109cb892be08c7fff1ff8f
 SHA1 (patch-ac) = c845134b3f7912b69c7773ca939f70d2dcd78fec
 SHA1 (patch-ad) = ab68ff2db078628069c925287c119c4cac6657f3
diff --git a/lang/openjdk7/patches/patch-aa b/lang/openjdk7/patches/patch-aa
index ebeaea2c0f4..7f961cb4779 100644
--- a/lang/openjdk7/patches/patch-aa
+++ b/lang/openjdk7/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2012/11/02 22:28:54 joerg Exp $
+$NetBSD: patch-aa,v 1.7 2012/11/03 20:03:03 joerg Exp $
 
 --- hotspot/src/os/bsd/vm/os_bsd.cpp.orig	2012-05-12 08:57:44.793207000 +0000
 +++ hotspot/src/os/bsd/vm/os_bsd.cpp
@@ -60,7 +60,7 @@ $NetBSD: patch-aa,v 1.6 2012/11/02 22:28:54 joerg Exp $
 +  getrlimit(RLIMIT_DATA, &limits);
 +  _physical_memory = MIN2(_physical_memory, (julong)limits.rlim_cur);
 +#if defined(RLIMIT_AS)
-+  getrlimit(RLIMIT_DATA, &limits);
++  getrlimit(RLIMIT_AS, &limits);
 +  _physical_memory = MIN2(_physical_memory, (julong)limits.rlim_cur);
  #endif
  }
-- 
cgit v1.2.3