CVS commit: pkgsrc/misc/libreoffice

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sun Dec  1 04:59:43 UTC 2019

Modified Files:
        pkgsrc/misc/libreoffice: Makefile

Log Message:
Fix build with native X.org under NetBSD

* Detect builtin (X11_TYPE=native) freetype2 correctly.


To generate a diff of this commit:
cvs rdiff -u -r1.214 -r1.215 pkgsrc/misc/libreoffice/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/libreoffice/Makefile
diff -u pkgsrc/misc/libreoffice/Makefile:1.214 pkgsrc/misc/libreoffice/Makefile:1.215
--- pkgsrc/misc/libreoffice/Makefile:1.214      Wed Nov 27 07:55:36 2019
+++ pkgsrc/misc/libreoffice/Makefile    Sun Dec  1 04:59:43 2019
@@ -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 @@ GCC_REQD+=    7
 
 .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=