[pkgsrc/trunk]: pkgsrc/misc/openoffice2 Fix build with X11_TYPE=native and PK...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/090f499e82ed
branches:  trunk
changeset: 536646:090f499e82ed
user:      hira <hira%pkgsrc.org@localhost>
date:      Tue Dec 18 22:24:29 2007 +0000

description:
Fix build with X11_TYPE=native and PKG_OPTIONS.openoffice2=-gtk2
(set USE_BUILTIN.freetype2 to `no').

diffstat:

 misc/openoffice2/Makefile   |  10 +++++++++-
 misc/openoffice2/options.mk |   8 +-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diffs (46 lines):

diff -r 9c955a09fc7d -r 090f499e82ed misc/openoffice2/Makefile
--- a/misc/openoffice2/Makefile Tue Dec 18 22:14:15 2007 +0000
+++ b/misc/openoffice2/Makefile Tue Dec 18 22:24:29 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2007/12/12 10:07:54 hira Exp $
+# $NetBSD: Makefile,v 1.31 2007/12/18 22:24:29 hira Exp $
 #
 
 OO_VER=                        2.3.1
@@ -167,6 +167,14 @@
 .  include "Makefile.${OPSYS}.${ARCH}"
 .endif
 
+# *.pc files are required, but these don't exist on NetBSD.
+.if ${OPSYS} == "NetBSD" && defined(X11_TYPE) && !empty(X11_TYPE:Mnative)
+USE_BUILTIN.freetype2= no
+USE_BUILTIN.Xfixes=     no
+USE_BUILTIN.Xrandr=     no
+USE_BUILTIN.Xrender=    no
+.endif
+
 PYTHON_VERSIONS_ACCEPTED=      24 23 22
 .include "../../lang/python/application.mk"
 
diff -r 9c955a09fc7d -r 090f499e82ed misc/openoffice2/options.mk
--- a/misc/openoffice2/options.mk       Tue Dec 18 22:14:15 2007 +0000
+++ b/misc/openoffice2/options.mk       Tue Dec 18 22:24:29 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.16 2007/11/11 15:46:25 hira Exp $
+# $NetBSD: options.mk,v 1.17 2007/12/18 22:24:29 hira Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.openoffice2
 PKG_SUPPORTED_OPTIONS=         cups gnome gtk2 kde nas ooo-external-libwpd
@@ -67,12 +67,6 @@
 
 .if !empty(PKG_OPTIONS:Mgtk2)
 CONFIGURE_ARGS+=       --enable-gtk
-# *.pc files are needed with NetBSD using native XFree86.
-.  if ${OPSYS} == "NetBSD" && defined(X11_TYPE) && !empty(X11_TYPE:Mnative)
-USE_BUILTIN.Xfixes=    no
-USE_BUILTIN.Xrandr=    no
-USE_BUILTIN.Xrender=   no
-.  endif
 .include "../../x11/gtk2/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --disable-gtk