summaryrefslogtreecommitdiff
path: root/x11/tk83
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2009-03-20 19:23:50 +0000
committerjoerg <joerg@pkgsrc.org>2009-03-20 19:23:50 +0000
commit2d1ba244e90207d03eef397a99aa4091baeec5b3 (patch)
tree647e974495c5d41703d41ca2e71c9b6063b9153a /x11/tk83
parent4bf0a20854ae9e07b7965977a713f2efee890976 (diff)
downloadpkgsrc-2d1ba244e90207d03eef397a99aa4091baeec5b3.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/tk83')
-rw-r--r--x11/tk83/buildlink3.mk19
1 files changed, 6 insertions, 13 deletions
diff --git a/x11/tk83/buildlink3.mk b/x11/tk83/buildlink3.mk
index 4bcfd0245f0..e2511a7ed2d 100644
--- a/x11/tk83/buildlink3.mk
+++ b/x11/tk83/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.9 2007/01/11 16:18:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:51 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-TK_BUILDLINK3_MK:= ${TK_BUILDLINK3_MK}+
+BUILDLINK_TREE+= tk
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= tk
-.endif
+.if !defined(TK_BUILDLINK3_MK)
+TK_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntk}
-BUILDLINK_PACKAGES+= tk
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tk
-
-.if !empty(TK_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.tk+= tk-8.3.4*
BUILDLINK_ABI_DEPENDS.tk?= tk>=8.3.4nb2
BUILDLINK_PKGSRCDIR.tk?= ../../x11/tk83
@@ -22,11 +15,11 @@ BUILDLINK_FILES.tk= bin/wish*
# many Makefiles.
#
BUILDLINK_TRANSFORM+= l:tk:tk83
-.endif # TK_BUILDLINK3_MK
TKCONFIG_SH?= ${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
.include "../../lang/tcl83/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
+.endif # TK_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -tk