From ce8c965e6648acae89798ee96b42c1df727f05a7 Mon Sep 17 00:00:00 2001
From: kristerw <kristerw@pkgsrc.org>
Date: Sun, 14 Mar 2004 02:29:20 +0000
Subject: The checkdll utility is really slow in NetBSD 1.6.2 (the build spends
 nearly 30 hours running this command on my not that old PC). Running checkdll
 is not needed to build the package (and it is only useful when porting the
 software to new architectures), so disable it for now.

---
 misc/openoffice/distinfo         |  4 ++--
 misc/openoffice/patches/patch-bx | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'misc/openoffice')

diff --git a/misc/openoffice/distinfo b/misc/openoffice/distinfo
index 7393ce3cd4a..9d88224a3d0 100644
--- a/misc/openoffice/distinfo
+++ b/misc/openoffice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2003/02/27 20:17:50 mrauch Exp $
+$NetBSD: distinfo,v 1.16 2004/03/14 02:29:20 kristerw Exp $
 
 SHA1 (oo_641_src.tar.bz2) = ad4c7000cf317d7e9d694a6d519336bfaf1f8edd
 Size (oo_641_src.tar.bz2) = 109167758 bytes
@@ -55,7 +55,7 @@ SHA1 (patch-bt) = 8f0f24689460f50bbe77647eee2ab4093c373283
 SHA1 (patch-bu) = 82e3a6c4d188fbace9ec6173c3f3a7da1dd78045
 SHA1 (patch-bv) = 1c3d6f413a750816203c285ab1d2217fce5101be
 SHA1 (patch-bw) = a4dd43d112a44be46934b2dc9f760c660b956be2
-SHA1 (patch-bx) = 52de4d2caa3dce8642e22154f9765e7aafc0f313
+SHA1 (patch-bx) = cef83e75391301e53252f3126e588d83abce3650
 SHA1 (patch-by) = f681eea30a6d28338c513118f6d361225bc8083a
 SHA1 (patch-bz) = 8670c4da21b0f4a0ec4bebce31e28bf831adb8dd
 SHA1 (patch-ca) = 0c515b79dd92a5bf22c79f32a124defd80cd544d
diff --git a/misc/openoffice/patches/patch-bx b/misc/openoffice/patches/patch-bx
index 27852c7cd77..edd4530b43d 100644
--- a/misc/openoffice/patches/patch-bx
+++ b/misc/openoffice/patches/patch-bx
@@ -1,8 +1,8 @@
-$NetBSD: patch-bx,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $
+$NetBSD: patch-bx,v 1.2 2004/03/14 02:29:21 kristerw Exp $
 
---- ../solenv/bin/checkdll.sh.orig	Tue Jun 19 13:07:46 2001
-+++ ../solenv/bin/checkdll.sh
-@@ -7,7 +7,7 @@
+--- ../solenv/bin/checkdll.sh.orig	Tue Jun 19 15:07:46 2001
++++ ../solenv/bin/checkdll.sh	Sun Mar 14 02:51:27 2004
+@@ -7,11 +7,14 @@
  # Copyright (c) 2000, Sun Microsystems, Inc.
  #
  
@@ -11,7 +11,14 @@ $NetBSD: patch-bx,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $
      echo "Usage: `basename $0` [-L library_path] <shared_library>" 1>&2
      exit 1
  }
-@@ -19,6 +19,8 @@
+ 
++echo "WARNING: checkdll is disabled" 1>&2
++exit 0
++
+ checkdll="$SOLARVERSION/$INPATH/bin/checkdll"
+ 
+ if [ -x $checkdll ]; then
+@@ -19,6 +22,8 @@
      do
  	case $1 in 
  	    -L) shift; option=$1;;
-- 
cgit v1.2.3