Thu Sep 6 15:27:21 2018 UTC ()
Repeat after me: I have never ever used .../.libs directly.


(joerg)
diff -r1.112 -r1.113 pkgsrc/fonts/fontconfig/Makefile
cvs diff -r1.112 -r1.113 pkgsrc/fonts/fontconfig/Makefile (expand / switch to unified diff)

--- pkgsrc/fonts/fontconfig/Makefile 2018/09/02 20:30:43 1.112
+++ pkgsrc/fonts/fontconfig/Makefile 2018/09/06 15:27:21 1.113
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.112 2018/09/02 20:30:43 wiz Exp $ 1# $NetBSD: Makefile,v 1.113 2018/09/06 15:27:21 joerg Exp $
2 2
3DISTNAME= fontconfig-2.13.1 3DISTNAME= fontconfig-2.13.1
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
@@ -79,30 +79,26 @@ FC_STDCONF+= 30-pkgsrc-aliases.conf @@ -79,30 +79,26 @@ FC_STDCONF+= 30-pkgsrc-aliases.conf
79.for f in ${FC_STDCONF} 79.for f in ${FC_STDCONF}
80CONF_FILES+= ${TMPLDIR}/${f} ${PKG_SYSCONFDIR}/conf.d/${f} 80CONF_FILES+= ${TMPLDIR}/${f} ${PKG_SYSCONFDIR}/conf.d/${f}
81.endfor 81.endfor
82 82
83MAKE_DIRS+= ${VARBASE}/cache 83MAKE_DIRS+= ${VARBASE}/cache
84BUILD_DEFS+= VARBASE 84BUILD_DEFS+= VARBASE
85 85
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) 
93LDFLAGS+= -L../src/.libs 
94.endif 
95 
96post-install: 92post-install:
97 ${INSTALL_DATA} ${FILESDIR}/30-pkgsrc-aliases.conf ${DESTDIR}${TMPLDIR} 93 ${INSTALL_DATA} ${FILESDIR}/30-pkgsrc-aliases.conf ${DESTDIR}${TMPLDIR}
98 94
99.include "../../archivers/bzip2/buildlink3.mk" 95.include "../../archivers/bzip2/buildlink3.mk"
100.include "../../devel/gettext-lib/buildlink3.mk" 96.include "../../devel/gettext-lib/buildlink3.mk"
101.if ${OPSYS} != "Darwin" 97.if ${OPSYS} != "Darwin"
102.include "../../devel/libuuid/buildlink3.mk" 98.include "../../devel/libuuid/buildlink3.mk"
103.endif 99.endif
104.include "../../devel/zlib/buildlink3.mk" 100.include "../../devel/zlib/buildlink3.mk"
105BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.8.1 101BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.8.1
106.include "../../graphics/freetype2/buildlink3.mk" 102.include "../../graphics/freetype2/buildlink3.mk"
107.include "../../textproc/expat/buildlink3.mk" 103.include "../../textproc/expat/buildlink3.mk"
108.include "../../mk/bsd.pkg.mk" 104.include "../../mk/bsd.pkg.mk"