diff options
| author | hira <hira@pkgsrc.org> | 2007-12-18 22:24:29 +0000 |
|---|---|---|
| committer | hira <hira@pkgsrc.org> | 2007-12-18 22:24:29 +0000 |
| commit | dc23a97bdb5304db636ba5feb9108ca3d133ca22 (patch) | |
| tree | 9c271326bbf3544108f262b1072b38df1e82643a /misc | |
| parent | e918f7727d9ab013ee8743c73f13ca82434a9d06 (diff) | |
| download | pkgsrc-dc23a97bdb5304db636ba5feb9108ca3d133ca22.tar.gz | |
Fix build with X11_TYPE=native and PKG_OPTIONS.openoffice2=-gtk2
(set USE_BUILTIN.freetype2 to `no').
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/openoffice2/Makefile | 10 | ||||
| -rw-r--r-- | misc/openoffice2/options.mk | 8 |
2 files changed, 10 insertions, 8 deletions
diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile index 948c04c98c1..21c22dc245d 100644 --- a/misc/openoffice2/Makefile +++ b/misc/openoffice2/Makefile @@ -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 @@ ARCH= ${MACHINE_ARCH:C/i[3-6]86/i386/g} . 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 --git a/misc/openoffice2/options.mk b/misc/openoffice2/options.mk index 374bf6261a0..91b7298ef5f 100644 --- a/misc/openoffice2/options.mk +++ b/misc/openoffice2/options.mk @@ -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 @@ CONFIGURE_ARGS+= --disable-gnome-vfs --disable-evolution2 .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 |