pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/fonts/fontconfig Remove duplicate changes entry



details:   https://anonhg.NetBSD.org/pkgsrc/rev/31f2a2388916
branches:  trunk
changeset: 322680:31f2a2388916
user:      gavan <gavan%pkgsrc.org@localhost>
date:      Fri Apr 26 15:05:14 2019 +0000

description:
Remove duplicate changes entry

diffstat:

 fonts/fontconfig/builtin.mk |  22 +---------------------
 1 files changed, 1 insertions(+), 21 deletions(-)

diffs (41 lines):

diff -r 7b4e66a6102e -r 31f2a2388916 fonts/fontconfig/builtin.mk
--- a/fonts/fontconfig/builtin.mk       Fri Apr 26 14:58:15 2019 +0000
+++ b/fonts/fontconfig/builtin.mk       Fri Apr 26 15:05:14 2019 +0000
@@ -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 @@
 ### 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.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



Home | Main Index | Thread Index | Old Index