Received: by mail.netbsd.org (Postfix, from userid 605) id 25BB184E18; Fri, 26 Apr 2019 15:05:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A095D84DAA for ; Fri, 26 Apr 2019 15:05:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id d6KpSMd_w6zM for ; Fri, 26 Apr 2019 15:05:15 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id F36B684CD4 for ; Fri, 26 Apr 2019 15:05:14 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id EDE61FB16; Fri, 26 Apr 2019 15:05:14 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_155629111483280" MIME-Version: 1.0 Date: Fri, 26 Apr 2019 15:05:14 +0000 From: "Gavan Fantom" Subject: CVS commit: pkgsrc/fonts/fontconfig To: pkgsrc-changes@NetBSD.org Reply-To: gavan@netbsd.org X-Mailer: log_accum Message-Id: <20190426150514.EDE61FB16@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_155629111483280 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gavan Date: Fri Apr 26 15:05:14 UTC 2019 Modified Files: pkgsrc/fonts/fontconfig: builtin.mk Log Message: Remove duplicate changes entry To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 pkgsrc/fonts/fontconfig/builtin.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_155629111483280 Content-Disposition: inline Content-Length: 1510 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/fonts/fontconfig/builtin.mk diff -u pkgsrc/fonts/fontconfig/builtin.mk:1.11 pkgsrc/fonts/fontconfig/builtin.mk:1.12 --- pkgsrc/fonts/fontconfig/builtin.mk:1.11 Mon Mar 19 12:34:13 2012 +++ pkgsrc/fonts/fontconfig/builtin.mk Fri Apr 26 15:05:14 2019 @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.11 2012/03/19 12:34:13 joerg Exp $ +# $NetBSD: builtin.mk,v 1.12 2019/04/26 15:05:14 gavan Exp $ BUILTIN_PKG:= fontconfig @@ -42,20 +42,6 @@ MAKEVARS+= BUILTIN_PKG.fontconfig ### Determine whether we should use the built-in implementation if it ### exists, and set USE_BUILTIN. appropriate ("yes" or "no"). ### -# -# These are dependencies of fontconfig. If we need to use the pkgsrc -# versions of any of these, then also use the pkgsrc version of -# fontconfig. -# -.if defined(USE_BUILTIN.zlib) && !empty(USE_BUILTIN.zlib:M[nN][oO]) -USE_BUILTIN.fontconfig= no -.endif -.if defined(USE_BUILTIN.freetype2) && !empty(USE_BUILTIN.freetype2:M[nN][oO]) -USE_BUILTIN.fontconfig= no -.endif -.if defined(USE_BUILTIN.expat) && !empty(USE_BUILTIN.expat:M[nN][oO]) -USE_BUILTIN.fontconfig= no -.endif .if !defined(USE_BUILTIN.fontconfig) . if ${PREFER.fontconfig} == "pkgsrc" @@ -95,10 +81,4 @@ BUILDLINK_API_DEPENDS.fontconfig+= fontc BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.3 . endif -. if !empty(USE_BUILTIN.fontconfig:M[yY][eE][sS]) -USE_BUILTIN.expat= yes -USE_BUILTIN.freetype2= yes -USE_BUILTIN.zlib= yes -. endif - .endif # CHECK_BUILTIN.fontconfig --_----------=_155629111483280--