From 403e256ff68dfb7e0b0918954c99f3bed3e40b3b Mon Sep 17 00:00:00 2001 From: cube Date: Sun, 5 Oct 2008 21:36:32 +0000 Subject: Merge cube-native-xorg, so that pkgsrc-current can be used with the native X.Org found in NetBSD-current. Thanks a lot to all who helped, especially Matthias Scheler who did repeated tests on Mac OS X and older versions of NetBSD to make sure the support for those platforms wouldn't be broken (or at least, not fatally, as I would still expect a few hiccups here and there, because there is only so much one can test in such limited time). On the infrastructure side, this branch brings pkgconfig-builtin.mk, in order to write very easily new builtin.mk files. It can actually handle more than just pkgconfig files, but it will provide a version if it finds such a file. x11.builtin.mk has also been made more useful and now all existing (and future!) native-X11-related builtin.mk files should include it. --- misc/openoffice2/Makefile.NetBSD | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'misc') diff --git a/misc/openoffice2/Makefile.NetBSD b/misc/openoffice2/Makefile.NetBSD index fb0eee2d070..d341633960b 100644 --- a/misc/openoffice2/Makefile.NetBSD +++ b/misc/openoffice2/Makefile.NetBSD @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.NetBSD,v 1.1 2008/02/05 19:17:24 hira Exp $ +# $NetBSD: Makefile.NetBSD,v 1.2 2008/10/05 21:36:35 cube Exp $ # # systray quickstarter is broken with mutex handling? @@ -6,10 +6,11 @@ CONFIGURE_ARGS+= --disable-systray # *.pc files are required, but these don't exist on NetBSD. .if defined(X11_TYPE) && !empty(X11_TYPE:Mnative) -USE_BUILTIN.freetype2= no -USE_BUILTIN.Xfixes= no -USE_BUILTIN.Xrandr= no -USE_BUILTIN.Xrender= no +. for _pkg_ in freetype2 Xfixes Xrandr Xrender +. if !exists(${X11BASE}/lib/pkgconfig/${_pkg_:tl}.pc) +USE_BUILTIN.${_pkg_}= no +. endif +. endfor .endif .if ${MACHINE_ARCH} == "i386" -- cgit v1.2.3