[pkgsrc/trunk]: pkgsrc/misc/openoffice3 - Correct CDEFS on NetBSD/amd64 (-DX8...

[hira <hira%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9d1b2a4bfb1b
branches:  trunk
changeset: 548574:9d1b2a4bfb1b
user:      hira <hira%pkgsrc.org@localhost>
date:      Sat Oct 18 01:05:08 2008 +0000

description:
- Correct CDEFS on NetBSD/amd64 (-DX86 -> -DX86_64).
 - Fix PLIST without gtk2 option.

diffstat:

 misc/openoffice3/PLIST            |  4 ++--
 misc/openoffice3/distinfo         |  4 ++--
 misc/openoffice3/options.mk       |  5 ++++-
 misc/openoffice3/patches/patch-cs |  4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diffs (75 lines):

diff -r 06699bcc1a76 -r 9d1b2a4bfb1b misc/openoffice3/PLIST
--- a/misc/openoffice3/PLIST    Fri Oct 17 23:42:47 2008 +0000
+++ b/misc/openoffice3/PLIST    Sat Oct 18 01:05:08 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/10/18 01:05:08 hira Exp $
 bin/scalc
 bin/sdraw
 bin/simpress
@@ -11,5 +11,5 @@
 share/applications/impress.desktop
 share/applications/math.desktop
 share/applications/printeradmin.desktop
-share/applications/qstart.desktop
+${PLIST.x11}share/applications/qstart.desktop
 share/applications/writer.desktop
diff -r 06699bcc1a76 -r 9d1b2a4bfb1b misc/openoffice3/distinfo
--- a/misc/openoffice3/distinfo Fri Oct 17 23:42:47 2008 +0000
+++ b/misc/openoffice3/distinfo Sat Oct 18 01:05:08 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2008/10/16 23:16:46 hira Exp $
+$NetBSD: distinfo,v 1.4 2008/10/18 01:05:08 hira Exp $
 
 SHA1 (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = 09ff91fd871f00c696befa8064fe04d7a88a3c8a
 RMD160 (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = edc71b8b0596d63e60431c7266140bf5188abc6d
@@ -54,7 +54,7 @@
 SHA1 (patch-cp) = 35151ba658859c9d116ccdf44ec372c9e66435b1
 SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d
 SHA1 (patch-cr) = aa797461919635c3e6aaa30678a7585d5640dedd
-SHA1 (patch-cs) = dc9afc7cd55cad8f801cb163d25fe2e1803f889a
+SHA1 (patch-cs) = 3f4f360870ad22b1fb88a2ca9f7907e03010ac79
 SHA1 (patch-ct) = a06c5cbc543acecb4f18e858cd844302bbdb50b4
 SHA1 (patch-cu) = b930fd94413c2bdf23ea94b074e3bb5e93784009
 SHA1 (patch-cv) = 2e14a54d369a255ee39fcec7d4f1d2b11a8f4d2e
diff -r 06699bcc1a76 -r 9d1b2a4bfb1b misc/openoffice3/options.mk
--- a/misc/openoffice3/options.mk       Fri Oct 17 23:42:47 2008 +0000
+++ b/misc/openoffice3/options.mk       Sat Oct 18 01:05:08 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2008/10/15 23:17:29 hira Exp $
+# $NetBSD: options.mk,v 1.3 2008/10/18 01:05:08 hira Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.openoffice3
 PKG_SUPPORTED_OPTIONS=         cups gnome gtk2 java kde ooo-external-libwpd
@@ -68,10 +68,13 @@
 CONFIGURE_ARGS+=       --disable-gnome-vfs --disable-evolution2
 .endif
 
+PLIST_VARS+=           gtk2
 .if !empty(PKG_OPTIONS:Mgtk2)
+PLIST.gtk2=            yes
 CONFIGURE_ARGS+=       --enable-gtk
 .include "../../x11/gtk2/buildlink3.mk"
 .else
+PLIST.gtk2=            no
 CONFIGURE_ARGS+=       --disable-gtk
 .endif
 
diff -r 06699bcc1a76 -r 9d1b2a4bfb1b misc/openoffice3/patches/patch-cs
--- a/misc/openoffice3/patches/patch-cs Fri Oct 17 23:42:47 2008 +0000
+++ b/misc/openoffice3/patches/patch-cs Sat Oct 18 01:05:08 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-cs,v 1.2 2008/10/16 23:16:46 hira Exp $
+$NetBSD: patch-cs,v 1.3 2008/10/18 01:05:08 hira Exp $
 
 --- solenv/inc/unxbsdx3.mk.orig        2007-10-13 00:24:19.000000000 +0900
 +++ solenv/inc/unxbsdx3.mk     2008-10-16 19:28:56.000000000 +0900
@@ -18,7 +18,7 @@
 +#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"