Re: CVS commit: pkgsrc/fonts/fontconfig

[Gavan Fantom <gavan%coolfactor.org@localhost>]

Thus was written:

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

Apologies, I accidentally committed this change with a commit message destined for another change.

This should read:

fontconfig: trust buildlink to match builtin status of depends

fontconfig's builtin.mk attempts to match its builtin status with that of its dependencies. Unfortunately, forcing other packages to use the builtin version causes those packages to bypass their own logic for determining if the builtin version is suitable.

Buildlink already has a mechanism to ensure that if a dependency uses a pkgsrc version, this package should do the same. Let's trust that mechanism to do its job properly, as the mechanism in this builtin.mk file has been around for a very long time and likely predates that mechanism.

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.

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.<pkg> 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