summaryrefslogtreecommitdiff
path: root/x11/libXft
diff options
context:
space:
mode:
authorjoerg <joerg>2009-03-20 19:23:50 +0000
committerjoerg <joerg>2009-03-20 19:23:50 +0000
commit75fb5bb7e7604eb9547fecf17d31c5f8f7bc55fd (patch)
tree647e974495c5d41703d41ca2e71c9b6063b9153a /x11/libXft
parent1e5847233e0f63b08e108a58553ab24d554cda0f (diff)
downloadpkgsrc-75fb5bb7e7604eb9547fecf17d31c5f8f7bc55fd.tar.gz
Simply and speed up buildlink3.mk files and processing.
This changes the buildlink3.mk files to use an include guard for the recursive include. The use of BUILDLINK_DEPTH, BUILDLINK_DEPENDS, BUILDLINK_PACKAGES and BUILDLINK_ORDER is handled by a single new variable BUILDLINK_TREE. Each buildlink3.mk file adds a pair of enter/exit marker, which can be used to reconstruct the tree and to determine first level includes. Avoiding := for large variables (BUILDLINK_ORDER) speeds up parse time as += has linear complexity. The include guard reduces system time by avoiding reading files over and over again. For complex packages this reduces both %user and %sys time to half of the former time.
Diffstat (limited to 'x11/libXft')
-rw-r--r--x11/libXft/buildlink3.mk19
1 files changed, 6 insertions, 13 deletions
diff --git a/x11/libXft/buildlink3.mk b/x11/libXft/buildlink3.mk
index 8c07492659b..00c07ae249b 100644
--- a/x11/libXft/buildlink3.mk
+++ b/x11/libXft/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2008/07/15 13:24:35 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:45 joerg Exp $
.include "../../mk/bsd.fast.prefs.mk"
@@ -6,28 +6,21 @@
.include "../../fonts/Xft2/buildlink3.mk"
.else
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBXFT_BUILDLINK3_MK:= ${LIBXFT_BUILDLINK3_MK}+
+BUILDLINK_TREE+= libXft
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= libXft
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXft}
-BUILDLINK_PACKAGES+= libXft
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXft
+.if !defined(LIBXFT_BUILDLINK3_MK)
+LIBXFT_BUILDLINK3_MK:=
-.if ${LIBXFT_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.libXft+= libXft>=2.1.10
BUILDLINK_PKGSRCDIR.libXft?= ../../x11/libXft
-.endif # LIBXFT_BUILDLINK3_MK
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../x11/libXrender/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/xproto/buildlink3.mk"
+.endif # LIBXFT_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -libXft
.endif