Mon Feb 24 17:29:26 2020 UTC ()
Fix breakage on Darwin.

MacOS does not provide /usr/include, but it sneaks into some command lines
and causes errors.  Be explicit about the path to glib2 to avoid this.


(brook)
diff -r1.81 -r1.82 pkgsrc/print/poppler-glib/Makefile
cvs diff -r1.81 -r1.82 pkgsrc/print/poppler-glib/Makefile (expand / switch to unified diff)

--- pkgsrc/print/poppler-glib/Makefile 2020/01/10 13:24:19 1.81
+++ pkgsrc/print/poppler-glib/Makefile 2020/02/24 17:29:25 1.82
@@ -1,25 +1,32 @@ @@ -1,25 +1,32 @@
1# $NetBSD: Makefile,v 1.81 2020/01/10 13:24:19 wiz Exp $ 1# $NetBSD: Makefile,v 1.82 2020/02/24 17:29:25 brook Exp $
2 2
3.include "../../print/poppler/Makefile.common" 3.include "../../print/poppler/Makefile.common"
4 4
5PKGNAME= poppler-glib-${POPPLER_VERS} 5PKGNAME= poppler-glib-${POPPLER_VERS}
6 6
7COMMENT= PDF rendering library (GLib wrapper) 7COMMENT= PDF rendering library (GLib wrapper)
8 8
9CONFLICTS+= poppler<0.4.5nb1 9CONFLICTS+= poppler<0.4.5nb1
10 10
11PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-glib.pc.cmake 11PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-glib.pc.cmake
12 12
 13.include "../../mk/bsd.prefs.mk"
 14
 15.if ${OPSYS} == "Darwin"
 16# MacOS Xcode does not provide /usr/include, so be explicit
 17CMAKE_ARGS+= -DGLIB2_INCLUDE_DIRS=${PREFIX}/include
 18.endif
 19
13# Don't build the splash graphics backend. 20# Don't build the splash graphics backend.
14CMAKE_ARGS+= -DENABLE_SPLASH=OFF 21CMAKE_ARGS+= -DENABLE_SPLASH=OFF
15# Don't compile GTK+ test program. 22# Don't compile GTK+ test program.
16CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF 23CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF
17# Compile GLib wrapper which also needs gtk2 24# Compile GLib wrapper which also needs gtk2
18CMAKE_ARGS+= -DENABLE_GLIB=ON 25CMAKE_ARGS+= -DENABLE_GLIB=ON
19# Do not generate glib API documentation. 26# Do not generate glib API documentation.
20CMAKE_ARGS+= -DENABLE_GTK_DOC=OFF 27CMAKE_ARGS+= -DENABLE_GTK_DOC=OFF
21# Don't build and install the tools 28# Don't build and install the tools
22CMAKE_ARGS+= -DENABLE_UTILS=OFF 29CMAKE_ARGS+= -DENABLE_UTILS=OFF
23# Don't compile poppler cpp wrapper. 30# Don't compile poppler cpp wrapper.
24CMAKE_ARGS+= -DENABLE_CPP=OFF 31CMAKE_ARGS+= -DENABLE_CPP=OFF
25# Don't compile poppler qt5 wrapper. 32# Don't compile poppler qt5 wrapper.