From cc76e76a33e19a846350f399e7ec46fafccfe025 Mon Sep 17 00:00:00 2001
From: hira <hira>
Date: Sat, 18 Oct 2008 01:09:44 +0000
Subject: Correct CDEFS on NetBSD/amd64 (-DX86 -> -DX86_64). Bump PKGREVISION.

---
 misc/openoffice2/Makefile         | 4 ++--
 misc/openoffice2/distinfo         | 4 ++--
 misc/openoffice2/patches/patch-cs | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'misc')

diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile
index e1f50e39c95..a242068b223 100644
--- a/misc/openoffice2/Makefile
+++ b/misc/openoffice2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2008/10/14 19:20:43 hira Exp $
+# $NetBSD: Makefile,v 1.53 2008/10/18 01:09:44 hira Exp $
 #
 
 OO_VER=			2.4.1
-PKGREVISION=		4
+PKGREVISION=		5
 DISTNAME=		openoffice-${OO_VER}
 PKGNAME=		openoffice2-${OO_VER}
 CATEGORIES=		misc
diff --git a/misc/openoffice2/distinfo b/misc/openoffice2/distinfo
index 48f53aa1c89..2d862a56515 100644
--- a/misc/openoffice2/distinfo
+++ b/misc/openoffice2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.44 2008/10/03 09:09:16 hira Exp $
+$NetBSD: distinfo,v 1.45 2008/10/18 01:09:44 hira Exp $
 
 SHA1 (openoffice-2.4.1/OOo_2.4.1_src_binfilter.tar.bz2) = a50c7f317643b756c2b0e8937fa9d64b99f05ed9
 RMD160 (openoffice-2.4.1/OOo_2.4.1_src_binfilter.tar.bz2) = 04ffce167f94a250f94f05923a70af0b0744c417
@@ -56,7 +56,7 @@ SHA1 (patch-cn) = 67afccde1d7bfa42ec4082067189da23ada97190
 SHA1 (patch-cp) = 35151ba658859c9d116ccdf44ec372c9e66435b1
 SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d
 SHA1 (patch-cr) = aa797461919635c3e6aaa30678a7585d5640dedd
-SHA1 (patch-cs) = 76c55cd6150076022d9b773486232417ed069643
+SHA1 (patch-cs) = ac54843e3aca0c798753bbb7670bb12bcb92272e
 SHA1 (patch-ct) = a06c5cbc543acecb4f18e858cd844302bbdb50b4
 SHA1 (patch-cu) = b930fd94413c2bdf23ea94b074e3bb5e93784009
 SHA1 (patch-cv) = 2e14a54d369a255ee39fcec7d4f1d2b11a8f4d2e
diff --git a/misc/openoffice2/patches/patch-cs b/misc/openoffice2/patches/patch-cs
index 9e309eab0a3..fe194e43652 100644
--- a/misc/openoffice2/patches/patch-cs
+++ b/misc/openoffice2/patches/patch-cs
@@ -1,4 +1,4 @@
-$NetBSD: patch-cs,v 1.1 2007/10/12 15:41:43 hira Exp $
+$NetBSD: patch-cs,v 1.2 2008/10/18 01:09:44 hira Exp $
 
 --- solenv/inc/unxbsdx3.mk.orig	2007-10-13 00:24:19.000000000 +0900
 +++ solenv/inc/unxbsdx3.mk	2007-10-13 00:28:56.000000000 +0900
@@ -18,7 +18,7 @@ $NetBSD: patch-cs,v 1.1 2007/10/12 15:41:43 hira Exp $
 +#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
 +
 +# _PTHREADS is needed for the stl
-+CDEFS+= -DX86 $(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
++CDEFS+= -DX86_64 $(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
 +
 +# enable visibility define in "sal/types.h"
 +.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-- 
cgit v1.2.3