Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 28AFE7A210 for ; Sun, 18 Sep 2016 13:18:22 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id C6B7185E8B; Sun, 18 Sep 2016 13:18:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5822285E8A for ; Sun, 18 Sep 2016 13:18:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id V7yLJBsHDJtB for ; Sun, 18 Sep 2016 13:18:21 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id BAFDA85E45 for ; Sun, 18 Sep 2016 13:18:20 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B5CD7FBD1; Sun, 18 Sep 2016 13:18:20 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1474204700284790" MIME-Version: 1.0 Date: Sun, 18 Sep 2016 13:18:20 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/fonts/fontconfig To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20160918131820.B5CD7FBD1@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1474204700284790 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Sun Sep 18 13:18:20 UTC 2016 Modified Files: pkgsrc/fonts/fontconfig: Makefile Log Message: Fix build with native X.org. The installed version of this library was found and used instead of the one build by the package, leading to problems when the pkgsrc one had symbols the native one doesn't have. Add libtool path to compiler search path to fix this. >From spz. To generate a diff of this commit: cvs rdiff -u -r1.96 -r1.97 pkgsrc/fonts/fontconfig/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1474204700284790 Content-Disposition: inline Content-Length: 746 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/fonts/fontconfig/Makefile diff -u pkgsrc/fonts/fontconfig/Makefile:1.96 pkgsrc/fonts/fontconfig/Makefile:1.97 --- pkgsrc/fonts/fontconfig/Makefile:1.96 Fri Aug 19 12:52:30 2016 +++ pkgsrc/fonts/fontconfig/Makefile Sun Sep 18 13:18:20 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.96 2016/08/19 12:52:30 wiz Exp $ +# $NetBSD: Makefile,v 1.97 2016/09/18 13:18:20 wiz Exp $ DISTNAME= fontconfig-2.12.1 CATEGORIES= fonts @@ -86,6 +86,10 @@ TEST_TARGET= check CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} .endif +.if ${X11_TYPE} != "modular" && exists(${X11BASE}/lib/libfontconfig.so) +LDFLAGS+= -L../src/.libs +.endif + post-install: ${INSTALL_DATA} ${FILESDIR}/30-pkgsrc-aliases.conf ${DESTDIR}${TMPLDIR} --_----------=_1474204700284790--