Mon Mar 12 19:13:53 2018 UTC ()
Fix inverted logic for the conditional uuid dependency.

The buildlink3.mk should be included for OSes _except_ Darwin.

The proper fix for this would be to have a devel/libuuid/builtin.mk that
detects builtinness.


(bsiegert)
diff -r1.106 -r1.107 pkgsrc/fonts/fontconfig/Makefile
cvs diff -r1.106 -r1.107 pkgsrc/fonts/fontconfig/Makefile (expand / switch to unified diff)

--- pkgsrc/fonts/fontconfig/Makefile 2018/03/12 11:44:52 1.106
+++ pkgsrc/fonts/fontconfig/Makefile 2018/03/12 19:13:53 1.107
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.106 2018/03/12 11:44:52 adam Exp $ 1# $NetBSD: Makefile,v 1.107 2018/03/12 19:13:53 bsiegert Exp $
2 2
3DISTNAME= fontconfig-2.13.0 3DISTNAME= fontconfig-2.13.0
4CATEGORIES= fonts 4CATEGORIES= fonts
5MASTER_SITES= https://www.fontconfig.org/release/ 5MASTER_SITES= https://www.fontconfig.org/release/
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.fontconfig.org/ 9HOMEPAGE= https://www.fontconfig.org/
10COMMENT= Library for configuring and customizing font access 10COMMENT= Library for configuring and customizing font access
11#LICENSE= x11? 11#LICENSE= x11?
12 12
13# https://bugs.freedesktop.org/show_bug.cgi?id=101280 13# https://bugs.freedesktop.org/show_bug.cgi?id=101280
14BUILD_DEPENDS+= gperf-[0-9]*:../../devel/gperf 14BUILD_DEPENDS+= gperf-[0-9]*:../../devel/gperf
@@ -86,20 +86,20 @@ BUILD_DEFS+= VARBASE @@ -86,20 +86,20 @@ BUILD_DEFS+= VARBASE
86TEST_TARGET= check 86TEST_TARGET= check
87 87
88.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 88.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
89CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} 89CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q}
90.endif 90.endif
91 91
92.if ${X11_TYPE} != "modular" && exists(${X11BASE}/lib/libfontconfig.so) 92.if ${X11_TYPE} != "modular" && exists(${X11BASE}/lib/libfontconfig.so)
93LDFLAGS+= -L../src/.libs 93LDFLAGS+= -L../src/.libs
94.endif 94.endif
95 95
96post-install: 96post-install:
97 ${INSTALL_DATA} ${FILESDIR}/30-pkgsrc-aliases.conf ${DESTDIR}${TMPLDIR} 97 ${INSTALL_DATA} ${FILESDIR}/30-pkgsrc-aliases.conf ${DESTDIR}${TMPLDIR}
98 98
99.if ${OPSYS} == "Darwin" 99.if ${OPSYS} != "Darwin"
100.include "../../devel/libuuid/buildlink3.mk" 100.include "../../devel/libuuid/buildlink3.mk"
101.endif 101.endif
102.include "../../devel/zlib/buildlink3.mk" 102.include "../../devel/zlib/buildlink3.mk"
103.include "../../graphics/freetype2/buildlink3.mk" 103.include "../../graphics/freetype2/buildlink3.mk"
104.include "../../textproc/expat/buildlink3.mk" 104.include "../../textproc/expat/buildlink3.mk"
105.include "../../mk/bsd.pkg.mk" 105.include "../../mk/bsd.pkg.mk"