Mon Sep 22 19:02:13 2008 UTC ()
Add a gross workaround to the gross workaround because openoffice insists
on using the pkgconfig files of its dependency.


(cube)
diff -r1.1 -r1.1.8.1 pkgsrc/misc/openoffice2/Makefile.NetBSD
cvs diff -r1.1 -r1.1.8.1 pkgsrc/misc/openoffice2/Attic/Makefile.NetBSD (expand / switch to unified diff)

--- pkgsrc/misc/openoffice2/Attic/Makefile.NetBSD 2008/02/05 19:17:24 1.1
+++ pkgsrc/misc/openoffice2/Attic/Makefile.NetBSD 2008/09/22 19:02:13 1.1.8.1
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1# $NetBSD: Makefile.NetBSD,v 1.1 2008/02/05 19:17:24 hira Exp $ 1# $NetBSD: Makefile.NetBSD,v 1.1.8.1 2008/09/22 19:02:13 cube Exp $
2# 2#
3 3
4# systray quickstarter is broken with mutex handling? 4# systray quickstarter is broken with mutex handling?
5CONFIGURE_ARGS+= --disable-systray 5CONFIGURE_ARGS+= --disable-systray
6 6
7# *.pc files are required, but these don't exist on NetBSD. 7# *.pc files are required, but these don't exist on NetBSD.
8.if defined(X11_TYPE) && !empty(X11_TYPE:Mnative) 8.if defined(X11_TYPE) && !empty(X11_TYPE:Mnative)
9USE_BUILTIN.freetype2= no 9. for _pkg_ in freetype2 Xfixes Xrandr Xrender
10USE_BUILTIN.Xfixes= no 10. if !exists(${X11BASE}/lib/pkgconfig/${_pkg_:tl}.pc)
11USE_BUILTIN.Xrandr= no 11USE_BUILTIN.${_pkg_}= no
12USE_BUILTIN.Xrender= no 12. endif
 13. endfor
13.endif 14.endif
14 15
15.if ${MACHINE_ARCH} == "i386" 16.if ${MACHINE_ARCH} == "i386"
16#OPENOFFICE_DLLSUFFIX= bi 17#OPENOFFICE_DLLSUFFIX= bi
17OPENOFFICE_OUTPATH= unxbsdi3 18OPENOFFICE_OUTPATH= unxbsdi3
18OPENOFFICE_SETFILE= NetBSDX86 19OPENOFFICE_SETFILE= NetBSDX86
19.elif ${MACHINE_ARCH} == "x86_64" 20.elif ${MACHINE_ARCH} == "x86_64"
20#OPENOFFICE_DLLSUFFIX= bx 21#OPENOFFICE_DLLSUFFIX= bx
21OPENOFFICE_OUTPATH= unxbsdx3 22OPENOFFICE_OUTPATH= unxbsdx3
22OPENOFFICE_SETFILE= NetBSDX86-64 23OPENOFFICE_SETFILE= NetBSDX86-64
23.endif 24.endif