kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix build with X11_TYPE=native and PKG_OPTIONS.openoffice2=-gtk2

Browse source 
(set USE_BUILTIN.freetype2 to `no').
This commit is contained in:
hira 2007-12-18 22:24:29 +00:00
parent e918f7727d
commit dc23a97bdb
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
misc/openoffice2/Makefile
View file

@ -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"

8
misc/openoffice2/options.mk
View file

@ -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