pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/misc/libreoffice Fix build with native X.org under NetBSD



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d735de9186b7
branches:  trunk
changeset: 405552:d735de9186b7
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Sun Dec 01 04:59:43 2019 +0000

description:
Fix build with native X.org under NetBSD

* Detect builtin (X11_TYPE=native) freetype2 correctly.

diffstat:

 misc/libreoffice/Makefile |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (19 lines):

diff -r dce41ee0d9c1 -r d735de9186b7 misc/libreoffice/Makefile
--- a/misc/libreoffice/Makefile Sun Dec 01 04:31:05 2019 +0000
+++ b/misc/libreoffice/Makefile Sun Dec 01 04:59:43 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.214 2019/11/27 07:55:36 martin Exp $
+# $NetBSD: Makefile,v 1.215 2019/12/01 04:59:43 ryoon Exp $
 
 VERREL=                6.3.3
 VERRC=         2
@@ -33,6 +33,9 @@
 
 .include "../../mk/bsd.prefs.mk"
 
+CHECK_BUILTIN.freetype2:=      yes
+.include "../../graphics/freetype2/builtin.mk"
+CHECK_BUILTIN.freetype2:=      no
 .if !empty(USE_BUILTIN.freetype2:M[Yy][Ee][Ss]) && \
        !empty(BUILTIN_VERSION.freetype2:M2.10.0)
 CFLAGS+=                       -D_FT_CONST=



Home | Main Index | Thread Index | Old Index