diff options
author | joerg <joerg> | 2009-03-20 19:23:50 +0000 |
---|---|---|
committer | joerg <joerg> | 2009-03-20 19:23:50 +0000 |
commit | 405c61d80251d8e80401aed2264d4bede218cb22 (patch) | |
tree | 647e974495c5d41703d41ca2e71c9b6063b9153a /misc | |
parent | f0f715d4dd4a290c5c6ae716c774f59caf5aa61c (diff) | |
download | pkgsrc-405c61d80251d8e80401aed2264d4bede218cb22.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 'misc')
-rw-r--r-- | misc/Addresses/buildlink3.mk | 20 | ||||
-rw-r--r-- | misc/bbdb/buildlink3.mk | 19 | ||||
-rw-r--r-- | misc/dialog/buildlink3.mk | 19 | ||||
-rw-r--r-- | misc/goffice0.6/buildlink3.mk | 19 | ||||
-rw-r--r-- | misc/kdepim3/buildlink3.mk | 19 | ||||
-rw-r--r-- | misc/koffice/buildlink3.mk | 19 | ||||
-rw-r--r-- | misc/libcdio/buildlink3.mk | 19 | ||||
-rw-r--r-- | misc/libutf/buildlink3.mk | 19 | ||||
-rw-r--r-- | misc/lookup/buildlink3.mk | 19 | ||||
-rw-r--r-- | misc/m17n-db/buildlink3.mk | 19 | ||||
-rw-r--r-- | misc/pciids/buildlink3.mk | 19 | ||||
-rw-r--r-- | misc/proj/buildlink3.mk | 19 | ||||
-rw-r--r-- | misc/rpm/buildlink3.mk | 19 | ||||
-rw-r--r-- | misc/usbids/buildlink3.mk | 19 | ||||
-rw-r--r-- | misc/xfce4-weather-plugin/buildlink3.mk | 19 |
15 files changed, 90 insertions, 196 deletions
diff --git a/misc/Addresses/buildlink3.mk b/misc/Addresses/buildlink3.mk index 0cce7c9fcd5..8c55a772c3e 100644 --- a/misc/Addresses/buildlink3.mk +++ b/misc/Addresses/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.11 2008/01/18 05:08:33 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:00 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ADDRESSES_BUILDLINK3_MK:= ${ADDRESSES_BUILDLINK3_MK}+ +BUILDLINK_TREE+= Addresses -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= Addresses -.endif +.if !defined(ADDRESSES_BUILDLINK3_MK) +ADDRESSES_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NAddresses} -BUILDLINK_PACKAGES+= Addresses -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Addresses - -.if !empty(ADDRESSES_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.Addresses+= Addresses>=0.4.5 BUILDLINK_ABI_DEPENDS.Addresses+= Addresses>=0.4.6nb6 BUILDLINK_PKGSRCDIR.Addresses?= ../../misc/Addresses @@ -26,8 +19,7 @@ BUILDLINK_FILES.Addresses+= ${GNUSTEP_SUBDIR}/Local/Library/Headers/AddressBook/ BUILDLINK_FILES.Addresses+= ${GNUSTEP_SUBDIR}/Local/Library/Headers/AddressView/*.h BUILDLINK_FILES.Addresses+= ${GNUSTEP_SUBDIR}/Local/Library/Headers/Addresses/*.h -.endif # ADDRESSES_BUILDLINK3_MK - .include "../../x11/gnustep-back/buildlink3.mk" +.endif # ADDRESSES_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -Addresses diff --git a/misc/bbdb/buildlink3.mk b/misc/bbdb/buildlink3.mk index 6ddb7de9f66..fac9e488af2 100644 --- a/misc/bbdb/buildlink3.mk +++ b/misc/bbdb/buildlink3.mk @@ -1,24 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:57 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:00 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BBDB_BUILDLINK3_MK:= ${BBDB_BUILDLINK3_MK}+ - .include "../../editors/emacs/modules.mk" .if ${EMACS_FLAVOR} == "emacs" -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= bbdb -.endif +BUILDLINK_TREE+= bbdb -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbbdb} -BUILDLINK_PACKAGES+= bbdb -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}bbdb +.if !defined(BBDB_BUILDLINK3_MK) +BBDB_BUILDLINK3_MK:= -.if ${BBDB_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.bbdb+= ${EMACS_PKGNAME_PREFIX}bbdb>=2 BUILDLINK_PKGSRCDIR.bbdb?= ../../misc/bbdb -.endif # BBDB_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.bbdb= ${EGREP} '.*\.el$$|.*\.elc$$' @@ -28,5 +20,6 @@ BUILDLINK_CONTENTS_FILTER.bbdb= ${EGREP} '.*\.el$$|.*\.elc$$' EMACS_MODULES+= base .endif +.endif # BBDB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -bbdb diff --git a/misc/dialog/buildlink3.mk b/misc/dialog/buildlink3.mk index 213c2986e7d..645eb82e5eb 100644 --- a/misc/dialog/buildlink3.mk +++ b/misc/dialog/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1 2008/10/08 09:34:00 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:00 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -DIALOG_BUILDLINK3_MK:= ${DIALOG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= dialog -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= dialog -.endif +.if !defined(DIALOG_BUILDLINK3_MK) +DIALOG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndialog} -BUILDLINK_PACKAGES+= dialog -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dialog - -.if ${DIALOG_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.dialog+= dialog>=1.1.20080819nb1 BUILDLINK_PKGSRCDIR.dialog?= ../../misc/dialog -.endif # DIALOG_BUILDLINK3_MK .include "../../devel/ncurses/buildlink3.mk" +.endif # DIALOG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -dialog diff --git a/misc/goffice0.6/buildlink3.mk b/misc/goffice0.6/buildlink3.mk index 75df0274579..27727c2e139 100644 --- a/misc/goffice0.6/buildlink3.mk +++ b/misc/goffice0.6/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/03/06 14:53:52 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:00 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GOFFICE0.6_BUILDLINK3_MK:= ${GOFFICE0.6_BUILDLINK3_MK}+ +BUILDLINK_TREE+= goffice0.6 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= goffice0.6 -.endif +.if !defined(GOFFICE0.6_BUILDLINK3_MK) +GOFFICE0.6_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngoffice0.6} -BUILDLINK_PACKAGES+= goffice0.6 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}goffice0.6 - -.if ${GOFFICE0.6_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.goffice0.6+= goffice0.6>=0.6.1 BUILDLINK_ABI_DEPENDS.goffice0.6?= goffice0.6>=0.6.1nb1 BUILDLINK_PKGSRCDIR.goffice0.6?= ../../misc/goffice0.6 -.endif # GOFFICE0.6_BUILDLINK3_MK #.include "../../converters/libiconv/buildlink3.mk" .include "../../devel/GConf/buildlink3.mk" @@ -30,5 +22,6 @@ BUILDLINK_PKGSRCDIR.goffice0.6?= ../../misc/goffice0.6 .include "../../graphics/libart/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # GOFFICE0.6_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -goffice0.6 diff --git a/misc/kdepim3/buildlink3.mk b/misc/kdepim3/buildlink3.mk index ced7fbbc3fe..b3c2f4461b8 100644 --- a/misc/kdepim3/buildlink3.mk +++ b/misc/kdepim3/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.23 2008/01/18 05:08:36 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2009/03/20 19:25:00 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -KDEPIM_BUILDLINK3_MK:= ${KDEPIM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= kdepim -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= kdepim -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkdepim} -BUILDLINK_PACKAGES+= kdepim -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kdepim +.if !defined(KDEPIM_BUILDLINK3_MK) +KDEPIM_BUILDLINK3_MK:= -.if !empty(KDEPIM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.kdepim+= kdepim>=3.5.0nb1 BUILDLINK_ABI_DEPENDS.kdepim?= kdepim>=3.5.8nb2 BUILDLINK_PKGSRCDIR.kdepim?= ../../misc/kdepim3 -.endif # KDEPIM_BUILDLINK3_MK pkgbase := kdepim .include "../../mk/pkg-build-options.mk" @@ -28,5 +20,6 @@ pkgbase := kdepim .endif .include "../../x11/kdebase3/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" +.endif # KDEPIM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -kdepim diff --git a/misc/koffice/buildlink3.mk b/misc/koffice/buildlink3.mk index 6962b1a2dee..7fba5578660 100644 --- a/misc/koffice/buildlink3.mk +++ b/misc/koffice/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.19 2008/01/18 05:08:36 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2009/03/20 19:25:00 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -KOFFICE_BUILDLINK3_MK:= ${KOFFICE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= koffice -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= koffice -.endif +.if !defined(KOFFICE_BUILDLINK3_MK) +KOFFICE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkoffice} -BUILDLINK_PACKAGES+= koffice -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}koffice - -.if !empty(KOFFICE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.koffice?= koffice>=1.4.2nb5 BUILDLINK_ABI_DEPENDS.koffice?= koffice>=1.6.3nb6 BUILDLINK_PKGSRCDIR.koffice?= ../../misc/koffice -.endif # KOFFICE_BUILDLINK3_MK .include "../../converters/wv2/buildlink3.mk" .include "../../textproc/aspell/buildlink3.mk" @@ -27,5 +19,6 @@ BUILDLINK_PKGSRCDIR.koffice?= ../../misc/koffice .include "../../graphics/tiff/buildlink3.mk" .include "../../meta-pkgs/kde3/kde3.mk" .include "../../x11/kdebase3/buildlink3.mk" +.endif # KOFFICE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -koffice diff --git a/misc/libcdio/buildlink3.mk b/misc/libcdio/buildlink3.mk index 3a43f1df330..52a7340ebc8 100644 --- a/misc/libcdio/buildlink3.mk +++ b/misc/libcdio/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:11:00 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:00 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBCDIO_BUILDLINK3_MK:= ${LIBCDIO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libcdio -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libcdio -.endif +.if !defined(LIBCDIO_BUILDLINK3_MK) +LIBCDIO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcdio} -BUILDLINK_PACKAGES+= libcdio -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libcdio - -.if !empty(LIBCDIO_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libcdio+= libcdio>=0.65 BUILDLINK_ABI_DEPENDS.libcdio+= libcdio>=0.76nb1 BUILDLINK_PKGSRCDIR.libcdio?= ../../misc/libcdio -.endif # LIBCDIO_BUILDLINK3_MK +.endif # LIBCDIO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libcdio diff --git a/misc/libutf/buildlink3.mk b/misc/libutf/buildlink3.mk index fa5025649dd..f96f23e0cdf 100644 --- a/misc/libutf/buildlink3.mk +++ b/misc/libutf/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:00 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:00 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBUTF_BUILDLINK3_MK:= ${LIBUTF_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libutf -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libutf -.endif +.if !defined(LIBUTF_BUILDLINK3_MK) +LIBUTF_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibutf} -BUILDLINK_PACKAGES+= libutf -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libutf - -.if ${LIBUTF_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libutf+= libutf>=3.0 BUILDLINK_PKGSRCDIR.libutf?= ../../misc/libutf -.endif # LIBUTF_BUILDLINK3_MK +.endif # LIBUTF_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libutf diff --git a/misc/lookup/buildlink3.mk b/misc/lookup/buildlink3.mk index f6dc5e63def..57d51511edc 100644 --- a/misc/lookup/buildlink3.mk +++ b/misc/lookup/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/12/16 14:17:31 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:00 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LOOKUP_BUILDLINK3_MK:= ${LOOKUP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= lookup -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= lookup -.endif +.if !defined(LOOKUP_BUILDLINK3_MK) +LOOKUP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlookup} -BUILDLINK_PACKAGES+= lookup -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lookup - -.if ${LOOKUP_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.lookup+= ${EMACS_PKGNAME_PREFIX}lookup>=1.4 BUILDLINK_PKGSRCDIR.lookup?= ../../misc/lookup -.endif # LOOKUP_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.lookup= ${EGREP} '.*\.el$$|.*\.elc$$' +.endif # LOOKUP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -lookup diff --git a/misc/m17n-db/buildlink3.mk b/misc/m17n-db/buildlink3.mk index 577b7bef949..5c583397639 100644 --- a/misc/m17n-db/buildlink3.mk +++ b/misc/m17n-db/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/02/27 13:45:47 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:00 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -M17N_DB_BUILDLINK3_MK:= ${M17N_DB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= m17n-db -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= m17n-db -.endif +.if !defined(M17N_DB_BUILDLINK3_MK) +M17N_DB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nm17n-db} -BUILDLINK_PACKAGES+= m17n-db -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}m17n-db - -.if ${M17N_DB_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.m17n-db+= m17n-db>=1.5.1 BUILDLINK_PKGSRCDIR.m17n-db?= ../../misc/m17n-db -.endif # M17N_DB_BUILDLINK3_MK +.endif # M17N_DB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -m17n-db diff --git a/misc/pciids/buildlink3.mk b/misc/pciids/buildlink3.mk index bf591a6c3f2..05e0ea1e0e7 100644 --- a/misc/pciids/buildlink3.mk +++ b/misc/pciids/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/12 11:46:21 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:01 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PCIIDS_BUILDLINK3_MK:= ${PCIIDS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pciids -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= pciids -.endif +.if !defined(PCIIDS_BUILDLINK3_MK) +PCIIDS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npciids} -BUILDLINK_PACKAGES+= pciids -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pciids - -.if ${PCIIDS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.pciids+= pciids>=20061026 BUILDLINK_PKGSRCDIR.pciids?= ../../misc/pciids -.endif # PCIIDS_BUILDLINK3_MK +.endif # PCIIDS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pciids diff --git a/misc/proj/buildlink3.mk b/misc/proj/buildlink3.mk index d1ba024123e..dbc1cec3bc9 100644 --- a/misc/proj/buildlink3.mk +++ b/misc/proj/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:00 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:01 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PROJ_BUILDLINK3_MK:= ${PROJ_BUILDLINK3_MK}+ +BUILDLINK_TREE+= proj -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= proj -.endif +.if !defined(PROJ_BUILDLINK3_MK) +PROJ_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nproj} -BUILDLINK_PACKAGES+= proj -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}proj - -.if !empty(PROJ_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.proj+= proj>=4.4.7nb1 BUILDLINK_ABI_DEPENDS.proj?= proj>=4.4.7nb2 BUILDLINK_PKGSRCDIR.proj?= ../../misc/proj -.endif # PROJ_BUILDLINK3_MK +.endif # PROJ_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -proj diff --git a/misc/rpm/buildlink3.mk b/misc/rpm/buildlink3.mk index a23c68991fe..b11690a267a 100644 --- a/misc/rpm/buildlink3.mk +++ b/misc/rpm/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:00 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:01 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -RPM_BUILDLINK3_MK:= ${RPM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= rpm -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= rpm -.endif +.if !defined(RPM_BUILDLINK3_MK) +RPM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrpm} -BUILDLINK_PACKAGES+= rpm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rpm - -.if !empty(RPM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.rpm+= rpm>=2.5.4nb4 BUILDLINK_ABI_DEPENDS.rpm?= rpm>=2.5.4nb5 BUILDLINK_PKGSRCDIR.rpm?= ../../misc/rpm BUILDLINK_DEPMETHOD.rpm?= build BUILDLINK_CPPFLAGS.rpm= -I${BUILDLINK_PREFIX.rpm}/include/rpm -.endif # RPM_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.endif # RPM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -rpm diff --git a/misc/usbids/buildlink3.mk b/misc/usbids/buildlink3.mk index 35ee7bf2ae8..2a3513c6eda 100644 --- a/misc/usbids/buildlink3.mk +++ b/misc/usbids/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/22 13:06:40 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:01 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -USBIDS_BUILDLINK3_MK:= ${USBIDS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= usbids -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= usbids -.endif +.if !defined(USBIDS_BUILDLINK3_MK) +USBIDS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nusbids} -BUILDLINK_PACKAGES+= usbids -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}usbids - -.if ${USBIDS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.usbids+= usbids>=20081118 BUILDLINK_PKGSRCDIR.usbids?= ../../misc/usbids -.endif # USBIDS_BUILDLINK3_MK +.endif # USBIDS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -usbids diff --git a/misc/xfce4-weather-plugin/buildlink3.mk b/misc/xfce4-weather-plugin/buildlink3.mk index 1390b21af65..bbb3d1e5803 100644 --- a/misc/xfce4-weather-plugin/buildlink3.mk +++ b/misc/xfce4-weather-plugin/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.14 2007/12/05 07:48:46 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:01 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK:= ${XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-weather-plugin -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-weather-plugin -.endif +.if !defined(XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK) +XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-weather-plugin} -BUILDLINK_PACKAGES+= xfce4-weather-plugin -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-weather-plugin - -.if ${XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-weather-plugin+= xfce4-weather-plugin>=0.6.2 BUILDLINK_PKGSRCDIR.xfce4-weather-plugin?= ../../misc/xfce4-weather-plugin -.endif # XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-weather-plugin |