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 | |
| 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.
1268 files changed, 7594 insertions, 16384 deletions
diff --git a/archivers/bzip2/buildlink3.mk b/archivers/bzip2/buildlink3.mk index 97fa3bc487b..f8dc3551445 100644 --- a/archivers/bzip2/buildlink3.mk +++ b/archivers/bzip2/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.20 2006/07/08 23:10:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2009/03/20 19:23:50 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BZIP2_BUILDLINK3_MK:= ${BZIP2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= bzip2 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= bzip2 -.endif +.if !defined(BZIP2_BUILDLINK3_MK) +BZIP2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbzip2} -BUILDLINK_PACKAGES+= bzip2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}bzip2 - -.if !empty(BZIP2_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.bzip2+= bzip2>=1.0.1 BUILDLINK_PKGSRCDIR.bzip2?= ../../archivers/bzip2 BUILDLINK_ABI_DEPENDS.bzip2+= bzip2>=1.0.3 -.endif # BZIP2_BUILDLINK3_MK +.endif # BZIP2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -bzip2 diff --git a/archivers/libarchive/buildlink3.mk b/archivers/libarchive/buildlink3.mk index 466e109659c..548aaa46d05 100644 --- a/archivers/libarchive/buildlink3.mk +++ b/archivers/libarchive/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.2 2007/07/29 17:35:14 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:23:50 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBARCHIVE_BUILDLINK3_MK:= ${LIBARCHIVE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libarchive -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libarchive -.endif +.if !defined(LIBARCHIVE_BUILDLINK3_MK) +LIBARCHIVE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibarchive} -BUILDLINK_PACKAGES+= libarchive -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libarchive - -.if ${LIBARCHIVE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libarchive+= libarchive>=2.2 BUILDLINK_PKGSRCDIR.libarchive?= ../../archivers/libarchive -.endif # LIBARCHIVE_BUILDLINK3_MK .include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.endif # LIBARCHIVE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libarchive diff --git a/archivers/libcomprex/buildlink3.mk b/archivers/libcomprex/buildlink3.mk index ffb2ef335f2..0846062e2d8 100644 --- a/archivers/libcomprex/buildlink3.mk +++ b/archivers/libcomprex/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.12 2008/01/18 05:06:19 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:23:51 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBCOMPREX_BUILDLINK3_MK:= ${LIBCOMPREX_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libcomprex -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libcomprex -.endif +.if !defined(LIBCOMPREX_BUILDLINK3_MK) +LIBCOMPREX_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcomprex} -BUILDLINK_PACKAGES+= libcomprex -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libcomprex - -.if !empty(LIBCOMPREX_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libcomprex+= libcomprex>=0.3.2 BUILDLINK_ABI_DEPENDS.libcomprex+= libcomprex>=0.3.3nb3 BUILDLINK_PKGSRCDIR.libcomprex?= ../../archivers/libcomprex -.endif # LIBCOMPREX_BUILDLINK3_MK .include "../../www/curl/buildlink3.mk" +.endif # LIBCOMPREX_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libcomprex diff --git a/archivers/liblzo/buildlink3.mk b/archivers/liblzo/buildlink3.mk index 2c8bcefdb39..15ff35f489a 100644 --- a/archivers/liblzo/buildlink3.mk +++ b/archivers/liblzo/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:51 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBLZO_BUILDLINK3_MK:= ${LIBLZO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= liblzo -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= liblzo -.endif +.if !defined(LIBLZO_BUILDLINK3_MK) +LIBLZO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nliblzo} -BUILDLINK_PACKAGES+= liblzo -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}liblzo - -.if !empty(LIBLZO_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.liblzo+= liblzo>=1.08 BUILDLINK_PKGSRCDIR.liblzo?= ../../archivers/liblzo BUILDLINK_ABI_DEPENDS.liblzo+= liblzo>=1.08nb1 -.endif # LIBLZO_BUILDLINK3_MK +.endif # LIBLZO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -liblzo diff --git a/archivers/libzip/buildlink3.mk b/archivers/libzip/buildlink3.mk index b7ec38bf827..6969888783d 100644 --- a/archivers/libzip/buildlink3.mk +++ b/archivers/libzip/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:23:51 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBZIP_BUILDLINK3_MK:= ${LIBZIP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libzip -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libzip -.endif +.if !defined(LIBZIP_BUILDLINK3_MK) +LIBZIP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibzip} -BUILDLINK_PACKAGES+= libzip -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libzip - -.if !empty(LIBZIP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libzip+= libzip>=0.7.1 BUILDLINK_PKGSRCDIR.libzip?= ../../archivers/libzip -.endif # LIBZIP_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" +.endif # LIBZIP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libzip diff --git a/archivers/lzmalib/buildlink3.mk b/archivers/lzmalib/buildlink3.mk index 0c74842625d..39634ad85cf 100644 --- a/archivers/lzmalib/buildlink3.mk +++ b/archivers/lzmalib/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/09/04 12:07:15 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:23:51 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LZMALIB_BUILDLINK3_MK:= ${LZMALIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= lzmalib -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= lzmalib -.endif +.if !defined(LZMALIB_BUILDLINK3_MK) +LZMALIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlzmalib} -BUILDLINK_PACKAGES+= lzmalib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lzmalib - -.if ${LZMALIB_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.lzmalib+= lzmalib>=0.0.1 BUILDLINK_PKGSRCDIR.lzmalib?= ../../archivers/lzmalib -.endif # LZMALIB_BUILDLINK3_MK +.endif # LZMALIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -lzmalib diff --git a/archivers/lzo/buildlink3.mk b/archivers/lzo/buildlink3.mk index 747f6f2af17..eb81f85533f 100644 --- a/archivers/lzo/buildlink3.mk +++ b/archivers/lzo/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:23:51 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LZO_BUILDLINK3_MK:= ${LZO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= lzo -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= lzo -.endif +.if !defined(LZO_BUILDLINK3_MK) +LZO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlzo} -BUILDLINK_PACKAGES+= lzo -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lzo - -.if !empty(LZO_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.lzo+= lzo>=2.01 BUILDLINK_PKGSRCDIR.lzo?= ../../archivers/lzo -.endif # LZO_BUILDLINK3_MK +.endif # LZO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -lzo diff --git a/archivers/szip/buildlink3.mk b/archivers/szip/buildlink3.mk index 959aef2b06c..2639c082b0b 100644 --- a/archivers/szip/buildlink3.mk +++ b/archivers/szip/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:23:51 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SZIP_BUILDLINK3_MK:= ${SZIP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= szip -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= szip -.endif +.if !defined(SZIP_BUILDLINK3_MK) +SZIP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nszip} -BUILDLINK_PACKAGES+= szip -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}szip - -.if !empty(SZIP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.szip+= szip>=2.0 BUILDLINK_PKGSRCDIR.szip?= ../../archivers/szip -.endif # SZIP_BUILDLINK3_MK +.endif # SZIP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -szip diff --git a/archivers/zziplib/buildlink3.mk b/archivers/zziplib/buildlink3.mk index 32de5c7122a..02abc95b112 100644 --- a/archivers/zziplib/buildlink3.mk +++ b/archivers/zziplib/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:23:51 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ZZIPLIB_BUILDLINK3_MK:= ${ZZIPLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= zziplib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= zziplib -.endif +.if !defined(ZZIPLIB_BUILDLINK3_MK) +ZZIPLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nzziplib} -BUILDLINK_PACKAGES+= zziplib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}zziplib - -.if !empty(ZZIPLIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.zziplib+= zziplib>=0.10.82 BUILDLINK_PKGSRCDIR.zziplib?= ../../archivers/zziplib -.endif # ZZIPLIB_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" +.endif # ZZIPLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -zziplib diff --git a/audio/SDL_mixer/buildlink3.mk b/audio/SDL_mixer/buildlink3.mk index a9856301a4d..eea88f735fb 100644 --- a/audio/SDL_mixer/buildlink3.mk +++ b/audio/SDL_mixer/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 23:10:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:23:51 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SDL_MIXER_BUILDLINK3_MK:= ${SDL_MIXER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= SDL_mixer -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= SDL_mixer -.endif +.if !defined(SDL_MIXER_BUILDLINK3_MK) +SDL_MIXER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDL_mixer} -BUILDLINK_PACKAGES+= SDL_mixer -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}SDL_mixer - -.if !empty(SDL_MIXER_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.SDL_mixer+= SDL_mixer>=1.2.5nb2 BUILDLINK_ABI_DEPENDS.SDL_mixer+= SDL_mixer>=1.2.6nb5 BUILDLINK_PKGSRCDIR.SDL_mixer?= ../../audio/SDL_mixer BUILDLINK_INCDIRS.SDL_mixer?= include/SDL -.endif # SDL_MIXER_BUILDLINK3_MK .include "../../audio/libvorbis/buildlink3.mk" .include "../../multimedia/libogg/buildlink3.mk" .include "../../multimedia/smpeg/buildlink3.mk" +.endif # SDL_MIXER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -SDL_mixer diff --git a/audio/SDL_sound/buildlink3.mk b/audio/SDL_sound/buildlink3.mk index 449e6dc3553..ab0229b6f22 100644 --- a/audio/SDL_sound/buildlink3.mk +++ b/audio/SDL_sound/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.14 2008/11/08 21:13:27 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:23:51 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SDL_SOUND_BUILDLINK3_MK:= ${SDL_SOUND_BUILDLINK3_MK}+ +BUILDLINK_TREE+= SDL_sound -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= SDL_sound -.endif +.if !defined(SDL_SOUND_BUILDLINK3_MK) +SDL_SOUND_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDL_sound} -BUILDLINK_PACKAGES+= SDL_sound -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}SDL_sound - -.if !empty(SDL_SOUND_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.SDL_sound+= SDL_sound>=1.0.3 BUILDLINK_ABI_DEPENDS.SDL_sound?= SDL_sound>=1.0.3nb1 BUILDLINK_PKGSRCDIR.SDL_sound?= ../../audio/SDL_sound -.endif # SDL_SOUND_BUILDLINK3_MK .include "../../audio/flac/buildlink3.mk" .include "../../audio/libmikmod/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" .include "../../audio/speex/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" +.endif # SDL_SOUND_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -SDL_sound diff --git a/audio/adplug/buildlink3.mk b/audio/adplug/buildlink3.mk index 566c4817e81..107f6f5b408 100644 --- a/audio/adplug/buildlink3.mk +++ b/audio/adplug/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/09/10 16:02:26 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:23:51 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ADPLUG_BUILDLINK3_MK:= ${ADPLUG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= adplug -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= adplug -.endif +.if !defined(ADPLUG_BUILDLINK3_MK) +ADPLUG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nadplug} -BUILDLINK_PACKAGES+= adplug -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}adplug - -.if ${ADPLUG_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.adplug+= adplug>=2.1 BUILDLINK_PKGSRCDIR.adplug?= ../../audio/adplug -.endif # ADPLUG_BUILDLINK3_MK .include "../../devel/libbinio/buildlink3.mk" +.endif # ADPLUG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -adplug diff --git a/audio/akode/buildlink3.mk b/audio/akode/buildlink3.mk index c14ba4558bd..a6596e2f78d 100644 --- a/audio/akode/buildlink3.mk +++ b/audio/akode/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/02/27 16:31:27 hasso Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:23:52 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -AKODE_BUILDLINK3_MK:= ${AKODE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= akode -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= akode -.endif +.if !defined(AKODE_BUILDLINK3_MK) +AKODE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nakode} -BUILDLINK_PACKAGES+= akode -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}akode - -.if !empty(AKODE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.akode+= akode>=2.0.2 BUILDLINK_PKGSRCDIR.akode?= ../../audio/akode -.endif # AKODE_BUILDLINK3_MK .include "../../devel/libltdl/buildlink3.mk" +.endif # AKODE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -akode diff --git a/audio/alsa-lib/buildlink3.mk b/audio/alsa-lib/buildlink3.mk index cb3abffa933..4a154213126 100644 --- a/audio/alsa-lib/buildlink3.mk +++ b/audio/alsa-lib/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/01/28 05:38:53 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:23:52 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ALSA_LIB_BUILDLINK3_MK:= ${ALSA_LIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= alsa-lib -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= alsa-lib -.endif +.if !defined(ALSA_LIB_BUILDLINK3_MK) +ALSA_LIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nalsa-lib} -BUILDLINK_PACKAGES+= alsa-lib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}alsa-lib - -.if ${ALSA_LIB_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.alsa-lib+= alsa-lib>=1.0.18 BUILDLINK_PKGSRCDIR.alsa-lib?= ../../audio/alsa-lib -.endif # ALSA_LIB_BUILDLINK3_MK .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.endif # ALSA_LIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -alsa-lib diff --git a/audio/arts/buildlink3.mk b/audio/arts/buildlink3.mk index 604d9239ad2..c6cba9012ed 100644 --- a/audio/arts/buildlink3.mk +++ b/audio/arts/buildlink3.mk @@ -1,24 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.19 2008/02/20 09:43:11 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2009/03/20 19:23:52 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ARTS_BUILDLINK3_MK:= ${ARTS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= arts -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= arts -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Narts} -BUILDLINK_PACKAGES+= arts -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}arts +.if !defined(ARTS_BUILDLINK3_MK) +ARTS_BUILDLINK3_MK:= -.if !empty(ARTS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.arts+= arts>=1.1.4nb1 BUILDLINK_ABI_DEPENDS.arts+= arts>=1.5.8nb1 BUILDLINK_PKGSRCDIR.arts?= ../../audio/arts PRINT_PLIST_AWK+= /^@dirrm include\/arts$$/ \ { print "@comment in arts: " $$0; next; } -.endif # ARTS_BUILDLINK3_MK .include "../../audio/libaudiofile/buildlink3.mk" .include "../../audio/libmad/buildlink3.mk" @@ -42,5 +34,6 @@ pkgbase := arts .if !empty(PKG_BUILD_OPTIONS.arts:Mjack) .include "../../audio/jack/buildlink3.mk" .endif +.endif # ARTS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -arts diff --git a/audio/audacious/buildlink3.mk b/audio/audacious/buildlink3.mk index 2a6aa9b64fc..156a1e918ee 100644 --- a/audio/audacious/buildlink3.mk +++ b/audio/audacious/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.3 2008/11/10 11:35:33 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:23:52 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -AUDACIOUS_BUILDLINK3_MK:= ${AUDACIOUS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= audacious -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= audacious -.endif +.if !defined(AUDACIOUS_BUILDLINK3_MK) +AUDACIOUS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Naudacious} -BUILDLINK_PACKAGES+= audacious -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}audacious - -.if ${AUDACIOUS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.audacious+= audacious>=1.5.0 BUILDLINK_PKGSRCDIR.audacious?= ../../audio/audacious BUILDLINK_DEPMETHOD.audacious?= build -.endif # AUDACIOUS_BUILDLINK3_MK PRINT_PLIST_AWK+= /^@dirrm share\/audacious\/images$$/ \ { print "@comment in audacious: " $$0; next; } @@ -33,5 +25,6 @@ PRINT_PLIST_AWK+= /^@dirrm share\/audacious$$/ \ .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" +.endif # AUDACIOUS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -audacious diff --git a/audio/bmp/buildlink3.mk b/audio/bmp/buildlink3.mk index 447eaf317be..449fc06c94c 100644 --- a/audio/bmp/buildlink3.mk +++ b/audio/bmp/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:52 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BMP_BUILDLINK3_MK:= ${BMP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= bmp -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= bmp -.endif +.if !defined(BMP_BUILDLINK3_MK) +BMP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbmp} -BUILDLINK_PACKAGES+= bmp -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}bmp - -.if !empty(BMP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.bmp+= bmp>=0.9.7rc2nb3 BUILDLINK_ABI_DEPENDS.bmp?= bmp>=0.9.7nb5 BUILDLINK_PKGSRCDIR.bmp?= ../../audio/bmp @@ -22,10 +15,10 @@ PRINT_PLIST_AWK+= /^@dirrm lib\/bmp\/Output$$/ \ { print "@comment in bmp: " $$0; next; } PRINT_PLIST_AWK+= /^@dirrm lib\/bmp\/Visualization$$/ \ { print "@comment in bmp: " $$0; next; } -.endif # BMP_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # BMP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -bmp diff --git a/audio/cddb-bundle/buildlink3.mk b/audio/cddb-bundle/buildlink3.mk index 8203ee17cfa..9ea643348b2 100644 --- a/audio/cddb-bundle/buildlink3.mk +++ b/audio/cddb-bundle/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:23:52 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CDDB_BUNDLE_BUILDLINK3_MK:= ${CDDB_BUNDLE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= cddb-bundle -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= cddb-bundle -.endif +.if !defined(CDDB_BUNDLE_BUILDLINK3_MK) +CDDB_BUNDLE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncddb-bundle} -BUILDLINK_PACKAGES+= cddb-bundle -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cddb-bundle - -.if !empty(CDDB_BUNDLE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.cddb-bundle+= cddb-bundle>=0.2 BUILDLINK_ABI_DEPENDS.cddb-bundle?= cddb-bundle>=0.2nb1 BUILDLINK_PKGSRCDIR.cddb-bundle?= ../../audio/cddb-bundle -.endif # CDDB_BUNDLE_BUILDLINK3_MK .include "../../devel/gnustep-make/buildlink3.mk" +.endif # CDDB_BUNDLE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -cddb-bundle diff --git a/audio/cdparanoia/buildlink3.mk b/audio/cdparanoia/buildlink3.mk index 927ef6084b5..adc7f8274e0 100644 --- a/audio/cdparanoia/buildlink3.mk +++ b/audio/cdparanoia/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:23:52 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CDPARANOIA_BUILDLINK3_MK:= ${CDPARANOIA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= cdparanoia -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= cdparanoia -.endif +.if !defined(CDPARANOIA_BUILDLINK3_MK) +CDPARANOIA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncdparanoia} -BUILDLINK_PACKAGES+= cdparanoia -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cdparanoia - -.if !empty(CDPARANOIA_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.cdparanoia+= cdparanoia>=3.0 BUILDLINK_ABI_DEPENDS.cdparanoia?= cdparanoia>=3.0.9.8nb5 BUILDLINK_PKGSRCDIR.cdparanoia?= ../../audio/cdparanoia -.endif # CDPARANOIA_BUILDLINK3_MK +.endif # CDPARANOIA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -cdparanoia diff --git a/audio/cdplayer/buildlink3.mk b/audio/cdplayer/buildlink3.mk index cdfafc7f18e..577a33330f4 100644 --- a/audio/cdplayer/buildlink3.mk +++ b/audio/cdplayer/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:23:52 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CDPLAYER_BUILDLINK3_MK:= ${CDPLAYER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= cdplayer -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= cdplayer -.endif +.if !defined(CDPLAYER_BUILDLINK3_MK) +CDPLAYER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncdplayer} -BUILDLINK_PACKAGES+= cdplayer -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cdplayer - -.if !empty(CDPLAYER_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.cdplayer+= cdplayer>=0.4.2 BUILDLINK_ABI_DEPENDS.cdplayer?= cdplayer>=0.4.2nb3 BUILDLINK_PKGSRCDIR.cdplayer?= ../../audio/cdplayer -.endif # CDPLAYER_BUILDLINK3_MK .include "../../audio/libcdaudio/buildlink3.mk" .include "../../audio/cddb-bundle/buildlink3.mk" +.endif # CDPLAYER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -cdplayer diff --git a/audio/celt/buildlink3.mk b/audio/celt/buildlink3.mk index bd610c5d6ba..42fb3679a00 100644 --- a/audio/celt/buildlink3.mk +++ b/audio/celt/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/12/03 00:44:49 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:23:52 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CELT_BUILDLINK3_MK:= ${CELT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= celt -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= celt -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncelt} -BUILDLINK_PACKAGES+= celt -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}celt +.if !defined(CELT_BUILDLINK3_MK) +CELT_BUILDLINK3_MK:= -.if ${CELT_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.celt+= celt>=0.5.0 BUILDLINK_PKGSRCDIR.celt?= ../../audio/celt pkgbase:= celt . include "../../mk/pkg-build-options.mk" -.endif # CELT_BUILDLINK3_MK .if !empty(PKG_BUILD_OPTIONS.celt:Mogg) . include "../../multimedia/libogg/buildlink3.mk" .endif +.endif # CELT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -celt diff --git a/audio/esound/buildlink3.mk b/audio/esound/buildlink3.mk index 75502e6f91c..cb7c2f3891c 100644 --- a/audio/esound/buildlink3.mk +++ b/audio/esound/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:23:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ESOUND_BUILDLINK3_MK:= ${ESOUND_BUILDLINK3_MK}+ +BUILDLINK_TREE+= esound -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= esound -.endif +.if !defined(ESOUND_BUILDLINK3_MK) +ESOUND_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nesound} -BUILDLINK_PACKAGES+= esound -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}esound - -.if !empty(ESOUND_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.esound+= esound>=0.2.18 BUILDLINK_ABI_DEPENDS.esound+= esound>=0.2.35nb1 BUILDLINK_PKGSRCDIR.esound?= ../../audio/esound -.endif # ESOUND_BUILDLINK3_MK .include "../../audio/libaudiofile/buildlink3.mk" +.endif # ESOUND_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -esound diff --git a/audio/espeak/buildlink3.mk b/audio/espeak/buildlink3.mk index 721c13b5293..0ba440490a5 100644 --- a/audio/espeak/buildlink3.mk +++ b/audio/espeak/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/07/17 19:18:44 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:23:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ESPEAK_BUILDLINK3_MK:= ${ESPEAK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= espeak -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= espeak -.endif +.if !defined(ESPEAK_BUILDLINK3_MK) +ESPEAK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nespeak} -BUILDLINK_PACKAGES+= espeak -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}espeak - -.if ${ESPEAK_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.espeak+= espeak>=1.26 BUILDLINK_PKGSRCDIR.espeak?= ../../audio/espeak -.endif # ESPEAK_BUILDLINK3_MK .include "../../audio/portaudio/buildlink3.mk" +.endif # ESPEAK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -espeak diff --git a/audio/faac/buildlink3.mk b/audio/faac/buildlink3.mk index 808b0d36a49..7cb5ac290da 100644 --- a/audio/faac/buildlink3.mk +++ b/audio/faac/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:23:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FAAC_BUILDLINK3_MK:= ${FAAC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= faac -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= faac -.endif +.if !defined(FAAC_BUILDLINK3_MK) +FAAC_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfaac} -BUILDLINK_PACKAGES+= faac -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}faac - -.if !empty(FAAC_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.faac+= faac>=1.24 BUILDLINK_ABI_DEPENDS.faac+= faac>=1.24nb1 BUILDLINK_PKGSRCDIR.faac?= ../../audio/faac -.endif # FAAC_BUILDLINK3_MK +.endif # FAAC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -faac diff --git a/audio/faad2/buildlink3.mk b/audio/faad2/buildlink3.mk index 46ec83c1dde..288ccf2785e 100644 --- a/audio/faad2/buildlink3.mk +++ b/audio/faad2/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.12 2008/02/25 16:12:34 sborrill Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:23:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FAAD2_BUILDLINK3_MK:= ${FAAD2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= faad2 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= faad2 -.endif +.if !defined(FAAD2_BUILDLINK3_MK) +FAAD2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfaad2} -BUILDLINK_PACKAGES+= faad2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}faad2 - -.if !empty(FAAD2_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.faad2+= faad2>=2.6.1 BUILDLINK_ABI_DEPENDS.faad2?= faad2>=2.6.1 BUILDLINK_PKGSRCDIR.faad2?= ../../audio/faad2 BUILDLINK_INCDIRS.faad2?= include/faad2 -.endif # FAAD2_BUILDLINK3_MK +.endif # FAAD2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -faad2 diff --git a/audio/flac/buildlink3.mk b/audio/flac/buildlink3.mk index 9a54d136e9b..401dfbff0de 100644 --- a/audio/flac/buildlink3.mk +++ b/audio/flac/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.12 2007/01/07 15:01:52 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:23:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FLAC_BUILDLINK3_MK:= ${FLAC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= flac -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= flac -.endif +.if !defined(FLAC_BUILDLINK3_MK) +FLAC_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nflac} -BUILDLINK_PACKAGES+= flac -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}flac - -.if !empty(FLAC_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.flac+= flac>=1.1.0nb1 BUILDLINK_ABI_DEPENDS.flac+= flac>=1.1.3nb1 BUILDLINK_PKGSRCDIR.flac?= ../../audio/flac -.endif # FLAC_BUILDLINK3_MK .include "../../multimedia/libogg/buildlink3.mk" +.endif # FLAC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -flac diff --git a/audio/fluidsynth/buildlink3.mk b/audio/fluidsynth/buildlink3.mk index e998aaae83c..1c5cabede4f 100644 --- a/audio/fluidsynth/buildlink3.mk +++ b/audio/fluidsynth/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:23:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FLUIDSYNTH_BUILDLINK3_MK:= ${FLUIDSYNTH_BUILDLINK3_MK}+ +BUILDLINK_TREE+= fluidsynth -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= fluidsynth -.endif +.if !defined(FLUIDSYNTH_BUILDLINK3_MK) +FLUIDSYNTH_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfluidsynth} -BUILDLINK_PACKAGES+= fluidsynth -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fluidsynth - -.if !empty(FLUIDSYNTH_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.fluidsynth+= fluidsynth>=1.0.5 BUILDLINK_PKGSRCDIR.fluidsynth?= ../../audio/fluidsynth -.endif # FLUIDSYNTH_BUILDLINK3_MK .include "../../devel/readline/buildlink3.mk" +.endif # FLUIDSYNTH_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -fluidsynth diff --git a/audio/freealut/buildlink3.mk b/audio/freealut/buildlink3.mk index a8a641fde3f..1222c539a37 100644 --- a/audio/freealut/buildlink3.mk +++ b/audio/freealut/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/07/13 14:50:17 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:23:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FREEALUT_BUILDLINK3_MK:= ${FREEALUT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= freealut -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= freealut -.endif +.if !defined(FREEALUT_BUILDLINK3_MK) +FREEALUT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfreealut} -BUILDLINK_PACKAGES+= freealut -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}freealut - -.if ${FREEALUT_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.freealut+= freealut>=1.1.0 BUILDLINK_PKGSRCDIR.freealut?= ../../audio/freealut -.endif # FREEALUT_BUILDLINK3_MK .include "../../audio/openal/buildlink3.mk" +.endif # FREEALUT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -freealut diff --git a/audio/gnome-speech/buildlink3.mk b/audio/gnome-speech/buildlink3.mk index 8cf40439e4b..284a6fb3d03 100644 --- a/audio/gnome-speech/buildlink3.mk +++ b/audio/gnome-speech/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:10:36 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:23:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNOME_SPEECH_BUILDLINK3_MK:= ${GNOME_SPEECH_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnome-speech -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnome-speech -.endif +.if !defined(GNOME_SPEECH_BUILDLINK3_MK) +GNOME_SPEECH_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-speech} -BUILDLINK_PACKAGES+= gnome-speech -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-speech - -.if !empty(GNOME_SPEECH_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gnome-speech+= gnome-speech>=0.3.2 BUILDLINK_ABI_DEPENDS.gnome-speech+= gnome-speech>=0.3.9nb2 BUILDLINK_PKGSRCDIR.gnome-speech?= ../../audio/gnome-speech -.endif # GNOME_SPEECH_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" +.endif # GNOME_SPEECH_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnome-speech diff --git a/audio/goom/buildlink3.mk b/audio/goom/buildlink3.mk index 9f81f7b3640..526ba9cff34 100644 --- a/audio/goom/buildlink3.mk +++ b/audio/goom/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:36 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:23:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GOOM_BUILDLINK3_MK:= ${GOOM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= goom -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= goom -.endif +.if !defined(GOOM_BUILDLINK3_MK) +GOOM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngoom} -BUILDLINK_PACKAGES+= goom -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}goom - -.if !empty(GOOM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.goom+= goom>=2004.0 BUILDLINK_PKGSRCDIR.goom?= ../../audio/goom -.endif # GOOM_BUILDLINK3_MK +.endif # GOOM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -goom diff --git a/audio/gsm/buildlink3.mk b/audio/gsm/buildlink3.mk index 5b9617ecf33..cc8e2438c2f 100644 --- a/audio/gsm/buildlink3.mk +++ b/audio/gsm/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/02/03 06:09:09 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GSM_BUILDLINK3_MK:= ${GSM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gsm -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gsm -.endif +.if !defined(GSM_BUILDLINK3_MK) +GSM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngsm} -BUILDLINK_PACKAGES+= gsm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gsm - -.if !empty(GSM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gsm+= gsm>=1.0.10 BUILDLINK_ABI_DEPENDS.gsm+= gsm>=1.0.12 BUILDLINK_PKGSRCDIR.gsm?= ../../audio/gsm -.endif # GSM_BUILDLINK3_MK +.endif # GSM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gsm diff --git a/audio/id3lib/buildlink3.mk b/audio/id3lib/buildlink3.mk index d503d49248f..a97612d1361 100644 --- a/audio/id3lib/buildlink3.mk +++ b/audio/id3lib/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:36 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:23:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ID3LIB_BUILDLINK3_MK:= ${ID3LIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= id3lib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= id3lib -.endif +.if !defined(ID3LIB_BUILDLINK3_MK) +ID3LIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nid3lib} -BUILDLINK_PACKAGES+= id3lib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}id3lib - -.if !empty(ID3LIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.id3lib+= id3lib>=3.8.3 BUILDLINK_ABI_DEPENDS.id3lib+= id3lib>=3.8.3nb1 BUILDLINK_PKGSRCDIR.id3lib?= ../../audio/id3lib -.endif # ID3LIB_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" +.endif # ID3LIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -id3lib diff --git a/audio/jack/buildlink3.mk b/audio/jack/buildlink3.mk index b54cdb5ffa0..8eba2f00239 100644 --- a/audio/jack/buildlink3.mk +++ b/audio/jack/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.5 2008/11/16 11:22:55 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:23:54 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -JACK_BUILDLINK3_MK:= ${JACK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= jack -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= jack -.endif +.if !defined(JACK_BUILDLINK3_MK) +JACK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Njack} -BUILDLINK_PACKAGES+= jack -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}jack - -.if ${JACK_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.jack+= jack>=0.110.0 BUILDLINK_PKGSRCDIR.jack?= ../../audio/jack -.endif # JACK_BUILDLINK3_MK .include "../../audio/libsamplerate/buildlink3.mk" # for DLOPEN_REQUIRE_PTHREADS .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.endif # JACK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -jack diff --git a/audio/ladspa/buildlink3.mk b/audio/ladspa/buildlink3.mk index 472fbbcc470..9a43b09998e 100644 --- a/audio/ladspa/buildlink3.mk +++ b/audio/ladspa/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/08/08 15:19:15 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:23:54 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LADSPA_BUILDLINK3_MK:= ${LADSPA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ladspa -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= ladspa -.endif +.if !defined(LADSPA_BUILDLINK3_MK) +LADSPA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nladspa} -BUILDLINK_PACKAGES+= ladspa -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ladspa - -.if ${LADSPA_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.ladspa+= ladspa>=1.12 BUILDLINK_ABI_DEPENDS.ladspa?= ladspa>=1.12nb1 BUILDLINK_PKGSRCDIR.ladspa?= ../../audio/ladspa -.endif # LADSPA_BUILDLINK3_MK +.endif # LADSPA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ladspa diff --git a/audio/lame/buildlink3.mk b/audio/lame/buildlink3.mk index fa64eb83990..24d5f0a6a11 100644 --- a/audio/lame/buildlink3.mk +++ b/audio/lame/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:36 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:23:54 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LAME_BUILDLINK3_MK:= ${LAME_BUILDLINK3_MK}+ +BUILDLINK_TREE+= lame -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= lame -.endif +.if !defined(LAME_BUILDLINK3_MK) +LAME_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlame} -BUILDLINK_PACKAGES+= lame -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lame - -.if !empty(LAME_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.lame+= lame>=3.93.1nb2 BUILDLINK_ABI_DEPENDS.lame+= lame>=3.96.1nb4 BUILDLINK_PKGSRCDIR.lame?= ../../audio/lame -.endif # LAME_BUILDLINK3_MK +.endif # LAME_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -lame diff --git a/audio/liba52/buildlink3.mk b/audio/liba52/buildlink3.mk index cddd09dde9a..afd3c39afe8 100644 --- a/audio/liba52/buildlink3.mk +++ b/audio/liba52/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:36 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:23:54 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBA52_BUILDLINK3_MK:= ${LIBA52_BUILDLINK3_MK}+ +BUILDLINK_TREE+= liba52 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= liba52 -.endif +.if !defined(LIBA52_BUILDLINK3_MK) +LIBA52_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nliba52} -BUILDLINK_PACKAGES+= liba52 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}liba52 - -.if !empty(LIBA52_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.liba52+= liba52>=0.7.4 BUILDLINK_ABI_DEPENDS.liba52+= liba52>=0.7.4nb3 BUILDLINK_PKGSRCDIR.liba52?= ../../audio/liba52 -.endif # LIBA52_BUILDLINK3_MK +.endif # LIBA52_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -liba52 diff --git a/audio/libao/buildlink3.mk b/audio/libao/buildlink3.mk index 396f640f511..e80b516641e 100644 --- a/audio/libao/buildlink3.mk +++ b/audio/libao/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.12 2006/12/12 21:52:34 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:23:54 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBAO_BUILDLINK3_MK:= ${LIBAO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libao -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libao -.endif +.if !defined(LIBAO_BUILDLINK3_MK) +LIBAO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibao} -BUILDLINK_PACKAGES+= libao -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libao - -.if !empty(LIBAO_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libao+= libao>=0.8.4 BUILDLINK_ABI_DEPENDS.libao+= libao>=0.8.6nb3 BUILDLINK_PKGSRCDIR.libao?= ../../audio/libao @@ -30,9 +23,9 @@ _LIBAO_DEFAULT_PLUGIN= DEPENDS+= libao-[a-z]*-[0-9]*:../../audio/libao-${_LIBAO_DEFAULT_PLUGIN} . endif . endif -.endif # LIBAO_BUILDLINK3_MK PRINT_PLIST_AWK+= /^@dirrm lib\/ao\/plugins-2$$/ \ { print "@comment in libao: " $$0; next } +.endif # LIBAO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libao diff --git a/audio/libaudiofile/buildlink3.mk b/audio/libaudiofile/buildlink3.mk index 9608fca635d..38dcbfa51fc 100644 --- a/audio/libaudiofile/buildlink3.mk +++ b/audio/libaudiofile/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:36 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:23:54 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -AUDIOFILE_BUILDLINK3_MK:= ${AUDIOFILE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= audiofile -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= audiofile -.endif +.if !defined(AUDIOFILE_BUILDLINK3_MK) +AUDIOFILE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Naudiofile} -BUILDLINK_PACKAGES+= audiofile -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}audiofile - -.if !empty(AUDIOFILE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.audiofile+= libaudiofile>=0.2.1 BUILDLINK_ABI_DEPENDS.audiofile+= libaudiofile>=0.2.6nb1 BUILDLINK_PKGSRCDIR.audiofile?= ../../audio/libaudiofile -.endif # AUDIOFILE_BUILDLINK3_MK +.endif # AUDIOFILE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -audiofile diff --git a/audio/libcanberra/buildlink3.mk b/audio/libcanberra/buildlink3.mk index a440d641e36..075d88d94f6 100644 --- a/audio/libcanberra/buildlink3.mk +++ b/audio/libcanberra/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/10/16 15:17:47 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:23:54 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBCANBERRA_BUILDLINK3_MK:= ${LIBCANBERRA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libcanberra -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libcanberra -.endif +.if !defined(LIBCANBERRA_BUILDLINK3_MK) +LIBCANBERRA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcanberra} -BUILDLINK_PACKAGES+= libcanberra -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libcanberra - -.if ${LIBCANBERRA_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libcanberra+= libcanberra>=0.10 BUILDLINK_PKGSRCDIR.libcanberra?= ../../audio/libcanberra -.endif # LIBCANBERRA_BUILDLINK3_MK #.include "../../multimedia/gstreamer0.10/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" .include "../../devel/libltdl/buildlink3.mk" +.endif # LIBCANBERRA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libcanberra diff --git a/audio/libcdaudio/buildlink3.mk b/audio/libcdaudio/buildlink3.mk index 51263903c30..29152389783 100644 --- a/audio/libcdaudio/buildlink3.mk +++ b/audio/libcdaudio/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:36 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:54 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBCDAUDIO_BUILDLINK3_MK:= ${LIBCDAUDIO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libcdaudio -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libcdaudio -.endif +.if !defined(LIBCDAUDIO_BUILDLINK3_MK) +LIBCDAUDIO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcdaudio} -BUILDLINK_PACKAGES+= libcdaudio -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libcdaudio - -.if !empty(LIBCDAUDIO_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libcdaudio+= libcdaudio>=0.99.4nb1 BUILDLINK_ABI_DEPENDS.libcdaudio+= libcdaudio>=0.99.12nb1 BUILDLINK_PKGSRCDIR.libcdaudio?= ../../audio/libcdaudio -.endif # LIBCDAUDIO_BUILDLINK3_MK +.endif # LIBCDAUDIO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libcdaudio diff --git a/audio/libcddb/buildlink3.mk b/audio/libcddb/buildlink3.mk index 0a22ff05766..71013734348 100644 --- a/audio/libcddb/buildlink3.mk +++ b/audio/libcddb/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.12 2009/01/24 12:13:21 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:23:54 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBCDDB_BUILDLINK3_MK:= ${LIBCDDB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libcddb -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libcddb -.endif +.if !defined(LIBCDDB_BUILDLINK3_MK) +LIBCDDB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcddb} -BUILDLINK_PACKAGES+= libcddb -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libcddb - -.if !empty(LIBCDDB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libcddb+= libcddb>=0.9.4 BUILDLINK_ABI_DEPENDS.libcddb+= libcddb>=0.9.5nb1 BUILDLINK_PKGSRCDIR.libcddb?= ../../audio/libcddb -.endif # LIBCDDB_BUILDLINK3_MK .include "../../converters/libiconv/buildlink3.mk" +.endif # LIBCDDB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libcddb diff --git a/audio/libdca/buildlink3.mk b/audio/libdca/buildlink3.mk index caa92c2801f..64ea8845e27 100644 --- a/audio/libdca/buildlink3.mk +++ b/audio/libdca/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.8 2008/09/08 08:38:10 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:54 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBDCA_BUILDLINK3_MK:= ${LIBDCA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libdca -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libdca -.endif +.if !defined(LIBDCA_BUILDLINK3_MK) +LIBDCA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdca} -BUILDLINK_PACKAGES+= libdca -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdca - -.if ${LIBDCA_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libdca+= libdca>=0.0.5 BUILDLINK_PKGSRCDIR.libdca?= ../../audio/libdca -.endif # LIBDCA_BUILDLINK3_MK +.endif # LIBDCA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libdca diff --git a/audio/libdiscid/buildlink3.mk b/audio/libdiscid/buildlink3.mk index 69c6df8db8d..15814bc80ca 100644 --- a/audio/libdiscid/buildlink3.mk +++ b/audio/libdiscid/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/10/13 02:31:56 epg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:23:55 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBDISCID_BUILDLINK3_MK:= ${LIBDISCID_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libdiscid -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libdiscid -.endif +.if !defined(LIBDISCID_BUILDLINK3_MK) +LIBDISCID_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdiscid} -BUILDLINK_PACKAGES+= libdiscid -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdiscid - -.if ${LIBDISCID_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libdiscid+= libdiscid>=0.1.0 BUILDLINK_PKGSRCDIR.libdiscid?= ../../audio/libdiscid -.endif # LIBDISCID_BUILDLINK3_MK +.endif # LIBDISCID_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libdiscid diff --git a/audio/libgpod/buildlink3.mk b/audio/libgpod/buildlink3.mk index 89da26c9bd3..611de1f9dde 100644 --- a/audio/libgpod/buildlink3.mk +++ b/audio/libgpod/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/09/06 22:55:05 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:23:55 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGPOD_BUILDLINK3_MK:= ${LIBGPOD_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgpod -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libgpod -.endif +.if !defined(LIBGPOD_BUILDLINK3_MK) +LIBGPOD_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgpod} -BUILDLINK_PACKAGES+= libgpod -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgpod - -.if ${LIBGPOD_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libgpod+= libgpod>=0.3.2 BUILDLINK_PKGSRCDIR.libgpod?= ../../audio/libgpod -.endif # LIBGPOD_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # LIBGPOD_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgpod diff --git a/audio/libhydrogen/buildlink3.mk b/audio/libhydrogen/buildlink3.mk index aafb26f1eb9..3d72e56b9e5 100644 --- a/audio/libhydrogen/buildlink3.mk +++ b/audio/libhydrogen/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:36 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:23:55 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBHYDROGEN_BUILDLINK3_MK:= ${LIBHYDROGEN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libhydrogen -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libhydrogen -.endif +.if !defined(LIBHYDROGEN_BUILDLINK3_MK) +LIBHYDROGEN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibhydrogen} -BUILDLINK_PACKAGES+= libhydrogen -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libhydrogen - -.if !empty(LIBHYDROGEN_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libhydrogen+= libhydrogen>=0.8.0 BUILDLINK_ABI_DEPENDS.libhydrogen+= libhydrogen>=0.8.0nb2 BUILDLINK_PKGSRCDIR.libhydrogen?= ../../audio/libhydrogen -.endif # LIBHYDROGEN_BUILDLINK3_MK .include "../../audio/libaudiofile/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.endif # LIBHYDROGEN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libhydrogen diff --git a/audio/libid3tag/buildlink3.mk b/audio/libid3tag/buildlink3.mk index b2286c3fa36..a5190de8066 100644 --- a/audio/libid3tag/buildlink3.mk +++ b/audio/libid3tag/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:36 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:55 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBID3TAG_BUILDLINK3_MK:= ${LIBID3TAG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libid3tag -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libid3tag -.endif +.if !defined(LIBID3TAG_BUILDLINK3_MK) +LIBID3TAG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibid3tag} -BUILDLINK_PACKAGES+= libid3tag -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libid3tag - -.if !empty(LIBID3TAG_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libid3tag+= libid3tag>=0.15.0b BUILDLINK_ABI_DEPENDS.libid3tag+= libid3tag>=0.15.1bnb1 BUILDLINK_PKGSRCDIR.libid3tag?= ../../audio/libid3tag -.endif # LIBID3TAG_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" +.endif # LIBID3TAG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libid3tag diff --git a/audio/libmad/buildlink3.mk b/audio/libmad/buildlink3.mk index 83cae9d3c02..40452bf2089 100644 --- a/audio/libmad/buildlink3.mk +++ b/audio/libmad/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:36 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:23:55 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBMAD_BUILDLINK3_MK:= ${LIBMAD_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libmad -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libmad -.endif +.if !defined(LIBMAD_BUILDLINK3_MK) +LIBMAD_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmad} -BUILDLINK_PACKAGES+= libmad -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmad - -.if !empty(LIBMAD_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libmad+= libmad>=0.15.0b BUILDLINK_ABI_DEPENDS.libmad+= libmad>=0.15.1bnb1 BUILDLINK_PKGSRCDIR.libmad?= ../../audio/libmad -.endif # LIBMAD_BUILDLINK3_MK +.endif # LIBMAD_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libmad diff --git a/audio/libmikmod/buildlink3.mk b/audio/libmikmod/buildlink3.mk index 92bf7deb36c..eeca4b63719 100644 --- a/audio/libmikmod/buildlink3.mk +++ b/audio/libmikmod/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.15 2007/05/30 08:54:28 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:23:55 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBMIKMOD_BUILDLINK3_MK:= ${LIBMIKMOD_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libmikmod -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libmikmod -.endif +.if !defined(LIBMIKMOD_BUILDLINK3_MK) +LIBMIKMOD_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmikmod} -BUILDLINK_PACKAGES+= libmikmod -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmikmod - -.if ${LIBMIKMOD_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libmikmod+= libmikmod>=3.1.9 BUILDLINK_ABI_DEPENDS.libmikmod+= libmikmod>=3.1.11.1nb2 BUILDLINK_PKGSRCDIR.libmikmod?= ../../audio/libmikmod @@ -25,6 +18,6 @@ pkgbase := libmikmod empty(OPSYS:MNetBSD) && empty(OPSYS:MLinux) . include "../../audio/esound/buildlink3.mk" . endif -.endif # LIBMIKMOD_BUILDLINK3_MK +.endif # LIBMIKMOD_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libmikmod diff --git a/audio/libmodplug/buildlink3.mk b/audio/libmodplug/buildlink3.mk index 839de556fe1..cf68ff6ec74 100644 --- a/audio/libmodplug/buildlink3.mk +++ b/audio/libmodplug/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:36 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:55 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBMODPLUG_BUILDLINK3_MK:= ${LIBMODPLUG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libmodplug -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libmodplug -.endif +.if !defined(LIBMODPLUG_BUILDLINK3_MK) +LIBMODPLUG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmodplug} -BUILDLINK_PACKAGES+= libmodplug -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmodplug - -.if !empty(LIBMODPLUG_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libmodplug+= libmodplug>=0.7 BUILDLINK_ABI_DEPENDS.libmodplug+= libmodplug>=0.7nb1 BUILDLINK_PKGSRCDIR.libmodplug?= ../../audio/libmodplug -.endif # LIBMODPLUG_BUILDLINK3_MK +.endif # LIBMODPLUG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libmodplug diff --git a/audio/libmp3splt/buildlink3.mk b/audio/libmp3splt/buildlink3.mk index 1b19113d44f..a9c6e1afa51 100644 --- a/audio/libmp3splt/buildlink3.mk +++ b/audio/libmp3splt/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/02/12 22:52:49 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:23:55 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBMP3SPLT_BUILDLINK3_MK:= ${LIBMP3SPLT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libmp3splt -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libmp3splt -.endif +.if !defined(LIBMP3SPLT_BUILDLINK3_MK) +LIBMP3SPLT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmp3splt} -BUILDLINK_PACKAGES+= libmp3splt -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmp3splt - -.if ${LIBMP3SPLT_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libmp3splt+= libmp3splt>=0.5.1 BUILDLINK_PKGSRCDIR.libmp3splt?= ../../audio/libmp3splt -.endif # LIBMP3SPLT_BUILDLINK3_MK ### ### XXX libmad and libvorbis are needed only for headers. ### @@ -26,5 +18,6 @@ BUILDLINK_DEPMETHOD.libvorbis?= build .include "../../multimedia/libogg/buildlink3.mk" .include "../../devel/libltdl/buildlink3.mk" +.endif # LIBMP3SPLT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libmp3splt diff --git a/audio/libmpcdec/buildlink3.mk b/audio/libmpcdec/buildlink3.mk index 96632cfc4eb..61deb31e910 100644 --- a/audio/libmpcdec/buildlink3.mk +++ b/audio/libmpcdec/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/07/25 13:59:39 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:23:55 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBMPCDEC_BUILDLINK3_MK:= ${LIBMPCDEC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libmpcdec -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libmpcdec -.endif +.if !defined(LIBMPCDEC_BUILDLINK3_MK) +LIBMPCDEC_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmpcdec} -BUILDLINK_PACKAGES+= libmpcdec -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmpcdec - -.if ${LIBMPCDEC_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libmpcdec+= libmpcdec>=1.2.4 BUILDLINK_ABI_DEPENDS.libmpcdec+= libmpcdec>=1.2.6 BUILDLINK_PKGSRCDIR.libmpcdec?= ../../audio/libmpcdec -.endif # LIBMPCDEC_BUILDLINK3_MK +.endif # LIBMPCDEC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libmpcdec diff --git a/audio/libmpd/buildlink3.mk b/audio/libmpd/buildlink3.mk index d0f9b4796e7..eca89011fc3 100644 --- a/audio/libmpd/buildlink3.mk +++ b/audio/libmpd/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:36 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:23:55 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBMPD_BUILDLINK3_MK:= ${LIBMPD_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libmpd -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libmpd -.endif +.if !defined(LIBMPD_BUILDLINK3_MK) +LIBMPD_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmpd} -BUILDLINK_PACKAGES+= libmpd -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmpd - -.if !empty(LIBMPD_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libmpd+= libmpd>=0.12.0 BUILDLINK_PKGSRCDIR.libmpd?= ../../audio/libmpd -.endif # LIBMPD_BUILDLINK3_MK +.endif # LIBMPD_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libmpd diff --git a/audio/libmpg123/buildlink3.mk b/audio/libmpg123/buildlink3.mk index 7b97c4916a5..18d3f02091d 100644 --- a/audio/libmpg123/buildlink3.mk +++ b/audio/libmpg123/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/10/15 01:58:53 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:23:56 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBMPG123_BUILDLINK3_MK:= ${LIBMPG123_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libmpg123 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libmpg123 -.endif +.if !defined(LIBMPG123_BUILDLINK3_MK) +LIBMPG123_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmpg123} -BUILDLINK_PACKAGES+= libmpg123 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmpg123 - -.if ${LIBMPG123_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libmpg123+= libmpg123>=0.7.0 BUILDLINK_PKGSRCDIR.libmpg123?= ../../audio/libmpg123 -.endif # LIBMPG123_BUILDLINK3_MK +.endif # LIBMPG123_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libmpg123 diff --git a/audio/libmusepack/buildlink3.mk b/audio/libmusepack/buildlink3.mk index 4bdcbd55108..249433a29ed 100644 --- a/audio/libmusepack/buildlink3.mk +++ b/audio/libmusepack/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.7 2007/02/01 10:21:57 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:23:56 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBMUSEPACK_BUILDLINK3_MK:= ${LIBMUSEPACK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libmusepack -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libmusepack -.endif +.if !defined(LIBMUSEPACK_BUILDLINK3_MK) +LIBMUSEPACK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmusepack} -BUILDLINK_PACKAGES+= libmusepack -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmusepack - -.if !empty(LIBMUSEPACK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libmusepack+= libmusepack>=1.0.3 BUILDLINK_PKGSRCDIR.libmusepack?= ../../audio/libmusepack -.endif # LIBMUSEPACK_BUILDLINK3_MK +.endif # LIBMUSEPACK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libmusepack diff --git a/audio/libmusicbrainz/buildlink3.mk b/audio/libmusicbrainz/buildlink3.mk index ec8818948fa..81f678317e9 100644 --- a/audio/libmusicbrainz/buildlink3.mk +++ b/audio/libmusicbrainz/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.3 2008/01/18 05:06:20 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:23:56 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBMUSICBRAINZ_BUILDLINK3_MK:= ${LIBMUSICBRAINZ_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libmusicbrainz -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libmusicbrainz -.endif +.if !defined(LIBMUSICBRAINZ_BUILDLINK3_MK) +LIBMUSICBRAINZ_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmusicbrainz} -BUILDLINK_PACKAGES+= libmusicbrainz -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmusicbrainz - -.if ${LIBMUSICBRAINZ_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libmusicbrainz+= libmusicbrainz>=3.0.0 BUILDLINK_ABI_DEPENDS.libmusicbrainz?= libmusicbrainz>=3.0.0nb1 BUILDLINK_PKGSRCDIR.libmusicbrainz?= ../../audio/libmusicbrainz -.endif # LIBMUSICBRAINZ_BUILDLINK3_MK .include "../../www/neon/buildlink3.mk" +.endif # LIBMUSICBRAINZ_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libmusicbrainz diff --git a/audio/libofa/buildlink3.mk b/audio/libofa/buildlink3.mk index 3a412d2246f..f27bab2b870 100644 --- a/audio/libofa/buildlink3.mk +++ b/audio/libofa/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/07/12 13:12:57 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:23:56 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBOFA_BUILDLINK3_MK:= ${LIBOFA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libofa -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libofa -.endif +.if !defined(LIBOFA_BUILDLINK3_MK) +LIBOFA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibofa} -BUILDLINK_PACKAGES+= libofa -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libofa - -.if ${LIBOFA_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libofa+= libofa>=0.9.3 BUILDLINK_PKGSRCDIR.libofa?= ../../audio/libofa -.endif # LIBOFA_BUILDLINK3_MK .include "../../math/fftw/buildlink3.mk" +.endif # LIBOFA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libofa diff --git a/audio/libopenspc/buildlink3.mk b/audio/libopenspc/buildlink3.mk index 98870e1b298..275b2f5f24c 100644 --- a/audio/libopenspc/buildlink3.mk +++ b/audio/libopenspc/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/01/26 16:44:00 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:23:56 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBOPENSPC_BUILDLINK3_MK:= ${LIBOPENSPC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libopenspc -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libopenspc -.endif +.if !defined(LIBOPENSPC_BUILDLINK3_MK) +LIBOPENSPC_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibopenspc} -BUILDLINK_PACKAGES+= libopenspc -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libopenspc - -.if ${LIBOPENSPC_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libopenspc+= libopenspc>=0.3.99.20050926 BUILDLINK_PKGSRCDIR.libopenspc?= ../../audio/libopenspc -.endif # LIBOPENSPC_BUILDLINK3_MK +.endif # LIBOPENSPC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libopenspc diff --git a/audio/libsamplerate/buildlink3.mk b/audio/libsamplerate/buildlink3.mk index da9ae2fbada..21ac640fa85 100644 --- a/audio/libsamplerate/buildlink3.mk +++ b/audio/libsamplerate/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.10 2007/01/07 12:25:51 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:23:56 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSAMPLERATE_BUILDLINK3_MK:= ${LIBSAMPLERATE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libsamplerate -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libsamplerate -.endif +.if !defined(LIBSAMPLERATE_BUILDLINK3_MK) +LIBSAMPLERATE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsamplerate} -BUILDLINK_PACKAGES+= libsamplerate -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsamplerate - -.if !empty(LIBSAMPLERATE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libsamplerate+= libsamplerate>=0.0.13nb1 BUILDLINK_ABI_DEPENDS.libsamplerate+= libsamplerate>=0.1.2nb3 BUILDLINK_PKGSRCDIR.libsamplerate?= ../../audio/libsamplerate -.endif # LIBSAMPLERATE_BUILDLINK3_MK .include "../../audio/libsndfile/buildlink3.mk" +.endif # LIBSAMPLERATE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libsamplerate diff --git a/audio/libshout/buildlink3.mk b/audio/libshout/buildlink3.mk index f199b9c4dc5..eff46004f7e 100644 --- a/audio/libshout/buildlink3.mk +++ b/audio/libshout/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:37 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:23:56 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSHOUT_BUILDLINK3_MK:= ${LIBSHOUT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libshout -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libshout -.endif +.if !defined(LIBSHOUT_BUILDLINK3_MK) +LIBSHOUT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibshout} -BUILDLINK_PACKAGES+= libshout -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libshout - -.if !empty(LIBSHOUT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libshout+= libshout>=2.0 BUILDLINK_ABI_DEPENDS.libshout+=libshout>=2.0nb1 BUILDLINK_PKGSRCDIR.libshout?= ../../audio/libshout -.endif # LIBSHOUT_BUILDLINK3_MK .include "../../audio/libvorbis/buildlink3.mk" .include "../../multimedia/libtheora/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.endif # LIBSHOUT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libshout diff --git a/audio/libsidplay/buildlink3.mk b/audio/libsidplay/buildlink3.mk index c4ae2a838f7..25b55cc0d5c 100644 --- a/audio/libsidplay/buildlink3.mk +++ b/audio/libsidplay/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:37 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:56 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSIDPLAY_BUILDLINK3_MK:= ${LIBSIDPLAY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libsidplay -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libsidplay -.endif +.if !defined(LIBSIDPLAY_BUILDLINK3_MK) +LIBSIDPLAY_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsidplay} -BUILDLINK_PACKAGES+= libsidplay -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsidplay - -.if !empty(LIBSIDPLAY_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libsidplay+= libsidplay>=1.36.38 BUILDLINK_ABI_DEPENDS.libsidplay+= libsidplay>=1.36.59nb2 BUILDLINK_PKGSRCDIR.libsidplay?= ../../audio/libsidplay -.endif # LIBSIDPLAY_BUILDLINK3_MK +.endif # LIBSIDPLAY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libsidplay diff --git a/audio/libsidplay2/buildlink3.mk b/audio/libsidplay2/buildlink3.mk index b4b744de157..8cf787d987b 100644 --- a/audio/libsidplay2/buildlink3.mk +++ b/audio/libsidplay2/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 23:10:37 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:23:56 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSIDPLAY2_BUILDLINK3_MK:= ${LIBSIDPLAY2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libsidplay2 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libsidplay2 -.endif +.if !defined(LIBSIDPLAY2_BUILDLINK3_MK) +LIBSIDPLAY2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsidplay2} -BUILDLINK_PACKAGES+= libsidplay2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsidplay2 - -.if !empty(LIBSIDPLAY2_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libsidplay2+= libsidplay2>=2.0.9 BUILDLINK_PKGSRCDIR.libsidplay2?= ../../audio/libsidplay2 -.endif # LIBSIDPLAY2_BUILDLINK3_MK +.endif # LIBSIDPLAY2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libsidplay2 diff --git a/audio/libsndfile/buildlink3.mk b/audio/libsndfile/buildlink3.mk index 076b2ff37cd..025ba5d3e15 100644 --- a/audio/libsndfile/buildlink3.mk +++ b/audio/libsndfile/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.12 2009/02/21 13:20:45 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:23:57 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSNDFILE_BUILDLINK3_MK:= ${LIBSNDFILE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libsndfile -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libsndfile -.endif +.if !defined(LIBSNDFILE_BUILDLINK3_MK) +LIBSNDFILE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsndfile} -BUILDLINK_PACKAGES+= libsndfile -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsndfile - -.if !empty(LIBSNDFILE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libsndfile+= libsndfile>=1.0.0 BUILDLINK_ABI_DEPENDS.libsndfile+= libsndfile>=1.0.18 BUILDLINK_PKGSRCDIR.libsndfile?= ../../audio/libsndfile -.endif # LIBSNDFILE_BUILDLINK3_MK .include "../../audio/libvorbis/buildlink3.mk" .include "../../audio/flac/buildlink3.mk" .include "../../multimedia/libogg/buildlink3.mk" +.endif # LIBSNDFILE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libsndfile diff --git a/audio/libspiff/buildlink3.mk b/audio/libspiff/buildlink3.mk index fc7a4937772..84d879a6e33 100644 --- a/audio/libspiff/buildlink3.mk +++ b/audio/libspiff/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.3 2008/10/31 22:36:28 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:23:57 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSPIFF_BUILDLINK3_MK:= ${LIBSPIFF_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libspiff -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libspiff -.endif +.if !defined(LIBSPIFF_BUILDLINK3_MK) +LIBSPIFF_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibspiff} -BUILDLINK_PACKAGES+= libspiff -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libspiff - -.if ${LIBSPIFF_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libspiff+= libspiff>=1.0.0 BUILDLINK_PKGSRCDIR.libspiff?= ../../audio/libspiff -.endif # LIBSPIFF_BUILDLINK3_MK .include "../../textproc/expat/buildlink3.mk" .include "../../textproc/uriparser/buildlink3.mk" +.endif # LIBSPIFF_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libspiff diff --git a/audio/libtunepimp/buildlink3.mk b/audio/libtunepimp/buildlink3.mk index fee84df6438..6aea6842240 100644 --- a/audio/libtunepimp/buildlink3.mk +++ b/audio/libtunepimp/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.9 2008/01/18 05:06:20 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:23:57 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBTUNEPIMP_BUILDLINK3_MK:= ${LIBTUNEPIMP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libtunepimp -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libtunepimp -.endif +.if !defined(LIBTUNEPIMP_BUILDLINK3_MK) +LIBTUNEPIMP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibtunepimp} -BUILDLINK_PACKAGES+= libtunepimp -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libtunepimp - -.if ${LIBTUNEPIMP_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libtunepimp+= libtunepimp>=0.5.0 BUILDLINK_ABI_DEPENDS.libtunepimp?= libtunepimp>=0.5.3nb4 BUILDLINK_PKGSRCDIR.libtunepimp?= ../../audio/libtunepimp -.endif # LIBTUNEPIMP_BUILDLINK3_MK .include "../../audio/musicbrainz/buildlink3.mk" .include "../../audio/libofa/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../www/curl/buildlink3.mk" +.endif # LIBTUNEPIMP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libtunepimp diff --git a/audio/libvisual/buildlink3.mk b/audio/libvisual/buildlink3.mk index e01f038bf09..602079a9d3b 100644 --- a/audio/libvisual/buildlink3.mk +++ b/audio/libvisual/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.10 2007/12/29 16:11:38 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:23:57 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBVISUAL_BUILDLINK3_MK:= ${LIBVISUAL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libvisual -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libvisual -.endif +.if !defined(LIBVISUAL_BUILDLINK3_MK) +LIBVISUAL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibvisual} -BUILDLINK_PACKAGES+= libvisual -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libvisual - -.if !empty(LIBVISUAL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libvisual+= libvisual>=0.4.0 BUILDLINK_PKGSRCDIR.libvisual?= ../../audio/libvisual -.endif # LIBVISUAL_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" +.endif # LIBVISUAL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libvisual diff --git a/audio/libvisual0.2/buildlink3.mk b/audio/libvisual0.2/buildlink3.mk index c172676b10e..a204ffca4b4 100644 --- a/audio/libvisual0.2/buildlink3.mk +++ b/audio/libvisual0.2/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 23:10:37 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:23:57 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBVISUAL0.2_BUILDLINK3_MK:= ${LIBVISUAL0.2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libvisual0.2 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libvisual0.2 -.endif +.if !defined(LIBVISUAL0.2_BUILDLINK3_MK) +LIBVISUAL0.2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibvisual0.2} -BUILDLINK_PACKAGES+= libvisual0.2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libvisual0.2 - -.if ${LIBVISUAL0.2_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libvisual0.2+= libvisual0.2>=0.2.0 BUILDLINK_PKGSRCDIR.libvisual0.2?= ../../audio/libvisual0.2 -.endif # LIBVISUAL0.2_BUILDLINK3_MK +.endif # LIBVISUAL0.2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libvisual0.2 diff --git a/audio/libvorbis/buildlink3.mk b/audio/libvorbis/buildlink3.mk index 80f9836c473..3430e9d13e7 100644 --- a/audio/libvorbis/buildlink3.mk +++ b/audio/libvorbis/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:37 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:23:57 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBVORBIS_BUILDLINK3_MK:= ${LIBVORBIS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libvorbis -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libvorbis -.endif +.if !defined(LIBVORBIS_BUILDLINK3_MK) +LIBVORBIS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibvorbis} -BUILDLINK_PACKAGES+= libvorbis -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libvorbis - -.if !empty(LIBVORBIS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libvorbis+= libvorbis>=1.0.1 BUILDLINK_ABI_DEPENDS.libvorbis+= libvorbis>=1.1.0nb1 BUILDLINK_PKGSRCDIR.libvorbis?= ../../audio/libvorbis -.endif # LIBVORBIS_BUILDLINK3_MK .include "../../multimedia/libogg/buildlink3.mk" +.endif # LIBVORBIS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libvorbis diff --git a/audio/mac/buildlink3.mk b/audio/mac/buildlink3.mk index e05e481e315..039beb6102e 100644 --- a/audio/mac/buildlink3.mk +++ b/audio/mac/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/02/09 21:20:01 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:23:57 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MAC_BUILDLINK3_MK:= ${MAC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= mac -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= mac -.endif +.if !defined(MAC_BUILDLINK3_MK) +MAC_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmac} -BUILDLINK_PACKAGES+= mac -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mac - -.if ${MAC_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.mac+= mac>=3.99u4b5 BUILDLINK_PKGSRCDIR.mac?= ../../audio/mac -.endif # MAC_BUILDLINK3_MK +.endif # MAC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -mac diff --git a/audio/musicbrainz/buildlink3.mk b/audio/musicbrainz/buildlink3.mk index b45c617f7cb..7be5641d894 100644 --- a/audio/musicbrainz/buildlink3.mk +++ b/audio/musicbrainz/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:37 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:23:58 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MUSICBRAINZ_BUILDLINK3_MK:= ${MUSICBRAINZ_BUILDLINK3_MK}+ +BUILDLINK_TREE+= musicbrainz -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= musicbrainz -.endif +.if !defined(MUSICBRAINZ_BUILDLINK3_MK) +MUSICBRAINZ_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmusicbrainz} -BUILDLINK_PACKAGES+= musicbrainz -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}musicbrainz - -.if !empty(MUSICBRAINZ_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.musicbrainz+= musicbrainz>=2.0.2 BUILDLINK_ABI_DEPENDS.musicbrainz+= musicbrainz>=2.1.2nb2 BUILDLINK_PKGSRCDIR.musicbrainz?= ../../audio/musicbrainz -.endif # MUSICBRAINZ_BUILDLINK3_MK .include "../../textproc/expat/buildlink3.mk" +.endif # MUSICBRAINZ_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -musicbrainz diff --git a/audio/nas/buildlink3.mk b/audio/nas/buildlink3.mk index 75533db0d59..0a529b49841 100644 --- a/audio/nas/buildlink3.mk +++ b/audio/nas/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/12 17:21:52 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:23:58 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -NAS_BUILDLINK3_MK:= ${NAS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= nas -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= nas -.endif +.if !defined(NAS_BUILDLINK3_MK) +NAS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnas} -BUILDLINK_PACKAGES+= nas -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}nas - -.if !empty(NAS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.nas+= nas>=1.4.2 BUILDLINK_ABI_DEPENDS.nas+= nas>=1.7bnb2 BUILDLINK_PKGSRCDIR.nas?= ../../audio/nas -.endif # NAS_BUILDLINK3_MK +.endif # NAS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -nas diff --git a/audio/openal/buildlink3.mk b/audio/openal/buildlink3.mk index 7544145a4c5..bfd43de5a60 100644 --- a/audio/openal/buildlink3.mk +++ b/audio/openal/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.7 2007/01/03 07:03:15 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:23:58 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OPENAL_BUILDLINK3_MK:= ${OPENAL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= openal -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= openal -.endif +.if !defined(OPENAL_BUILDLINK3_MK) +OPENAL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenal} -BUILDLINK_PACKAGES+= openal -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openal - -.if !empty(OPENAL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.openal+= openal>=0.0.8 BUILDLINK_PKGSRCDIR.openal?= ../../audio/openal -.endif # OPENAL_BUILDLINK3_MK +.endif # OPENAL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -openal diff --git a/audio/portaudio-devel/buildlink3.mk b/audio/portaudio-devel/buildlink3.mk index 3f022c50421..a22d05422ca 100644 --- a/audio/portaudio-devel/buildlink3.mk +++ b/audio/portaudio-devel/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 23:10:37 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:23:58 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PORTAUDIO_DEVEL_BUILDLINK3_MK:= ${PORTAUDIO_DEVEL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= portaudio-devel -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= portaudio-devel -.endif +.if !defined(PORTAUDIO_DEVEL_BUILDLINK3_MK) +PORTAUDIO_DEVEL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nportaudio-devel} -BUILDLINK_PACKAGES+= portaudio-devel -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}portaudio-devel - -.if ${PORTAUDIO_DEVEL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.portaudio-devel+= portaudio-devel>=20060521 BUILDLINK_PKGSRCDIR.portaudio-devel?= ../../audio/portaudio-devel BUILDLINK_INCDIRS.portaudio-devel?= include/portaudio2 BUILDLINK_LIBDIRS.portaudio-devel?= lib/portaudio2 BUILDLINK_CPPFLAGS.portaudio-devel?= -I${BUILDLINK_PREFIX.portaudio-devel}/include/portaudio2 -.endif # PORTAUDIO_DEVEL_BUILDLINK3_MK +.endif # PORTAUDIO_DEVEL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -portaudio-devel diff --git a/audio/portaudio/buildlink3.mk b/audio/portaudio/buildlink3.mk index 5cba1b3d5ce..bcaa900b434 100644 --- a/audio/portaudio/buildlink3.mk +++ b/audio/portaudio/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:37 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:58 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PORTAUDIO_BUILDLINK3_MK:= ${PORTAUDIO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= portaudio -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= portaudio -.endif +.if !defined(PORTAUDIO_BUILDLINK3_MK) +PORTAUDIO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nportaudio} -BUILDLINK_PACKAGES+= portaudio -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}portaudio - -.if !empty(PORTAUDIO_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.portaudio+= portaudio>=18.1 BUILDLINK_ABI_DEPENDS.portaudio?= portaudio>=18.1nb2 BUILDLINK_PKGSRCDIR.portaudio?= ../../audio/portaudio -.endif # PORTAUDIO_BUILDLINK3_MK +.endif # PORTAUDIO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -portaudio diff --git a/audio/pulseaudio/buildlink3.mk b/audio/pulseaudio/buildlink3.mk index 4ad9fd2620d..c171b7457d3 100644 --- a/audio/pulseaudio/buildlink3.mk +++ b/audio/pulseaudio/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/01/03 19:34:02 gdt Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:23:58 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PULSEAUDIO_BUILDLINK3_MK:= ${PULSEAUDIO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pulseaudio -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= pulseaudio -.endif +.if !defined(PULSEAUDIO_BUILDLINK3_MK) +PULSEAUDIO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npulseaudio} -BUILDLINK_PACKAGES+= pulseaudio -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pulseaudio - -.if ${PULSEAUDIO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.pulseaudio+= pulseaudio>=0.9.13 BUILDLINK_PKGSRCDIR.pulseaudio?= ../../audio/pulseaudio -.endif # PULSEAUDIO_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" +.endif # PULSEAUDIO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pulseaudio diff --git a/audio/py-mpd/buildlink3.mk b/audio/py-mpd/buildlink3.mk index bf4fa38693a..5893655139c 100644 --- a/audio/py-mpd/buildlink3.mk +++ b/audio/py-mpd/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:09 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:23:58 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_MPD_BUILDLINK3_MK:= ${PY_MPD_BUILDLINK3_MK}+ +BUILDLINK_TREE+= py-mpd -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= py-mpd -.endif +.if !defined(PY_MPD_BUILDLINK3_MK) +PY_MPD_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-mpd} -BUILDLINK_PACKAGES+= py-mpd -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-mpd - -.if ${PY_MPD_BUILDLINK3_MK} == "+" .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.py-mpd+= ${PYPKGPREFIX}-mpd>=0.2.0 BUILDLINK_PKGSRCDIR.py-mpd?= ../../audio/py-mpd -.endif # PY_MPD_BUILDLINK3_MK +.endif # PY_MPD_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -py-mpd diff --git a/audio/py-mutagen/buildlink3.mk b/audio/py-mutagen/buildlink3.mk index 7ef36ed4fe4..986b0442b81 100644 --- a/audio/py-mutagen/buildlink3.mk +++ b/audio/py-mutagen/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 17:30:09 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:23:58 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_MUTAGEN_BUILDLINK3_MK:= ${PY_MUTAGEN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= py-mutagen -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= py-mutagen -.endif +.if !defined(PY_MUTAGEN_BUILDLINK3_MK) +PY_MUTAGEN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-mutagen} -BUILDLINK_PACKAGES+= py-mutagen -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-mutagen - -.if ${PY_MUTAGEN_BUILDLINK3_MK} == "+" . include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.py-mutagen+= ${PYPKGPREFIX}-mutagen>=1.9 BUILDLINK_PKGSRCDIR.py-mutagen?= ../../audio/py-mutagen -.endif # PY_MUTAGEN_BUILDLINK3_MK +.endif # PY_MUTAGEN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -py-mutagen diff --git a/audio/py-ogg/buildlink3.mk b/audio/py-ogg/buildlink3.mk index 110603cc383..afa969149a1 100644 --- a/audio/py-ogg/buildlink3.mk +++ b/audio/py-ogg/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 17:30:09 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:23:58 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PYOGG_BUILDLINK3_MK:= ${PYOGG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pyogg -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pyogg -.endif +.if !defined(PYOGG_BUILDLINK3_MK) +PYOGG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyogg} -BUILDLINK_PACKAGES+= pyogg -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyogg - -.if !empty(PYOGG_BUILDLINK3_MK:M+) .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pyogg+= ${PYPKGPREFIX}-ogg>=1.3 BUILDLINK_ABI_DEPENDS.pyogg?= ${PYPKGPREFIX}-ogg>=1.3nb2 BUILDLINK_PKGSRCDIR.pyogg?= ../../audio/py-ogg -.endif # PYOGG_BUILDLINK3_MK .include "../../multimedia/libogg/buildlink3.mk" +.endif # PYOGG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pyogg diff --git a/audio/rplay/buildlink3.mk b/audio/rplay/buildlink3.mk index dc915123f8e..3a3732c838e 100644 --- a/audio/rplay/buildlink3.mk +++ b/audio/rplay/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.9 2009/02/03 06:11:12 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:23:59 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -RPLAY_BUILDLINK3_MK:= ${RPLAY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= rplay -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= rplay -.endif +.if !defined(RPLAY_BUILDLINK3_MK) +RPLAY_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrplay} -BUILDLINK_PACKAGES+= rplay -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rplay - -.if !empty(RPLAY_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.rplay+= rplay>=3.3.2nb1 BUILDLINK_ABI_DEPENDS.rplay+= rplay>=3.3.2nb5 BUILDLINK_PKGSRCDIR.rplay?= ../../audio/rplay -.endif # RPLAY_BUILDLINK3_MK .include "../../audio/gsm/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../devel/rx/buildlink3.mk" +.endif # RPLAY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -rplay diff --git a/audio/speex/buildlink3.mk b/audio/speex/buildlink3.mk index 4d86d272087..2047dd930e8 100644 --- a/audio/speex/buildlink3.mk +++ b/audio/speex/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.11 2008/11/08 21:06:46 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:23:59 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SPEEX_BUILDLINK3_MK:= ${SPEEX_BUILDLINK3_MK}+ +BUILDLINK_TREE+= speex -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= speex -.endif +.if !defined(SPEEX_BUILDLINK3_MK) +SPEEX_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nspeex} -BUILDLINK_PACKAGES+= speex -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}speex - -.if !empty(SPEEX_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.speex+= speex>=1.2rc1 BUILDLINK_PKGSRCDIR.speex?= ../../audio/speex -.endif # SPEEX_BUILDLINK3_MK .include "../../multimedia/libogg/buildlink3.mk" +.endif # SPEEX_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -speex diff --git a/audio/streamtuner/buildlink3.mk b/audio/streamtuner/buildlink3.mk index bd9fa79fd77..1f300b383f5 100644 --- a/audio/streamtuner/buildlink3.mk +++ b/audio/streamtuner/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.12 2008/01/18 05:06:21 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:23:59 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -STREAMTUNER_BUILDLINK3_MK:= ${STREAMTUNER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= streamtuner -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= streamtuner -.endif +.if !defined(STREAMTUNER_BUILDLINK3_MK) +STREAMTUNER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nstreamtuner} -BUILDLINK_PACKAGES+= streamtuner -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}streamtuner - -.if !empty(STREAMTUNER_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.streamtuner+= streamtuner>=0.99 BUILDLINK_ABI_DEPENDS.streamtuner?= streamtuner>=0.99.99nb7 BUILDLINK_PKGSRCDIR.streamtuner?= ../../audio/streamtuner -.endif # STREAMTUNER_BUILDLINK3_MK .include "../../www/curl/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # STREAMTUNER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -streamtuner diff --git a/audio/sweep/buildlink3.mk b/audio/sweep/buildlink3.mk index 87b97587176..18f2aab5db4 100644 --- a/audio/sweep/buildlink3.mk +++ b/audio/sweep/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.12 2008/11/08 21:13:27 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:23:59 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SWEEP_BUILDLINK3_MK:= ${SWEEP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= sweep -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= sweep -.endif +.if !defined(SWEEP_BUILDLINK3_MK) +SWEEP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsweep} -BUILDLINK_PACKAGES+= sweep -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sweep - -.if !empty(SWEEP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.sweep+= sweep>=0.8.2nb6 BUILDLINK_ABI_DEPENDS.sweep+= sweep>=0.9.3nb1 BUILDLINK_PKGSRCDIR.sweep?= ../../audio/sweep -.endif # SWEEP_BUILDLINK3_MK .include "../../audio/libmad/buildlink3.mk" .include "../../audio/libsamplerate/buildlink3.mk" @@ -25,5 +17,6 @@ BUILDLINK_PKGSRCDIR.sweep?= ../../audio/sweep .include "../../converters/libiconv/buildlink3.mk" .include "../../databases/tdb/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" +.endif # SWEEP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -sweep diff --git a/audio/taglib/buildlink3.mk b/audio/taglib/buildlink3.mk index 9f9231dca59..1fdba870748 100644 --- a/audio/taglib/buildlink3.mk +++ b/audio/taglib/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:37 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:23:59 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TAGLIB_BUILDLINK3_MK:= ${TAGLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= taglib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= taglib -.endif +.if !defined(TAGLIB_BUILDLINK3_MK) +TAGLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntaglib} -BUILDLINK_PACKAGES+= taglib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}taglib - -.if !empty(TAGLIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.taglib+= taglib>=1.0 BUILDLINK_ABI_DEPENDS.taglib+= taglib>=1.3 BUILDLINK_PKGSRCDIR.taglib?= ../../audio/taglib -.endif # TAGLIB_BUILDLINK3_MK +.endif # TAGLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -taglib diff --git a/audio/tremor/buildlink3.mk b/audio/tremor/buildlink3.mk index dbd49bb8143..84c19214874 100644 --- a/audio/tremor/buildlink3.mk +++ b/audio/tremor/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:37 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:59 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TREMOR_BUILDLINK3_MK:= ${TREMOR_BUILDLINK3_MK}+ +BUILDLINK_TREE+= tremor -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= tremor -.endif +.if !defined(TREMOR_BUILDLINK3_MK) +TREMOR_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntremor} -BUILDLINK_PACKAGES+= tremor -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tremor - -.if !empty(TREMOR_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.tremor+= tremor>=1.0.2 BUILDLINK_ABI_DEPENDS.tremor+= tremor>=1.0.2nb5 BUILDLINK_PKGSRCDIR.tremor?= ../../audio/tremor -.endif # TREMOR_BUILDLINK3_MK +.endif # TREMOR_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -tremor diff --git a/audio/twolame/buildlink3.mk b/audio/twolame/buildlink3.mk index fb16554aa06..4cbae6fb336 100644 --- a/audio/twolame/buildlink3.mk +++ b/audio/twolame/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.4 2007/01/07 12:25:53 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:23:59 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TWOLAME_BUILDLINK3_MK:= ${TWOLAME_BUILDLINK3_MK}+ +BUILDLINK_TREE+= twolame -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= twolame -.endif +.if !defined(TWOLAME_BUILDLINK3_MK) +TWOLAME_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntwolame} -BUILDLINK_PACKAGES+= twolame -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}twolame - -.if ${TWOLAME_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.twolame+= twolame>=0.3.7 BUILDLINK_ABI_DEPENDS.twolame?= twolame>=0.3.7nb1 BUILDLINK_PKGSRCDIR.twolame?= ../../audio/twolame -.endif # TWOLAME_BUILDLINK3_MK .include "../../audio/libsndfile/buildlink3.mk" +.endif # TWOLAME_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -twolame diff --git a/audio/wavpack/buildlink3.mk b/audio/wavpack/buildlink3.mk index ba66fc9f78e..ba76f99ba0d 100644 --- a/audio/wavpack/buildlink3.mk +++ b/audio/wavpack/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.2 2007/05/09 23:43:05 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:23:59 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -WAVPACK_BUILDLINK3_MK:= ${WAVPACK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= wavpack -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= wavpack -.endif +.if !defined(WAVPACK_BUILDLINK3_MK) +WAVPACK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nwavpack} -BUILDLINK_PACKAGES+= wavpack -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wavpack - -.if ${WAVPACK_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.wavpack+= wavpack>=4.41.0 BUILDLINK_PKGSRCDIR.wavpack?= ../../audio/wavpack -.endif # WAVPACK_BUILDLINK3_MK +.endif # WAVPACK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -wavpack diff --git a/audio/wsoundserver/buildlink3.mk b/audio/wsoundserver/buildlink3.mk index 436dae90b8b..d2243962e7a 100644 --- a/audio/wsoundserver/buildlink3.mk +++ b/audio/wsoundserver/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:37 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:23:59 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -WSOUNDSERVER_BUILDLINK3_MK:= ${WSOUNDSERVER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= wsoundserver -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= wsoundserver -.endif +.if !defined(WSOUNDSERVER_BUILDLINK3_MK) +WSOUNDSERVER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nwsoundserver} -BUILDLINK_PACKAGES+= wsoundserver -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wsoundserver - -.if !empty(WSOUNDSERVER_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.wsoundserver+= wsoundserver>=0.4.0nb4 BUILDLINK_ABI_DEPENDS.wsoundserver+= wsoundserver>=0.4.0nb8 BUILDLINK_PKGSRCDIR.wsoundserver?= ../../audio/wsoundserver -.endif # WSOUNDSERVER_BUILDLINK3_MK .include "../../audio/libaudiofile/buildlink3.mk" .include "../../devel/libdockapp/buildlink3.mk" .include "../../devel/libproplist/buildlink3.mk" .include "../../wm/windowmaker/buildlink3.mk" +.endif # WSOUNDSERVER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -wsoundserver diff --git a/audio/xfce4-mixer/buildlink3.mk b/audio/xfce4-mixer/buildlink3.mk index 5506bce7cce..e7713b39ec9 100644 --- a/audio/xfce4-mixer/buildlink3.mk +++ b/audio/xfce4-mixer/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.22 2008/12/18 16:46:29 hira Exp $ +# $NetBSD: buildlink3.mk,v 1.23 2009/03/20 19:23:59 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_MIXER_BUILDLINK3_MK:= ${XFCE4_MIXER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-mixer -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-mixer -.endif +.if !defined(XFCE4_MIXER_BUILDLINK3_MK) +XFCE4_MIXER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-mixer} -BUILDLINK_PACKAGES+= xfce4-mixer -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-mixer - -.if ${XFCE4_MIXER_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-mixer+= xfce4-mixer>=4.4.3nb1 BUILDLINK_PKGSRCDIR.xfce4-mixer?= ../../audio/xfce4-mixer -.endif # XFCE4_MIXER_BUILDLINK3_MK .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_MIXER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-mixer diff --git a/audio/xfce4-xmms-plugin/buildlink3.mk b/audio/xfce4-xmms-plugin/buildlink3.mk index 935d2c5f373..6e73f3052a5 100644 --- a/audio/xfce4-xmms-plugin/buildlink3.mk +++ b/audio/xfce4-xmms-plugin/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.16 2007/10/30 08:15:18 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:00 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_XMMS_PLUGIN_BUILDLINK3_MK:= ${XFCE4_XMMS_PLUGIN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-xmms-plugin -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-xmms-plugin -.endif +.if !defined(XFCE4_XMMS_PLUGIN_BUILDLINK3_MK) +XFCE4_XMMS_PLUGIN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-xmms-plugin} -BUILDLINK_PACKAGES+= xfce4-xmms-plugin -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-xmms-plugin - -.if ${XFCE4_XMMS_PLUGIN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-xmms-plugin+= xfce4-xmms-plugin>=0.5.1 BUILDLINK_PKGSRCDIR.xfce4-xmms-plugin?= ../../audio/xfce4-xmms-plugin -.endif # XFCE4_XMMS_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_XMMS_PLUGIN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-xmms-plugin diff --git a/audio/xmms-meta-input/buildlink3.mk b/audio/xmms-meta-input/buildlink3.mk index 3128cecd78e..eff8bd8cef4 100644 --- a/audio/xmms-meta-input/buildlink3.mk +++ b/audio/xmms-meta-input/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:00 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XMMS_META_INPUT_BUILDLINK3_MK:= ${XMMS_META_INPUT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xmms-meta-input -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= xmms-meta-input -.endif +.if !defined(XMMS_META_INPUT_BUILDLINK3_MK) +XMMS_META_INPUT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxmms-meta-input} -BUILDLINK_PACKAGES+= xmms-meta-input -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xmms-meta-input - -.if !empty(XMMS_META_INPUT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.xmms-meta-input+= xmms-meta-input>=0.4 BUILDLINK_ABI_DEPENDS.xmms-meta-input?= xmms-meta-input>=0.4nb2 BUILDLINK_PKGSRCDIR.xmms-meta-input?= ../../audio/xmms-meta-input -.endif # XMMS_META_INPUT_BUILDLINK3_MK .include "../../audio/xmms/buildlink3.mk" +.endif # XMMS_META_INPUT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xmms-meta-input diff --git a/audio/xmms/buildlink3.mk b/audio/xmms/buildlink3.mk index 1179f05cc39..e8f7c16dd73 100644 --- a/audio/xmms/buildlink3.mk +++ b/audio/xmms/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/16 23:03:20 seb Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:00 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XMMS_BUILDLINK3_MK:= ${XMMS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xmms -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= xmms -.endif +.if !defined(XMMS_BUILDLINK3_MK) +XMMS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxmms} -BUILDLINK_PACKAGES+= xmms -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xmms - -.if !empty(XMMS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.xmms+= xmms>=1.2.7nb10 BUILDLINK_ABI_DEPENDS.xmms?= xmms>=1.2.10nb6 BUILDLINK_PKGSRCDIR.xmms?= ../../audio/xmms -.endif # XMMS_BUILDLINK3_MK PTHREAD_OPTS+= require @@ -26,5 +18,6 @@ PTHREAD_OPTS+= require .include "../../x11/gtk/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.endif # XMMS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xmms diff --git a/cad/gplcver/buildlink3.mk b/cad/gplcver/buildlink3.mk index e7246ed9532..ba4382b6839 100644 --- a/cad/gplcver/buildlink3.mk +++ b/cad/gplcver/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:00 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GPLCVER_BUILDLINK3_MK:= ${GPLCVER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gplcver -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gplcver -.endif +.if !defined(GPLCVER_BUILDLINK3_MK) +GPLCVER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngplcver} -BUILDLINK_PACKAGES+= gplcver -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gplcver - -.if !empty(GPLCVER_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gplcver+= gplcver>=2.11a BUILDLINK_PKGSRCDIR.gplcver?= ../../cad/gplcver -.endif # GPLCVER_BUILDLINK3_MK +.endif # GPLCVER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gplcver diff --git a/cad/libgeda/buildlink3.mk b/cad/libgeda/buildlink3.mk index 32871b05460..be2c2faaf81 100644 --- a/cad/libgeda/buildlink3.mk +++ b/cad/libgeda/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.25 2009/02/01 05:20:00 dmcmahill Exp $ +# $NetBSD: buildlink3.mk,v 1.26 2009/03/20 19:24:00 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGEDA_BUILDLINK3_MK:= ${LIBGEDA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgeda -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libgeda -.endif +.if !defined(LIBGEDA_BUILDLINK3_MK) +LIBGEDA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgeda} -BUILDLINK_PACKAGES+= libgeda -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgeda - -.if !empty(LIBGEDA_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libgeda+= libgeda-1.4.3{,nb[0-9]*} BUILDLINK_ABI_DEPENDS.libgeda?= libgeda-1.4.3{,nb[0-9]*} BUILDLINK_PKGSRCDIR.libgeda?= ../../cad/libgeda -.endif # LIBGEDA_BUILDLINK3_MK .include "../../graphics/gd/buildlink3.mk" .include "../../lang/guile/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # LIBGEDA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgeda diff --git a/cad/libwcalc/buildlink3.mk b/cad/libwcalc/buildlink3.mk index c3c30f4622f..e5e01c4d5cd 100644 --- a/cad/libwcalc/buildlink3.mk +++ b/cad/libwcalc/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:00 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBWCALC_BUILDLINK3_MK:= ${LIBWCALC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libwcalc -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libwcalc -.endif +.if !defined(LIBWCALC_BUILDLINK3_MK) +LIBWCALC_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibwcalc} -BUILDLINK_PACKAGES+= libwcalc -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libwcalc - -.if !empty(LIBWCALC_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libwcalc+= libwcalc-1.0* BUILDLINK_ABI_DEPENDS.libwcalc?= libwcalc>=1.0nb1 BUILDLINK_PKGSRCDIR.libwcalc?= ../../cad/libwcalc -.endif # LIBWCALC_BUILDLINK3_MK .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" +.endif # LIBWCALC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libwcalc diff --git a/cad/verilog-current/buildlink3.mk b/cad/verilog-current/buildlink3.mk index cf053840531..79bfd4767c6 100644 --- a/cad/verilog-current/buildlink3.mk +++ b/cad/verilog-current/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/08/11 13:28:08 dmcmahill Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:00 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -VERILOG_CURRENT_BUILDLINK3_MK:= ${VERILOG_CURRENT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= verilog-current -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= verilog-current -.endif +.if !defined(VERILOG_CURRENT_BUILDLINK3_MK) +VERILOG_CURRENT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nverilog-current} -BUILDLINK_PACKAGES+= verilog-current -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}verilog-current - -.if !empty(VERILOG_CURRENT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.verilog-current+= verilog-current>=20021019 BUILDLINK_ABI_DEPENDS.verilog-current?= verilog-current>=20060809 BUILDLINK_PKGSRCDIR.verilog-current?= ../../cad/verilog-current -.endif # VERILOG_CURRENT_BUILDLINK3_MK +.endif # VERILOG_CURRENT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -verilog-current diff --git a/cad/verilog/buildlink3.mk b/cad/verilog/buildlink3.mk index b867dd46409..52d1cadd260 100644 --- a/cad/verilog/buildlink3.mk +++ b/cad/verilog/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:00 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -VERILOG_BUILDLINK3_MK:= ${VERILOG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= verilog -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= verilog -.endif +.if !defined(VERILOG_BUILDLINK3_MK) +VERILOG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nverilog} -BUILDLINK_PACKAGES+= verilog -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}verilog - -.if !empty(VERILOG_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.verilog+= verilog>=0.8.1nb1 BUILDLINK_PKGSRCDIR.verilog?= ../../cad/verilog -.endif # VERILOG_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" .include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/gperf/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" +.endif # VERILOG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -verilog diff --git a/chat/ekg/buildlink3.mk b/chat/ekg/buildlink3.mk index 8cb024504aa..0e9a825d181 100644 --- a/chat/ekg/buildlink3.mk +++ b/chat/ekg/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.19 2008/03/05 15:03:18 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2009/03/20 19:24:00 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EKG_BUILDLINK3_MK:= ${EKG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ekg -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ekg -.endif +.if !defined(EKG_BUILDLINK3_MK) +EKG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nekg} -BUILDLINK_PACKAGES+= ekg -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ekg - -.if !empty(EKG_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ekg+= ekg>=1.6 BUILDLINK_ABI_DEPENDS.ekg+= ekg>=1.7nb1 BUILDLINK_PKGSRCDIR.ekg?= ../../chat/ekg -.endif # EKG_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" +.endif # EKG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ekg diff --git a/chat/empathy/buildlink3.mk b/chat/empathy/buildlink3.mk index 683f0f2413d..a51eedb1092 100644 --- a/chat/empathy/buildlink3.mk +++ b/chat/empathy/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1 2009/01/13 09:08:18 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:00 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EMPATHY_BUILDLINK3_MK:= ${EMPATHY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= empathy -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= empathy -.endif +.if !defined(EMPATHY_BUILDLINK3_MK) +EMPATHY_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nempathy} -BUILDLINK_PACKAGES+= empathy -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}empathy - -.if ${EMPATHY_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.empathy+= empathy>=2.24.1nb1 BUILDLINK_PKGSRCDIR.empathy?= ../../chat/empathy -.endif # EMPATHY_BUILDLINK3_MK .include "../../chat/telepathy-mission-control/buildlink3.mk" .include "../../devel/libglade/buildlink3.mk" @@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.empathy?= ../../chat/empathy .include "../../sysutils/dbus/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # EMPATHY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -empathy diff --git a/chat/gale/buildlink3.mk b/chat/gale/buildlink3.mk index ebc6008fee2..9d7e3f24066 100644 --- a/chat/gale/buildlink3.mk +++ b/chat/gale/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2008/01/18 05:06:24 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:01 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GALE_BUILDLINK3_MK:= ${GALE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gale -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gale -.endif +.if !defined(GALE_BUILDLINK3_MK) +GALE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngale} -BUILDLINK_PACKAGES+= gale -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gale - -.if !empty(GALE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gale+= gale>=0.99f BUILDLINK_ABI_DEPENDS.gale?= gale>=0.99fnb2 BUILDLINK_PKGSRCDIR.gale?= ../../chat/gale -.endif # GALE_BUILDLINK3_MK .include "../../devel/boehm-gc/buildlink3.mk" .include "../../devel/glib/buildlink3.mk" @@ -24,5 +16,6 @@ BUILDLINK_PKGSRCDIR.gale?= ../../chat/gale .include "../../net/adns/buildlink3.mk" .include "../../security/rsaref/buildlink3.mk" .include "../../www/libwww/buildlink3.mk" +.endif # GALE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gale diff --git a/chat/jabberd/buildlink3.mk b/chat/jabberd/buildlink3.mk index 771a4974f8e..0a1104d38dd 100644 --- a/chat/jabberd/buildlink3.mk +++ b/chat/jabberd/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.13 2008/01/18 05:06:24 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:01 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -JABBERD_BUILDLINK3_MK:= ${JABBERD_BUILDLINK3_MK}+ +BUILDLINK_TREE+= jabberd -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= jabberd -.endif +.if !defined(JABBERD_BUILDLINK3_MK) +JABBERD_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Njabberd} -BUILDLINK_PACKAGES+= jabberd -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}jabberd - -.if !empty(JABBERD_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.jabberd+= jabberd>=1.4.2 BUILDLINK_ABI_DEPENDS.jabberd?= jabberd>=1.4.2nb6 BUILDLINK_PKGSRCDIR.jabberd?= ../../chat/jabberd -.endif # JABBERD_BUILDLINK3_MK .include "../../security/openssl/buildlink3.mk" +.endif # JABBERD_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -jabberd diff --git a/chat/libirc/buildlink3.mk b/chat/libirc/buildlink3.mk index a8439a25184..595bd7458f7 100644 --- a/chat/libirc/buildlink3.mk +++ b/chat/libirc/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:01 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBIRC_BUILDLINK3_MK:= ${LIBIRC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libirc -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libirc -.endif +.if !defined(LIBIRC_BUILDLINK3_MK) +LIBIRC_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibirc} -BUILDLINK_PACKAGES+= libirc -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libirc - -.if !empty(LIBIRC_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libirc+= libirc>=0.2nb1 BUILDLINK_ABI_DEPENDS.libirc+= libirc>=0.2nb2 BUILDLINK_PKGSRCDIR.libirc?= ../../chat/libirc -.endif # LIBIRC_BUILDLINK3_MK .include "../../devel/glib/buildlink3.mk" +.endif # LIBIRC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libirc diff --git a/chat/libmsn/buildlink3.mk b/chat/libmsn/buildlink3.mk index 76a378db949..61e60e5aa0d 100644 --- a/chat/libmsn/buildlink3.mk +++ b/chat/libmsn/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/10 08:56:39 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:01 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBMSN_BUILDLINK3_MK:= ${LIBMSN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libmsn -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libmsn -.endif +.if !defined(LIBMSN_BUILDLINK3_MK) +LIBMSN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmsn} -BUILDLINK_PACKAGES+= libmsn -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmsn - -.if ${LIBMSN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libmsn+= libmsn>=4.0beta2 BUILDLINK_PKGSRCDIR.libmsn?= ../../chat/libmsn -.endif # LIBMSN_BUILDLINK3_MK .include "../../security/openssl/buildlink3.mk" +.endif # LIBMSN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libmsn diff --git a/chat/libotr/buildlink3.mk b/chat/libotr/buildlink3.mk index 34b310c1be3..457a67fdd3c 100644 --- a/chat/libotr/buildlink3.mk +++ b/chat/libotr/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.10 2007/11/11 21:53:57 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:01 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBOTR_BUILDLINK3_MK:= ${LIBOTR_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libotr -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libotr -.endif +.if !defined(LIBOTR_BUILDLINK3_MK) +LIBOTR_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibotr} -BUILDLINK_PACKAGES+= libotr -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libotr - -.if !empty(LIBOTR_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libotr+= libotr>=3.0.0 BUILDLINK_PKGSRCDIR.libotr?= ../../chat/libotr -.endif # LIBOTR_BUILDLINK3_MK .include "../../security/libgcrypt/buildlink3.mk" +.endif # LIBOTR_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libotr diff --git a/chat/libpurple/buildlink3.mk b/chat/libpurple/buildlink3.mk index d242758b49a..7d875742db5 100644 --- a/chat/libpurple/buildlink3.mk +++ b/chat/libpurple/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.12 2008/08/19 18:18:10 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:01 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBPURPLE_BUILDLINK3_MK:= ${LIBPURPLE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libpurple -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libpurple -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibpurple} -BUILDLINK_PACKAGES+= libpurple -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libpurple +.if !defined(LIBPURPLE_BUILDLINK3_MK) +LIBPURPLE_BUILDLINK3_MK:= -.if ${LIBPURPLE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libpurple+= libpurple>=2.5.0 BUILDLINK_PKGSRCDIR.libpurple?= ../../chat/libpurple -.endif # LIBPURPLE_BUILDLINK3_MK pkgbase := libpurple .include "../../mk/pkg-build-options.mk" @@ -24,5 +16,6 @@ pkgbase := libpurple . include "../../sysutils/dbus-glib/buildlink3.mk" . include "../../sysutils/py-dbus/buildlink3.mk" .endif +.endif # LIBPURPLE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libpurple diff --git a/chat/libtelepathy/buildlink3.mk b/chat/libtelepathy/buildlink3.mk index cfdfff99778..a90d45df0d7 100644 --- a/chat/libtelepathy/buildlink3.mk +++ b/chat/libtelepathy/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/14 22:58:06 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:01 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBTELEPATHY_BUILDLINK3_MK:= ${LIBTELEPATHY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libtelepathy -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libtelepathy -.endif +.if !defined(LIBTELEPATHY_BUILDLINK3_MK) +LIBTELEPATHY_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibtelepathy} -BUILDLINK_PACKAGES+= libtelepathy -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libtelepathy - -.if ${LIBTELEPATHY_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libtelepathy+= libtelepathy>=0.3.3 BUILDLINK_PKGSRCDIR.libtelepathy?= ../../chat/libtelepathy -.endif # LIBTELEPATHY_BUILDLINK3_MK .include "../../chat/telepathy-glib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" +.endif # LIBTELEPATHY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libtelepathy diff --git a/chat/libtlen/buildlink3.mk b/chat/libtlen/buildlink3.mk index 2870ee1647a..f82ad4c84f6 100644 --- a/chat/libtlen/buildlink3.mk +++ b/chat/libtlen/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:01 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBTLEN_BUILDLINK3_MK:= ${LIBTLEN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libtlen -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libtlen -.endif +.if !defined(LIBTLEN_BUILDLINK3_MK) +LIBTLEN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibtlen} -BUILDLINK_PACKAGES+= libtlen -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libtlen - -.if !empty(LIBTLEN_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libtlen+= libtlen>=20040212 BUILDLINK_ABI_DEPENDS.libtlen+= libtlen>=20040212nb1 BUILDLINK_PKGSRCDIR.libtlen?= ../../chat/libtlen -.endif # LIBTLEN_BUILDLINK3_MK +.endif # LIBTLEN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libtlen diff --git a/chat/loudmouth/buildlink3.mk b/chat/loudmouth/buildlink3.mk index 213481a46f8..fcaf84117d6 100644 --- a/chat/loudmouth/buildlink3.mk +++ b/chat/loudmouth/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.16 2008/03/06 14:53:48 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:01 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LOUDMOUTH_BUILDLINK3_MK:= ${LOUDMOUTH_BUILDLINK3_MK}+ +BUILDLINK_TREE+= loudmouth -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= loudmouth -.endif +.if !defined(LOUDMOUTH_BUILDLINK3_MK) +LOUDMOUTH_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nloudmouth} -BUILDLINK_PACKAGES+= loudmouth -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}loudmouth - -.if !empty(LOUDMOUTH_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.loudmouth+= loudmouth>=1.0 BUILDLINK_ABI_DEPENDS.loudmouth+= loudmouth>=1.2.3nb1 BUILDLINK_PKGSRCDIR.loudmouth?= ../../chat/loudmouth -.endif # LOUDMOUTH_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../security/gnutls/buildlink3.mk" +.endif # LOUDMOUTH_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -loudmouth diff --git a/chat/meanwhile/buildlink3.mk b/chat/meanwhile/buildlink3.mk index 1cf6b7636af..8cdda8eb7e3 100644 --- a/chat/meanwhile/buildlink3.mk +++ b/chat/meanwhile/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/08/13 05:29:27 dan Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:01 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MEANWHILE_BUILDLINK3_MK:= ${MEANWHILE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= meanwhile -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= meanwhile -.endif +.if !defined(MEANWHILE_BUILDLINK3_MK) +MEANWHILE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmeanwhile} -BUILDLINK_PACKAGES+= meanwhile -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}meanwhile - -.if ${MEANWHILE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.meanwhile+= meanwhile>=1.0.2 BUILDLINK_PKGSRCDIR.meanwhile?= ../../chat/meanwhile -.endif # MEANWHILE_BUILDLINK3_MK +.endif # MEANWHILE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -meanwhile diff --git a/chat/pidgin/buildlink3.mk b/chat/pidgin/buildlink3.mk index 5a4b7b9ba76..4c94d2f34d7 100644 --- a/chat/pidgin/buildlink3.mk +++ b/chat/pidgin/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.11 2008/09/16 19:59:46 abs Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:01 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PIDGIN_BUILDLINK3_MK:= ${PIDGIN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pidgin -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= pidgin -.endif +.if !defined(PIDGIN_BUILDLINK3_MK) +PIDGIN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npidgin} -BUILDLINK_PACKAGES+= pidgin -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pidgin - -.if ${PIDGIN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.pidgin+= pidgin>=2.5.1 BUILDLINK_PKGSRCDIR.pidgin?= ../../chat/pidgin -.endif # PIDGIN_BUILDLINK3_MK .include "../../chat/libpurple/buildlink3.mk" +.endif # PIDGIN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pidgin diff --git a/chat/riece/buildlink3.mk b/chat/riece/buildlink3.mk index 7c9608d3a7d..95086d30e26 100644 --- a/chat/riece/buildlink3.mk +++ b/chat/riece/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1 2008/10/06 07:24:31 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:02 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -RIECE_BUILDLINK3_MK:= ${RIECE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= riece -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= riece -.endif +.if !defined(RIECE_BUILDLINK3_MK) +RIECE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nriece} -BUILDLINK_PACKAGES+= riece -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}riece - -.if ${RIECE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.riece+= ${EMACS_PKGNAME_PREFIX}riece>=4 BUILDLINK_PKGSRCDIR.riece?= ../../chat/riece -.endif # RIECE_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.riece= ${EGREP} '.*\.el$$|.*\.elc$$' +.endif # RIECE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -riece diff --git a/chat/telepathy-glib/buildlink3.mk b/chat/telepathy-glib/buildlink3.mk index 4efd0aa0b8c..92ebf04f423 100644 --- a/chat/telepathy-glib/buildlink3.mk +++ b/chat/telepathy-glib/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/14 22:57:10 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:02 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TELEPATHY_GLIB_BUILDLINK3_MK:= ${TELEPATHY_GLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= telepathy-glib -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= telepathy-glib -.endif +.if !defined(TELEPATHY_GLIB_BUILDLINK3_MK) +TELEPATHY_GLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntelepathy-glib} -BUILDLINK_PACKAGES+= telepathy-glib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}telepathy-glib - -.if ${TELEPATHY_GLIB_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.telepathy-glib+= telepathy-glib>=0.7.18 BUILDLINK_PKGSRCDIR.telepathy-glib?= ../../chat/telepathy-glib -.endif # TELEPATHY_GLIB_BUILDLINK3_MK PRINT_PLIST_AWK+= /^@dirrm include\/telepathy-1.0$$/ \ { print "@comment in telepathy-glib: " $$0; next; } @@ -22,5 +14,6 @@ PRINT_PLIST_AWK+= /^@dirrm include\/telepathy-1.0$$/ \ .include "../../devel/glib2/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" +.endif # TELEPATHY_GLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -telepathy-glib diff --git a/chat/telepathy-mission-control/buildlink3.mk b/chat/telepathy-mission-control/buildlink3.mk index 0002b775e25..d6e9ad94d8c 100644 --- a/chat/telepathy-mission-control/buildlink3.mk +++ b/chat/telepathy-mission-control/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/14 22:59:03 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:02 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TELEPATHY_MISSION_CONTROL_BUILDLINK3_MK:= ${TELEPATHY_MISSION_CONTROL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= telepathy-mission-control -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= telepathy-mission-control -.endif +.if !defined(TELEPATHY_MISSION_CONTROL_BUILDLINK3_MK) +TELEPATHY_MISSION_CONTROL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntelepathy-mission-control} -BUILDLINK_PACKAGES+= telepathy-mission-control -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}telepathy-mission-control - -.if ${TELEPATHY_MISSION_CONTROL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.telepathy-mission-control+= telepathy-mission-control>=4.67 BUILDLINK_PKGSRCDIR.telepathy-mission-control?= ../../chat/telepathy-mission-control -.endif # TELEPATHY_MISSION_CONTROL_BUILDLINK3_MK .include "../../chat/libtelepathy/buildlink3.mk" .include "../../chat/telepathy-glib/buildlink3.mk" @@ -22,5 +14,6 @@ BUILDLINK_PKGSRCDIR.telepathy-mission-control?= ../../chat/telepathy-mission-con .include "../../security/gnome-keyring/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" +.endif # TELEPATHY_MISSION_CONTROL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -telepathy-mission-control diff --git a/chat/zephyr/buildlink3.mk b/chat/zephyr/buildlink3.mk index f3e26f29ce8..5035a2fca94 100644 --- a/chat/zephyr/buildlink3.mk +++ b/chat/zephyr/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:02 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ZEPHYR_BUILDLINK3_MK:= ${ZEPHYR_BUILDLINK3_MK}+ +BUILDLINK_TREE+= zephyr -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= zephyr -.endif +.if !defined(ZEPHYR_BUILDLINK3_MK) +ZEPHYR_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nzephyr} -BUILDLINK_PACKAGES+= zephyr -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}zephyr - -.if !empty(ZEPHYR_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.zephyr+= zephyr>=20010518nb1 BUILDLINK_ABI_DEPENDS.zephyr?= zephyr>=20010518nb4 BUILDLINK_PKGSRCDIR.zephyr?= ../../chat/zephyr BUILDLINK_DEPMETHOD.zephyr?= build -.endif # ZEPHYR_BUILDLINK3_MK +.endif # ZEPHYR_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -zephyr diff --git a/comms/gnome-pilot/buildlink3.mk b/comms/gnome-pilot/buildlink3.mk index 340abc55481..79d58ad27ea 100644 --- a/comms/gnome-pilot/buildlink3.mk +++ b/comms/gnome-pilot/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.20 2008/09/06 20:54:31 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2009/03/20 19:24:02 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNOME_PILOT_BUILDLINK3_MK:= ${GNOME_PILOT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnome-pilot -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnome-pilot -.endif +.if !defined(GNOME_PILOT_BUILDLINK3_MK) +GNOME_PILOT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-pilot} -BUILDLINK_PACKAGES+= gnome-pilot -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-pilot - -.if !empty(GNOME_PILOT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gnome-pilot?= gnome-pilot>=2.0.12nb2 BUILDLINK_ABI_DEPENDS.gnome-pilot?= gnome-pilot>=2.0.15nb6 BUILDLINK_PKGSRCDIR.gnome-pilot?= ../../comms/gnome-pilot -.endif # GNOME_PILOT_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../comms/pilot-link-libs/buildlink3.mk" .include "../../devel/libglade/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gnome-panel/buildlink3.mk" +.endif # GNOME_PILOT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnome-pilot diff --git a/comms/jpilot/buildlink3.mk b/comms/jpilot/buildlink3.mk index fd7ce54ead2..9484efa0f59 100644 --- a/comms/jpilot/buildlink3.mk +++ b/comms/jpilot/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.12 2008/10/09 19:01:57 bad Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:02 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -JPILOT_BUILDLINK3_MK:= ${JPILOT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= jpilot -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= jpilot -.endif +.if !defined(JPILOT_BUILDLINK3_MK) +JPILOT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Njpilot} -BUILDLINK_PACKAGES+= jpilot -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}jpilot - -.if !empty(JPILOT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.jpilot+= jpilot>=1.6.0 BUILDLINK_ABI_DEPENDS.jpilot+= jpilot>=1.6.0 BUILDLINK_PKGSRCDIR.jpilot?= ../../comms/jpilot -.endif # JPILOT_BUILDLINK3_MK .include "../../comms/pilot-link-libs/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # JPILOT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -jpilot diff --git a/comms/libmal/buildlink3.mk b/comms/libmal/buildlink3.mk index be054bcc391..42998d23c14 100644 --- a/comms/libmal/buildlink3.mk +++ b/comms/libmal/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:02 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBMAL_BUILDLINK3_MK:= ${LIBMAL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libmal -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libmal -.endif +.if !defined(LIBMAL_BUILDLINK3_MK) +LIBMAL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmal} -BUILDLINK_PACKAGES+= libmal -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmal - -.if !empty(LIBMAL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libmal+= libmal>=0.40 BUILDLINK_ABI_DEPENDS.libmal+= libmal>=0.40nb2 BUILDLINK_PKGSRCDIR.libmal?= ../../comms/libmal -.endif # LIBMAL_BUILDLINK3_MK .include "../../comms/pilot-link-libs/buildlink3.mk" +.endif # LIBMAL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libmal diff --git a/comms/libopensync/buildlink3.mk b/comms/libopensync/buildlink3.mk index 4e6b8e0cfd9..ebb72c89fb5 100644 --- a/comms/libopensync/buildlink3.mk +++ b/comms/libopensync/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.2 2007/05/23 21:27:26 seb Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:02 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBOPENSYNC_BUILDLINK3_MK:= ${LIBOPENSYNC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libopensync -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libopensync -.endif +.if !defined(LIBOPENSYNC_BUILDLINK3_MK) +LIBOPENSYNC_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibopensync} -BUILDLINK_PACKAGES+= libopensync -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libopensync - -.if ${LIBOPENSYNC_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libopensync+= libopensync>=0.22 BUILDLINK_PKGSRCDIR.libopensync?= ../../comms/libopensync -.endif # LIBOPENSYNC_BUILDLINK3_MK .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.endif # LIBOPENSYNC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libopensync diff --git a/comms/libsyncml/buildlink3.mk b/comms/libsyncml/buildlink3.mk index 90e83d9174c..df0f0f481f8 100644 --- a/comms/libsyncml/buildlink3.mk +++ b/comms/libsyncml/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/01/12 14:09:35 dillo Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:02 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSYNCML_BUILDLINK3_MK:= ${LIBSYNCML_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libsyncml -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libsyncml -.endif +.if !defined(LIBSYNCML_BUILDLINK3_MK) +LIBSYNCML_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsyncml} -BUILDLINK_PACKAGES+= libsyncml -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsyncml - -.if ${LIBSYNCML_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libsyncml+= libsyncml>=0.4.5 BUILDLINK_PKGSRCDIR.libsyncml?= ../../comms/libsyncml -.endif # LIBSYNCML_BUILDLINK3_MK +.endif # LIBSYNCML_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libsyncml diff --git a/comms/obexftp/buildlink3.mk b/comms/obexftp/buildlink3.mk index d0cea24537f..b75205489f2 100644 --- a/comms/obexftp/buildlink3.mk +++ b/comms/obexftp/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1 2006/11/30 00:07:03 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:02 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OBEXFTP_BUILDLINK3_MK:= ${OBEXFTP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= obexftp -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= obexftp -.endif +.if !defined(OBEXFTP_BUILDLINK3_MK) +OBEXFTP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nobexftp} -BUILDLINK_PACKAGES+= obexftp -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}obexftp - -.if ${OBEXFTP_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.obexftp+= obexftp>=0.20nb1 BUILDLINK_PKGSRCDIR.obexftp?= ../../comms/obexftp -.endif # OBEXFTP_BUILDLINK3_MK .include "../../comms/openobex/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/libusb/buildlink3.mk" +.endif # OBEXFTP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -obexftp diff --git a/comms/openobex/buildlink3.mk b/comms/openobex/buildlink3.mk index 1c61452edf2..857962688c2 100644 --- a/comms/openobex/buildlink3.mk +++ b/comms/openobex/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.10 2009/03/05 21:10:27 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:03 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OPENOBEX_BUILDLINK3_MK:= ${OPENOBEX_BUILDLINK3_MK}+ +BUILDLINK_TREE+= openobex -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= openobex -.endif +.if !defined(OPENOBEX_BUILDLINK3_MK) +OPENOBEX_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenobex} -BUILDLINK_PACKAGES+= openobex -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openobex - -.if ${OPENOBEX_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.openobex+= openobex>=1.3 BUILDLINK_PKGSRCDIR.openobex?= ../../comms/openobex -.endif # OPENOBEX_BUILDLINK3_MK .include "../../devel/libusb/buildlink3.mk" +.endif # OPENOBEX_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -openobex diff --git a/comms/pilot-link-libs/buildlink3.mk b/comms/pilot-link-libs/buildlink3.mk index 1171533c0c1..dfc902ae6aa 100644 --- a/comms/pilot-link-libs/buildlink3.mk +++ b/comms/pilot-link-libs/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.9 2007/01/26 01:26:46 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:03 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PILOT_LINK_LIBS_BUILDLINK3_MK:= ${PILOT_LINK_LIBS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pilot-link-libs -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pilot-link-libs -.endif +.if !defined(PILOT_LINK_LIBS_BUILDLINK3_MK) +PILOT_LINK_LIBS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npilot-link-libs} -BUILDLINK_PACKAGES+= pilot-link-libs -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pilot-link-libs - -.if !empty(PILOT_LINK_LIBS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.pilot-link-libs+= pilot-link-libs>=0.11.7nb1 BUILDLINK_ABI_DEPENDS.pilot-link-libs+= pilot-link-libs>=0.12.1 BUILDLINK_PKGSRCDIR.pilot-link-libs?= ../../comms/pilot-link-libs -.endif # PILOT_LINK_LIBS_BUILDLINK3_MK .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" +.endif # PILOT_LINK_LIBS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pilot-link-libs diff --git a/comms/synce-librapi2/buildlink3.mk b/comms/synce-librapi2/buildlink3.mk index df4d19baa93..3c33492ba99 100644 --- a/comms/synce-librapi2/buildlink3.mk +++ b/comms/synce-librapi2/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:03 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SYNCE_LIBRAPI2_BUILDLINK3_MK:= ${SYNCE_LIBRAPI2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= synce-librapi2 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= synce-librapi2 -.endif +.if !defined(SYNCE_LIBRAPI2_BUILDLINK3_MK) +SYNCE_LIBRAPI2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsynce-librapi2} -BUILDLINK_PACKAGES+= synce-librapi2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}synce-librapi2 - -.if !empty(SYNCE_LIBRAPI2_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.synce-librapi2+= synce-librapi2>=0.9.1 BUILDLINK_PKGSRCDIR.synce-librapi2?= ../../comms/synce-librapi2 -.endif # SYNCE_LIBRAPI2_BUILDLINK3_MK .include "../../comms/synce-libsynce/buildlink3.mk" +.endif # SYNCE_LIBRAPI2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -synce-librapi2 diff --git a/comms/synce-libsynce/buildlink3.mk b/comms/synce-libsynce/buildlink3.mk index 928e73846a7..4956258e2cd 100644 --- a/comms/synce-libsynce/buildlink3.mk +++ b/comms/synce-libsynce/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:39 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:03 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SYNCE_LIBSYNCE_BUILDLINK3_MK:= ${SYNCE_LIBSYNCE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= synce-libsynce -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= synce-libsynce -.endif +.if !defined(SYNCE_LIBSYNCE_BUILDLINK3_MK) +SYNCE_LIBSYNCE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsynce-libsynce} -BUILDLINK_PACKAGES+= synce-libsynce -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}synce-libsynce - -.if !empty(SYNCE_LIBSYNCE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.synce-libsynce+= synce-libsynce>=0.9.1 BUILDLINK_PKGSRCDIR.synce-libsynce?= ../../comms/synce-libsynce -.endif # SYNCE_LIBSYNCE_BUILDLINK3_MK .include "../../converters/libiconv/buildlink3.mk" +.endif # SYNCE_LIBSYNCE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -synce-libsynce diff --git a/comms/zaptel-netbsd/buildlink3.mk b/comms/zaptel-netbsd/buildlink3.mk index 5f5b9cdd258..f0cd577f489 100644 --- a/comms/zaptel-netbsd/buildlink3.mk +++ b/comms/zaptel-netbsd/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:39 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:03 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ZAPTEL_NETBSD_BUILDLINK3_MK:= ${ZAPTEL_NETBSD_BUILDLINK3_MK}+ +BUILDLINK_TREE+= zaptel-netbsd -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= zaptel-netbsd -.endif +.if !defined(ZAPTEL_NETBSD_BUILDLINK3_MK) +ZAPTEL_NETBSD_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nzaptel-netbsd} -BUILDLINK_PACKAGES+= zaptel-netbsd -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}zaptel-netbsd - -.if !empty(ZAPTEL_NETBSD_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.zaptel-netbsd+= zaptel-netbsd>=20050314 BUILDLINK_ABI_DEPENDS.zaptel-netbsd?= zaptel-netbsd>=20060127nb1 BUILDLINK_PKGSRCDIR.zaptel-netbsd?= ../../comms/zaptel-netbsd BUILDLINK_DEPMETHOD.zaptel-netbsd?= build -.endif # ZAPTEL_NETBSD_BUILDLINK3_MK .include "../../devel/newt/buildlink3.mk" +.endif # ZAPTEL_NETBSD_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -zaptel-netbsd diff --git a/converters/TECkit/buildlink3.mk b/converters/TECkit/buildlink3.mk index c1ff7b4841f..3fe984738cb 100644 --- a/converters/TECkit/buildlink3.mk +++ b/converters/TECkit/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/24 02:09:31 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:03 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TECKIT_BUILDLINK3_MK:= ${TECKIT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= TECkit -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= TECkit -.endif +.if !defined(TECKIT_BUILDLINK3_MK) +TECKIT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NTECkit} -BUILDLINK_PACKAGES+= TECkit -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}TECkit - -.if ${TECKIT_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.TECkit+= TECkit>=2.5.1 BUILDLINK_PKGSRCDIR.TECkit?= ../../converters/TECkit -.endif # TECKIT_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" +.endif # TECKIT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -TECkit diff --git a/converters/fribidi/buildlink3.mk b/converters/fribidi/buildlink3.mk index 373c1878f0f..ee5bf90d524 100644 --- a/converters/fribidi/buildlink3.mk +++ b/converters/fribidi/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:39 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:03 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FRIBIDI_BUILDLINK3_MK:= ${FRIBIDI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= fribidi -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= fribidi -.endif +.if !defined(FRIBIDI_BUILDLINK3_MK) +FRIBIDI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfribidi} -BUILDLINK_PACKAGES+= fribidi -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fribidi - -.if !empty(FRIBIDI_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.fribidi+= fribidi>=0.10.4 BUILDLINK_ABI_DEPENDS.fribidi+= fribidi>=0.10.4nb1 BUILDLINK_PKGSRCDIR.fribidi?= ../../converters/fribidi -.endif # FRIBIDI_BUILDLINK3_MK +.endif # FRIBIDI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -fribidi diff --git a/converters/libiconv/buildlink3.mk b/converters/libiconv/buildlink3.mk index b3143523d93..bd61139690a 100644 --- a/converters/libiconv/buildlink3.mk +++ b/converters/libiconv/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.25 2008/02/27 22:10:34 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.26 2009/03/20 19:24:03 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ICONV_BUILDLINK3_MK:= ${ICONV_BUILDLINK3_MK}+ +BUILDLINK_TREE+= iconv -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= iconv -.endif +.if !defined(ICONV_BUILDLINK3_MK) +ICONV_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Niconv} -BUILDLINK_PACKAGES+= iconv -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}iconv - -.if !empty(ICONV_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.iconv+= libiconv>=1.9.1 BUILDLINK_ABI_DEPENDS.iconv+= libiconv>=1.9.1nb4 BUILDLINK_PKGSRCDIR.iconv?= ../../converters/libiconv BUILDLINK_LIBNAME.iconv= iconv BUILDLINK_LDADD.iconv= ${BUILDLINK_LIBNAME.iconv:S/^/-l/:S/^-l$//} -.endif # ICONV_BUILDLINK3_MK +.endif # ICONV_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -iconv diff --git a/converters/libwpd/buildlink3.mk b/converters/libwpd/buildlink3.mk index 1e6e1f3e619..833caeb6f5a 100644 --- a/converters/libwpd/buildlink3.mk +++ b/converters/libwpd/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.12 2008/03/06 14:53:48 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:03 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBWPD_BUILDLINK3_MK:= ${LIBWPD_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libwpd -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libwpd -.endif +.if !defined(LIBWPD_BUILDLINK3_MK) +LIBWPD_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibwpd} -BUILDLINK_PACKAGES+= libwpd -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libwpd - -.if !empty(LIBWPD_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libwpd+= libwpd>=0.8.1nb1 BUILDLINK_ABI_DEPENDS.libwpd?= libwpd>=0.8.9nb4 BUILDLINK_PKGSRCDIR.libwpd?= ../../converters/libwpd -.endif # LIBWPD_BUILDLINK3_MK .include "../../devel/libgsf/buildlink3.mk" +.endif # LIBWPD_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libwpd diff --git a/converters/psiconv/buildlink3.mk b/converters/psiconv/buildlink3.mk index 4a23f5c8150..2c7d7ee47fe 100644 --- a/converters/psiconv/buildlink3.mk +++ b/converters/psiconv/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:39 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:03 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PSICONV_BUILDLINK3_MK:= ${PSICONV_BUILDLINK3_MK}+ +BUILDLINK_TREE+= psiconv -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= psiconv -.endif +.if !defined(PSICONV_BUILDLINK3_MK) +PSICONV_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npsiconv} -BUILDLINK_PACKAGES+= psiconv -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}psiconv - -.if !empty(PSICONV_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.psiconv+= psiconv>=0.8.3nb1 BUILDLINK_ABI_DEPENDS.psiconv+= psiconv>=0.9.6nb1 BUILDLINK_PKGSRCDIR.psiconv?= ../../converters/psiconv -.endif # PSICONV_BUILDLINK3_MK +.endif # PSICONV_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -psiconv diff --git a/converters/qrencode/buildlink3.mk b/converters/qrencode/buildlink3.mk index 771707e8f20..09bfe2560b5 100644 --- a/converters/qrencode/buildlink3.mk +++ b/converters/qrencode/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1 2008/06/15 10:33:38 gavan Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:04 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -QRENCODE_BUILDLINK3_MK:= ${QRENCODE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= qrencode -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= qrencode -.endif +.if !defined(QRENCODE_BUILDLINK3_MK) +QRENCODE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nqrencode} -BUILDLINK_PACKAGES+= qrencode -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qrencode - -.if ${QRENCODE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.qrencode+= qrencode>=3.0.3 BUILDLINK_PKGSRCDIR.qrencode?= ../../converters/qrencode -.endif # QRENCODE_BUILDLINK3_MK +.endif # QRENCODE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -qrencode diff --git a/converters/recode/buildlink3.mk b/converters/recode/buildlink3.mk index 51e423bf20b..3d40a2ed3d0 100644 --- a/converters/recode/buildlink3.mk +++ b/converters/recode/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:39 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:04 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -RECODE_BUILDLINK3_MK:= ${RECODE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= recode -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= recode -.endif +.if !defined(RECODE_BUILDLINK3_MK) +RECODE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrecode} -BUILDLINK_PACKAGES+= recode -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}recode - -.if !empty(RECODE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.recode+= recode>=3.6nb1 BUILDLINK_ABI_DEPENDS.recode+= recode>=3.6nb3 BUILDLINK_PKGSRCDIR.recode?= ../../converters/recode -.endif # RECODE_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" +.endif # RECODE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -recode diff --git a/converters/uulib/buildlink3.mk b/converters/uulib/buildlink3.mk index 49140a2f598..e4b0e788d40 100644 --- a/converters/uulib/buildlink3.mk +++ b/converters/uulib/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:39 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:04 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -UULIB_BUILDLINK3_MK:= ${UULIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= uulib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= uulib -.endif +.if !defined(UULIB_BUILDLINK3_MK) +UULIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nuulib} -BUILDLINK_PACKAGES+= uulib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}uulib - -.if !empty(UULIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.uulib+= uulib>=0.5.20 BUILDLINK_ABI_DEPENDS.uulib+= uulib>=0.5.20nb2 BUILDLINK_PKGSRCDIR.uulib?= ../../converters/uulib -.endif # UULIB_BUILDLINK3_MK +.endif # UULIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -uulib diff --git a/converters/wv/buildlink3.mk b/converters/wv/buildlink3.mk index 827f20142cf..fcbb126911f 100644 --- a/converters/wv/buildlink3.mk +++ b/converters/wv/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.17 2008/03/06 14:53:48 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:24:04 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -WV_BUILDLINK3_MK:= ${WV_BUILDLINK3_MK}+ +BUILDLINK_TREE+= wv -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= wv -.endif +.if !defined(WV_BUILDLINK3_MK) +WV_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nwv} -BUILDLINK_PACKAGES+= wv -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wv - -.if !empty(WV_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.wv+= wv>=1.0.0 BUILDLINK_ABI_DEPENDS.wv+= wv>=1.2.4nb4 BUILDLINK_PKGSRCDIR.wv?= ../../converters/wv -.endif # WV_BUILDLINK3_MK .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libgsf/buildlink3.mk" .include "../../graphics/libwmf/buildlink3.mk" +.endif # WV_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -wv diff --git a/converters/wv2/buildlink3.mk b/converters/wv2/buildlink3.mk index 170e3d92d05..97c5f57133c 100644 --- a/converters/wv2/buildlink3.mk +++ b/converters/wv2/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.13 2008/03/06 14:53:48 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:04 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -WV2_BUILDLINK3_MK:= ${WV2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= wv2 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= wv2 -.endif +.if !defined(WV2_BUILDLINK3_MK) +WV2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nwv2} -BUILDLINK_PACKAGES+= wv2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wv2 - -.if !empty(WV2_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.wv2?= wv2>=0.2.2nb1 BUILDLINK_ABI_DEPENDS.wv2?= wv2>=0.2.3nb5 BUILDLINK_PKGSRCDIR.wv2?= ../../converters/wv2 -.endif # WV2_BUILDLINK3_MK .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/libgsf/buildlink3.mk" +.endif # WV2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -wv2 diff --git a/cross/binutils/buildlink3.mk b/cross/binutils/buildlink3.mk index 747e2655af8..bbfcccb0eac 100644 --- a/cross/binutils/buildlink3.mk +++ b/cross/binutils/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/08/24 19:53:44 kristerw Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:04 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CROSS_BINUTILS_BUILDLINK3_MK:= ${CROSS_BINUTILS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= cross-binutils -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= cross-binutils -.endif +.if !defined(CROSS_BINUTILS_BUILDLINK3_MK) +CROSS_BINUTILS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncross-binutils} -BUILDLINK_PACKAGES+= cross-binutils -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cross-binutils - -.if !empty(CROSS_BINUTILS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.cross-binutils+= cross-binutils>=2.17.0.0 BUILDLINK_PKGSRCDIR.cross-binutils?= ../../cross/binutils -.endif # CROSS_BINUTILS_BUILDLINK3_MK +.endif # CROSS_BINUTILS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -cross-binutils diff --git a/databases/bdb-xml/buildlink3.mk b/databases/bdb-xml/buildlink3.mk index 54c7dffbf9c..40e46ede4fa 100644 --- a/databases/bdb-xml/buildlink3.mk +++ b/databases/bdb-xml/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.12 2008/09/24 19:32:00 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:04 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BDB_XML_BUILDLINK3_MK:= ${BDB_XML_BUILDLINK3_MK}+ +BUILDLINK_TREE+= bdb-xml -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= bdb-xml -.endif +.if !defined(BDB_XML_BUILDLINK3_MK) +BDB_XML_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbdb-xml} -BUILDLINK_PACKAGES+= bdb-xml -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}bdb-xml - -.if !empty(BDB_XML_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.bdb-xml+= bdb-xml>=1.2.1nb3 BUILDLINK_ABI_DEPENDS.bdb-xml?= bdb-xml>=1.2.1nb8 BUILDLINK_PKGSRCDIR.bdb-xml?= ../../databases/bdb-xml -.endif # BDB_XML_BUILDLINK3_MK .include "../../databases/db46/buildlink3.mk" .include "../../textproc/libpathan/buildlink3.mk" .include "../../textproc/xerces-c/buildlink3.mk" +.endif # BDB_XML_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -bdb-xml diff --git a/databases/db/buildlink3.mk b/databases/db/buildlink3.mk index 684a2ecec15..0c46c1d5093 100644 --- a/databases/db/buildlink3.mk +++ b/databases/db/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.25 2006/12/12 21:52:35 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.26 2009/03/20 19:24:04 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -DB_BUILDLINK3_MK:= ${DB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= db2 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= db2 -.endif +.if !defined(DB_BUILDLINK3_MK) +DB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndb2} -BUILDLINK_PACKAGES+= db2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}db2 - -.if !empty(DB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.db2+= db>=2.7.3 BUILDLINK_ABI_DEPENDS.db2+= db>=2.7.7nb2 BUILDLINK_PKGSRCDIR.db2?= ../../databases/db @@ -23,6 +16,6 @@ BUILDLINK_LDADD.db2= -ldb2 BUILDLINK_LIBS.db2= ${BUILDLINK_LDADD.db2} BUILDLINK_TRANSFORM+= l:db:db2 . endif -.endif # DB_BUILDLINK3_MK +.endif # DB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -db2 diff --git a/databases/db3/buildlink3.mk b/databases/db3/buildlink3.mk index 7413120912c..f5305c69e68 100644 --- a/databases/db3/buildlink3.mk +++ b/databases/db3/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.21 2006/12/12 21:52:35 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:24:04 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -DB3_BUILDLINK3_MK:= ${DB3_BUILDLINK3_MK}+ +BUILDLINK_TREE+= db3 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= db3 -.endif +.if !defined(DB3_BUILDLINK3_MK) +DB3_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndb3} -BUILDLINK_PACKAGES+= db3 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}db3 - -.if !empty(DB3_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.db3+= db3>=2.9.2 BUILDLINK_ABI_DEPENDS.db3+= db3>=3.11.2nb3 BUILDLINK_PKGSRCDIR.db3?= ../../databases/db3 @@ -24,8 +17,8 @@ BUILDLINK_TRANSFORM+= l:db-3:db3 BUILDLINK_LIBS.db3= ${BUILDLINK_LDADD.db3} BUILDLINK_TRANSFORM+= l:db:db3 . endif -.endif # DB3_BUILDLINK3_MK .include "../../mk/pthread.buildlink3.mk" +.endif # DB3_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -db3 diff --git a/databases/db4/buildlink3.mk b/databases/db4/buildlink3.mk index 5ab5e630fec..715c72a4cb6 100644 --- a/databases/db4/buildlink3.mk +++ b/databases/db4/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.34 2008/09/06 20:53:51 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.35 2009/03/20 19:24:04 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -DB4_BUILDLINK3_MK:= ${DB4_BUILDLINK3_MK}+ +BUILDLINK_TREE+= db4 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= db4 -.endif +.if !defined(DB4_BUILDLINK3_MK) +DB4_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndb4} -BUILDLINK_PACKAGES+= db4 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}db4 - -.if !empty(DB4_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.db4+= db4>=4.7.25.1 BUILDLINK_ABI_DEPENDS.db4?= db4>=4.7.25.1 BUILDLINK_PKGSRCDIR.db4?= ../../databases/db4 @@ -30,6 +23,6 @@ BUILDLINK_TRANSFORM+= l:db:db4 PTHREAD_OPTS+= native . include "../../mk/pthread.buildlink3.mk" . endif -.endif # DB4_BUILDLINK3_MK +.endif # DB4_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -db4 diff --git a/databases/db46/buildlink3.mk b/databases/db46/buildlink3.mk index 567359b3fc1..ecfae217fc9 100644 --- a/databases/db46/buildlink3.mk +++ b/databases/db46/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.1 2008/09/09 22:23:32 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:05 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -DB46_BUILDLINK3_MK:= ${DB46_BUILDLINK3_MK}+ +BUILDLINK_TREE+= db46 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= db46 -.endif +.if !defined(DB46_BUILDLINK3_MK) +DB46_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndb46} -BUILDLINK_PACKAGES+= db46 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}db46 - -.if !empty(DB46_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.db46+= db46>=4.6.21 BUILDLINK_PKGSRCDIR.db46?= ../../databases/db46 BUILDLINK_INCDIRS.db46?= include/db46 @@ -29,6 +22,6 @@ BUILDLINK_TRANSFORM+= l:db:db46 PTHREAD_OPTS+= native . include "../../mk/pthread.buildlink3.mk" . endif -.endif # DB46_BUILDLINK3_MK +.endif # DB46_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -db46 diff --git a/databases/dbh/buildlink3.mk b/databases/dbh/buildlink3.mk index 08a3f459350..171645ef6fe 100644 --- a/databases/dbh/buildlink3.mk +++ b/databases/dbh/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:39 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:05 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -DBH_BUILDLINK3_MK:= ${DBH_BUILDLINK3_MK}+ +BUILDLINK_TREE+= dbh -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= dbh -.endif +.if !defined(DBH_BUILDLINK3_MK) +DBH_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndbh} -BUILDLINK_PACKAGES+= dbh -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dbh - -.if !empty(DBH_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.dbh+= dbh>=1.0.22 BUILDLINK_PKGSRCDIR.dbh?= ../../databases/dbh -.endif # DBH_BUILDLINK3_MK +.endif # DBH_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -dbh diff --git a/databases/edb/buildlink3.mk b/databases/edb/buildlink3.mk index bf6df29aadb..8ff6618b212 100644 --- a/databases/edb/buildlink3.mk +++ b/databases/edb/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:39 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:05 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EDB_BUILDLINK3_MK:= ${EDB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= edb -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= edb -.endif +.if !defined(EDB_BUILDLINK3_MK) +EDB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nedb} -BUILDLINK_PACKAGES+= edb -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}edb - -.if !empty(EDB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.edb+= edb>=1.0.3nb3 BUILDLINK_ABI_DEPENDS.edb+= edb>=1.0.3nb5 BUILDLINK_PKGSRCDIR.edb?= ../../databases/edb -.endif # EDB_BUILDLINK3_MK +.endif # EDB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -edb diff --git a/databases/freetds/buildlink3.mk b/databases/freetds/buildlink3.mk index 958fb88d4c6..4718b74ad5e 100644 --- a/databases/freetds/buildlink3.mk +++ b/databases/freetds/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.12 2008/05/08 20:14:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:05 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FREETDS_BUILDLINK3_MK:= ${FREETDS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= freetds -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= freetds -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfreetds} -BUILDLINK_PACKAGES+= freetds -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}freetds +.if !defined(FREETDS_BUILDLINK3_MK) +FREETDS_BUILDLINK3_MK:= -.if !empty(FREETDS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.freetds+= freetds>=0.82 BUILDLINK_ABI_DEPENDS.freetds?= freetds>=0.63nb4 BUILDLINK_PKGSRCDIR.freetds?= ../../databases/freetds -.endif # FREETDS_BUILDLINK3_MK .include "../../converters/libiconv/buildlink3.mk" @@ -29,5 +21,6 @@ pkgbase := freetds .if !empty(PKG_BUILD_OPTIONS.freetds:Mopenssl) . include "../../security/openssl/buildlink3.mk" .endif +.endif # FREETDS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -freetds diff --git a/databases/gdbm/buildlink3.mk b/databases/gdbm/buildlink3.mk index 0b0314eb737..dd1ddc1c63d 100644 --- a/databases/gdbm/buildlink3.mk +++ b/databases/gdbm/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:39 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:05 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GDBM_BUILDLINK3_MK:= ${GDBM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gdbm -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gdbm -.endif +.if !defined(GDBM_BUILDLINK3_MK) +GDBM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngdbm} -BUILDLINK_PACKAGES+= gdbm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gdbm - -.if !empty(GDBM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gdbm+= gdbm>=1.8.3 BUILDLINK_ABI_DEPENDS.gdbm+= gdbm>=1.8.3nb1 BUILDLINK_PKGSRCDIR.gdbm?= ../../databases/gdbm -.endif # GDBM_BUILDLINK3_MK +.endif # GDBM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gdbm diff --git a/databases/gnome-mime-data/buildlink3.mk b/databases/gnome-mime-data/buildlink3.mk index ff7e472ce74..ae6fa7971f7 100644 --- a/databases/gnome-mime-data/buildlink3.mk +++ b/databases/gnome-mime-data/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:39 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:05 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNOME_MIME_DATA_BUILDLINK3_MK:= ${GNOME_MIME_DATA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnome-mime-data -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnome-mime-data -.endif +.if !defined(GNOME_MIME_DATA_BUILDLINK3_MK) +GNOME_MIME_DATA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-mime-data} -BUILDLINK_PACKAGES+= gnome-mime-data -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-mime-data - -.if !empty(GNOME_MIME_DATA_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gnome-mime-data+= gnome-mime-data>=2.4.0 BUILDLINK_ABI_DEPENDS.gnome-mime-data+= gnome-mime-data>=2.4.2nb2 BUILDLINK_PKGSRCDIR.gnome-mime-data?= ../../databases/gnome-mime-data @@ -21,8 +14,7 @@ BUILDLINK_PKGSRCDIR.gnome-mime-data?= ../../databases/gnome-mime-data # USE_TOOLS+= perl -.endif # GNOME_MIME_DATA_BUILDLINK3_MK - .include "../../devel/gettext-lib/buildlink3.mk" +.endif # GNOME_MIME_DATA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnome-mime-data diff --git a/databases/iodbc/buildlink3.mk b/databases/iodbc/buildlink3.mk index 6e219e8bdce..1a0f90d299d 100644 --- a/databases/iodbc/buildlink3.mk +++ b/databases/iodbc/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:39 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:05 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -IODBC_BUILDLINK3_MK:= ${IODBC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= iodbc -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= iodbc -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Niodbc} -BUILDLINK_PACKAGES+= iodbc -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}iodbc +.if !defined(IODBC_BUILDLINK3_MK) +IODBC_BUILDLINK3_MK:= -.if !empty(IODBC_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.iodbc+= iodbc>=3.52.3 BUILDLINK_PKGSRCDIR.iodbc?= ../../databases/iodbc -.endif # IODBC_BUILDLINK3_MK # ODBC drivers don't need these bits, but ODBC clients do. .if !defined(ODBC_DRIVER) . include "../../mk/dlopen.buildlink3.mk" . include "../../mk/pthread.buildlink3.mk" .endif +.endif # IODBC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -iodbc diff --git a/databases/libgda/buildlink3.mk b/databases/libgda/buildlink3.mk index df37c784484..a1bbad7f95d 100644 --- a/databases/libgda/buildlink3.mk +++ b/databases/libgda/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.16 2007/08/09 19:07:38 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:05 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGDA_BUILDLINK3_MK:= ${LIBGDA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgda -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libgda -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgda} -BUILDLINK_PACKAGES+= libgda -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgda +.if !defined(LIBGDA_BUILDLINK3_MK) +LIBGDA_BUILDLINK3_MK:= -.if !empty(LIBGDA_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libgda+= libgda>=2.99.2 BUILDLINK_ABI_DEPENDS.libgda+= libgda>=3.0.0 BUILDLINK_PKGSRCDIR.libgda?= ../../databases/libgda @@ -20,7 +13,6 @@ PRINT_PLIST_AWK+= /^@dirrm lib\/libgda-3.0\/providers$$/ \ { print "@comment in libgda: " $$0; next; } PRINT_PLIST_AWK+= /^@dirrm share\/libgda-3.0$$/ \ { print "@comment in libgda: " $$0; next; } -.endif # LIBGDA_BUILDLINK3_MK .include "../../mk/bsd.fast.prefs.mk" @@ -34,5 +26,6 @@ pkgbase := libgda .include "../../devel/glib2/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.endif # LIBGDA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgda diff --git a/databases/libgnomedb/buildlink3.mk b/databases/libgnomedb/buildlink3.mk index 53e62fb6405..95c7c65d57e 100644 --- a/databases/libgnomedb/buildlink3.mk +++ b/databases/libgnomedb/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.23 2008/01/18 05:06:27 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2009/03/20 19:24:05 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGNOMEDB_BUILDLINK3_MK:= ${LIBGNOMEDB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgnomedb -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libgnomedb -.endif +.if !defined(LIBGNOMEDB_BUILDLINK3_MK) +LIBGNOMEDB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomedb} -BUILDLINK_PACKAGES+= libgnomedb -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgnomedb - -.if !empty(LIBGNOMEDB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libgnomedb+= libgnomedb>=2.99.2 BUILDLINK_ABI_DEPENDS.libgnomedb+= libgnomedb>=3.0.0nb2 BUILDLINK_PKGSRCDIR.libgnomedb?= ../../databases/libgnomedb -.endif # LIBGNOMEDB_BUILDLINK3_MK .include "../../databases/libgda/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.libgnomedb?= ../../databases/libgnomedb .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/gtksourceview/buildlink3.mk" +.endif # LIBGNOMEDB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgnomedb diff --git a/databases/libpqxx/buildlink3.mk b/databases/libpqxx/buildlink3.mk index 1d96585b092..580d4dd5858 100644 --- a/databases/libpqxx/buildlink3.mk +++ b/databases/libpqxx/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:40 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:05 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBPQXX_BUILDLINK3_MK:= ${LIBPQXX_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libpqxx -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libpqxx -.endif +.if !defined(LIBPQXX_BUILDLINK3_MK) +LIBPQXX_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibpqxx} -BUILDLINK_PACKAGES+= libpqxx -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libpqxx - -.if !empty(LIBPQXX_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libpqxx+= libpqxx>=2.5.0 BUILDLINK_ABI_DEPENDS.libpqxx?= libpqxx>=2.5.4nb1 BUILDLINK_PKGSRCDIR.libpqxx?= ../../databases/libpqxx -.endif # LIBPQXX_BUILDLINK3_MK +.endif # LIBPQXX_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libpqxx diff --git a/databases/metakit-lib/buildlink3.mk b/databases/metakit-lib/buildlink3.mk index cef0ca31a17..b5f410b4628 100644 --- a/databases/metakit-lib/buildlink3.mk +++ b/databases/metakit-lib/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:40 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:06 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -METAKIT_LIB_BUILDLINK3_MK:= ${METAKIT_LIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= metakit-lib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= metakit-lib -.endif +.if !defined(METAKIT_LIB_BUILDLINK3_MK) +METAKIT_LIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmetakit-lib} -BUILDLINK_PACKAGES+= metakit-lib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}metakit-lib - -.if !empty(METAKIT_LIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.metakit-lib+= metakit-lib>=2.4.8 BUILDLINK_ABI_DEPENDS.metakit-lib+= metakit-lib>=2.4.9.3nb1 BUILDLINK_PKGSRCDIR.metakit-lib?= ../../databases/metakit-lib -.endif # METAKIT_LIB_BUILDLINK3_MK +.endif # METAKIT_LIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -metakit-lib diff --git a/databases/mysql4-client/buildlink3.mk b/databases/mysql4-client/buildlink3.mk index b2e16611dfb..e2fd4f0ea1c 100644 --- a/databases/mysql4-client/buildlink3.mk +++ b/databases/mysql4-client/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.23 2008/03/26 13:22:00 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2009/03/20 19:24:06 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MYSQL_CLIENT_BUILDLINK3_MK:= ${MYSQL_CLIENT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= mysql-client -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= mysql-client -.endif +.if !defined(MYSQL_CLIENT_BUILDLINK3_MK) +MYSQL_CLIENT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmysql-client} -BUILDLINK_PACKAGES+= mysql-client -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mysql-client - -.if ${MYSQL_CLIENT_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.mysql-client+= mysql-client>=4.1.22<5 BUILDLINK_ABI_DEPENDS.mysql-client?= mysql-client>=4.1.22nb1 BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mysql4-client BUILDLINK_LIBDIRS.mysql-client?= lib/mysql BUILDLINK_INCDIRS.mysql-client?= include/mysql -.endif # MYSQL_CLIENT_BUILDLINK3_MK .include "../../devel/readline/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.endif # MYSQL_CLIENT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -mysql-client diff --git a/databases/mysql5-client/buildlink3.mk b/databases/mysql5-client/buildlink3.mk index b8a3d4e8122..cb427907899 100644 --- a/databases/mysql5-client/buildlink3.mk +++ b/databases/mysql5-client/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.12 2008/09/18 11:50:44 taca Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:06 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MYSQL_CLIENT_BUILDLINK3_MK:= ${MYSQL_CLIENT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= mysql-client -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= mysql-client -.endif +.if !defined(MYSQL_CLIENT_BUILDLINK3_MK) +MYSQL_CLIENT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmysql-client} -BUILDLINK_PACKAGES+= mysql-client -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mysql-client - -.if ${MYSQL_CLIENT_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.mysql-client+= mysql-client>=5.0.15 BUILDLINK_ABI_DEPENDS.mysql-client+= mysql-client>=5.0.67 BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mysql5-client BUILDLINK_LIBDIRS.mysql-client?= lib/mysql BUILDLINK_INCDIRS.mysql-client?= include/mysql -.endif # MYSQL_CLIENT_BUILDLINK3_MK .include "../../security/openssl/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.endif # MYSQL_CLIENT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -mysql-client diff --git a/databases/openldap-client/buildlink3.mk b/databases/openldap-client/buildlink3.mk index c52c347c1a0..0547cf1ce57 100644 --- a/databases/openldap-client/buildlink3.mk +++ b/databases/openldap-client/buildlink3.mk @@ -1,26 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.7 2008/01/18 05:06:28 tnn Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OPENLDAP_BUILDLINK3_MK:= ${OPENLDAP_BUILDLINK3_MK}+ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:06 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= openldap-client -.endif +BUILDLINK_TREE+= openldap-client -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenldap-client} -BUILDLINK_PACKAGES+= openldap-client -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openldap-client +.if !defined(OPENLDAP_BUILDLINK3_MK) +OPENLDAP_BUILDLINK3_MK:= -.if !empty(OPENLDAP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.openldap-client+= openldap-client>=2.4.6 BUILDLINK_ABI_DEPENDS.openldap-client?= openldap-client>=2.4.7nb1 BUILDLINK_PKGSRCDIR.openldap-client?= ../../databases/openldap-client # Export the deprecated API from the openldap-2.2.x releases. BUILDLINK_CPPFLAGS.openldap-client+= -DLDAP_DEPRECATED -.endif # OPENLDAP_BUILDLINK3_MK pkgbase := openldap-client .include "../../mk/pkg-build-options.mk" @@ -30,5 +22,6 @@ pkgbase := openldap-client . include "../../security/cyrus-sasl/buildlink3.mk" .endif .include "../../security/openssl/buildlink3.mk" +.endif # OPENLDAP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -openldap-client diff --git a/databases/p5-DBI/buildlink3.mk b/databases/p5-DBI/buildlink3.mk index 741ebba1660..0ebcb373cbd 100644 --- a/databases/p5-DBI/buildlink3.mk +++ b/databases/p5-DBI/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.13 2008/10/13 17:55:44 erh Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:06 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -P5_DBI_BUILDLINK3_MK:= ${P5_DBI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= p5-DBI -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= p5-DBI -.endif +.if !defined(P5_DBI_BUILDLINK3_MK) +P5_DBI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Np5-DBI} -BUILDLINK_PACKAGES+= p5-DBI -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}p5-DBI - -.if !empty(P5_DBI_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.p5-DBI+= p5-DBI>=1.52 BUILDLINK_PKGSRCDIR.p5-DBI?= ../../databases/p5-DBI BUILDLINK_INCDIRS.p5-DBI?= ${PERL5_SUB_INSTALLVENDORARCH}/auto/DBI # We want all of the arch-dependent DBI files. BUILDLINK_CONTENTS_FILTER.p5-DBI?= ${GREP} '/auto/DBI/' -.endif # P5_DBI_BUILDLINK3_MK .include "../../lang/perl5/buildlink3.mk" +.endif # P5_DBI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -p5-DBI diff --git a/databases/php-pdo/buildlink3.mk b/databases/php-pdo/buildlink3.mk index 8d48da56f1f..626d1c5aedf 100644 --- a/databases/php-pdo/buildlink3.mk +++ b/databases/php-pdo/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.10 2009/03/13 10:57:20 sborrill Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:06 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PHP_PDO_BUILDLINK3_MK:= ${PHP_PDO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= php-pdo -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= php-pdo -.endif +.if !defined(PHP_PDO_BUILDLINK3_MK) +PHP_PDO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nphp-pdo} -BUILDLINK_PACKAGES+= php-pdo -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}php-pdo - -.if !empty(PHP_PDO_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.php-pdo+= ${PHP_PKG_PREFIX}-pdo-5.* BUILDLINK_ABI_DEPENDS.php-pdo?= ${PHP_PKG_PREFIX}-pdo>=5.2.9 BUILDLINK_PKGSRCDIR.php-pdo?= ../../databases/php-pdo BUILDLINK_INCDIRS.php-pdo?= include/php/ext/pdo -.endif # PHP_PDO_BUILDLINK3_MK +.endif # PHP_PDO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -php-pdo diff --git a/databases/postgresql81-client/buildlink3.mk b/databases/postgresql81-client/buildlink3.mk index 271158de1d8..bfdb5dbdf93 100644 --- a/databases/postgresql81-client/buildlink3.mk +++ b/databases/postgresql81-client/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.9 2008/01/18 05:06:29 tnn Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -POSTGRESQL81_CLIENT_BUILDLINK3_MK:= ${POSTGRESQL81_CLIENT_BUILDLINK3_MK}+ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:06 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= postgresql81-client -.endif +BUILDLINK_TREE+= postgresql81-client -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npostgresql81-client} -BUILDLINK_PACKAGES+= postgresql81-client -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}postgresql81-client +.if !defined(POSTGRESQL81_CLIENT_BUILDLINK3_MK) +POSTGRESQL81_CLIENT_BUILDLINK3_MK:= -.if ${POSTGRESQL81_CLIENT_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.postgresql81-client+= postgresql81-client>=8.1.0 BUILDLINK_ABI_DEPENDS.postgresql81-client?= postgresql81-client>=8.1.11nb1 BUILDLINK_PKGSRCDIR.postgresql81-client?= ../../databases/postgresql81-client @@ -27,9 +20,9 @@ BUILDLINK_LIBDIRS.postgresql81-client?= ${PG_SUBPREFIX}/lib BUILDLINK_LDADD.postgresql81-client= -lpq ${BUILDLINK_LDADD.gettext} BUILDLINK_FILES.postgresql81-client+= bin/pg_config -.endif # POSTGRESQL81_CLIENT_BUILDLINK3_MK .include "../../security/openssl/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" +.endif # POSTGRESQL81_CLIENT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -postgresql81-client diff --git a/databases/postgresql82-client/buildlink3.mk b/databases/postgresql82-client/buildlink3.mk index 3ccf9d3b61c..1765ac8c80f 100644 --- a/databases/postgresql82-client/buildlink3.mk +++ b/databases/postgresql82-client/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.4 2008/01/18 05:06:30 tnn Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -POSTGRESQL82_CLIENT_BUILDLINK3_MK:= ${POSTGRESQL82_CLIENT_BUILDLINK3_MK}+ +# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:24:06 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= postgresql82-client -.endif +BUILDLINK_TREE+= postgresql82-client -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npostgresql82-client} -BUILDLINK_PACKAGES+= postgresql82-client -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}postgresql82-client +.if !defined(POSTGRESQL82_CLIENT_BUILDLINK3_MK) +POSTGRESQL82_CLIENT_BUILDLINK3_MK:= -.if ${POSTGRESQL82_CLIENT_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.postgresql82-client+= postgresql82-client>=8.2.0 BUILDLINK_ABI_DEPENDS.postgresql82-client?= postgresql82-client>=8.2.6nb1 BUILDLINK_PKGSRCDIR.postgresql82-client?= ../../databases/postgresql82-client @@ -27,9 +20,9 @@ BUILDLINK_LIBDIRS.postgresql82-client?= ${PG_SUBPREFIX}/lib BUILDLINK_LDADD.postgresql82-client= -lpq ${BUILDLINK_LDADD.gettext} BUILDLINK_FILES.postgresql82-client+= bin/pg_config -.endif # POSTGRESQL82_CLIENT_BUILDLINK3_MK .include "../../security/openssl/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" +.endif # POSTGRESQL82_CLIENT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -postgresql82-client diff --git a/databases/postgresql83-client/buildlink3.mk b/databases/postgresql83-client/buildlink3.mk index efc960dafed..eab6e319aba 100644 --- a/databases/postgresql83-client/buildlink3.mk +++ b/databases/postgresql83-client/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/03/04 12:42:53 adam Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -POSTGRESQL83_CLIENT_BUILDLINK3_MK:= ${POSTGRESQL83_CLIENT_BUILDLINK3_MK}+ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:06 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= postgresql83-client -.endif +BUILDLINK_TREE+= postgresql83-client -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npostgresql83-client} -BUILDLINK_PACKAGES+= postgresql83-client -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}postgresql83-client +.if !defined(POSTGRESQL83_CLIENT_BUILDLINK3_MK) +POSTGRESQL83_CLIENT_BUILDLINK3_MK:= -.if ${POSTGRESQL83_CLIENT_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.postgresql83-client+= postgresql83-client>=8.3.0 BUILDLINK_ABI_DEPENDS.postgresql83-client?= postgresql83-client>=8.3.0 BUILDLINK_PKGSRCDIR.postgresql83-client?= ../../databases/postgresql83-client @@ -27,9 +20,9 @@ BUILDLINK_LIBDIRS.postgresql83-client?= ${PG_SUBPREFIX}/lib BUILDLINK_LDADD.postgresql83-client= -lpq ${BUILDLINK_LDADD.gettext} BUILDLINK_FILES.postgresql83-client+= bin/pg_config -.endif # POSTGRESQL83_CLIENT_BUILDLINK3_MK .include "../../security/openssl/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" +.endif # POSTGRESQL83_CLIENT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -postgresql83-client diff --git a/databases/py-ZODB/buildlink3.mk b/databases/py-ZODB/buildlink3.mk index 4f2eac8d21e..02c880a7d5b 100644 --- a/databases/py-ZODB/buildlink3.mk +++ b/databases/py-ZODB/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 17:30:10 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:06 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_ZODB_BUILDLINK3_MK:= ${PY_ZODB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pyZODB -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pyZODB -.endif +.if !defined(PY_ZODB_BUILDLINK3_MK) +PY_ZODB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NpyZODB} -BUILDLINK_PACKAGES+= pyZODB -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyZODB - -.if !empty(PY_ZODB_BUILDLINK3_MK:M+) .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pyZODB+= ${PYPKGPREFIX}-ZODB>=3.2nb1 BUILDLINK_ABI_DEPENDS.pyZODB+= ${PYPKGPREFIX}-ZODB>=3.2.1nb2 BUILDLINK_PKGSRCDIR.pyZODB?= ../../databases/py-ZODB -.endif # PY_ZODB_BUILDLINK3_MK +.endif # PY_ZODB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pyZODB diff --git a/databases/py-bsddb3/buildlink3.mk b/databases/py-bsddb3/buildlink3.mk index 0524fa720d6..fa8d3e57607 100644 --- a/databases/py-bsddb3/buildlink3.mk +++ b/databases/py-bsddb3/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.14 2008/09/18 16:54:22 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:06 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_BSDDB3_BUILDLINK3_MK:= ${PY_BSDDB3_BUILDLINK3_MK}+ +BUILDLINK_TREE+= py-bsddb3 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= py-bsddb3 -.endif +.if !defined(PY_BSDDB3_BUILDLINK3_MK) +PY_BSDDB3_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-bsddb3} -BUILDLINK_PACKAGES+= py-bsddb3 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-bsddb3 - -.if !empty(PY_BSDDB3_BUILDLINK3_MK:M+) . include "../../mk/pthread.buildlink3.mk" . include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.py-bsddb3+= ${PYPKGPREFIX}-bsddb3>=4.7.2 BUILDLINK_ABI_DEPENDS.py-bsddb3+= ${PYPKGPREFIX}-bsddb3>=4.7.2 BUILDLINK_PKGSRCDIR.py-bsddb3?= ../../databases/py-bsddb3 -.endif # PY_BSDDB3_BUILDLINK3_MK .include "../../databases/db4/buildlink3.mk" +.endif # PY_BSDDB3_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -py-bsddb3 diff --git a/databases/py-ldap/buildlink3.mk b/databases/py-ldap/buildlink3.mk index 7ae58d71b96..6d1a3c7b764 100644 --- a/databases/py-ldap/buildlink3.mk +++ b/databases/py-ldap/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 17:30:10 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:07 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_LDAP_BUILDLINK3_MK:= ${PY_LDAP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pyldap -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pyldap -.endif +.if !defined(PY_LDAP_BUILDLINK3_MK) +PY_LDAP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyldap} -BUILDLINK_PACKAGES+= pyldap -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyldap - -.if !empty(PY_LDAP_BUILDLINK3_MK:M+) .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pyldap+= ${PYPKGPREFIX}-ldap>=2.2.0 BUILDLINK_ABI_DEPENDS.pyldap+= ${PYPKGPREFIX}-ldap>=2.2.0 BUILDLINK_PKGSRCDIR.pyldap?= ../../databases/py-ldap -.endif # PY_LDAP_BUILDLINK3_MK +.endif # PY_LDAP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pyldap diff --git a/databases/py-metakit/buildlink3.mk b/databases/py-metakit/buildlink3.mk index fe83ca419d6..130ae5fab8b 100644 --- a/databases/py-metakit/buildlink3.mk +++ b/databases/py-metakit/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 17:30:10 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:07 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_METAKIT_BUILDLINK3_MK:= ${PY_METAKIT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pymetakit -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pymetakit -.endif +.if !defined(PY_METAKIT_BUILDLINK3_MK) +PY_METAKIT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npymetakit} -BUILDLINK_PACKAGES+= pymetakit -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pymetakit - -.if !empty(PY_METAKIT_BUILDLINK3_MK:M+) .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pymetakit+= ${PYPKGPREFIX}-metakit-[0-9]* BUILDLINK_ABI_DEPENDS.pymetakit+= ${PYPKGPREFIX}-metakit>=2.4.9.3nb2 BUILDLINK_PKGSRCDIR.pymetakit?= ../../databases/py-metakit -.endif # PY_METAKIT_BUILDLINK3_MK +.endif # PY_METAKIT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pymetakit diff --git a/databases/py-psycopg/buildlink3.mk b/databases/py-psycopg/buildlink3.mk index 06d231d9ae9..3a06a7cc4cf 100644 --- a/databases/py-psycopg/buildlink3.mk +++ b/databases/py-psycopg/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 17:30:10 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:07 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_PSYCOPG_BUILDLINK3_MK:= ${PY_PSYCOPG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= psycopg -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= psycopg -.endif +.if !defined(PY_PSYCOPG_BUILDLINK3_MK) +PY_PSYCOPG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npsycopg} -BUILDLINK_PACKAGES+= psycopg -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}psycopg - -.if !empty(PY_PSYCOPG_BUILDLINK3_MK:M+) . include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.psycopg+= ${PYPKGPREFIX}-psycopg>=1.1.21 BUILDLINK_ABI_DEPENDS.psycopg+= ${PYPKGPREFIX}-psycopg>=1.1.21nb1 BUILDLINK_PKGSRCDIR.psycopg?= ../../databases/py-psycopg -.endif # PY_PSYCOPG_BUILDLINK3_MK +.endif # PY_PSYCOPG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -psycopg diff --git a/databases/py-sqlite2/buildlink3.mk b/databases/py-sqlite2/buildlink3.mk index 40cd37725b9..0d3798dc69e 100644 --- a/databases/py-sqlite2/buildlink3.mk +++ b/databases/py-sqlite2/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/01/10 10:39:18 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:07 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_SQLITE2_BUILDLINK3_MK:= ${PY_SQLITE2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= py-sqlite2 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= py-sqlite2 -.endif +.if !defined(PY_SQLITE2_BUILDLINK3_MK) +PY_SQLITE2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-sqlite2} -BUILDLINK_PACKAGES+= py-sqlite2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-sqlite2 - -.if ${PY_SQLITE2_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.py-sqlite2+= ${PYPKGPREFIX}-sqlite2>=2.3.2 BUILDLINK_PKGSRCDIR.py-sqlite2?= ../../databases/py-sqlite2 -.endif # PY_SQLITE2_BUILDLINK3_MK +.endif # PY_SQLITE2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -py-sqlite2 diff --git a/databases/qdbm/buildlink3.mk b/databases/qdbm/buildlink3.mk index ccd2a40f17b..4080d4ef924 100644 --- a/databases/qdbm/buildlink3.mk +++ b/databases/qdbm/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/09/03 02:56:00 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:07 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -QDBM_BUILDLINK3_MK:= ${QDBM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= qdbm -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= qdbm -.endif +.if !defined(QDBM_BUILDLINK3_MK) +QDBM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nqdbm} -BUILDLINK_PACKAGES+= qdbm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qdbm - -.if !empty(QDBM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.qdbm+= qdbm>=1.8.40 BUILDLINK_ABI_DEPENDS.qdbm+= qdbm>=1.8.65 BUILDLINK_PKGSRCDIR.qdbm?= ../../databases/qdbm @@ -23,11 +16,11 @@ CONFIGURE_ARGS+= --enable-pthread BUILDLINK_CFLAGS.qdbm+= ${PTHREAD_CFLAGS} BUILDLINK_LDFLAGS.qdbm+=${PTHREAD_LDFLAGS} . endif -.endif # QDBM_BUILDLINK3_MK .include "../../archivers/bzip2/buildlink3.mk" .include "../../archivers/lzo/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.endif # QDBM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -qdbm diff --git a/databases/rrdtool/buildlink3.mk b/databases/rrdtool/buildlink3.mk index 8392084a821..3e3f1a6ef23 100644 --- a/databases/rrdtool/buildlink3.mk +++ b/databases/rrdtool/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.21 2009/01/02 20:07:07 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:24:07 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -RRDTOOL_BUILDLINK3_MK:= ${RRDTOOL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= rrdtool -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= rrdtool -.endif +.if !defined(RRDTOOL_BUILDLINK3_MK) +RRDTOOL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrrdtool} -BUILDLINK_PACKAGES+= rrdtool -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rrdtool - -.if ${RRDTOOL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.rrdtool+= rrdtool>=1.3.5 BUILDLINK_PKGSRCDIR.rrdtool?= ../../databases/rrdtool -.endif # RRDTOOL_BUILDLINK3_MK .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" @@ -25,5 +17,6 @@ BUILDLINK_PKGSRCDIR.rrdtool?= ../../databases/rrdtool .include "../../textproc/libxml2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../x11/pixman/buildlink3.mk" +.endif # RRDTOOL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -rrdtool diff --git a/databases/rrdtool12/buildlink3.mk b/databases/rrdtool12/buildlink3.mk index d0a97fb9670..a4c3cd818f0 100644 --- a/databases/rrdtool12/buildlink3.mk +++ b/databases/rrdtool12/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/01/02 20:07:10 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:07 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -RRDTOOL_BUILDLINK3_MK:= ${RRDTOOL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= rrdtool -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= rrdtool -.endif +.if !defined(RRDTOOL_BUILDLINK3_MK) +RRDTOOL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrrdtool} -BUILDLINK_PACKAGES+= rrdtool -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rrdtool - -.if ${RRDTOOL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.rrdtool+= rrdtool>=1.2.29 BUILDLINK_PKGSRCDIR.rrdtool?= ../../databases/rrdtool -.endif # RRDTOOL_BUILDLINK3_MK .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/libart/buildlink3.mk" +.endif # RRDTOOL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -rrdtool diff --git a/databases/sdbm/buildlink3.mk b/databases/sdbm/buildlink3.mk index 525e047d651..64a72a04968 100644 --- a/databases/sdbm/buildlink3.mk +++ b/databases/sdbm/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:40 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:07 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SDBM_BUILDLINK3_MK:= ${SDBM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= sdbm -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= sdbm -.endif +.if !defined(SDBM_BUILDLINK3_MK) +SDBM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsdbm} -BUILDLINK_PACKAGES+= sdbm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sdbm - -.if !empty(SDBM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.sdbm+= sdbm>=90.12.1 BUILDLINK_PKGSRCDIR.sdbm?= ../../databases/sdbm -.endif # SDBM_BUILDLINK3_MK +.endif # SDBM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -sdbm diff --git a/databases/shared-mime-info/buildlink3.mk b/databases/shared-mime-info/buildlink3.mk index 67d9851fc4e..5378163693e 100644 --- a/databases/shared-mime-info/buildlink3.mk +++ b/databases/shared-mime-info/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.9 2007/12/06 11:38:26 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:07 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SHARED_MIME_INFO_BUILDLINK3_MK:= ${SHARED_MIME_INFO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= shared-mime-info -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= shared-mime-info -.endif +.if !defined(SHARED_MIME_INFO_BUILDLINK3_MK) +SHARED_MIME_INFO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nshared-mime-info} -BUILDLINK_PACKAGES+= shared-mime-info -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}shared-mime-info - -.if !empty(SHARED_MIME_INFO_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.shared-mime-info+= shared-mime-info>=0.15 BUILDLINK_ABI_DEPENDS.shared-mime-info+= shared-mime-info>=0.16nb2 BUILDLINK_PKGSRCDIR.shared-mime-info?= ../../databases/shared-mime-info @@ -31,10 +24,10 @@ shared-mime-info-buildlink-fake: ${ECHO} "echo '[pkgsrc] Doing nothing for update-mime-database' \$$*" >> ${_SMI_FAKE_UPDATEDB}; \ ${CHMOD} +x ${_SMI_FAKE_UPDATEDB}; \ fi -.endif # SHARED_MIME_INFO_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.endif # SHARED_MIME_INFO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -shared-mime-info diff --git a/databases/sqlite/buildlink3.mk b/databases/sqlite/buildlink3.mk index 19345b6a091..78a03a3cb51 100644 --- a/databases/sqlite/buildlink3.mk +++ b/databases/sqlite/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:40 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:07 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SQLITE_BUILDLINK3_MK:= ${SQLITE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= sqlite -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= sqlite -.endif +.if !defined(SQLITE_BUILDLINK3_MK) +SQLITE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsqlite} -BUILDLINK_PACKAGES+= sqlite -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sqlite - -.if !empty(SQLITE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.sqlite+= sqlite>=2.8.0 BUILDLINK_ABI_DEPENDS.sqlite+= sqlite>=2.8.16nb1 BUILDLINK_PKGSRCDIR.sqlite?= ../../databases/sqlite -.endif # SQLITE_BUILDLINK3_MK +.endif # SQLITE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -sqlite diff --git a/databases/sqlite3/buildlink3.mk b/databases/sqlite3/buildlink3.mk index eb142659dbe..7a4fb167b60 100644 --- a/databases/sqlite3/buildlink3.mk +++ b/databases/sqlite3/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2007/11/15 10:39:18 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:08 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SQLITE3_BUILDLINK3_MK:= ${SQLITE3_BUILDLINK3_MK}+ +BUILDLINK_TREE+= sqlite3 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= sqlite3 -.endif +.if !defined(SQLITE3_BUILDLINK3_MK) +SQLITE3_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsqlite3} -BUILDLINK_PACKAGES+= sqlite3 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sqlite3 - -.if !empty(SQLITE3_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.0.8 BUILDLINK_ABI_DEPENDS.sqlite3+= sqlite3>=3.2.7nb1 BUILDLINK_PKGSRCDIR.sqlite3?= ../../databases/sqlite3 -.endif # SQLITE3_BUILDLINK3_MK +.endif # SQLITE3_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -sqlite3 diff --git a/databases/tdb/buildlink3.mk b/databases/tdb/buildlink3.mk index 20f43a88984..98afc6b095c 100644 --- a/databases/tdb/buildlink3.mk +++ b/databases/tdb/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:40 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:08 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TDB_BUILDLINK3_MK:= ${TDB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= tdb -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= tdb -.endif +.if !defined(TDB_BUILDLINK3_MK) +TDB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntdb} -BUILDLINK_PACKAGES+= tdb -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tdb - -.if !empty(TDB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.tdb+= tdb>=1.0.6 BUILDLINK_ABI_DEPENDS.tdb+= tdb>=1.0.6nb2 BUILDLINK_PKGSRCDIR.tdb?= ../../databases/tdb -.endif # TDB_BUILDLINK3_MK +.endif # TDB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -tdb diff --git a/databases/tinycdb/buildlink3.mk b/databases/tinycdb/buildlink3.mk index 41f102898c5..8467198912b 100644 --- a/databases/tinycdb/buildlink3.mk +++ b/databases/tinycdb/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:40 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:08 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TINYCDB_BUILDLINK3_MK:= ${TINYCDB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= tinycdb -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= tinycdb -.endif +.if !defined(TINYCDB_BUILDLINK3_MK) +TINYCDB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntinycdb} -BUILDLINK_PACKAGES+= tinycdb -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tinycdb - -.if !empty(TINYCDB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.tinycdb+= tinycdb>=0.75 BUILDLINK_DEPMETHOD.tinycdb?= build BUILDLINK_PKGSRCDIR.tinycdb?= ../../databases/tinycdb -.endif # TINYCDB_BUILDLINK3_MK +.endif # TINYCDB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -tinycdb diff --git a/databases/tokyocabinet/buildlink3.mk b/databases/tokyocabinet/buildlink3.mk index efa4f796cb3..b1f8d6fbf35 100644 --- a/databases/tokyocabinet/buildlink3.mk +++ b/databases/tokyocabinet/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.3 2008/12/15 11:15:05 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:08 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TOKYOCABINET_BUILDLINK3_MK:= ${TOKYOCABINET_BUILDLINK3_MK}+ +BUILDLINK_TREE+= tokyocabinet -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= tokyocabinet -.endif +.if !defined(TOKYOCABINET_BUILDLINK3_MK) +TOKYOCABINET_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntokyocabinet} -BUILDLINK_PACKAGES+= tokyocabinet -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tokyocabinet - -.if ${TOKYOCABINET_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.tokyocabinet+= tokyocabinet>=1.3.7 BUILDLINK_ABI_DEPENDS.tokyocabinet+= tokyocabinet>=1.3.24 BUILDLINK_PKGSRCDIR.tokyocabinet?= ../../databases/tokyocabinet -.endif # TOKYOCABINET_BUILDLINK3_MK .include "../../archivers/bzip2/buildlink3.mk" .include "../../archivers/lzmalib/buildlink3.mk" .include "../../archivers/lzo/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.endif # TOKYOCABINET_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -tokyocabinet diff --git a/databases/unixodbc/buildlink3.mk b/databases/unixodbc/buildlink3.mk index aaa52813839..b2b475b30d9 100644 --- a/databases/unixodbc/buildlink3.mk +++ b/databases/unixodbc/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:41 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:08 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -UNIXODBC_BUILDLINK3_MK:= ${UNIXODBC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= unixodbc -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= unixodbc -.endif +.if !defined(UNIXODBC_BUILDLINK3_MK) +UNIXODBC_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nunixodbc} -BUILDLINK_PACKAGES+= unixodbc -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}unixodbc - -.if !empty(UNIXODBC_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.unixodbc+= unixodbc>=2.0.11nb1 BUILDLINK_ABI_DEPENDS.unixodbc+= unixodbc>=2.0.11nb3 BUILDLINK_PKGSRCDIR.unixodbc?= ../../databases/unixodbc -.endif # UNIXODBC_BUILDLINK3_MK +.endif # UNIXODBC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -unixodbc diff --git a/devel/GConf-ui/buildlink3.mk b/devel/GConf-ui/buildlink3.mk index 1699abb1f6b..30019714c1c 100644 --- a/devel/GConf-ui/buildlink3.mk +++ b/devel/GConf-ui/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/09/21 12:58:15 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:08 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GCONF_UI_BUILDLINK3_MK:= ${GCONF_UI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= GConf-ui -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= GConf-ui -.endif +.if !defined(GCONF_UI_BUILDLINK3_MK) +GCONF_UI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGConf-ui} -BUILDLINK_PACKAGES+= GConf-ui -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}GConf-ui - -.if !empty(GCONF_UI_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.GConf-ui+= GConf-ui>=2.8.0.1 BUILDLINK_ABI_DEPENDS.GConf-ui?= GConf-ui>=2.14.0nb1 BUILDLINK_PKGSRCDIR.GConf-ui?= ../../devel/GConf-ui -.endif # GCONF_UI_BUILDLINK3_MK .include "../../devel/GConf/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # GCONF_UI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -GConf-ui diff --git a/devel/GConf/buildlink3.mk b/devel/GConf/buildlink3.mk index bf2c088432b..0694ec2fad7 100644 --- a/devel/GConf/buildlink3.mk +++ b/devel/GConf/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.15 2008/10/09 20:53:48 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:24:08 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GCONF_BUILDLINK3_MK:= ${GCONF_BUILDLINK3_MK}+ +BUILDLINK_TREE+= GConf -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= GConf -.endif +.if !defined(GCONF_BUILDLINK3_MK) +GCONF_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGConf} -BUILDLINK_PACKAGES+= GConf -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}GConf - -.if !empty(GCONF_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.GConf+= GConf>=2.8.0.1 BUILDLINK_ABI_DEPENDS.GConf?= GConf>=2.12.1nb1 BUILDLINK_PKGSRCDIR.GConf?= ../../devel/GConf -.endif # GCONF_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" @@ -25,7 +17,6 @@ BUILDLINK_PKGSRCDIR.GConf?= ../../devel/GConf .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/xmlcatmgr/buildlink3.mk" -.if !empty(GCONF_BUILDLINK3_MK:M+) BUILDLINK_TARGETS+= GConf-buildlink-fake _GCONF_FAKE= ${BUILDLINK_DIR}/bin/gconftool-2 @@ -38,6 +29,6 @@ GConf-buildlink-fake: ${ECHO} "#!${SH}" > ${_GCONF_FAKE}; \ ${CHMOD} +x ${_GCONF_FAKE}; \ fi -.endif # GCONF_BUILDLINK3_MK +.endif # GCONF_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -GConf diff --git a/devel/Renaissance/buildlink3.mk b/devel/Renaissance/buildlink3.mk index f2bf09f1b21..d8cf8d5df58 100644 --- a/devel/Renaissance/buildlink3.mk +++ b/devel/Renaissance/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.10 2008/01/18 05:14:31 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:08 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -RENAISSANCE_BUILDLINK3_MK:= ${RENAISSANCE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= Renaissance -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= Renaissance -.endif +.if !defined(RENAISSANCE_BUILDLINK3_MK) +RENAISSANCE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NRenaissance} -BUILDLINK_PACKAGES+= Renaissance -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Renaissance - -.if !empty(RENAISSANCE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.Renaissance+= Renaissance>=0.7.0 BUILDLINK_ABI_DEPENDS.Renaissance+= Renaissance>=0.8.0nb7 BUILDLINK_PKGSRCDIR.Renaissance?= ../../devel/Renaissance -.endif # RENAISSANCE_BUILDLINK3_MK .include "../../x11/gnustep-back/buildlink3.mk" +.endif # RENAISSANCE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -Renaissance diff --git a/devel/SDL/buildlink3.mk b/devel/SDL/buildlink3.mk index 20dcac07386..508335a6099 100644 --- a/devel/SDL/buildlink3.mk +++ b/devel/SDL/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.29 2008/05/06 06:36:44 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.30 2009/03/20 19:24:08 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SDL_BUILDLINK3_MK:= ${SDL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= SDL -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= SDL -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDL} -BUILDLINK_PACKAGES+= SDL -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}SDL +.if !defined(SDL_BUILDLINK3_MK) +SDL_BUILDLINK3_MK:= -.if !empty(SDL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.SDL+= SDL>=1.2.5nb5 BUILDLINK_ABI_DEPENDS.SDL+= SDL>=1.2.10 BUILDLINK_PKGSRCDIR.SDL?= ../../devel/SDL -.endif # SDL_BUILDLINK3_MK PTHREAD_OPTS+= require @@ -43,5 +35,6 @@ pkgbase := SDL .include "../../x11/libXrandr/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" +.endif # SDL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -SDL diff --git a/devel/SDL_Pango/buildlink3.mk b/devel/SDL_Pango/buildlink3.mk index 9ea6170cca1..912732e3ea1 100644 --- a/devel/SDL_Pango/buildlink3.mk +++ b/devel/SDL_Pango/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.1 2008/01/28 20:15:57 heinz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:08 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SDL_PANGO_BUILDLINK3_MK:= ${SDL_PANGO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= SDL_Pango -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= SDL_Pango -.endif +.if !defined(SDL_PANGO_BUILDLINK3_MK) +SDL_PANGO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDL_Pango} -BUILDLINK_PACKAGES+= SDL_Pango -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}SDL_Pango - -.if ${SDL_PANGO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.SDL_Pango+= SDL_Pango>=0.1.2 BUILDLINK_ABI_DEPENDS.SDL_Pango+= SDL_Pango>=0.1.2 BUILDLINK_PKGSRCDIR.SDL_Pango?= ../../devel/SDL_Pango -.endif # SDL_PANGO_BUILDLINK3_MK # Seems to be unnecessary, pkg-config does not show anything from SDL #.include "../../devel/SDL/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" +.endif # SDL_PANGO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -SDL_Pango diff --git a/devel/SDL_gfx/buildlink3.mk b/devel/SDL_gfx/buildlink3.mk index bbe219c9c4b..4f62d134dda 100644 --- a/devel/SDL_gfx/buildlink3.mk +++ b/devel/SDL_gfx/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.10 2007/01/07 12:06:35 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:09 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SDL_GFX_BUILDLINK3_MK:= ${SDL_GFX_BUILDLINK3_MK}+ +BUILDLINK_TREE+= SDL_gfx -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= SDL_gfx -.endif +.if !defined(SDL_GFX_BUILDLINK3_MK) +SDL_GFX_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDL_gfx} -BUILDLINK_PACKAGES+= SDL_gfx -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}SDL_gfx - -.if !empty(SDL_GFX_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.SDL_gfx+= SDL_gfx>=2.0.3nb2 BUILDLINK_ABI_DEPENDS.SDL_gfx+= SDL_gfx>=2.0.15 BUILDLINK_PKGSRCDIR.SDL_gfx?= ../../devel/SDL_gfx -.endif # SDL_GFX_BUILDLINK3_MK .include "../../devel/SDL/buildlink3.mk" +.endif # SDL_GFX_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -SDL_gfx diff --git a/devel/SDL_ttf/buildlink3.mk b/devel/SDL_ttf/buildlink3.mk index 1ce36a501cd..7ce0d4b50c7 100644 --- a/devel/SDL_ttf/buildlink3.mk +++ b/devel/SDL_ttf/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:41 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:09 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SDL_TTF_BUILDLINK3_MK:= ${SDL_TTF_BUILDLINK3_MK}+ +BUILDLINK_TREE+= SDL_ttf -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= SDL_ttf -.endif +.if !defined(SDL_TTF_BUILDLINK3_MK) +SDL_TTF_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDL_ttf} -BUILDLINK_PACKAGES+= SDL_ttf -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}SDL_ttf - -.if !empty(SDL_TTF_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.SDL_ttf+= SDL_ttf>=2.0.3nb3 BUILDLINK_ABI_DEPENDS.SDL_ttf?= SDL_ttf>=2.0.8 BUILDLINK_PKGSRCDIR.SDL_ttf?= ../../devel/SDL_ttf -.endif # SDL_TTF_BUILDLINK3_MK .include "../../devel/SDL/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" +.endif # SDL_TTF_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -SDL_ttf diff --git a/devel/SDLmm/buildlink3.mk b/devel/SDLmm/buildlink3.mk index 64be2d51edc..2b7d854b0ab 100644 --- a/devel/SDLmm/buildlink3.mk +++ b/devel/SDLmm/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:41 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:09 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SDLMM_BUILDLINK3_MK:= ${SDLMM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= SDLmm -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= SDLmm -.endif +.if !defined(SDLMM_BUILDLINK3_MK) +SDLMM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDLmm} -BUILDLINK_PACKAGES+= SDLmm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}SDLmm - -.if !empty(SDLMM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.SDLmm+= SDLmm>=0.1.8nb1 BUILDLINK_ABI_DEPENDS.SDLmm?= SDLmm>=0.1.8nb6 BUILDLINK_PKGSRCDIR.SDLmm?= ../../devel/SDLmm -.endif # SDLMM_BUILDLINK3_MK .include "../../devel/SDL/buildlink3.mk" +.endif # SDLMM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -SDLmm diff --git a/devel/allegro/buildlink3.mk b/devel/allegro/buildlink3.mk index cb5481bbe11..ef0d3b7099c 100644 --- a/devel/allegro/buildlink3.mk +++ b/devel/allegro/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.9 2007/01/20 14:16:29 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:09 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ALLEGRO_BUILDLINK3_MK:= ${ALLEGRO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= allegro -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= allegro -.endif +.if !defined(ALLEGRO_BUILDLINK3_MK) +ALLEGRO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nallegro} -BUILDLINK_PACKAGES+= allegro -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}allegro - -.if !empty(ALLEGRO_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.allegro+= allegro>=4.1.13 BUILDLINK_ABI_DEPENDS.allegro?= allegro>=4.2.0nb1 BUILDLINK_PKGSRCDIR.allegro?= ../../devel/allegro -.endif # ALLEGRO_BUILDLINK3_MK .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXcursor/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXxf86vm/buildlink3.mk" .include "../../x11/xextproto/buildlink3.mk" +.endif # ALLEGRO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -allegro diff --git a/devel/apel/buildlink3.mk b/devel/apel/buildlink3.mk index e55330412dd..01af086ea61 100644 --- a/devel/apel/buildlink3.mk +++ b/devel/apel/buildlink3.mk @@ -1,24 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:55 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:09 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -APEL_BUILDLINK3_MK:= ${APEL_BUILDLINK3_MK}+ - .include "../../editors/emacs/modules.mk" .if ${EMACS_FLAVOR} == "emacs" -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= apel -.endif +BUILDLINK_TREE+= apel -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Napel} -BUILDLINK_PACKAGES+= apel -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}apel +.if !defined(APEL_BUILDLINK3_MK) +APEL_BUILDLINK3_MK:= -.if ${APEL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.apel+= ${EMACS_PKGNAME_PREFIX}apel>=10 BUILDLINK_PKGSRCDIR.apel?= ../../devel/apel -.endif # APEL_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.apel= ${EGREP} '.*\.el$$|.*\.elc$$' @@ -28,5 +20,6 @@ BUILDLINK_CONTENTS_FILTER.apel= ${EGREP} '.*\.el$$|.*\.elc$$' EMACS_MODULES+= base .endif +.endif # APEL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -apel diff --git a/devel/apr-util/buildlink3.mk b/devel/apr-util/buildlink3.mk index e531b878e90..92039083541 100644 --- a/devel/apr-util/buildlink3.mk +++ b/devel/apr-util/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.7 2008/09/06 20:54:32 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:09 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -APR_UTIL_BUILDLINK3_MK:= ${APR_UTIL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= apr-util -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= apr-util -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Napr-util} -BUILDLINK_PACKAGES+= apr-util -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}apr-util +.if !defined(APR_UTIL_BUILDLINK3_MK) +APR_UTIL_BUILDLINK3_MK:= -.if !empty(APR_UTIL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.apr-util+= apr-util>=1.2.8 BUILDLINK_ABI_DEPENDS.apr-util?= apr-util>=1.3.4 BUILDLINK_PKGSRCDIR.apr-util?= ../../devel/apr-util @@ -23,7 +16,6 @@ ${BUILDLINK_DIR}/bin/apu-config: buildlink-directories ${MKDIR} ${BUILDLINK_DIR}/bin && ${LN} -fs apu-1-config ${BUILDLINK_DIR}/bin/apu-config buildlink-apr-util-cookie: ${BUILDLINK_DIR}/bin/apu-config -.endif # APR_UTIL_BUILDLINK3_MK .include "../../mk/bsd.fast.prefs.mk" @@ -42,5 +34,6 @@ pkgbase := apr-util .include "../../devel/apr/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" +.endif # APR_UTIL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -apr-util diff --git a/devel/apr/buildlink3.mk b/devel/apr/buildlink3.mk index ee4e092a637..7da8b958260 100644 --- a/devel/apr/buildlink3.mk +++ b/devel/apr/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.31 2007/06/30 15:04:55 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.32 2009/03/20 19:24:09 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -APR_BUILDLINK3_MK:= ${APR_BUILDLINK3_MK}+ +BUILDLINK_TREE+= apr -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= apr -.endif +.if !defined(APR_BUILDLINK3_MK) +APR_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Napr} -BUILDLINK_PACKAGES+= apr -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}apr - -.if !empty(APR_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.apr+= apr>=1.2.8 BUILDLINK_PKGSRCDIR.apr?= ../../devel/apr BUILDLINK_INCDIRS.apr?= include/apr-1 @@ -23,7 +16,6 @@ ${BUILDLINK_DIR}/bin/apr-config: buildlink-directories ${MKDIR} ${BUILDLINK_DIR}/bin && ${LN} -fs apr-1-config ${BUILDLINK_DIR}/bin/apr-config buildlink-apr-cookie: ${BUILDLINK_DIR}/bin/apr-config +.endif # APR_BUILDLINK3_MK -.endif # APR_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -apr diff --git a/devel/apr0/buildlink3.mk b/devel/apr0/buildlink3.mk index 5da5d7b872c..25f4ddd1c42 100644 --- a/devel/apr0/buildlink3.mk +++ b/devel/apr0/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.9 2008/09/06 20:54:32 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:09 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -APR_BUILDLINK3_MK:= ${APR_BUILDLINK3_MK}+ +BUILDLINK_TREE+= apr -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= apr -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Napr} -BUILDLINK_PACKAGES+= apr -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}apr +.if !defined(APR_BUILDLINK3_MK) +APR_BUILDLINK3_MK:= -.if !empty(APR_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.apr+= apr-0.9.* apr>=0.9.5.2.0.51nb1 BUILDLINK_ABI_DEPENDS.apr+= apr>=0.9.17.2.0.63nb1 BUILDLINK_PKGSRCDIR.apr?= ../../devel/apr0 @@ -23,8 +16,6 @@ BUILDLINK_FILES.apr+= bin/apr-config BUILDLINK_FILES.apr+= bin/apu-config BUILDLINK_FILES.apr+= lib/*.exp -.endif # APR_BUILDLINK3_MK - .include "../../mk/bsd.fast.prefs.mk" pkgbase := apr @@ -41,5 +32,6 @@ pkgbase := apr .include "../../converters/libiconv/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" +.endif # APR_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -apr diff --git a/devel/argp/buildlink3.mk b/devel/argp/buildlink3.mk index bb98c7ef01c..045d0cee8fd 100644 --- a/devel/argp/buildlink3.mk +++ b/devel/argp/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/03/24 16:57:41 agc Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:09 joerg Exp $ # Packages that only install static libraries or headers should # include the following line: # # BUILDLINK_DEPMETHOD.argp?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ARGP_BUILDLINK3_MK:= ${ARGP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= argp -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= argp -.endif +.if !defined(ARGP_BUILDLINK3_MK) +ARGP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nargp} -BUILDLINK_PACKAGES+= argp -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}argp - -.if ${ARGP_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.argp+= argp>=1.3 BUILDLINK_PKGSRCDIR.argp?= ../../devel/argp -.endif # ARGP_BUILDLINK3_MK +.endif # ARGP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -argp diff --git a/devel/at-spi/buildlink3.mk b/devel/at-spi/buildlink3.mk index 7608c57db10..cf365d38838 100644 --- a/devel/at-spi/buildlink3.mk +++ b/devel/at-spi/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.16 2008/10/16 12:26:36 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:09 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -AT_SPI_BUILDLINK3_MK:= ${AT_SPI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= at-spi -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= at-spi -.endif +.if !defined(AT_SPI_BUILDLINK3_MK) +AT_SPI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nat-spi} -BUILDLINK_PACKAGES+= at-spi -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}at-spi - -.if !empty(AT_SPI_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.at-spi+= at-spi>=1.6.0 BUILDLINK_ABI_DEPENDS.at-spi+= at-spi>=1.7.7nb1 BUILDLINK_PKGSRCDIR.at-spi?= ../../devel/at-spi -.endif # AT_SPI_BUILDLINK3_MK .include "../../devel/atk/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libXtst/buildlink3.mk" +.endif # AT_SPI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -at-spi diff --git a/devel/atk/buildlink3.mk b/devel/atk/buildlink3.mk index a19b50db4b5..ffd1cac3851 100644 --- a/devel/atk/buildlink3.mk +++ b/devel/atk/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:41 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:09 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ATK_BUILDLINK3_MK:= ${ATK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= atk -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= atk -.endif +.if !defined(ATK_BUILDLINK3_MK) +ATK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Natk} -BUILDLINK_PACKAGES+= atk -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}atk - -.if !empty(ATK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.atk+= atk>=1.11.4 BUILDLINK_ABI_DEPENDS.atk+= atk>=1.11.4 BUILDLINK_PKGSRCDIR.atk?= ../../devel/atk -.endif # ATK_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # ATK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -atk diff --git a/devel/bglibs/buildlink3.mk b/devel/bglibs/buildlink3.mk index e0250948f8a..3416de7bc23 100644 --- a/devel/bglibs/buildlink3.mk +++ b/devel/bglibs/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.12 2008/04/12 20:56:25 schmonz Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:10 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BGLIBS_BUILDLINK3_MK:= ${BGLIBS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= bglibs -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= bglibs -.endif +.if !defined(BGLIBS_BUILDLINK3_MK) +BGLIBS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbglibs} -BUILDLINK_PACKAGES+= bglibs -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}bglibs - -.if !empty(BGLIBS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.bglibs+= bglibs>=1.104 BUILDLINK_PKGSRCDIR.bglibs?= ../../devel/bglibs -.endif # BGLIBS_BUILDLINK3_MK +.endif # BGLIBS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -bglibs diff --git a/devel/binutils/buildlink3.mk b/devel/binutils/buildlink3.mk index f75eb266995..2c09efc8722 100644 --- a/devel/binutils/buildlink3.mk +++ b/devel/binutils/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.22 2008/03/24 23:40:37 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.23 2009/03/20 19:24:10 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BINUTILS_BUILDLINK3_MK:= ${BINUTILS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= binutils -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= binutils -.endif +.if !defined(BINUTILS_BUILDLINK3_MK) +BINUTILS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbinutils} -BUILDLINK_PACKAGES+= binutils -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}binutils - -.if ${BINUTILS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.binutils+= binutils>=2.17 BUILDLINK_PKGSRCDIR.binutils?= ../../devel/binutils BUILDLINK_DEPMETHOD.binutils?= build -.endif # BINUTILS_BUILDLINK3_MK +.endif # BINUTILS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -binutils diff --git a/devel/blib/buildlink3.mk b/devel/blib/buildlink3.mk index 02999c5860b..8e060ca7bb3 100644 --- a/devel/blib/buildlink3.mk +++ b/devel/blib/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:41 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:10 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BLIB_BUILDLINK3_MK:= ${BLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= blib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= blib -.endif +.if !defined(BLIB_BUILDLINK3_MK) +BLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nblib} -BUILDLINK_PACKAGES+= blib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}blib - -.if !empty(BLIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.blib+= blib>=1.0.2nb1 BUILDLINK_ABI_DEPENDS.blib+= blib>=1.0.2nb5 BUILDLINK_PKGSRCDIR.blib?= ../../devel/blib -.endif # BLIB_BUILDLINK3_MK .include "../../x11/gtk2/buildlink3.mk" +.endif # BLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -blib diff --git a/devel/boehm-gc/buildlink3.mk b/devel/boehm-gc/buildlink3.mk index 5fb59c84368..6c35d41c545 100644 --- a/devel/boehm-gc/buildlink3.mk +++ b/devel/boehm-gc/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:10:41 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:10 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BOEHM_GC_BUILDLINK3_MK:= ${BOEHM_GC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= boehm-gc -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= boehm-gc -.endif +.if !defined(BOEHM_GC_BUILDLINK3_MK) +BOEHM_GC_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nboehm-gc} -BUILDLINK_PACKAGES+= boehm-gc -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}boehm-gc - -.if !empty(BOEHM_GC_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.boehm-gc+= boehm-gc>=6.3nb1 BUILDLINK_ABI_DEPENDS.boehm-gc+= boehm-gc>=6.6nb1 BUILDLINK_PKGSRCDIR.boehm-gc?= ../../devel/boehm-gc -.endif # BOEHM_GC_BUILDLINK3_MK +.endif # BOEHM_GC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -boehm-gc diff --git a/devel/boost-build/buildlink3.mk b/devel/boost-build/buildlink3.mk index a2672d294cf..ba1121c1279 100644 --- a/devel/boost-build/buildlink3.mk +++ b/devel/boost-build/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.10 2009/03/03 08:57:57 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:10 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BOOST_BUILD_BUILDLINK3_MK:= ${BOOST_BUILD_BUILDLINK3_MK}+ +BUILDLINK_TREE+= boost-build -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= boost-build -.endif +.if !defined(BOOST_BUILD_BUILDLINK3_MK) +BOOST_BUILD_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nboost-build} -BUILDLINK_PACKAGES+= boost-build -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}boost-build - -.if !empty(BOOST_BUILD_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.boost-build+= boost-build-1.38.* BUILDLINK_DEPMETHOD.boost-build?= build BUILDLINK_PKGSRCDIR.boost-build?= ../../devel/boost-build -.endif # BOOST_BUILD_BUILDLINK3_MK +.endif # BOOST_BUILD_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -boost-build diff --git a/devel/boost-headers/buildlink3.mk b/devel/boost-headers/buildlink3.mk index d98b5906886..df189614119 100644 --- a/devel/boost-headers/buildlink3.mk +++ b/devel/boost-headers/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.11 2009/03/03 08:57:58 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:10 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BOOST_HEADERS_BUILDLINK3_MK:= ${BOOST_HEADERS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= boost-headers -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= boost-headers -.endif +.if !defined(BOOST_HEADERS_BUILDLINK3_MK) +BOOST_HEADERS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nboost-headers} -BUILDLINK_PACKAGES+= boost-headers -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}boost-headers - -.if !empty(BOOST_HEADERS_BUILDLINK3_MK:M+) # Use a dependency pattern that guarantees the proper ABI. BUILDLINK_API_DEPENDS.boost-headers+= boost-headers-1.38.* BUILDLINK_DEPMETHOD.boost-headers?= build BUILDLINK_PKGSRCDIR.boost-headers?= ../../devel/boost-headers -.endif # BOOST_HEADERS_BUILDLINK3_MK PTHREAD_OPTS+= require .include "../../mk/pthread.buildlink3.mk" +.endif # BOOST_HEADERS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -boost-headers diff --git a/devel/boost-jam/buildlink3.mk b/devel/boost-jam/buildlink3.mk index 168fdc20c92..bddd9d8c342 100644 --- a/devel/boost-jam/buildlink3.mk +++ b/devel/boost-jam/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.4 2009/03/03 08:57:58 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:24:10 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BOOST_JAM_BUILDLINK3_MK:= ${BOOST_JAM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= boost-jam -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= boost-jam -.endif +.if !defined(BOOST_JAM_BUILDLINK3_MK) +BOOST_JAM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nboost-jam} -BUILDLINK_PACKAGES+= boost-jam -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}boost-jam - -.if !empty(BOOST_JAM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.boost-jam+= boost-jam-1.38.* BUILDLINK_DEPMETHOD.boost-jam?= build BUILDLINK_PKGSRCDIR.boost-jam?= ../../devel/boost-jam -.endif # BOOST_JAM_BUILDLINK3_MK +.endif # BOOST_JAM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -boost-jam diff --git a/devel/boost-libs/buildlink3.mk b/devel/boost-libs/buildlink3.mk index fbe185d65d6..89a1251fc84 100644 --- a/devel/boost-libs/buildlink3.mk +++ b/devel/boost-libs/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.11 2009/03/03 08:57:58 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:10 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BOOST_LIBS_BUILDLINK3_MK:= ${BOOST_LIBS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= boost-libs -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= boost-libs -.endif +.if !defined(BOOST_LIBS_BUILDLINK3_MK) +BOOST_LIBS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nboost-libs} -BUILDLINK_PACKAGES+= boost-libs -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}boost-libs - -.if !empty(BOOST_LIBS_BUILDLINK3_MK:M+) # Use a dependency pattern that guarantees the proper ABI. BUILDLINK_API_DEPENDS.boost-libs+= boost-libs-1.38.* BUILDLINK_PKGSRCDIR.boost-libs?= ../../devel/boost-libs -.endif # BOOST_LIBS_BUILDLINK3_MK .include "../../devel/boost-headers/buildlink3.mk" +.endif # BOOST_LIBS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -boost-libs diff --git a/devel/boost-python/buildlink3.mk b/devel/boost-python/buildlink3.mk index 395885bc33a..a26cbd02b16 100644 --- a/devel/boost-python/buildlink3.mk +++ b/devel/boost-python/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.15 2009/03/19 17:05:51 cube Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:24:10 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BOOST_PYTHON_BUILDLINK3_MK:= ${BOOST_PYTHON_BUILDLINK3_MK}+ +BUILDLINK_TREE+= boost-python -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= boost-python -.endif +.if !defined(BOOST_PYTHON_BUILDLINK3_MK) +BOOST_PYTHON_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nboost-python} -BUILDLINK_PACKAGES+= boost-python -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}boost-python - -.if !empty(BOOST_PYTHON_BUILDLINK3_MK:M+) # Use a dependency pattern that guarantees the proper ABI. BUILDLINK_API_DEPENDS.boost-python+= boost-python-1.38.* BUILDLINK_ABI_DEPENDS.boost-python?= boost-python>=1.38.* BUILDLINK_PKGSRCDIR.boost-python?= ../../devel/boost-python -.endif # BOOST_PYTHON_BUILDLINK3_MK .include "../../devel/boost-headers/buildlink3.mk" +.endif # BOOST_PYTHON_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -boost-python diff --git a/devel/buddy/buildlink3.mk b/devel/buddy/buildlink3.mk index 6d452c341cb..01d4c886023 100644 --- a/devel/buddy/buildlink3.mk +++ b/devel/buddy/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:41 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:10 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BUDDY_BUILDLINK3_MK:= ${BUDDY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= buddy -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= buddy -.endif +.if !defined(BUDDY_BUILDLINK3_MK) +BUDDY_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbuddy} -BUILDLINK_PACKAGES+= buddy -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}buddy - -.if !empty(BUDDY_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.buddy+= buddy>=2.4 BUILDLINK_PKGSRCDIR.buddy?= ../../devel/buddy -.endif # BUDDY_BUILDLINK3_MK +.endif # BUDDY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -buddy diff --git a/devel/cdk/buildlink3.mk b/devel/cdk/buildlink3.mk index 022c81c2c01..e40650c47b2 100644 --- a/devel/cdk/buildlink3.mk +++ b/devel/cdk/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:42 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:11 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CDK_BUILDLINK3_MK:= ${CDK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= cdk -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= cdk -.endif +.if !defined(CDK_BUILDLINK3_MK) +CDK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncdk} -BUILDLINK_PACKAGES+= cdk -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cdk - -.if !empty(CDK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.cdk+= cdk>=4.9.9nb1 BUILDLINK_ABI_DEPENDS.cdk+= cdk>=4.9.9nb2 BUILDLINK_PKGSRCDIR.cdk?= ../../devel/cdk -.endif # CDK_BUILDLINK3_MK USE_NCURSES= yes .include "../../devel/ncurses/buildlink3.mk" +.endif # CDK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -cdk diff --git a/devel/cfitsio/buildlink3.mk b/devel/cfitsio/buildlink3.mk index 097cc8db586..d7d04cdc8b3 100644 --- a/devel/cfitsio/buildlink3.mk +++ b/devel/cfitsio/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1 2008/12/29 10:13:12 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:11 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CFITSIO_BUILDLINK3_MK:= ${CFITSIO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= cfitsio -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= cfitsio -.endif +.if !defined(CFITSIO_BUILDLINK3_MK) +CFITSIO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncfitsio} -BUILDLINK_PACKAGES+= cfitsio -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cfitsio - -.if ${CFITSIO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.cfitsio+= cfitsio>=3.100 BUILDLINK_PKGSRCDIR.cfitsio?= ../../devel/cfitsio -.endif # CFITSIO_BUILDLINK3_MK +.endif # CFITSIO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -cfitsio diff --git a/devel/check/buildlink3.mk b/devel/check/buildlink3.mk index 60c5c3a3226..4b38ac09a99 100644 --- a/devel/check/buildlink3.mk +++ b/devel/check/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/02/01 19:07:24 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:11 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CHECK_BUILDLINK3_MK:= ${CHECK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= check -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= check -.endif +.if !defined(CHECK_BUILDLINK3_MK) +CHECK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncheck} -BUILDLINK_PACKAGES+= check -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}check - -.if ${CHECK_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.check+= check>=0.9.5 BUILDLINK_PKGSRCDIR.check?= ../../devel/check -.endif # CHECK_BUILDLINK3_MK +.endif # CHECK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -check diff --git a/devel/chmlib/buildlink3.mk b/devel/chmlib/buildlink3.mk index 3f3e874faa6..e091e5271a3 100644 --- a/devel/chmlib/buildlink3.mk +++ b/devel/chmlib/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:42 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:11 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CHMLIB_BUILDLINK3_MK:= ${CHMLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= chmlib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= chmlib -.endif +.if !defined(CHMLIB_BUILDLINK3_MK) +CHMLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nchmlib} -BUILDLINK_PACKAGES+= chmlib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}chmlib - -.if !empty(CHMLIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.chmlib+= chmlib>=0.31 BUILDLINK_ABI_DEPENDS.chmlib+= chmlib>=0.37.4nb2 BUILDLINK_PKGSRCDIR.chmlib?= ../../devel/chmlib -.endif # CHMLIB_BUILDLINK3_MK +.endif # CHMLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -chmlib diff --git a/devel/cmake/buildlink3.mk b/devel/cmake/buildlink3.mk index 985f1af01c7..39283ab9df3 100644 --- a/devel/cmake/buildlink3.mk +++ b/devel/cmake/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.9 2007/03/12 06:42:33 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:11 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CMAKE_BUILDLINK3_MK:= ${CMAKE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= cmake -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= cmake -.endif +.if !defined(CMAKE_BUILDLINK3_MK) +CMAKE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncmake} -BUILDLINK_PACKAGES+= cmake -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cmake - -.if ${CMAKE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.cmake+= cmake>=2.4.6nb3 BUILDLINK_PKGSRCDIR.cmake?= ../../devel/cmake BUILDLINK_DEPMETHOD.cmake?= build BUILDLINK_FILES.cmake+= share/cmake-*/include/* -.endif # CMAKE_BUILDLINK3_MK +.endif # CMAKE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -cmake diff --git a/devel/compiz-bcop/buildlink3.mk b/devel/compiz-bcop/buildlink3.mk index 4c21d15ca8c..306ac59ffe5 100644 --- a/devel/compiz-bcop/buildlink3.mk +++ b/devel/compiz-bcop/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/05/14 16:40:20 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:11 joerg Exp $ BUILDLINK_DEPMETHOD.compiz-bcop?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -COMPIZ_BCOP_BUILDLINK3_MK:= ${COMPIZ_BCOP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= compiz-bcop -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= compiz-bcop -.endif +.if !defined(COMPIZ_BCOP_BUILDLINK3_MK) +COMPIZ_BCOP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncompiz-bcop} -BUILDLINK_PACKAGES+= compiz-bcop -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}compiz-bcop - -.if ${COMPIZ_BCOP_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.compiz-bcop+= compiz-bcop>=0.6.0 BUILDLINK_PKGSRCDIR.compiz-bcop?= ../../devel/compiz-bcop -.endif # COMPIZ_BCOP_BUILDLINK3_MK +.endif # COMPIZ_BCOP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -compiz-bcop diff --git a/devel/confuse/buildlink3.mk b/devel/confuse/buildlink3.mk index 0cdb0dc11bc..612a26cf205 100644 --- a/devel/confuse/buildlink3.mk +++ b/devel/confuse/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.2 2007/03/02 03:18:25 dmcmahill Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:11 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CONFUSE_BUILDLINK3_MK:= ${CONFUSE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= confuse -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= confuse -.endif +.if !defined(CONFUSE_BUILDLINK3_MK) +CONFUSE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nconfuse} -BUILDLINK_PACKAGES+= confuse -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}confuse - -.if ${CONFUSE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.confuse+= confuse>=2.5 BUILDLINK_PKGSRCDIR.confuse?= ../../devel/confuse -.endif # CONFUSE_BUILDLINK3_MK +.endif # CONFUSE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -confuse diff --git a/devel/cppunit/buildlink3.mk b/devel/cppunit/buildlink3.mk index 154fe302925..302b5594aba 100644 --- a/devel/cppunit/buildlink3.mk +++ b/devel/cppunit/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:42 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:11 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CPPUNIT_BUILDLINK3_MK:= ${CPPUNIT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= cppunit -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= cppunit -.endif +.if !defined(CPPUNIT_BUILDLINK3_MK) +CPPUNIT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncppunit} -BUILDLINK_PACKAGES+= cppunit -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cppunit - -.if !empty(CPPUNIT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.cppunit+= cppunit>=1.10.2 BUILDLINK_ABI_DEPENDS.cppunit?= cppunit>=1.10.2nb5 BUILDLINK_PKGSRCDIR.cppunit?= ../../devel/cppunit BUILDLINK_CPPFLAGS.cppunit+= -I${BUILDLINK_PREFIX.cppunit}/include/cppunit -.endif # CPPUNIT_BUILDLINK3_MK +.endif # CPPUNIT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -cppunit diff --git a/devel/cunit/buildlink3.mk b/devel/cunit/buildlink3.mk index 01edbb5a12f..669306571d5 100644 --- a/devel/cunit/buildlink3.mk +++ b/devel/cunit/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/10 21:03:58 agc Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:11 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CUNIT_BUILDLINK3_MK:= ${CUNIT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= CUnit -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= CUnit -.endif +.if !defined(CUNIT_BUILDLINK3_MK) +CUNIT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NCUnit} -BUILDLINK_PACKAGES+= CUnit -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}CUnit - -.if ${CUNIT_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.CUnit+= CUnit>=2.1 BUILDLINK_PKGSRCDIR.CUnit?= ../../devel/cunit -.endif # CUNIT_BUILDLINK3_MK +.endif # CUNIT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -CUnit diff --git a/devel/darts/buildlink3.mk b/devel/darts/buildlink3.mk index 9189b4ff97b..81b3196ae40 100644 --- a/devel/darts/buildlink3.mk +++ b/devel/darts/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2008/08/03 15:21:56 taca Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:11 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -DARTS_BUILDLINK3_MK:= ${DARTS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= darts -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= darts -.endif +.if !defined(DARTS_BUILDLINK3_MK) +DARTS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndarts} -BUILDLINK_PACKAGES+= darts -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}darts - -.if !empty(DARTS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.darts+= darts>=0.32 BUILDLINK_PKGSRCDIR.darts?= ../../devel/darts BUILDLINK_DEPMETHOD.darts?= build -.endif # DARTS_BUILDLINK3_MK +.endif # DARTS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -darts diff --git a/devel/devIL/buildlink3.mk b/devel/devIL/buildlink3.mk index 76eef3fbab8..2dac0a4f1f7 100644 --- a/devel/devIL/buildlink3.mk +++ b/devel/devIL/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.14 2006/12/15 20:32:54 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:12 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -DEVIL_BUILDLINK3_MK:= ${DEVIL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= devIL -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= devIL -.endif +.if !defined(DEVIL_BUILDLINK3_MK) +DEVIL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NdevIL} -BUILDLINK_PACKAGES+= devIL -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}devIL - -.if !empty(DEVIL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.devIL+= devIL>=1.6.6nb1 BUILDLINK_ABI_DEPENDS.devIL+= devIL>=1.6.6nb9 BUILDLINK_PKGSRCDIR.devIL?= ../../devel/devIL -.endif # DEVIL_BUILDLINK3_MK .include "../../devel/SDL/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" @@ -24,5 +16,6 @@ BUILDLINK_PKGSRCDIR.devIL?= ../../devel/devIL .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.endif # DEVIL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -devIL diff --git a/devel/devhelp/buildlink3.mk b/devel/devhelp/buildlink3.mk index c36d569ee2f..fb245eb1061 100644 --- a/devel/devhelp/buildlink3.mk +++ b/devel/devhelp/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.2 2007/09/21 13:03:34 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:12 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -DEVHELP_BUILDLINK3_MK:= ${DEVHELP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= devhelp -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= devhelp -.endif +.if !defined(DEVHELP_BUILDLINK3_MK) +DEVHELP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndevhelp} -BUILDLINK_PACKAGES+= devhelp -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}devhelp - -.if ${DEVHELP_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.devhelp+= devhelp>=0.12nb1 BUILDLINK_PKGSRCDIR.devhelp?= ../../devel/devhelp -.endif # DEVHELP_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" @@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.devhelp?= ../../devel/devhelp .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # DEVHELP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -devhelp diff --git a/devel/dlcompat/buildlink3.mk b/devel/dlcompat/buildlink3.mk index 63a1c5ef2e2..f7a9a710fae 100644 --- a/devel/dlcompat/buildlink3.mk +++ b/devel/dlcompat/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.12 2007/03/27 06:32:06 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:12 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -DLCOMPAT_BUILDLINK3_MK:= ${DLCOMPAT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= dlcompat -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= dlcompat -.endif +.if !defined(DLCOMPAT_BUILDLINK3_MK) +DLCOMPAT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndlcompat} -BUILDLINK_PACKAGES+= dlcompat -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dlcompat - -.if !empty(DLCOMPAT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.dlcompat+= dlcompat>=20030629 BUILDLINK_PKGSRCDIR.dlcompat?= ../../devel/dlcompat BUILDLINK_LDFLAGS.dlcompat+= -ldl -.endif # DLCOMPAT_BUILDLINK3_MK +.endif # DLCOMPAT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -dlcompat diff --git a/devel/dmalloc/buildlink3.mk b/devel/dmalloc/buildlink3.mk index c5b34c02e38..0df61390716 100644 --- a/devel/dmalloc/buildlink3.mk +++ b/devel/dmalloc/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:42 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:12 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -DMALLOC_BUILDLINK3_MK:= ${DMALLOC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= dmalloc -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= dmalloc -.endif +.if !defined(DMALLOC_BUILDLINK3_MK) +DMALLOC_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndmalloc} -BUILDLINK_PACKAGES+= dmalloc -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dmalloc - -.if !empty(DMALLOC_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.dmalloc+= dmalloc>=4.8.2nb2 BUILDLINK_PKGSRCDIR.dmalloc?= ../../devel/dmalloc BUILDLINK_DEPMETHOD.dmalloc?= build -.endif # DMALLOC_BUILDLINK3_MK +.endif # DMALLOC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -dmalloc diff --git a/devel/edcommon/buildlink3.mk b/devel/edcommon/buildlink3.mk index 78d538a7e63..a0f828b2fe6 100644 --- a/devel/edcommon/buildlink3.mk +++ b/devel/edcommon/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:42 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:12 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EDCOMMON_BUILDLINK3_MK:= ${EDCOMMON_BUILDLINK3_MK}+ +BUILDLINK_TREE+= edcommon -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= edcommon -.endif +.if !defined(EDCOMMON_BUILDLINK3_MK) +EDCOMMON_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nedcommon} -BUILDLINK_PACKAGES+= edcommon -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}edcommon - -.if !empty(EDCOMMON_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.edcommon+= edcommon>=32 BUILDLINK_ABI_DEPENDS.edcommon?= edcommon>=32nb2 BUILDLINK_PKGSRCDIR.edcommon?= ../../devel/edcommon -.endif # EDCOMMON_BUILDLINK3_MK +.endif # EDCOMMON_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -edcommon diff --git a/devel/eel/buildlink3.mk b/devel/eel/buildlink3.mk index bf733997cb0..1b27d0a9008 100644 --- a/devel/eel/buildlink3.mk +++ b/devel/eel/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.5 2008/10/16 13:46:59 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:12 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EEL_BUILDLINK3_MK:= ${EEL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= eel -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= eel -.endif +.if !defined(EEL_BUILDLINK3_MK) +EEL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Neel} -BUILDLINK_PACKAGES+= eel -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}eel - -.if !empty(EEL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.eel+= eel>=2.10.0 BUILDLINK_ABI_DEPENDS.eel?= eel>=2.20.0nb1 BUILDLINK_PKGSRCDIR.eel?= ../../devel/eel -.endif # EEL_BUILDLINK3_MK .include "../../devel/GConf/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -30,5 +22,6 @@ BUILDLINK_PKGSRCDIR.eel?= ../../devel/eel .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" +.endif # EEL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -eel diff --git a/devel/eet/buildlink3.mk b/devel/eet/buildlink3.mk index 555867a6eeb..a6f8538afc4 100644 --- a/devel/eet/buildlink3.mk +++ b/devel/eet/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.8 2008/06/22 01:21:31 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:12 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EET_BUILDLINK3_MK:= ${EET_BUILDLINK3_MK}+ +BUILDLINK_TREE+= eet -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= eet -.endif +.if !defined(EET_BUILDLINK3_MK) +EET_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Neet} -BUILDLINK_PACKAGES+= eet -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}eet - -.if ${EET_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.eet+= eet>=1.0.1 BUILDLINK_PKGSRCDIR.eet?= ../../devel/eet -.endif # EET_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" +.endif # EET_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -eet diff --git a/devel/elib/buildlink3.mk b/devel/elib/buildlink3.mk index 2f7151e1ed5..2b51b7d85d1 100644 --- a/devel/elib/buildlink3.mk +++ b/devel/elib/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:41:17 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:12 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ELIB_BUILDLINK3_MK:= ${ELIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= elib -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= elib -.endif +.if !defined(ELIB_BUILDLINK3_MK) +ELIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nelib} -BUILDLINK_PACKAGES+= elib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}elib - -.if ${ELIB_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.elib+= ${EMACS_PKGNAME_PREFIX}elib>=1 BUILDLINK_PKGSRCDIR.elib?= ../../devel/elib -.endif # ELIB_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.elib= ${EGREP} '.*\.el$$|.*\.elc$$' +.endif # ELIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -elib diff --git a/devel/exempi/buildlink3.mk b/devel/exempi/buildlink3.mk index 88fb9100652..accf417ef9a 100644 --- a/devel/exempi/buildlink3.mk +++ b/devel/exempi/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/04/12 10:56:18 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:12 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EXEMPI_BUILDLINK3_MK:= ${EXEMPI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= exempi -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= exempi -.endif +.if !defined(EXEMPI_BUILDLINK3_MK) +EXEMPI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nexempi} -BUILDLINK_PACKAGES+= exempi -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}exempi - -.if ${EXEMPI_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.exempi+= exempi>=1.99.9 BUILDLINK_PKGSRCDIR.exempi?= ../../devel/exempi -.endif # EXEMPI_BUILDLINK3_MK .include "../../textproc/expat/buildlink3.mk" +.endif # EXEMPI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -exempi diff --git a/devel/fann-devel/buildlink3.mk b/devel/fann-devel/buildlink3.mk index aff62eaac09..d95a577fe62 100644 --- a/devel/fann-devel/buildlink3.mk +++ b/devel/fann-devel/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/10/12 18:30:22 gdt Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:12 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FANN_BUILDLINK3_MK:= ${FANN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= fann -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= fann -.endif +.if !defined(FANN_BUILDLINK3_MK) +FANN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfann} -BUILDLINK_PACKAGES+= fann -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fann - -.if ${FANN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.fann+= fann>=2.1.0.20061012 BUILDLINK_PKGSRCDIR.fann?= ../../devel/fann-devel -.endif # FANN_BUILDLINK3_MK +.endif # FANN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -fann diff --git a/devel/fann/buildlink3.mk b/devel/fann/buildlink3.mk index 9ae2e97b297..c7f910f82de 100644 --- a/devel/fann/buildlink3.mk +++ b/devel/fann/buildlink3.mk @@ -1,18 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1 2006/10/05 14:55:21 gdt Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FANN_BUILDLINK3_MK:= ${FANN_BUILDLINK3_MK}+ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:12 joerg Exp $ -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= fann -.endif +BUILDLINK_TREE+= fann -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfann} -BUILDLINK_PACKAGES+= fann -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fann +.if !defined(FANN_BUILDLINK3_MK) +FANN_BUILDLINK3_MK:= -.if ${FANN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.fann+= fann>=2.0.0 BUILDLINK_PKGSRCDIR.fann?= ../../devel/fann -.endif # FANN_BUILDLINK3_MK +.endif # FANN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -fann diff --git a/devel/ffcall/buildlink3.mk b/devel/ffcall/buildlink3.mk index df03752e345..18ffee8bb80 100644 --- a/devel/ffcall/buildlink3.mk +++ b/devel/ffcall/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:42 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:13 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FFCALL_BUILDLINK3_MK:= ${FFCALL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ffcall -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ffcall -.endif +.if !defined(FFCALL_BUILDLINK3_MK) +FFCALL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nffcall} -BUILDLINK_PACKAGES+= ffcall -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ffcall - -.if !empty(FFCALL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ffcall+= ffcall>=1.9 BUILDLINK_ABI_DEPENDS.ffcall+= ffcall>=1.10nb1 BUILDLINK_PKGSRCDIR.ffcall?= ../../devel/ffcall -.endif # FFCALL_BUILDLINK3_MK +.endif # FFCALL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ffcall diff --git a/devel/flex/buildlink3.mk b/devel/flex/buildlink3.mk index 1a93889e987..517bf9c9602 100644 --- a/devel/flex/buildlink3.mk +++ b/devel/flex/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:42 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:13 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FLEX_BUILDLINK3_MK:= ${FLEX_BUILDLINK3_MK}+ +BUILDLINK_TREE+= flex -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= flex -.endif +.if !defined(FLEX_BUILDLINK3_MK) +FLEX_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nflex} -BUILDLINK_PACKAGES+= flex -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}flex - -.if !empty(FLEX_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.flex+= flex>=2.5.4a BUILDLINK_PKGSRCDIR.flex?= ../../devel/flex BUILDLINK_DEPMETHOD.flex?= build -.endif # FLEX_BUILDLINK3_MK +.endif # FLEX_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -flex diff --git a/devel/flim/buildlink3.mk b/devel/flim/buildlink3.mk index 66e99508363..63eabf22a0a 100644 --- a/devel/flim/buildlink3.mk +++ b/devel/flim/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:41:17 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:13 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FLIM_BUILDLINK3_MK:= ${FLIM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= flim -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= flim -.endif +.if !defined(FLIM_BUILDLINK3_MK) +FLIM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nflim} -BUILDLINK_PACKAGES+= flim -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}flim - -.if ${FLIM_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.flim+= ${EMACS_PKGNAME_PREFIX}flim>=1.14 BUILDLINK_PKGSRCDIR.flim?= ../../devel/flim -.endif # FLIM_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.flim= ${EGREP} '.*\.el$$|.*\.elc$$' .include "../../devel/apel/buildlink3.mk" +.endif # FLIM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -flim diff --git a/devel/florist/buildlink3.mk b/devel/florist/buildlink3.mk index 8ccd09f5be5..d16cee6594e 100644 --- a/devel/florist/buildlink3.mk +++ b/devel/florist/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:42 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:13 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FLORIST_BUILDLINK3_MK:= ${FLORIST_BUILDLINK3_MK}+ +BUILDLINK_TREE+= florist -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= florist -.endif +.if !defined(FLORIST_BUILDLINK3_MK) +FLORIST_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nflorist} -BUILDLINK_PACKAGES+= florist -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}florist - -.if !empty(FLORIST_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.florist+= florist>=3.15p BUILDLINK_ABI_DEPENDS.florist?= florist>=3.15pnb2 BUILDLINK_PKGSRCDIR.florist?= ../../devel/florist -.endif # FLORIST_BUILDLINK3_MK +.endif # FLORIST_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -florist diff --git a/devel/g-wrap/buildlink3.mk b/devel/g-wrap/buildlink3.mk index e0c9932b9ff..aa3dc7ec0db 100644 --- a/devel/g-wrap/buildlink3.mk +++ b/devel/g-wrap/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.11 2009/02/21 02:09:00 gdt Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:13 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -G_WRAP_BUILDLINK3_MK:= ${G_WRAP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= g-wrap -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= g-wrap -.endif +.if !defined(G_WRAP_BUILDLINK3_MK) +G_WRAP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ng-wrap} -BUILDLINK_PACKAGES+= g-wrap -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}g-wrap - -.if !empty(G_WRAP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.g-wrap+= g-wrap>=1.9.5 BUILDLINK_ABI_DEPENDS.g-wrap?= g-wrap>=1.9.6nb1 BUILDLINK_PKGSRCDIR.g-wrap?= ../../devel/g-wrap -.endif # G_WRAP_BUILDLINK3_MK .include "../../devel/libffi/buildlink3.mk" .include "../../lang/guile/buildlink3.mk" +.endif # G_WRAP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -g-wrap diff --git a/devel/gconfmm/buildlink3.mk b/devel/gconfmm/buildlink3.mk index e30757c6795..ee239dfa084 100644 --- a/devel/gconfmm/buildlink3.mk +++ b/devel/gconfmm/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.12 2007/09/21 13:03:35 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:13 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GCONFMM_BUILDLINK3_MK:= ${GCONFMM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gconfmm -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gconfmm -.endif +.if !defined(GCONFMM_BUILDLINK3_MK) +GCONFMM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngconfmm} -BUILDLINK_PACKAGES+= gconfmm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gconfmm - -.if !empty(GCONFMM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gconfmm+= gconfmm>=2.10.0 BUILDLINK_ABI_DEPENDS.gconfmm+= gconfmm>=2.14.0nb1 BUILDLINK_PKGSRCDIR.gconfmm?= ../../devel/gconfmm -.endif # GCONFMM_BUILDLINK3_MK .include "../../devel/GConf/buildlink3.mk" .include "../../x11/gtkmm/buildlink3.mk" +.endif # GCONFMM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gconfmm diff --git a/devel/gdbada/buildlink3.mk b/devel/gdbada/buildlink3.mk index 8416c4bfba8..3663ff144b8 100644 --- a/devel/gdbada/buildlink3.mk +++ b/devel/gdbada/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:42 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:13 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GDBADA_BUILDLINK3_MK:= ${GDBADA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gdbada -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gdbada -.endif +.if !defined(GDBADA_BUILDLINK3_MK) +GDBADA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngdbada} gdbada - -.if !empty(GDBADA_BUILDLINK3_MK:M+) -BUILDLINK_PACKAGES+= gdbada -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gdbada BUILDLINK_API_DEPENDS.gdbada+= gdbada>=5.3 BUILDLINK_ABI_DEPENDS.gdbada+= gdbada>=6.3nb1 BUILDLINK_PKGSRCDIR.gdbada?= ../../devel/gdbada .include "../../mk/pthread.buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.endif # GDBADA_BUILDLINK3_MK +.endif # GDBADA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gdbada diff --git a/devel/gdl/buildlink3.mk b/devel/gdl/buildlink3.mk index bdd5d4c515e..3afbb707fbd 100644 --- a/devel/gdl/buildlink3.mk +++ b/devel/gdl/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.4 2008/03/06 14:53:49 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:24:13 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GDL_BUILDLINK3_MK:= ${GDL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gdl -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= gdl -.endif +.if !defined(GDL_BUILDLINK3_MK) +GDL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngdl} -BUILDLINK_PACKAGES+= gdl -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gdl - -.if ${GDL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.gdl+= gdl>=0.6.1 BUILDLINK_ABI_DEPENDS.gdl?= gdl>=0.7.7nb1 BUILDLINK_PKGSRCDIR.gdl?= ../../devel/gdl -.endif # GDL_BUILDLINK3_MK .include "../../devel/libglade/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # GDL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gdl diff --git a/devel/gettext-asprintf/buildlink3.mk b/devel/gettext-asprintf/buildlink3.mk index 2c6af8003d0..d779902b975 100644 --- a/devel/gettext-asprintf/buildlink3.mk +++ b/devel/gettext-asprintf/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 23:10:42 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:24:13 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GETTEXT_ASPRINTF_BUILDLINK3_MK:= ${GETTEXT_ASPRINTF_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gettext-asprintf -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gettext-asprintf -.endif +.if !defined(GETTEXT_ASPRINTF_BUILDLINK3_MK) +GETTEXT_ASPRINTF_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngettext-asprintf} -BUILDLINK_PACKAGES+= gettext-asprintf -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gettext-asprintf - -.if !empty(GETTEXT_ASPRINTF_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gettext-asprintf+= gettext-asprintf>=0.14.5 BUILDLINK_PKGSRCDIR.gettext-asprintf?= ../../devel/gettext-asprintf -.endif # GETTEXT_ASPRINTF_BUILDLINK3_MK +.endif # GETTEXT_ASPRINTF_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gettext-asprintf diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk index c77c894ab1e..a8f231fe88f 100644 --- a/devel/gettext-lib/buildlink3.mk +++ b/devel/gettext-lib/buildlink3.mk @@ -1,23 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.30 2008/02/27 22:10:34 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.31 2009/03/20 19:24:13 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GETTEXT_BUILDLINK3_MK:= ${GETTEXT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gettext -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gettext -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngettext} -BUILDLINK_PACKAGES+= gettext -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gettext +.if !defined(GETTEXT_BUILDLINK3_MK) +GETTEXT_BUILDLINK3_MK:= -.if !empty(GETTEXT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gettext+= gettext-lib>=0.14.5 BUILDLINK_PKGSRCDIR.gettext?= ../../devel/gettext-lib BUILDLINK_LIBNAME.gettext= intl BUILDLINK_LDADD.gettext= ${BUILDLINK_LIBNAME.gettext:S/^/-l/:S/^-l$//} BUILDLINK_LDADD.gettext+= ${BUILDLINK_LDADD.iconv} -.endif # GETTEXT_BUILDLINK3_MK .include "../../mk/bsd.fast.prefs.mk" @@ -44,5 +36,6 @@ USE_BUILTIN.iconv= yes .endif .include "../../converters/libiconv/buildlink3.mk" +.endif # GETTEXT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gettext diff --git a/devel/giblib/buildlink3.mk b/devel/giblib/buildlink3.mk index 8a4ba7ab75a..992efac86a7 100644 --- a/devel/giblib/buildlink3.mk +++ b/devel/giblib/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:42 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:14 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GIBLIB_BUILDLINK3_MK:= ${GIBLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= giblib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= giblib -.endif +.if !defined(GIBLIB_BUILDLINK3_MK) +GIBLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngiblib} -BUILDLINK_PACKAGES+= giblib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}giblib - -.if !empty(GIBLIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.giblib+= giblib>=1.2.3nb3 BUILDLINK_ABI_DEPENDS.giblib+= giblib>=1.2.4nb4 BUILDLINK_PKGSRCDIR.giblib?= ../../devel/giblib -.endif # GIBLIB_BUILDLINK3_MK .include "../../graphics/imlib2/buildlink3.mk" +.endif # GIBLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -giblib diff --git a/devel/glade3/buildlink3.mk b/devel/glade3/buildlink3.mk index b1b64563dd7..e71e61c6101 100644 --- a/devel/glade3/buildlink3.mk +++ b/devel/glade3/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/12/16 14:03:00 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:14 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GLADE3_BUILDLINK3_MK:= ${GLADE3_BUILDLINK3_MK}+ +BUILDLINK_TREE+= glade3 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= glade3 -.endif +.if !defined(GLADE3_BUILDLINK3_MK) +GLADE3_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglade3} -BUILDLINK_PACKAGES+= glade3 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}glade3 - -.if ${GLADE3_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.glade3+= glade3>=3.4.0 BUILDLINK_PKGSRCDIR.glade3?= ../../devel/glade3 -.endif # GLADE3_BUILDLINK3_MK .include "../../x11/gtk2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.endif # GLADE3_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -glade3 diff --git a/devel/glib/buildlink3.mk b/devel/glib/buildlink3.mk index 89d64ce635d..4638ec43737 100644 --- a/devel/glib/buildlink3.mk +++ b/devel/glib/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:43 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:14 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GLIB_BUILDLINK3_MK:= ${GLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= glib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= glib -.endif +.if !defined(GLIB_BUILDLINK3_MK) +GLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglib} -BUILDLINK_PACKAGES+= glib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}glib - -.if !empty(GLIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.glib+= glib>=1.2.10nb5 BUILDLINK_ABI_DEPENDS.glib+= glib>=1.2.10nb7 BUILDLINK_PKGSRCDIR.glib?= ../../devel/glib PTHREAD_OPTS+= require -.endif # GLIB_BUILDLINK3_MK .include "../../mk/pthread.buildlink3.mk" +.endif # GLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -glib diff --git a/devel/glib2/buildlink3.mk b/devel/glib2/buildlink3.mk index c97deb68fac..84ee0147ce2 100644 --- a/devel/glib2/buildlink3.mk +++ b/devel/glib2/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.16 2008/05/29 08:03:58 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:14 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GLIB2_BUILDLINK3_MK:= ${GLIB2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= glib2 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= glib2 -.endif +.if !defined(GLIB2_BUILDLINK3_MK) +GLIB2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglib2} -BUILDLINK_PACKAGES+= glib2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}glib2 - -.if !empty(GLIB2_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.glib2+= glib2>=2.4.0 BUILDLINK_ABI_DEPENDS.glib2+= glib2>=2.14.3 BUILDLINK_PKGSRCDIR.glib2?= ../../devel/glib2 @@ -19,11 +12,11 @@ BUILDLINK_PKGSRCDIR.glib2?= ../../devel/glib2 PRINT_PLIST_AWK+= /^@dirrm lib\/gio$$/ { next; } PRINT_PLIST_AWK+= /^@dirrm lib\/gio\/modules$$/ \ { print "@comment in glib2: " $$0; next; } -.endif # GLIB2_BUILDLINK3_MK .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/pcre/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.endif # GLIB2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -glib2 diff --git a/devel/glibmm/buildlink3.mk b/devel/glibmm/buildlink3.mk index 092bcd552f2..44e06c76f96 100644 --- a/devel/glibmm/buildlink3.mk +++ b/devel/glibmm/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.9 2007/09/21 13:03:35 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:14 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GLIBMM_BUILDLINK3_MK:= ${GLIBMM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= glibmm -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= glibmm -.endif +.if !defined(GLIBMM_BUILDLINK3_MK) +GLIBMM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglibmm} -BUILDLINK_PACKAGES+= glibmm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}glibmm - -.if !empty(GLIBMM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.glibmm+= glibmm>=2.6.1 BUILDLINK_ABI_DEPENDS.glibmm+= glibmm>=2.8.3nb1 BUILDLINK_PKGSRCDIR.glibmm?= ../../devel/glibmm -.endif # GLIBMM_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libsigc++/buildlink3.mk" +.endif # GLIBMM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -glibmm diff --git a/devel/gmp/buildlink3.mk b/devel/gmp/buildlink3.mk index b7878b17f1c..f29e85a2af1 100644 --- a/devel/gmp/buildlink3.mk +++ b/devel/gmp/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/12/09 03:38:16 jnemeth Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:14 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GMP_BUILDLINK3_MK:= ${GMP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gmp -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gmp -.endif +.if !defined(GMP_BUILDLINK3_MK) +GMP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngmp} -BUILDLINK_PACKAGES+= gmp -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gmp - -.if !empty(GMP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gmp+= gmp>=4.2.1 BUILDLINK_ABI_DEPENDS.gmp+= gmp>=4.2.1 BUILDLINK_PKGSRCDIR.gmp?= ../../devel/gmp -.endif # GMP_BUILDLINK3_MK +.endif # GMP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gmp diff --git a/devel/gnome-build/buildlink3.mk b/devel/gnome-build/buildlink3.mk index 9f679daa620..b4ec2b4d4a6 100644 --- a/devel/gnome-build/buildlink3.mk +++ b/devel/gnome-build/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2008/03/06 14:53:49 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:14 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNOME_BUILD_BUILDLINK3_MK:= ${GNOME_BUILD_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnome-build -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= gnome-build -.endif +.if !defined(GNOME_BUILD_BUILDLINK3_MK) +GNOME_BUILD_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-build} -BUILDLINK_PACKAGES+= gnome-build -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-build - -.if ${GNOME_BUILD_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.gnome-build+= gnome-build>=0.1.3 BUILDLINK_ABI_DEPENDS.gnome-build?= gnome-build>=0.2.0nb1 BUILDLINK_PKGSRCDIR.gnome-build?= ../../devel/gnome-build -.endif # GNOME_BUILD_BUILDLINK3_MK .include "../../devel/gdl/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" @@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.gnome-build?= ../../devel/gnome-build .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # GNOME_BUILD_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnome-build diff --git a/devel/gnustep-base/buildlink3.mk b/devel/gnustep-base/buildlink3.mk index 42ea1067841..0571c40321c 100644 --- a/devel/gnustep-base/buildlink3.mk +++ b/devel/gnustep-base/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.13 2008/01/18 05:14:33 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:14 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNUSTEP_BASE_BUILDLINK3_MK:= ${GNUSTEP_BASE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnustep-base -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnustep-base -.endif +.if !defined(GNUSTEP_BASE_BUILDLINK3_MK) +GNUSTEP_BASE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnustep-base} -BUILDLINK_PACKAGES+= gnustep-base -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnustep-base - -.if !empty(GNUSTEP_BASE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gnustep-base+= gnustep-base>=1.9.1 BUILDLINK_ABI_DEPENDS.gnustep-base+= gnustep-base>=1.14.1nb1 BUILDLINK_PKGSRCDIR.gnustep-base?= ../../devel/gnustep-base @@ -53,13 +46,12 @@ PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Librar PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Libraries\/Resources\/gnustep-base\/NSTimeZones$$/ { next; } PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Libraries\/Resources\/gnustep-base\/NSTimeZones\/zones$$/ { next; } -.endif # GNUSTEP_BASE_BUILDLINK3_MK - .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/ffcall/buildlink3.mk" .include "../../devel/gmp/buildlink3.mk" .include "../../devel/gnustep-make/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.endif # GNUSTEP_BASE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnustep-base diff --git a/devel/gnustep-make/buildlink3.mk b/devel/gnustep-make/buildlink3.mk index d38e02c2001..e36d2d05d2b 100644 --- a/devel/gnustep-make/buildlink3.mk +++ b/devel/gnustep-make/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.12 2007/11/25 14:42:02 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:14 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNUSTEP_MAKE_BUILDLINK3_MK:= ${GNUSTEP_MAKE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnustep-make -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnustep-make -.endif +.if !defined(GNUSTEP_MAKE_BUILDLINK3_MK) +GNUSTEP_MAKE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnustep-make} -BUILDLINK_PACKAGES+= gnustep-make -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnustep-make - -.if !empty(GNUSTEP_MAKE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gnustep-make+= gnustep-make>=2.0.2 BUILDLINK_ABI_DEPENDS.gnustep-make?= gnustep-make>=2.0.2 BUILDLINK_PKGSRCDIR.gnustep-make?= ../../devel/gnustep-make @@ -109,7 +102,6 @@ PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Tools$$/ { next PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Tools\/Java$$/ { next; } PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Tools\/Resources$$/ { next; } PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/share$$/ { next; } +.endif # GNUSTEP_MAKE_BUILDLINK3_MK -.endif # GNUSTEP_MAKE_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnustep-make diff --git a/devel/gnustep-objc-lf2/buildlink3.mk b/devel/gnustep-objc-lf2/buildlink3.mk index de278980b07..d7164d8c845 100644 --- a/devel/gnustep-objc-lf2/buildlink3.mk +++ b/devel/gnustep-objc-lf2/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.7 2007/01/17 03:11:18 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:15 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNUSTEP_OBJC_LF2_BUILDLINK3_MK:= ${GNUSTEP_OBJC_LF2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnustep-objc-lf2 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnustep-objc-lf2 -.endif +.if !defined(GNUSTEP_OBJC_LF2_BUILDLINK3_MK) +GNUSTEP_OBJC_LF2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnustep-objc-lf2} -BUILDLINK_PACKAGES+= gnustep-objc-lf2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnustep-objc-lf2 - -.if !empty(GNUSTEP_OBJC_LF2_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gnustep-objc-lf2+= gnustep-objc-lf2>=2.95.3.88 BUILDLINK_ABI_DEPENDS.gnustep-objc-lf2?= gnustep-objc-lf2>=2.95.3.88nb1 BUILDLINK_PKGSRCDIR.gnustep-objc-lf2?= ../../devel/gnustep-objc-lf2 BUILDLINK_FNAME_TRANSFORM.gnustep-objc-lf2?= -e "s|Headers/objc_lf2/|Headers/objc/|g" BUILDLINK_TRANSFORM+= l:objc:objc_lf2 -.endif # GNUSTEP_OBJC_LF2_BUILDLINK3_MK .include "../../devel/gnustep-make/buildlink3.mk" +.endif # GNUSTEP_OBJC_LF2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnustep-objc-lf2 diff --git a/devel/gnustep-objc/buildlink3.mk b/devel/gnustep-objc/buildlink3.mk index 0e36dde5b8c..78628242f88 100644 --- a/devel/gnustep-objc/buildlink3.mk +++ b/devel/gnustep-objc/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:43 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:14 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNUSTEP_OBJC_BUILDLINK3_MK:= ${GNUSTEP_OBJC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnustep-objc -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnustep-objc -.endif +.if !defined(GNUSTEP_OBJC_BUILDLINK3_MK) +GNUSTEP_OBJC_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnustep-objc} -BUILDLINK_PACKAGES+= gnustep-objc -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnustep-objc - -.if !empty(GNUSTEP_OBJC_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gnustep-objc+= gnustep-objc>=1.3.0 BUILDLINK_ABI_DEPENDS.gnustep-objc?= gnustep-objc>=1.3.0nb1 BUILDLINK_PKGSRCDIR.gnustep-objc?= ../../devel/gnustep-objc -.endif # GNUSTEP_OBJC_BUILDLINK3_MK .include "../../devel/gnustep-make/buildlink3.mk" +.endif # GNUSTEP_OBJC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnustep-objc diff --git a/devel/gob2/buildlink3.mk b/devel/gob2/buildlink3.mk index 76955a12420..3d68b652526 100644 --- a/devel/gob2/buildlink3.mk +++ b/devel/gob2/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:43 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:15 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GOB2_BUILDLINK3_MK:= ${GOB2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gob2 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gob2 -.endif +.if !defined(GOB2_BUILDLINK3_MK) +GOB2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngob2} -BUILDLINK_PACKAGES+= gob2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gob2 - -.if !empty(GOB2_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gob2+= gob2>=2.0.10 BUILDLINK_ABI_DEPENDS.gob2?= gob2>=2.0.12nb1 BUILDLINK_PKGSRCDIR.gob2?= ../../devel/gob2 -.endif # GOB2_BUILDLINK3_MK #.include "../../devel/glib2/buildlink3.mk" +.endif # GOB2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gob2 diff --git a/devel/gperf/buildlink3.mk b/devel/gperf/buildlink3.mk index f0d4af7f5ed..3d2aaed2cbf 100644 --- a/devel/gperf/buildlink3.mk +++ b/devel/gperf/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2007/10/13 18:35:35 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:15 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GPERF_BUILDLINK3_MK:= ${GPERF_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gperf -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gperf -.endif +.if !defined(GPERF_BUILDLINK3_MK) +GPERF_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngperf} -BUILDLINK_PACKAGES+= gperf -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gperf - -.if !empty(GPERF_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gperf+= gperf>=3.0.1 BUILDLINK_PKGSRCDIR.gperf?= ../../devel/gperf BUILDLINK_DEPMETHOD.gperf?= build -.endif # GPERF_BUILDLINK3_MK +.endif # GPERF_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gperf diff --git a/devel/gtl/buildlink3.mk b/devel/gtl/buildlink3.mk index 07613fad7e3..1defa18874c 100644 --- a/devel/gtl/buildlink3.mk +++ b/devel/gtl/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:43 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:15 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GTL_BUILDLINK3_MK:= ${GTL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gtl -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gtl -.endif +.if !defined(GTL_BUILDLINK3_MK) +GTL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtl} -BUILDLINK_PACKAGES+= gtl -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtl - -.if !empty(GTL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gtl+= gtl>=1.2.0 BUILDLINK_PKGSRCDIR.gtl?= ../../devel/gtl -.endif # GTL_BUILDLINK3_MK +.endif # GTL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gtl diff --git a/devel/guile-gtk/buildlink3.mk b/devel/guile-gtk/buildlink3.mk index 04a2b0d54ad..1606115c6c9 100644 --- a/devel/guile-gtk/buildlink3.mk +++ b/devel/guile-gtk/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/08/27 11:43:11 gdt Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:15 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GUILE_GTK_BUILDLINK3_MK:= ${GUILE_GTK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= guile-gtk -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= guile-gtk -.endif +.if !defined(GUILE_GTK_BUILDLINK3_MK) +GUILE_GTK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nguile-gtk} -BUILDLINK_PACKAGES+= guile-gtk -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}guile-gtk - -.if !empty(GUILE_GTK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.guile-gtk+= guile-gtk>=0.4 BUILDLINK_ABI_DEPENDS.guile-gtk?= guile-gtk>=0.4 BUILDLINK_PKGSRCDIR.guile-gtk?= ../../devel/guile-gtk -.endif # GUILE_GTK_BUILDLINK3_MK .include "../../lang/guile/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" +.endif # GUILE_GTK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -guile-gtk diff --git a/devel/guile16-gtk/buildlink3.mk b/devel/guile16-gtk/buildlink3.mk index c9e4af60407..064261780e3 100644 --- a/devel/guile16-gtk/buildlink3.mk +++ b/devel/guile16-gtk/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/06/18 00:38:58 dmcmahill Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:15 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GUILE16_GTK_BUILDLINK3_MK:= ${GUILE16_GTK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= guile16-gtk -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= guile16-gtk -.endif +.if !defined(GUILE16_GTK_BUILDLINK3_MK) +GUILE16_GTK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nguile16-gtk} -BUILDLINK_PACKAGES+= guile16-gtk -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}guile16-gtk - -.if !empty(GUILE16_GTK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.guile16-gtk+= guile16-gtk>=0.5 BUILDLINK_ABI_DEPENDS.guile16-gtk?= guile16-gtk>=0.5 BUILDLINK_PKGSRCDIR.guile16-gtk?= ../../devel/guile16-gtk -.endif # GUILE16_GTK_BUILDLINK3_MK .include "../../lang/guile16/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" +.endif # GUILE16_GTK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -guile16-gtk diff --git a/devel/hdf/buildlink3.mk b/devel/hdf/buildlink3.mk index 24f465aaffd..4515fef2eb0 100644 --- a/devel/hdf/buildlink3.mk +++ b/devel/hdf/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:43 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:15 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -HDF_BUILDLINK3_MK:= ${HDF_BUILDLINK3_MK}+ +BUILDLINK_TREE+= hdf -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= hdf -.endif +.if !defined(HDF_BUILDLINK3_MK) +HDF_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nhdf} -BUILDLINK_PACKAGES+= hdf -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}hdf - -.if !empty(HDF_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.hdf+= hdf>=4.1r5 BUILDLINK_ABI_DEPENDS.hdf?= hdf>=4.2r1nb1 BUILDLINK_PKGSRCDIR.hdf?= ../../devel/hdf -.endif # HDF_BUILDLINK3_MK +.endif # HDF_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -hdf diff --git a/devel/hdf5/buildlink3.mk b/devel/hdf5/buildlink3.mk index 35b55381cfd..f4e82230c19 100644 --- a/devel/hdf5/buildlink3.mk +++ b/devel/hdf5/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.11 2007/05/30 08:54:29 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:15 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -HDF5_BUILDLINK3_MK:= ${HDF5_BUILDLINK3_MK}+ +BUILDLINK_TREE+= hdf5 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= hdf5 -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nhdf5} -BUILDLINK_PACKAGES+= hdf5 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}hdf5 +.if !defined(HDF5_BUILDLINK3_MK) +HDF5_BUILDLINK3_MK:= -.if !empty(HDF5_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.hdf5+= hdf5>=1.6.2 BUILDLINK_ABI_DEPENDS.hdf5+= hdf5>=1.6.5nb1 BUILDLINK_PKGSRCDIR.hdf5?= ../../devel/hdf5 -.endif # HDF5_BUILDLINK3_MK pkgbase := hdf5 .include "../../mk/pkg-build-options.mk" @@ -25,5 +17,6 @@ pkgbase := hdf5 .endif .include "../../devel/zlib/buildlink3.mk" +.endif # HDF5_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -hdf5 diff --git a/devel/kdesdk3/buildlink3.mk b/devel/kdesdk3/buildlink3.mk index cfdda78cced..4b801748075 100644 --- a/devel/kdesdk3/buildlink3.mk +++ b/devel/kdesdk3/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.18 2008/09/06 20:54:32 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2009/03/20 19:24:15 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -KDESDK_BUILDLINK3_MK:= ${KDESDK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= kdesdk -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= kdesdk -.endif +.if !defined(KDESDK_BUILDLINK3_MK) +KDESDK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkdesdk} -BUILDLINK_PACKAGES+= kdesdk -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kdesdk - -.if !empty(KDESDK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.kdesdk+= kdesdk>=3.5.0nb1 BUILDLINK_ABI_DEPENDS.kdesdk?= kdesdk>=3.5.10nb1 BUILDLINK_PKGSRCDIR.kdesdk?= ../../devel/kdesdk3 -.endif # KDESDK_BUILDLINK3_MK .include "../../databases/db4/buildlink3.mk" .include "../../devel/libltdl/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" .include "../../x11/kdebase3/buildlink3.mk" +.endif # KDESDK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -kdesdk diff --git a/devel/ldapsdk/buildlink3.mk b/devel/ldapsdk/buildlink3.mk index 267f46c1ac1..950240ee0cb 100644 --- a/devel/ldapsdk/buildlink3.mk +++ b/devel/ldapsdk/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:43 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:15 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LDAPSDK_BUILDLINK3_MK:= ${LDAPSDK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ldapsdk -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ldapsdk -.endif +.if !defined(LDAPSDK_BUILDLINK3_MK) +LDAPSDK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nldapsdk} -BUILDLINK_PACKAGES+= ldapsdk -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ldapsdk - -.if !empty(LDAPSDK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ldapsdk+= ldapsdk>=12311998 BUILDLINK_ABI_DEPENDS.ldapsdk?= ldapsdk>=12311998nb2 BUILDLINK_PKGSRCDIR.ldapsdk?= ../../devel/ldapsdk -.endif # LDAPSDK_BUILDLINK3_MK +.endif # LDAPSDK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ldapsdk diff --git a/devel/libFoundation/buildlink3.mk b/devel/libFoundation/buildlink3.mk index ae2648c51ea..06020e8f13f 100644 --- a/devel/libFoundation/buildlink3.mk +++ b/devel/libFoundation/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:43 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:16 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBFOUNDATION_BUILDLINK3_MK:= ${LIBFOUNDATION_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libFoundation -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libFoundation -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibFoundation} -BUILDLINK_PACKAGES+= libFoundation -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libFoundation +.if !defined(LIBFOUNDATION_BUILDLINK3_MK) +LIBFOUNDATION_BUILDLINK3_MK:= -.if !empty(LIBFOUNDATION_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libFoundation+= libFoundation>=1.0.72.107nb1 BUILDLINK_ABI_DEPENDS.libFoundation?= libFoundation>=1.0.72.107nb2 BUILDLINK_PKGSRCDIR.libFoundation?= ../../devel/libFoundation @@ -68,8 +61,7 @@ MAKE_ENV+= FOUNDATION_LIB=${FOUNDATION_LIB:Q} MAKE_ENV+= ADDITIONAL_INCLUDE_DIRS=${ADDITIONAL_INCLUDE_DIRS:Q} .endif -.endif # LIBFOUNDATION_BUILDLINK3_MK - .include "../../devel/gnustep-objc-lf2/buildlink3.mk" +.endif # LIBFOUNDATION_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libFoundation diff --git a/devel/libargparse/buildlink3.mk b/devel/libargparse/buildlink3.mk index 58c3f8d1c02..166d595030c 100644 --- a/devel/libargparse/buildlink3.mk +++ b/devel/libargparse/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:43 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:16 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBARGPARSE_BUILDLINK3_MK:= ${LIBARGPARSE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libargparse -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libargparse -.endif +.if !defined(LIBARGPARSE_BUILDLINK3_MK) +LIBARGPARSE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibargparse} -BUILDLINK_PACKAGES+= libargparse -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libargparse - -.if !empty(LIBARGPARSE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libargparse+= libargparse>=0.1.0000 BUILDLINK_ABI_DEPENDS.libargparse+= libargparse>=0.1.0000nb1 BUILDLINK_PKGSRCDIR.libargparse?= ../../devel/libargparse -.endif # LIBARGPARSE_BUILDLINK3_MK +.endif # LIBARGPARSE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libargparse diff --git a/devel/libast/buildlink3.mk b/devel/libast/buildlink3.mk index 4ed9ca15e28..8b395def00b 100644 --- a/devel/libast/buildlink3.mk +++ b/devel/libast/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.11 2007/01/14 10:59:17 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:16 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBAST_BUILDLINK3_MK:= ${LIBAST_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libast -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libast -.endif +.if !defined(LIBAST_BUILDLINK3_MK) +LIBAST_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibast} -BUILDLINK_PACKAGES+= libast -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libast - -.if !empty(LIBAST_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libast+= libast>=0.5nb5 BUILDLINK_ABI_DEPENDS.libast+= libast>=0.6.1nb3 BUILDLINK_PKGSRCDIR.libast?= ../../devel/libast -.endif # LIBAST_BUILDLINK3_MK .include "../../devel/pcre/buildlink3.mk" .include "../../graphics/imlib2/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" +.endif # LIBAST_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libast diff --git a/devel/libatomic_ops/buildlink3.mk b/devel/libatomic_ops/buildlink3.mk index 4f2f9db838a..c18bc3ac305 100644 --- a/devel/libatomic_ops/buildlink3.mk +++ b/devel/libatomic_ops/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/12/22 02:48:56 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:16 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBATOMIC_OPS_BUILDLINK3_MK:= ${LIBATOMIC_OPS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libatomic_ops -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libatomic_ops -.endif +.if !defined(LIBATOMIC_OPS_BUILDLINK3_MK) +LIBATOMIC_OPS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibatomic_ops} -BUILDLINK_PACKAGES+= libatomic_ops -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libatomic_ops - -.if ${LIBATOMIC_OPS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libatomic_ops+= libatomic_ops>=20081024nb1 BUILDLINK_PKGSRCDIR.libatomic_ops?= ../../devel/libatomic_ops -.endif # LIBATOMIC_OPS_BUILDLINK3_MK +.endif # LIBATOMIC_OPS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libatomic_ops diff --git a/devel/libbegemot/buildlink3.mk b/devel/libbegemot/buildlink3.mk index 255e6dc6fb9..eb67d56e5ea 100644 --- a/devel/libbegemot/buildlink3.mk +++ b/devel/libbegemot/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:43 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:16 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBBEGEMOT_BUILDLINK3_MK:= ${LIBBEGEMOT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libbegemot -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libbegemot -.endif +.if !defined(LIBBEGEMOT_BUILDLINK3_MK) +LIBBEGEMOT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibbegemot} -BUILDLINK_PACKAGES+= libbegemot -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libbegemot - -.if !empty(LIBBEGEMOT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libbegemot+= libbegemot>=1.9nb1 BUILDLINK_PKGSRCDIR.libbegemot?= ../../devel/libbegemot -.endif # LIBBEGEMOT_BUILDLINK3_MK +.endif # LIBBEGEMOT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libbegemot diff --git a/devel/libbinio/buildlink3.mk b/devel/libbinio/buildlink3.mk index b46f1bc3fd3..3abdcf886f4 100644 --- a/devel/libbinio/buildlink3.mk +++ b/devel/libbinio/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/06/19 16:30:45 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:16 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBBINIO_BUILDLINK3_MK:= ${LIBBINIO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libbinio -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libbinio -.endif +.if !defined(LIBBINIO_BUILDLINK3_MK) +LIBBINIO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibbinio} -BUILDLINK_PACKAGES+= libbinio -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libbinio - -.if ${LIBBINIO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libbinio+= libbinio>=1.4 BUILDLINK_PKGSRCDIR.libbinio?= ../../devel/libbinio -.endif # LIBBINIO_BUILDLINK3_MK +.endif # LIBBINIO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libbinio diff --git a/devel/libbonobo/buildlink3.mk b/devel/libbonobo/buildlink3.mk index 351bf5e66ad..134b5a7c9b3 100644 --- a/devel/libbonobo/buildlink3.mk +++ b/devel/libbonobo/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:10:43 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:16 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBBONOBO_BUILDLINK3_MK:= ${LIBBONOBO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libbonobo -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libbonobo -.endif +.if !defined(LIBBONOBO_BUILDLINK3_MK) +LIBBONOBO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibbonobo} -BUILDLINK_PACKAGES+= libbonobo -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libbonobo - -.if !empty(LIBBONOBO_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libbonobo+= libbonobo>=2.8.0 BUILDLINK_ABI_DEPENDS.libbonobo+= libbonobo>=2.10.1nb2 BUILDLINK_PKGSRCDIR.libbonobo?= ../../devel/libbonobo @@ -24,12 +17,12 @@ PRINT_PLIST_AWK+= /^@dirrm lib\/bonobo\/(monikers|servers)$$/ \ { print "@comment in libbonobo: " $$0; next; } PRINT_PLIST_AWK+= /^@dirrm lib\/bonobo-2.0\/samples$$/ \ { print "@comment in libbonobo: " $$0; next; } -.endif # LIBBONOBO_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.endif # LIBBONOBO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libbonobo diff --git a/devel/libbonoboui/buildlink3.mk b/devel/libbonoboui/buildlink3.mk index ca141048f18..4dff4edd1ad 100644 --- a/devel/libbonoboui/buildlink3.mk +++ b/devel/libbonoboui/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.20 2008/03/06 14:53:49 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2009/03/20 19:24:16 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBBONOBOUI_BUILDLINK3_MK:= ${LIBBONOBOUI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libbonoboui -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libbonoboui -.endif +.if !defined(LIBBONOBOUI_BUILDLINK3_MK) +LIBBONOBOUI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibbonoboui} -BUILDLINK_PACKAGES+= libbonoboui -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libbonoboui - -.if !empty(LIBBONOBOUI_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libbonoboui+= libbonoboui>=2.8.0 BUILDLINK_ABI_DEPENDS.libbonoboui+= libbonoboui>=2.20.0nb2 BUILDLINK_PKGSRCDIR.libbonoboui?= ../../devel/libbonoboui -.endif # LIBBONOBOUI_BUILDLINK3_MK .include "../../devel/GConf/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -26,5 +18,6 @@ BUILDLINK_PKGSRCDIR.libbonoboui?= ../../devel/libbonoboui .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # LIBBONOBOUI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libbonoboui diff --git a/devel/libcfg+/buildlink3.mk b/devel/libcfg+/buildlink3.mk index 1babf344c1d..a1d45ad975a 100644 --- a/devel/libcfg+/buildlink3.mk +++ b/devel/libcfg+/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/26 06:09:23 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:16 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBCFG_BUILDLINK3_MK:= ${LIBCFG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libcfg -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libcfg -.endif +.if !defined(LIBCFG_BUILDLINK3_MK) +LIBCFG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcfg} -BUILDLINK_PACKAGES+= libcfg -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libcfg - -.if !empty(LIBCFG_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libcfg+= libcfg+>=0.6.2nb1 BUILDLINK_ABI_DEPENDS.libcfg+= libcfg+>=0.6.2nb3 BUILDLINK_PKGSRCDIR.libcfg?= ../../devel/libcfg+ -.endif # LIBCFG_BUILDLINK3_MK +.endif # LIBCFG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libcfg diff --git a/devel/libcompizconfig/buildlink3.mk b/devel/libcompizconfig/buildlink3.mk index 6a333b6b466..c33cf9dc483 100644 --- a/devel/libcompizconfig/buildlink3.mk +++ b/devel/libcompizconfig/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/05/12 10:38:01 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:16 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBCOMPIZCONFIG_BUILDLINK3_MK:= ${LIBCOMPIZCONFIG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libcompizconfig -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libcompizconfig -.endif +.if !defined(LIBCOMPIZCONFIG_BUILDLINK3_MK) +LIBCOMPIZCONFIG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcompizconfig} -BUILDLINK_PACKAGES+= libcompizconfig -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libcompizconfig - -.if !empty(LIBCOMPIZCONFIG_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libcompizconfig+= libcompizconfig>=0.6.0 BUILDLINK_ABI_DEPENDS.libcompizconfig?= libcompizconfig>=0.6.0 BUILDLINK_PKGSRCDIR.libcompizconfig?= ../../devel/libcompizconfig -.endif # LIBCOMPIZCONFIG_BUILDLINK3_MK .include "../../textproc/libxml2/buildlink3.mk" +.endif # LIBCOMPIZCONFIG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libcompizconfig diff --git a/devel/libconfig/buildlink3.mk b/devel/libconfig/buildlink3.mk index 2a029acc154..ad2081f38bc 100644 --- a/devel/libconfig/buildlink3.mk +++ b/devel/libconfig/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/11/03 14:58:01 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:17 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBCONFIG_BUILDLINK3_MK:= ${LIBCONFIG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libconfig -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libconfig -.endif +.if !defined(LIBCONFIG_BUILDLINK3_MK) +LIBCONFIG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibconfig} -BUILDLINK_PACKAGES+= libconfig -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libconfig - -.if ${LIBCONFIG_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libconfig+= libconfig>=1.1.3 BUILDLINK_PKGSRCDIR.libconfig?= ../../devel/libconfig -.endif # LIBCONFIG_BUILDLINK3_MK +.endif # LIBCONFIG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libconfig diff --git a/devel/libdaemon/buildlink3.mk b/devel/libdaemon/buildlink3.mk index b73d2532942..d9e99e9debc 100644 --- a/devel/libdaemon/buildlink3.mk +++ b/devel/libdaemon/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/12/20 17:24:48 ahoka Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:17 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBDAEMON_BUILDLINK3_MK:= ${LIBDAEMON_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libdaemon -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libdaemon -.endif +.if !defined(LIBDAEMON_BUILDLINK3_MK) +LIBDAEMON_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdaemon} -BUILDLINK_PACKAGES+= libdaemon -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdaemon - -.if ${LIBDAEMON_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libdaemon+= libdaemon>=0.10 BUILDLINK_PKGSRCDIR.libdaemon?= ../../devel/libdaemon -.endif # LIBDAEMON_BUILDLINK3_MK +.endif # LIBDAEMON_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libdaemon diff --git a/devel/libdatrie/buildlink3.mk b/devel/libdatrie/buildlink3.mk index 9f848002bb0..3b158b64154 100644 --- a/devel/libdatrie/buildlink3.mk +++ b/devel/libdatrie/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/02/11 02:11:24 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:17 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBDATRIE_BUILDLINK3_MK:= ${LIBDATRIE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libdatrie -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libdatrie -.endif +.if !defined(LIBDATRIE_BUILDLINK3_MK) +LIBDATRIE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdatrie} -BUILDLINK_PACKAGES+= libdatrie -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdatrie - -.if ${LIBDATRIE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libdatrie+= libdatrie>=0.1.3 BUILDLINK_PKGSRCDIR.libdatrie?= ../../devel/libdatrie -.endif # LIBDATRIE_BUILDLINK3_MK +.endif # LIBDATRIE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libdatrie diff --git a/devel/libdnsres/buildlink3.mk b/devel/libdnsres/buildlink3.mk index cd4e52daf68..9c2b9def89c 100644 --- a/devel/libdnsres/buildlink3.mk +++ b/devel/libdnsres/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.5 2008/04/22 18:06:09 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:17 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBDNSRES_BUILDLINK3_MK:= ${LIBDNSRES_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libdnsres -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libdnsres -.endif +.if !defined(LIBDNSRES_BUILDLINK3_MK) +LIBDNSRES_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdnsres} -BUILDLINK_PACKAGES+= libdnsres -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdnsres - -.if !empty(LIBDNSRES_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libdnsres+= libdnsres>=0.1a BUILDLINK_ABI_DEPENDS.libdnsres?= libdnsres>=0.1anb4 BUILDLINK_PKGSRCDIR.libdnsres?= ../../devel/libdnsres -.endif # LIBDNSRES_BUILDLINK3_MK +.endif # LIBDNSRES_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libdnsres diff --git a/devel/libdockapp/buildlink3.mk b/devel/libdockapp/buildlink3.mk index ee95f361e18..009dfbe1627 100644 --- a/devel/libdockapp/buildlink3.mk +++ b/devel/libdockapp/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/12/15 20:32:54 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:17 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBDOCKAPP_BUILDLINK3_MK:= ${LIBDOCKAPP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libdockapp -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libdockapp -.endif +.if !defined(LIBDOCKAPP_BUILDLINK3_MK) +LIBDOCKAPP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdockapp} -BUILDLINK_PACKAGES+= libdockapp -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdockapp - -.if !empty(LIBDOCKAPP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libdockapp+= libdockapp>=0.4.0 BUILDLINK_ABI_DEPENDS.libdockapp+= libdockapp>=0.4.0nb2 BUILDLINK_PKGSRCDIR.libdockapp?= ../../devel/libdockapp -.endif # LIBDOCKAPP_BUILDLINK3_MK .include "../../x11/libXpm/buildlink3.mk" +.endif # LIBDOCKAPP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libdockapp diff --git a/devel/libebml/buildlink3.mk b/devel/libebml/buildlink3.mk index 83f8ea01ef0..82a438a10f5 100644 --- a/devel/libebml/buildlink3.mk +++ b/devel/libebml/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.15 2007/11/14 18:20:05 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:24:17 joerg Exp $ # # This Makefile fragment is included by packages that use libebml. # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBEBML_BUILDLINK3_MK:= ${LIBEBML_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libebml -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libebml -.endif +.if !defined(LIBEBML_BUILDLINK3_MK) +LIBEBML_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibebml} -BUILDLINK_PACKAGES+= libebml -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libebml - -.if !empty(LIBEBML_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libebml+= libebml>=0.7.7 BUILDLINK_ABI_DEPENDS.libebml?= libebml>=0.7.7 BUILDLINK_PKGSRCDIR.libebml?= ../../devel/libebml -.endif # LIBEBML_BUILDLINK3_MK +.endif # LIBEBML_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libebml diff --git a/devel/libelf/buildlink3.mk b/devel/libelf/buildlink3.mk index b0b3436c615..6718361f8b3 100644 --- a/devel/libelf/buildlink3.mk +++ b/devel/libelf/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.6 2007/10/11 18:53:12 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:17 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBELF_BUILDLINK3_MK:= ${LIBELF_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libelf -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libelf -.endif +.if !defined(LIBELF_BUILDLINK3_MK) +LIBELF_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibelf} -BUILDLINK_PACKAGES+= libelf -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libelf - -.if !empty(LIBELF_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libelf+= libelf>=0.8.5 BUILDLINK_PKGSRCDIR.libelf?= ../../devel/libelf -.endif # LIBELF_BUILDLINK3_MK +.endif # LIBELF_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libelf diff --git a/devel/libetm/buildlink3.mk b/devel/libetm/buildlink3.mk index 2a7efa27792..da40597a239 100644 --- a/devel/libetm/buildlink3.mk +++ b/devel/libetm/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:44 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:17 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBETM_BUILDLINK3_MK:= ${LIBETM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libetm -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libetm -.endif +.if !defined(LIBETM_BUILDLINK3_MK) +LIBETM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibetm} -BUILDLINK_PACKAGES+= libetm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libetm - -.if !empty(LIBETM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libetm+= libetm>=1.09 BUILDLINK_PKGSRCDIR.libetm?= ../../devel/libetm BUILDLINK_DEPMETHOD.libetm?= build -.endif # LIBETM_BUILDLINK3_MK +.endif # LIBETM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libetm diff --git a/devel/libevent/buildlink3.mk b/devel/libevent/buildlink3.mk index cd71d9f8689..32b10adb938 100644 --- a/devel/libevent/buildlink3.mk +++ b/devel/libevent/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.15 2009/02/27 22:50:43 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:24:17 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBEVENT_BUILDLINK3_MK:= ${LIBEVENT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libevent -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libevent -.endif +.if !defined(LIBEVENT_BUILDLINK3_MK) +LIBEVENT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibevent} -BUILDLINK_PACKAGES+= libevent -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libevent - -.if !empty(LIBEVENT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libevent+=libevent>=0.6 BUILDLINK_ABI_DEPENDS.libevent+=libevent-1.4.9* # exact match -- see Makefile BUILDLINK_PKGSRCDIR.libevent?= ../../devel/libevent -.endif # LIBEVENT_BUILDLINK3_MK +.endif # LIBEVENT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libevent diff --git a/devel/libextractor/buildlink3.mk b/devel/libextractor/buildlink3.mk index f6a57ef2f68..23a8154d757 100644 --- a/devel/libextractor/buildlink3.mk +++ b/devel/libextractor/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:44 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:17 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBEXTRACTOR_BUILDLINK3_MK:= ${LIBEXTRACTOR_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libextractor -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libextractor -.endif +.if !defined(LIBEXTRACTOR_BUILDLINK3_MK) +LIBEXTRACTOR_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibextractor} -BUILDLINK_PACKAGES+= libextractor -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libextractor - -.if !empty(LIBEXTRACTOR_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libextractor+= libextractor>=0.3.10 BUILDLINK_ABI_DEPENDS.libextractor+= libextractor>=0.5.3nb3 BUILDLINK_PKGSRCDIR.libextractor?= ../../devel/libextractor -.endif # LIBEXTRACTOR_BUILDLINK3_MK +.endif # LIBEXTRACTOR_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libextractor diff --git a/devel/libffi/buildlink3.mk b/devel/libffi/buildlink3.mk index 0dae4ba8f42..fccf3154867 100644 --- a/devel/libffi/buildlink3.mk +++ b/devel/libffi/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.7 2008/10/11 22:33:56 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:17 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBFFI_BUILDLINK3_MK:= ${LIBFFI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libffi -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libffi -.endif +.if !defined(LIBFFI_BUILDLINK3_MK) +LIBFFI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibffi} -BUILDLINK_PACKAGES+= libffi -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libffi - -.if ${LIBFFI_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libffi+= libffi>=1.20 BUILDLINK_ABI_DEPENDS.libffi+= libffi>=2.0betanb1 #BUILDLINK_API_DEPENDS.libffi+= libffi>=3.0.6 BUILDLINK_PKGSRCDIR.libffi?= ../../devel/libffi -.endif # LIBFFI_BUILDLINK3_MK +.endif # LIBFFI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libffi diff --git a/devel/libfirm/buildlink3.mk b/devel/libfirm/buildlink3.mk index 981bd3855a6..92228e97db7 100644 --- a/devel/libfirm/buildlink3.mk +++ b/devel/libfirm/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/12/17 16:52:35 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:18 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBFIRM_BUILDLINK3_MK:= ${LIBFIRM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libfirm -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libfirm -.endif +.if !defined(LIBFIRM_BUILDLINK3_MK) +LIBFIRM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibfirm} -BUILDLINK_PACKAGES+= libfirm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libfirm - -.if ${LIBFIRM_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libfirm+= libfirm>=1.15.0 BUILDLINK_PKGSRCDIR.libfirm?= ../../devel/libfirm -.endif # LIBFIRM_BUILDLINK3_MK +.endif # LIBFIRM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libfirm diff --git a/devel/libgail-gnome/buildlink3.mk b/devel/libgail-gnome/buildlink3.mk index 036461cf17e..6f643c6da07 100644 --- a/devel/libgail-gnome/buildlink3.mk +++ b/devel/libgail-gnome/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.18 2008/09/06 20:54:32 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2009/03/20 19:24:18 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGAIL_GNOME_BUILDLINK3_MK:= ${LIBGAIL_GNOME_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgail-gnome -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libgail-gnome -.endif +.if !defined(LIBGAIL_GNOME_BUILDLINK3_MK) +LIBGAIL_GNOME_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgail-gnome} -BUILDLINK_PACKAGES+= libgail-gnome -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgail-gnome - -.if !empty(LIBGAIL_GNOME_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libgail-gnome+= libgail-gnome>=1.1.1nb2 BUILDLINK_ABI_DEPENDS.libgail-gnome?= libgail-gnome>=1.20.0nb2 BUILDLINK_PKGSRCDIR.libgail-gnome?= ../../devel/libgail-gnome -.endif # LIBGAIL_GNOME_BUILDLINK3_MK .include "../../devel/at-spi/buildlink3.mk" .include "../../devel/atk/buildlink3.mk" @@ -24,5 +16,6 @@ BUILDLINK_PKGSRCDIR.libgail-gnome?= ../../devel/libgail-gnome .include "../../devel/libgnomeui/buildlink3.mk" .include "../../x11/gnome-panel/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # LIBGAIL_GNOME_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgail-gnome diff --git a/devel/libgcroots/buildlink3.mk b/devel/libgcroots/buildlink3.mk index 5c6fe276845..5448f42a5e9 100644 --- a/devel/libgcroots/buildlink3.mk +++ b/devel/libgcroots/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/02/29 13:06:36 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:18 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGCROOTS_BUILDLINK3_MK:= ${LIBGCROOTS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgcroots -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libgcroots -.endif +.if !defined(LIBGCROOTS_BUILDLINK3_MK) +LIBGCROOTS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgcroots} -BUILDLINK_PACKAGES+= libgcroots -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgcroots - -.if ${LIBGCROOTS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libgcroots+= libgcroots>=0.2.1 BUILDLINK_PKGSRCDIR.libgcroots?= ../../devel/libgcroots -.endif # LIBGCROOTS_BUILDLINK3_MK +.endif # LIBGCROOTS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgcroots diff --git a/devel/libgee/buildlink3.mk b/devel/libgee/buildlink3.mk index 6a560cb8cd0..2ab5101c8ee 100644 --- a/devel/libgee/buildlink3.mk +++ b/devel/libgee/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/03/05 21:59:43 ahoka Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:18 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGEE_BUILDLINK3_MK:= ${LIBGEE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgee -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libgee -.endif +.if !defined(LIBGEE_BUILDLINK3_MK) +LIBGEE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgee} -BUILDLINK_PACKAGES+= libgee -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgee - -.if ${LIBGEE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libgee+= libgee>=0.1.5 BUILDLINK_PKGSRCDIR.libgee?= ../../devel/libgee -.endif # LIBGEE_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../lang/vala/buildlink3.mk" +.endif # LIBGEE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgee diff --git a/devel/libgetopt/buildlink3.mk b/devel/libgetopt/buildlink3.mk index aeb84d5edce..43652dcae5d 100644 --- a/devel/libgetopt/buildlink3.mk +++ b/devel/libgetopt/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:10:44 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:18 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGETOPT_BUILDLINK3_MK:= ${LIBGETOPT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= getopt -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= getopt -.endif +.if !defined(LIBGETOPT_BUILDLINK3_MK) +LIBGETOPT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngetopt} -BUILDLINK_PACKAGES+= getopt -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}getopt - -.if !empty(LIBGETOPT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.getopt+= libgetopt>=1.3 BUILDLINK_PKGSRCDIR.getopt?= ../../devel/libgetopt -.endif # LIBGETOPT_BUILDLINK3_MK +.endif # LIBGETOPT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -getopt diff --git a/devel/libglade/buildlink3.mk b/devel/libglade/buildlink3.mk index ca1fac122a9..1737cd31796 100644 --- a/devel/libglade/buildlink3.mk +++ b/devel/libglade/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.13 2007/09/21 12:58:55 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:18 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGLADE_BUILDLINK3_MK:= ${LIBGLADE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libglade -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libglade -.endif +.if !defined(LIBGLADE_BUILDLINK3_MK) +LIBGLADE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibglade} -BUILDLINK_PACKAGES+= libglade -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libglade - -.if !empty(LIBGLADE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libglade+= libglade>=2.3.6 BUILDLINK_ABI_DEPENDS.libglade+= libglade>=2.5.1nb4 BUILDLINK_PKGSRCDIR.libglade?= ../../devel/libglade @@ -19,9 +12,9 @@ BUILDLINK_PKGSRCDIR.libglade?= ../../devel/libglade PRINT_PLIST_AWK+= /^@dirrm lib\/libglade$$/ { next; } PRINT_PLIST_AWK+= /^@dirrm lib\/libglade\/2.0$$/ \ { print "@comment in libglade: " $$0; next; } -.endif # LIBGLADE_BUILDLINK3_MK .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # LIBGLADE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libglade diff --git a/devel/libglademm/buildlink3.mk b/devel/libglademm/buildlink3.mk index 8ddef3acba3..3d29e435590 100644 --- a/devel/libglademm/buildlink3.mk +++ b/devel/libglademm/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.10 2007/09/21 13:03:38 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:18 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGLADEMM_BUILDLINK3_MK:= ${LIBGLADEMM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libglademm -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libglademm -.endif +.if !defined(LIBGLADEMM_BUILDLINK3_MK) +LIBGLADEMM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibglademm} -BUILDLINK_PACKAGES+= libglademm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libglademm - -.if !empty(LIBGLADEMM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libglademm+= libglademm>=2.6.0 BUILDLINK_ABI_DEPENDS.libglademm+= libglademm>=2.6.2nb1 BUILDLINK_PKGSRCDIR.libglademm?= ../../devel/libglademm -.endif # LIBGLADEMM_BUILDLINK3_MK .include "../../devel/libglade/buildlink3.mk" .include "../../x11/gtkmm/buildlink3.mk" +.endif # LIBGLADEMM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libglademm diff --git a/devel/libgnome/buildlink3.mk b/devel/libgnome/buildlink3.mk index 106884f2fa9..2729d413c47 100644 --- a/devel/libgnome/buildlink3.mk +++ b/devel/libgnome/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.20 2008/04/10 16:40:49 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2009/03/20 19:24:18 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGNOME_BUILDLINK3_MK:= ${LIBGNOME_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgnome -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libgnome -.endif +.if !defined(LIBGNOME_BUILDLINK3_MK) +LIBGNOME_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnome} -BUILDLINK_PACKAGES+= libgnome -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgnome - -.if !empty(LIBGNOME_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.8.0 BUILDLINK_ABI_DEPENDS.libgnome+= libgnome>=2.20.1.1nb1 BUILDLINK_PKGSRCDIR.libgnome?= ../../devel/libgnome -.endif # LIBGNOME_BUILDLINK3_MK .include "../../audio/esound/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -26,5 +18,6 @@ BUILDLINK_PKGSRCDIR.libgnome?= ../../devel/libgnome .include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" +.endif # LIBGNOME_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgnome diff --git a/devel/libgnomemm/buildlink3.mk b/devel/libgnomemm/buildlink3.mk index b1873da170a..d9e161be9e3 100644 --- a/devel/libgnomemm/buildlink3.mk +++ b/devel/libgnomemm/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.14 2008/03/06 14:53:49 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:18 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGNOMEMM_BUILDLINK3_MK:= ${LIBGNOMEMM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgnomemm -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libgnomemm -.endif +.if !defined(LIBGNOMEMM_BUILDLINK3_MK) +LIBGNOMEMM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomemm} -BUILDLINK_PACKAGES+= libgnomemm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgnomemm - -.if !empty(LIBGNOMEMM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libgnomemm+= libgnomemm>=2.10.0 BUILDLINK_ABI_DEPENDS.libgnomemm+= libgnomemm>=2.20.0nb1 BUILDLINK_PKGSRCDIR.libgnomemm?= ../../devel/libgnomemm -.endif # LIBGNOMEMM_BUILDLINK3_MK .include "../../devel/libgnome/buildlink3.mk" .include "../../x11/gtkmm/buildlink3.mk" +.endif # LIBGNOMEMM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgnomemm diff --git a/devel/libgnomeui/buildlink3.mk b/devel/libgnomeui/buildlink3.mk index bdbe455f1c0..ac19605de9d 100644 --- a/devel/libgnomeui/buildlink3.mk +++ b/devel/libgnomeui/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.25 2008/10/16 13:26:11 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.26 2009/03/20 19:24:18 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGNOMEUI_BUILDLINK3_MK:= ${LIBGNOMEUI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgnomeui -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libgnomeui -.endif +.if !defined(LIBGNOMEUI_BUILDLINK3_MK) +LIBGNOMEUI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomeui} -BUILDLINK_PACKAGES+= libgnomeui -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgnomeui - -.if !empty(LIBGNOMEUI_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.8.0 BUILDLINK_ABI_DEPENDS.libgnomeui+= libgnomeui>=2.20.1.1nb2 BUILDLINK_PKGSRCDIR.libgnomeui?= ../../devel/libgnomeui -.endif # LIBGNOMEUI_BUILDLINK3_MK .include "../../devel/GConf/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -27,5 +19,6 @@ BUILDLINK_PKGSRCDIR.libgnomeui?= ../../devel/libgnomeui .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../security/gnome-keyring/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" +.endif # LIBGNOMEUI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgnomeui diff --git a/devel/libgnomeuimm/buildlink3.mk b/devel/libgnomeuimm/buildlink3.mk index 396bdb4765b..cb372dae48f 100644 --- a/devel/libgnomeuimm/buildlink3.mk +++ b/devel/libgnomeuimm/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.14 2008/03/06 14:53:49 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:19 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGNOMEUIMM_BUILDLINK3_MK:= ${LIBGNOMEUIMM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgnomeuimm -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libgnomeuimm -.endif +.if !defined(LIBGNOMEUIMM_BUILDLINK3_MK) +LIBGNOMEUIMM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomeuimm} -BUILDLINK_PACKAGES+= libgnomeuimm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgnomeuimm - -.if !empty(LIBGNOMEUIMM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libgnomeuimm+= libgnomeuimm>=2.10.0 BUILDLINK_ABI_DEPENDS.libgnomeuimm+= libgnomeuimm>=2.20.0nb1 BUILDLINK_PKGSRCDIR.libgnomeuimm?= ../../devel/libgnomeuimm -.endif # LIBGNOMEUIMM_BUILDLINK3_MK .include "../../devel/gconfmm/buildlink3.mk" .include "../../devel/libglademm/buildlink3.mk" @@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.libgnomeuimm?= ../../devel/libgnomeuimm .include "../../devel/libgnomeui/buildlink3.mk" .include "../../graphics/libgnomecanvasmm/buildlink3.mk" .include "../../sysutils/gnome-vfsmm/buildlink3.mk" +.endif # LIBGNOMEUIMM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgnomeuimm diff --git a/devel/libgphoto2/buildlink3.mk b/devel/libgphoto2/buildlink3.mk index de444af5dbe..1cda8a36775 100644 --- a/devel/libgphoto2/buildlink3.mk +++ b/devel/libgphoto2/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.14 2009/03/18 13:25:11 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:19 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGPHOTO2_BUILDLINK3_MK:= ${LIBGPHOTO2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgphoto2 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libgphoto2 -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgphoto2} -BUILDLINK_PACKAGES+= libgphoto2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgphoto2 +.if !defined(LIBGPHOTO2_BUILDLINK3_MK) +LIBGPHOTO2_BUILDLINK3_MK:= -.if !empty(LIBGPHOTO2_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libgphoto2+= libgphoto2>=2.1.2 BUILDLINK_ABI_DEPENDS.libgphoto2+= libgphoto2>=2.1.6nb1 BUILDLINK_PKGSRCDIR.libgphoto2?= ../../devel/libgphoto2 -.endif # LIBGPHOTO2_BUILDLINK3_MK .include "../../mk/bsd.fast.prefs.mk" .if ${OPSYS} != "SunOS" @@ -26,5 +18,6 @@ BUILDLINK_PKGSRCDIR.libgphoto2?= ../../devel/libgphoto2 .include "../../devel/libltdl/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../graphics/libexif/buildlink3.mk" +.endif # LIBGPHOTO2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgphoto2 diff --git a/devel/libgsf/buildlink3.mk b/devel/libgsf/buildlink3.mk index cd1ee2c3392..3de80b621a9 100644 --- a/devel/libgsf/buildlink3.mk +++ b/devel/libgsf/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.19 2008/03/06 14:53:49 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2009/03/20 19:24:19 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGSF_BUILDLINK3_MK:= ${LIBGSF_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgsf -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libgsf -.endif +.if !defined(LIBGSF_BUILDLINK3_MK) +LIBGSF_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgsf} -BUILDLINK_PACKAGES+= libgsf -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgsf - -.if !empty(LIBGSF_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libgsf+= libgsf>=1.13.3 BUILDLINK_ABI_DEPENDS.libgsf?= libgsf>=1.14.7nb3 BUILDLINK_PKGSRCDIR.libgsf?= ../../devel/libgsf -.endif # LIBGSF_BUILDLINK3_MK .include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" @@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.libgsf?= ../../devel/libgsf .include "../../devel/zlib/buildlink3.mk" .include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.endif # LIBGSF_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgsf diff --git a/devel/libgweather/buildlink3.mk b/devel/libgweather/buildlink3.mk index ef223d09d55..7addf056c14 100644 --- a/devel/libgweather/buildlink3.mk +++ b/devel/libgweather/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/10/16 13:36:46 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:19 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGWEATHER_BUILDLINK3_MK:= ${LIBGWEATHER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgweather -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libgweather -.endif +.if !defined(LIBGWEATHER_BUILDLINK3_MK) +LIBGWEATHER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgweather} -BUILDLINK_PACKAGES+= libgweather -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgweather - -.if ${LIBGWEATHER_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libgweather+= libgweather>=2.22.0 BUILDLINK_PKGSRCDIR.libgweather?= ../../devel/libgweather -.endif # LIBGWEATHER_BUILDLINK3_MK .include "../../net/libsoup24/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../sysutils/gnome-vfs/buildlink3.mk" +.endif # LIBGWEATHER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgweather diff --git a/devel/libhfs/buildlink3.mk b/devel/libhfs/buildlink3.mk index dd341c75ff2..720eff2d7eb 100644 --- a/devel/libhfs/buildlink3.mk +++ b/devel/libhfs/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:44 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:19 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBHFS_BUILDLINK3_MK:= ${LIBHFS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libhfs -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libhfs -.endif +.if !defined(LIBHFS_BUILDLINK3_MK) +LIBHFS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibhfs} -BUILDLINK_PACKAGES+= libhfs -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libhfs - -.if !empty(LIBHFS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libhfs+= libhfs>=3.2.6nb1 BUILDLINK_PKGSRCDIR.libhfs?= ../../devel/libhfs -.endif # LIBHFS_BUILDLINK3_MK +.endif # LIBHFS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libhfs diff --git a/devel/libiberty/buildlink3.mk b/devel/libiberty/buildlink3.mk index 5d1e9436d30..b2311d72111 100644 --- a/devel/libiberty/buildlink3.mk +++ b/devel/libiberty/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:44 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:19 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBIBERTY_BUILDLINK3_MK:= ${LIBIBERTY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libiberty -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libiberty -.endif +.if !defined(LIBIBERTY_BUILDLINK3_MK) +LIBIBERTY_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibiberty} -BUILDLINK_PACKAGES+= libiberty -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libiberty - -.if !empty(LIBIBERTY_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libiberty+= libiberty>=1.0nb1 BUILDLINK_ABI_DEPENDS.libiberty?= libiberty>=1.0nb2 BUILDLINK_PKGSRCDIR.libiberty?= ../../devel/libiberty -.endif # LIBIBERTY_BUILDLINK3_MK BUILDLINK_DEPMETHOD.libiberty?= build +.endif # LIBIBERTY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libiberty diff --git a/devel/libidn/buildlink3.mk b/devel/libidn/buildlink3.mk index 6bd073817a7..cad4cb70f4d 100644 --- a/devel/libidn/buildlink3.mk +++ b/devel/libidn/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:19 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBIDN_BUILDLINK3_MK:= ${LIBIDN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libidn -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libidn -.endif +.if !defined(LIBIDN_BUILDLINK3_MK) +LIBIDN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibidn} -BUILDLINK_PACKAGES+= libidn -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libidn - -.if !empty(LIBIDN_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libidn+= libidn>=0.4.6 BUILDLINK_ABI_DEPENDS.libidn+= libidn>=0.6.1nb1 BUILDLINK_PKGSRCDIR.libidn?= ../../devel/libidn -.endif # LIBIDN_BUILDLINK3_MK .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libgetopt/buildlink3.mk" +.endif # LIBIDN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libidn diff --git a/devel/libixp/buildlink3.mk b/devel/libixp/buildlink3.mk index 7f4c67e1b1c..7a242144e48 100644 --- a/devel/libixp/buildlink3.mk +++ b/devel/libixp/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/01/06 21:47:09 ghen Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:19 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBIXP_BUILDLINK3_MK:= ${LIBIXP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libixp -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libixp -.endif +.if !defined(LIBIXP_BUILDLINK3_MK) +LIBIXP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibixp} -BUILDLINK_PACKAGES+= libixp -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libixp - -.if ${LIBIXP_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libixp+= libixp>=0.4 BUILDLINK_PKGSRCDIR.libixp?= ../../devel/libixp -.endif # LIBIXP_BUILDLINK3_MK +.endif # LIBIXP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libixp diff --git a/devel/libjit/buildlink3.mk b/devel/libjit/buildlink3.mk index 4fbc9e9b2a6..5288bdd1013 100644 --- a/devel/libjit/buildlink3.mk +++ b/devel/libjit/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:19 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBJIT_BUILDLINK3_MK:= ${LIBJIT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libjit -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libjit -.endif +.if !defined(LIBJIT_BUILDLINK3_MK) +LIBJIT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibjit} -BUILDLINK_PACKAGES+= libjit -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libjit - -.if !empty(LIBJIT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libjit+= libjit>=0.0.2 BUILDLINK_ABI_DEPENDS.libjit+= libjit>=0.0.4nb1 BUILDLINK_PKGSRCDIR.libjit?= ../../devel/libjit -.endif # LIBJIT_BUILDLINK3_MK +.endif # LIBJIT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libjit diff --git a/devel/libjudy/buildlink3.mk b/devel/libjudy/buildlink3.mk index 3e547027665..0f8c3df03df 100644 --- a/devel/libjudy/buildlink3.mk +++ b/devel/libjudy/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/06/13 13:28:10 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:19 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBJUDY_BUILDLINK3_MK:= ${LIBJUDY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libjudy -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libjudy -.endif +.if !defined(LIBJUDY_BUILDLINK3_MK) +LIBJUDY_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibjudy} -BUILDLINK_PACKAGES+= libjudy -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libjudy - -.if !empty(LIBJUDY_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libjudy+= libjudy>=1.0.3 BUILDLINK_PKGSRCDIR.libjudy?= ../../devel/libjudy -.endif # LIBJUDY_BUILDLINK3_MK +.endif # LIBJUDY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libjudy diff --git a/devel/libltdl/buildlink3.mk b/devel/libltdl/buildlink3.mk index 62195facab0..dc6c63bb6e6 100644 --- a/devel/libltdl/buildlink3.mk +++ b/devel/libltdl/buildlink3.mk @@ -1,7 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/12/12 21:52:35 joerg Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBLTDL_BUILDLINK3_MK:= ${LIBLTDL_BUILDLINK3_MK}+ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:20 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" .if ${OPSYS} == "NetBSD" @@ -11,20 +8,17 @@ _SKIP_LIBLTDL= yes .endif .if !defined(_SKIP_LIBLTDL) -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libltdl -.endif -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibltdl} -BUILDLINK_PACKAGES+= libltdl -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libltdl +BUILDLINK_TREE+= libltdl + +.if !defined(LIBLTDL_BUILDLINK3_MK) +LIBLTDL_BUILDLINK3_MK:= -.if !empty(LIBLTDL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libltdl+= libltdl>=1.5.10 BUILDLINK_PKGSRCDIR.libltdl?= ../../devel/libltdl -.endif # LIBLTDL_BUILDLINK3_MK .include "../../mk/dlopen.buildlink3.mk" .endif +.endif # LIBLTDL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libltdl diff --git a/devel/libmaa/buildlink3.mk b/devel/libmaa/buildlink3.mk index 6ab13890e4a..9ff50bc4140 100644 --- a/devel/libmaa/buildlink3.mk +++ b/devel/libmaa/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/03/12 00:50:20 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:20 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBMAA_BUILDLINK3_MK:= ${LIBMAA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libmaa -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libmaa -.endif +.if !defined(LIBMAA_BUILDLINK3_MK) +LIBMAA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmaa} -BUILDLINK_PACKAGES+= libmaa -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmaa - -.if ${LIBMAA_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libmaa+= libmaa>=0.990 BUILDLINK_PKGSRCDIR.libmaa?= ../../devel/libmaa -.endif # LIBMAA_BUILDLINK3_MK +.endif # LIBMAA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libmaa diff --git a/devel/libmatchbox/buildlink3.mk b/devel/libmatchbox/buildlink3.mk index 9760d433243..d88cb765222 100644 --- a/devel/libmatchbox/buildlink3.mk +++ b/devel/libmatchbox/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.13 2006/12/27 13:37:36 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:20 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBMATCHBOX_BUILDLINK3_MK:= ${LIBMATCHBOX_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libmatchbox -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libmatchbox -.endif +.if !defined(LIBMATCHBOX_BUILDLINK3_MK) +LIBMATCHBOX_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmatchbox} -BUILDLINK_PACKAGES+= libmatchbox -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmatchbox - -.if !empty(LIBMATCHBOX_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libmatchbox+= libmatchbox>=1.4 BUILDLINK_ABI_DEPENDS.libmatchbox+= libmatchbox>=1.7nb3 BUILDLINK_PKGSRCDIR.libmatchbox?= ../../devel/libmatchbox -.endif # LIBMATCHBOX_BUILDLINK3_MK .include "../../graphics/png/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../x11/xextproto/buildlink3.mk" +.endif # LIBMATCHBOX_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libmatchbox diff --git a/devel/libmcs/buildlink3.mk b/devel/libmcs/buildlink3.mk index 9f0e714d9a0..6f6cdf35531 100644 --- a/devel/libmcs/buildlink3.mk +++ b/devel/libmcs/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/11/10 11:39:48 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:20 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBMCS_BUILDLINK3_MK:= ${LIBMCS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libmcs -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libmcs -.endif +.if !defined(LIBMCS_BUILDLINK3_MK) +LIBMCS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmcs} -BUILDLINK_PACKAGES+= libmcs -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmcs - -.if ${LIBMCS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libmcs+= libmcs>=0.7.1 BUILDLINK_PKGSRCDIR.libmcs?= ../../devel/libmcs -.endif # LIBMCS_BUILDLINK3_MK .include "../../devel/libmowgli/buildlink3.mk" +.endif # LIBMCS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libmcs diff --git a/devel/libmemcache/buildlink3.mk b/devel/libmemcache/buildlink3.mk index 91813d9e331..a8284159933 100644 --- a/devel/libmemcache/buildlink3.mk +++ b/devel/libmemcache/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:20 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBMEMCACHE_BUILDLINK3_MK:= ${LIBMEMCACHE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libmemcache -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libmemcache -.endif +.if !defined(LIBMEMCACHE_BUILDLINK3_MK) +LIBMEMCACHE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmemcache} -BUILDLINK_PACKAGES+= libmemcache -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmemcache - -.if !empty(LIBMEMCACHE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libmemcache+= libmemcache>=1.4.0beta5 BUILDLINK_PKGSRCDIR.libmemcache?= ../../devel/libmemcache -.endif # LIBMEMCACHE_BUILDLINK3_MK +.endif # LIBMEMCACHE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libmemcache diff --git a/devel/libmemmgr/buildlink3.mk b/devel/libmemmgr/buildlink3.mk index 769b9e0755a..c335af4473e 100644 --- a/devel/libmemmgr/buildlink3.mk +++ b/devel/libmemmgr/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:20 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBMEMMGR_BUILDLINK3_MK:= ${LIBMEMMGR_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libmemmgr -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libmemmgr -.endif +.if !defined(LIBMEMMGR_BUILDLINK3_MK) +LIBMEMMGR_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmemmgr} -BUILDLINK_PACKAGES+= libmemmgr -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmemmgr - -.if !empty(LIBMEMMGR_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libmemmgr+= libmemmgr>=1.04 BUILDLINK_PKGSRCDIR.libmemmgr?= ../../devel/libmemmgr BUILDLINK_DEPMETHOD.libmemmgr?= build -.endif # LIBMEMMGR_BUILDLINK3_MK .include "../../devel/libetm/buildlink3.mk" +.endif # LIBMEMMGR_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libmemmgr diff --git a/devel/libmimedir/buildlink3.mk b/devel/libmimedir/buildlink3.mk index fba9624a7c0..0c7f81d8258 100644 --- a/devel/libmimedir/buildlink3.mk +++ b/devel/libmimedir/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:20 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBMIMEDIR_BUILDLINK3_MK:= ${LIBMIMEDIR_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libmimedir -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libmimedir -.endif +.if !defined(LIBMIMEDIR_BUILDLINK3_MK) +LIBMIMEDIR_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmimedir} -BUILDLINK_PACKAGES+= libmimedir -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmimedir - -.if !empty(LIBMIMEDIR_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libmimedir+= libmimedir>=0.4nb1 BUILDLINK_PKGSRCDIR.libmimedir?= ../../devel/libmimedir -.endif # LIBMIMEDIR_BUILDLINK3_MK +.endif # LIBMIMEDIR_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libmimedir diff --git a/devel/libmm/buildlink3.mk b/devel/libmm/buildlink3.mk index 847e69626d6..e87330f51b5 100644 --- a/devel/libmm/buildlink3.mk +++ b/devel/libmm/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.10 2007/09/07 17:16:43 reed Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:20 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBMM_BUILDLINK3_MK:= ${LIBMM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libmm -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libmm -.endif +.if !defined(LIBMM_BUILDLINK3_MK) +LIBMM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmm} -BUILDLINK_PACKAGES+= libmm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmm - -.if !empty(LIBMM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libmm+= libmm>=1.4.0 BUILDLINK_PKGSRCDIR.libmm?= ../../devel/libmm -.endif # LIBMM_BUILDLINK3_MK +.endif # LIBMM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libmm diff --git a/devel/libmowgli/buildlink3.mk b/devel/libmowgli/buildlink3.mk index 385df49995a..03b687841a4 100644 --- a/devel/libmowgli/buildlink3.mk +++ b/devel/libmowgli/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.3 2008/11/10 12:08:17 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:20 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBMOWGLI_BUILDLINK3_MK:= ${LIBMOWGLI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libmowgli -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libmowgli -.endif +.if !defined(LIBMOWGLI_BUILDLINK3_MK) +LIBMOWGLI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmowgli} -BUILDLINK_PACKAGES+= libmowgli -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmowgli - -.if ${LIBMOWGLI_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libmowgli+= libmowgli>=0.7.0 BUILDLINK_PKGSRCDIR.libmowgli?= ../../devel/libmowgli -.endif # LIBMOWGLI_BUILDLINK3_MK +.endif # LIBMOWGLI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libmowgli diff --git a/devel/libmtp/buildlink3.mk b/devel/libmtp/buildlink3.mk index 9ada2e78487..4298b7b2759 100644 --- a/devel/libmtp/buildlink3.mk +++ b/devel/libmtp/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/09/06 23:24:08 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:20 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBMTP_BUILDLINK3_MK:= ${LIBMTP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libmtp -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libmtp -.endif +.if !defined(LIBMTP_BUILDLINK3_MK) +LIBMTP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmtp} -BUILDLINK_PACKAGES+= libmtp -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmtp - -.if ${LIBMTP_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libmtp+= libmtp>=0.3.0 BUILDLINK_PKGSRCDIR.libmtp?= ../../devel/libmtp -.endif # LIBMTP_BUILDLINK3_MK .include "../../devel/libusb/buildlink3.mk" +.endif # LIBMTP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libmtp diff --git a/devel/libnet10/buildlink3.mk b/devel/libnet10/buildlink3.mk index dbb7c2b5e69..8e76fbaa63c 100644 --- a/devel/libnet10/buildlink3.mk +++ b/devel/libnet10/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/02/18 18:36:21 adrianp Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:21 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBNET10_BUILDLINK3_MK:= ${LIBNET10_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libnet10 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libnet10 -.endif +.if !defined(LIBNET10_BUILDLINK3_MK) +LIBNET10_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibnet10} -BUILDLINK_PACKAGES+= libnet10 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libnet10 - -.if ${LIBNET10_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libnet10+= libnet10>=1.0.2a BUILDLINK_PKGSRCDIR.libnet10?= ../../devel/libnet10 BUILDLINK_INCDIRS.libnet10+= include/libnet10 BUILDLINK_LIBDIRS.libnet10+= lib/libnet10 -.endif # LIBNET10_BUILDLINK3_MK +.endif # LIBNET10_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libnet10 diff --git a/devel/libnet11/buildlink3.mk b/devel/libnet11/buildlink3.mk index c14b9cc5dff..cd80c3bc434 100644 --- a/devel/libnet11/buildlink3.mk +++ b/devel/libnet11/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.6 2007/02/18 18:31:00 adrianp Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:21 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBNET11_BUILDLINK3_MK:= ${LIBNET11_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libnet11 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libnet11 -.endif +.if !defined(LIBNET11_BUILDLINK3_MK) +LIBNET11_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibnet11} -BUILDLINK_PACKAGES+= libnet11 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libnet11 - -.if ${LIBNET11_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libnet11+= libnet11>=1.1.2.1 BUILDLINK_PKGSRCDIR.libnet11?= ../../devel/libnet11 BUILDLINK_INCDIRS.libnet11+= include/libnet11 BUILDLINK_LIBDIRS.libnet11+= lib/libnet11 BUILDLINK_CPPFLAGS.libnet11+= -lnet -.endif # LIBNET11_BUILDLINK3_MK +.endif # LIBNET11_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libnet11 diff --git a/devel/libntlm/buildlink3.mk b/devel/libntlm/buildlink3.mk index ca35458007f..2faaacf49c2 100644 --- a/devel/libntlm/buildlink3.mk +++ b/devel/libntlm/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:21 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBNTLM_BUILDLINK3_MK:= ${LIBNTLM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libntlm -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libntlm -.endif +.if !defined(LIBNTLM_BUILDLINK3_MK) +LIBNTLM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibntlm} -BUILDLINK_PACKAGES+= libntlm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libntlm - -.if !empty(LIBNTLM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libntlm+= libntlm>=0.3.2 BUILDLINK_ABI_DEPENDS.libntlm+= libntlm>=0.3.6nb1 BUILDLINK_PKGSRCDIR.libntlm?= ../../devel/libntlm -.endif # LIBNTLM_BUILDLINK3_MK +.endif # LIBNTLM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libntlm diff --git a/devel/liboil/buildlink3.mk b/devel/liboil/buildlink3.mk index b91ad9c15e0..14f507d8e74 100644 --- a/devel/liboil/buildlink3.mk +++ b/devel/liboil/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:21 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBOIL_BUILDLINK3_MK:= ${LIBOIL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= liboil -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= liboil -.endif +.if !defined(LIBOIL_BUILDLINK3_MK) +LIBOIL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nliboil} -BUILDLINK_PACKAGES+= liboil -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}liboil - -.if !empty(LIBOIL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.liboil+= liboil>=0.3.6 BUILDLINK_PKGSRCDIR.liboil?= ../../devel/liboil -.endif # LIBOIL_BUILDLINK3_MK +.endif # LIBOIL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -liboil diff --git a/devel/liboop/buildlink3.mk b/devel/liboop/buildlink3.mk index e8e52fbd782..59b3669d8ba 100644 --- a/devel/liboop/buildlink3.mk +++ b/devel/liboop/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:21 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBOOP_BUILDLINK3_MK:= ${LIBOOP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= liboop -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= liboop -.endif +.if !defined(LIBOOP_BUILDLINK3_MK) +LIBOOP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nliboop} -BUILDLINK_PACKAGES+= liboop -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}liboop - -.if !empty(LIBOOP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.liboop+= liboop>=0.9 BUILDLINK_ABI_DEPENDS.liboop+= liboop>=1.0nb1 BUILDLINK_PKGSRCDIR.liboop?= ../../devel/liboop -.endif # LIBOOP_BUILDLINK3_MK +.endif # LIBOOP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -liboop diff --git a/devel/libosip/buildlink3.mk b/devel/libosip/buildlink3.mk index 31b9aac9a9f..cdf123298aa 100644 --- a/devel/libosip/buildlink3.mk +++ b/devel/libosip/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.9 2008/11/11 22:02:42 schwarz Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:21 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBOSIP2_BUILDLINK3_MK:= ${LIBOSIP2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libosip2 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libosip2 -.endif +.if !defined(LIBOSIP2_BUILDLINK3_MK) +LIBOSIP2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibosip2} -BUILDLINK_PACKAGES+= libosip2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libosip2 - -.if !empty(LIBOSIP2_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libosip2+= libosip2>=2.2.0 BUILDLINK_ABI_DEPENDS.libosip2+= libosip2>=3.2.0 BUILDLINK_PKGSRCDIR.libosip2?= ../../devel/libosip -.endif # LIBOSIP2_BUILDLINK3_MK +.endif # LIBOSIP2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libosip2 diff --git a/devel/libowfat/buildlink3.mk b/devel/libowfat/buildlink3.mk index 02acf9226fd..342b7f5016e 100644 --- a/devel/libowfat/buildlink3.mk +++ b/devel/libowfat/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/01/06 23:48:49 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:21 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBOWFAT_BUILDLINK3_MK:= ${LIBOWFAT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libowfat -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libowfat -.endif +.if !defined(LIBOWFAT_BUILDLINK3_MK) +LIBOWFAT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibowfat} -BUILDLINK_PACKAGES+= libowfat -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libowfat - -.if ${LIBOWFAT_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libowfat+= libowfat>=0.26 BUILDLINK_PKGSRCDIR.libowfat?= ../../devel/libowfat BUILDLINK_DEPMETHOD.libowfat?= build -.endif # LIBOWFAT_BUILDLINK3_MK +.endif # LIBOWFAT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libowfat diff --git a/devel/libportlib/buildlink3.mk b/devel/libportlib/buildlink3.mk index 6075ed16115..e34074aad52 100644 --- a/devel/libportlib/buildlink3.mk +++ b/devel/libportlib/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:21 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBPORTLIB_BUILDLINK3_MK:= ${LIBPORTLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libportlib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libportlib -.endif +.if !defined(LIBPORTLIB_BUILDLINK3_MK) +LIBPORTLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibportlib} -BUILDLINK_PACKAGES+= libportlib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libportlib - -.if !empty(LIBPORTLIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libportlib+= libportlib>=1.01 BUILDLINK_PKGSRCDIR.libportlib?= ../../devel/libportlib BUILDLINK_DEPMETHOD.libportlib?= build -.endif # LIBPORTLIB_BUILDLINK3_MK +.endif # LIBPORTLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libportlib diff --git a/devel/libproplist/buildlink3.mk b/devel/libproplist/buildlink3.mk index d7ec63d44b8..0696aa27191 100644 --- a/devel/libproplist/buildlink3.mk +++ b/devel/libproplist/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:21 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBPROPLIST_BUILDLINK3_MK:= ${LIBPROPLIST_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libproplist -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libproplist -.endif +.if !defined(LIBPROPLIST_BUILDLINK3_MK) +LIBPROPLIST_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibproplist} -BUILDLINK_PACKAGES+= libproplist -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libproplist - -.if !empty(LIBPROPLIST_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libproplist+= libproplist>=0.10.1 BUILDLINK_ABI_DEPENDS.libproplist+= libproplist>=0.10.1nb1 BUILDLINK_PKGSRCDIR.libproplist?= ../../devel/libproplist -.endif # LIBPROPLIST_BUILDLINK3_MK +.endif # LIBPROPLIST_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libproplist diff --git a/devel/librfuncs/buildlink3.mk b/devel/librfuncs/buildlink3.mk index b43aa779366..66c03cce859 100644 --- a/devel/librfuncs/buildlink3.mk +++ b/devel/librfuncs/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.9 2007/02/15 14:24:24 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:21 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBRFUNCS_BUILDLINK3_MK:= ${LIBRFUNCS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= librfuncs -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= librfuncs -.endif +.if !defined(LIBRFUNCS_BUILDLINK3_MK) +LIBRFUNCS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibrfuncs} -BUILDLINK_PACKAGES+= librfuncs -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}librfuncs - -.if !empty(LIBRFUNCS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.librfuncs+= librfuncs>=1.0.4 BUILDLINK_PKGSRCDIR.librfuncs?= ../../devel/librfuncs BUILDLINK_LDFLAGS.librfuncs+= -lrfuncs -.endif # LIBRFUNCS_BUILDLINK3_MK +.endif # LIBRFUNCS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -librfuncs diff --git a/devel/librlog/buildlink3.mk b/devel/librlog/buildlink3.mk index 37b303dc08c..3da30caed71 100644 --- a/devel/librlog/buildlink3.mk +++ b/devel/librlog/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/02/18 14:18:18 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:21 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBRLOG_BUILDLINK3_MK:= ${LIBRLOG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= librlog -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= librlog -.endif +.if !defined(LIBRLOG_BUILDLINK3_MK) +LIBRLOG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibrlog} -BUILDLINK_PACKAGES+= librlog -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}librlog - -.if ${LIBRLOG_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.librlog+= librlog>=1.3.7 BUILDLINK_PKGSRCDIR.librlog?= ../../devel/librlog -.endif # LIBRLOG_BUILDLINK3_MK +.endif # LIBRLOG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -librlog diff --git a/devel/librsync/buildlink3.mk b/devel/librsync/buildlink3.mk index 94400a1a11b..31b677366b0 100644 --- a/devel/librsync/buildlink3.mk +++ b/devel/librsync/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:22 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBRSYNC_BUILDLINK3_MK:= ${LIBRSYNC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= librsync -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= librsync -.endif +.if !defined(LIBRSYNC_BUILDLINK3_MK) +LIBRSYNC_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibrsync} -BUILDLINK_PACKAGES+= librsync -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}librsync - -.if !empty(LIBRSYNC_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.librsync+= librsync>=0.9.6nb2 BUILDLINK_ABI_DEPENDS.librsync+= librsync>=0.9.7nb1 BUILDLINK_PKGSRCDIR.librsync?= ../../devel/librsync -.endif # LIBRSYNC_BUILDLINK3_MK .include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.endif # LIBRSYNC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -librsync diff --git a/devel/librxspencer/buildlink3.mk b/devel/librxspencer/buildlink3.mk index 3673f40acdd..99810645141 100644 --- a/devel/librxspencer/buildlink3.mk +++ b/devel/librxspencer/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/02/21 21:06:12 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:22 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBRXSPENCER_BUILDLINK3_MK:= ${LIBRXSPENCER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= librxspencer -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= librxspencer -.endif +.if !defined(LIBRXSPENCER_BUILDLINK3_MK) +LIBRXSPENCER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibrxspencer} -BUILDLINK_PACKAGES+= librxspencer -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}librxspencer - -.if !empty(LIBRXSPENCER_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.librxspencer+= librxspencer>=3.8.3 BUILDLINK_PKGSRCDIR.librxspencer?= ../../devel/librxspencer BUILDLINK_INCDIRS.librxspencer+= include/rxspencer -.endif # LIBRXSPENCER_BUILDLINK3_MK +.endif # LIBRXSPENCER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -librxspencer diff --git a/devel/libscsi/buildlink3.mk b/devel/libscsi/buildlink3.mk index 85d9778e03a..eb0bf005062 100644 --- a/devel/libscsi/buildlink3.mk +++ b/devel/libscsi/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:22 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSCSI_BUILDLINK3_MK:= ${LIBSCSI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libscsi -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libscsi -.endif +.if !defined(LIBSCSI_BUILDLINK3_MK) +LIBSCSI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibscsi} -BUILDLINK_PACKAGES+= libscsi -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libscsi - -.if !empty(LIBSCSI_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libscsi+= libscsi>=1.6 BUILDLINK_PKGSRCDIR.libscsi?= ../../devel/libscsi BUILDLINK_DEPMETHOD.libscsi?= build -.endif # LIBSCSI_BUILDLINK3_MK +.endif # LIBSCSI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libscsi diff --git a/devel/libsexy/buildlink3.mk b/devel/libsexy/buildlink3.mk index 46683e67d25..09276071f2d 100644 --- a/devel/libsexy/buildlink3.mk +++ b/devel/libsexy/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:22 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSEXY_BUILDLINK3_MK:= ${LIBSEXY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libsexy -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libsexy -.endif +.if !defined(LIBSEXY_BUILDLINK3_MK) +LIBSEXY_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsexy} -BUILDLINK_PACKAGES+= libsexy -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsexy - -.if !empty(LIBSEXY_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libsexy+= libsexy>=0.1.8 BUILDLINK_ABI_DEPENDS.libsexy?= libsexy>=0.1.8nb1 BUILDLINK_PKGSRCDIR.libsexy?= ../../devel/libsexy -.endif # LIBSEXY_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # LIBSEXY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libsexy diff --git a/devel/libsexymm/buildlink3.mk b/devel/libsexymm/buildlink3.mk index 562b546fe1c..463fe935af6 100644 --- a/devel/libsexymm/buildlink3.mk +++ b/devel/libsexymm/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/07/17 19:10:48 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:22 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSEXYMM_BUILDLINK3_MK:= ${LIBSEXYMM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libsexymm -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libsexymm -.endif +.if !defined(LIBSEXYMM_BUILDLINK3_MK) +LIBSEXYMM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsexymm} -BUILDLINK_PACKAGES+= libsexymm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsexymm - -.if ${LIBSEXYMM_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libsexymm+= libsexymm>=0.1.9 BUILDLINK_PKGSRCDIR.libsexymm?= ../../devel/libsexymm -.endif # LIBSEXYMM_BUILDLINK3_MK .include "../../x11/gtkmm/buildlink3.mk" .include "../../devel/libsexy/buildlink3.mk" +.endif # LIBSEXYMM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libsexymm diff --git a/devel/libsigc++/buildlink3.mk b/devel/libsigc++/buildlink3.mk index 0d8f0371e79..96d79fa0233 100644 --- a/devel/libsigc++/buildlink3.mk +++ b/devel/libsigc++/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.10 2007/09/21 12:59:53 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:22 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSIGCPP_BUILDLINK3_MK:= ${LIBSIGCPP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libsigcpp -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libsigcpp -.endif +.if !defined(LIBSIGCPP_BUILDLINK3_MK) +LIBSIGCPP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsigcpp} -BUILDLINK_PACKAGES+= libsigcpp -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsigcpp - -.if !empty(LIBSIGCPP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libsigcpp+= libsigc++>=2.0.3 BUILDLINK_ABI_DEPENDS.libsigcpp+= libsigc++>=2.0.17nb1 BUILDLINK_PKGSRCDIR.libsigcpp?= ../../devel/libsigc++ -.endif # LIBSIGCPP_BUILDLINK3_MK +.endif # LIBSIGCPP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libsigcpp diff --git a/devel/libsigc++1/buildlink3.mk b/devel/libsigc++1/buildlink3.mk index 570810a2946..60f7c0d8b68 100644 --- a/devel/libsigc++1/buildlink3.mk +++ b/devel/libsigc++1/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/09/21 12:59:54 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:22 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSIGCPP1_BUILDLINK3_MK:= ${LIBSIGCPP1_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libsigcpp1 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libsigcpp1 -.endif +.if !defined(LIBSIGCPP1_BUILDLINK3_MK) +LIBSIGCPP1_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsigcpp1} -BUILDLINK_PACKAGES+= libsigcpp1 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsigcpp1 - -.if !empty(LIBSIGCPP1_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libsigcpp1+= libsigc++1>=1.2.3nb1 BUILDLINK_ABI_DEPENDS.libsigcpp1+= libsigc++1>=1.2.7nb1 BUILDLINK_PKGSRCDIR.libsigcpp1?= ../../devel/libsigc++1 -.endif # LIBSIGCPP1_BUILDLINK3_MK +.endif # LIBSIGCPP1_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libsigcpp1 diff --git a/devel/libsigsegv/buildlink3.mk b/devel/libsigsegv/buildlink3.mk index d8d06cf96a2..42626213f18 100644 --- a/devel/libsigsegv/buildlink3.mk +++ b/devel/libsigsegv/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/12/29 13:54:22 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:22 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSIGSEGV_BUILDLINK3_MK:= ${LIBSIGSEGV_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libsigsegv -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libsigsegv -.endif +.if !defined(LIBSIGSEGV_BUILDLINK3_MK) +LIBSIGSEGV_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsigsegv} -BUILDLINK_PACKAGES+= libsigsegv -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsigsegv - -.if !empty(LIBSIGSEGV_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libsigsegv+= libsigsegv>=2.2 BUILDLINK_PKGSRCDIR.libsigsegv?= ../../devel/libsigsegv -.endif # LIBSIGSEGV_BUILDLINK3_MK +.endif # LIBSIGSEGV_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libsigsegv diff --git a/devel/libsigsegv25/buildlink3.mk b/devel/libsigsegv25/buildlink3.mk index 3975fb722d3..95c62a84c15 100644 --- a/devel/libsigsegv25/buildlink3.mk +++ b/devel/libsigsegv25/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/09/12 22:11:28 ahoka Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:22 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSIGSEGV25_BUILDLINK3_MK:= ${LIBSIGSEGV25_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libsigsegv25 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libsigsegv25 -.endif +.if !defined(LIBSIGSEGV25_BUILDLINK3_MK) +LIBSIGSEGV25_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsigsegv25} -BUILDLINK_PACKAGES+= libsigsegv25 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsigsegv25 - -.if !empty(LIBSIGSEGV25_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libsigsegv25+= libsigsegv25>=2.2 BUILDLINK_PKGSRCDIR.libsigsegv25?= ../../devel/libsigsegv25 -.endif # LIBSIGSEGV25_BUILDLINK3_MK +.endif # LIBSIGSEGV25_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libsigsegv25 diff --git a/devel/libslang/buildlink3.mk b/devel/libslang/buildlink3.mk index 1ebfeb9944c..835fa12495c 100644 --- a/devel/libslang/buildlink3.mk +++ b/devel/libslang/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.17 2009/02/25 12:38:36 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:24:22 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSLANG_BUILDLINK3_MK:= ${LIBSLANG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libslang -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libslang -.endif +.if !defined(LIBSLANG_BUILDLINK3_MK) +LIBSLANG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibslang} -BUILDLINK_PACKAGES+= libslang -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libslang - -.if !empty(LIBSLANG_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libslang+= libslang>=1.4.9nb1 BUILDLINK_ABI_DEPENDS.libslang+= libslang>=1.4.9nb4 BUILDLINK_PKGSRCDIR.libslang?= ../../devel/libslang -.endif # LIBSLANG_BUILDLINK3_MK +.endif # LIBSLANG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libslang diff --git a/devel/libslang2/buildlink3.mk b/devel/libslang2/buildlink3.mk index 4eceb35f4f6..7d0cf1485c7 100644 --- a/devel/libslang2/buildlink3.mk +++ b/devel/libslang2/buildlink3.mk @@ -1,24 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/08/09 21:22:11 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:23 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSLANG2_BUILDLINK3_MK:= ${LIBSLANG2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libslang2 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libslang2 -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibslang2} -BUILDLINK_PACKAGES+= libslang2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libslang2 +.if !defined(LIBSLANG2_BUILDLINK3_MK) +LIBSLANG2_BUILDLINK3_MK:= -.if ${LIBSLANG2_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libslang2+= libslang2>=2.1.3 BUILDLINK_PKGSRCDIR.libslang2?= ../../devel/libslang2 BUILDLINK_FNAME_TRANSFORM.libslang2+= -e 's|include/slang2/|include/|g' BUILDLINK_TRANSFORM+= l:slang:slang2 pkgbase:= libslang2 . include "../../mk/pkg-build-options.mk" -.endif # LIBSLANG2_BUILDLINK3_MK .if !empty(PKG_BUILD_OPTIONS.libslang2:Mpng) . include "../../graphics/png/buildlink3.mk" @@ -32,5 +24,6 @@ pkgbase:= libslang2 .include "../../converters/libiconv/buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" +.endif # LIBSLANG2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libslang2 diff --git a/devel/libsmi/buildlink3.mk b/devel/libsmi/buildlink3.mk index 185f3fd9a37..65d986902e7 100644 --- a/devel/libsmi/buildlink3.mk +++ b/devel/libsmi/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1 2008/06/05 19:29:46 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:23 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSMI_BUILDLINK3_MK:= ${LIBSMI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libsmi -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libsmi -.endif +.if !defined(LIBSMI_BUILDLINK3_MK) +LIBSMI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsmi} -BUILDLINK_PACKAGES+= libsmi -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsmi - -.if ${LIBSMI_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libsmi+= libsmi>=0.4.5nb1 BUILDLINK_PKGSRCDIR.libsmi?= ../../devel/libsmi -.endif # LIBSMI_BUILDLINK3_MK +.endif # LIBSMI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libsmi diff --git a/devel/libstatgrab/buildlink3.mk b/devel/libstatgrab/buildlink3.mk index c8182b234b5..6b25a904879 100644 --- a/devel/libstatgrab/buildlink3.mk +++ b/devel/libstatgrab/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:46 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:23 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSTATGRAB_BUILDLINK3_MK:= ${LIBSTATGRAB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libstatgrab -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libstatgrab -.endif +.if !defined(LIBSTATGRAB_BUILDLINK3_MK) +LIBSTATGRAB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibstatgrab} -BUILDLINK_PACKAGES+= libstatgrab -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libstatgrab - -.if !empty(LIBSTATGRAB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libstatgrab+= libstatgrab>=0.10 BUILDLINK_ABI_DEPENDS.libstatgrab+= libstatgrab>=0.10.3nb1 BUILDLINK_PKGSRCDIR.libstatgrab?= ../../devel/libstatgrab -.endif # LIBSTATGRAB_BUILDLINK3_MK +.endif # LIBSTATGRAB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libstatgrab diff --git a/devel/libstroke/buildlink3.mk b/devel/libstroke/buildlink3.mk index 9bdab64a5d5..d27ace99915 100644 --- a/devel/libstroke/buildlink3.mk +++ b/devel/libstroke/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:46 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:23 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSTROKE_BUILDLINK3_MK:= ${LIBSTROKE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libstroke -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libstroke -.endif +.if !defined(LIBSTROKE_BUILDLINK3_MK) +LIBSTROKE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibstroke} -BUILDLINK_PACKAGES+= libstroke -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libstroke - -.if !empty(LIBSTROKE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libstroke+= libstroke>=0.5.1 BUILDLINK_ABI_DEPENDS.libstroke+= libstroke>=0.5.1nb2 BUILDLINK_PKGSRCDIR.libstroke?= ../../devel/libstroke -.endif # LIBSTROKE_BUILDLINK3_MK .include "../../lang/tcl/buildlink3.mk" +.endif # LIBSTROKE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libstroke diff --git a/devel/libtai/buildlink3.mk b/devel/libtai/buildlink3.mk index d5a6767b015..8f2a236a2b1 100644 --- a/devel/libtai/buildlink3.mk +++ b/devel/libtai/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.1 2008/07/30 10:36:27 schmonz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:23 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBTAI_BUILDLINK3_MK:= ${LIBTAI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libtai -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libtai -.endif +.if !defined(LIBTAI_BUILDLINK3_MK) +LIBTAI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibtai} -BUILDLINK_PACKAGES+= libtai -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libtai - -.if ${LIBTAI_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libtai+= libtai>=0.60nb1 BUILDLINK_PKGSRCDIR.libtai?= ../../devel/libtai BUILDLINK_DEPMETHOD.libtai?= build -.endif # LIBTAI_BUILDLINK3_MK +.endif # LIBTAI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libtai diff --git a/devel/libtar/buildlink3.mk b/devel/libtar/buildlink3.mk index aeef02e96bc..22b14778d37 100644 --- a/devel/libtar/buildlink3.mk +++ b/devel/libtar/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:46 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:23 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBTAR_BUILDLINK3_MK:= ${LIBTAR_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libtar -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libtar -.endif +.if !defined(LIBTAR_BUILDLINK3_MK) +LIBTAR_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibtar} -BUILDLINK_PACKAGES+= libtar -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libtar - -.if !empty(LIBTAR_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libtar+= libtar>=1.2.11 BUILDLINK_PKGSRCDIR.libtar?= ../../devel/libtar -.endif # LIBTAR_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" +.endif # LIBTAR_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libtar diff --git a/devel/libtecla/buildlink3.mk b/devel/libtecla/buildlink3.mk index ce732b0612f..dff3b653194 100644 --- a/devel/libtecla/buildlink3.mk +++ b/devel/libtecla/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:46 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:23 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBTECLA_BUILDLINK3_MK:= ${LIBTECLA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libtecla -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libtecla -.endif +.if !defined(LIBTECLA_BUILDLINK3_MK) +LIBTECLA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibtecla} -BUILDLINK_PACKAGES+= libtecla -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libtecla - -.if !empty(LIBTECLA_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libtecla+= libtecla>=1.5.0 BUILDLINK_ABI_DEPENDS.libtecla?= libtecla>=1.6.1nb1 BUILDLINK_PKGSRCDIR.libtecla?= ../../devel/libtecla -.endif # LIBTECLA_BUILDLINK3_MK +.endif # LIBTECLA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libtecla diff --git a/devel/libthai/buildlink3.mk b/devel/libthai/buildlink3.mk index da5bea668f5..c19c7d8149d 100644 --- a/devel/libthai/buildlink3.mk +++ b/devel/libthai/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/02/11 02:20:44 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:23 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBTHAI_BUILDLINK3_MK:= ${LIBTHAI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libthai -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libthai -.endif +.if !defined(LIBTHAI_BUILDLINK3_MK) +LIBTHAI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibthai} -BUILDLINK_PACKAGES+= libthai -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libthai - -.if ${LIBTHAI_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libthai+= libthai>=0.1.9 BUILDLINK_PKGSRCDIR.libthai?= ../../devel/libthai -.endif # LIBTHAI_BUILDLINK3_MK .include "../../devel/libdatrie/buildlink3.mk" +.endif # LIBTHAI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libthai diff --git a/devel/libts/buildlink3.mk b/devel/libts/buildlink3.mk index 0f0282d4653..1643dc33e16 100644 --- a/devel/libts/buildlink3.mk +++ b/devel/libts/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:46 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:23 joerg Exp $ BUILDLINK_DEPMETHOD.libts?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBTS_BUILDLINK3_MK:= ${LIBTS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libts -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libts -.endif +.if !defined(LIBTS_BUILDLINK3_MK) +LIBTS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibts} -BUILDLINK_PACKAGES+= libts -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libts - -.if !empty(LIBTS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libts+= libts>=1.08 BUILDLINK_PKGSRCDIR.libts?= ../../devel/libts -.endif # LIBTS_BUILDLINK3_MK +.endif # LIBTS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libts diff --git a/devel/libusb/buildlink3.mk b/devel/libusb/buildlink3.mk index 1ae02f3a66c..3d2758c0565 100644 --- a/devel/libusb/buildlink3.mk +++ b/devel/libusb/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:46 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:23 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBUSB_BUILDLINK3_MK:= ${LIBUSB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libusb -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libusb -.endif +.if !defined(LIBUSB_BUILDLINK3_MK) +LIBUSB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibusb} -BUILDLINK_PACKAGES+= libusb -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libusb - -.if !empty(LIBUSB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libusb+= libusb>=0.1.7 BUILDLINK_ABI_DEPENDS.libusb+= libusb>=0.1.8nb2 BUILDLINK_PKGSRCDIR.libusb?= ../../devel/libusb -.endif # LIBUSB_BUILDLINK3_MK +.endif # LIBUSB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libusb diff --git a/devel/libvolume_id/buildlink3.mk b/devel/libvolume_id/buildlink3.mk index 14ea7195842..66ecfb9e7e0 100644 --- a/devel/libvolume_id/buildlink3.mk +++ b/devel/libvolume_id/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/22 13:48:23 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:24 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBVOLUME_ID_BUILDLINK3_MK:= ${LIBVOLUME_ID_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libvolume_id -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libvolume_id -.endif +.if !defined(LIBVOLUME_ID_BUILDLINK3_MK) +LIBVOLUME_ID_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibvolume_id} -BUILDLINK_PACKAGES+= libvolume_id -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libvolume_id - -.if ${LIBVOLUME_ID_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libvolume_id+= libvolume_id>=0.81.0 BUILDLINK_PKGSRCDIR.libvolume_id?= ../../devel/libvolume_id -.endif # LIBVOLUME_ID_BUILDLINK3_MK +.endif # LIBVOLUME_ID_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libvolume_id diff --git a/devel/libwnck/buildlink3.mk b/devel/libwnck/buildlink3.mk index c8cef2d6af3..08eab8d1f3d 100644 --- a/devel/libwnck/buildlink3.mk +++ b/devel/libwnck/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.16 2007/11/05 11:36:17 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:24 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBWNCK_BUILDLINK3_MK:= ${LIBWNCK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libwnck -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libwnck -.endif +.if !defined(LIBWNCK_BUILDLINK3_MK) +LIBWNCK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibwnck} -BUILDLINK_PACKAGES+= libwnck -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libwnck - -.if !empty(LIBWNCK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libwnck+= libwnck>=2.20.0 BUILDLINK_ABI_DEPENDS.libwnck?= libwnck>=2.20.0 BUILDLINK_PKGSRCDIR.libwnck?= ../../devel/libwnck -.endif # LIBWNCK_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" +.endif # LIBWNCK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libwnck diff --git a/devel/lwp/buildlink3.mk b/devel/lwp/buildlink3.mk index ee2340f1bd1..58605f5ddaf 100644 --- a/devel/lwp/buildlink3.mk +++ b/devel/lwp/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:46 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:24 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LWP_BUILDLINK3_MK:= ${LWP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= lwp -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= lwp -.endif +.if !defined(LWP_BUILDLINK3_MK) +LWP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlwp} -BUILDLINK_PACKAGES+= lwp -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lwp - -.if !empty(LWP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.lwp+= lwp>=1.6 BUILDLINK_ABI_DEPENDS.lwp+= lwp>=1.10nb1 BUILDLINK_PKGSRCDIR.lwp?= ../../devel/lwp -.endif # LWP_BUILDLINK3_MK +.endif # LWP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -lwp diff --git a/devel/m17n-lib/buildlink3.mk b/devel/m17n-lib/buildlink3.mk index 4c9b3f655cd..52e4a99e600 100644 --- a/devel/m17n-lib/buildlink3.mk +++ b/devel/m17n-lib/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/03/09 11:17:27 hira Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:24 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -M17N_LIB_BUILDLINK3_MK:= ${M17N_LIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= m17n-lib -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= m17n-lib -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nm17n-lib} -BUILDLINK_PACKAGES+= m17n-lib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}m17n-lib +.if !defined(M17N_LIB_BUILDLINK3_MK) +M17N_LIB_BUILDLINK3_MK:= -.if ${M17N_LIB_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.m17n-lib+= m17n-lib>=1.5.1 BUILDLINK_PKGSRCDIR.m17n-lib?= ../../devel/m17n-lib -.endif # M17N_LIB_BUILDLINK3_MK pkgbase := m17n-lib .include "../../mk/pkg-build-options.mk" @@ -44,5 +36,6 @@ pkgbase := m17n-lib .include "../../devel/gettext-lib/buildlink3.mk" .include "../../misc/m17n-db/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.endif # M17N_LIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -m17n-lib diff --git a/devel/mell/buildlink3.mk b/devel/mell/buildlink3.mk index 69ef11beb9b..767af3c1701 100644 --- a/devel/mell/buildlink3.mk +++ b/devel/mell/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:55 uebayasi Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MELL_BUILDLINK3_MK:= ${MELL_BUILDLINK3_MK}+ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:24 joerg Exp $ .include "../../editors/emacs/modules.mk" -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= mell -.endif +BUILDLINK_TREE+= mell -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmell} -BUILDLINK_PACKAGES+= mell -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mell +.if !defined(MELL_BUILDLINK3_MK) +MELL_BUILDLINK3_MK:= -.if ${MELL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.mell+= ${EMACS_PKGNAME_PREFIX}mell>=1.0.0 BUILDLINK_PKGSRCDIR.mell?= ../../devel/mell -.endif # MELL_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.mell= ${EGREP} '.*\.el$$|.*\.elc$$' +.endif # MELL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -mell diff --git a/devel/mono-addins/buildlink3.mk b/devel/mono-addins/buildlink3.mk index f0d67c60425..01f9a0d3f92 100644 --- a/devel/mono-addins/buildlink3.mk +++ b/devel/mono-addins/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/03/17 22:54:02 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:24 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MONO_ADDINS_BUILDLINK3_MK:= ${MONO_ADDINS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= mono-addins -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= mono-addins -.endif +.if !defined(MONO_ADDINS_BUILDLINK3_MK) +MONO_ADDINS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmono-addins} -BUILDLINK_PACKAGES+= mono-addins -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mono-addins - -.if ${MONO_ADDINS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.mono-addins+= mono-addins>=0.3 BUILDLINK_PKGSRCDIR.mono-addins?= ../../devel/mono-addins -.endif # MONO_ADDINS_BUILDLINK3_MK .include "../../lang/mono/buildlink3.mk" .include "../../x11/gtk-sharp/buildlink3.mk" +.endif # MONO_ADDINS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -mono-addins diff --git a/devel/mono-tools/buildlink3.mk b/devel/mono-tools/buildlink3.mk index f14711dffcd..a25fe2e2305 100644 --- a/devel/mono-tools/buildlink3.mk +++ b/devel/mono-tools/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/10/07 13:26:57 kefren Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:24 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MONO_TOOLS_BUILDLINK3_MK:= ${MONO_TOOLS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= mono-tools -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= mono-tools -.endif +.if !defined(MONO_TOOLS_BUILDLINK3_MK) +MONO_TOOLS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmono-tools} -BUILDLINK_PACKAGES+= mono-tools -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mono-tools - -.if ${MONO_TOOLS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.mono-tools+= mono-tools>=2.0 BUILDLINK_PKGSRCDIR.mono-tools?= ../../devel/mono-tools -.endif # MONO_TOOLS_BUILDLINK3_MK +.endif # MONO_TOOLS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -mono-tools diff --git a/devel/ncurses/buildlink3.mk b/devel/ncurses/buildlink3.mk index ba66ad0c8c6..3bcdd5a0006 100644 --- a/devel/ncurses/buildlink3.mk +++ b/devel/ncurses/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.32 2008/02/27 21:32:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.33 2009/03/20 19:24:24 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -NCURSES_BUILDLINK3_MK:= ${NCURSES_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ncurses -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ncurses -.endif +.if !defined(NCURSES_BUILDLINK3_MK) +NCURSES_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nncurses} -BUILDLINK_PACKAGES+= ncurses -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ncurses - -.if !empty(NCURSES_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ncurses+= ncurses>=5.3nb1 BUILDLINK_ABI_DEPENDS.ncurses+= ncurses>=5.4nb1 BUILDLINK_PKGSRCDIR.ncurses?= ../../devel/ncurses @@ -35,7 +28,6 @@ buildlink-ncurses-curses-h: ${MKDIR} `${DIRNAME} "$$dest"`; \ ${LN} -s "$$src" "$$dest"; \ fi +.endif # NCURSES_BUILDLINK3_MK -.endif # NCURSES_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ncurses diff --git a/devel/ncursesw/buildlink3.mk b/devel/ncursesw/buildlink3.mk index 9e9b0338b69..43de46e631a 100644 --- a/devel/ncursesw/buildlink3.mk +++ b/devel/ncursesw/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.3 2008/02/29 19:23:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:24 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -NCURSESW_BUILDLINK3_MK:=${NCURSESW_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ncursesw -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ncursesw -.endif +.if !defined(NCURSESW_BUILDLINK3_MK) +NCURSESW_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nncursesw} -BUILDLINK_PACKAGES+= ncursesw -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ncursesw - -.if !empty(NCURSESW_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ncursesw+= ncursesw>=5.5 BUILDLINK_ABI_DEPENDS.ncursesw+= ncursesw>=5.5 BUILDLINK_PKGSRCDIR.ncursesw?= ../../devel/ncursesw BUILDLINK_LIBNAME.ncursesw= ncursesw BUILDLINK_LDADD.ncursesw= ${BUILDLINK_LIBNAME.ncursesw:S/^/-l/:S/^-l$//} -.endif # NCURSESW_BUILDLINK3_MK .include "../../devel/ncurses/buildlink3.mk" +.endif # NCURSESW_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ncursesw diff --git a/devel/netcdf/buildlink3.mk b/devel/netcdf/buildlink3.mk index abf97c90b8e..7ca854e06fa 100644 --- a/devel/netcdf/buildlink3.mk +++ b/devel/netcdf/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:46 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:24 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -NETCDF_BUILDLINK3_MK:= ${NETCDF_BUILDLINK3_MK}+ +BUILDLINK_TREE+= netcdf -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= netcdf -.endif +.if !defined(NETCDF_BUILDLINK3_MK) +NETCDF_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnetcdf} -BUILDLINK_PACKAGES+= netcdf -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}netcdf - -.if !empty(NETCDF_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.netcdf+= netcdf>=3.5 BUILDLINK_ABI_DEPENDS.netcdf+= netcdf>=3.5.0nb2 BUILDLINK_PKGSRCDIR.netcdf?= ../../devel/netcdf -.endif # NETCDF_BUILDLINK3_MK +.endif # NETCDF_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -netcdf diff --git a/devel/newt/buildlink3.mk b/devel/newt/buildlink3.mk index 14c3c3aa7b9..9a9eacb84d5 100644 --- a/devel/newt/buildlink3.mk +++ b/devel/newt/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:47 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:25 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -NEWT_BUILDLINK3_MK:= ${NEWT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= newt -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= newt -.endif +.if !defined(NEWT_BUILDLINK3_MK) +NEWT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnewt} -BUILDLINK_PACKAGES+= newt -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}newt - -.if !empty(NEWT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.newt+= newt>=0.51.6 BUILDLINK_ABI_DEPENDS.newt?= newt>=0.51.6nb2 BUILDLINK_PKGSRCDIR.newt?= ../../devel/newt -.endif # NEWT_BUILDLINK3_MK .include "../../devel/libslang/buildlink3.mk" +.endif # NEWT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -newt diff --git a/devel/nspr/buildlink3.mk b/devel/nspr/buildlink3.mk index 7d3835f7dbe..7f04497850c 100644 --- a/devel/nspr/buildlink3.mk +++ b/devel/nspr/buildlink3.mk @@ -1,17 +1,9 @@ -# $NetBSD: buildlink3.mk,v 1.9 2007/09/25 04:18:25 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:25 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -NSPR_BUILDLINK3_MK:= ${NSPR_BUILDLINK3_MK}+ +BUILDLINK_TREE+= nspr -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= nspr -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnspr} -BUILDLINK_PACKAGES+= nspr -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}nspr - -.if ${NSPR_BUILDLINK3_MK} == "+" +.if !defined(NSPR_BUILDLINK3_MK) +NSPR_BUILDLINK3_MK:= . include "../../mk/bsd.fast.prefs.mk" @@ -29,7 +21,6 @@ BUILDLINK_FILES.nspr+= include/nspr/* BUILDLINK_INCDIRS.nspr+= include/nspr BUILDLINK_LIBDIRS.nspr+= lib/nspr BUILDLINK_RPATHDIRS.nspr+= lib/nspr +.endif # NSPR_BUILDLINK3_MK -.endif # NSPR_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -nspr diff --git a/devel/nss/buildlink3.mk b/devel/nss/buildlink3.mk index 6977353f3c7..3b8b52c79c2 100644 --- a/devel/nss/buildlink3.mk +++ b/devel/nss/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:47 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:25 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -NSS_BUILDLINK3_MK:= ${NSS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= nss -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= nss -.endif +.if !defined(NSS_BUILDLINK3_MK) +NSS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnss} -BUILDLINK_PACKAGES+= nss -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}nss - -.if !empty(NSS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.nss+= nss>=3.9.2nb1 BUILDLINK_ABI_DEPENDS.nss+= nss>=3.9.2nb4 BUILDLINK_PKGSRCDIR.nss?= ../../devel/nss @@ -23,8 +16,7 @@ BUILDLINK_INCDIRS.nss+= include/nss BUILDLINK_LIBDIRS.nss+= lib/nss BUILDLINK_RPATHDIRS.nss+= lib/nss -.endif # NSS_BUILDLINK3_MK - .include "../../devel/nspr/buildlink3.mk" +.endif # NSS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -nss diff --git a/devel/ode/buildlink3.mk b/devel/ode/buildlink3.mk index 74ec76956ef..71ed23efb8d 100644 --- a/devel/ode/buildlink3.mk +++ b/devel/ode/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:47 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:25 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ODE_BUILDLINK3_MK:= ${ODE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ode -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ode -.endif +.if !defined(ODE_BUILDLINK3_MK) +ODE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Node} -BUILDLINK_PACKAGES+= ode -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ode - -.if !empty(ODE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ode+= ode>=0.5nb2 BUILDLINK_ABI_DEPENDS.ode?= ode>=0.5nb2 BUILDLINK_PKGSRCDIR.ode?= ../../devel/ode -.endif # ODE_BUILDLINK3_MK +.endif # ODE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ode diff --git a/devel/ogre/buildlink3.mk b/devel/ogre/buildlink3.mk index e8b15f2626a..04cc31e3f0b 100644 --- a/devel/ogre/buildlink3.mk +++ b/devel/ogre/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:47 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:25 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OGRE_BUILDLINK3_MK:= ${OGRE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ogre -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ogre -.endif +.if !defined(OGRE_BUILDLINK3_MK) +OGRE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nogre} -BUILDLINK_PACKAGES+= ogre -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ogre - -.if !empty(OGRE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ogre+= ogre>=0.12.1nb1 BUILDLINK_ABI_DEPENDS.ogre+= ogre>=0.12.1nb8 BUILDLINK_PKGSRCDIR.ogre?= ../../devel/ogre -.endif # OGRE_BUILDLINK3_MK .include "../../devel/SDL/buildlink3.mk" .include "../../devel/devIL/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" +.endif # OGRE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ogre diff --git a/devel/opal/buildlink3.mk b/devel/opal/buildlink3.mk index e2d45c5ed7b..8ec67d92c5e 100644 --- a/devel/opal/buildlink3.mk +++ b/devel/opal/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/03/18 11:58:08 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:25 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OPAL_BUILDLINK3_MK:= ${OPAL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= opal -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= opal -.endif +.if !defined(OPAL_BUILDLINK3_MK) +OPAL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopal} -BUILDLINK_PACKAGES+= opal -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}opal - -.if !empty(OPAL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.opal+= opal>=3.6.1 BUILDLINK_ABI_DEPENDS.opal?= opal>=3.6.1 BUILDLINK_PKGSRCDIR.opal?= ../../devel/opal -.endif # OPAL_BUILDLINK3_MK .include "../../devel/ptlib/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.endif # OPAL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -opal diff --git a/devel/ossp-uuid/buildlink3.mk b/devel/ossp-uuid/buildlink3.mk index f7c2d8a9e4a..d6064f224da 100644 --- a/devel/ossp-uuid/buildlink3.mk +++ b/devel/ossp-uuid/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/07/14 00:02:38 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:25 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OSSP_UUID_BUILDLINK3_MK:= ${OSSP_UUID_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ossp-uuid -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ossp-uuid -.endif +.if !defined(OSSP_UUID_BUILDLINK3_MK) +OSSP_UUID_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nossp-uuid} -BUILDLINK_PACKAGES+= ossp-uuid -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ossp-uuid - -.if !empty(OSSP_UUID_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ossp-uuid+= ossp-uuid>=1.6.0 BUILDLINK_ABI_DEPENDS.ossp-uuid+= ossp-uuid>=1.6.2 BUILDLINK_PKGSRCDIR.ossp-uuid?= ../../devel/ossp-uuid -.endif # OSSP_UUID_BUILDLINK3_MK +.endif # OSSP_UUID_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ossp-uuid diff --git a/devel/p5-B-Hooks-OP-Check/buildlink3.mk b/devel/p5-B-Hooks-OP-Check/buildlink3.mk index 505522805ea..830082b701c 100644 --- a/devel/p5-B-Hooks-OP-Check/buildlink3.mk +++ b/devel/p5-B-Hooks-OP-Check/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1 2008/11/02 23:30:34 he Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -P5_B_HOOKS_OP_CHECK_BUILDLINK3_MK:= ${P5_B_HOOKS_OP_CHECK_BUILDLINK3_MK}+ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:25 joerg Exp $ BUILDLINK_DEPMETHOD.p5-B-Hooks-OP-Check?= build -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= p5-B-Hooks-OP-Check -.endif +BUILDLINK_TREE+= p5-B-Hooks-OP-Check -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Np5-B-Hooks-OP-Check} -BUILDLINK_PACKAGES+= p5-B-Hooks-OP-Check -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}p5-B-Hooks-OP-Check +.if !defined(P5_B_HOOKS_OP_CHECK_BUILDLINK3_MK) +P5_B_HOOKS_OP_CHECK_BUILDLINK3_MK:= -.if ${P5_B_HOOKS_OP_CHECK_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.p5-B-Hooks-OP-Check+= p5-B-Hooks-OP-Check>=0.12nb1 BUILDLINK_PKGSRCDIR.p5-B-Hooks-OP-Check?= ../../devel/p5-B-Hooks-OP-Check -.endif # P5_B_HOOKS_OP_CHECK_BUILDLINK3_MK +.endif # P5_B_HOOKS_OP_CHECK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -p5-B-Hooks-OP-Check diff --git a/devel/p5-B-Hooks-OP-PPAddr/buildlink3.mk b/devel/p5-B-Hooks-OP-PPAddr/buildlink3.mk index 8f3a6400a76..85f53a7f8aa 100644 --- a/devel/p5-B-Hooks-OP-PPAddr/buildlink3.mk +++ b/devel/p5-B-Hooks-OP-PPAddr/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/19 18:02:22 abs Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -P5_B_HOOKS_OP_PPADDR_BUILDLINK3_MK:= ${P5_B_HOOKS_OP_PPADDR_BUILDLINK3_MK}+ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:25 joerg Exp $ BUILDLINK_DEPMETHOD.p5-B-Hooks-OP-PPAddr?= build -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= p5-B-Hooks-OP-PPAddr -.endif +BUILDLINK_TREE+= p5-B-Hooks-OP-PPAddr -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Np5-B-Hooks-OP-PPAddr} -BUILDLINK_PACKAGES+= p5-B-Hooks-OP-PPAddr -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}p5-B-Hooks-OP-PPAddr +.if !defined(P5_B_HOOKS_OP_PPADDR_BUILDLINK3_MK) +P5_B_HOOKS_OP_PPADDR_BUILDLINK3_MK:= -.if ${P5_B_HOOKS_OP_PPADDR_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.p5-B-Hooks-OP-PPAddr+= p5-B-Hooks-OP-PPAddr>=0.02 BUILDLINK_PKGSRCDIR.p5-B-Hooks-OP-PPAddr?= ../../devel/p5-B-Hooks-OP-PPAddr -.endif # P5_B_HOOKS_OP_PPADDR_BUILDLINK3_MK +.endif # P5_B_HOOKS_OP_PPADDR_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -p5-B-Hooks-OP-PPAddr diff --git a/devel/p5-B-Hooks-Parser/buildlink3.mk b/devel/p5-B-Hooks-Parser/buildlink3.mk index fa2b3af1cc2..0b2a613b39f 100644 --- a/devel/p5-B-Hooks-Parser/buildlink3.mk +++ b/devel/p5-B-Hooks-Parser/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/19 18:02:57 abs Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -P5_B_HOOKS_PARSER_BUILDLINK3_MK:= ${P5_B_HOOKS_PARSER_BUILDLINK3_MK}+ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:25 joerg Exp $ BUILDLINK_DEPMETHOD.p5-B-Hooks-Parser?= build -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= p5-B-Hooks-Parser -.endif +BUILDLINK_TREE+= p5-B-Hooks-Parser -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Np5-B-Hooks-Parser} -BUILDLINK_PACKAGES+= p5-B-Hooks-Parser -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}p5-B-Hooks-Parser +.if !defined(P5_B_HOOKS_PARSER_BUILDLINK3_MK) +P5_B_HOOKS_PARSER_BUILDLINK3_MK:= -.if ${P5_B_HOOKS_PARSER_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.p5-B-Hooks-Parser+= p5-B-Hooks-Parser>=0.08 BUILDLINK_PKGSRCDIR.p5-B-Hooks-Parser?= ../../devel/p5-B-Hooks-Parser -.endif # P5_B_HOOKS_PARSER_BUILDLINK3_MK +.endif # P5_B_HOOKS_PARSER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -p5-B-Hooks-Parser diff --git a/devel/p5-glib2/buildlink3.mk b/devel/p5-glib2/buildlink3.mk index 9298fa24960..6b900e47b0a 100644 --- a/devel/p5-glib2/buildlink3.mk +++ b/devel/p5-glib2/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:47 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:26 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -P5_GLIB2_BUILDLINK3_MK:= ${P5_GLIB2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= p5-glib2 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= p5-glib2 -.endif +.if !defined(P5_GLIB2_BUILDLINK3_MK) +P5_GLIB2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Np5-glib2} -BUILDLINK_PACKAGES+= p5-glib2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}p5-glib2 - -.if !empty(P5_GLIB2_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.p5-glib2+= p5-glib2>=1.103 BUILDLINK_ABI_DEPENDS.p5-glib2?= p5-glib2>=1.103nb1 BUILDLINK_PKGSRCDIR.p5-glib2?= ../../devel/p5-glib2 -.endif # P5_GLIB2_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" +.endif # P5_GLIB2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -p5-glib2 diff --git a/devel/pango/buildlink3.mk b/devel/pango/buildlink3.mk index 13d96a7073e..fc41af569d0 100644 --- a/devel/pango/buildlink3.mk +++ b/devel/pango/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.21 2007/05/30 08:54:29 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:24:26 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PANGO_BUILDLINK3_MK:= ${PANGO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pango -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pango -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npango} -BUILDLINK_PACKAGES+= pango -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pango +.if !defined(PANGO_BUILDLINK3_MK) +PANGO_BUILDLINK3_MK:= -.if !empty(PANGO_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.pango+= pango>=1.6.0 BUILDLINK_ABI_DEPENDS.pango+= pango>=1.12.1nb1 BUILDLINK_PKGSRCDIR.pango?= ../../devel/pango -.endif # PANGO_BUILDLINK3_MK .include "../../mk/bsd.fast.prefs.mk" @@ -32,5 +24,6 @@ pkgbase := pango .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" +.endif # PANGO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pango diff --git a/devel/pangomm/buildlink3.mk b/devel/pangomm/buildlink3.mk index 1a62222dbd9..3892705899d 100644 --- a/devel/pangomm/buildlink3.mk +++ b/devel/pangomm/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/17 22:10:15 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:26 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PANGOMM_BUILDLINK3_MK:= ${PANGOMM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pangomm -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= pangomm -.endif +.if !defined(PANGOMM_BUILDLINK3_MK) +PANGOMM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npangomm} -BUILDLINK_PACKAGES+= pangomm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pangomm - -.if ${PANGOMM_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.pangomm+= pangomm>=2.24.0 BUILDLINK_PKGSRCDIR.pangomm?= ../../devel/pangomm -.endif # PANGOMM_BUILDLINK3_MK .include "../../devel/glibmm/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" .include "../../graphics/cairomm/buildlink3.mk" +.endif # PANGOMM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pangomm diff --git a/devel/pccts/buildlink3.mk b/devel/pccts/buildlink3.mk index b830b86c5be..a0994356b7d 100644 --- a/devel/pccts/buildlink3.mk +++ b/devel/pccts/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:47 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:26 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PCCTS_BUILDLINK3_MK:= ${PCCTS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pccts -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pccts -.endif +.if !defined(PCCTS_BUILDLINK3_MK) +PCCTS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npccts} -BUILDLINK_PACKAGES+= pccts -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pccts - -.if !empty(PCCTS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.pccts+= pccts>=1.33.22 BUILDLINK_ABI_DEPENDS.pccts?= pccts>=1.33.22nb1 BUILDLINK_PKGSRCDIR.pccts?= ../../devel/pccts BUILDLINK_DEPMETHOD.pccts?= build -.endif # PCCTS_BUILDLINK3_MK +.endif # PCCTS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pccts diff --git a/devel/pcre++/buildlink3.mk b/devel/pcre++/buildlink3.mk index ac589e0e7a7..a605c2d1bd8 100644 --- a/devel/pcre++/buildlink3.mk +++ b/devel/pcre++/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.6 2007/12/30 14:34:18 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:26 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PCREXX_BUILDLINK3_MK:= ${PCREXX_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pcrexx -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pcrexx -.endif +.if !defined(PCREXX_BUILDLINK3_MK) +PCREXX_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npcrexx} -BUILDLINK_PACKAGES+= pcrexx -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pcrexx - -.if !empty(PCREXX_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.pcrexx+= pcre++>=0.9.5 BUILDLINK_PKGSRCDIR.pcrexx?= ../../devel/pcre++ -.endif # PCREXX_BUILDLINK3_MK .include "../../devel/pcre/buildlink3.mk" +.endif # PCREXX_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pcrexx diff --git a/devel/pcre-ocaml/buildlink3.mk b/devel/pcre-ocaml/buildlink3.mk index b2ffa267d65..eef4c1840e6 100644 --- a/devel/pcre-ocaml/buildlink3.mk +++ b/devel/pcre-ocaml/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1 2006/08/11 15:47:30 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:26 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PCRE_OCAML_BUILDLINK3_MK:= ${PCRE_OCAML_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pcre-ocaml -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= pcre-ocaml -.endif +.if !defined(PCRE_OCAML_BUILDLINK3_MK) +PCRE_OCAML_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npcre-ocaml} -BUILDLINK_PACKAGES+= pcre-ocaml -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pcre-ocaml - -.if ${PCRE_OCAML_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.pcre-ocaml+= pcre-ocaml>=5.10.3nb1 BUILDLINK_PKGSRCDIR.pcre-ocaml?= ../../devel/pcre-ocaml -.endif # PCRE_OCAML_BUILDLINK3_MK .include "../../devel/pcre/buildlink3.mk" +.endif # PCRE_OCAML_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pcre-ocaml diff --git a/devel/pcre/buildlink3.mk b/devel/pcre/buildlink3.mk index 2988ef8639f..543be8d2c03 100644 --- a/devel/pcre/buildlink3.mk +++ b/devel/pcre/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:47 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:26 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PCRE_BUILDLINK3_MK:= ${PCRE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pcre -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pcre -.endif +.if !defined(PCRE_BUILDLINK3_MK) +PCRE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npcre} -BUILDLINK_PACKAGES+= pcre -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pcre - -.if !empty(PCRE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.pcre+= pcre>=3.4nb1 BUILDLINK_ABI_DEPENDS.pcre+= pcre>=6.2 BUILDLINK_PKGSRCDIR.pcre?= ../../devel/pcre -.endif # PCRE_BUILDLINK3_MK +.endif # PCRE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pcre diff --git a/devel/pdcurses/buildlink3.mk b/devel/pdcurses/buildlink3.mk index 42042b44d5b..445165bc4c4 100644 --- a/devel/pdcurses/buildlink3.mk +++ b/devel/pdcurses/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.5 2008/02/27 21:32:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:26 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PDCURSES_BUILDLINK3_MK:= ${PDCURSES_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pdcurses -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pdcurses -.endif +.if !defined(PDCURSES_BUILDLINK3_MK) +PDCURSES_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npdcurses} -BUILDLINK_PACKAGES+= pdcurses -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pdcurses - -.if !empty(PDCURSES_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.pdcurses+= pdcurses>=3.3 BUILDLINK_PKGSRCDIR.pdcurses?= ../../devel/pdcurses @@ -26,8 +19,6 @@ BUILDLINK_INCDIRS.pdcurses+= include/xcurses BUILDLINK_TRANSFORM+= l:curses:XCurses . endif -.endif # PDCURSES_BUILDLINK3_MK - .include "../../mk/xaw.buildlink3.mk" .include "../../x11/libICE/buildlink3.mk" @@ -38,5 +29,6 @@ BUILDLINK_TRANSFORM+= l:curses:XCurses .include "../../x11/libXpm/buildlink3.mk" .include "../../x11/libXp/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" +.endif # PDCURSES_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pdcurses diff --git a/devel/physfs/buildlink3.mk b/devel/physfs/buildlink3.mk index 2377555519e..76853c3bf5e 100644 --- a/devel/physfs/buildlink3.mk +++ b/devel/physfs/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:47 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:26 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PHYSFS_BUILDLINK3_MK:= ${PHYSFS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= physfs -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= physfs -.endif +.if !defined(PHYSFS_BUILDLINK3_MK) +PHYSFS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nphysfs} -BUILDLINK_PACKAGES+= physfs -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}physfs - -.if !empty(PHYSFS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.physfs+= physfs>=1.0.0 BUILDLINK_ABI_DEPENDS.physfs+= physfs>=1.0.1 BUILDLINK_PKGSRCDIR.physfs?= ../../devel/physfs -.endif # PHYSFS_BUILDLINK3_MK .include "../../devel/readline/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../mk/curses.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.endif # PHYSFS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -physfs diff --git a/devel/popt/buildlink3.mk b/devel/popt/buildlink3.mk index 7e8ab9c6aac..68aa8f95cd7 100644 --- a/devel/popt/buildlink3.mk +++ b/devel/popt/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:47 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:26 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -POPT_BUILDLINK3_MK:= ${POPT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= popt -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= popt -.endif +.if !defined(POPT_BUILDLINK3_MK) +POPT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npopt} -BUILDLINK_PACKAGES+= popt -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}popt - -.if !empty(POPT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.popt+= popt>=1.7nb3 BUILDLINK_ABI_DEPENDS.popt+= popt>=1.7nb6 BUILDLINK_PKGSRCDIR.popt?= ../../devel/popt -.endif # POPT_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" +.endif # POPT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -popt diff --git a/devel/pth/buildlink3.mk b/devel/pth/buildlink3.mk index 875330ca58b..e51b87b3e74 100644 --- a/devel/pth/buildlink3.mk +++ b/devel/pth/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:47 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:27 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PTH_BUILDLINK3_MK:= ${PTH_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pth -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pth -.endif +.if !defined(PTH_BUILDLINK3_MK) +PTH_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npth} -BUILDLINK_PACKAGES+= pth -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pth - -.if !empty(PTH_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.pth+= pth>=2.0.0 BUILDLINK_ABI_DEPENDS.pth+= pth>=2.0.0nb2 BUILDLINK_PKGSRCDIR.pth?= ../../devel/pth -.endif # PTH_BUILDLINK3_MK +.endif # PTH_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pth diff --git a/devel/pthread-sem/buildlink3.mk b/devel/pthread-sem/buildlink3.mk index ef558cd2c81..c49307670bf 100644 --- a/devel/pthread-sem/buildlink3.mk +++ b/devel/pthread-sem/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:47 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:27 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PTHREAD_SEM_BUILDLINK3_MK:= ${PTHREAD_SEM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pthread-sem -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pthread-sem -.endif +.if !defined(PTHREAD_SEM_BUILDLINK3_MK) +PTHREAD_SEM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npthread-sem} -BUILDLINK_PACKAGES+= pthread-sem -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pthread-sem - -.if !empty(PTHREAD_SEM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.pthread-sem+= pthread-sem>=1.0 BUILDLINK_PKGSRCDIR.pthread-sem?= ../../devel/pthread-sem -.endif # PTHREAD_SEM_BUILDLINK3_MK +.endif # PTHREAD_SEM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pthread-sem diff --git a/devel/pthread-stublib/buildlink3.mk b/devel/pthread-stublib/buildlink3.mk index d9950b84f13..89e0d7144ce 100644 --- a/devel/pthread-stublib/buildlink3.mk +++ b/devel/pthread-stublib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:47 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:27 joerg Exp $ # XXX # XXX This file was created automatically using createbuildlink-3.10. # XXX After this file has been verified as correct, the comment lines @@ -10,22 +10,15 @@ # XXX # XXX BUILDLINK_DEPMETHOD.pthread-stublib?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PTHREAD_STUBLIB_BUILDLINK3_MK:= ${PTHREAD_STUBLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pthread-stublib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pthread-stublib -.endif +.if !defined(PTHREAD_STUBLIB_BUILDLINK3_MK) +PTHREAD_STUBLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npthread-stublib} -BUILDLINK_PACKAGES+= pthread-stublib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pthread-stublib - -.if !empty(PTHREAD_STUBLIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.pthread-stublib+= pthread-stublib>=1.0 BUILDLINK_PKGSRCDIR.pthread-stublib?= ../../devel/pthread-stublib -.endif # PTHREAD_STUBLIB_BUILDLINK3_MK IS_BUILTIN.pthread-stublib=no +.endif # PTHREAD_STUBLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pthread-stublib diff --git a/devel/ptlib/buildlink3.mk b/devel/ptlib/buildlink3.mk index 46f07a7fbeb..87e1d59d807 100644 --- a/devel/ptlib/buildlink3.mk +++ b/devel/ptlib/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.6 2009/03/18 11:57:15 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:27 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PTLIB_BUILDLINK3_MK:= ${PTLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ptlib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ptlib -.endif +.if !defined(PTLIB_BUILDLINK3_MK) +PTLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nptlib} -BUILDLINK_PACKAGES+= ptlib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ptlib - -.if !empty(PTLIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ptlib+= ptlib>=2.6.1 BUILDLINK_ABI_DEPENDS.ptlib?= ptlib>=2.6.1 BUILDLINK_PKGSRCDIR.ptlib?= ../../devel/ptlib -.endif # PTLIB_BUILDLINK3_MK .include "../../devel/SDL/buildlink3.mk" .include "../../databases/openldap-client/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.endif # PTLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ptlib diff --git a/devel/pwlib/buildlink3.mk b/devel/pwlib/buildlink3.mk index 81ff17e136f..b4794c83912 100644 --- a/devel/pwlib/buildlink3.mk +++ b/devel/pwlib/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.14 2008/01/18 05:14:38 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:27 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PWLIB_BUILDLINK3_MK:= ${PWLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pwlib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pwlib -.endif +.if !defined(PWLIB_BUILDLINK3_MK) +PWLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npwlib} -BUILDLINK_PACKAGES+= pwlib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pwlib - -.if !empty(PWLIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.pwlib+= pwlib>=1.8.3nb1 BUILDLINK_ABI_DEPENDS.pwlib?= pwlib>=1.8.3nb7 BUILDLINK_PKGSRCDIR.pwlib?= ../../devel/pwlib -.endif # PWLIB_BUILDLINK3_MK .include "../../security/openssl/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.endif # PWLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pwlib diff --git a/devel/py-at-spi/buildlink3.mk b/devel/py-at-spi/buildlink3.mk index c9ddab4b2a5..93905a52f7f 100644 --- a/devel/py-at-spi/buildlink3.mk +++ b/devel/py-at-spi/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:10 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:27 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_AT_SPI_BUILDLINK3_MK:= ${PY_AT_SPI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= py-at-spi -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= py-at-spi -.endif +.if !defined(PY_AT_SPI_BUILDLINK3_MK) +PY_AT_SPI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-at-spi} -BUILDLINK_PACKAGES+= py-at-spi -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-at-spi - -.if ${PY_AT_SPI_BUILDLINK3_MK} == "+" .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.py-at-spi+= ${PYPKGPREFIX}-at-spi>=1.20.1 BUILDLINK_PKGSRCDIR.py-at-spi?= ../../devel/py-at-spi -.endif # PY_AT_SPI_BUILDLINK3_MK .include "../../devel/at-spi/buildlink3.mk" +.endif # PY_AT_SPI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -py-at-spi diff --git a/devel/py-compizconfig/buildlink3.mk b/devel/py-compizconfig/buildlink3.mk index fd1c74a24e7..4cc94794574 100644 --- a/devel/py-compizconfig/buildlink3.mk +++ b/devel/py-compizconfig/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:10 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:27 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_COMPIZCONFIG_BUILDLINK3_MK:= ${PY_COMPIZCONFIG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ${PYPKGPREFIX}-compizconfig -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ${PYPKGPREFIX}-compizconfig -.endif +.if !defined(PY_COMPIZCONFIG_BUILDLINK3_MK) +PY_COMPIZCONFIG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:N${PYPKGPREFIX}-compizconfig} -BUILDLINK_PACKAGES+= ${PYPKGPREFIX}-compizconfig -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}${PYPKGPREFIX}-compizconfig - -.if !empty(PY_COMPIZCONFIG_BUILDLINK3_MK:M+) .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-compizconfig+= ${PYPKGPREFIX}-compizconfig>=0.6.0 @@ -19,7 +12,6 @@ BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-compizconfig?= ${PYPKGPREFIX}-compizconfig> BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-compizconfig?= ../../devel/py-compizconfig .include "../../devel/libcompizconfig/buildlink3.mk" +.endif # PY_COMPIZCONFIG_BUILDLINK3_MK -.endif # PY_COMPIZCONFIG_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -${PYPKGPREFIX}-compizconfig diff --git a/devel/py-ctypes/buildlink3.mk b/devel/py-ctypes/buildlink3.mk index e712a04c784..24c70f1b8c8 100644 --- a/devel/py-ctypes/buildlink3.mk +++ b/devel/py-ctypes/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:10 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:27 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_CTYPES_BUILDLINK3_MK:= ${PY_CTYPES_BUILDLINK3_MK}+ +BUILDLINK_TREE+= py-ctypes -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= py-ctypes -.endif +.if !defined(PY_CTYPES_BUILDLINK3_MK) +PY_CTYPES_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-ctypes} -BUILDLINK_PACKAGES+= py-ctypes -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-ctypes - -.if ${PY_CTYPES_BUILDLINK3_MK} == "+" .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.py-ctypes+= ${PYPKGPREFIX}-ctypes>=1.0.0 BUILDLINK_PKGSRCDIR.py-ctypes?= ../../devel/py-ctypes -.endif # PY_CTYPES_BUILDLINK3_MK +.endif # PY_CTYPES_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -py-ctypes diff --git a/devel/py-curses/buildlink3.mk b/devel/py-curses/buildlink3.mk index 66340934095..0e522ecfb8e 100644 --- a/devel/py-curses/buildlink3.mk +++ b/devel/py-curses/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 17:30:10 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:27 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_CURSES_BUILDLINK3_MK:= ${PY_CURSES_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pycurses -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pycurses -.endif +.if !defined(PY_CURSES_BUILDLINK3_MK) +PY_CURSES_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npycurses} -BUILDLINK_PACKAGES+= pycurses -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pycurses - -.if !empty(PY_CURSES_BUILDLINK3_MK:M+) . include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pycurses+= ${PYPKGPREFIX}-curses-[0-9]* BUILDLINK_ABI_DEPENDS.pycurses+= ${PYPKGPREFIX}-curses>=0nb4 BUILDLINK_PKGSRCDIR.pycurses?= ../../devel/py-curses -.endif # PY_CURSES_BUILDLINK3_MK .include "../../devel/ncurses/buildlink3.mk" +.endif # PY_CURSES_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pycurses diff --git a/devel/py-cursespanel/buildlink3.mk b/devel/py-cursespanel/buildlink3.mk index 372216860d8..9b0f14f6fb5 100644 --- a/devel/py-cursespanel/buildlink3.mk +++ b/devel/py-cursespanel/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 17:30:10 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:27 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_CURSESPANEL_BUILDLINK3_MK:= ${PY_CURSESPANEL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pycursespanel -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pycursespanel -.endif +.if !defined(PY_CURSESPANEL_BUILDLINK3_MK) +PY_CURSESPANEL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npycursespanel} -BUILDLINK_PACKAGES+= pycursespanel -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pycursespanel - -.if !empty(PY_CURSESPANEL_BUILDLINK3_MK:M+) .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pycursespanel+= ${PYPKGPREFIX}-cursespanel-[0-9]* BUILDLINK_ABI_DEPENDS.pycursespanel?= ${PYPKGPREFIX}-cursespanel>=0nb3 BUILDLINK_PKGSRCDIR.pycursespanel?= ../../devel/py-cursespanel -.endif # PY_CURSESPANEL_BUILDLINK3_MK .include "../../devel/ncurses/buildlink3.mk" +.endif # PY_CURSESPANEL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pycursespanel diff --git a/devel/py-game/buildlink3.mk b/devel/py-game/buildlink3.mk index caf4eb10d9f..9bda15a8d9d 100644 --- a/devel/py-game/buildlink3.mk +++ b/devel/py-game/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 17:30:10 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:28 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_GAME_BUILDLINK3_MK:= ${PY_GAME_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ${PYPKGPREFIX}-game -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ${PYPKGPREFIX}-game -.endif +.if !defined(PY_GAME_BUILDLINK3_MK) +PY_GAME_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:N${PYPKGPREFIX}-game} -BUILDLINK_PACKAGES+= ${PYPKGPREFIX}-game -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}${PYPKGPREFIX}-game - -.if !empty(PY_GAME_BUILDLINK3_MK:M+) .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-game+= ${PYPKGPREFIX}-game>=1.6 @@ -23,7 +16,6 @@ BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-game?= ../../devel/py-game .include "../../graphics/SDL_image/buildlink3.mk" .include "../../multimedia/smpeg/buildlink3.mk" .include "../../math/py-Numeric/buildlink3.mk" +.endif # PY_GAME_BUILDLINK3_MK -.endif # PY_GAME_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -${PYPKGPREFIX}-game diff --git a/devel/py-gobject-shared/buildlink3.mk b/devel/py-gobject-shared/buildlink3.mk index 3fda7328f5b..a39da92430b 100644 --- a/devel/py-gobject-shared/buildlink3.mk +++ b/devel/py-gobject-shared/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 23:10:47 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:24:28 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_GOBJECT_SHARED_BUILDLINK3_MK:= ${PY_GOBJECT_SHARED_BUILDLINK3_MK}+ +BUILDLINK_TREE+= py-gobject-shared -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= py-gobject-shared -.endif +.if !defined(PY_GOBJECT_SHARED_BUILDLINK3_MK) +PY_GOBJECT_SHARED_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-gobject-shared} -BUILDLINK_PACKAGES+= py-gobject-shared -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-gobject-shared - -.if ${PY_GOBJECT_SHARED_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.py-gobject-shared+= py-gobject-shared>=2.10.1 BUILDLINK_PKGSRCDIR.py-gobject-shared?= ../../devel/py-gobject-shared BUILDLINK_DEPMETHOD.py-gobject-shared?= build -.endif # PY_GOBJECT_SHARED_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" +.endif # PY_GOBJECT_SHARED_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -py-gobject-shared diff --git a/devel/py-gobject/buildlink3.mk b/devel/py-gobject/buildlink3.mk index d0dbf6e4aac..1a211168b28 100644 --- a/devel/py-gobject/buildlink3.mk +++ b/devel/py-gobject/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 17:30:11 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:28 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_GOBJECT_BUILDLINK3_MK:= ${PY_GOBJECT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pygobject -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pygobject -.endif +.if !defined(PY_GOBJECT_BUILDLINK3_MK) +PY_GOBJECT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npygobject} -BUILDLINK_PACKAGES+= pygobject -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pygobject - -.if !empty(PY_GOBJECT_BUILDLINK3_MK:M+) .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pygobject+= ${PYPKGPREFIX}-gobject>=2.10.1nb1 BUILDLINK_PKGSRCDIR.pygobject?= ../../devel/py-gobject -.endif # PY_GOBJECT_BUILDLINK3_MK .include "../../devel/py-gobject-shared/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # PY_GOBJECT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pygobject diff --git a/devel/py-pexpect/buildlink3.mk b/devel/py-pexpect/buildlink3.mk index e28535bf082..06a534530a1 100644 --- a/devel/py-pexpect/buildlink3.mk +++ b/devel/py-pexpect/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:11 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:28 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_PEXPECT_BUILDLINK3_MK:= ${PY_PEXPECT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= py-pexpect -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= py-pexpect -.endif +.if !defined(PY_PEXPECT_BUILDLINK3_MK) +PY_PEXPECT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-pexpect} -BUILDLINK_PACKAGES+= py-pexpect -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-pexpect - -.if !empty(PY_PEXPECT_BUILDLINK3_MK:M+) . include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.py-pexpect+= ${PYPKGPREFIX}-pexpect>=2.1 BUILDLINK_ABI_DEPENDS.py-pexpect+= ${PYPKGPREFIX}-pexpect>=2.1 BUILDLINK_PKGSRCDIR.py-pexpect?= ../../devel/py-pexpect -.endif # PY_PEXPECT_BUILDLINK3_MK +.endif # PY_PEXPECT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -py-pexpect diff --git a/devel/py-readline/buildlink3.mk b/devel/py-readline/buildlink3.mk index 4d4a701586e..85fca7f748e 100644 --- a/devel/py-readline/buildlink3.mk +++ b/devel/py-readline/buildlink3.mk @@ -1,24 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:48 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:28 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PYREADLINE_BUILDLINK3_MK:= ${PYREADLINE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pyreadline -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pyreadline -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyreadline} -BUILDLINK_PACKAGES+= pyreadline -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyreadline - -.if !empty(PYREADLINE_BUILDLINK3_MK:M+) +.if !defined(PYREADLINE_BUILDLINK3_MK) +PYREADLINE_BUILDLINK3_MK:= .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pyreadline+= ${PYPKGPREFIX}-readline-[0-9]* BUILDLINK_ABI_DEPENDS.pyreadline?= ${PYPKGPREFIX}-readline>=0nb2 BUILDLINK_PKGSRCDIR.pyreadline?= ../../devel/py-readline +.endif # PYREADLINE_BUILDLINK3_MK -.endif # PYREADLINE_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pyreadline diff --git a/devel/qof/buildlink3.mk b/devel/qof/buildlink3.mk index 663e371f61c..0e06c92143d 100644 --- a/devel/qof/buildlink3.mk +++ b/devel/qof/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/10/28 23:36:39 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:28 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -QOF_BUILDLINK3_MK:= ${QOF_BUILDLINK3_MK}+ +BUILDLINK_TREE+= qof -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= qof -.endif +.if !defined(QOF_BUILDLINK3_MK) +QOF_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nqof} -BUILDLINK_PACKAGES+= qof -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qof - -.if ${QOF_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.qof+= qof>=0.7.5 BUILDLINK_PKGSRCDIR.qof?= ../../devel/qof -.endif # QOF_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # QOF_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -qof diff --git a/devel/readline/buildlink3.mk b/devel/readline/buildlink3.mk index 5397366befd..381f03d5d4d 100644 --- a/devel/readline/buildlink3.mk +++ b/devel/readline/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.30 2008/02/29 22:41:13 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.31 2009/03/20 19:24:28 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -READLINE_BUILDLINK3_MK:= ${READLINE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= readline -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= readline -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nreadline} -BUILDLINK_PACKAGES+= readline -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}readline +.if !defined(READLINE_BUILDLINK3_MK) +READLINE_BUILDLINK3_MK:= -.if !empty(READLINE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.readline+= readline>=2.2 BUILDLINK_ABI_DEPENDS.readline+= readline>=5.0 BUILDLINK_PKGSRCDIR.readline?= ../../devel/readline @@ -32,7 +25,6 @@ BROKEN_READLINE_DETECTION?= no . if !empty(BROKEN_READLINE_DETECTION:M[yY][eE][sS]) BUILDLINK_TRANSFORM+= l:readline:readline:${BUILDLINK_LIBNAME.termcap} . endif -.endif # READLINE_BUILDLINK3_MK CHECK_BUILTIN.readline:= yes .include "../../devel/readline/builtin.mk" @@ -44,5 +36,6 @@ USE_BUILTIN.termcap= yes .endif .include "../../mk/termcap.buildlink3.mk" +.endif # READLINE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -readline diff --git a/devel/rpc2/buildlink3.mk b/devel/rpc2/buildlink3.mk index 98aa4e340de..93ff3826083 100644 --- a/devel/rpc2/buildlink3.mk +++ b/devel/rpc2/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:48 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:28 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -RPC2_BUILDLINK3_MK:= ${RPC2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= rpc2 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= rpc2 -.endif +.if !defined(RPC2_BUILDLINK3_MK) +RPC2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrpc2} -BUILDLINK_PACKAGES+= rpc2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rpc2 - -.if !empty(RPC2_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.rpc2+= rpc2>=1.10 BUILDLINK_ABI_DEPENDS.rpc2+= rpc2>=1.27nb1 BUILDLINK_PKGSRCDIR.rpc2?= ../../devel/rpc2 -.endif # RPC2_BUILDLINK3_MK .include "../../devel/lwp/buildlink3.mk" +.endif # RPC2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -rpc2 diff --git a/devel/ruby-gnome2-glib/buildlink3.mk b/devel/ruby-gnome2-glib/buildlink3.mk index 83fa7d4962c..4259ac6845b 100644 --- a/devel/ruby-gnome2-glib/buildlink3.mk +++ b/devel/ruby-gnome2-glib/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/01/19 04:01:52 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:29 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -RUBY_GNOME2_GLIB_BUILDLINK3_MK:= ${RUBY_GNOME2_GLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ruby-gnome2-glib -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= ruby-gnome2-glib -.endif +.if !defined(RUBY_GNOME2_GLIB_BUILDLINK3_MK) +RUBY_GNOME2_GLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nruby-gnome2-glib} -BUILDLINK_PACKAGES+= ruby-gnome2-glib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ruby-gnome2-glib - -.if ${RUBY_GNOME2_GLIB_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.ruby-gnome2-glib+= ${RUBY_PKGPREFIX}-gnome2-glib>=0.17.0 BUILDLINK_PKGSRCDIR.ruby-gnome2-glib?= ../../devel/ruby-gnome2-glib -.endif # RUBY_GNOME2_GLIB_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../lang/ruby/buildlink3.mk" +.endif # RUBY_GNOME2_GLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ruby-gnome2-glib diff --git a/devel/ruby-gnome2-pango/buildlink3.mk b/devel/ruby-gnome2-pango/buildlink3.mk index 55de94a0ead..c9ae329b60e 100644 --- a/devel/ruby-gnome2-pango/buildlink3.mk +++ b/devel/ruby-gnome2-pango/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.10 2009/01/19 04:07:54 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:29 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -RUBY_GNOME2_PANGO_BUILDLINK3_MK:= ${RUBY_GNOME2_PANGO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ruby-gnome2-pango -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ruby-gnome2-pango -.endif +.if !defined(RUBY_GNOME2_PANGO_BUILDLINK3_MK) +RUBY_GNOME2_PANGO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nruby-gnome2-pango} -BUILDLINK_PACKAGES+= ruby-gnome2-pango -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ruby-gnome2-pango - -.if !empty(RUBY_GNOME2_PANGO_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ruby-gnome2-pango+= ${RUBY_PKGPREFIX}-gnome2-pango>=0.16.0 BUILDLINK_PKGSRCDIR.ruby-gnome2-pango?= ../../devel/ruby-gnome2-pango -.endif # RUBY_GNOME2_PANGO_BUILDLINK3_MK .include "../../devel/ruby-gnome2-glib/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" .include "../../lang/ruby/buildlink3.mk" +.endif # RUBY_GNOME2_PANGO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ruby-gnome2-pango diff --git a/devel/rudiments/buildlink3.mk b/devel/rudiments/buildlink3.mk index f9424831395..69bbd9950fa 100644 --- a/devel/rudiments/buildlink3.mk +++ b/devel/rudiments/buildlink3.mk @@ -1,24 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:48 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:29 joerg Exp $ # # This Makefile fragment is included by packages that use rudiments. # # This file was created automatically using createbuildlink-3.1. # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -RUDIMENTS_BUILDLINK3_MK:= ${RUDIMENTS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= rudiments -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= rudiments -.endif +.if !defined(RUDIMENTS_BUILDLINK3_MK) +RUDIMENTS_BUILDLINK3_MK:= -.if !empty(RUDIMENTS_BUILDLINK3_MK:M+) -BUILDLINK_PACKAGES+= rudiments -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rudiments BUILDLINK_API_DEPENDS.rudiments+= rudiments>=0.25.1 BUILDLINK_ABI_DEPENDS.rudiments+= rudiments>=0.28.2nb1 BUILDLINK_PKGSRCDIR.rudiments?= ../../devel/rudiments - .endif # RUDIMENTS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -rudiments diff --git a/devel/rvm/buildlink3.mk b/devel/rvm/buildlink3.mk index a1a2a67fcd0..cca6e0feed1 100644 --- a/devel/rvm/buildlink3.mk +++ b/devel/rvm/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:48 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:29 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -RVM_BUILDLINK3_MK:= ${RVM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= rvm -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= rvm -.endif +.if !defined(RVM_BUILDLINK3_MK) +RVM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrvm} -BUILDLINK_PACKAGES+= rvm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rvm - -.if !empty(RVM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.rvm+= rvm>=1.3 BUILDLINK_ABI_DEPENDS.rvm+= rvm>=1.11nb1 BUILDLINK_PKGSRCDIR.rvm?= ../../devel/rvm -.endif # RVM_BUILDLINK3_MK .include "../../devel/lwp/buildlink3.mk" +.endif # RVM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -rvm diff --git a/devel/rx/buildlink3.mk b/devel/rx/buildlink3.mk index 855568a16cd..be81cd568f0 100644 --- a/devel/rx/buildlink3.mk +++ b/devel/rx/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:48 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:29 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -RX_BUILDLINK3_MK:= ${RX_BUILDLINK3_MK}+ +BUILDLINK_TREE+= rx -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= rx -.endif +.if !defined(RX_BUILDLINK3_MK) +RX_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrx} -BUILDLINK_PACKAGES+= rx -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rx - -.if !empty(RX_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.rx+= rx>=1.5 BUILDLINK_PKGSRCDIR.rx?= ../../devel/rx -.endif # RX_BUILDLINK3_MK +.endif # RX_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -rx diff --git a/devel/sapnwrfcsdk/buildlink3.mk b/devel/sapnwrfcsdk/buildlink3.mk index bf56f6ee162..0b2d2a7f169 100644 --- a/devel/sapnwrfcsdk/buildlink3.mk +++ b/devel/sapnwrfcsdk/buildlink3.mk @@ -1,26 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/03/09 16:53:16 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:29 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SAPNWRFCSDK_BUILDLINK3_MK:= ${SAPNWRFCSDK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= sapnwrfcsdk -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= sapnwrfcsdk -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsapnwrfcsdk} -BUILDLINK_PACKAGES+= sapnwrfcsdk -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sapnwrfcsdk - -.if !empty(SAPNWRFCSDK_BUILDLINK3_MK:M+) +.if !defined(SAPNWRFCSDK_BUILDLINK3_MK) +SAPNWRFCSDK_BUILDLINK3_MK:= . include "../../mk/bsd.fast.prefs.mk" BUILDLINK_API_DEPENDS.sapnwrfcsdk+= sapnwrfcsdk>=7.00 BUILDLINK_ABI_DEPENDS.sapnwrfcsdk+= sapnwrfcsdk>=7.00 BUILDLINK_PKGSRCDIR.sapnwrfcsdk?= ../../devel/sapnwrfcsdk -.endif # SAPNWRFCSDK_BUILDLINK3_MK pkgbase := sapnwrfcsdk .include "../../mk/pkg-build-options.mk" +.endif # SAPNWRFCSDK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -sapnwrfcsdk diff --git a/devel/semantic/buildlink3.mk b/devel/semantic/buildlink3.mk index 7a1dc4d7a99..4df92886466 100644 --- a/devel/semantic/buildlink3.mk +++ b/devel/semantic/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:41:17 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:29 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SEMANTIC_BUILDLINK3_MK:= ${SEMANTIC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= semantic -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= semantic -.endif +.if !defined(SEMANTIC_BUILDLINK3_MK) +SEMANTIC_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsemantic} -BUILDLINK_PACKAGES+= semantic -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}semantic - -.if ${SEMANTIC_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.semantic+= ${EMACS_PKGNAME_PREFIX}semantic>=10 BUILDLINK_PKGSRCDIR.semantic?= ../../devel/semantic -.endif # SEMANTIC_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.semantic= ${EGREP} '.*\.el$$|.*\.elc$$' +.endif # SEMANTIC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -semantic diff --git a/devel/semi/buildlink3.mk b/devel/semi/buildlink3.mk index 42c013de5df..a217b20d0f8 100644 --- a/devel/semi/buildlink3.mk +++ b/devel/semi/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:41:17 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:29 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SEMI_BUILDLINK3_MK:= ${SEMI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= semi -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= semi -.endif +.if !defined(SEMI_BUILDLINK3_MK) +SEMI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsemi} -BUILDLINK_PACKAGES+= semi -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}semi - -.if ${SEMI_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.semi+= ${EMACS_PKGNAME_PREFIX}semi>=1.14 BUILDLINK_PKGSRCDIR.semi?= ../../devel/semi -.endif # SEMI_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.semi= ${EGREP} '.*\.el$$|.*\.elc$$' .include "../../devel/flim/buildlink3.mk" +.endif # SEMI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -semi diff --git a/devel/sgb/buildlink3.mk b/devel/sgb/buildlink3.mk index 2070338bf9d..fbe078bf088 100644 --- a/devel/sgb/buildlink3.mk +++ b/devel/sgb/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 23:10:48 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:29 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SGB_BUILDLINK3_MK:= ${SGB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= sgb -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= sgb -.endif +.if !defined(SGB_BUILDLINK3_MK) +SGB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsgb} -BUILDLINK_PACKAGES+= sgb -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sgb - -.if !empty(SGB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.sgb+= sgb>=0pre20050409 BUILDLINK_PKGSRCDIR.sgb?= ../../devel/sgb -.endif # SGB_BUILDLINK3_MK +.endif # SGB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -sgb diff --git a/devel/silc-toolkit/buildlink3.mk b/devel/silc-toolkit/buildlink3.mk index 937596997b8..88ecc5027b5 100644 --- a/devel/silc-toolkit/buildlink3.mk +++ b/devel/silc-toolkit/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/10/25 01:40:36 dmcmahill Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:29 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SILC_TOOLKIT_BUILDLINK3_MK:= ${SILC_TOOLKIT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= silc-toolkit -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= silc-toolkit -.endif +.if !defined(SILC_TOOLKIT_BUILDLINK3_MK) +SILC_TOOLKIT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsilc-toolkit} -BUILDLINK_PACKAGES+= silc-toolkit -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}silc-toolkit - -.if !empty(SILC_TOOLKIT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.silc-toolkit+= silc-toolkit>=0.9.12 BUILDLINK_ABI_DEPENDS.silc-toolkit+= silc-toolkit>=0.9.12nb1 BUILDLINK_PKGSRCDIR.silc-toolkit?= ../../devel/silc-toolkit -.endif # SILC_TOOLKIT_BUILDLINK3_MK .include "../../devel/libgetopt/buildlink3.mk" +.endif # SILC_TOOLKIT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -silc-toolkit diff --git a/devel/subversion-base/buildlink3.mk b/devel/subversion-base/buildlink3.mk index dd0a86b486d..38610affb6f 100644 --- a/devel/subversion-base/buildlink3.mk +++ b/devel/subversion-base/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.16 2008/09/06 20:54:32 wiz Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SUBVERSION_BASE_BUILDLINK3_MK:= ${SUBVERSION_BASE_BUILDLINK3_MK}+ +# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:30 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" .include "../../devel/subversion/Makefile.version" -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= subversion-base -.endif +BUILDLINK_TREE+= subversion-base -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsubversion-base} -BUILDLINK_PACKAGES+= subversion-base -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}subversion-base +.if !defined(SUBVERSION_BASE_BUILDLINK3_MK) +SUBVERSION_BASE_BUILDLINK3_MK:= -.if !empty(SUBVERSION_BASE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.subversion-base+= subversion-base>=1.0.0 BUILDLINK_ABI_DEPENDS.subversion-base?= subversion-base>=1.5.2nb1 BUILDLINK_PKGSRCDIR.subversion-base?= ../../devel/subversion-base @@ -24,8 +17,6 @@ BUILDLINK_FILES.subversion-base+= bin/svn-config pkgbase := subversion-base .include "../../mk/pkg-build-options.mk" -.endif # SUBVERSION_BASE_BUILDLINK3_MK - .if !empty(PKG_BUILD_OPTIONS.subversion-base:Msasl) .include "../../security/cyrus-sasl/buildlink3.mk" .endif @@ -42,5 +33,6 @@ pkgbase := subversion-base . include "../../devel/apr0/buildlink3.mk" . include "../../www/neon/buildlink3.mk" .endif +.endif # SUBVERSION_BASE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -subversion-base diff --git a/devel/swig/buildlink3.mk b/devel/swig/buildlink3.mk index 54e64b8f072..22ff253193a 100644 --- a/devel/swig/buildlink3.mk +++ b/devel/swig/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/12/02 10:15:46 wulf Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:30 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SWIG_BUILDLINK3_MK:= ${SWIG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= swig -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= swig -.endif +.if !defined(SWIG_BUILDLINK3_MK) +SWIG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nswig} -BUILDLINK_PACKAGES+= swig -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}swig - -.if !empty(SWIG_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.swig+= swig>=1.3.24 BUILDLINK_ABI_DEPENDS.swig+= swig>=1.3.31 BUILDLINK_PKGSRCDIR.swig?= ../../devel/swig @@ -19,6 +12,6 @@ BUILDLINK_PKGSRCDIR.swig?= ../../devel/swig BUILDLINK_DEPMETHOD.swig?= build BUILDLINK_FILES.swig+= share/swig/1.3/* share/swig/1.3/*/* -.endif # SWIG_BUILDLINK3_MK +.endif # SWIG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -swig diff --git a/devel/syncdir/buildlink3.mk b/devel/syncdir/buildlink3.mk index e0837abbe49..446c63202c1 100644 --- a/devel/syncdir/buildlink3.mk +++ b/devel/syncdir/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:48 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:30 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SYNCDIR_BUILDLINK3_MK:= ${SYNCDIR_BUILDLINK3_MK}+ +BUILDLINK_TREE+= syncdir -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= syncdir -.endif +.if !defined(SYNCDIR_BUILDLINK3_MK) +SYNCDIR_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsyncdir} -BUILDLINK_PACKAGES+= syncdir -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}syncdir - -.if !empty(SYNCDIR_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.syncdir+= syncdir>=1.0 BUILDLINK_ABI_DEPENDS.syncdir+= syncdir>=1.0nb1 BUILDLINK_PKGSRCDIR.syncdir?= ../../devel/syncdir -.endif # SYNCDIR_BUILDLINK3_MK +.endif # SYNCDIR_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -syncdir diff --git a/devel/sysexits/buildlink3.mk b/devel/sysexits/buildlink3.mk index b134fb3a3c7..f8d658cf60f 100644 --- a/devel/sysexits/buildlink3.mk +++ b/devel/sysexits/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:48 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:30 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SYSEXITS_BUILDLINK3_MK:= ${SYSEXITS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= sysexits -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= sysexits -.endif +.if !defined(SYSEXITS_BUILDLINK3_MK) +SYSEXITS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsysexits} -BUILDLINK_PACKAGES+= sysexits -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sysexits - -.if !empty(SYSEXITS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.sysexits+= sysexits>=1.1 BUILDLINK_DEPMETHOD.sysexits?= build BUILDLINK_PKGSRCDIR.sysexits?= ../../devel/sysexits -.endif # SYSEXITS_BUILDLINK3_MK +.endif # SYSEXITS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -sysexits diff --git a/devel/tcl-tclcl/buildlink3.mk b/devel/tcl-tclcl/buildlink3.mk index a522ca2fc23..a492722097e 100644 --- a/devel/tcl-tclcl/buildlink3.mk +++ b/devel/tcl-tclcl/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:48 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:30 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TCL_TCLCL_BUILDLINK3_MK:= ${TCL_TCLCL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= tcl-tclcl -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= tcl-tclcl -.endif +.if !defined(TCL_TCLCL_BUILDLINK3_MK) +TCL_TCLCL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl-tclcl} -BUILDLINK_PACKAGES+= tcl-tclcl -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tcl-tclcl - -.if !empty(TCL_TCLCL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.tcl-tclcl+= tcl-tclcl>=1.15 BUILDLINK_ABI_DEPENDS.tcl-tclcl+= tcl-tclcl>=1.17nb2 BUILDLINK_PKGSRCDIR.tcl-tclcl?= ../../devel/tcl-tclcl -.endif # TCL_TCLCL_BUILDLINK3_MK .include "../../lang/tcl/buildlink3.mk" .include "../../lang/tcl-otcl/buildlink3.mk" .include "../../x11/tk/buildlink3.mk" +.endif # TCL_TCLCL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -tcl-tclcl diff --git a/devel/teem/buildlink3.mk b/devel/teem/buildlink3.mk index 4cdd1e597e0..0a2af2b2ca6 100644 --- a/devel/teem/buildlink3.mk +++ b/devel/teem/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:48 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:30 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TEEM_BUILDLINK3_MK:= ${TEEM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= teem -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= teem -.endif +.if !defined(TEEM_BUILDLINK3_MK) +TEEM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nteem} -BUILDLINK_PACKAGES+= teem -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}teem - -.if !empty(TEEM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.teem+= teem>=1.8.0 BUILDLINK_ABI_DEPENDS.teem+= teem>=1.8.0nb1 BUILDLINK_PKGSRCDIR.teem?= ../../devel/teem @@ -39,7 +32,6 @@ BUILDLINK_FILES.teem+= lib/libnrrd.* BUILDLINK_FILES.teem+= lib/libteem.* BUILDLINK_FILES.teem+= lib/libten.* BUILDLINK_FILES.teem+= lib/libunrrdu.* +.endif # TEEM_BUILDLINK3_MK -.endif # TEEM_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -teem diff --git a/devel/tre/buildlink3.mk b/devel/tre/buildlink3.mk index a9b3c6f4bb3..56b24f71166 100644 --- a/devel/tre/buildlink3.mk +++ b/devel/tre/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2007/09/13 19:23:40 adrianp Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:30 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TRE_BUILDLINK3_MK:= ${TRE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= tre -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= tre -.endif +.if !defined(TRE_BUILDLINK3_MK) +TRE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntre} -BUILDLINK_PACKAGES+= tre -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tre - -.if !empty(TRE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.tre+= tre>=0.7.2 BUILDLINK_PKGSRCDIR.tre?= ../../devel/tre BUILDLINK_CPPFLAGS.tre+= -I${BUILDLINK_PREFIX.tre}/include/tre -.endif # TRE_BUILDLINK3_MK +.endif # TRE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -tre diff --git a/devel/ucl/buildlink3.mk b/devel/ucl/buildlink3.mk index efb66907425..d448d28a244 100644 --- a/devel/ucl/buildlink3.mk +++ b/devel/ucl/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:48 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:30 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -UCL_BUILDLINK3_MK:= ${UCL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ucl -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ucl -.endif +.if !defined(UCL_BUILDLINK3_MK) +UCL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nucl} -BUILDLINK_PACKAGES+= ucl -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ucl - -.if !empty(UCL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ucl+= ucl>=1.02 BUILDLINK_ABI_DEPENDS.ucl+= ucl>=1.02nb2 BUILDLINK_PKGSRCDIR.ucl?= ../../devel/ucl -.endif # UCL_BUILDLINK3_MK +.endif # UCL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ucl diff --git a/devel/vanessa_adt/buildlink3.mk b/devel/vanessa_adt/buildlink3.mk index ec83f9cf4e0..3a64aa6163b 100644 --- a/devel/vanessa_adt/buildlink3.mk +++ b/devel/vanessa_adt/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:48 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:30 joerg Exp $ # # This file was created automatically using createbuildlink-3.5. -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -VANESSA_ADT_BUILDLINK3_MK:= ${VANESSA_ADT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= vanessa_adt -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= vanessa_adt -.endif +.if !defined(VANESSA_ADT_BUILDLINK3_MK) +VANESSA_ADT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nvanessa_adt} -BUILDLINK_PACKAGES+= vanessa_adt -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}vanessa_adt - -.if !empty(VANESSA_ADT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.vanessa_adt+= vanessa_adt>=0.0.6 BUILDLINK_ABI_DEPENDS.vanessa_adt+= vanessa_adt>=0.0.6nb1 BUILDLINK_PKGSRCDIR.vanessa_adt?= ../../devel/vanessa_adt -.endif # VANESSA_ADT_BUILDLINK3_MK .include "../../devel/vanessa_logger/buildlink3.mk" +.endif # VANESSA_ADT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -vanessa_adt diff --git a/devel/vanessa_logger/buildlink3.mk b/devel/vanessa_logger/buildlink3.mk index 4e5b566e6a8..98db6f59922 100644 --- a/devel/vanessa_logger/buildlink3.mk +++ b/devel/vanessa_logger/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:48 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:30 joerg Exp $ # # This file was created automatically using createbuildlink-3.5. -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -VANESSA_LOGGER_BUILDLINK3_MK:= ${VANESSA_LOGGER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= vanessa_logger -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= vanessa_logger -.endif +.if !defined(VANESSA_LOGGER_BUILDLINK3_MK) +VANESSA_LOGGER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nvanessa_logger} -BUILDLINK_PACKAGES+= vanessa_logger -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}vanessa_logger - -.if !empty(VANESSA_LOGGER_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.vanessa_logger+= vanessa_logger>=0.0.7 BUILDLINK_ABI_DEPENDS.vanessa_logger+= vanessa_logger>=0.0.7nb1 BUILDLINK_PKGSRCDIR.vanessa_logger?= ../../devel/vanessa_logger -.endif # VANESSA_LOGGER_BUILDLINK3_MK +.endif # VANESSA_LOGGER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -vanessa_logger diff --git a/devel/vanessa_socket/buildlink3.mk b/devel/vanessa_socket/buildlink3.mk index 82535019437..9cea9d06bdf 100644 --- a/devel/vanessa_socket/buildlink3.mk +++ b/devel/vanessa_socket/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:48 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:31 joerg Exp $ # # This file was created automatically using createbuildlink-3.5. -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -VANESSA_SOCKET_BUILDLINK3_MK:= ${VANESSA_SOCKET_BUILDLINK3_MK}+ +BUILDLINK_TREE+= vanessa_socket -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= vanessa_socket -.endif +.if !defined(VANESSA_SOCKET_BUILDLINK3_MK) +VANESSA_SOCKET_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nvanessa_socket} -BUILDLINK_PACKAGES+= vanessa_socket -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}vanessa_socket - -.if !empty(VANESSA_SOCKET_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.vanessa_socket+= vanessa_socket>=0.0.7nb2 BUILDLINK_ABI_DEPENDS.vanessa_socket?= vanessa_socket>=0.0.7nb3 BUILDLINK_PKGSRCDIR.vanessa_socket?= ../../devel/vanessa_socket -.endif # VANESSA_SOCKET_BUILDLINK3_MK .include "../../devel/popt/buildlink3.mk" .include "../../devel/vanessa_logger/buildlink3.mk" +.endif # VANESSA_SOCKET_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -vanessa_socket diff --git a/devel/xfce4-dev-tools/buildlink3.mk b/devel/xfce4-dev-tools/buildlink3.mk index 2f83ca3bddc..a7241acf173 100644 --- a/devel/xfce4-dev-tools/buildlink3.mk +++ b/devel/xfce4-dev-tools/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.2 2007/12/07 19:43:20 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:31 joerg Exp $ BUILDLINK_DEPMETHOD.xfce4-dev-tools?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_DEV_TOOLS_BUILDLINK3_MK:= ${XFCE4_DEV_TOOLS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-dev-tools -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-dev-tools -.endif +.if !defined(XFCE4_DEV_TOOLS_BUILDLINK3_MK) +XFCE4_DEV_TOOLS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-dev-tools} -BUILDLINK_PACKAGES+= xfce4-dev-tools -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-dev-tools - -.if ${XFCE4_DEV_TOOLS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-dev-tools+= xfce4-dev-tools>=4.4.0.1 BUILDLINK_PKGSRCDIR.xfce4-dev-tools?= ../../devel/xfce4-dev-tools -.endif # XFCE4_DEV_TOOLS_BUILDLINK3_MK +.endif # XFCE4_DEV_TOOLS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-dev-tools diff --git a/devel/zlib/buildlink3.mk b/devel/zlib/buildlink3.mk index 6c0867d04f5..6416a4f5b36 100644 --- a/devel/zlib/buildlink3.mk +++ b/devel/zlib/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.23 2006/07/08 23:10:49 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2009/03/20 19:24:31 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ZLIB_BUILDLINK3_MK:= ${ZLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= zlib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= zlib -.endif +.if !defined(ZLIB_BUILDLINK3_MK) +ZLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nzlib} -BUILDLINK_PACKAGES+= zlib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}zlib - -.if !empty(ZLIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.zlib+= zlib>=1.1.4nb1 BUILDLINK_ABI_DEPENDS.zlib+= zlib>=1.2.3 BUILDLINK_PKGSRCDIR.zlib?= ../../devel/zlib -.endif # ZLIB_BUILDLINK3_MK +.endif # ZLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -zlib diff --git a/editors/emacs-nox11/buildlink3.mk b/editors/emacs-nox11/buildlink3.mk index 4d203b93838..29efa0e0e24 100644 --- a/editors/emacs-nox11/buildlink3.mk +++ b/editors/emacs-nox11/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:31 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EMACS_NOX11_BUILDLINK3_MK:= ${EMACS_NOX11_BUILDLINK3_MK}+ +BUILDLINK_TREE+= emacs-nox11 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= emacs-nox11 -.endif +.if !defined(EMACS_NOX11_BUILDLINK3_MK) +EMACS_NOX11_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nemacs-nox11} -BUILDLINK_PACKAGES+= emacs-nox11 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}emacs-nox11 - -.if ${EMACS_NOX11_BUILDLINK3_MK} == "+" .include "../../editors/emacs/modules.mk" BUILDLINK_API_DEPENDS.emacs-nox11+= ${_EMACS_REQD} BUILDLINK_PKGSRCDIR.emacs-nox11?= ${_EMACS_PKGDIR} -.endif # EMACS_NOX11_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.emacs-nox11= ${EGREP} '.*\.el$$|.*\.elc$$' +.endif # EMACS_NOX11_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -emacs-nox11 diff --git a/editors/emacs/buildlink3.mk b/editors/emacs/buildlink3.mk index 02b5e681ab4..da53e6597d3 100644 --- a/editors/emacs/buildlink3.mk +++ b/editors/emacs/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:31 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EMACS_BUILDLINK3_MK:= ${EMACS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= emacs -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= emacs -.endif +.if !defined(EMACS_BUILDLINK3_MK) +EMACS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nemacs} -BUILDLINK_PACKAGES+= emacs -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}emacs - -.if ${EMACS_BUILDLINK3_MK} == "+" .include "../../editors/emacs/modules.mk" BUILDLINK_API_DEPENDS.emacs+= ${_EMACS_REQD} BUILDLINK_PKGSRCDIR.emacs?= ${_EMACS_PKGDIR} -.endif # EMACS_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.emacs= ${EGREP} '.*\.el$$|.*\.elc$$' +.endif # EMACS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -emacs diff --git a/editors/emacs20/buildlink3.mk b/editors/emacs20/buildlink3.mk index abb41b1e09b..273598e06c7 100644 --- a/editors/emacs20/buildlink3.mk +++ b/editors/emacs20/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.3 2008/10/13 14:00:28 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:31 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EMACS_BUILDLINK3_MK:= ${EMACS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= emacs -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= emacs -.endif +.if !defined(EMACS_BUILDLINK3_MK) +EMACS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nemacs} -BUILDLINK_PACKAGES+= emacs -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}emacs - -.if ${EMACS_BUILDLINK3_MK} == "+" .include "../../editors/emacs/modules.mk" BUILDLINK_API_DEPENDS.emacs+= ${_EMACS_REQD} BUILDLINK_PKGSRCDIR.emacs?= ${_EMACS_PKGDIR} -.endif # EMACS_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.emacs= ${EGREP} '.*\.el$$|.*\.elc$$' +.endif # EMACS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -emacs diff --git a/editors/emacs21-nox11/buildlink3.mk b/editors/emacs21-nox11/buildlink3.mk index 4d203b93838..29efa0e0e24 100644 --- a/editors/emacs21-nox11/buildlink3.mk +++ b/editors/emacs21-nox11/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:31 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EMACS_NOX11_BUILDLINK3_MK:= ${EMACS_NOX11_BUILDLINK3_MK}+ +BUILDLINK_TREE+= emacs-nox11 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= emacs-nox11 -.endif +.if !defined(EMACS_NOX11_BUILDLINK3_MK) +EMACS_NOX11_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nemacs-nox11} -BUILDLINK_PACKAGES+= emacs-nox11 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}emacs-nox11 - -.if ${EMACS_NOX11_BUILDLINK3_MK} == "+" .include "../../editors/emacs/modules.mk" BUILDLINK_API_DEPENDS.emacs-nox11+= ${_EMACS_REQD} BUILDLINK_PKGSRCDIR.emacs-nox11?= ${_EMACS_PKGDIR} -.endif # EMACS_NOX11_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.emacs-nox11= ${EGREP} '.*\.el$$|.*\.elc$$' +.endif # EMACS_NOX11_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -emacs-nox11 diff --git a/editors/emacs21/buildlink3.mk b/editors/emacs21/buildlink3.mk index 02b5e681ab4..da53e6597d3 100644 --- a/editors/emacs21/buildlink3.mk +++ b/editors/emacs21/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:31 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EMACS_BUILDLINK3_MK:= ${EMACS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= emacs -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= emacs -.endif +.if !defined(EMACS_BUILDLINK3_MK) +EMACS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nemacs} -BUILDLINK_PACKAGES+= emacs -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}emacs - -.if ${EMACS_BUILDLINK3_MK} == "+" .include "../../editors/emacs/modules.mk" BUILDLINK_API_DEPENDS.emacs+= ${_EMACS_REQD} BUILDLINK_PKGSRCDIR.emacs?= ${_EMACS_PKGDIR} -.endif # EMACS_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.emacs= ${EGREP} '.*\.el$$|.*\.elc$$' +.endif # EMACS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -emacs diff --git a/editors/gedit/buildlink3.mk b/editors/gedit/buildlink3.mk index afaf889a459..b52e8d121ad 100644 --- a/editors/gedit/buildlink3.mk +++ b/editors/gedit/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.15 2008/04/15 18:37:22 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:24:31 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GEDIT_BUILDLINK3_MK:= ${GEDIT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gedit -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gedit -.endif +.if !defined(GEDIT_BUILDLINK3_MK) +GEDIT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngedit} -BUILDLINK_PACKAGES+= gedit -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gedit - -.if !empty(GEDIT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gedit+= gedit>=2.12.1nb4 BUILDLINK_ABI_DEPENDS.gedit?= gedit>=2.20.4nb2 BUILDLINK_PKGSRCDIR.gedit?= ../../editors/gedit -.endif # GEDIT_BUILDLINK3_MK .include "../../devel/libglade/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../x11/gtksourceview2/buildlink3.mk" +.endif # GEDIT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gedit diff --git a/editors/mule-ucs/buildlink3.mk b/editors/mule-ucs/buildlink3.mk index 1fad14e30e7..abb0cc15a55 100644 --- a/editors/mule-ucs/buildlink3.mk +++ b/editors/mule-ucs/buildlink3.mk @@ -1,9 +1,6 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:31 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MULE_UCS_BUILDLINK3_MK:= ${MULE_UCS_BUILDLINK3_MK}+ - # # Only for older GNU Emacs. Emacs 22 or later doesn't need this because it # incorporated Unicode support. @@ -12,21 +9,17 @@ MULE_UCS_BUILDLINK3_MK:= ${MULE_UCS_BUILDLINK3_MK}+ .include "../../editors/emacs/modules.mk" .if ${EMACS_FLAVOR} == "emacs" && ${EMACS_VERSION_MAJOR} < 22 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= mule-ucs -.endif +BUILDLINK_TREE+= mule-ucs -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmule-ucs} -BUILDLINK_PACKAGES+= mule-ucs -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mule-ucs +.if !defined(MULE_UCS_BUILDLINK3_MK) +MULE_UCS_BUILDLINK3_MK:= -.if ${MULE_UCS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.mule-ucs+= ${EMACS_PKGNAME_PREFIX}Mule-UCS>=0.84 BUILDLINK_PKGSRCDIR.mule-ucs?= ../../editors/mule-ucs -.endif # MULE_UCS_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.mule-ucs= ${EGREP} '.*\.el$$|.*\.elc$$' .endif +.endif # MULE_UCS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -mule-ucs diff --git a/editors/obby/buildlink3.mk b/editors/obby/buildlink3.mk index 2b906ccbd92..aaa318b2352 100644 --- a/editors/obby/buildlink3.mk +++ b/editors/obby/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/03/06 14:53:50 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:31 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OBBY_BUILDLINK3_MK:= ${OBBY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= obby -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= obby -.endif +.if !defined(OBBY_BUILDLINK3_MK) +OBBY_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nobby} -BUILDLINK_PACKAGES+= obby -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}obby - -.if ${OBBY_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.obby+= obby>=0.4.4 BUILDLINK_ABI_DEPENDS.obby?= obby>=0.4.4nb1 BUILDLINK_PKGSRCDIR.obby?= ../../editors/obby -.endif # OBBY_BUILDLINK3_MK .include "../../devel/libsigc++/buildlink3.mk" .include "../../net/net6/buildlink3.mk" +.endif # OBBY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -obby diff --git a/editors/pico/buildlink3.mk b/editors/pico/buildlink3.mk index 80240f596d5..e277293f29c 100644 --- a/editors/pico/buildlink3.mk +++ b/editors/pico/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:10:49 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:32 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PICO_BUILDLINK3_MK:= ${PICO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pico -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pico -.endif +.if !defined(PICO_BUILDLINK3_MK) +PICO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npico} -BUILDLINK_PACKAGES+= pico -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pico - -.if !empty(PICO_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.pico+= pico>=4.10 BUILDLINK_PKGSRCDIR.pico?= ../../editors/pico -.endif # PICO_BUILDLINK3_MK +.endif # PICO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pico diff --git a/editors/sam/buildlink3.mk b/editors/sam/buildlink3.mk index 28aa8947326..05b8491d41f 100644 --- a/editors/sam/buildlink3.mk +++ b/editors/sam/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:49 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:32 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SAM_BUILDLINK3_MK:= ${SAM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= sam -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= sam -.endif +.if !defined(SAM_BUILDLINK3_MK) +SAM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsam} -BUILDLINK_PACKAGES+= sam -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sam - -.if !empty(SAM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.sam+= sam>=4.3nb1 BUILDLINK_ABI_DEPENDS.sam?= sam>=4.3nb3 BUILDLINK_PKGSRCDIR.sam?= ../../editors/sam BUILDLINK_DEPMETHOD.sam?= build -.endif # SAM_BUILDLINK3_MK +.endif # SAM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -sam diff --git a/editors/speedbar/buildlink3.mk b/editors/speedbar/buildlink3.mk index db4e8a24d07..40a64530823 100644 --- a/editors/speedbar/buildlink3.mk +++ b/editors/speedbar/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:41:18 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:32 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SPEEDBAR_BUILDLINK3_MK:= ${SPEEDBAR_BUILDLINK3_MK}+ +BUILDLINK_TREE+= speedbar -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= speedbar -.endif +.if !defined(SPEEDBAR_BUILDLINK3_MK) +SPEEDBAR_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nspeedbar} -BUILDLINK_PACKAGES+= speedbar -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}speedbar - -.if ${SPEEDBAR_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.speedbar+= ${EMACS_PKGNAME_PREFIX}speedbar>=0.14rc0 BUILDLINK_PKGSRCDIR.speedbar?= ../../editors/speedbar -.endif # SPEEDBAR_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.speedbar= ${EGREP} '.*\.el$$|.*\.elc$$' +.endif # SPEEDBAR_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -speedbar diff --git a/editors/xemacs-current-nox11/buildlink3.mk b/editors/xemacs-current-nox11/buildlink3.mk index 45e76f5fc57..ed72a9af3af 100644 --- a/editors/xemacs-current-nox11/buildlink3.mk +++ b/editors/xemacs-current-nox11/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:32 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XEMACS_NOX11_BUILDLINK3_MK:= ${XEMACS_NOX11_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xemacs-nox11 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xemacs-nox11 -.endif +.if !defined(XEMACS_NOX11_BUILDLINK3_MK) +XEMACS_NOX11_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxemacs-nox11} -BUILDLINK_PACKAGES+= xemacs-nox11 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xemacs-nox11 - -.if ${XEMACS_NOX11_BUILDLINK3_MK} == "+" .include "../../editors/emacs/modules.mk" BUILDLINK_API_DEPENDS.xemacs-nox11+= ${_EMACS_REQD} BUILDLINK_PKGSRCDIR.xemacs-nox11?= ${_EMACS_PKGDIR} -.endif # XEMACS_NOX11_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.xemacs-nox11= ${EGREP} '.*\.el$$|.*\.elc$$' +.endif # XEMACS_NOX11_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xemacs-nox11 diff --git a/editors/xemacs-current/buildlink3.mk b/editors/xemacs-current/buildlink3.mk index 86aa1539510..c67b61843d7 100644 --- a/editors/xemacs-current/buildlink3.mk +++ b/editors/xemacs-current/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:32 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XEMACS_BUILDLINK3_MK:= ${XEMACS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xemacs -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xemacs -.endif +.if !defined(XEMACS_BUILDLINK3_MK) +XEMACS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxemacs} -BUILDLINK_PACKAGES+= xemacs -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xemacs - -.if ${XEMACS_BUILDLINK3_MK} == "+" .include "../../editors/emacs/modules.mk" BUILDLINK_API_DEPENDS.xemacs+= ${_EMACS_REQD} BUILDLINK_PKGSRCDIR.xemacs?= ${_EMACS_PKGDIR} -.endif # XEMACS_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.xemacs= ${EGREP} '.*\.el$$|.*\.elc$$' +.endif # XEMACS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xemacs diff --git a/editors/xemacs-nox11/buildlink3.mk b/editors/xemacs-nox11/buildlink3.mk index 45e76f5fc57..ed72a9af3af 100644 --- a/editors/xemacs-nox11/buildlink3.mk +++ b/editors/xemacs-nox11/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:32 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XEMACS_NOX11_BUILDLINK3_MK:= ${XEMACS_NOX11_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xemacs-nox11 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xemacs-nox11 -.endif +.if !defined(XEMACS_NOX11_BUILDLINK3_MK) +XEMACS_NOX11_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxemacs-nox11} -BUILDLINK_PACKAGES+= xemacs-nox11 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xemacs-nox11 - -.if ${XEMACS_NOX11_BUILDLINK3_MK} == "+" .include "../../editors/emacs/modules.mk" BUILDLINK_API_DEPENDS.xemacs-nox11+= ${_EMACS_REQD} BUILDLINK_PKGSRCDIR.xemacs-nox11?= ${_EMACS_PKGDIR} -.endif # XEMACS_NOX11_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.xemacs-nox11= ${EGREP} '.*\.el$$|.*\.elc$$' +.endif # XEMACS_NOX11_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xemacs-nox11 diff --git a/editors/xemacs/buildlink3.mk b/editors/xemacs/buildlink3.mk index 86aa1539510..c67b61843d7 100644 --- a/editors/xemacs/buildlink3.mk +++ b/editors/xemacs/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:32 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XEMACS_BUILDLINK3_MK:= ${XEMACS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xemacs -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xemacs -.endif +.if !defined(XEMACS_BUILDLINK3_MK) +XEMACS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxemacs} -BUILDLINK_PACKAGES+= xemacs -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xemacs - -.if ${XEMACS_BUILDLINK3_MK} == "+" .include "../../editors/emacs/modules.mk" BUILDLINK_API_DEPENDS.xemacs+= ${_EMACS_REQD} BUILDLINK_PKGSRCDIR.xemacs?= ${_EMACS_PKGDIR} -.endif # XEMACS_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.xemacs= ${EGREP} '.*\.el$$|.*\.elc$$' +.endif # XEMACS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xemacs diff --git a/editors/xfce4-mousepad/buildlink3.mk b/editors/xfce4-mousepad/buildlink3.mk index 8cfc69e6d4b..4cf6d60503a 100644 --- a/editors/xfce4-mousepad/buildlink3.mk +++ b/editors/xfce4-mousepad/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.3 2008/12/18 16:46:29 hira Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:32 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_MOUSEPAD_BUILDLINK3_MK:= ${XFCE4_MOUSEPAD_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-mousepad -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-mousepad -.endif +.if !defined(XFCE4_MOUSEPAD_BUILDLINK3_MK) +XFCE4_MOUSEPAD_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-mousepad} -BUILDLINK_PACKAGES+= xfce4-mousepad -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-mousepad - -.if ${XFCE4_MOUSEPAD_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-mousepad+= xfce4-mousepad>=0.2.14nb1 BUILDLINK_PKGSRCDIR.xfce4-mousepad?= ../../editors/xfce4-mousepad -.endif # XFCE4_MOUSEPAD_BUILDLINK3_MK .include "../../x11/libxfce4gui/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_MOUSEPAD_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-mousepad diff --git a/emulators/DatLib/buildlink3.mk b/emulators/DatLib/buildlink3.mk index 191e32785c0..dde49b66d14 100644 --- a/emulators/DatLib/buildlink3.mk +++ b/emulators/DatLib/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.8 2007/02/26 00:00:32 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:32 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -DATLIB_BUILDLINK3_MK:= ${DATLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= DatLib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= DatLib -.endif +.if !defined(DATLIB_BUILDLINK3_MK) +DATLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NDatLib} -BUILDLINK_PACKAGES+= DatLib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}DatLib - -.if !empty(DATLIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.DatLib+= DatLib>=2.20 BUILDLINK_PKGSRCDIR.DatLib?= ../../emulators/DatLib -.endif # DATLIB_BUILDLINK3_MK +.endif # DATLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -DatLib diff --git a/emulators/cygwin_lib/buildlink3.mk b/emulators/cygwin_lib/buildlink3.mk index a8a17e99f08..fd0866af54c 100644 --- a/emulators/cygwin_lib/buildlink3.mk +++ b/emulators/cygwin_lib/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:49 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:32 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CYGWIN_LIB_BUILDLINK3_MK:= ${CYGWIN_LIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= cygwin_lib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= cygwin_lib -.endif +.if !defined(CYGWIN_LIB_BUILDLINK3_MK) +CYGWIN_LIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncygwin_lib} -BUILDLINK_PACKAGES+= cygwin_lib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cygwin_lib - -.if !empty(CYGWIN_LIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.cygwin_lib+= cygwin_lib>=1.5.11.1 BUILDLINK_PKGSRCDIR.cygwin_lib?= ../../emulators/cygwin_lib -.endif # CYGWIN_LIB_BUILDLINK3_MK +.endif # CYGWIN_LIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -cygwin_lib diff --git a/emulators/gpsim-devel/buildlink3.mk b/emulators/gpsim-devel/buildlink3.mk index d43784b9f52..44e869930e5 100644 --- a/emulators/gpsim-devel/buildlink3.mk +++ b/emulators/gpsim-devel/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.9 2007/01/27 10:58:30 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:33 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GPSIM_BUILDLINK3_MK:= ${GPSIM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gpsim -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gpsim -.endif +.if !defined(GPSIM_BUILDLINK3_MK) +GPSIM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngpsim} -BUILDLINK_PACKAGES+= gpsim -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gpsim - -.if !empty(GPSIM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gpsim+= gpsim>=20050905 BUILDLINK_ABI_DEPENDS.gpsim+= gpsim>=20050905nb3 BUILDLINK_PKGSRCDIR.gpsim?= ../../emulators/gpsim-devel -.endif # GPSIM_BUILDLINK3_MK .include "../../x11/gtk2/buildlink3.mk" +.endif # GPSIM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gpsim diff --git a/emulators/libspectrum/buildlink3.mk b/emulators/libspectrum/buildlink3.mk index 06643914d52..e12dd786efc 100644 --- a/emulators/libspectrum/buildlink3.mk +++ b/emulators/libspectrum/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:49 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:33 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSPECTRUM_BUILDLINK3_MK:= ${LIBSPECTRUM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libspectrum -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libspectrum -.endif +.if !defined(LIBSPECTRUM_BUILDLINK3_MK) +LIBSPECTRUM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibspectrum} -BUILDLINK_PACKAGES+= libspectrum -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libspectrum - -.if !empty(LIBSPECTRUM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libspectrum+= libspectrum>=0.2.2 BUILDLINK_ABI_DEPENDS.libspectrum+= libspectrum>=0.2.2nb2 BUILDLINK_PKGSRCDIR.libspectrum?= ../../emulators/libspectrum -.endif # LIBSPECTRUM_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../security/libgcrypt/buildlink3.mk" +.endif # LIBSPECTRUM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libspectrum diff --git a/emulators/lrmi/buildlink3.mk b/emulators/lrmi/buildlink3.mk index 5465677d726..4fa23d02e4f 100644 --- a/emulators/lrmi/buildlink3.mk +++ b/emulators/lrmi/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:49 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:33 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LRMI_BUILDLINK3_MK:= ${LRMI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= lrmi -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= lrmi -.endif +.if !defined(LRMI_BUILDLINK3_MK) +LRMI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlrmi} -BUILDLINK_PACKAGES+= lrmi -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lrmi - -.if !empty(LRMI_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.lrmi+= lrmi>=0.8nb1 BUILDLINK_PKGSRCDIR.lrmi?= ../../emulators/lrmi -.endif # LRMI_BUILDLINK3_MK +.endif # LRMI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -lrmi diff --git a/emulators/wine-devel/buildlink3.mk b/emulators/wine-devel/buildlink3.mk index be31710e53c..6dabcbe8644 100644 --- a/emulators/wine-devel/buildlink3.mk +++ b/emulators/wine-devel/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:33 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -WINE_BUILDLINK3_MK:= ${WINE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= wine -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= wine -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nwine} -BUILDLINK_PACKAGES+= wine -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wine +.if !defined(WINE_BUILDLINK3_MK) +WINE_BUILDLINK3_MK:= -.if ${WINE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.wine+= wine>=0.9.6nb1 BUILDLINK_PKGSRCDIR.wine?= ../../emulators/wine -.endif # WINE_BUILDLINK3_MK pkgbase:= wine .include "../../mk/pkg-build-options.mk" @@ -26,5 +18,6 @@ pkgbase:= wine .endif .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" +.endif # WINE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -wine diff --git a/emulators/wine/buildlink3.mk b/emulators/wine/buildlink3.mk index 61a01cd16a2..25398b5dadc 100644 --- a/emulators/wine/buildlink3.mk +++ b/emulators/wine/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.13 2007/03/18 11:11:09 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:33 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -WINE_BUILDLINK3_MK:= ${WINE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= wine -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= wine -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nwine} -BUILDLINK_PACKAGES+= wine -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wine +.if !defined(WINE_BUILDLINK3_MK) +WINE_BUILDLINK3_MK:= -.if ${WINE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.wine+= wine>=0.9.6nb1 BUILDLINK_PKGSRCDIR.wine?= ../../emulators/wine -.endif # WINE_BUILDLINK3_MK pkgbase:= wine .include "../../mk/pkg-build-options.mk" @@ -26,5 +18,6 @@ pkgbase:= wine .endif .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" +.endif # WINE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -wine diff --git a/filesystems/fuse/buildlink3.mk b/filesystems/fuse/buildlink3.mk index 1b66385ff3a..87cf0ce92e8 100644 --- a/filesystems/fuse/buildlink3.mk +++ b/filesystems/fuse/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/02/08 11:53:06 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:33 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FUSEFS_BUILDLINK3_MK:= ${FUSEFS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= fuse -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= fuse -.endif +.if !defined(FUSEFS_BUILDLINK3_MK) +FUSEFS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfuse} -BUILDLINK_PACKAGES+= fuse -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fuse - -.if ${FUSEFS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.fuse+= fuse>=2.5.2 BUILDLINK_PKGSRCDIR.fuse?= ../../filesystems/fuse -.endif # FUSEFS_BUILDLINK3_MK +.endif # FUSEFS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -fuse diff --git a/filesystems/py-fuse-bindings/buildlink3.mk b/filesystems/py-fuse-bindings/buildlink3.mk index c82a43c1926..212a7e24f69 100644 --- a/filesystems/py-fuse-bindings/buildlink3.mk +++ b/filesystems/py-fuse-bindings/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/04/25 22:16:20 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:33 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_FUSE_BINDINGS_BUILDLINK3_MK:= ${PY_FUSE_BINDINGS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= py-fuse-bindings -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= py-fuse-bindings -.endif +.if !defined(PY_FUSE_BINDINGS_BUILDLINK3_MK) +PY_FUSE_BINDINGS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-fuse-bindings} -BUILDLINK_PACKAGES+= py-fuse-bindings -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-fuse-bindings - -.if ${PY_FUSE_BINDINGS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.py-fuse-bindings+= ${PYPKGPREFIX}-fuse-bindings>=0.2pre1 BUILDLINK_PKGSRCDIR.py-fuse-bindings?= ../../filesystems/py-fuse-bindings -.endif # PY_FUSE_BINDINGS_BUILDLINK3_MK +.endif # PY_FUSE_BINDINGS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -py-fuse-bindings diff --git a/finance/gnucash/buildlink3.mk b/finance/gnucash/buildlink3.mk index beca5d9ba65..16c49b2cd12 100644 --- a/finance/gnucash/buildlink3.mk +++ b/finance/gnucash/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.11 2008/10/28 11:30:42 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:33 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNUCASH_BUILDLINK3_MK:= ${GNUCASH_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnucash -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= gnucash -.endif +.if !defined(GNUCASH_BUILDLINK3_MK) +GNUCASH_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnucash} -BUILDLINK_PACKAGES+= gnucash -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnucash - -.if ${GNUCASH_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.gnucash+= gnucash>=2.1.0 BUILDLINK_ABI_DEPENDS.gnucash?= gnucash>=2.2.3nb2 BUILDLINK_PKGSRCDIR.gnucash?= ../../finance/gnucash -.endif # GNUCASH_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" +.endif # GNUCASH_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnucash diff --git a/finance/libofx/buildlink3.mk b/finance/libofx/buildlink3.mk index 219ebe6f37d..855244ab0ab 100644 --- a/finance/libofx/buildlink3.mk +++ b/finance/libofx/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/09/03 13:02:17 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:33 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBOFX_BUILDLINK3_MK:= ${LIBOFX_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libofx -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libofx -.endif +.if !defined(LIBOFX_BUILDLINK3_MK) +LIBOFX_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibofx} -BUILDLINK_PACKAGES+= libofx -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libofx - -.if !empty(LIBOFX_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libofx+= libofx>=0.8.0 BUILDLINK_PKGSRCDIR.libofx?= ../../finance/libofx BUILDLINK_INCDIRS.libofx+= include/libofx -.endif # LIBOFX_BUILDLINK3_MK .include "../../textproc/opensp/buildlink3.mk" +.endif # LIBOFX_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libofx diff --git a/fonts/Xft2/buildlink3.mk b/fonts/Xft2/buildlink3.mk index 9e072c839ab..54d23c7ae5a 100644 --- a/fonts/Xft2/buildlink3.mk +++ b/fonts/Xft2/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.19 2006/12/15 20:32:55 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2009/03/20 19:24:33 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFT2_BUILDLINK3_MK:= ${XFT2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= Xft2 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= Xft2 -.endif +.if !defined(XFT2_BUILDLINK3_MK) +XFT2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXft2} -BUILDLINK_PACKAGES+= Xft2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Xft2 - -.if !empty(XFT2_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1 BUILDLINK_ABI_DEPENDS.Xft2+= Xft2>=2.1.7nb2 BUILDLINK_PKGSRCDIR.Xft2?= ../../fonts/Xft2 -.endif # XFT2_BUILDLINK3_MK .include "../../fonts/fontconfig/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" +.endif # XFT2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -Xft2 diff --git a/fonts/font-util/buildlink3.mk b/fonts/font-util/buildlink3.mk index 7c276338896..0146f6f57f4 100644 --- a/fonts/font-util/buildlink3.mk +++ b/fonts/font-util/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/14 20:15:05 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:34 joerg Exp $ BUILDLINK_DEPMETHOD.font-util?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FONT_UTIL_BUILDLINK3_MK:= ${FONT_UTIL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= font-util -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= font-util -.endif +.if !defined(FONT_UTIL_BUILDLINK3_MK) +FONT_UTIL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfont-util} -BUILDLINK_PACKAGES+= font-util -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}font-util - -.if ${FONT_UTIL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.font-util+= font-util>=1.0.1 BUILDLINK_PKGSRCDIR.font-util?= ../../fonts/font-util -.endif # FONT_UTIL_BUILDLINK3_MK +.endif # FONT_UTIL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -font-util diff --git a/fonts/fontconfig/buildlink3.mk b/fonts/fontconfig/buildlink3.mk index 4bce66fa107..28d8c7b391f 100644 --- a/fonts/fontconfig/buildlink3.mk +++ b/fonts/fontconfig/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.25 2007/10/16 18:12:56 reed Exp $ +# $NetBSD: buildlink3.mk,v 1.26 2009/03/20 19:24:34 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FONTCONFIG_BUILDLINK3_MK:= ${FONTCONFIG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= fontconfig -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= fontconfig -.endif +.if !defined(FONTCONFIG_BUILDLINK3_MK) +FONTCONFIG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfontconfig} -BUILDLINK_PACKAGES+= fontconfig -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fontconfig - -.if !empty(FONTCONFIG_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.4.2 BUILDLINK_PKGSRCDIR.fontconfig?= ../../fonts/fontconfig -.endif # FONTCONFIG_BUILDLINK3_MK .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" +.endif # FONTCONFIG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -fontconfig diff --git a/fonts/gucharmap/buildlink3.mk b/fonts/gucharmap/buildlink3.mk index 5d10f5f3a60..9f190c12841 100644 --- a/fonts/gucharmap/buildlink3.mk +++ b/fonts/gucharmap/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.22 2009/03/15 19:42:26 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.23 2009/03/20 19:24:34 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GUCHARMAP_BUILDLINK3_MK:= ${GUCHARMAP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gucharmap -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gucharmap -.endif +.if !defined(GUCHARMAP_BUILDLINK3_MK) +GUCHARMAP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngucharmap} -BUILDLINK_PACKAGES+= gucharmap -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gucharmap - -.if !empty(GUCHARMAP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gucharmap+= gucharmap>=2.24.1 BUILDLINK_PKGSRCDIR.gucharmap?= ../../fonts/gucharmap -.endif # GUCHARMAP_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # GUCHARMAP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gucharmap diff --git a/fonts/libfontenc/buildlink3.mk b/fonts/libfontenc/buildlink3.mk index d1ff58bd825..e04a6bb5fcb 100644 --- a/fonts/libfontenc/buildlink3.mk +++ b/fonts/libfontenc/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.3 2007/06/30 03:06:58 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:34 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBFONTENC_BUILDLINK3_MK:= ${LIBFONTENC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libfontenc -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libfontenc -.endif +.if !defined(LIBFONTENC_BUILDLINK3_MK) +LIBFONTENC_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibfontenc} -BUILDLINK_PACKAGES+= libfontenc -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libfontenc - -.if ${LIBFONTENC_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libfontenc+= libfontenc>=0.99 BUILDLINK_PKGSRCDIR.libfontenc?= ../../fonts/libfontenc -.endif # LIBFONTENC_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" +.endif # LIBFONTENC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libfontenc diff --git a/fonts/mftrace/buildlink3.mk b/fonts/mftrace/buildlink3.mk index 85cd1b69168..c95060b5b6f 100644 --- a/fonts/mftrace/buildlink3.mk +++ b/fonts/mftrace/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:49 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:34 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MFTRACE_BUILDLINK3_MK:= ${MFTRACE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= mftrace -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= mftrace -.endif +.if !defined(MFTRACE_BUILDLINK3_MK) +MFTRACE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmftrace} -BUILDLINK_PACKAGES+= mftrace -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mftrace - -.if !empty(MFTRACE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.mftrace+= mftrace>=1.0.19 BUILDLINK_ABI_DEPENDS.mftrace?= mftrace>=1.1.1nb3 BUILDLINK_PKGSRCDIR.mftrace?= ../../fonts/mftrace -.endif # MFTRACE_BUILDLINK3_MK +.endif # MFTRACE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -mftrace diff --git a/fonts/t1lib/buildlink3.mk b/fonts/t1lib/buildlink3.mk index 384aef2a6b0..c6b464a03db 100644 --- a/fonts/t1lib/buildlink3.mk +++ b/fonts/t1lib/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:49 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:34 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -T1LIB_BUILDLINK3_MK:= ${T1LIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= t1lib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= t1lib -.endif +.if !defined(T1LIB_BUILDLINK3_MK) +T1LIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nt1lib} -BUILDLINK_PACKAGES+= t1lib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}t1lib - -.if !empty(T1LIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.t1lib+= t1lib>=5.0.1 BUILDLINK_ABI_DEPENDS.t1lib+= t1lib>=5.1.0nb5 BUILDLINK_PKGSRCDIR.t1lib?= ../../fonts/t1lib -.endif # T1LIB_BUILDLINK3_MK +.endif # T1LIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -t1lib diff --git a/games/ggz-client-libs/buildlink3.mk b/games/ggz-client-libs/buildlink3.mk index 6a0e83b07e3..75e43e94382 100644 --- a/games/ggz-client-libs/buildlink3.mk +++ b/games/ggz-client-libs/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/04/25 23:24:49 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:34 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GGZ_CLIENT_LIBS_BUILDLINK3_MK:= ${GGZ_CLIENT_LIBS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ggz-client-libs -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= ggz-client-libs -.endif +.if !defined(GGZ_CLIENT_LIBS_BUILDLINK3_MK) +GGZ_CLIENT_LIBS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nggz-client-libs} -BUILDLINK_PACKAGES+= ggz-client-libs -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ggz-client-libs - -.if ${GGZ_CLIENT_LIBS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.ggz-client-libs+= ggz-client-libs>=0.0.14.1 BUILDLINK_PKGSRCDIR.ggz-client-libs?= ../../games/ggz-client-libs -.endif # GGZ_CLIENT_LIBS_BUILDLINK3_MK .include "../../games/libggz/buildlink3.mk" +.endif # GGZ_CLIENT_LIBS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ggz-client-libs diff --git a/games/kdegames3/buildlink3.mk b/games/kdegames3/buildlink3.mk index ded6a7ba7bc..73577d59c7c 100644 --- a/games/kdegames3/buildlink3.mk +++ b/games/kdegames3/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.14 2008/01/18 05:06:35 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:34 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -KDEGAMES_BUILDLINK3_MK:= ${KDEGAMES_BUILDLINK3_MK}+ +BUILDLINK_TREE+= kdegames -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= kdegames -.endif +.if !defined(KDEGAMES_BUILDLINK3_MK) +KDEGAMES_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkdegames} -BUILDLINK_PACKAGES+= kdegames -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kdegames - -.if !empty(KDEGAMES_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.kdegames+= kdegames>=3.5.0nb1 BUILDLINK_ABI_DEPENDS.kdegames?= kdegames>=3.5.8nb2 BUILDLINK_PKGSRCDIR.kdegames?= ../../games/kdegames3 -.endif # KDEGAMES_BUILDLINK3_MK .include "../../x11/kdebase3/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" +.endif # KDEGAMES_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -kdegames diff --git a/games/libggz/buildlink3.mk b/games/libggz/buildlink3.mk index 38ab48d6e1b..c5fee5f314e 100644 --- a/games/libggz/buildlink3.mk +++ b/games/libggz/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/04/25 23:09:44 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:34 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGGZ_BUILDLINK3_MK:= ${LIBGGZ_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libggz -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libggz -.endif +.if !defined(LIBGGZ_BUILDLINK3_MK) +LIBGGZ_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibggz} -BUILDLINK_PACKAGES+= libggz -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libggz - -.if ${LIBGGZ_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libggz+= libggz>=0.0.14.1 BUILDLINK_PKGSRCDIR.libggz?= ../../games/libggz -.endif # LIBGGZ_BUILDLINK3_MK .include "../../security/gnutls/buildlink3.mk" +.endif # LIBGGZ_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libggz diff --git a/games/plib/buildlink3.mk b/games/plib/buildlink3.mk index 87ba9493164..9d8c99d45da 100644 --- a/games/plib/buildlink3.mk +++ b/games/plib/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:49 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:34 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PLIB_BUILDLINK3_MK:= ${PLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= plib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= plib -.endif +.if !defined(PLIB_BUILDLINK3_MK) +PLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nplib} -BUILDLINK_PACKAGES+= plib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}plib - -.if !empty(PLIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.plib+= plib>=1.6.0 BUILDLINK_ABI_DEPENDS.plib?= plib>=1.6.0nb3 BUILDLINK_PKGSRCDIR.plib?= ../../games/plib BUILDLINK_DEPMETHOD.plib?= build -.endif # PLIB_BUILDLINK3_MK .include "../../graphics/Mesa/buildlink3.mk" +.endif # PLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -plib diff --git a/games/simgear/buildlink3.mk b/games/simgear/buildlink3.mk index 8d9628ef6e7..3e429368058 100644 --- a/games/simgear/buildlink3.mk +++ b/games/simgear/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/03/05 21:17:42 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:35 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SIMGEAR_BUILDLINK3_MK:= ${SIMGEAR_BUILDLINK3_MK}+ +BUILDLINK_TREE+= simgear -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= simgear -.endif +.if !defined(SIMGEAR_BUILDLINK3_MK) +SIMGEAR_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsimgear} -BUILDLINK_PACKAGES+= simgear -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}simgear - -.if ${SIMGEAR_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.simgear+= simgear>=1.0.0 BUILDLINK_PKGSRCDIR.simgear?= ../../games/simgear BUILDLINK_DEPMETHOD.simgear?= build -.endif # SIMGEAR_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" .include "../../games/plib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" +.endif # SIMGEAR_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -simgear diff --git a/geography/gdal-lib/buildlink3.mk b/geography/gdal-lib/buildlink3.mk index 8979ec0e79e..0a170566c51 100644 --- a/geography/gdal-lib/buildlink3.mk +++ b/geography/gdal-lib/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.9 2008/02/16 01:29:00 gdt Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:35 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GDAL_LIB_BUILDLINK3_MK:= ${GDAL_LIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gdal-lib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gdal-lib -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngdal-lib} -BUILDLINK_PACKAGES+= gdal-lib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gdal-lib +.if !defined(GDAL_LIB_BUILDLINK3_MK) +GDAL_LIB_BUILDLINK3_MK:= -.if !empty(GDAL_LIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gdal-lib+= gdal-lib>=1.3.1 BUILDLINK_ABI_DEPENDS.gdal-lib?= gdal-lib>=1.4.0nb4 BUILDLINK_PKGSRCDIR.gdal-lib?= ../../geography/gdal-lib -.endif # GDAL_LIB_BUILDLINK3_MK pkgbase := gdal-lib .include "../../mk/pkg-build-options.mk" @@ -32,5 +24,6 @@ pkgbase := gdal-lib .include "../../geography/geos/buildlink3.mk" .include "../../textproc/xerces-c/buildlink3.mk" .include "../../www/curl/buildlink3.mk" +.endif # GDAL_LIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gdal-lib diff --git a/geography/geos/buildlink3.mk b/geography/geos/buildlink3.mk index 440546f2715..2a6e7f093bc 100644 --- a/geography/geos/buildlink3.mk +++ b/geography/geos/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2008/02/16 01:29:00 gdt Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:35 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GEOS_BUILDLINK3_MK:= ${GEOS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= geos -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= geos -.endif +.if !defined(GEOS_BUILDLINK3_MK) +GEOS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngeos} -BUILDLINK_PACKAGES+= geos -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}geos - -.if !empty(GEOS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.geos+= geos>=2.2.3 BUILDLINK_ABI_DEPENDS.geos?= geos>=3.0.0 BUILDLINK_PKGSRCDIR.geos?= ../../geography/geos -.endif # GEOS_BUILDLINK3_MK +.endif # GEOS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -geos diff --git a/geography/gpsd/buildlink3.mk b/geography/gpsd/buildlink3.mk index bc63dc409b7..32779b69654 100644 --- a/geography/gpsd/buildlink3.mk +++ b/geography/gpsd/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1 2009/03/10 23:12:29 gdt Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:35 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GPSD_BUILDLINK3_MK:= ${GPSD_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gpsd -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= gpsd -.endif +.if !defined(GPSD_BUILDLINK3_MK) +GPSD_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngpsd} -BUILDLINK_PACKAGES+= gpsd -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gpsd - -.if ${GPSD_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.gpsd+= gpsd>=2.37nb1 BUILDLINK_PKGSRCDIR.gpsd?= ../../geography/gpsd -.endif # GPSD_BUILDLINK3_MK +.endif # GPSD_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gpsd diff --git a/geography/shapelib/buildlink3.mk b/geography/shapelib/buildlink3.mk index b5b15d4af53..33c641f5ec8 100644 --- a/geography/shapelib/buildlink3.mk +++ b/geography/shapelib/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:50 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:35 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SHAPELIB_BUILDLINK3_MK:= ${SHAPELIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= shapelib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= shapelib -.endif +.if !defined(SHAPELIB_BUILDLINK3_MK) +SHAPELIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nshapelib} -BUILDLINK_PACKAGES+= shapelib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}shapelib - -.if !empty(SHAPELIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.shapelib+= shapelib>=1.2.10 BUILDLINK_PKGSRCDIR.shapelib?= ../../geography/shapelib -.endif # SHAPELIB_BUILDLINK3_MK +.endif # SHAPELIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -shapelib diff --git a/graphics/Coin/buildlink3.mk b/graphics/Coin/buildlink3.mk index eb155bbe302..58f9fcba565 100644 --- a/graphics/Coin/buildlink3.mk +++ b/graphics/Coin/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.11 2007/03/08 13:39:20 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:35 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -COIN_BUILDLINK3_MK:= ${COIN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= Coin -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= Coin -.endif +.if !defined(COIN_BUILDLINK3_MK) +COIN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NCoin} -BUILDLINK_PACKAGES+= Coin -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Coin - -.if ${COIN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.Coin+= Coin>=2.2.1 BUILDLINK_ABI_DEPENDS.Coin+= Coin>=2.4.4nb3 BUILDLINK_PKGSRCDIR.Coin?= ../../graphics/Coin @@ -20,7 +13,6 @@ BUILDLINK_PKGSRCDIR.Coin?= ../../graphics/Coin .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" - .endif # COIN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -Coin diff --git a/graphics/GLXKit/buildlink3.mk b/graphics/GLXKit/buildlink3.mk index 20750752a3a..651bad9e02b 100644 --- a/graphics/GLXKit/buildlink3.mk +++ b/graphics/GLXKit/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.10 2008/01/18 05:06:37 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:35 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GLXKIT_BUILDLINK3_MK:= ${GLXKIT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= GLXKit -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= GLXKit -.endif +.if !defined(GLXKIT_BUILDLINK3_MK) +GLXKIT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGLXKit} -BUILDLINK_PACKAGES+= GLXKit -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}GLXKit - -.if !empty(GLXKIT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.GLXKit+= GLXKit>=0.3.1r2nb3 BUILDLINK_ABI_DEPENDS.GLXKit?= GLXKit>=0.3.1r2nb12 BUILDLINK_PKGSRCDIR.GLXKit?= ../../graphics/GLXKit -.endif # GLXKIT_BUILDLINK3_MK .include "../../graphics/RenderKit/buildlink3.mk" +.endif # GLXKIT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -GLXKit diff --git a/graphics/GUIlib/buildlink3.mk b/graphics/GUIlib/buildlink3.mk index 90fe5fc9e1d..b1a9048c48b 100644 --- a/graphics/GUIlib/buildlink3.mk +++ b/graphics/GUIlib/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:50 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:35 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GUILIB_BUILDLINK3_MK:= ${GUILIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= GUIlib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= GUIlib -.endif +.if !defined(GUILIB_BUILDLINK3_MK) +GUILIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGUIlib} -BUILDLINK_PACKAGES+= GUIlib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}GUIlib - -.if !empty(GUILIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.GUIlib+= GUIlib>=1.1.0nb2 BUILDLINK_ABI_DEPENDS.GUIlib+= GUIlib>=1.1.0nb7 BUILDLINK_PKGSRCDIR.GUIlib?= ../../graphics/GUIlib -.endif # GUILIB_BUILDLINK3_MK .include "../../devel/SDL/buildlink3.mk" +.endif # GUILIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -GUIlib diff --git a/graphics/GeometryKit/buildlink3.mk b/graphics/GeometryKit/buildlink3.mk index f88f0bcbc29..d6ea700b480 100644 --- a/graphics/GeometryKit/buildlink3.mk +++ b/graphics/GeometryKit/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.10 2008/01/18 05:06:37 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:35 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GEOMETRYKIT_BUILDLINK3_MK:= ${GEOMETRYKIT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= GeometryKit -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= GeometryKit -.endif +.if !defined(GEOMETRYKIT_BUILDLINK3_MK) +GEOMETRYKIT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGeometryKit} -BUILDLINK_PACKAGES+= GeometryKit -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}GeometryKit - -.if !empty(GEOMETRYKIT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.GeometryKit+= GeometryKit>=0.3.1r2nb3 BUILDLINK_ABI_DEPENDS.GeometryKit?= GeometryKit>=0.3.1r2nb12 BUILDLINK_PKGSRCDIR.GeometryKit?= ../../graphics/GeometryKit -.endif # GEOMETRYKIT_BUILDLINK3_MK .include "../../x11/gnustep-back/buildlink3.mk" +.endif # GEOMETRYKIT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -GeometryKit diff --git a/graphics/GlutKit/buildlink3.mk b/graphics/GlutKit/buildlink3.mk index 92ed45a6a66..f19fa09b159 100644 --- a/graphics/GlutKit/buildlink3.mk +++ b/graphics/GlutKit/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.10 2008/01/18 05:06:38 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:35 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GLUTKIT_BUILDLINK3_MK:= ${GLUTKIT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= GlutKit -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= GlutKit -.endif +.if !defined(GLUTKIT_BUILDLINK3_MK) +GLUTKIT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGlutKit} -BUILDLINK_PACKAGES+= GlutKit -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}GlutKit - -.if !empty(GLUTKIT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.GlutKit+= GlutKit>=0.3.1r2nb4 BUILDLINK_ABI_DEPENDS.GlutKit?= GlutKit>=0.3.1r2nb14 BUILDLINK_PKGSRCDIR.GlutKit?= ../../graphics/GlutKit -.endif # GLUTKIT_BUILDLINK3_MK .include "../../graphics/RenderKit/buildlink3.mk" .include "../../graphics/glut/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" +.endif # GLUTKIT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -GlutKit diff --git a/graphics/GraphicsMagick/buildlink3.mk b/graphics/GraphicsMagick/buildlink3.mk index 988c2afe35b..eadc1692986 100644 --- a/graphics/GraphicsMagick/buildlink3.mk +++ b/graphics/GraphicsMagick/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2008/11/10 11:24:27 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:36 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GRAPHICSMAGICK_BUILDLINK3_MK:= ${GRAPHICSMAGICK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= GraphicsMagick -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= GraphicsMagick -.endif +.if !defined(GRAPHICSMAGICK_BUILDLINK3_MK) +GRAPHICSMAGICK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGraphicsMagick} -BUILDLINK_PACKAGES+= GraphicsMagick -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}GraphicsMagick - -.if ${GRAPHICSMAGICK_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.GraphicsMagick+= GraphicsMagick>=1.2 BUILDLINK_ABI_DEPENDS.GraphicsMagick?= GraphicsMagick>=1.3 BUILDLINK_PKGSRCDIR.GraphicsMagick?= ../../graphics/GraphicsMagick -.endif # GRAPHICSMAGICK_BUILDLINK3_MK .include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" @@ -33,5 +25,6 @@ BUILDLINK_PKGSRCDIR.GraphicsMagick?= ../../graphics/GraphicsMagick .include "../../x11/libXext/buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.endif # GRAPHICSMAGICK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -GraphicsMagick diff --git a/graphics/ImageMagick/buildlink3.mk b/graphics/ImageMagick/buildlink3.mk index 4697cd2628f..da4e41b972c 100644 --- a/graphics/ImageMagick/buildlink3.mk +++ b/graphics/ImageMagick/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.22 2009/01/13 12:55:30 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.23 2009/03/20 19:24:36 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -IMAGEMAGICK_BUILDLINK3_MK:= ${IMAGEMAGICK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ImageMagick -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ImageMagick -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NImageMagick} -BUILDLINK_PACKAGES+= ImageMagick -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ImageMagick +.if !defined(IMAGEMAGICK_BUILDLINK3_MK) +IMAGEMAGICK_BUILDLINK3_MK:= -.if !empty(IMAGEMAGICK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ImageMagick+= ImageMagick>=5.5.7.11nb1 BUILDLINK_ABI_DEPENDS.ImageMagick+= ImageMagick>=6.3.1.6nb1 BUILDLINK_PKGSRCDIR.ImageMagick?= ../../graphics/ImageMagick -.endif # IMAGEMAGICK_BUILDLINK3_MK pkgbase := ImageMagick .include "../../mk/pkg-build-options.mk" @@ -38,5 +30,6 @@ pkgbase := ImageMagick .include "../../graphics/tiff/buildlink3.mk" .include "../../devel/libltdl/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.endif # IMAGEMAGICK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ImageMagick diff --git a/graphics/MesaLib/buildlink3.mk b/graphics/MesaLib/buildlink3.mk index 1044f72bbec..c1c23e96505 100644 --- a/graphics/MesaLib/buildlink3.mk +++ b/graphics/MesaLib/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.46 2008/05/15 19:46:47 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.47 2009/03/20 19:24:36 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MESALIB_BUILDLINK3_MK:= ${MESALIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= MesaLib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= MesaLib -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NMesaLib} -BUILDLINK_PACKAGES+= MesaLib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}MesaLib +.if !defined(MESALIB_BUILDLINK3_MK) +MESALIB_BUILDLINK3_MK:= -.if !empty(MESALIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=3.4.2 BUILDLINK_ABI_DEPENDS.MesaLib+= MesaLib>=7.0.3 BUILDLINK_PKGSRCDIR.MesaLib?= ../../graphics/MesaLib @@ -30,12 +23,11 @@ pkgbase:= MesaLib . include "../../graphics/MesaLib/dri.mk" .endif -.endif # MESALIB_BUILDLINK3_MK - .if !empty(MACHINE_PLATFORM:MNetBSD-[12].*) .include "../../devel/pthread-stublib/buildlink3.mk" .endif .include "../../x11/libXext/buildlink3.mk" +.endif # MESALIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -MesaLib diff --git a/graphics/MesaLib/builtin.mk b/graphics/MesaLib/builtin.mk index f2a3808be25..59f7bb2d230 100644 --- a/graphics/MesaLib/builtin.mk +++ b/graphics/MesaLib/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.16 2009/02/03 08:35:13 obache Exp $ +# $NetBSD: builtin.mk,v 1.17 2009/03/20 19:24:36 joerg Exp $ BUILTIN_PKG:= MesaLib @@ -68,15 +68,11 @@ CHECK_BUILTIN.MesaLib?= no .if !empty(CHECK_BUILTIN.MesaLib:M[nN][oO]) . if !empty(USE_BUILTIN.MesaLib:M[nN][oO]) -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ . include "../../mk/pthread.buildlink3.mk" . include "../../mk/pthread.builtin.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} BUILTIN_PKG:= MesaLib . endif -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ . include "../../mk/x11.builtin.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} .endif # CHECK_BUILTIN.MesaLib diff --git a/graphics/OpenRM/buildlink3.mk b/graphics/OpenRM/buildlink3.mk index d7b18e6d1b1..c533ab6e8ea 100644 --- a/graphics/OpenRM/buildlink3.mk +++ b/graphics/OpenRM/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.12 2007/02/15 14:58:19 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:36 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OPENRM_BUILDLINK3_MK:= ${OPENRM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= OpenRM -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= OpenRM -.endif +.if !defined(OPENRM_BUILDLINK3_MK) +OPENRM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NOpenRM} -BUILDLINK_PACKAGES+= OpenRM -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}OpenRM - -.if !empty(OPENRM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.OpenRM+= OpenRM>=1.5.1 BUILDLINK_ABI_DEPENDS.OpenRM?= OpenRM>=1.5.2nb3 BUILDLINK_PKGSRCDIR.OpenRM?= ../../graphics/OpenRM -.endif # OPENRM_BUILDLINK3_MK .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../x11/libXmu/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.endif # OPENRM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -OpenRM diff --git a/graphics/RenderKit/buildlink3.mk b/graphics/RenderKit/buildlink3.mk index 5f88357ac05..158e7dd0f31 100644 --- a/graphics/RenderKit/buildlink3.mk +++ b/graphics/RenderKit/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.10 2008/01/18 05:06:38 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:36 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -RENDERKIT_BUILDLINK3_MK:= ${RENDERKIT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= RenderKit -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= RenderKit -.endif +.if !defined(RENDERKIT_BUILDLINK3_MK) +RENDERKIT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NRenderKit} -BUILDLINK_PACKAGES+= RenderKit -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}RenderKit - -.if !empty(RENDERKIT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.RenderKit+= RenderKit>=0.3.1r2nb3 BUILDLINK_ABI_DEPENDS.RenderKit?= RenderKit>=0.3.1r2nb12 BUILDLINK_PKGSRCDIR.RenderKit?= ../../graphics/RenderKit -.endif # RENDERKIT_BUILDLINK3_MK .include "../../graphics/GeometryKit/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" +.endif # RENDERKIT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -RenderKit diff --git a/graphics/SDLKit/buildlink3.mk b/graphics/SDLKit/buildlink3.mk index 6fecee921e8..0229d935a68 100644 --- a/graphics/SDLKit/buildlink3.mk +++ b/graphics/SDLKit/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.12 2008/01/18 05:06:38 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:36 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SDLKIT_BUILDLINK3_MK:= ${SDLKIT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= SDLKit -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= SDLKit -.endif +.if !defined(SDLKIT_BUILDLINK3_MK) +SDLKIT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDLKit} -BUILDLINK_PACKAGES+= SDLKit -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}SDLKit - -.if !empty(SDLKIT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.SDLKit+= SDLKit>=0.3.1r2nb5 BUILDLINK_ABI_DEPENDS.SDLKit?= SDLKit>=0.3.1r2nb17 BUILDLINK_PKGSRCDIR.SDLKit?= ../../graphics/SDLKit -.endif # SDLKIT_BUILDLINK3_MK .include "../../devel/SDL/buildlink3.mk" .include "../../graphics/RenderKit/buildlink3.mk" +.endif # SDLKIT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -SDLKit diff --git a/graphics/SDL_image/buildlink3.mk b/graphics/SDL_image/buildlink3.mk index 83af44a56a1..d2b743e014a 100644 --- a/graphics/SDL_image/buildlink3.mk +++ b/graphics/SDL_image/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.17 2006/07/08 23:10:50 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:24:36 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SDL_IMAGE_BUILDLINK3_MK:= ${SDL_IMAGE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= SDL_image -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= SDL_image -.endif +.if !defined(SDL_IMAGE_BUILDLINK3_MK) +SDL_IMAGE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDL_image} -BUILDLINK_PACKAGES+= SDL_image -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}SDL_image - -.if !empty(SDL_IMAGE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.SDL_image+= SDL_image>=1.2.3nb1 BUILDLINK_ABI_DEPENDS.SDL_image+= SDL_image>=1.2.5 BUILDLINK_PKGSRCDIR.SDL_image?= ../../graphics/SDL_image BUILDLINK_INCDIRS.SDL_image?= include/SDL -.endif # SDL_IMAGE_BUILDLINK3_MK .include "../../devel/SDL/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" +.endif # SDL_IMAGE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -SDL_image diff --git a/graphics/aalib/buildlink3.mk b/graphics/aalib/buildlink3.mk index c73ec32fd38..3989e38275e 100644 --- a/graphics/aalib/buildlink3.mk +++ b/graphics/aalib/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.11 2007/05/30 08:54:30 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:36 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -AALIB_BUILDLINK3_MK:= ${AALIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= aalib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= aalib -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Naalib} -BUILDLINK_PACKAGES+= aalib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}aalib +.if !defined(AALIB_BUILDLINK3_MK) +AALIB_BUILDLINK3_MK:= -.if !empty(AALIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.aalib+= aalib>=1.4.0.4 BUILDLINK_ABI_DEPENDS.aalib+= aalib>=1.4.0.5nb2 BUILDLINK_PKGSRCDIR.aalib?= ../../graphics/aalib -.endif # AALIB_BUILDLINK3_MK pkgbase := aalib .include "../../mk/pkg-build-options.mk" @@ -31,5 +23,6 @@ pkgbase := aalib .if !empty(PKG_BUILD_OPTIONS.aalib:Mx11) . include "../../x11/libX11/buildlink3.mk" .endif +.endif # AALIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -aalib diff --git a/graphics/agg/buildlink3.mk b/graphics/agg/buildlink3.mk index 337cb49abf7..26e0580757a 100644 --- a/graphics/agg/buildlink3.mk +++ b/graphics/agg/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/04/27 06:41:08 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:36 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -AGG_BUILDLINK3_MK:= ${AGG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= agg -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= agg -.endif +.if !defined(AGG_BUILDLINK3_MK) +AGG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nagg} -BUILDLINK_PACKAGES+= agg -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}agg - -.if ${AGG_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.agg+= agg>=2.5 BUILDLINK_PKGSRCDIR.agg?= ../../graphics/agg -.endif # AGG_BUILDLINK3_MK .include "../../graphics/freetype2/buildlink3.mk" +.endif # AGG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -agg diff --git a/graphics/babl/buildlink3.mk b/graphics/babl/buildlink3.mk index b0d416ebe97..5a17e572f72 100644 --- a/graphics/babl/buildlink3.mk +++ b/graphics/babl/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/08/19 17:51:14 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:36 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BABL_BUILDLINK3_MK:= ${BABL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= babl -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= babl -.endif +.if !defined(BABL_BUILDLINK3_MK) +BABL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbabl} -BUILDLINK_PACKAGES+= babl -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}babl - -.if ${BABL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.babl+= babl>=0.0.22 BUILDLINK_PKGSRCDIR.babl?= ../../graphics/babl -.endif # BABL_BUILDLINK3_MK .include "../../mk/dlopen.buildlink3.mk" +.endif # BABL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -babl diff --git a/graphics/cairo/buildlink3.mk b/graphics/cairo/buildlink3.mk index a0c1b245d01..2fbbbf15ff5 100644 --- a/graphics/cairo/buildlink3.mk +++ b/graphics/cairo/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.30 2008/10/17 13:00:44 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.31 2009/03/20 19:24:37 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CAIRO_BUILDLINK3_MK:= ${CAIRO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= cairo -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= cairo -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncairo} -BUILDLINK_PACKAGES+= cairo -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cairo +.if !defined(CAIRO_BUILDLINK3_MK) +CAIRO_BUILDLINK3_MK:= -.if ${CAIRO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.cairo+= cairo>=1.0.0nb2 BUILDLINK_ABI_DEPENDS.cairo+= cairo>=1.6.4 BUILDLINK_PKGSRCDIR.cairo?= ../../graphics/cairo @@ -19,7 +12,6 @@ BUILDLINK_PKGSRCDIR.cairo?= ../../graphics/cairo BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8 BUILDLINK_API_DEPENDS.glitz+= glitz>=0.5.1 BUILDLINK_API_DEPENDS.pixman+= pixman>=0.12.0 -.endif # CAIRO_BUILDLINK3_MK .include "../../mk/bsd.fast.prefs.mk" @@ -35,5 +27,6 @@ pkgbase := cairo .include "../../graphics/glitz/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/pixman/buildlink3.mk" +.endif # CAIRO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -cairo diff --git a/graphics/cairomm/buildlink3.mk b/graphics/cairomm/buildlink3.mk index 97919cbb172..f6367959c8f 100644 --- a/graphics/cairomm/buildlink3.mk +++ b/graphics/cairomm/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/09/06 19:56:40 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:37 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CAIROMM_BUILDLINK3_MK:= ${CAIROMM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= cairomm -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= cairomm -.endif +.if !defined(CAIROMM_BUILDLINK3_MK) +CAIROMM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncairomm} -BUILDLINK_PACKAGES+= cairomm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cairomm - -.if ${CAIROMM_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.cairomm+= cairomm>=1.2.2 BUILDLINK_PKGSRCDIR.cairomm?= ../../graphics/cairomm -.endif # CAIROMM_BUILDLINK3_MK .include "../../graphics/cairo/buildlink3.mk" +.endif # CAIROMM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -cairomm diff --git a/graphics/cal3d/buildlink3.mk b/graphics/cal3d/buildlink3.mk index cd4e7cf7171..f4a0fba037f 100644 --- a/graphics/cal3d/buildlink3.mk +++ b/graphics/cal3d/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:50 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:37 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CAL3D_BUILDLINK3_MK:= ${CAL3D_BUILDLINK3_MK}+ +BUILDLINK_TREE+= cal3d -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= cal3d -.endif +.if !defined(CAL3D_BUILDLINK3_MK) +CAL3D_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncal3d} -BUILDLINK_PACKAGES+= cal3d -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cal3d - -.if !empty(CAL3D_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.cal3d+= cal3d>=0.9.1 BUILDLINK_ABI_DEPENDS.cal3d+= cal3d>=0.9.1nb2 BUILDLINK_PKGSRCDIR.cal3d?= ../../graphics/cal3d -.endif # CAL3D_BUILDLINK3_MK .include "../../graphics/Mesa/buildlink3.mk" +.endif # CAL3D_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -cal3d diff --git a/graphics/camlimages/buildlink3.mk b/graphics/camlimages/buildlink3.mk index a0d60c430db..366c7c69d33 100644 --- a/graphics/camlimages/buildlink3.mk +++ b/graphics/camlimages/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:50 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:37 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CAMLIMAGES_BUILDLINK3_MK:= ${CAMLIMAGES_BUILDLINK3_MK}+ +BUILDLINK_TREE+= camlimages -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= camlimages -.endif +.if !defined(CAMLIMAGES_BUILDLINK3_MK) +CAMLIMAGES_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncamlimages} -BUILDLINK_PACKAGES+= camlimages -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}camlimages - -.if !empty(CAMLIMAGES_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.camlimages+= camlimages>=2.2.0 BUILDLINK_ABI_DEPENDS.camlimages?= camlimages>=2.2.0nb1 BUILDLINK_PKGSRCDIR.camlimages?= ../../graphics/camlimages -.endif # CAMLIMAGES_BUILDLINK3_MK +.endif # CAMLIMAGES_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -camlimages diff --git a/graphics/clutter-cairo/buildlink3.mk b/graphics/clutter-cairo/buildlink3.mk index 24fae3bffe1..837ba89552d 100644 --- a/graphics/clutter-cairo/buildlink3.mk +++ b/graphics/clutter-cairo/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/12/14 11:04:35 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:37 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CLUTTER_CAIRO_BUILDLINK3_MK:= ${CLUTTER_CAIRO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= clutter-cairo -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= clutter-cairo -.endif +.if !defined(CLUTTER_CAIRO_BUILDLINK3_MK) +CLUTTER_CAIRO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nclutter-cairo} -BUILDLINK_PACKAGES+= clutter-cairo -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}clutter-cairo - -.if ${CLUTTER_CAIRO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.clutter-cairo+= clutter-cairo>=0.8.0 BUILDLINK_PKGSRCDIR.clutter-cairo?= ../../graphics/clutter-cairo -.endif # CLUTTER_CAIRO_BUILDLINK3_MK .include "../../graphics/cairo/buildlink3.mk" .include "../../graphics/clutter/buildlink3.mk" +.endif # CLUTTER_CAIRO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -clutter-cairo diff --git a/graphics/clutter-gtk/buildlink3.mk b/graphics/clutter-gtk/buildlink3.mk index f9fe6d66af6..646c775cd04 100644 --- a/graphics/clutter-gtk/buildlink3.mk +++ b/graphics/clutter-gtk/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/12/14 11:06:42 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:37 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CLUTTER_GTK_BUILDLINK3_MK:= ${CLUTTER_GTK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= clutter-gtk -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= clutter-gtk -.endif +.if !defined(CLUTTER_GTK_BUILDLINK3_MK) +CLUTTER_GTK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nclutter-gtk} -BUILDLINK_PACKAGES+= clutter-gtk -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}clutter-gtk - -.if ${CLUTTER_GTK_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.clutter-gtk+= clutter-gtk>=0.8.0 BUILDLINK_PKGSRCDIR.clutter-gtk?= ../../graphics/clutter-gtk -.endif # CLUTTER_GTK_BUILDLINK3_MK .include "../../x11/gtk2/buildlink3.mk" .include "../../graphics/clutter/buildlink3.mk" +.endif # CLUTTER_GTK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -clutter-gtk diff --git a/graphics/clutter/buildlink3.mk b/graphics/clutter/buildlink3.mk index 4d7d0b92820..f0656367dd3 100644 --- a/graphics/clutter/buildlink3.mk +++ b/graphics/clutter/buildlink3.mk @@ -1,24 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/12/14 10:57:18 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:37 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CLUTTER_BUILDLINK3_MK:= ${CLUTTER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= clutter -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= clutter -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nclutter} -BUILDLINK_PACKAGES+= clutter -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}clutter +.if !defined(CLUTTER_BUILDLINK3_MK) +CLUTTER_BUILDLINK3_MK:= -.if ${CLUTTER_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.clutter+= clutter>=0.8.0 BUILDLINK_PKGSRCDIR.clutter?= ../../graphics/clutter PRINT_PLIST_AWK+= /^@dirrm include\/clutter-0.8$$/ \ { print "@comment in clutter: " $$0; next; } -.endif # CLUTTER_BUILDLINK3_MK pkgbase := clutter .include "../../mk/pkg-build-options.mk" @@ -36,5 +28,6 @@ pkgbase := clutter .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" .include "../../textproc/json-glib/buildlink3.mk" +.endif # CLUTTER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -clutter diff --git a/graphics/compface/buildlink3.mk b/graphics/compface/buildlink3.mk index b8a709c98bc..5859f41a946 100644 --- a/graphics/compface/buildlink3.mk +++ b/graphics/compface/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:50 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:37 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -COMPFACE_BUILDLINK3_MK:= ${COMPFACE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= compface -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= compface -.endif +.if !defined(COMPFACE_BUILDLINK3_MK) +COMPFACE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncompface} -BUILDLINK_PACKAGES+= compface -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}compface - -.if !empty(COMPFACE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.compface+= compface>=1.4 BUILDLINK_ABI_DEPENDS.compface?= compface>=1.5.1nb1 BUILDLINK_PKGSRCDIR.compface?= ../../graphics/compface -.endif # COMPFACE_BUILDLINK3_MK +.endif # COMPFACE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -compface diff --git a/graphics/digikam/buildlink3.mk b/graphics/digikam/buildlink3.mk index 336287c791d..b7ee606d7a6 100644 --- a/graphics/digikam/buildlink3.mk +++ b/graphics/digikam/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.19 2009/01/07 01:43:49 gdt Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2009/03/20 19:24:37 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -DIGIKAM_BUILDLINK3_MK:= ${DIGIKAM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= digikam -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= digikam -.endif +.if !defined(DIGIKAM_BUILDLINK3_MK) +DIGIKAM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndigikam} -BUILDLINK_PACKAGES+= digikam -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}digikam - -.if !empty(DIGIKAM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.digikam+= digikam>=0.8.1 BUILDLINK_ABI_DEPENDS.digikam?= digikam>=0.9.5beta1nb1 BUILDLINK_PKGSRCDIR.digikam?= ../../graphics/digikam -.endif # DIGIKAM_BUILDLINK3_MK .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/libgphoto2/buildlink3.mk" @@ -24,5 +16,6 @@ BUILDLINK_PKGSRCDIR.digikam?= ../../graphics/digikam .include "../../graphics/libkipi/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" +.endif # DIGIKAM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -digikam diff --git a/graphics/djvulibre-lib/buildlink3.mk b/graphics/djvulibre-lib/buildlink3.mk index b6568863819..a8a0e19c1a9 100644 --- a/graphics/djvulibre-lib/buildlink3.mk +++ b/graphics/djvulibre-lib/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/08/30 17:03:28 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:37 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -DJVULIBRE_LIB_BUILDLINK3_MK:= ${DJVULIBRE_LIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= djvulibre-lib -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= djvulibre-lib -.endif +.if !defined(DJVULIBRE_LIB_BUILDLINK3_MK) +DJVULIBRE_LIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndjvulibre-lib} -BUILDLINK_PACKAGES+= djvulibre-lib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}djvulibre-lib - -.if ${DJVULIBRE_LIB_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.djvulibre-lib+= djvulibre-lib>=3.5.17 BUILDLINK_PKGSRCDIR.djvulibre-lib?= ../../graphics/djvulibre-lib -.endif # DJVULIBRE_LIB_BUILDLINK3_MK +.endif # DJVULIBRE_LIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -djvulibre-lib diff --git a/graphics/epeg/buildlink3.mk b/graphics/epeg/buildlink3.mk index 56402c48882..db5e45b62dc 100644 --- a/graphics/epeg/buildlink3.mk +++ b/graphics/epeg/buildlink3.mk @@ -1,21 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:50 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:38 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EPEG_BUILDLINK3_MK:= ${EPEG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= epeg -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= epeg -.endif +.if !defined(EPEG_BUILDLINK3_MK) +EPEG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES+= epeg -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}epeg - -.if !empty(EPEG_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.epeg+= epeg>=0.9.0 BUILDLINK_PKGSRCDIR.epeg?= ../../graphics/epeg -.endif # EPEG_BUILDLINK3_MK .include "../../devel/libltdl/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" +.endif # EPEG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -epeg diff --git a/graphics/evas-buffer/buildlink3.mk b/graphics/evas-buffer/buildlink3.mk index 05f9b27201d..0ae23e4459b 100644 --- a/graphics/evas-buffer/buildlink3.mk +++ b/graphics/evas-buffer/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/02/26 18:56:19 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:38 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EVAS_BUFFER_BUILDLINK3_MK:= ${EVAS_BUFFER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= evas-buffer -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= evas-buffer -.endif +.if !defined(EVAS_BUFFER_BUILDLINK3_MK) +EVAS_BUFFER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nevas-buffer} -BUILDLINK_PACKAGES+= evas-buffer -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}evas-buffer - -.if ${EVAS_BUFFER_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.evas-buffer+= evas-buffer>=0.9.9.050 BUILDLINK_PKGSRCDIR.evas-buffer?= ../../graphics/evas-buffer -.endif # EVAS_BUFFER_BUILDLINK3_MK +.endif # EVAS_BUFFER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -evas-buffer diff --git a/graphics/evas-software-x11/buildlink3.mk b/graphics/evas-software-x11/buildlink3.mk index a0a6bd497c8..164a054237a 100644 --- a/graphics/evas-software-x11/buildlink3.mk +++ b/graphics/evas-software-x11/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/02/26 19:14:12 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:38 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EVAS_SOFTWARE_X11_BUILDLINK3_MK:= ${EVAS_SOFTWARE_X11_BUILDLINK3_MK}+ +BUILDLINK_TREE+= evas-software-x11 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= evas-software-x11 -.endif +.if !defined(EVAS_SOFTWARE_X11_BUILDLINK3_MK) +EVAS_SOFTWARE_X11_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nevas-software-x11} -BUILDLINK_PACKAGES+= evas-software-x11 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}evas-software-x11 - -.if ${EVAS_SOFTWARE_X11_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.evas-software-x11+= evas-software-x11>=0.9.9.050 BUILDLINK_PKGSRCDIR.evas-software-x11?= ../../graphics/evas-software-x11 -.endif # EVAS_SOFTWARE_X11_BUILDLINK3_MK .include "../../x11/libX11/buildlink3.mk" +.endif # EVAS_SOFTWARE_X11_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -evas-software-x11 diff --git a/graphics/evas/buildlink3.mk b/graphics/evas/buildlink3.mk index fcfd7382274..a894deb7f75 100644 --- a/graphics/evas/buildlink3.mk +++ b/graphics/evas/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/02/26 18:12:55 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:38 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EVAS_BUILDLINK3_MK:= ${EVAS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= evas -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= evas -.endif +.if !defined(EVAS_BUILDLINK3_MK) +EVAS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nevas} -BUILDLINK_PACKAGES+= evas -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}evas - -.if ${EVAS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.evas+= evas>=0.9.9.050 BUILDLINK_PKGSRCDIR.evas?= ../../graphics/evas -.endif # EVAS_BUILDLINK3_MK .include "../../devel/eet/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" +.endif # EVAS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -evas diff --git a/graphics/exiv2/buildlink3.mk b/graphics/exiv2/buildlink3.mk index 50444b50c9e..c5253dde7eb 100644 --- a/graphics/exiv2/buildlink3.mk +++ b/graphics/exiv2/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/01/07 01:07:51 gdt Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:38 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EXIV2_BUILDLINK3_MK:= ${EXIV2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= exiv2 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= exiv2 -.endif +.if !defined(EXIV2_BUILDLINK3_MK) +EXIV2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nexiv2} -BUILDLINK_PACKAGES+= exiv2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}exiv2 - -.if ${EXIV2_BUILDLINK3_MK} == "+" # 0.18 changes the signature of printTag BUILDLINK_API_DEPENDS.exiv2+= exiv2>=0.18 BUILDLINK_ABI_DEPENDS.exiv2+= exiv2>=0.18 BUILDLINK_PKGSRCDIR.exiv2?= ../../graphics/exiv2 -.endif # EXIV2_BUILDLINK3_MK +.endif # EXIV2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -exiv2 diff --git a/graphics/fnlib/buildlink3.mk b/graphics/fnlib/buildlink3.mk index 722ac8a44a7..898211a3e0a 100644 --- a/graphics/fnlib/buildlink3.mk +++ b/graphics/fnlib/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:50 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:38 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FNLIB_BUILDLINK3_MK:= ${FNLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= fnlib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= fnlib -.endif +.if !defined(FNLIB_BUILDLINK3_MK) +FNLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfnlib} -BUILDLINK_PACKAGES+= fnlib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fnlib - -.if !empty(FNLIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.fnlib+= fnlib>=0.5nb6 BUILDLINK_ABI_DEPENDS.fnlib+= fnlib>=0.5nb10 BUILDLINK_PKGSRCDIR.fnlib?= ../../graphics/fnlib -.endif # FNLIB_BUILDLINK3_MK .include "../../graphics/imlib/buildlink3.mk" +.endif # FNLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -fnlib diff --git a/graphics/freeglut/buildlink3.mk b/graphics/freeglut/buildlink3.mk index 0ea88c55834..34c977b2d1e 100644 --- a/graphics/freeglut/buildlink3.mk +++ b/graphics/freeglut/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.8 2008/11/08 01:10:12 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:38 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FREEGLUT_BUILDLINK3_MK:= ${FREEGLUT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= freeglut -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= freeglut -.endif +.if !defined(FREEGLUT_BUILDLINK3_MK) +FREEGLUT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfreeglut} -BUILDLINK_PACKAGES+= freeglut -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}freeglut - -.if !empty(FREEGLUT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.freeglut+= freeglut>=2.2.0 BUILDLINK_ABI_DEPENDS.freeglut+= freeglut>=2.2.0nb3 BUILDLINK_PKGSRCDIR.freeglut?= ../../graphics/freeglut -.endif # FREEGLUT_BUILDLINK3_MK .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" +.endif # FREEGLUT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -freeglut diff --git a/graphics/freetype-lib/buildlink3.mk b/graphics/freetype-lib/buildlink3.mk index f64936796b5..83e2d27e9bc 100644 --- a/graphics/freetype-lib/buildlink3.mk +++ b/graphics/freetype-lib/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 23:10:51 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:38 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FREETYPE_BUILDLINK3_MK:= ${FREETYPE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= freetype -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= freetype -.endif +.if !defined(FREETYPE_BUILDLINK3_MK) +FREETYPE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfreetype} -BUILDLINK_PACKAGES+= freetype -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}freetype - -.if !empty(FREETYPE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.freetype+= freetype-lib>=1.3.1nb1 BUILDLINK_ABI_DEPENDS.freetype+=freetype-lib>=1.3.1nb2 BUILDLINK_ABI_DEPENDS.freetype?= freetype-lib>=1.3.1nb3 BUILDLINK_PKGSRCDIR.freetype?= ../../graphics/freetype-lib -.endif # FREETYPE_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" +.endif # FREETYPE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -freetype diff --git a/graphics/freetype2/buildlink3.mk b/graphics/freetype2/buildlink3.mk index 5d537b2c993..ac4c8033aeb 100644 --- a/graphics/freetype2/buildlink3.mk +++ b/graphics/freetype2/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.29 2006/07/08 23:10:51 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.30 2009/03/20 19:24:38 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FREETYPE2_BUILDLINK3_MK:= ${FREETYPE2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= freetype2 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= freetype2 -.endif +.if !defined(FREETYPE2_BUILDLINK3_MK) +FREETYPE2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfreetype2} -BUILDLINK_PACKAGES+= freetype2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}freetype2 - -.if !empty(FREETYPE2_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.8 BUILDLINK_ABI_DEPENDS.freetype2+= freetype2>=2.1.10nb1 BUILDLINK_PKGSRCDIR.freetype2?= ../../graphics/freetype2 @@ -19,7 +12,6 @@ BUILDLINK_INCDIRS.freetype2?= include/freetype2 FREETYPE_CONFIG?= ${BUILDLINK_PREFIX.freetype2}/bin/freetype-config CONFIGURE_ENV+= FREETYPE_CONFIG=${FREETYPE_CONFIG:Q} +.endif # FREETYPE2_BUILDLINK3_MK -.endif # FREETYPE2_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -freetype2 diff --git a/graphics/gd/buildlink3.mk b/graphics/gd/buildlink3.mk index 267fce41fb0..24382910cc6 100644 --- a/graphics/gd/buildlink3.mk +++ b/graphics/gd/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.16 2008/11/20 17:25:01 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:38 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GD_BUILDLINK3_MK:= ${GD_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gd -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gd -.endif +.if !defined(GD_BUILDLINK3_MK) +GD_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngd} -BUILDLINK_PACKAGES+= gd -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gd - -.if !empty(GD_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gd+= gd>=2.0.15nb1 BUILDLINK_ABI_DEPENDS.gd+= gd>=2.0.33nb3 BUILDLINK_PKGSRCDIR.gd?= ../../graphics/gd -.endif # GD_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" @@ -24,5 +16,6 @@ BUILDLINK_PKGSRCDIR.gd?= ../../graphics/gd .include "../../graphics/png/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.endif # GD_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gd diff --git a/graphics/gdchart/buildlink3.mk b/graphics/gdchart/buildlink3.mk index 035eea49e60..e93781841d0 100644 --- a/graphics/gdchart/buildlink3.mk +++ b/graphics/gdchart/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:51 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:38 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GDCHART_BUILDLINK3_MK:= ${GDCHART_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gdchart -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gdchart -.endif +.if !defined(GDCHART_BUILDLINK3_MK) +GDCHART_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngdchart} -BUILDLINK_PACKAGES+= gdchart -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gdchart - -.if !empty(GDCHART_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gdchart+= gdchart>=0.11.4nb1 BUILDLINK_ABI_DEPENDS.gdchart+= gdchart>=0.11.5nb2 BUILDLINK_PKGSRCDIR.gdchart?= ../../graphics/gdchart -.endif # GDCHART_BUILDLINK3_MK .include "../../graphics/gd/buildlink3.mk" +.endif # GDCHART_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gdchart diff --git a/graphics/gdk-pixbuf/buildlink3.mk b/graphics/gdk-pixbuf/buildlink3.mk index 41034eb3c1c..815ff50b5d4 100644 --- a/graphics/gdk-pixbuf/buildlink3.mk +++ b/graphics/gdk-pixbuf/buildlink3.mk @@ -1,27 +1,20 @@ -# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:51 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:39 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GDK_PIXBUF_BUILDLINK3_MK:= ${GDK_PIXBUF_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gdk-pixbuf -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gdk-pixbuf -.endif +.if !defined(GDK_PIXBUF_BUILDLINK3_MK) +GDK_PIXBUF_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngdk-pixbuf} -BUILDLINK_PACKAGES+= gdk-pixbuf -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gdk-pixbuf - -.if !empty(GDK_PIXBUF_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gdk-pixbuf+= gdk-pixbuf>=0.22.0nb2 BUILDLINK_ABI_DEPENDS.gdk-pixbuf+= gdk-pixbuf>=0.22.0nb8 BUILDLINK_PKGSRCDIR.gdk-pixbuf?= ../../graphics/gdk-pixbuf BUILDLINK_CPPFLAGS.gdk-pixbuf+= \ -I${BUILDLINK_PREFIX.gdk-pixbuf}/include/gdk-pixbuf-1.0 -.endif # GDK_PIXBUF_BUILDLINK3_MK .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" +.endif # GDK_PIXBUF_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gdk-pixbuf diff --git a/graphics/gegl/buildlink3.mk b/graphics/gegl/buildlink3.mk index 03bb5b73334..9bacd23a11d 100644 --- a/graphics/gegl/buildlink3.mk +++ b/graphics/gegl/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/02/03 06:21:40 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:39 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GEGL_BUILDLINK3_MK:= ${GEGL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gegl -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= gegl -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngegl} -BUILDLINK_PACKAGES+= gegl -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gegl +.if !defined(GEGL_BUILDLINK3_MK) +GEGL_BUILDLINK3_MK:= -.if ${GEGL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.gegl+= gegl>=0.0.20 BUILDLINK_PKGSRCDIR.gegl?= ../../graphics/gegl -.endif # GEGL_BUILDLINK3_MK pkgbase := gegl .include "../../mk/pkg-build-options.mk" @@ -28,5 +20,6 @@ pkgbase := gegl .include "../../graphics/openexr/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # GEGL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gegl diff --git a/graphics/gimp/buildlink3.mk b/graphics/gimp/buildlink3.mk index 5ef58a662ce..1da31be09c5 100644 --- a/graphics/gimp/buildlink3.mk +++ b/graphics/gimp/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.26 2008/09/30 19:55:03 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.27 2009/03/20 19:24:39 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GIMP_BUILDLINK3_MK:= ${GIMP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gimp -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gimp -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngimp} -BUILDLINK_PACKAGES+= gimp -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gimp +.if !defined(GIMP_BUILDLINK3_MK) +GIMP_BUILDLINK3_MK:= -.if !empty(GIMP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gimp+= gimp>=2.4.0 BUILDLINK_ABI_DEPENDS.gimp+= gimp>=2.4.4 BUILDLINK_PKGSRCDIR.gimp?= ../../graphics/gimp -.endif # GIMP_BUILDLINK3_MK pkgbase := gimp .include "../../mk/pkg-build-options.mk" @@ -44,5 +36,6 @@ pkgbase := gimp .include "../../graphics/png/buildlink3.mk" .include "../../graphics/libwmf/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # GIMP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gimp diff --git a/graphics/gimp1-base/buildlink3.mk b/graphics/gimp1-base/buildlink3.mk index 27413481875..a7e73782b8c 100644 --- a/graphics/gimp1-base/buildlink3.mk +++ b/graphics/gimp1-base/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/12/15 20:32:57 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:39 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GIMP_BASE_BUILDLINK3_MK:= ${GIMP_BASE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gimp-base -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gimp-base -.endif +.if !defined(GIMP_BASE_BUILDLINK3_MK) +GIMP_BASE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngimp-base} -BUILDLINK_PACKAGES+= gimp-base -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gimp-base - -.if !empty(GIMP_BASE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gimp-base+= gimp-base>=1.2.5nb2 BUILDLINK_ABI_DEPENDS.gimp-base+= gimp-base>=1.2.5nb5 BUILDLINK_PKGSRCDIR.gimp-base?= ../../graphics/gimp1-base -.endif # GIMP_BASE_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" @@ -24,5 +16,6 @@ BUILDLINK_PKGSRCDIR.gimp-base?= ../../graphics/gimp1-base .include "../../multimedia/mpeg-lib/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.endif # GIMP_BASE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gimp-base diff --git a/graphics/gle/buildlink3.mk b/graphics/gle/buildlink3.mk index 6af9f29f56c..bcd4b099b90 100644 --- a/graphics/gle/buildlink3.mk +++ b/graphics/gle/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:51 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:39 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GLE_BUILDLINK3_MK:= ${GLE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gle -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gle -.endif +.if !defined(GLE_BUILDLINK3_MK) +GLE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngle} -BUILDLINK_PACKAGES+= gle -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gle - -.if !empty(GLE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gle+= gle>=3.0.3 BUILDLINK_ABI_DEPENDS.gle+= gle>=3.1.0nb2 BUILDLINK_PKGSRCDIR.gle?= ../../graphics/gle -.endif # GLE_BUILDLINK3_MK .include "../../graphics/Mesa/buildlink3.mk" +.endif # GLE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gle diff --git a/graphics/glew/buildlink3.mk b/graphics/glew/buildlink3.mk index fb0c88f0f34..a51a14ffe9a 100644 --- a/graphics/glew/buildlink3.mk +++ b/graphics/glew/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/08/15 15:21:27 abs Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:39 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GLEW_BUILDLINK3_MK:= ${GLEW_BUILDLINK3_MK}+ +BUILDLINK_TREE+= glew -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= glew -.endif +.if !defined(GLEW_BUILDLINK3_MK) +GLEW_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglew} -BUILDLINK_PACKAGES+= glew -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}glew - -.if !empty(GLEW_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.glew+= glew>=1.3.4 BUILDLINK_ABI_DEPENDS.glew+= glew>=1.3.4 BUILDLINK_PKGSRCDIR.glew?= ../../graphics/glew -.endif # GLEW_BUILDLINK3_MK .include "../../graphics/MesaLib/buildlink3.mk" +.endif # GLEW_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -glew diff --git a/graphics/glitz/buildlink3.mk b/graphics/glitz/buildlink3.mk index 91b5ad0bff0..3f9535e3b34 100644 --- a/graphics/glitz/buildlink3.mk +++ b/graphics/glitz/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.11 2006/07/23 01:24:38 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:39 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GLITZ_BUILDLINK3_MK:= ${GLITZ_BUILDLINK3_MK}+ +BUILDLINK_TREE+= glitz -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= glitz -.endif +.if !defined(GLITZ_BUILDLINK3_MK) +GLITZ_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglitz} -BUILDLINK_PACKAGES+= glitz -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}glitz - -.if !empty(GLITZ_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.glitz+= glitz>=0.4.4 BUILDLINK_ABI_DEPENDS.glitz+= glitz>=0.4.4nb2 BUILDLINK_PKGSRCDIR.glitz?= ../../graphics/glitz -.endif # GLITZ_BUILDLINK3_MK +.endif # GLITZ_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -glitz diff --git a/graphics/glu/buildlink3.mk b/graphics/glu/buildlink3.mk index 8d98d52c4eb..f019fc7bfe8 100644 --- a/graphics/glu/buildlink3.mk +++ b/graphics/glu/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.33 2008/04/24 11:57:35 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.34 2009/03/20 19:24:39 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GLU_BUILDLINK3_MK:= ${GLU_BUILDLINK3_MK}+ +BUILDLINK_TREE+= glu -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= glu -.endif +.if !defined(GLU_BUILDLINK3_MK) +GLU_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglu} -BUILDLINK_PACKAGES+= glu -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}glu - -.if !empty(GLU_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.glu+= glu>=3.4.2 BUILDLINK_ABI_DEPENDS.glu+= glu>=7.0.3 BUILDLINK_PKGSRCDIR.glu?= ../../graphics/glu -.endif # GLU_BUILDLINK3_MK .include "../../graphics/MesaLib/buildlink3.mk" +.endif # GLU_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -glu diff --git a/graphics/glut/buildlink3.mk b/graphics/glut/buildlink3.mk index 16803c04514..aa86eb02921 100644 --- a/graphics/glut/buildlink3.mk +++ b/graphics/glut/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.18 2009/01/16 07:55:17 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2009/03/20 19:24:39 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GLUT_BUILDLINK3_MK:= ${GLUT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= glut -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= glut -.endif +.if !defined(GLUT_BUILDLINK3_MK) +GLUT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglut} -BUILDLINK_PACKAGES+= glut -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}glut - -.if !empty(GLUT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.glut+= glut>=3.4.2 BUILDLINK_ABI_DEPENDS.glut+= glut>=7.0.3 BUILDLINK_PKGSRCDIR.glut?= ../../graphics/glut -.endif # GLUT_BUILDLINK3_MK .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libXi/buildlink3.mk" +.endif # GLUT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -glut diff --git a/graphics/gnome-icon-theme/buildlink3.mk b/graphics/gnome-icon-theme/buildlink3.mk index 2f53a6e3c7f..c4b226cbc62 100644 --- a/graphics/gnome-icon-theme/buildlink3.mk +++ b/graphics/gnome-icon-theme/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.13 2006/12/12 21:52:36 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:39 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNOME_ICON_THEME_BUILDLINK3_MK:= ${GNOME_ICON_THEME_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnome-icon-theme -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnome-icon-theme -.endif +.if !defined(GNOME_ICON_THEME_BUILDLINK3_MK) +GNOME_ICON_THEME_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-icon-theme} -BUILDLINK_PACKAGES+= gnome-icon-theme -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-icon-theme - -.if !empty(GNOME_ICON_THEME_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gnome-icon-theme+= gnome-icon-theme>=2.8.0 BUILDLINK_ABI_DEPENDS.gnome-icon-theme?= gnome-icon-theme>=2.12.1nb2 BUILDLINK_PKGSRCDIR.gnome-icon-theme?= ../../graphics/gnome-icon-theme @@ -30,6 +23,6 @@ PRINT_PLIST_AWK+= /^@dirrm ${d:S/\//\\\//g}$$/ \ { print "@comment in gnome-icon-theme: " $$0; next; } . endfor . undef dirs -.endif # GNOME_ICON_THEME_BUILDLINK3_MK +.endif # GNOME_ICON_THEME_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnome-icon-theme diff --git a/graphics/goocanvas/buildlink3.mk b/graphics/goocanvas/buildlink3.mk index c61602e56ff..94fb68237fd 100644 --- a/graphics/goocanvas/buildlink3.mk +++ b/graphics/goocanvas/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/10/22 10:27:17 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:40 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GOOCANVAS_BUILDLINK3_MK:= ${GOOCANVAS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= goocanvas -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= goocanvas -.endif +.if !defined(GOOCANVAS_BUILDLINK3_MK) +GOOCANVAS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngoocanvas} -BUILDLINK_PACKAGES+= goocanvas -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}goocanvas - -.if ${GOOCANVAS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.goocanvas+= goocanvas>=0.12 BUILDLINK_PKGSRCDIR.goocanvas?= ../../graphics/goocanvas -.endif # GOOCANVAS_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # GOOCANVAS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -goocanvas diff --git a/graphics/graphviz/buildlink3.mk b/graphics/graphviz/buildlink3.mk index e6eafb80dca..3ae060d06f9 100644 --- a/graphics/graphviz/buildlink3.mk +++ b/graphics/graphviz/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.16 2009/03/06 07:36:34 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:40 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GRAPHVIZ_BUILDLINK3_MK:= ${GRAPHVIZ_BUILDLINK3_MK}+ +BUILDLINK_TREE+= graphviz -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= graphviz -.endif +.if !defined(GRAPHVIZ_BUILDLINK3_MK) +GRAPHVIZ_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngraphviz} -BUILDLINK_PACKAGES+= graphviz -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}graphviz - -.if ${GRAPHVIZ_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.graphviz+= graphviz>=1.12 BUILDLINK_ABI_DEPENDS.graphviz+= graphviz>=2.6nb5 BUILDLINK_PKGSRCDIR.graphviz?= ../../graphics/graphviz -.endif # GRAPHVIZ_BUILDLINK3_MK .include "../../converters/libiconv/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" +.endif # GRAPHVIZ_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -graphviz diff --git a/graphics/gtkglext/buildlink3.mk b/graphics/gtkglext/buildlink3.mk index 9676d5d1a06..24d2aaa6c45 100644 --- a/graphics/gtkglext/buildlink3.mk +++ b/graphics/gtkglext/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 23:10:51 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:40 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GTKGLEXT_BUILDLINK3_MK:= ${GTKGLEXT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gtkglext -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gtkglext -.endif +.if !defined(GTKGLEXT_BUILDLINK3_MK) +GTKGLEXT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtkglext} -BUILDLINK_PACKAGES+= gtkglext -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtkglext - -.if !empty(GTKGLEXT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gtkglext+= gtkglext>=1.2.0 BUILDLINK_ABI_DEPENDS.gtkglext?= gtkglext>=1.2.0nb1 BUILDLINK_PKGSRCDIR.gtkglext?= ../../graphics/gtkglext -.endif # GTKGLEXT_BUILDLINK3_MK .include "../../graphics/glu/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # GTKGLEXT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gtkglext diff --git a/graphics/gtkimageview/buildlink3.mk b/graphics/gtkimageview/buildlink3.mk index 75a865d0439..362d7f857b1 100644 --- a/graphics/gtkimageview/buildlink3.mk +++ b/graphics/gtkimageview/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/08/31 00:09:13 gdt Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:40 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GTKIMAGEVIEW_BUILDLINK3_MK:= ${GTKIMAGEVIEW_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gtkimageview -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= gtkimageview -.endif +.if !defined(GTKIMAGEVIEW_BUILDLINK3_MK) +GTKIMAGEVIEW_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtkimageview} -BUILDLINK_PACKAGES+= gtkimageview -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtkimageview - -.if ${GTKIMAGEVIEW_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.gtkimageview+= gtkimageview>=1.3.0 BUILDLINK_PKGSRCDIR.gtkimageview?= ../../graphics/gtkimageview -.endif # GTKIMAGEVIEW_BUILDLINK3_MK +.endif # GTKIMAGEVIEW_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gtkimageview diff --git a/graphics/guile-cairo/buildlink3.mk b/graphics/guile-cairo/buildlink3.mk index bc7e846d588..bbc5f62d9f7 100644 --- a/graphics/guile-cairo/buildlink3.mk +++ b/graphics/guile-cairo/buildlink3.mk @@ -1,18 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/08/10 21:21:01 gdt Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GUILE_CAIRO_BUILDLINK3_MK:= ${GUILE_CAIRO_BUILDLINK3_MK}+ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:40 joerg Exp $ -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= guile-cairo -.endif +BUILDLINK_TREE+= guile-cairo -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nguile-cairo} -BUILDLINK_PACKAGES+= guile-cairo -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}guile-cairo +.if !defined(GUILE_CAIRO_BUILDLINK3_MK) +GUILE_CAIRO_BUILDLINK3_MK:= -.if ${GUILE_CAIRO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.guile-cairo+= guile-cairo>=1.4.0 BUILDLINK_PKGSRCDIR.guile-cairo?= ../../graphics/guile-cairo -.endif # GUILE_CAIRO_BUILDLINK3_MK +.endif # GUILE_CAIRO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -guile-cairo diff --git a/graphics/hermes/buildlink3.mk b/graphics/hermes/buildlink3.mk index 412b696c935..8b49ee7d71b 100644 --- a/graphics/hermes/buildlink3.mk +++ b/graphics/hermes/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:51 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:40 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -HERMES_BUILDLINK3_MK:= ${HERMES_BUILDLINK3_MK}+ +BUILDLINK_TREE+= Hermes -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= Hermes -.endif +.if !defined(HERMES_BUILDLINK3_MK) +HERMES_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NHermes} -BUILDLINK_PACKAGES+= Hermes -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Hermes - -.if !empty(HERMES_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.Hermes+= Hermes>=1.3.2 BUILDLINK_ABI_DEPENDS.Hermes+= Hermes>=1.3.3nb2 BUILDLINK_PKGSRCDIR.Hermes?= ../../graphics/hermes -.endif # HERMES_BUILDLINK3_MK +.endif # HERMES_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -Hermes diff --git a/graphics/hicolor-icon-theme/buildlink3.mk b/graphics/hicolor-icon-theme/buildlink3.mk index 9b962ab5cc0..414226c49b8 100644 --- a/graphics/hicolor-icon-theme/buildlink3.mk +++ b/graphics/hicolor-icon-theme/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.14 2009/01/13 16:27:24 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:40 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -HICOLOR_ICON_THEME_BUILDLINK3_MK:= ${HICOLOR_ICON_THEME_BUILDLINK3_MK}+ +BUILDLINK_TREE+= hicolor-icon-theme -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= hicolor-icon-theme -.endif +.if !defined(HICOLOR_ICON_THEME_BUILDLINK3_MK) +HICOLOR_ICON_THEME_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nhicolor-icon-theme} -BUILDLINK_PACKAGES+= hicolor-icon-theme -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}hicolor-icon-theme - -.if !empty(HICOLOR_ICON_THEME_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.hicolor-icon-theme+= hicolor-icon-theme>=0.4 BUILDLINK_ABI_DEPENDS.hicolor-icon-theme+= hicolor-icon-theme>=0.9nb1 BUILDLINK_PKGSRCDIR.hicolor-icon-theme?=../../graphics/hicolor-icon-theme @@ -53,6 +46,6 @@ guic-buildlink-fake: ${CHMOD} +x ${_GUIC_FAKE}; \ fi .endif # HICOLOR_ICON_THEME_DEPEND_ONLY -.endif # HICOLOR_ICON_THEME_BUILDLINK3_MK +.endif # HICOLOR_ICON_THEME_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -hicolor-icon-theme diff --git a/graphics/icon-naming-utils/buildlink3.mk b/graphics/icon-naming-utils/buildlink3.mk index c6a47d63bd3..344fe68f9c9 100644 --- a/graphics/icon-naming-utils/buildlink3.mk +++ b/graphics/icon-naming-utils/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/08/19 13:36:55 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:40 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ICON_NAMING_UTILS_BUILDLINK3_MK:= ${ICON_NAMING_UTILS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= icon-naming-utils -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= icon-naming-utils -.endif +.if !defined(ICON_NAMING_UTILS_BUILDLINK3_MK) +ICON_NAMING_UTILS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nicon-naming-utils} -BUILDLINK_PACKAGES+= icon-naming-utils -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}icon-naming-utils - -.if ${ICON_NAMING_UTILS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.icon-naming-utils+= icon-naming-utils>=0.8.7 BUILDLINK_DEPMETHOD.icon-naming-utils?= build BUILDLINK_PKGSRCDIR.icon-naming-utils?= ../../graphics/icon-naming-utils -.endif # ICON_NAMING_UTILS_BUILDLINK3_MK +.endif # ICON_NAMING_UTILS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -icon-naming-utils diff --git a/graphics/ilmbase/buildlink3.mk b/graphics/ilmbase/buildlink3.mk index 7787a338a00..fadc5e17a75 100644 --- a/graphics/ilmbase/buildlink3.mk +++ b/graphics/ilmbase/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/11/30 21:50:22 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:40 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ILMBASE_BUILDLINK3_MK:= ${ILMBASE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ilmbase -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= ilmbase -.endif +.if !defined(ILMBASE_BUILDLINK3_MK) +ILMBASE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nilmbase} -BUILDLINK_PACKAGES+= ilmbase -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ilmbase - -.if ${ILMBASE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.ilmbase+= ilmbase>=1.0.1 BUILDLINK_PKGSRCDIR.ilmbase?= ../../graphics/ilmbase -.endif # ILMBASE_BUILDLINK3_MK +.endif # ILMBASE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ilmbase diff --git a/graphics/imlib/buildlink3.mk b/graphics/imlib/buildlink3.mk index 7af8bcac22f..7788b77cd5c 100644 --- a/graphics/imlib/buildlink3.mk +++ b/graphics/imlib/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.14 2007/01/31 01:38:48 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:40 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -IMLIB_BUILDLINK3_MK:= ${IMLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= imlib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= imlib -.endif +.if !defined(IMLIB_BUILDLINK3_MK) +IMLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nimlib} -BUILDLINK_PACKAGES+= imlib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}imlib - -.if !empty(IMLIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.imlib+= imlib>=1.9.14nb5 BUILDLINK_ABI_DEPENDS.imlib+= imlib>=1.9.15nb4 BUILDLINK_PKGSRCDIR.imlib?= ../../graphics/imlib -.endif # IMLIB_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" @@ -25,5 +17,6 @@ BUILDLINK_PKGSRCDIR.imlib?= ../../graphics/imlib .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" .include "../../x11/xextproto/buildlink3.mk" +.endif # IMLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -imlib diff --git a/graphics/imlib2/buildlink3.mk b/graphics/imlib2/buildlink3.mk index 2ed59418c95..a10b05eb409 100644 --- a/graphics/imlib2/buildlink3.mk +++ b/graphics/imlib2/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.18 2007/11/17 01:40:50 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2009/03/20 19:24:41 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -IMLIB2_BUILDLINK3_MK:= ${IMLIB2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= imlib2 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= imlib2 -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nimlib2} -BUILDLINK_PACKAGES+= imlib2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}imlib2 +.if !defined(IMLIB2_BUILDLINK3_MK) +IMLIB2_BUILDLINK3_MK:= -.if !empty(IMLIB2_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.imlib2+= imlib2>=1.1.0nb2 BUILDLINK_ABI_DEPENDS.imlib2+= imlib2>=1.2.0nb5 BUILDLINK_PKGSRCDIR.imlib2?= ../../graphics/imlib2 -.endif # IMLIB2_BUILDLINK3_MK .include "../../devel/libltdl/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" @@ -39,5 +31,6 @@ pkgbase := imlib2 .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .endif +.endif # IMLIB2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -imlib2 diff --git a/graphics/jasper/buildlink3.mk b/graphics/jasper/buildlink3.mk index ed84c148e1d..4e3ef783860 100644 --- a/graphics/jasper/buildlink3.mk +++ b/graphics/jasper/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.10 2007/01/17 23:47:20 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:41 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -JASPER_BUILDLINK3_MK:= ${JASPER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= jasper -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= jasper -.endif +.if !defined(JASPER_BUILDLINK3_MK) +JASPER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Njasper} -BUILDLINK_PACKAGES+= jasper -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}jasper - -.if !empty(JASPER_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.jasper+= jasper>=1.600.0 BUILDLINK_ABI_DEPENDS.jasper+= jasper>=1.900.0 BUILDLINK_PKGSRCDIR.jasper?= ../../graphics/jasper -.endif # JASPER_BUILDLINK3_MK .include "../../graphics/jpeg/buildlink3.mk" +.endif # JASPER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -jasper diff --git a/graphics/jpeg/buildlink3.mk b/graphics/jpeg/buildlink3.mk index 92088a10853..874ca963c68 100644 --- a/graphics/jpeg/buildlink3.mk +++ b/graphics/jpeg/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:51 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:41 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -JPEG_BUILDLINK3_MK:= ${JPEG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= jpeg -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= jpeg -.endif +.if !defined(JPEG_BUILDLINK3_MK) +JPEG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Njpeg} -BUILDLINK_PACKAGES+= jpeg -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}jpeg - -.if !empty(JPEG_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.jpeg+= jpeg>=6b BUILDLINK_ABI_DEPENDS.jpeg+= jpeg>=6bnb2 BUILDLINK_PKGSRCDIR.jpeg?= ../../graphics/jpeg -.endif # JPEG_BUILDLINK3_MK +.endif # JPEG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -jpeg diff --git a/graphics/kdegraphics3/buildlink3.mk b/graphics/kdegraphics3/buildlink3.mk index 9223d9d00c7..b622210e9cb 100644 --- a/graphics/kdegraphics3/buildlink3.mk +++ b/graphics/kdegraphics3/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.16 2008/01/18 05:06:41 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:41 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -KDEGRAPHICS_BUILDLINK3_MK:= ${KDEGRAPHICS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= kdegraphics -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= kdegraphics -.endif +.if !defined(KDEGRAPHICS_BUILDLINK3_MK) +KDEGRAPHICS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkdegraphics} -BUILDLINK_PACKAGES+= kdegraphics -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kdegraphics - -.if !empty(KDEGRAPHICS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.kdegraphics+= kdegraphics>=3.5.0nb2 BUILDLINK_ABI_DEPENDS.kdegraphics?= kdegraphics>=3.5.8nb3 BUILDLINK_PKGSRCDIR.kdegraphics?= ../../graphics/kdegraphics3 -.endif # KDEGRAPHICS_BUILDLINK3_MK .include "../../converters/fribidi/buildlink3.mk" .include "../../devel/libgphoto2/buildlink3.mk" @@ -26,5 +18,6 @@ BUILDLINK_PKGSRCDIR.kdegraphics?= ../../graphics/kdegraphics3 .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/kdebase3/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" +.endif # KDEGRAPHICS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -kdegraphics diff --git a/graphics/kipi-plugins/buildlink3.mk b/graphics/kipi-plugins/buildlink3.mk index 56ba78072b1..8f2ce90de1a 100644 --- a/graphics/kipi-plugins/buildlink3.mk +++ b/graphics/kipi-plugins/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1 2008/03/02 12:33:09 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:41 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -KIPI_PLUGINS_BUILDLINK3_MK:= ${KIPI_PLUGINS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= kipi-plugins -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= kipi-plugins -.endif +.if !defined(KIPI_PLUGINS_BUILDLINK3_MK) +KIPI_PLUGINS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkipi-plugins} -BUILDLINK_PACKAGES+= kipi-plugins -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kipi-plugins - -.if ${KIPI_PLUGINS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.kipi-plugins+= kipi-plugins>=0.1.4nb6 BUILDLINK_PKGSRCDIR.kipi-plugins?= ../../graphics/kipi-plugins -.endif # KIPI_PLUGINS_BUILDLINK3_MK +.endif # KIPI_PLUGINS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -kipi-plugins diff --git a/graphics/lcms/buildlink3.mk b/graphics/lcms/buildlink3.mk index 3cef04af615..c32a6d96c8c 100644 --- a/graphics/lcms/buildlink3.mk +++ b/graphics/lcms/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:52 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:41 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LCMS_BUILDLINK3_MK:= ${LCMS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= lcms -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= lcms -.endif +.if !defined(LCMS_BUILDLINK3_MK) +LCMS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlcms} -BUILDLINK_PACKAGES+= lcms -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lcms - -.if !empty(LCMS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.lcms+= lcms>=1.06 BUILDLINK_ABI_DEPENDS.lcms+= lcms>=1.12nb2 BUILDLINK_PKGSRCDIR.lcms?= ../../graphics/lcms @@ -28,7 +21,6 @@ buildlink-include-lcms: ${LN} -s ${BUILDLINK_PREFIX.lcms}/include/${_h_} ${BUILDLINK_DIR}/include/lcms/${_h_}; \ fi .endfor +.endif # LCMS_BUILDLINK3_MK -.endif # LCMS_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -lcms diff --git a/graphics/lib3ds/buildlink3.mk b/graphics/lib3ds/buildlink3.mk index 8136a910c18..a8832880390 100644 --- a/graphics/lib3ds/buildlink3.mk +++ b/graphics/lib3ds/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:52 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:41 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIB3DS_BUILDLINK3_MK:= ${LIB3DS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= lib3ds -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= lib3ds -.endif +.if !defined(LIB3DS_BUILDLINK3_MK) +LIB3DS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlib3ds} -BUILDLINK_PACKAGES+= lib3ds -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lib3ds - -.if !empty(LIB3DS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.lib3ds+= lib3ds>=1.2.0nb2 BUILDLINK_ABI_DEPENDS.lib3ds?= lib3ds>=1.2.0nb4 BUILDLINK_PKGSRCDIR.lib3ds?= ../../graphics/lib3ds -.endif # LIB3DS_BUILDLINK3_MK .include "../../graphics/Mesa/buildlink3.mk" +.endif # LIB3DS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -lib3ds diff --git a/graphics/libart/buildlink3.mk b/graphics/libart/buildlink3.mk index 0655316f68c..c051da5108a 100644 --- a/graphics/libart/buildlink3.mk +++ b/graphics/libart/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/09/21 13:00:18 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:41 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBART_BUILDLINK3_MK:= ${LIBART_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libart -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libart -.endif +.if !defined(LIBART_BUILDLINK3_MK) +LIBART_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibart} -BUILDLINK_PACKAGES+= libart -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libart - -.if !empty(LIBART_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libart+= libart>=2.3.10nb1 BUILDLINK_ABI_DEPENDS.libart+= libart>=2.3.16nb1 BUILDLINK_PKGSRCDIR.libart?= ../../graphics/libart -.endif # LIBART_BUILDLINK3_MK +.endif # LIBART_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libart diff --git a/graphics/libexif-gtk/buildlink3.mk b/graphics/libexif-gtk/buildlink3.mk index 9cd9da9feb7..227fc24b289 100644 --- a/graphics/libexif-gtk/buildlink3.mk +++ b/graphics/libexif-gtk/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:52 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:41 joerg Exp $ # # This file was created automatically using createbuildlink-3.4. -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBEXIF_GTK_BUILDLINK3_MK:= ${LIBEXIF_GTK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libexif-gtk -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libexif-gtk -.endif +.if !defined(LIBEXIF_GTK_BUILDLINK3_MK) +LIBEXIF_GTK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibexif-gtk} -BUILDLINK_PACKAGES+= libexif-gtk -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libexif-gtk - -.if !empty(LIBEXIF_GTK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libexif-gtk+= libexif-gtk>=0.3.3nb7 BUILDLINK_ABI_DEPENDS.libexif-gtk+= libexif-gtk>=0.3.5nb4 BUILDLINK_PKGSRCDIR.libexif-gtk?= ../../graphics/libexif-gtk -.endif # LIBEXIF_GTK_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/libexif/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # LIBEXIF_GTK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libexif-gtk diff --git a/graphics/libexif/buildlink3.mk b/graphics/libexif/buildlink3.mk index f435c795b7c..a7f3b267794 100644 --- a/graphics/libexif/buildlink3.mk +++ b/graphics/libexif/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:52 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:41 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBEXIF_BUILDLINK3_MK:= ${LIBEXIF_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libexif -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libexif -.endif +.if !defined(LIBEXIF_BUILDLINK3_MK) +LIBEXIF_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibexif} -BUILDLINK_PACKAGES+= libexif -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libexif - -.if !empty(LIBEXIF_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libexif+= libexif>=0.6.11 BUILDLINK_ABI_DEPENDS.libexif+= libexif>=0.6.13nb1 BUILDLINK_PKGSRCDIR.libexif?= ../../graphics/libexif -.endif # LIBEXIF_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" +.endif # LIBEXIF_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libexif diff --git a/graphics/libgdiplus/buildlink3.mk b/graphics/libgdiplus/buildlink3.mk index b9b0991eb8e..1322ee19617 100644 --- a/graphics/libgdiplus/buildlink3.mk +++ b/graphics/libgdiplus/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.24 2008/10/07 13:23:25 kefren Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2009/03/20 19:24:41 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGDIPLUS_BUILDLINK3_MK:= ${LIBGDIPLUS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgdiplus -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libgdiplus -.endif +.if !defined(LIBGDIPLUS_BUILDLINK3_MK) +LIBGDIPLUS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgdiplus} -BUILDLINK_PACKAGES+= libgdiplus -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgdiplus - -.if ${LIBGDIPLUS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libgdiplus+= libgdiplus>=2.0 BUILDLINK_ABI_DEPENDS.libgdiplus?= libgdiplus>=2.0 BUILDLINK_PKGSRCDIR.libgdiplus?= ../../graphics/libgdiplus -.endif # LIBGDIPLUS_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" @@ -26,5 +18,6 @@ BUILDLINK_PKGSRCDIR.libgdiplus?= ../../graphics/libgdiplus .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" +.endif # LIBGDIPLUS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgdiplus diff --git a/graphics/libggi/buildlink3.mk b/graphics/libggi/buildlink3.mk index ceafd241f05..5c13ed3dd44 100644 --- a/graphics/libggi/buildlink3.mk +++ b/graphics/libggi/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.11 2007/02/04 15:26:34 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:42 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGGI_BUILDLINK3_MK:= ${LIBGGI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libggi -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libggi -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibggi} -BUILDLINK_PACKAGES+= libggi -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libggi +.if !defined(LIBGGI_BUILDLINK3_MK) +LIBGGI_BUILDLINK3_MK:= -.if !empty(LIBGGI_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libggi+= libggi>=2.1.0 BUILDLINK_ABI_DEPENDS.libggi?= libggi>=2.1.1nb1 BUILDLINK_PKGSRCDIR.libggi?= ../../graphics/libggi -.endif # LIBGGI_BUILDLINK3_MK .include "../../mk/bsd.fast.prefs.mk" @@ -27,5 +19,6 @@ BUILDLINK_PKGSRCDIR.libggi?= ../../graphics/libggi .include "../../graphics/libgii/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/xextproto/buildlink3.mk" +.endif # LIBGGI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libggi diff --git a/graphics/libggiwmh/buildlink3.mk b/graphics/libggiwmh/buildlink3.mk index dc3754ea308..4f8cf572073 100644 --- a/graphics/libggiwmh/buildlink3.mk +++ b/graphics/libggiwmh/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:52 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:42 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGGIWMH_BUILDLINK3_MK:= ${LIBGGIWMH_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libggiwmh -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libggiwmh -.endif +.if !defined(LIBGGIWMH_BUILDLINK3_MK) +LIBGGIWMH_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibggiwmh} -BUILDLINK_PACKAGES+= libggiwmh -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libggiwmh - -.if !empty(LIBGGIWMH_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libggiwmh+= libggiwmh>=0.2.0 BUILDLINK_ABI_DEPENDS.libggiwmh?= libggiwmh>=0.2.1nb1 BUILDLINK_PKGSRCDIR.libggiwmh?= ../../graphics/libggiwmh -.endif # LIBGGIWMH_BUILDLINK3_MK .include "../../graphics/libggi/buildlink3.mk" +.endif # LIBGGIWMH_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libggiwmh diff --git a/graphics/libgii/buildlink3.mk b/graphics/libgii/buildlink3.mk index 6cdf45cc3e3..efcb9205294 100644 --- a/graphics/libgii/buildlink3.mk +++ b/graphics/libgii/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.10 2007/02/02 19:17:31 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:42 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGII_BUILDLINK3_MK:= ${LIBGII_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgii -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libgii -.endif +.if !defined(LIBGII_BUILDLINK3_MK) +LIBGII_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgii} -BUILDLINK_PACKAGES+= libgii -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgii - -.if !empty(LIBGII_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libgii+= libgii>=0.9.0 BUILDLINK_ABI_DEPENDS.libgii?= libgii>=0.9.1nb1 BUILDLINK_PKGSRCDIR.libgii?= ../../graphics/libgii -.endif # LIBGII_BUILDLINK3_MK .include "../../x11/libX11/buildlink3.mk" +.endif # LIBGII_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgii diff --git a/graphics/libgnomecanvas/buildlink3.mk b/graphics/libgnomecanvas/buildlink3.mk index 8f1e7f77143..b401f13585e 100644 --- a/graphics/libgnomecanvas/buildlink3.mk +++ b/graphics/libgnomecanvas/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.16 2008/10/16 17:49:18 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:42 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGNOMECANVAS_BUILDLINK3_MK:= ${LIBGNOMECANVAS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgnomecanvas -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libgnomecanvas -.endif +.if !defined(LIBGNOMECANVAS_BUILDLINK3_MK) +LIBGNOMECANVAS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomecanvas} -BUILDLINK_PACKAGES+= libgnomecanvas -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgnomecanvas - -.if !empty(LIBGNOMECANVAS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libgnomecanvas+= libgnomecanvas>=2.8.0 BUILDLINK_ABI_DEPENDS.libgnomecanvas+= libgnomecanvas>=2.14.0nb1 BUILDLINK_PKGSRCDIR.libgnomecanvas?= ../../graphics/libgnomecanvas -.endif # LIBGNOMECANVAS_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libglade/buildlink3.mk" .include "../../graphics/libart/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # LIBGNOMECANVAS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgnomecanvas diff --git a/graphics/libgnomecanvasmm/buildlink3.mk b/graphics/libgnomecanvasmm/buildlink3.mk index 1748f0e2c50..fb0dfd9d722 100644 --- a/graphics/libgnomecanvasmm/buildlink3.mk +++ b/graphics/libgnomecanvasmm/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/09/24 16:49:19 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:42 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGNOMECANVASMM_BUILDLINK3_MK:= ${LIBGNOMECANVASMM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgnomecanvasmm -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libgnomecanvasmm -.endif +.if !defined(LIBGNOMECANVASMM_BUILDLINK3_MK) +LIBGNOMECANVASMM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomecanvasmm} -BUILDLINK_PACKAGES+= libgnomecanvasmm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgnomecanvasmm - -.if !empty(LIBGNOMECANVASMM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libgnomecanvasmm+= libgnomecanvasmm>=2.10.0 BUILDLINK_ABI_DEPENDS.libgnomecanvasmm+= libgnomecanvasmm>=2.14.0nb1 BUILDLINK_PKGSRCDIR.libgnomecanvasmm?= ../../graphics/libgnomecanvasmm -.endif # LIBGNOMECANVASMM_BUILDLINK3_MK .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../x11/gtkmm/buildlink3.mk" +.endif # LIBGNOMECANVASMM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgnomecanvasmm diff --git a/graphics/libkdcraw/buildlink3.mk b/graphics/libkdcraw/buildlink3.mk index 9740a84d295..a1cd48fe7b0 100644 --- a/graphics/libkdcraw/buildlink3.mk +++ b/graphics/libkdcraw/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.4 2008/01/18 05:06:42 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:24:42 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBKDCRAW_BUILDLINK3_MK:= ${LIBKDCRAW_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libkdcraw -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libkdcraw -.endif +.if !defined(LIBKDCRAW_BUILDLINK3_MK) +LIBKDCRAW_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibkdcraw} -BUILDLINK_PACKAGES+= libkdcraw -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libkdcraw - -.if ${LIBKDCRAW_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libkdcraw+= libkdcraw>=0.1.1 BUILDLINK_ABI_DEPENDS.libkdcraw?= libkdcraw>=0.1.3nb1 BUILDLINK_PKGSRCDIR.libkdcraw?= ../../graphics/libkdcraw -.endif # LIBKDCRAW_BUILDLINK3_MK .include "../../x11/qt3-libs/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" +.endif # LIBKDCRAW_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libkdcraw diff --git a/graphics/libkexif/buildlink3.mk b/graphics/libkexif/buildlink3.mk index 035d284489f..502c67bb40d 100644 --- a/graphics/libkexif/buildlink3.mk +++ b/graphics/libkexif/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.13 2008/01/18 05:06:42 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:42 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBKEXIF_BUILDLINK3_MK:= ${LIBKEXIF_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libkexif -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libkexif -.endif +.if !defined(LIBKEXIF_BUILDLINK3_MK) +LIBKEXIF_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibkexif} -BUILDLINK_PACKAGES+= libkexif -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libkexif - -.if !empty(LIBKEXIF_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libkexif+= libkexif>=0.2.5 BUILDLINK_ABI_DEPENDS.libkexif?= libkexif>=0.2.5nb4 BUILDLINK_PKGSRCDIR.libkexif?= ../../graphics/libkexif -.endif # LIBKEXIF_BUILDLINK3_MK .include "../../graphics/libexif/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" +.endif # LIBKEXIF_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libkexif diff --git a/graphics/libkexiv2/buildlink3.mk b/graphics/libkexiv2/buildlink3.mk index 9b350f2bd92..c68c49c5028 100644 --- a/graphics/libkexiv2/buildlink3.mk +++ b/graphics/libkexiv2/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.5 2008/01/18 05:06:42 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:42 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBKEXIV2_BUILDLINK3_MK:= ${LIBKEXIV2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libkexiv2 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libkexiv2 -.endif +.if !defined(LIBKEXIV2_BUILDLINK3_MK) +LIBKEXIV2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibkexiv2} -BUILDLINK_PACKAGES+= libkexiv2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libkexiv2 - -.if ${LIBKEXIV2_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libkexiv2+= libkexiv2>=0.1.1 BUILDLINK_ABI_DEPENDS.libkexiv2+= libkexiv2>=0.1.6nb2 BUILDLINK_PKGSRCDIR.libkexiv2?= ../../graphics/libkexiv2 -.endif # LIBKEXIV2_BUILDLINK3_MK .include "../../graphics/exiv2/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" +.endif # LIBKEXIV2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libkexiv2 diff --git a/graphics/libkipi/buildlink3.mk b/graphics/libkipi/buildlink3.mk index 99777de9533..0776645219c 100644 --- a/graphics/libkipi/buildlink3.mk +++ b/graphics/libkipi/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.13 2008/01/18 05:06:42 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:42 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBKIPI_BUILDLINK3_MK:= ${LIBKIPI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libkipi -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libkipi -.endif +.if !defined(LIBKIPI_BUILDLINK3_MK) +LIBKIPI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibkipi} -BUILDLINK_PACKAGES+= libkipi -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libkipi - -.if !empty(LIBKIPI_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libkipi+= libkipi>=0.1.5 BUILDLINK_ABI_DEPENDS.libkipi?= libkipi>=0.1.5nb5 BUILDLINK_PKGSRCDIR.libkipi?= ../../graphics/libkipi @@ -20,10 +13,10 @@ BUILDLINK_PKGSRCDIR.libkipi?= ../../graphics/libkipi PRINT_PLIST_AWK+= /^@dirrm ${dir:S|/|\\/|g}$$/ \ { print "@comment in libkipi: " $$0; next; } . endfor -.endif # LIBKIPI_BUILDLINK3_MK .include "../../x11/kdelibs3/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" +.endif # LIBKIPI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libkipi diff --git a/graphics/liblqr/buildlink3.mk b/graphics/liblqr/buildlink3.mk index c0f1d614e1d..f20c9ba9938 100644 --- a/graphics/liblqr/buildlink3.mk +++ b/graphics/liblqr/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/04/05 02:00:39 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:42 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBLQR_BUILDLINK3_MK:= ${LIBLQR_BUILDLINK3_MK}+ +BUILDLINK_TREE+= liblqr -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= liblqr -.endif +.if !defined(LIBLQR_BUILDLINK3_MK) +LIBLQR_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nliblqr} -BUILDLINK_PACKAGES+= liblqr -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}liblqr - -.if ${LIBLQR_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.liblqr+= liblqr>=0.1.0.2 BUILDLINK_PKGSRCDIR.liblqr?= ../../graphics/liblqr -.endif # LIBLQR_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" +.endif # LIBLQR_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -liblqr diff --git a/graphics/libotf/buildlink3.mk b/graphics/libotf/buildlink3.mk index 2b0c8abc37d..6bfa898d83f 100644 --- a/graphics/libotf/buildlink3.mk +++ b/graphics/libotf/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/02/26 11:47:35 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:43 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBOTF_BUILDLINK3_MK:= ${LIBOTF_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libotf -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libotf -.endif +.if !defined(LIBOTF_BUILDLINK3_MK) +LIBOTF_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibotf} -BUILDLINK_PACKAGES+= libotf -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libotf - -.if ${LIBOTF_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libotf+= libotf>=0.9.7 BUILDLINK_PKGSRCDIR.libotf?= ../../graphics/libotf -.endif # LIBOTF_BUILDLINK3_MK .include "../../graphics/freetype2/buildlink3.mk" +.endif # LIBOTF_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libotf diff --git a/graphics/libpuzzle/buildlink3.mk b/graphics/libpuzzle/buildlink3.mk index 2a39b013be3..0323f912eca 100644 --- a/graphics/libpuzzle/buildlink3.mk +++ b/graphics/libpuzzle/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1 2009/03/05 00:23:46 imil Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:43 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBPUZZLE_BUILDLINK3_MK:= ${LIBPUZZLE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libpuzzle -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libpuzzle -.endif +.if !defined(LIBPUZZLE_BUILDLINK3_MK) +LIBPUZZLE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibpuzzle} -BUILDLINK_PACKAGES+= libpuzzle -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libpuzzle - -.if ${LIBPUZZLE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libpuzzle+= libpuzzle>=0.9 BUILDLINK_PKGSRCDIR.libpuzzle?= ../../graphics/libpuzzle -.endif # LIBPUZZLE_BUILDLINK3_MK .include "../../graphics/gd/buildlink3.mk" +.endif # LIBPUZZLE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libpuzzle diff --git a/graphics/librsvg/buildlink3.mk b/graphics/librsvg/buildlink3.mk index 605b0fa9e89..5d9899b7ecc 100644 --- a/graphics/librsvg/buildlink3.mk +++ b/graphics/librsvg/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.14 2009/02/27 20:11:20 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:43 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBRSVG_BUILDLINK3_MK:= ${LIBRSVG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= librsvg -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= librsvg -.endif +.if !defined(LIBRSVG_BUILDLINK3_MK) +LIBRSVG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibrsvg} -BUILDLINK_PACKAGES+= librsvg -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}librsvg - -.if !empty(LIBRSVG_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.librsvg+= librsvg>=2.12.6nb1 BUILDLINK_ABI_DEPENDS.librsvg+= librsvg>=2.18.2nb4 BUILDLINK_PKGSRCDIR.librsvg?= ../../graphics/librsvg -.endif # LIBRSVG_BUILDLINK3_MK .include "../../devel/libgsf/buildlink3.mk" .include "../../textproc/libcroco/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # LIBRSVG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -librsvg diff --git a/graphics/libscigraphica/buildlink3.mk b/graphics/libscigraphica/buildlink3.mk index 905380ded2d..e6c3581dcd7 100644 --- a/graphics/libscigraphica/buildlink3.mk +++ b/graphics/libscigraphica/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.4 2007/09/21 13:03:52 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:24:43 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSCIGRAPHICA_BUILDLINK3_MK:= ${LIBSCIGRAPHICA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libscigraphica -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libscigraphica -.endif +.if !defined(LIBSCIGRAPHICA_BUILDLINK3_MK) +LIBSCIGRAPHICA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibscigraphica} -BUILDLINK_PACKAGES+= libscigraphica -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libscigraphica - -.if ${LIBSCIGRAPHICA_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libscigraphica+= libscigraphica>=2.1.1 BUILDLINK_PKGSRCDIR.libscigraphica?= ../../graphics/libscigraphica -.endif # LIBSCIGRAPHICA_BUILDLINK3_MK .include "../../graphics/libart/buildlink3.mk" .include "../../math/py-numarray/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2+extra/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # LIBSCIGRAPHICA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libscigraphica diff --git a/graphics/libungif/buildlink3.mk b/graphics/libungif/buildlink3.mk index 359691b42c5..9129045a4a1 100644 --- a/graphics/libungif/buildlink3.mk +++ b/graphics/libungif/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:52 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:43 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBUNGIF_BUILDLINK3_MK:= ${LIBUNGIF_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libungif -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libungif -.endif +.if !defined(LIBUNGIF_BUILDLINK3_MK) +LIBUNGIF_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibungif} -BUILDLINK_PACKAGES+= libungif -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libungif - -.if !empty(LIBUNGIF_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libungif+= libungif>=4.1.0 BUILDLINK_ABI_DEPENDS.libungif+= libungif>=4.1.3nb1 BUILDLINK_PKGSRCDIR.libungif?= ../../graphics/libungif -.endif # LIBUNGIF_BUILDLINK3_MK +.endif # LIBUNGIF_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libungif diff --git a/graphics/libv4l/buildlink3.mk b/graphics/libv4l/buildlink3.mk index fc17139058d..aab59d0bf1e 100644 --- a/graphics/libv4l/buildlink3.mk +++ b/graphics/libv4l/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/01/10 21:04:23 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:43 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBV4L_BUILDLINK3_MK:= ${LIBV4L_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libv4l -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libv4l -.endif +.if !defined(LIBV4L_BUILDLINK3_MK) +LIBV4L_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibv4l} -BUILDLINK_PACKAGES+= libv4l -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libv4l - -.if !empty(LIBV4L_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libv4l+= libv4l>=0.4.3nb2 BUILDLINK_ABI_DEPENDS.libv4l+= libv4l>=0.4.3nb2 BUILDLINK_PKGSRCDIR.libv4l?= ../../graphics/libv4l -.endif # LIBV4L_BUILDLINK3_MK +.endif # LIBV4L_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libv4l diff --git a/graphics/libvideogfx/buildlink3.mk b/graphics/libvideogfx/buildlink3.mk index 67e7eefadc1..8159d3e8c57 100644 --- a/graphics/libvideogfx/buildlink3.mk +++ b/graphics/libvideogfx/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.9 2007/02/07 23:54:48 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:43 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBVIDEOGFX_BUILDLINK3_MK:= ${LIBVIDEOGFX_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libvideogfx -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libvideogfx -.endif +.if !defined(LIBVIDEOGFX_BUILDLINK3_MK) +LIBVIDEOGFX_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibvideogfx} -BUILDLINK_PACKAGES+= libvideogfx -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libvideogfx - -.if !empty(LIBVIDEOGFX_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libvideogfx+= libvideogfx>=1.0.3 BUILDLINK_ABI_DEPENDS.libvideogfx+= libvideogfx>=1.0.3nb3 BUILDLINK_PKGSRCDIR.libvideogfx?= ../../graphics/libvideogfx -.endif # LIBVIDEOGFX_BUILDLINK3_MK .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" +.endif # LIBVIDEOGFX_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libvideogfx diff --git a/graphics/libwmf/buildlink3.mk b/graphics/libwmf/buildlink3.mk index 47f7bc74b11..fd0cf655116 100644 --- a/graphics/libwmf/buildlink3.mk +++ b/graphics/libwmf/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:52 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:43 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBWMF_BUILDLINK3_MK:= ${LIBWMF_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libwmf -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libwmf -.endif +.if !defined(LIBWMF_BUILDLINK3_MK) +LIBWMF_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibwmf} -BUILDLINK_PACKAGES+= libwmf -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libwmf - -.if !empty(LIBWMF_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libwmf+= libwmf>=0.2.8nb2 BUILDLINK_ABI_DEPENDS.libwmf+= libwmf>=0.2.8.4nb3 BUILDLINK_PKGSRCDIR.libwmf?= ../../graphics/libwmf -.endif # LIBWMF_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" @@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.libwmf?= ../../graphics/libwmf .include "../../graphics/png/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.endif # LIBWMF_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libwmf diff --git a/graphics/mng/buildlink3.mk b/graphics/mng/buildlink3.mk index 94bb9876d61..7cd75193815 100644 --- a/graphics/mng/buildlink3.mk +++ b/graphics/mng/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:52 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:43 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MNG_BUILDLINK3_MK:= ${MNG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= mng -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= mng -.endif +.if !defined(MNG_BUILDLINK3_MK) +MNG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmng} -BUILDLINK_PACKAGES+= mng -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mng - -.if !empty(MNG_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.mng+= mng>=1.0.0 BUILDLINK_ABI_DEPENDS.mng+= mng>=1.0.9nb1 BUILDLINK_PKGSRCDIR.mng?= ../../graphics/mng -.endif # MNG_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/lcms/buildlink3.mk" +.endif # MNG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -mng diff --git a/graphics/netpbm/buildlink3.mk b/graphics/netpbm/buildlink3.mk index 494f6c2e744..4a18529c963 100644 --- a/graphics/netpbm/buildlink3.mk +++ b/graphics/netpbm/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:53 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:43 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -NETPBM_BUILDLINK3_MK:= ${NETPBM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= netpbm -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= netpbm -.endif +.if !defined(NETPBM_BUILDLINK3_MK) +NETPBM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnetpbm} -BUILDLINK_PACKAGES+= netpbm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}netpbm - -.if !empty(NETPBM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.netpbm+= netpbm>=10.11.6 BUILDLINK_ABI_DEPENDS.netpbm+= netpbm>=10.33nb1 BUILDLINK_PKGSRCDIR.netpbm?= ../../graphics/netpbm -.endif # NETPBM_BUILDLINK3_MK .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" +.endif # NETPBM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -netpbm diff --git a/graphics/openexr/buildlink3.mk b/graphics/openexr/buildlink3.mk index f85a0c997c7..99218085e2e 100644 --- a/graphics/openexr/buildlink3.mk +++ b/graphics/openexr/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.9 2007/11/30 21:52:17 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:44 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OPENEXR_BUILDLINK3_MK:= ${OPENEXR_BUILDLINK3_MK}+ +BUILDLINK_TREE+= openexr -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= openexr -.endif +.if !defined(OPENEXR_BUILDLINK3_MK) +OPENEXR_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenexr} -BUILDLINK_PACKAGES+= openexr -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openexr - -.if !empty(OPENEXR_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.openexr+= openexr>=1.6.1 BUILDLINK_PKGSRCDIR.openexr?= ../../graphics/openexr PTHREAD_OPTS+= require -.endif # OPENEXR_BUILDLINK3_MK .include "../../graphics/ilmbase/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.endif # OPENEXR_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -openexr diff --git a/graphics/p5-cairo/buildlink3.mk b/graphics/p5-cairo/buildlink3.mk index b6af34efa54..c8582acf3bf 100644 --- a/graphics/p5-cairo/buildlink3.mk +++ b/graphics/p5-cairo/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/04/13 23:21:38 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:44 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -P5_CAIRO_BUILDLINK3_MK:= ${P5_CAIRO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= p5-cairo -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= p5-cairo -.endif +.if !defined(P5_CAIRO_BUILDLINK3_MK) +P5_CAIRO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Np5-cairo} -BUILDLINK_PACKAGES+= p5-cairo -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}p5-cairo - -.if ${P5_CAIRO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.p5-cairo+= p5-cairo>=1.023 BUILDLINK_PKGSRCDIR.p5-cairo?= ../../graphics/p5-cairo -.endif # P5_CAIRO_BUILDLINK3_MK .include "../../graphics/cairo/buildlink3.mk" +.endif # P5_CAIRO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -p5-cairo diff --git a/graphics/pfstools/buildlink3.mk b/graphics/pfstools/buildlink3.mk index 438be02f635..24600026400 100644 --- a/graphics/pfstools/buildlink3.mk +++ b/graphics/pfstools/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/18 12:46:39 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:44 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PFSTOOLS_BUILDLINK3_MK:= ${PFSTOOLS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pfstools -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= pfstools -.endif +.if !defined(PFSTOOLS_BUILDLINK3_MK) +PFSTOOLS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npfstools} -BUILDLINK_PACKAGES+= pfstools -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pfstools - -.if ${PFSTOOLS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.pfstools+= pfstools>=1.7.0 BUILDLINK_PKGSRCDIR.pfstools?= ../../graphics/pfstools -.endif # PFSTOOLS_BUILDLINK3_MK +.endif # PFSTOOLS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pfstools diff --git a/graphics/plotutils-nox11/buildlink3.mk b/graphics/plotutils-nox11/buildlink3.mk index 59e1d567ce0..5aa6915a241 100644 --- a/graphics/plotutils-nox11/buildlink3.mk +++ b/graphics/plotutils-nox11/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:53 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:44 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PLOTUTILS_NOX11_BUILDLINK3_MK:= ${PLOTUTILS_NOX11_BUILDLINK3_MK}+ +BUILDLINK_TREE+= plotutils-nox11 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= plotutils-nox11 -.endif +.if !defined(PLOTUTILS_NOX11_BUILDLINK3_MK) +PLOTUTILS_NOX11_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nplotutils-nox11} -BUILDLINK_PACKAGES+= plotutils-nox11 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}plotutils-nox11 - -.if !empty(PLOTUTILS_NOX11_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.plotutils-nox11+= plotutils-nox11>=2.4.1 BUILDLINK_ABI_DEPENDS.plotutils-nox11?= plotutils-nox11>=2.4.1nb2 BUILDLINK_PKGSRCDIR.plotutils-nox11?= ../../graphics/plotutils-nox11 -.endif # PLOTUTILS_NOX11_BUILDLINK3_MK .include "../../graphics/png/buildlink3.mk" +.endif # PLOTUTILS_NOX11_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -plotutils-nox11 diff --git a/graphics/plotutils/buildlink3.mk b/graphics/plotutils/buildlink3.mk index ce64ab6c84a..ee788149f7d 100644 --- a/graphics/plotutils/buildlink3.mk +++ b/graphics/plotutils/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.11 2007/01/22 22:09:15 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:44 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PLOTUTILS_BUILDLINK3_MK:= ${PLOTUTILS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= plotutils -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= plotutils -.endif +.if !defined(PLOTUTILS_BUILDLINK3_MK) +PLOTUTILS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nplotutils} -BUILDLINK_PACKAGES+= plotutils -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}plotutils - -.if !empty(PLOTUTILS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.plotutils+= plotutils>=2.4.1nb2 BUILDLINK_ABI_DEPENDS.plotutils+= plotutils>=2.4.1nb5 BUILDLINK_PKGSRCDIR.plotutils?= ../../graphics/plotutils -.endif # PLOTUTILS_BUILDLINK3_MK .include "../../graphics/png/buildlink3.mk" .include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXp/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" +.endif # PLOTUTILS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -plotutils diff --git a/graphics/png/buildlink3.mk b/graphics/png/buildlink3.mk index 7d17890b35d..c55386c555e 100644 --- a/graphics/png/buildlink3.mk +++ b/graphics/png/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.22 2008/08/18 21:35:37 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.23 2009/03/20 19:24:44 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PNG_BUILDLINK3_MK:= ${PNG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= png -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= png -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npng} -BUILDLINK_PACKAGES+= png -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}png +.if !defined(PNG_BUILDLINK3_MK) +PNG_BUILDLINK3_MK:= -.if !empty(PNG_BUILDLINK3_MK:M+) # XXX tv - remove this OPSYS block the next time ABI_DEPENDS is bumped: . include "../../mk/bsd.fast.prefs.mk" . if ${OPSYS} == "Interix" @@ -26,7 +19,6 @@ BUILDLINK_PKGSRCDIR.png?= ../../graphics/png . if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64" CPPFLAGS+= -DPNG_NO_ASSEMBLER_CODE . endif -.endif # PNG_BUILDLINK3_MK # Work around broken libtool archive "/usr/X11/lib/libpng12.la" under # Mac OS 10.5.4 or newer which references a non-existing version of the @@ -36,5 +28,6 @@ BUILDLINK_TRANSFORM+= rename:-lpng12.0.26.0:-lpng .endif .include "../../devel/zlib/buildlink3.mk" +.endif # PNG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -png diff --git a/graphics/py-cairo/buildlink3.mk b/graphics/py-cairo/buildlink3.mk index 880f800af13..273f1809d13 100644 --- a/graphics/py-cairo/buildlink3.mk +++ b/graphics/py-cairo/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 17:30:11 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:44 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_CAIRO_BUILDLINK3_MK:= ${PY_CAIRO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pycairo -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pycairo -.endif +.if !defined(PY_CAIRO_BUILDLINK3_MK) +PY_CAIRO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npycairo} -BUILDLINK_PACKAGES+= pycairo -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pycairo - -.if !empty(PY_CAIRO_BUILDLINK3_MK:M+) . include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pycairo+= ${PYPKGPREFIX}-cairo>=1.0.2 BUILDLINK_ABI_DEPENDS.pycairo+= ${PYPKGPREFIX}-cairo>=1.0.2nb1 BUILDLINK_PKGSRCDIR.pycairo?= ../../graphics/py-cairo -.endif # PY_CAIRO_BUILDLINK3_MK .include "../../math/py-Numeric/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" +.endif # PY_CAIRO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pycairo diff --git a/graphics/py-imaging/buildlink3.mk b/graphics/py-imaging/buildlink3.mk index b75bdf77033..fe0ff5899d6 100644 --- a/graphics/py-imaging/buildlink3.mk +++ b/graphics/py-imaging/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 17:30:11 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:44 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_IMAGING_BUILDLINK3_MK:= ${PY_IMAGING_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pyimaging -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pyimaging -.endif +.if !defined(PY_IMAGING_BUILDLINK3_MK) +PY_IMAGING_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyimaging} -BUILDLINK_PACKAGES+= pyimaging -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyimaging - -.if !empty(PY_IMAGING_BUILDLINK3_MK:M+) .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.4 BUILDLINK_ABI_DEPENDS.pyimaging?= ${PYPKGPREFIX}-imaging>=1.1.5nb1 BUILDLINK_PKGSRCDIR.pyimaging?= ../../graphics/py-imaging -.endif # PY_IMAGING_BUILDLINK3_MK .include "../../graphics/jpeg/buildlink3.mk" +.endif # PY_IMAGING_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pyimaging diff --git a/graphics/py-matplotlib/buildlink3.mk b/graphics/py-matplotlib/buildlink3.mk index eaae70abc68..183ac617356 100644 --- a/graphics/py-matplotlib/buildlink3.mk +++ b/graphics/py-matplotlib/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 17:30:11 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:24:44 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_MATPLOTLIB_BUILDLINK3_MK:= ${PY_MATPLOTLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pymatplotlib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pymatplotlib -.endif +.if !defined(PY_MATPLOTLIB_BUILDLINK3_MK) +PY_MATPLOTLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npymatplotlib} -BUILDLINK_PACKAGES+= pymatplotlib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pymatplotlib - -.if !empty(PY_MATPLOTLIB_BUILDLINK3_MK:M+) .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pymatplotlib+= ${PYPKGPREFIX}-matplotlib>=0.87.2 BUILDLINK_PKGSRCDIR.pymatplotlib?= ../../graphics/py-matplotlib -.endif # PY_MATPLOTLIB_BUILDLINK3_MK +.endif # PY_MATPLOTLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pymatplotlib diff --git a/graphics/qimageblitz/buildlink3.mk b/graphics/qimageblitz/buildlink3.mk index 9c0456fd7e3..5810a2609a2 100644 --- a/graphics/qimageblitz/buildlink3.mk +++ b/graphics/qimageblitz/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/04 10:07:38 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:44 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -QIMAGEBLITZ_BUILDLINK3_MK:= ${QIMAGEBLITZ_BUILDLINK3_MK}+ +BUILDLINK_TREE+= qimageblitz -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= qimageblitz -.endif +.if !defined(QIMAGEBLITZ_BUILDLINK3_MK) +QIMAGEBLITZ_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nqimageblitz} -BUILDLINK_PACKAGES+= qimageblitz -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qimageblitz - -.if ${QIMAGEBLITZ_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.qimageblitz+= qimageblitz>=0.0.4 BUILDLINK_PKGSRCDIR.qimageblitz?= ../../graphics/qimageblitz -.endif # QIMAGEBLITZ_BUILDLINK3_MK .include "../../x11/qt4-libs/buildlink3.mk" +.endif # QIMAGEBLITZ_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -qimageblitz diff --git a/graphics/quesoglc/buildlink3.mk b/graphics/quesoglc/buildlink3.mk index 8ae77a2eb97..2c3846ff0cb 100644 --- a/graphics/quesoglc/buildlink3.mk +++ b/graphics/quesoglc/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/02/15 16:03:46 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:44 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -QUESOGLC_BUILDLINK3_MK:= ${QUESOGLC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= quesoglc -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= quesoglc -.endif +.if !defined(QUESOGLC_BUILDLINK3_MK) +QUESOGLC_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nquesoglc} -BUILDLINK_PACKAGES+= quesoglc -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}quesoglc - -.if ${QUESOGLC_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.quesoglc+= quesoglc>=0.7.1 BUILDLINK_PKGSRCDIR.quesoglc?= ../../graphics/quesoglc -.endif # QUESOGLC_BUILDLINK3_MK +.endif # QUESOGLC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -quesoglc diff --git a/graphics/ruby-rcairo/buildlink3.mk b/graphics/ruby-rcairo/buildlink3.mk index ec44eb89455..90be99c5af7 100644 --- a/graphics/ruby-rcairo/buildlink3.mk +++ b/graphics/ruby-rcairo/buildlink3.mk @@ -1,22 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/06/22 03:31:52 taca Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:45 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +BUILDLINK_TREE+= ${RUBY_PKGPREFIX}-rcairo -RUBY_RCAIRO_BUILDLINK3_MK:= ${RUBY_RCAIRO_BUILDLINK3_MK}+ +.if !defined(RUBY_RCAIRO_BUILDLINK3_MK) +RUBY_RCAIRO_BUILDLINK3_MK:= -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= ${RUBY_PKGPREFIX}-rcairo -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:N${RUBY_PKGPREFIX}-rcairo} -BUILDLINK_PACKAGES+= ${RUBY_PKGPREFIX}-rcairo -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}${RUBY_PKGPREFIX}-rcairo - -.if ${RUBY_RCAIRO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.ruby18-rcairo+= ${RUBY_PKGPREFIX}-rcairo>=1.6.0 BUILDLINK_PKGSRCDIR.ruby18-rcairo?= ../../graphics/ruby-rcairo -.endif # RUBY_RCAIRO_BUILDLINK3_MK .include "../../graphics/cairo/buildlink3.mk" +.endif # RUBY_RCAIRO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -${RUBY_PKGPREFIX}-rcairo diff --git a/graphics/sane-backends/buildlink3.mk b/graphics/sane-backends/buildlink3.mk index c9eb2ee54f4..c36beaa1926 100644 --- a/graphics/sane-backends/buildlink3.mk +++ b/graphics/sane-backends/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/12/12 21:52:36 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:45 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SANE_BACKENDS_BUILDLINK3_MK:= ${SANE_BACKENDS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= sane-backends -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= sane-backends -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsane-backends} -BUILDLINK_PACKAGES+= sane-backends -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sane-backends +.if !defined(SANE_BACKENDS_BUILDLINK3_MK) +SANE_BACKENDS_BUILDLINK3_MK:= -.if !empty(SANE_BACKENDS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.sane-backends+= sane-backends>=1.0.3 BUILDLINK_ABI_DEPENDS.sane-backends+= sane-backends>=1.0.17nb1 BUILDLINK_PKGSRCDIR.sane-backends?= ../../graphics/sane-backends -.endif # SANE_BACKENDS_BUILDLINK3_MK .include "../../mk/bsd.fast.prefs.mk" @@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.sane-backends?= ../../graphics/sane-backends . include "../../devel/libusb/buildlink3.mk" .endif .include "../../graphics/jpeg/buildlink3.mk" +.endif # SANE_BACKENDS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -sane-backends diff --git a/graphics/silgraphite-ft/buildlink3.mk b/graphics/silgraphite-ft/buildlink3.mk index 7c0d0422315..571a1ce9fd5 100644 --- a/graphics/silgraphite-ft/buildlink3.mk +++ b/graphics/silgraphite-ft/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/12/13 06:58:01 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:45 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SILGRAPHITE_FT_BUILDLINK3_MK:= ${SILGRAPHITE_FT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= silgraphite-ft -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= silgraphite-ft -.endif +.if !defined(SILGRAPHITE_FT_BUILDLINK3_MK) +SILGRAPHITE_FT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsilgraphite-ft} -BUILDLINK_PACKAGES+= silgraphite-ft -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}silgraphite-ft - -.if ${SILGRAPHITE_FT_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.silgraphite-ft+= silgraphite-ft>=2.2.0 BUILDLINK_PKGSRCDIR.silgraphite-ft?= ../../graphics/silgraphite-ft -.endif # SILGRAPHITE_FT_BUILDLINK3_MK .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/silgraphite/buildlink3.mk" +.endif # SILGRAPHITE_FT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -silgraphite-ft diff --git a/graphics/silgraphite-xft/buildlink3.mk b/graphics/silgraphite-xft/buildlink3.mk index 3892cc94b07..a508dfe52b1 100644 --- a/graphics/silgraphite-xft/buildlink3.mk +++ b/graphics/silgraphite-xft/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/12/15 00:44:52 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:45 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SILGRAPHITE_XFT_BUILDLINK3_MK:= ${SILGRAPHITE_XFT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= silgraphite-xft -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= silgraphite-xft -.endif +.if !defined(SILGRAPHITE_XFT_BUILDLINK3_MK) +SILGRAPHITE_XFT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsilgraphite-xft} -BUILDLINK_PACKAGES+= silgraphite-xft -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}silgraphite-xft - -.if ${SILGRAPHITE_XFT_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.silgraphite-xft+= silgraphite-xft>=2.3 BUILDLINK_PKGSRCDIR.silgraphite-xft?= ../../wip/silgraphite-xft -.endif # SILGRAPHITE_XFT_BUILDLINK3_MK .include "../../graphics/silgraphite-ft/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" +.endif # SILGRAPHITE_XFT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -silgraphite-xft diff --git a/graphics/silgraphite/buildlink3.mk b/graphics/silgraphite/buildlink3.mk index a1e7220d097..69b6bade0f8 100644 --- a/graphics/silgraphite/buildlink3.mk +++ b/graphics/silgraphite/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/12/09 01:54:25 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:45 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SILGRAPHITE_BUILDLINK3_MK:= ${SILGRAPHITE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= silgraphite -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= silgraphite -.endif +.if !defined(SILGRAPHITE_BUILDLINK3_MK) +SILGRAPHITE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsilgraphite} -BUILDLINK_PACKAGES+= silgraphite -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}silgraphite - -.if ${SILGRAPHITE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.silgraphite+= silgraphite>=2.3 BUILDLINK_PKGSRCDIR.silgraphite?= ../../graphics/silgraphite -.endif # SILGRAPHITE_BUILDLINK3_MK +.endif # SILGRAPHITE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -silgraphite diff --git a/graphics/simage/buildlink3.mk b/graphics/simage/buildlink3.mk index 8f793ee506b..ca57e8d7857 100644 --- a/graphics/simage/buildlink3.mk +++ b/graphics/simage/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.10 2007/01/07 12:25:54 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:45 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SIMAGE_BUILDLINK3_MK:= ${SIMAGE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= simage -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= simage -.endif +.if !defined(SIMAGE_BUILDLINK3_MK) +SIMAGE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsimage} -BUILDLINK_PACKAGES+= simage -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}simage - -.if !empty(SIMAGE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.simage+= simage>=1.6.1 BUILDLINK_ABI_DEPENDS.simage+= simage>=1.6.1nb4 BUILDLINK_PKGSRCDIR.simage?= ../../graphics/simage -.endif # SIMAGE_BUILDLINK3_MK .include "../../audio/libsndfile/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" @@ -25,5 +17,6 @@ BUILDLINK_PKGSRCDIR.simage?= ../../graphics/simage .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../multimedia/libogg/buildlink3.mk" +.endif # SIMAGE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -simage diff --git a/graphics/tiff/buildlink3.mk b/graphics/tiff/buildlink3.mk index f4a74e4888d..beeca3ba7cc 100644 --- a/graphics/tiff/buildlink3.mk +++ b/graphics/tiff/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 23:10:53 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:24:45 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TIFF_BUILDLINK3_MK:= ${TIFF_BUILDLINK3_MK}+ +BUILDLINK_TREE+= tiff -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= tiff -.endif +.if !defined(TIFF_BUILDLINK3_MK) +TIFF_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntiff} -BUILDLINK_PACKAGES+= tiff -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tiff - -.if !empty(TIFF_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.tiff+= tiff>=3.6.1 BUILDLINK_ABI_DEPENDS.tiff+= tiff>=3.7.2nb1 BUILDLINK_PKGSRCDIR.tiff?= ../../graphics/tiff -.endif # TIFF_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" +.endif # TIFF_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -tiff diff --git a/graphics/unicap/buildlink3.mk b/graphics/unicap/buildlink3.mk index 7f347f5148c..7e1bfb9db02 100644 --- a/graphics/unicap/buildlink3.mk +++ b/graphics/unicap/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:45 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -UNICAP_BUILDLINK3_MK:= ${UNICAP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= unicap -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= unicap -.endif +.if !defined(UNICAP_BUILDLINK3_MK) +UNICAP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nunicap} -BUILDLINK_PACKAGES+= unicap -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}unicap - -.if !empty(UNICAP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.unicap+= unicap>=0.9.1 BUILDLINK_ABI_DEPENDS.unicap+= unicap>=0.9.1 BUILDLINK_PKGSRCDIR.unicap?= ../../graphics/unicap -.endif # UNICAP_BUILDLINK3_MK .include "../../x11/libXv/buildlink3.mk" .include "../../multimedia/libtheora/buildlink3.mk" +.endif # UNICAP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -unicap diff --git a/graphics/urt/buildlink3.mk b/graphics/urt/buildlink3.mk index 0b3c9cefce4..59ab73ea14a 100644 --- a/graphics/urt/buildlink3.mk +++ b/graphics/urt/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.8 2007/05/24 04:46:52 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:45 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -URT_BUILDLINK3_MK:= ${URT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= urt -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= urt -.endif +.if !defined(URT_BUILDLINK3_MK) +URT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nurt} -BUILDLINK_PACKAGES+= urt -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}urt - -.if !empty(URT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.urt+= urt>=3.1b1nb5 BUILDLINK_ABI_DEPENDS.urt+= urt>=3.1b1nb7 BUILDLINK_PKGSRCDIR.urt?= ../../graphics/urt -.endif # URT_BUILDLINK3_MK .include "../../graphics/netpbm/buildlink3.mk" +.endif # URT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -urt diff --git a/graphics/wxsvg/buildlink3.mk b/graphics/wxsvg/buildlink3.mk index b97573bcc3e..7ad73c6732a 100644 --- a/graphics/wxsvg/buildlink3.mk +++ b/graphics/wxsvg/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.9 2008/09/22 20:21:03 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:45 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -WXSVG_BUILDLINK3_MK:= ${WXSVG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= wxsvg -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= wxsvg -.endif +.if !defined(WXSVG_BUILDLINK3_MK) +WXSVG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nwxsvg} -BUILDLINK_PACKAGES+= wxsvg -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wxsvg - -.if !empty(WXSVG_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.wxsvg+= wxsvg>=1.0beta5 BUILDLINK_ABI_DEPENDS.wxsvg?= wxsvg>=1.0beta5nb2 BUILDLINK_PKGSRCDIR.wxsvg?= ../../graphics/wxsvg -.endif # WXSVG_BUILDLINK3_MK .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/libart/buildlink3.mk" .include "../../x11/wxGTK26/buildlink3.mk" +.endif # WXSVG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -wxsvg diff --git a/graphics/xfce4-icon-theme/buildlink3.mk b/graphics/xfce4-icon-theme/buildlink3.mk index efc36251ed8..b275040a6ea 100644 --- a/graphics/xfce4-icon-theme/buildlink3.mk +++ b/graphics/xfce4-icon-theme/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.15 2008/12/18 16:43:28 hira Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:24:46 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_ICON_THEME_BUILDLINK3_MK:= ${XFCE4_ICON_THEME_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-icon-theme -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-icon-theme -.endif +.if !defined(XFCE4_ICON_THEME_BUILDLINK3_MK) +XFCE4_ICON_THEME_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-icon-theme} -BUILDLINK_PACKAGES+= xfce4-icon-theme -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-icon-theme - -.if ${XFCE4_ICON_THEME_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-icon-theme+= xfce4-icon-theme>=4.4.3 BUILDLINK_PKGSRCDIR.xfce4-icon-theme?= ../../graphics/xfce4-icon-theme -.endif # XFCE4_ICON_THEME_BUILDLINK3_MK .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_ICON_THEME_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-icon-theme diff --git a/graphics/xpm/buildlink3.mk b/graphics/xpm/buildlink3.mk index cc8ff134f2c..3d2d52a248a 100644 --- a/graphics/xpm/buildlink3.mk +++ b/graphics/xpm/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.24 2007/01/06 16:45:17 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2009/03/20 19:24:46 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XPM_BUILDLINK3_MK:= ${XPM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xpm -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= xpm -.endif +.if !defined(XPM_BUILDLINK3_MK) +XPM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxpm} -BUILDLINK_PACKAGES+= xpm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xpm - -.if !empty(XPM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.xpm+= xpm>=3.4k BUILDLINK_ABI_DEPENDS.xpm+= xpm>=3.4knb6 BUILDLINK_PKGSRCDIR.xpm?= ../../graphics/xpm -.endif # XPM_BUILDLINK3_MK .include "../../mk/x11.buildlink3.mk" +.endif # XPM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xpm diff --git a/ham/gnuradio-core/buildlink3.mk b/ham/gnuradio-core/buildlink3.mk index 5c342c75eb6..32ff780ee0a 100644 --- a/ham/gnuradio-core/buildlink3.mk +++ b/ham/gnuradio-core/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.13 2007/08/08 03:05:05 wulf Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:46 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNURADIO_CORE_BUILDLINK3_MK:= ${GNURADIO_CORE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnuradio-core -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= gnuradio-core -.endif +.if !defined(GNURADIO_CORE_BUILDLINK3_MK) +GNURADIO_CORE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnuradio-core} -BUILDLINK_PACKAGES+= gnuradio-core -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnuradio-core - -.if ${GNURADIO_CORE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.gnuradio-core+= gnuradio-core>=3.0.4 BUILDLINK_PKGSRCDIR.gnuradio-core?= ../../ham/gnuradio-core BUILDLINK_CPPFLAGS.gnuradio-core+= -I${BUILDLINK_PREFIX.gnuradio-core}/include/gnuradio -.endif # GNURADIO_CORE_BUILDLINK3_MK .include "../../devel/boost-headers/buildlink3.mk" .include "../../devel/cppunit/buildlink3.mk" @@ -24,5 +16,6 @@ BUILDLINK_CPPFLAGS.gnuradio-core+= -I${BUILDLINK_PREFIX.gnuradio-core}/includ .include "../../lang/python/extension.mk" .include "../../lang/python/pyversion.mk" .include "../../math/fftwf/buildlink3.mk" +.endif # GNURADIO_CORE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnuradio-core diff --git a/ham/gnuradio-wxgui/buildlink3.mk b/ham/gnuradio-wxgui/buildlink3.mk index 9bd64ee6105..7210746d523 100644 --- a/ham/gnuradio-wxgui/buildlink3.mk +++ b/ham/gnuradio-wxgui/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.11 2007/08/08 03:23:20 wulf Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:46 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNURADIO_WXGUI_BUILDLINK3_MK:= ${GNURADIO_WXGUI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnuradio-wxgui -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= gnuradio-wxgui -.endif +.if !defined(GNURADIO_WXGUI_BUILDLINK3_MK) +GNURADIO_WXGUI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnuradio-wxgui} -BUILDLINK_PACKAGES+= gnuradio-wxgui -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnuradio-wxgui - -.if ${GNURADIO_WXGUI_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.gnuradio-wxgui+= gnuradio-wxgui>=3.0.4 BUILDLINK_PKGSRCDIR.gnuradio-wxgui?= ../../ham/gnuradio-wxgui -.endif # GNURADIO_WXGUI_BUILDLINK3_MK .include "../../ham/gnuradio-core/buildlink3.mk" .include "../../x11/py-wxWidgets/buildlink3.mk" +.endif # GNURADIO_WXGUI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnuradio-wxgui diff --git a/ham/hamlib/buildlink3.mk b/ham/hamlib/buildlink3.mk index 8071d92222c..cbbb4a08a03 100644 --- a/ham/hamlib/buildlink3.mk +++ b/ham/hamlib/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:53 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:46 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -HAMLIB_BUILDLINK3_MK:= ${HAMLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= hamlib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= hamlib -.endif +.if !defined(HAMLIB_BUILDLINK3_MK) +HAMLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nhamlib} -BUILDLINK_PACKAGES+= hamlib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}hamlib - -.if !empty(HAMLIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.hamlib+= hamlib>=1.1.4 BUILDLINK_ABI_DEPENDS.hamlib+= hamlib>=1.2.5 BUILDLINK_PKGSRCDIR.hamlib?= ../../ham/hamlib -.endif # HAMLIB_BUILDLINK3_MK +.endif # HAMLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -hamlib diff --git a/ham/usrp/buildlink3.mk b/ham/usrp/buildlink3.mk index 58caf473c6f..d5493f4a490 100644 --- a/ham/usrp/buildlink3.mk +++ b/ham/usrp/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.11 2007/08/08 03:24:47 wulf Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:46 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -USRP_BUILDLINK3_MK:= ${USRP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= usrp -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= usrp -.endif +.if !defined(USRP_BUILDLINK3_MK) +USRP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nusrp} -BUILDLINK_PACKAGES+= usrp -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}usrp - -.if ${USRP_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.usrp+= usrp>=3.0.4 BUILDLINK_PKGSRCDIR.usrp?= ../../ham/usrp -.endif # USRP_BUILDLINK3_MK .include "../../ham/gnuradio-core/buildlink3.mk" .include "../../devel/libusb/buildlink3.mk" +.endif # USRP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -usrp diff --git a/inputmethod/anthy/buildlink3.mk b/inputmethod/anthy/buildlink3.mk index f3e08c96604..550d3164be7 100644 --- a/inputmethod/anthy/buildlink3.mk +++ b/inputmethod/anthy/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2007/01/20 17:11:52 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:46 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ANTHY_BUILDLINK3_MK:= ${ANTHY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= anthy -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= anthy -.endif +.if !defined(ANTHY_BUILDLINK3_MK) +ANTHY_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nanthy} -BUILDLINK_PACKAGES+= anthy -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}anthy - -.if !empty(ANTHY_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.anthy+= anthy>=6300 BUILDLINK_ABI_DEPENDS.anthy?= anthy>=7900 BUILDLINK_PKGSRCDIR.anthy?= ../../inputmethod/anthy -.endif # ANTHY_BUILDLINK3_MK +.endif # ANTHY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -anthy diff --git a/inputmethod/canna-lib/buildlink3.mk b/inputmethod/canna-lib/buildlink3.mk index 53987a7e016..b840c1510e5 100644 --- a/inputmethod/canna-lib/buildlink3.mk +++ b/inputmethod/canna-lib/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:53 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:46 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CANNA_LIB_BUILDLINK3_MK:= ${CANNA_LIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= Canna-lib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= Canna-lib -.endif +.if !defined(CANNA_LIB_BUILDLINK3_MK) +CANNA_LIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NCanna-lib} -BUILDLINK_PACKAGES+= Canna-lib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Canna-lib - -.if !empty(CANNA_LIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.Canna-lib+= Canna-lib>=3.6pl4 BUILDLINK_PKGSRCDIR.Canna-lib?= ../../inputmethod/canna-lib +.endif # CANNA_LIB_BUILDLINK3_MK -.endif # CANNA_LIB_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -Canna-lib diff --git a/inputmethod/ja-freewnn-lib/buildlink3.mk b/inputmethod/ja-freewnn-lib/buildlink3.mk index 169178c6b31..74bec913f11 100644 --- a/inputmethod/ja-freewnn-lib/buildlink3.mk +++ b/inputmethod/ja-freewnn-lib/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:53 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:46 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -JA_FREEWNN_LIB_BUILDLINK3_MK:= ${JA_FREEWNN_LIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ja-FreeWnn-lib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ja-FreeWnn-lib -.endif +.if !defined(JA_FREEWNN_LIB_BUILDLINK3_MK) +JA_FREEWNN_LIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nja-FreeWnn-lib} -BUILDLINK_PACKAGES+= ja-FreeWnn-lib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ja-FreeWnn-lib - -.if !empty(JA_FREEWNN_LIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ja-FreeWnn-lib+= ja-FreeWnn-lib>=1.10nb3 BUILDLINK_PKGSRCDIR.ja-FreeWnn-lib?= ../../inputmethod/ja-freewnn-lib BUILDLINK_DEPMETHOD.ja-freewnn?= build -.endif # JA_FREEWNN_LIB_BUILDLINK3_MK +.endif # JA_FREEWNN_LIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ja-FreeWnn-lib diff --git a/inputmethod/libchewing/buildlink3.mk b/inputmethod/libchewing/buildlink3.mk index 9cdff8f04b8..600a3763a6a 100644 --- a/inputmethod/libchewing/buildlink3.mk +++ b/inputmethod/libchewing/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:54 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:46 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBCHEWING_BUILDLINK3_MK:= ${LIBCHEWING_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libchewing -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libchewing -.endif +.if !defined(LIBCHEWING_BUILDLINK3_MK) +LIBCHEWING_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibchewing} -BUILDLINK_PACKAGES+= libchewing -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libchewing - -.if !empty(LIBCHEWING_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libchewing+= libchewing>=0.2.7 BUILDLINK_ABI_DEPENDS.libchewing+= libchewing>=0.2.7 BUILDLINK_PKGSRCDIR.libchewing?= ../../inputmethod/libchewing -.endif # LIBCHEWING_BUILDLINK3_MK +.endif # LIBCHEWING_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libchewing diff --git a/inputmethod/libhangul/buildlink3.mk b/inputmethod/libhangul/buildlink3.mk index 4914eb36731..127beadcfe2 100644 --- a/inputmethod/libhangul/buildlink3.mk +++ b/inputmethod/libhangul/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.2 2007/05/09 17:29:39 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:47 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBHANGUL_BUILDLINK3_MK:= ${LIBHANGUL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libhangul -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libhangul -.endif +.if !defined(LIBHANGUL_BUILDLINK3_MK) +LIBHANGUL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibhangul} -BUILDLINK_PACKAGES+= libhangul -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libhangul - -.if ${LIBHANGUL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libhangul+= libhangul>=0.0.4 BUILDLINK_PKGSRCDIR.libhangul?= ../../inputmethod/libhangul -.endif # LIBHANGUL_BUILDLINK3_MK +.endif # LIBHANGUL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libhangul diff --git a/inputmethod/libtabe/buildlink3.mk b/inputmethod/libtabe/buildlink3.mk index f8d86c4b4e4..e45ecb8da32 100644 --- a/inputmethod/libtabe/buildlink3.mk +++ b/inputmethod/libtabe/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:54 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:47 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBTABE_BUILDLINK3_MK:= ${LIBTABE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libtabe -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libtabe -.endif +.if !defined(LIBTABE_BUILDLINK3_MK) +LIBTABE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibtabe} -BUILDLINK_PACKAGES+= libtabe -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libtabe - -.if !empty(LIBTABE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libtabe+= libtabe>=0.2.5 BUILDLINK_ABI_DEPENDS.libtabe+= libtabe>=0.2.5nb2 BUILDLINK_PKGSRCDIR.libtabe?= ../../inputmethod/libtabe -.endif # LIBTABE_BUILDLINK3_MK .include "../../databases/db3/buildlink3.mk" +.endif # LIBTABE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libtabe diff --git a/inputmethod/m17n-im-config/buildlink3.mk b/inputmethod/m17n-im-config/buildlink3.mk index 363e590b8e3..1065a7e43b2 100644 --- a/inputmethod/m17n-im-config/buildlink3.mk +++ b/inputmethod/m17n-im-config/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/02/27 14:07:46 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:47 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -M17N_IM_CONFIG_BUILDLINK3_MK:= ${M17N_IM_CONFIG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= m17n-im-config -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= m17n-im-config -.endif +.if !defined(M17N_IM_CONFIG_BUILDLINK3_MK) +M17N_IM_CONFIG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nm17n-im-config} -BUILDLINK_PACKAGES+= m17n-im-config -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}m17n-im-config - -.if ${M17N_IM_CONFIG_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.m17n-im-config+= m17n-im-config>=0.9.0 BUILDLINK_PKGSRCDIR.m17n-im-config?= ../../inputmethod/m17n-im-config -.endif # M17N_IM_CONFIG_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/m17n-lib/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # M17N_IM_CONFIG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -m17n-im-config diff --git a/inputmethod/prime/buildlink3.mk b/inputmethod/prime/buildlink3.mk index 76f06acfe85..dbe8a1344b0 100644 --- a/inputmethod/prime/buildlink3.mk +++ b/inputmethod/prime/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/03/02 02:49:45 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:47 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PRIME_BUILDLINK3_MK:= ${PRIME_BUILDLINK3_MK}+ +BUILDLINK_TREE+= prime -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= prime -.endif +.if !defined(PRIME_BUILDLINK3_MK) +PRIME_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nprime} -BUILDLINK_PACKAGES+= prime -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}prime - -.if ${PRIME_BUILDLINK3_MK} == "+" .include "../../lang/ruby/rubyversion.mk" BUILDLINK_API_DEPENDS.prime+= ${RUBY_PKGPREFIX}-prime>=1.0.0.1 BUILDLINK_PKGSRCDIR.prime?= ../../inputmethod/prime -.endif # PRIME_BUILDLINK3_MK +.endif # PRIME_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -prime diff --git a/inputmethod/sj3-lib/buildlink3.mk b/inputmethod/sj3-lib/buildlink3.mk index 5a89e9875e2..74b8f604442 100644 --- a/inputmethod/sj3-lib/buildlink3.mk +++ b/inputmethod/sj3-lib/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:54 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:47 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SJ3_LIB_BUILDLINK3_MK:= ${SJ3_LIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= sj3-lib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= sj3-lib -.endif +.if !defined(SJ3_LIB_BUILDLINK3_MK) +SJ3_LIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsj3-lib} -BUILDLINK_PACKAGES+= sj3-lib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sj3-lib - -.if !empty(SJ3_LIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.sj3-lib+= sj3-lib>=2.0.1.20nb1 BUILDLINK_PKGSRCDIR.sj3-lib?= ../../inputmethod/sj3-lib BUILDLINK_DEPMETHOD.sj3-lib?= build -.endif # SJ3_LIB_BUILDLINK3_MK +.endif # SJ3_LIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -sj3-lib diff --git a/inputmethod/tomoe-gtk/buildlink3.mk b/inputmethod/tomoe-gtk/buildlink3.mk index 674eea578cc..9b59593ccee 100644 --- a/inputmethod/tomoe-gtk/buildlink3.mk +++ b/inputmethod/tomoe-gtk/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/11/01 17:54:00 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:47 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TOMOE_GTK_BUILDLINK3_MK:= ${TOMOE_GTK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= tomoe-gtk -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= tomoe-gtk -.endif +.if !defined(TOMOE_GTK_BUILDLINK3_MK) +TOMOE_GTK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntomoe-gtk} -BUILDLINK_PACKAGES+= tomoe-gtk -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tomoe-gtk - -.if ${TOMOE_GTK_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.tomoe-gtk+= tomoe-gtk>=0.6.0 BUILDLINK_PKGSRCDIR.tomoe-gtk?= ../../inputmethod/tomoe-gtk -.endif # TOMOE_GTK_BUILDLINK3_MK .include "../../inputmethod/tomoe/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # TOMOE_GTK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -tomoe-gtk diff --git a/inputmethod/tomoe/buildlink3.mk b/inputmethod/tomoe/buildlink3.mk index c1e01e2fcb1..02a425b9f72 100644 --- a/inputmethod/tomoe/buildlink3.mk +++ b/inputmethod/tomoe/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/04/13 06:05:44 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:47 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TOMOE_BUILDLINK3_MK:= ${TOMOE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= tomoe -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= tomoe -.endif +.if !defined(TOMOE_BUILDLINK3_MK) +TOMOE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntomoe} -BUILDLINK_PACKAGES+= tomoe -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tomoe - -.if ${TOMOE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.tomoe+= tomoe>=0.6.0 BUILDLINK_PKGSRCDIR.tomoe?= ../../inputmethod/tomoe -.endif # TOMOE_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" +.endif # TOMOE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -tomoe diff --git a/inputmethod/uim/buildlink3.mk b/inputmethod/uim/buildlink3.mk index 3ba1de07aae..6bc3112cc28 100644 --- a/inputmethod/uim/buildlink3.mk +++ b/inputmethod/uim/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.10 2008/06/08 13:01:48 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:47 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -UIM_BUILDLINK3_MK:= ${UIM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= uim -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= uim -.endif +.if !defined(UIM_BUILDLINK3_MK) +UIM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nuim} -BUILDLINK_PACKAGES+= uim -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}uim - -.if !empty(UIM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.uim+= uim>=1.5.1 BUILDLINK_ABI_DEPENDS.uim?= uim>=1.5.1 BUILDLINK_PKGSRCDIR.uim?= ../../inputmethod/uim -.endif # UIM_BUILDLINK3_MK .include "../../devel/libgcroots/buildlink3.mk" +.endif # UIM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -uim diff --git a/inputmethod/unicon-im/buildlink3.mk b/inputmethod/unicon-im/buildlink3.mk index cab6eba92f8..9af3e8400c3 100644 --- a/inputmethod/unicon-im/buildlink3.mk +++ b/inputmethod/unicon-im/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:54 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:47 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -UNICON_IM_BUILDLINK3_MK:= ${UNICON_IM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= unicon-im -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= unicon-im -.endif +.if !defined(UNICON_IM_BUILDLINK3_MK) +UNICON_IM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nunicon-im} -BUILDLINK_PACKAGES+= unicon-im -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}unicon-im - -.if !empty(UNICON_IM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.unicon-im+= unicon-im>=1.2nb2 BUILDLINK_ABI_DEPENDS.unicon-im+= unicon-im>=1.2nb4 BUILDLINK_PKGSRCDIR.unicon-im?= ../../inputmethod/unicon-im -.endif # UNICON_IM_BUILDLINK3_MK .include "../../devel/pth/buildlink3.mk" +.endif # UNICON_IM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -unicon-im diff --git a/lang/Cg-compiler/buildlink3.mk b/lang/Cg-compiler/buildlink3.mk index 9ef13d7d3cc..4bc9d0fb071 100644 --- a/lang/Cg-compiler/buildlink3.mk +++ b/lang/Cg-compiler/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:54 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:47 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CG_COMPILER_BUILDLINK3_MK:= ${CG_COMPILER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= Cg-compiler -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= Cg-compiler -.endif +.if !defined(CG_COMPILER_BUILDLINK3_MK) +CG_COMPILER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NCg-compiler} -BUILDLINK_PACKAGES+= Cg-compiler -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Cg-compiler - -.if !empty(CG_COMPILER_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.Cg-compiler+= Cg-compiler>=1.2.1 BUILDLINK_ABI_DEPENDS.Cg-compiler?= Cg-compiler>=1.3beta2nb1 BUILDLINK_PKGSRCDIR.Cg-compiler?= ../../lang/Cg-compiler -.endif # CG_COMPILER_BUILDLINK3_MK +.endif # CG_COMPILER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -Cg-compiler diff --git a/lang/camlp5/buildlink3.mk b/lang/camlp5/buildlink3.mk index 9412fd22c16..0b07a55826d 100644 --- a/lang/camlp5/buildlink3.mk +++ b/lang/camlp5/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/12/01 12:56:04 tonio Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:48 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CAMLP5_BUILDLINK3_MK:= ${CAMLP5_BUILDLINK3_MK}+ +BUILDLINK_TREE+= camlp5 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= camlp5 -.endif +.if !defined(CAMLP5_BUILDLINK3_MK) +CAMLP5_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncamlp5} -BUILDLINK_PACKAGES+= camlp5 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}camlp5 - -.if ${CAMLP5_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.camlp5+= camlp5>=5.01 BUILDLINK_PKGSRCDIR.camlp5?= ../../lang/camlp5 -.endif # CAMLP5_BUILDLINK3_MK .include "../../lang/ocaml/buildlink3.mk" +.endif # CAMLP5_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -camlp5 diff --git a/lang/cdl3/buildlink3.mk b/lang/cdl3/buildlink3.mk index 4f304ac132a..36a6010933b 100644 --- a/lang/cdl3/buildlink3.mk +++ b/lang/cdl3/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:54 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:48 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CDL3_BUILDLINK3_MK:= ${CDL3_BUILDLINK3_MK}+ +BUILDLINK_TREE+= cdl3 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= cdl3 -.endif +.if !defined(CDL3_BUILDLINK3_MK) +CDL3_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncdl3} -BUILDLINK_PACKAGES+= cdl3 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cdl3 - -.if !empty(CDL3_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.cdl3+= cdl3>=1.2.5 BUILDLINK_ABI_DEPENDS.cdl3?= cdl3>=1.2.5nb1 BUILDLINK_PKGSRCDIR.cdl3?= ../../lang/cdl3 -.endif # CDL3_BUILDLINK3_MK +.endif # CDL3_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -cdl3 diff --git a/lang/ecl/buildlink3.mk b/lang/ecl/buildlink3.mk index dbc0f5460c7..d034ac8cad2 100644 --- a/lang/ecl/buildlink3.mk +++ b/lang/ecl/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/12/19 23:12:46 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:48 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ECL_BUILDLINK3_MK:= ${ECL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ecl -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= ecl -.endif +.if !defined(ECL_BUILDLINK3_MK) +ECL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Necl} -BUILDLINK_PACKAGES+= ecl -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ecl - -.if ${ECL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.ecl+= ecl>=0.9.12 BUILDLINK_PKGSRCDIR.ecl?= ../../lang/ecl -.endif # ECL_BUILDLINK3_MK .include "../../devel/boehm-gc/buildlink3.mk" .include "../../devel/gmp/buildlink3.mk" +.endif # ECL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ecl diff --git a/lang/eieio/buildlink3.mk b/lang/eieio/buildlink3.mk index adf70be4a7d..d72d0999cdf 100644 --- a/lang/eieio/buildlink3.mk +++ b/lang/eieio/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:41:18 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:48 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EIEIO_BUILDLINK3_MK:= ${EIEIO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= eieio -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= eieio -.endif +.if !defined(EIEIO_BUILDLINK3_MK) +EIEIO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Neieio} -BUILDLINK_PACKAGES+= eieio -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}eieio - -.if ${EIEIO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.eieio+= ${EMACS_PKGNAME_PREFIX}eieio>=0.17 BUILDLINK_PKGSRCDIR.eieio?= ../../lang/eieio -.endif # EIEIO_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.eieio= ${EGREP} '.*\.el$$|.*\.elc$$' +.endif # EIEIO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -eieio diff --git a/lang/elk/buildlink3.mk b/lang/elk/buildlink3.mk index 4db32edac0c..00488ab7b6f 100644 --- a/lang/elk/buildlink3.mk +++ b/lang/elk/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:54 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:48 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ELK_BUILDLINK3_MK:= ${ELK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= elk -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= elk -.endif +.if !defined(ELK_BUILDLINK3_MK) +ELK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nelk} -BUILDLINK_PACKAGES+= elk -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}elk - -.if !empty(ELK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.elk+= elk>=3.99.6 BUILDLINK_PKGSRCDIR.elk?= ../../lang/elk -.endif # ELK_BUILDLINK3_MK +.endif # ELK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -elk diff --git a/lang/embryo/buildlink3.mk b/lang/embryo/buildlink3.mk index 85c15c365c4..409f039ea9e 100644 --- a/lang/embryo/buildlink3.mk +++ b/lang/embryo/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/10/26 07:54:20 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:48 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EMBRYO_BUILDLINK3_MK:= ${EMBRYO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= embryo -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= embryo -.endif +.if !defined(EMBRYO_BUILDLINK3_MK) +EMBRYO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nembryo} -BUILDLINK_PACKAGES+= embryo -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}embryo - -.if ${EMBRYO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.embryo+= embryo>=0.9.5.050 BUILDLINK_PKGSRCDIR.embryo?= ../../lang/embryo -.endif # EMBRYO_BUILDLINK3_MK +.endif # EMBRYO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -embryo diff --git a/lang/erlang/buildlink3.mk b/lang/erlang/buildlink3.mk index dd14d070c7c..b38c8f69e0d 100644 --- a/lang/erlang/buildlink3.mk +++ b/lang/erlang/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2007/07/28 06:28:38 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:48 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ERLANG_BUILDLINK3_MK:= ${ERLANG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= erlang -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= erlang -.endif +.if !defined(ERLANG_BUILDLINK3_MK) +ERLANG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nerlang} -BUILDLINK_PACKAGES+= erlang -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}erlang - -.if ${ERLANG_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.erlang+= erlang>=10.1 BUILDLINK_ABI_DEPENDS.erlang?= erlang>=10.1.9nb1 BUILDLINK_PKGSRCDIR.erlang?= ../../lang/erlang -.endif # ERLANG_BUILDLINK3_MK +.endif # ERLANG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -erlang diff --git a/lang/ezm3/buildlink3.mk b/lang/ezm3/buildlink3.mk index 22e90187876..0c050044411 100644 --- a/lang/ezm3/buildlink3.mk +++ b/lang/ezm3/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:54 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:48 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EZM3_BUILDLINK3_MK:= ${EZM3_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ezm3 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ezm3 -.endif +.if !defined(EZM3_BUILDLINK3_MK) +EZM3_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nezm3} -BUILDLINK_PACKAGES+= ezm3 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ezm3 - -.if !empty(EZM3_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ezm3+= ezm3>=1.1nb1 BUILDLINK_DEPMETHOD.ezm3?= build BUILDLINK_ABI_DEPENDS.ezm3?= ezm3>=1.2nb1 BUILDLINK_PKGSRCDIR.ezm3?= ../../lang/ezm3 -.endif # EZM3_BUILDLINK3_MK BUILDLINK_PASSTHRU_DIRS+= ${PREFIX}/ezm3 +.endif # EZM3_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ezm3 diff --git a/lang/f2c/buildlink3.mk b/lang/f2c/buildlink3.mk index dfcb7516bcd..06911d5efc2 100644 --- a/lang/f2c/buildlink3.mk +++ b/lang/f2c/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:54 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:48 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -F2C_BUILDLINK3_MK:= ${F2C_BUILDLINK3_MK}+ +BUILDLINK_TREE+= f2c -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= f2c -.endif +.if !defined(F2C_BUILDLINK3_MK) +F2C_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nf2c} -BUILDLINK_PACKAGES+= f2c -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}f2c - -.if !empty(F2C_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.f2c+= f2c>=20001205nb3 BUILDLINK_ABI_DEPENDS.f2c+= f2c>=20001205nb8 BUILDLINK_PKGSRCDIR.f2c?= ../../lang/f2c -.endif # F2C_BUILDLINK3_MK # The f2c-f77 script takes some environment variables to override hardcoded # values for the compiler and C preprocessor. @@ -24,5 +16,6 @@ CONFIGURE_ENV+= CC_f2c=${CC:Q} CONFIGURE_ENV+= CPP=${CPP:Q} MAKE_ENV+= CC_f2c=${CC:Q} MAKE_ENV+= CPP=${CPP:Q} +.endif # F2C_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -f2c diff --git a/lang/g95/buildlink3.mk b/lang/g95/buildlink3.mk index 2f1807c4771..a00befa2b14 100644 --- a/lang/g95/buildlink3.mk +++ b/lang/g95/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1 2008/06/04 13:12:20 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:48 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -G95_BUILDLINK3_MK:= ${G95_BUILDLINK3_MK}+ +BUILDLINK_TREE+= g95 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= g95 -.endif +.if !defined(G95_BUILDLINK3_MK) +G95_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ng95} -BUILDLINK_PACKAGES+= g95 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}g95 - -.if ${G95_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.g95+= g95>=0.91 BUILDLINK_PKGSRCDIR.g95?= ../../lang/g95 -.endif # G95_BUILDLINK3_MK +.endif # G95_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -g95 diff --git a/lang/gambc/buildlink3.mk b/lang/gambc/buildlink3.mk index b1dcd440b42..c6d65e84781 100644 --- a/lang/gambc/buildlink3.mk +++ b/lang/gambc/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/04/28 04:14:31 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:49 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GAMBC_BUILDLINK3_MK:= ${GAMBC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gambc -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= gambc -.endif +.if !defined(GAMBC_BUILDLINK3_MK) +GAMBC_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngambc} -BUILDLINK_PACKAGES+= gambc -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gambc - -.if ${GAMBC_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.gambc+= gambc>=4.2.6 BUILDLINK_PKGSRCDIR.gambc?= ../../lang/gambc -.endif # GAMBC_BUILDLINK3_MK .include "../../mk/dlopen.buildlink3.mk" +.endif # GAMBC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gambc diff --git a/lang/gauche/buildlink3.mk b/lang/gauche/buildlink3.mk index 696d7322d1f..8353fac66e7 100644 --- a/lang/gauche/buildlink3.mk +++ b/lang/gauche/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:54 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:49 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GAUCHE_BUILDLINK3_MK:= ${GAUCHE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= Gauche -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= Gauche -.endif +.if !defined(GAUCHE_BUILDLINK3_MK) +GAUCHE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGauche} -BUILDLINK_PACKAGES+= Gauche -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Gauche - -.if !empty(GAUCHE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.Gauche+= Gauche>=0.8.1 BUILDLINK_PKGSRCDIR.Gauche?= ../../lang/gauche -.endif # GAUCHE_BUILDLINK3_MK .include "../../converters/libiconv/buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" +.endif # GAUCHE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -Gauche diff --git a/lang/gcc/buildlink3.mk b/lang/gcc/buildlink3.mk index 3a2e758a6be..1d11cca8471 100644 --- a/lang/gcc/buildlink3.mk +++ b/lang/gcc/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.13 2006/12/12 21:52:36 joerg Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GCC_BUILDLINK3_MK:= ${GCC_BUILDLINK3_MK}+ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:49 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gcc -.endif +BUILDLINK_TREE+= gcc -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc} -BUILDLINK_PACKAGES+= gcc -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gcc +.if !defined(GCC_BUILDLINK3_MK) +GCC_BUILDLINK3_MK:= -.if !empty(GCC_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gcc+= gcc>=${_GCC_REQD} BUILDLINK_ABI_DEPENDS.gcc?= gcc>=2.95.3nb7 BUILDLINK_PKGSRCDIR.gcc?= ../../lang/gcc @@ -27,6 +20,6 @@ BUILDLINK_DEPMETHOD.gcc+= full . else BUILDLINK_DEPMETHOD.gcc?= build . endif -.endif # GCC_BUILDLINK3_MK +.endif # GCC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gcc diff --git a/lang/gcc3-ada/buildlink3.mk b/lang/gcc3-ada/buildlink3.mk index fe4e38f188c..b96b0014c46 100644 --- a/lang/gcc3-ada/buildlink3.mk +++ b/lang/gcc3-ada/buildlink3.mk @@ -1,18 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.8 2007/01/17 03:11:19 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:49 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GCC3_ADA_BUILDLINK3_MK:= ${GCC3_ADA_BUILDLINK3_MK}+ BUILDLINK_PREFIX.gcc3-ada:=${LOCALBASE}/gcc3 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gcc3-ada -.endif +BUILDLINK_TREE+= gcc3-ada -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc3-ada} -BUILDLINK_PACKAGES+= gcc3-ada -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gcc3-ada +.if !defined(GCC3_ADA_BUILDLINK3_MK) +GCC3_ADA_BUILDLINK3_MK:= -.if !empty(GCC3_ADA_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gcc3-ada+= gcc3-ada>=3.3.3 BUILDLINK_ABI_DEPENDS.gcc3-ada?= gcc3-ada>=3.3.5nb1 BUILDLINK_PKGSRCDIR.gcc3-ada?= ../../lang/gcc3-ada @@ -23,7 +17,6 @@ BUILDLINK_LIBDIRS.gcc3-ada+= lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3 BUILDLINK_LIBDIRS.gcc3-ada+= ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-ada}\///}/adalib BUILDLINK_INCDIRS.gcc3-ada+= include ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-ada}\///}/adainclude . endif -.endif # GCC3_ADA_BUILDLINK3_MK BUILDLINK_PKGSRCDIR.gcc3-ada?= ../../lang/gcc3-ada BUILDLINK_FILES_CMD.gcc3-ada= (cd ${BUILDLINK_PREFIX.gcc3-ada} && \ @@ -34,5 +27,6 @@ BUILDLINK_DEPMETHOD.gcc3-ada?= build .include "../../mk/pthread.buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" +.endif # GCC3_ADA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gcc3-ada diff --git a/lang/gcc3-c++/buildlink3.mk b/lang/gcc3-c++/buildlink3.mk index 40b5bf179d0..7575c05169b 100644 --- a/lang/gcc3-c++/buildlink3.mk +++ b/lang/gcc3-c++/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.17 2006/12/12 21:52:36 joerg Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GCC3_CXX_BUILDLINK3_MK:= ${GCC3_CXX_BUILDLINK3_MK}+ +# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:24:49 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gcc3-cxx -.endif +BUILDLINK_TREE+= gcc3-cxx -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc3-cxx} -BUILDLINK_PACKAGES+= gcc3-cxx -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gcc3-cxx +.if !defined(GCC3_CXX_BUILDLINK3_MK) +GCC3_CXX_BUILDLINK3_MK:= -.if !empty(GCC3_CXX_BUILDLINK3_MK:M+) . if defined(GCC3_INSTALLTO_SUBPREFIX) . if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} @@ -31,6 +24,6 @@ BUILDLINK_DEPMETHOD.gcc3-cxx+= full . else BUILDLINK_DEPMETHOD.gcc3-cxx?= build . endif -.endif # GCC3_CXX_BUILDLINK3_MK +.endif # GCC3_CXX_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gcc3-cxx diff --git a/lang/gcc3-c/buildlink3.mk b/lang/gcc3-c/buildlink3.mk index 5a249882c38..75c692fd73a 100644 --- a/lang/gcc3-c/buildlink3.mk +++ b/lang/gcc3-c/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.17 2007/02/15 14:35:16 rillig Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GCC3_C_BUILDLINK3_MK:= ${GCC3_C_BUILDLINK3_MK}+ +# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:24:49 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gcc3-c -.endif +BUILDLINK_TREE+= gcc3-c -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc3-c} -BUILDLINK_PACKAGES+= gcc3-c -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gcc3-c +.if !defined(GCC3_C_BUILDLINK3_MK) +GCC3_C_BUILDLINK3_MK:= -.if !empty(GCC3_C_BUILDLINK3_MK:M+) . include "../../mk/bsd.prefs.mk" . if defined(GCC3_INSTALLTO_SUBPREFIX) # @@ -42,6 +35,6 @@ BUILDLINK_DEPMETHOD.gcc3-c+= full . else BUILDLINK_DEPMETHOD.gcc3-c?= build . endif -.endif # GCC3_C_BUILDLINK3_MK +.endif # GCC3_C_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gcc3-c diff --git a/lang/gcc3-f77/buildlink3.mk b/lang/gcc3-f77/buildlink3.mk index ef4979caa52..6279d84a8c1 100644 --- a/lang/gcc3-f77/buildlink3.mk +++ b/lang/gcc3-f77/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.17 2006/12/12 21:52:36 joerg Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GCC3_F77_BUILDLINK3_MK:= ${GCC3_F77_BUILDLINK3_MK}+ +# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:24:49 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gcc3-f77 -.endif +BUILDLINK_TREE+= gcc3-f77 -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc3-f77} -BUILDLINK_PACKAGES+= gcc3-f77 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gcc3-f77 +.if !defined(GCC3_F77_BUILDLINK3_MK) +GCC3_F77_BUILDLINK3_MK:= -.if !empty(GCC3_F77_BUILDLINK3_MK:M+) . if defined(GCC3_INSTALLTO_SUBPREFIX) . if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} @@ -31,6 +24,6 @@ BUILDLINK_DEPMETHOD.gcc3-f77+= full . else BUILDLINK_DEPMETHOD.gcc3-f77?= build . endif -.endif # GCC3_F77_BUILDLINK3_MK +.endif # GCC3_F77_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gcc3-f77 diff --git a/lang/gcc3-java/buildlink3.mk b/lang/gcc3-java/buildlink3.mk index 941ea380bfd..f8e5ca5933f 100644 --- a/lang/gcc3-java/buildlink3.mk +++ b/lang/gcc3-java/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.17 2006/12/12 21:52:36 joerg Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GCC3_JAVA_BUILDLINK3_MK:= ${GCC3_JAVA_BUILDLINK3_MK}+ +# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:24:49 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gcc3-java -.endif +BUILDLINK_TREE+= gcc3-java -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc3-java} -BUILDLINK_PACKAGES+= gcc3-java -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gcc3-java +.if !defined(GCC3_JAVA_BUILDLINK3_MK) +GCC3_JAVA_BUILDLINK3_MK:= -.if !empty(GCC3_JAVA_BUILDLINK3_MK:M+) . if defined(GCC3_INSTALLTO_SUBPREFIX) . if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} @@ -31,6 +24,6 @@ BUILDLINK_DEPMETHOD.gcc3-java+= full . else BUILDLINK_DEPMETHOD.gcc3-java?= build . endif -.endif # GCC3_JAVA_BUILDLINK3_MK +.endif # GCC3_JAVA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gcc3-java diff --git a/lang/gcc3-objc/buildlink3.mk b/lang/gcc3-objc/buildlink3.mk index 64ed5f7b571..12ed022bbf1 100644 --- a/lang/gcc3-objc/buildlink3.mk +++ b/lang/gcc3-objc/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.17 2006/12/12 21:52:36 joerg Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GCC3_OBJC_BUILDLINK3_MK:= ${GCC3_OBJC_BUILDLINK3_MK}+ +# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:24:49 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gcc3-objc -.endif +BUILDLINK_TREE+= gcc3-objc -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc3-objc} -BUILDLINK_PACKAGES+= gcc3-objc -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gcc3-objc +.if !defined(GCC3_OBJC_BUILDLINK3_MK) +GCC3_OBJC_BUILDLINK3_MK:= -.if !empty(GCC3_OBJC_BUILDLINK3_MK:M+) . if defined(GCC3_INSTALLTO_SUBPREFIX) . if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} @@ -31,6 +24,6 @@ BUILDLINK_DEPMETHOD.gcc3-objc+= full . else BUILDLINK_DEPMETHOD.gcc3-objc?= build . endif -.endif # GCC3_OBJC_BUILDLINK3_MK +.endif # GCC3_OBJC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gcc3-objc diff --git a/lang/gcc34-ada/buildlink3.mk b/lang/gcc34-ada/buildlink3.mk index 4e7668799c6..1f7694a401e 100644 --- a/lang/gcc34-ada/buildlink3.mk +++ b/lang/gcc34-ada/buildlink3.mk @@ -1,18 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.11 2007/01/17 03:11:19 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:49 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GCCADA_BUILDLINK3_MK:= ${GCCADA_BUILDLINK3_MK}+ BUILDLINK_PREFIX.gcc34-ada:=${LOCALBASE}/gcc34-ada -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gcc34-ada -.endif +BUILDLINK_TREE+= gcc34-ada -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc34-ada} -BUILDLINK_PACKAGES+= gcc34-ada -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gcc34-ada +.if !defined(GCCADA_BUILDLINK3_MK) +GCCADA_BUILDLINK3_MK:= -.if !empty(GCCADA_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gcc34-ada+= gcc34-ada>=3.4.1nb4 BUILDLINK_ABI_DEPENDS.gcc34-ada?= gcc34-ada>=3.4.4nb1 BUILDLINK_PKGSRCDIR.gcc34-ada?= ../../lang/gcc34-ada @@ -25,7 +19,6 @@ BUILDLINK_LIBDIRS.gcc34-ada+= ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc34-ada}\// BUILDLINK_INCDIRS.gcc34-ada+= include ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc34-ada}\///}/adainclude . endif . endif -.endif # GCCADA_BUILDLINK3_MK BUILDLINK_FILES_CMD.gcc34-ada= (cd ${BUILDLINK_PREFIX.gcc34-ada} && \ ${FIND} bin libexec lib \( -type file -o -type link \) -print) @@ -40,5 +33,6 @@ BUILDLINK_DEPMETHOD.gcc34-ada?= build .include "../../mk/pthread.buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" +.endif # GCCADA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gcc34-ada diff --git a/lang/gcc34/buildlink3.mk b/lang/gcc34/buildlink3.mk index edd84d7ee65..d60dde242b9 100644 --- a/lang/gcc34/buildlink3.mk +++ b/lang/gcc34/buildlink3.mk @@ -1,18 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.16 2008/07/28 09:48:48 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:49 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GCC34_BUILDLINK3_MK:= ${GCC34_BUILDLINK3_MK}+ BUILDLINK_PREFIX.gcc34:=${LOCALBASE}/gcc34 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gcc34 -.endif +BUILDLINK_TREE+= gcc34 -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc34} -BUILDLINK_PACKAGES+= gcc34 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gcc34 +.if !defined(GCC34_BUILDLINK3_MK) +GCC34_BUILDLINK3_MK:= -.if !empty(GCC34_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gcc34+= gcc34>=${_GCC_REQD} BUILDLINK_ABI_DEPENDS.gcc34?= gcc34>=3.4.5nb1 BUILDLINK_PKGSRCDIR.gcc34?= ../../lang/gcc34 @@ -31,7 +25,6 @@ BUILDLINK_LIBDIRS.gcc34+= ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc34}\///}/adali BUILDLINK_INCDIRS.gcc34+= include ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc34}\///}/include . endif . endif -.endif # GCC34_BUILDLINK3_MK BUILDLINK_FILES_CMD.gcc34= \ (cd ${BUILDLINK_PREFIX.gcc34} && \ @@ -45,8 +38,8 @@ BUILDLINK_DEPMETHOD.gcc34+= full BUILDLINK_DEPMETHOD.gcc34?= build . endif - .include "../../mk/pthread.buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" +.endif # GCC34_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gcc34 diff --git a/lang/ghc/buildlink3.mk b/lang/ghc/buildlink3.mk index e491a06f560..71608b33e54 100644 --- a/lang/ghc/buildlink3.mk +++ b/lang/ghc/buildlink3.mk @@ -1,27 +1,20 @@ -# $NetBSD: buildlink3.mk,v 1.10 2008/07/20 00:26:52 kristerw Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:50 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GHC_BUILDLINK3_MK:= ${GHC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ghc -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ghc -.endif +.if !defined(GHC_BUILDLINK3_MK) +GHC_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nghc} -BUILDLINK_PACKAGES+= ghc -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ghc - -.if !empty(GHC_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ghc+= ghc>=6.8.3 BUILDLINK_ABI_DEPENDS.ghc?= ghc>=6.8.3 BUILDLINK_PKGSRCDIR.ghc?= ../../lang/ghc BUILDLINK_DEPMETHOD.ghc?= build -.endif # GHC_BUILDLINK3_MK .include "../../devel/readline/buildlink3.mk" +.endif # GHC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ghc # We include gmp/buildlink3.mk here so that "gmp" is registered as a # direct dependency for any package that includes this buildlink3.mk diff --git a/lang/guile/buildlink3.mk b/lang/guile/buildlink3.mk index 8766aaa0c44..3c1d9137c1e 100644 --- a/lang/guile/buildlink3.mk +++ b/lang/guile/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.12 2007/06/12 03:02:34 dmcmahill Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:50 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GUILE_BUILDLINK3_MK:= ${GUILE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= guile -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= guile -.endif +.if !defined(GUILE_BUILDLINK3_MK) +GUILE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nguile} -BUILDLINK_PACKAGES+= guile -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}guile - -.if !empty(GUILE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.guile+= guile>=1.8.1 BUILDLINK_ABI_DEPENDS.guile+= guile>=1.8.1 BUILDLINK_PKGSRCDIR.guile?= ../../lang/guile -.endif # GUILE_BUILDLINK3_MK .include "../../devel/gmp/buildlink3.mk" .include "../../devel/libltdl/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.endif # GUILE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -guile diff --git a/lang/guile16/buildlink3.mk b/lang/guile16/buildlink3.mk index 6b7f7fa3a06..bf64c9f8150 100644 --- a/lang/guile16/buildlink3.mk +++ b/lang/guile16/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/06/04 23:38:39 dmcmahill Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:50 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GUILE16_BUILDLINK3_MK:= ${GUILE16_BUILDLINK3_MK}+ +BUILDLINK_TREE+= guile16 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= guile16 -.endif +.if !defined(GUILE16_BUILDLINK3_MK) +GUILE16_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nguile16} -BUILDLINK_PACKAGES+= guile16 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}guile16 - -.if !empty(GUILE16_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.guile16+= guile16>=1.6.8 BUILDLINK_ABI_DEPENDS.guile16+= guile16>=1.6.8 BUILDLINK_PKGSRCDIR.guile16?= ../../lang/guile16 @@ -21,11 +14,11 @@ BUILDLINK_FILES.guile16+= guile/1.6/bin/* BUILDLINK_FNAME_TRANSFORM.guile16+= -e s,/guile/1.6/bin/,/bin/, GUILE16_SUBDIR= guile/1.6 -.endif # GUILE16_BUILDLINK3_MK .include "../../devel/libltdl/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.endif # GUILE16_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -guile16 diff --git a/lang/hugs/buildlink3.mk b/lang/hugs/buildlink3.mk index db123c3da3b..8ac9c3fb232 100644 --- a/lang/hugs/buildlink3.mk +++ b/lang/hugs/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/03/05 21:04:27 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:50 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -HUGS98_BUILDLINK3_MK:= ${HUGS98_BUILDLINK3_MK}+ +BUILDLINK_TREE+= hugs98 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= hugs98 -.endif +.if !defined(HUGS98_BUILDLINK3_MK) +HUGS98_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nhugs98} -BUILDLINK_PACKAGES+= hugs98 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}hugs98 - -.if ${HUGS98_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.hugs98+= hugs98>=200609 BUILDLINK_PKGSRCDIR.hugs98?= ../../lang/hugs -.endif # HUGS98_BUILDLINK3_MK +.endif # HUGS98_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -hugs98 diff --git a/lang/jdk/buildlink3.mk b/lang/jdk/buildlink3.mk index 95204f03a7a..3cecc7943ca 100644 --- a/lang/jdk/buildlink3.mk +++ b/lang/jdk/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:55 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:50 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -JDK_BUILDLINK3_MK:= ${JDK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= jdk -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= jdk -.endif +.if !defined(JDK_BUILDLINK3_MK) +JDK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Njdk} -BUILDLINK_PACKAGES+= jdk -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}jdk - -.if !empty(JDK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.jdk+= jdk>=1.1.8 BUILDLINK_PKGSRCDIR.jdk?= ../../lang/jdk BUILDLINK_JAVA_PREFIX.jdk= ${PREFIX}/java/jdk-1.1.8 @@ -21,6 +14,6 @@ BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_JAVA_PREFIX.jdk} BUILDLINK_CPPFLAGS.jdk= \ -I${BUILDLINK_JAVA_PREFIX.jdk}/include \ -I${BUILDLINK_JAVA_PREFIX.jdk}/include/netbsd -.endif # JDK_BUILDLINK3_MK +.endif # JDK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -jdk diff --git a/lang/kaffe/buildlink3.mk b/lang/kaffe/buildlink3.mk index 3f3f6526be2..4e5bdd2d807 100644 --- a/lang/kaffe/buildlink3.mk +++ b/lang/kaffe/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 23:10:55 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:24:50 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -KAFFE_BUILDLINK3_MK:= ${KAFFE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= kaffe -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= kaffe -.endif +.if !defined(KAFFE_BUILDLINK3_MK) +KAFFE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkaffe} -BUILDLINK_PACKAGES+= kaffe -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kaffe - -.if !empty(KAFFE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.kaffe+= kaffe>=1.1.7 BUILDLINK_ABI_DEPENDS.kaffe?= kaffe>=1.1.7 BUILDLINK_PKGSRCDIR.kaffe?= ../../lang/kaffe BUILDLINK_JAVA_PREFIX.kaffe= ${PREFIX}/java/kaffe -.endif # KAFFE_BUILDLINK3_MK BUILDLINK_CPPFLAGS.kaffe= \ -I${BUILDLINK_JAVA_PREFIX.kaffe}/include \ -I${BUILDLINK_JAVA_PREFIX.kaffe}/include/kaffe +.endif # KAFFE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -kaffe diff --git a/lang/librep/buildlink3.mk b/lang/librep/buildlink3.mk index cd46d9c859f..f9da494e83d 100644 --- a/lang/librep/buildlink3.mk +++ b/lang/librep/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:10:55 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:50 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBREP_BUILDLINK3_MK:= ${LIBREP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= librep -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= librep -.endif +.if !defined(LIBREP_BUILDLINK3_MK) +LIBREP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibrep} -BUILDLINK_PACKAGES+= librep -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}librep - -.if !empty(LIBREP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.librep+= librep>=0.17 BUILDLINK_ABI_DEPENDS.librep+= librep>=0.17nb2 BUILDLINK_PKGSRCDIR.librep?= ../../lang/librep MAKE_FLAGS+= rep_LIBTOOL=${LIBTOOL:Q} -.endif # LIBREP_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/gmp/buildlink3.mk" +.endif # LIBREP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -librep diff --git a/lang/libtcl-nothread/buildlink3.mk b/lang/libtcl-nothread/buildlink3.mk index ed866198c0a..523ac22dc51 100644 --- a/lang/libtcl-nothread/buildlink3.mk +++ b/lang/libtcl-nothread/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/21 14:27:56 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:50 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TCLNT_BUILDLINK3_MK:= ${TCLNT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= tclnt -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= tclnt -.endif +.if !defined(TCLNT_BUILDLINK3_MK) +TCLNT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntclnt} -BUILDLINK_PACKAGES+= tclnt -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tclnt - -.if !empty(TCLNT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.tclnt+= libtcl-nothread>=8.4.6 BUILDLINK_ABI_DEPENDS.tclnt+= libtcl-nothread>=8.4.6nb1 BUILDLINK_PKGSRCDIR.tclnt?= ../../lang/libtcl-nothread @@ -27,9 +20,8 @@ BUILDLINK_TRANSFORM+= l:tcl8.4:tcl84-nothread TCLCONFIG_SH?= ${BUILDLINK_PREFIX.tcl}/lib/tclConfig-nothread.sh PKGSRC_MAKE_ENV+= _TCL_NOTHREAD=yes -.endif # TCLNT_BUILDLINK3_MK - _TCL_NOTHREAD= yes .include "../../lang/tcl/buildlink3.mk" +.endif # TCLNT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -tclnt diff --git a/lang/lua/buildlink3.mk b/lang/lua/buildlink3.mk index f546c70d009..74e43bf9fec 100644 --- a/lang/lua/buildlink3.mk +++ b/lang/lua/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.11 2008/02/27 18:59:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:50 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LUA_BUILDLINK3_MK:= ${LUA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= lua -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= lua -.endif +.if !defined(LUA_BUILDLINK3_MK) +LUA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlua} -BUILDLINK_PACKAGES+= lua -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lua - -.if !empty(LUA_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.lua+= lua>=5.1.1 BUILDLINK_PKGSRCDIR.lua?= ../../lang/lua -.endif # LUA_BUILDLINK3_MK .include "../../devel/readline/buildlink3.mk" +.endif # LUA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -lua diff --git a/lang/mono/buildlink3.mk b/lang/mono/buildlink3.mk index 21a5f2f70b3..15ad2b43c33 100644 --- a/lang/mono/buildlink3.mk +++ b/lang/mono/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.30 2009/03/06 14:28:53 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.31 2009/03/20 19:24:50 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MONO_BUILDLINK3_MK:= ${MONO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= mono -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= mono -.endif +.if !defined(MONO_BUILDLINK3_MK) +MONO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmono} -BUILDLINK_PACKAGES+= mono -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mono - -.if ${MONO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.mono+= mono>=2.2 BUILDLINK_PKGSRCDIR.mono?= ../../lang/mono ALL_ENV+= MONO_SHARED_DIR=${WRKDIR:Q} -.endif # MONO_BUILDLINK3_MK PRINT_PLIST_AWK+= /^@dirrm lib\/mono\/gac$$/ \ { print "@comment in mono: " $$0; next; } @@ -24,5 +16,6 @@ PRINT_PLIST_AWK+= /^@dirrm lib\/mono$$/ \ .include "../../devel/glib2/buildlink3.mk" .include "../../textproc/icu/buildlink3.mk" +.endif # MONO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -mono diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk index 25bbe97e927..a853e9295e1 100644 --- a/lang/ocaml/buildlink3.mk +++ b/lang/ocaml/buildlink3.mk @@ -1,18 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.21 2008/01/23 20:42:25 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:24:51 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OCAML_BUILDLINK3_MK:= ${OCAML_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ocaml -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ocaml -.endif +.if !defined(OCAML_BUILDLINK3_MK) +OCAML_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nocaml} -BUILDLINK_PACKAGES+= ocaml - -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ocaml - -.if !empty(OCAML_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.08.2 BUILDLINK_ABI_DEPENDS.ocaml+= ocaml>=3.09.1nb2 BUILDLINK_PKGSRCDIR.ocaml?= ../../lang/ocaml @@ -48,7 +40,6 @@ ocaml-wrappers: ${LN} -s ${BUILDLINK_PREFIX.ocaml}/bin/"$$w" \ ${BUILDLINK_DIR}/bin/"$$w"; \ done +.endif # OCAML_BUILDLINK3_MK -.endif # OCAML_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ocaml diff --git a/lang/ossp-js/buildlink3.mk b/lang/ossp-js/buildlink3.mk index 40728daae74..22c712c2b88 100644 --- a/lang/ossp-js/buildlink3.mk +++ b/lang/ossp-js/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.3 2008/02/06 10:10:45 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:51 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OSSP_JS_BUILDLINK3_MK:= ${OSSP_JS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ossp-js -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= ossp-js -.endif +.if !defined(OSSP_JS_BUILDLINK3_MK) +OSSP_JS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nossp-js} -BUILDLINK_PACKAGES+= ossp-js -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ossp-js - -.if ${OSSP_JS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.ossp-js+= ossp-js>=1.6.20070208nb1 BUILDLINK_PKGSRCDIR.ossp-js?= ../../lang/ossp-js . include "../../lang/ossp-js/libm.mk" -.endif # OSSP_JS_BUILDLINK3_MK .include "../../mk/dlopen.buildlink3.mk" +.endif # OSSP_JS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ossp-js diff --git a/lang/parrot/buildlink3.mk b/lang/parrot/buildlink3.mk index cf607df773f..40cef7b4e8e 100644 --- a/lang/parrot/buildlink3.mk +++ b/lang/parrot/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:55 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:51 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PARROT_BUILDLINK3_MK:= ${PARROT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= parrot -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= parrot -.endif +.if !defined(PARROT_BUILDLINK3_MK) +PARROT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nparrot} -BUILDLINK_PACKAGES+= parrot -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}parrot - -.if !empty(PARROT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.parrot+= parrot>=0.4.0 BUILDLINK_ABI_DEPENDS.parrot?= parrot>=0.4.1nb1 BUILDLINK_PKGSRCDIR.parrot?= ../../lang/parrot -.endif # PARROT_BUILDLINK3_MK .include "../../textproc/icu/buildlink3.mk" +.endif # PARROT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -parrot diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk index de805a61507..c6da4cd12af 100644 --- a/lang/perl5/buildlink3.mk +++ b/lang/perl5/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.43 2008/10/19 19:10:42 he Exp $ +# $NetBSD: buildlink3.mk,v 1.44 2009/03/20 19:24:51 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PERL5_BUILDLINK3_MK:= ${PERL5_BUILDLINK3_MK}+ +BUILDLINK_TREE+= perl -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= perl -.endif +.if !defined(PERL5_BUILDLINK3_MK) +PERL5_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nperl} -BUILDLINK_PACKAGES+= perl -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}perl - -.if !empty(PERL5_BUILDLINK3_MK:M+) .include "../../mk/bsd.fast.prefs.mk" PERL5_REQD+= 5.10.0 .for _perl5_ver_ in ${PERL5_REQD} @@ -43,6 +36,6 @@ BUILDLINK_FILES.perl= \ ${PERL5_SUB_INSTALLARCHLIB}/CORE/* \ ${PERL5_SUB_INSTALLARCHLIB}/auto/DynaLoader/DynaLoader.a . endif -.endif # PERL5_BUILDLINK3_MK +.endif # PERL5_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -perl diff --git a/lang/php5/buildlink3.mk b/lang/php5/buildlink3.mk index fb49fa411ea..6afda984906 100644 --- a/lang/php5/buildlink3.mk +++ b/lang/php5/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:55 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:51 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PHP_BUILDLINK3_MK:= ${PHP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= php -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= php -.endif +.if !defined(PHP_BUILDLINK3_MK) +PHP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nphp} -BUILDLINK_PACKAGES+= php -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}php - -.if !empty(PHP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.php+= php>=5.1.2 BUILDLINK_ABI_DEPENDS.php+= php>=5.1.2 BUILDLINK_PKGSRCDIR.php?= ../../lang/php5 -.endif # PHP_BUILDLINK3_MK .include "../../textproc/libxml2/buildlink3.mk" +.endif # PHP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -php diff --git a/lang/pnet/buildlink3.mk b/lang/pnet/buildlink3.mk index e3edfb32e5f..255979c552f 100644 --- a/lang/pnet/buildlink3.mk +++ b/lang/pnet/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.12 2008/02/18 16:39:43 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:51 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PNET_BUILDLINK3_MK:= ${PNET_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pnet -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pnet -.endif +.if !defined(PNET_BUILDLINK3_MK) +PNET_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npnet} -BUILDLINK_PACKAGES+= pnet -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pnet - -.if !empty(PNET_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.pnet+= pnet>=0.8.0 BUILDLINK_PKGSRCDIR.pnet?= ../../lang/pnet -.endif # PNET_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" +.endif # PNET_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pnet diff --git a/lang/pnetC/buildlink3.mk b/lang/pnetC/buildlink3.mk index 781322303a9..1369abc06d9 100644 --- a/lang/pnetC/buildlink3.mk +++ b/lang/pnetC/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:55 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:51 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PNETC_BUILDLINK3_MK:= ${PNETC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pnetC -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pnetC -.endif +.if !defined(PNETC_BUILDLINK3_MK) +PNETC_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NpnetC} -BUILDLINK_PACKAGES+= pnetC -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pnetC - -.if !empty(PNETC_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.pnetC+= pnetC>=0.6.4 BUILDLINK_ABI_DEPENDS.pnetC?= pnetC>=0.6.6nb2 BUILDLINK_PKGSRCDIR.pnetC?= ../../lang/pnetC -.endif # PNETC_BUILDLINK3_MK .include "../../lang/pnet/buildlink3.mk" +.endif # PNETC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pnetC diff --git a/lang/pnetlib/buildlink3.mk b/lang/pnetlib/buildlink3.mk index a235df4cf12..43293e74596 100644 --- a/lang/pnetlib/buildlink3.mk +++ b/lang/pnetlib/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:55 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:51 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PNETLIB_BUILDLINK3_MK:= ${PNETLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pnetlib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pnetlib -.endif +.if !defined(PNETLIB_BUILDLINK3_MK) +PNETLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npnetlib} -BUILDLINK_PACKAGES+= pnetlib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pnetlib - -.if !empty(PNETLIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.pnetlib+= pnetlib>=0.6.4 BUILDLINK_ABI_DEPENDS.pnetlib+= pnetlib>=0.6.6nb2 BUILDLINK_PKGSRCDIR.pnetlib?= ../../lang/pnetlib -.endif # PNETLIB_BUILDLINK3_MK .include "../../lang/pnet/buildlink3.mk" +.endif # PNETLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pnetlib diff --git a/lang/python23/buildlink3.mk b/lang/python23/buildlink3.mk index a20117d9183..99dfd1b6864 100644 --- a/lang/python23/buildlink3.mk +++ b/lang/python23/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.14 2009/01/23 03:05:53 dsainty Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:51 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PYTHON23_BUILDLINK3_MK:= ${PYTHON23_BUILDLINK3_MK}+ +BUILDLINK_TREE+= python23 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= python23 -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npython23} -BUILDLINK_PACKAGES+= python23 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}python23 +.if !defined(PYTHON23_BUILDLINK3_MK) +PYTHON23_BUILDLINK3_MK:= -.if !empty(PYTHON23_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.python23+= python23>=2.3 BUILDLINK_ABI_DEPENDS.python23?= python23>=2.3.5nb6 BUILDLINK_PKGSRCDIR.python23?= ../../lang/python23 @@ -23,10 +16,9 @@ BUILDLINK_DEPMETHOD.python23?= ${BUILDLINK_DEPMETHOD.python} BUILDLINK_INCDIRS.python23+= include/python2.3 BUILDLINK_LIBDIRS.python23+= lib/python2.3/config BUILDLINK_TRANSFORM+= l:python:python2.3 +.endif # PYTHON23_BUILDLINK3_MK -.endif # PYTHON23_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -python23 .include "../../mk/bsd.fast.prefs.mk" .if ${OPSYS} != "IRIX" diff --git a/lang/python24/buildlink3.mk b/lang/python24/buildlink3.mk index bd4e7e762fb..fd8067573dd 100644 --- a/lang/python24/buildlink3.mk +++ b/lang/python24/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/01/23 03:05:53 dsainty Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:51 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PYTHON24_BUILDLINK3_MK:= ${PYTHON24_BUILDLINK3_MK}+ +BUILDLINK_TREE+= python24 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= python24 -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npython24} -BUILDLINK_PACKAGES+= python24 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}python24 +.if !defined(PYTHON24_BUILDLINK3_MK) +PYTHON24_BUILDLINK3_MK:= -.if !empty(PYTHON24_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.python24+= python24>=2.4 BUILDLINK_ABI_DEPENDS.python24?= python24>=2.4.2nb4 BUILDLINK_PKGSRCDIR.python24?= ../../lang/python24 @@ -23,10 +16,9 @@ BUILDLINK_DEPMETHOD.python24?= ${BUILDLINK_DEPMETHOD.python} BUILDLINK_INCDIRS.python24+= include/python2.4 BUILDLINK_LIBDIRS.python24+= lib/python2.4/config BUILDLINK_TRANSFORM+= l:python:python2.4 +.endif # PYTHON24_BUILDLINK3_MK -.endif # PYTHON24_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -python24 .include "../../mk/bsd.fast.prefs.mk" .if ${OPSYS} != "IRIX" diff --git a/lang/python25/buildlink3.mk b/lang/python25/buildlink3.mk index 34c92fd4a6b..046af0b6d14 100644 --- a/lang/python25/buildlink3.mk +++ b/lang/python25/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/01/23 03:05:53 dsainty Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:52 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PYTHON25_BUILDLINK3_MK:= ${PYTHON25_BUILDLINK3_MK}+ +BUILDLINK_TREE+= python25 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= python25 -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npython25} -BUILDLINK_PACKAGES+= python25 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}python25 +.if !defined(PYTHON25_BUILDLINK3_MK) +PYTHON25_BUILDLINK3_MK:= -.if !empty(PYTHON25_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.python25+= python25>=2.5 BUILDLINK_ABI_DEPENDS.python25+= python25>=2.5.2 BUILDLINK_PKGSRCDIR.python25?= ../../lang/python25 @@ -24,8 +17,6 @@ BUILDLINK_INCDIRS.python25+= include/python2.5 BUILDLINK_LIBDIRS.python25+= lib/python2.5/config BUILDLINK_TRANSFORM+= l:python:python2.5 -.endif # PYTHON25_BUILDLINK3_MK - .include "../../mk/bsd.fast.prefs.mk" .if ${OPSYS} != "IRIX" . include "../../mk/bdb.buildlink3.mk" @@ -34,5 +25,6 @@ BUILDLINK_TRANSFORM+= l:python:python2.5 .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" +.endif # PYTHON25_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -python25 diff --git a/lang/ruby/buildlink3.mk b/lang/ruby/buildlink3.mk index 1a11fd04caf..c9426dc097f 100644 --- a/lang/ruby/buildlink3.mk +++ b/lang/ruby/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:56 jlam Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -RUBY_BUILDLINK3_MK:= ${RUBY_BUILDLINK3_MK}+ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:52 joerg Exp $ .if !defined(_RUBYVERSION_MK) .include "../../lang/ruby/rubyversion.mk" .endif -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ${RUBY_BASE} -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:N${RUBY_BASE}} -BUILDLINK_PACKAGES+= ${RUBY_BASE} -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}${RUBY_BASE} +BUILDLINK_TREE+= ${RUBY_BASE} -.if !empty(RUBY_BUILDLINK3_MK:M+) +.if !defined(RUBY_BUILDLINK3_MK) +RUBY_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.${RUBY_BASE}?= ${RUBY_BASE}>=${RUBY_REQD} BUILDLINK_ABI_DEPENDS.${RUBY_BASE}?= ${RUBY_BASE}>=${RUBY_VERSION} @@ -31,7 +23,6 @@ buildlink-bin-ruby: if ${TEST} -f $$f; then \ ${LN} -s $$f ${BUILDLINK_DIR}/bin/ruby; \ fi +.endif # RUBY_BUILDLINK3_MK -.endif # RUBY_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -${RUBY_BASE} diff --git a/lang/see/buildlink3.mk b/lang/see/buildlink3.mk index 84439fbee5c..5e16b8eae4b 100644 --- a/lang/see/buildlink3.mk +++ b/lang/see/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1 2008/11/06 07:50:56 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:52 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SEE_BUILDLINK3_MK:= ${SEE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= see -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= see -.endif +.if !defined(SEE_BUILDLINK3_MK) +SEE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsee} -BUILDLINK_PACKAGES+= see -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}see - -.if ${SEE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.see+= see>=3.0.1376 BUILDLINK_PKGSRCDIR.see?= ../../lang/see -.endif # SEE_BUILDLINK3_MK .include "../../devel/readline/buildlink3.mk" +.endif # SEE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -see diff --git a/lang/sigscheme/buildlink3.mk b/lang/sigscheme/buildlink3.mk index d024dcede92..82fb86f40c6 100644 --- a/lang/sigscheme/buildlink3.mk +++ b/lang/sigscheme/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/02/29 13:11:14 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:52 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SIGSCHEME_BUILDLINK3_MK:= ${SIGSCHEME_BUILDLINK3_MK}+ +BUILDLINK_TREE+= sigscheme -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= sigscheme -.endif +.if !defined(SIGSCHEME_BUILDLINK3_MK) +SIGSCHEME_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsigscheme} -BUILDLINK_PACKAGES+= sigscheme -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sigscheme - -.if ${SIGSCHEME_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.sigscheme+= sigscheme>=0.8.0 BUILDLINK_PKGSRCDIR.sigscheme?= ../../lang/sigscheme -.endif # SIGSCHEME_BUILDLINK3_MK .include "../../devel/libgcroots/buildlink3.mk" +.endif # SIGSCHEME_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -sigscheme diff --git a/lang/spidermonkey/buildlink3.mk b/lang/spidermonkey/buildlink3.mk index e4b4d86a02d..07ef71bcd74 100644 --- a/lang/spidermonkey/buildlink3.mk +++ b/lang/spidermonkey/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.11 2006/12/12 21:52:36 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:52 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SPIDERMONKEY_BUILDLINK3_MK:= ${SPIDERMONKEY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= spidermonkey -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= spidermonkey -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nspidermonkey} -BUILDLINK_PACKAGES+= spidermonkey -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}spidermonkey +.if !defined(SPIDERMONKEY_BUILDLINK3_MK) +SPIDERMONKEY_BUILDLINK3_MK:= .include "../../mk/bsd.fast.prefs.mk" -.if !empty(SPIDERMONKEY_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.spidermonkey+= spidermonkey>=1.5 .if ${OPSYS} == "Darwin" BUILDLINK_ABI_DEPENDS.spidermonkey?= spidermonkey>=1.5nb6 @@ -21,9 +14,9 @@ BUILDLINK_ABI_DEPENDS.spidermonkey?= spidermonkey>=1.5nb6 BUILDLINK_ABI_DEPENDS.spidermonkey?= spidermonkey>=1.5nb8 .endif BUILDLINK_PKGSRCDIR.spidermonkey?= ../../lang/spidermonkey -.endif # SPIDERMONKEY_BUILDLINK3_MK .include "../../devel/readline/buildlink3.mk" .include "../../devel/nspr/buildlink3.mk" +.endif # SPIDERMONKEY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -spidermonkey diff --git a/lang/sun-jdk14/buildlink3.mk b/lang/sun-jdk14/buildlink3.mk index 326c14660d9..46ed1d51dc9 100644 --- a/lang/sun-jdk14/buildlink3.mk +++ b/lang/sun-jdk14/buildlink3.mk @@ -1,17 +1,9 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:56 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:52 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SUN_JDK14_BUILDLINK3_MK:= ${SUN_JDK14_BUILDLINK3_MK}+ +BUILDLINK_TREE+= sun-jdk14 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= sun-jdk14 -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsun-jdk14} -BUILDLINK_PACKAGES+= sun-jdk14 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sun-jdk14 - -.if !empty(SUN_JDK14_BUILDLINK3_MK:M+) +.if !defined(SUN_JDK14_BUILDLINK3_MK) +SUN_JDK14_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.sun-jdk14+= sun-jdk14-[0-9]* BUILDLINK_ABI_DEPENDS.sun-jdk14?= sun-jdk14>=2.11 @@ -25,7 +17,6 @@ BUILDLINK_CPPFLAGS.sun-jdk14+= \ -I${BUILDLINK_JAVA_PREFIX.sun-jre14}/include/linux .include "../../lang/sun-jre14/buildlink3.mk" +.endif # SUN_JDK14_BUILDLINK3_MK -.endif # SUN_JDK14_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -sun-jdk14 diff --git a/lang/sun-jdk15/buildlink3.mk b/lang/sun-jdk15/buildlink3.mk index a496d4bf7b8..f60ceab0294 100644 --- a/lang/sun-jdk15/buildlink3.mk +++ b/lang/sun-jdk15/buildlink3.mk @@ -1,17 +1,9 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:56 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:52 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SUN_JDK15_BUILDLINK3_MK:= ${SUN_JDK15_BUILDLINK3_MK}+ +BUILDLINK_TREE+= sun-jdk15 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= sun-jdk15 -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsun-jdk15} -BUILDLINK_PACKAGES+= sun-jdk15 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sun-jdk15 - -.if !empty(SUN_JDK15_BUILDLINK3_MK:M+) +.if !defined(SUN_JDK15_BUILDLINK3_MK) +SUN_JDK15_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.sun-jdk15+= sun-jdk15-[0-9]* BUILDLINK_ABI_DEPENDS.sun-jdk15?= sun-jdk15>=5.0.6nb1 @@ -25,7 +17,6 @@ BUILDLINK_CPPFLAGS.sun-jdk15= \ -I${BUILDLINK_JAVA_PREFIX.sun-jre15}/include/linux .include "../../lang/sun-jre15/buildlink3.mk" +.endif # SUN_JDK15_BUILDLINK3_MK -.endif # SUN_JDK15_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -sun-jdk15 diff --git a/lang/sun-jdk6/buildlink3.mk b/lang/sun-jdk6/buildlink3.mk index f2ee33cb0e3..e64214c82d9 100644 --- a/lang/sun-jdk6/buildlink3.mk +++ b/lang/sun-jdk6/buildlink3.mk @@ -1,17 +1,9 @@ -# $NetBSD: buildlink3.mk,v 1.3 2008/01/20 02:31:48 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:52 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SUN_JDK6_BUILDLINK3_MK:= ${SUN_JDK6_BUILDLINK3_MK}+ +BUILDLINK_TREE+= sun-jdk6 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= sun-jdk6 -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsun-jdk6} -BUILDLINK_PACKAGES+= sun-jdk6 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sun-jdk6 - -.if !empty(SUN_JDK6_BUILDLINK3_MK:M+) +.if !defined(SUN_JDK6_BUILDLINK3_MK) +SUN_JDK6_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.sun-jdk6+= sun-jdk6-[0-9]* BUILDLINK_ABI_DEPENDS.sun-jdk6?= sun-jdk6>=6.0.4 @@ -25,7 +17,6 @@ BUILDLINK_CPPFLAGS.sun-jdk6= \ -I${BUILDLINK_JAVA_PREFIX.sun-jre6}/include/linux .include "../../lang/sun-jre6/buildlink3.mk" +.endif # SUN_JDK6_BUILDLINK3_MK -.endif # SUN_JDK6_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -sun-jdk6 diff --git a/lang/sun-jre14/buildlink3.mk b/lang/sun-jre14/buildlink3.mk index f064b3004af..b45bdf3967d 100644 --- a/lang/sun-jre14/buildlink3.mk +++ b/lang/sun-jre14/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:56 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:52 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SUN_JRE14_BUILDLINK3_MK:= ${SUN_JRE14_BUILDLINK3_MK}+ +BUILDLINK_TREE+= sun-jre14 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= sun-jre14 -.endif +.if !defined(SUN_JRE14_BUILDLINK3_MK) +SUN_JRE14_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsun-jre14} -BUILDLINK_PACKAGES+= sun-jre14 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sun-jre14 - -.if !empty(SUN_JRE14_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.sun-jre14+= sun-jre14-[0-9]* BUILDLINK_ABI_DEPENDS.sun-jre14?= sun-jre14>=2.11 BUILDLINK_PKGSRCDIR.sun-jre14?= ../../lang/sun-jre14 BUILDLINK_JAVA_PREFIX.sun-jre14= ${PREFIX}/java/sun-1.4 -.endif # SUN_JRE14_BUILDLINK3_MK UNLIMIT_RESOURCES+= datasize # Must be at least 131204 +.endif # SUN_JRE14_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -sun-jre14 diff --git a/lang/sun-jre15/buildlink3.mk b/lang/sun-jre15/buildlink3.mk index 54cf2355153..006edeb441e 100644 --- a/lang/sun-jre15/buildlink3.mk +++ b/lang/sun-jre15/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:56 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:52 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SUN_JRE15_BUILDLINK3_MK:= ${SUN_JRE15_BUILDLINK3_MK}+ +BUILDLINK_TREE+= sun-jre15 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= sun-jre15 -.endif +.if !defined(SUN_JRE15_BUILDLINK3_MK) +SUN_JRE15_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsun-jre15} -BUILDLINK_PACKAGES+= sun-jre15 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sun-jre15 - -.if !empty(SUN_JRE15_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.sun-jre15+= sun-jre15-[0-9]* BUILDLINK_ABI_DEPENDS.sun-jre15?= sun-jre15>=5.0.6nb2 BUILDLINK_PKGSRCDIR.sun-jre15?= ../../lang/sun-jre15 BUILDLINK_JAVA_PREFIX.sun-jre15= ${PREFIX}/java/sun-1.5 UNLIMIT_RESOURCES+= datasize # Must be at least 131204 -.endif # SUN_JRE15_BUILDLINK3_MK +.endif # SUN_JRE15_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -sun-jre15 diff --git a/lang/sun-jre6/buildlink3.mk b/lang/sun-jre6/buildlink3.mk index 0c0431965d2..18b3d4e6946 100644 --- a/lang/sun-jre6/buildlink3.mk +++ b/lang/sun-jre6/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.4 2008/01/20 09:21:35 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:24:52 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SUN_JRE6_BUILDLINK3_MK:= ${SUN_JRE6_BUILDLINK3_MK}+ +BUILDLINK_TREE+= sun-jre6 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= sun-jre6 -.endif +.if !defined(SUN_JRE6_BUILDLINK3_MK) +SUN_JRE6_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsun-jre6} -BUILDLINK_PACKAGES+= sun-jre6 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sun-jre6 - -.if !empty(SUN_JRE6_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.sun-jre6+= sun-jre6-[0-9]* BUILDLINK_ABI_DEPENDS.sun-jre6?= sun-jre6>=6.0.4 BUILDLINK_PKGSRCDIR.sun-jre6?= ../../lang/sun-jre6 BUILDLINK_JAVA_PREFIX.sun-jre6= ${PREFIX}/java/sun-6 UNLIMIT_RESOURCES+= datasize # Must be at least 131204 -.endif # SUN_JRE6_BUILDLINK3_MK +.endif # SUN_JRE6_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -sun-jre6 diff --git a/lang/swi-prolog-lite/buildlink3.mk b/lang/swi-prolog-lite/buildlink3.mk index aa9e87ddba8..1e5235e5889 100644 --- a/lang/swi-prolog-lite/buildlink3.mk +++ b/lang/swi-prolog-lite/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:56 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SWI_PROLOG_LITE_BUILDLINK3_MK:= ${SWI_PROLOG_LITE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= swi-prolog-lite -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= swi-prolog-lite -.endif +.if !defined(SWI_PROLOG_LITE_BUILDLINK3_MK) +SWI_PROLOG_LITE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nswi-prolog-lite} -BUILDLINK_PACKAGES+= swi-prolog-lite -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}swi-prolog-lite - -.if !empty(SWI_PROLOG_LITE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.swi-prolog-lite+= swi-prolog-lite>=5.2.9 BUILDLINK_PKGSRCDIR.swi-prolog-lite?= ../../lang/swi-prolog-lite -.endif # SWI_PROLOG_LITE_BUILDLINK3_MK .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" +.endif # SWI_PROLOG_LITE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -swi-prolog-lite diff --git a/lang/tcl-expect/buildlink3.mk b/lang/tcl-expect/buildlink3.mk index e81a6e5763c..055a643f845 100644 --- a/lang/tcl-expect/buildlink3.mk +++ b/lang/tcl-expect/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:56 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TCL_EXPECT_BUILDLINK3_MK:= ${TCL_EXPECT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= tcl-expect -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= tcl-expect -.endif +.if !defined(TCL_EXPECT_BUILDLINK3_MK) +TCL_EXPECT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl-expect} -BUILDLINK_PACKAGES+= tcl-expect -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tcl-expect - -.if !empty(TCL_EXPECT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.tcl-expect+= tcl-expect>=5.38.0nb1 BUILDLINK_ABI_DEPENDS.tcl-expect+= tcl-expect>=5.38.0nb2 BUILDLINK_PKGSRCDIR.tcl-expect?= ../../lang/tcl-expect -.endif # TCL_EXPECT_BUILDLINK3_MK .include "../../lang/tcl/buildlink3.mk" +.endif # TCL_EXPECT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -tcl-expect diff --git a/lang/tcl-itcl-current/buildlink3.mk b/lang/tcl-itcl-current/buildlink3.mk index 228ceaa26c5..377a5a6d21f 100644 --- a/lang/tcl-itcl-current/buildlink3.mk +++ b/lang/tcl-itcl-current/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:56 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TCL_ITCL_CURRENT_BUILDLINK3_MK:= ${TCL_ITCL_CURRENT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= tcl-itcl-current -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= tcl-itcl-current -.endif +.if !defined(TCL_ITCL_CURRENT_BUILDLINK3_MK) +TCL_ITCL_CURRENT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl-itcl-current} -BUILDLINK_PACKAGES+= tcl-itcl-current -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tcl-itcl-current - -.if !empty(TCL_ITCL_CURRENT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.tcl-itcl-current+= tcl-itcl-current>=20040920 BUILDLINK_ABI_DEPENDS.tcl-itcl-current?= tcl-itcl-current>=20040920nb4 BUILDLINK_PKGSRCDIR.tcl-itcl-current?= ../../lang/tcl-itcl-current @@ -19,9 +12,8 @@ BUILDLINK_PKGSRCDIR.tcl-itcl-current?= ../../lang/tcl-itcl-current BUILDLINK_TRANSFORM+= l:itcl:itcl33 BUILDLINK_TRANSFORM+= l:itk:itk33 -.endif # TCL_ITCL_CURRENT_BUILDLINK3_MK - .include "../../lang/tcl/buildlink3.mk" .include "../../x11/tk/buildlink3.mk" +.endif # TCL_ITCL_CURRENT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -tcl-itcl-current diff --git a/lang/tcl-itcl/buildlink3.mk b/lang/tcl-itcl/buildlink3.mk index c9dbd15a77a..bdbb411965e 100644 --- a/lang/tcl-itcl/buildlink3.mk +++ b/lang/tcl-itcl/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:56 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TCL_ITCL_BUILDLINK3_MK:= ${TCL_ITCL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= tcl-itcl -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= tcl-itcl -.endif +.if !defined(TCL_ITCL_BUILDLINK3_MK) +TCL_ITCL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl-itcl} -BUILDLINK_PACKAGES+= tcl-itcl -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tcl-itcl - -.if !empty(TCL_ITCL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.tcl-itcl+= tcl-itcl>=3.2.1 BUILDLINK_ABI_DEPENDS.tcl-itcl?= tcl-itcl>=3.2.1nb1 BUILDLINK_PKGSRCDIR.tcl-itcl?= ../../lang/tcl-itcl -.endif # TCL_ITCL_BUILDLINK3_MK .include "../../lang/tcl/buildlink3.mk" .include "../../x11/tk/buildlink3.mk" +.endif # TCL_ITCL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -tcl-itcl diff --git a/lang/tcl-otcl/buildlink3.mk b/lang/tcl-otcl/buildlink3.mk index d2fd87ea170..f9385ec3b85 100644 --- a/lang/tcl-otcl/buildlink3.mk +++ b/lang/tcl-otcl/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:56 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TCL_OTCL_BUILDLINK3_MK:= ${TCL_OTCL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= tcl-otcl -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= tcl-otcl -.endif +.if !defined(TCL_OTCL_BUILDLINK3_MK) +TCL_OTCL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl-otcl} -BUILDLINK_PACKAGES+= tcl-otcl -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tcl-otcl - -.if !empty(TCL_OTCL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.tcl-otcl+= tcl-otcl>=1.8 BUILDLINK_ABI_DEPENDS.tcl-otcl?= tcl-otcl>=1.11nb1 BUILDLINK_PKGSRCDIR.tcl-otcl?= ../../lang/tcl-otcl -.endif # TCL_OTCL_BUILDLINK3_MK .include "../../lang/tcl/buildlink3.mk" .include "../../x11/tk/buildlink3.mk" +.endif # TCL_OTCL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -tcl-otcl diff --git a/lang/tcl-tclX/buildlink3.mk b/lang/tcl-tclX/buildlink3.mk index a8a6d783ba0..41c2d5be2bb 100644 --- a/lang/tcl-tclX/buildlink3.mk +++ b/lang/tcl-tclX/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:56 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TCL_TCLX_BUILDLINK3_MK:= ${TCL_TCLX_BUILDLINK3_MK}+ +BUILDLINK_TREE+= tcl-tclX -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= tcl-tclX -.endif +.if !defined(TCL_TCLX_BUILDLINK3_MK) +TCL_TCLX_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl-tclX} -BUILDLINK_PACKAGES+= tcl-tclX -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tcl-tclX - -.if !empty(TCL_TCLX_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.tcl-tclX+= tcl-tclX>=8.3.5 BUILDLINK_ABI_DEPENDS.tcl-tclX?= tcl-tclX>=8.3.5nb3 BUILDLINK_PKGSRCDIR.tcl-tclX?= ../../lang/tcl-tclX -.endif # TCL_TCLX_BUILDLINK3_MK .include "../../lang/tcl/buildlink3.mk" +.endif # TCL_TCLX_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -tcl-tclX diff --git a/lang/tcl/buildlink3.mk b/lang/tcl/buildlink3.mk index 4c1be953873..5d68998fd61 100644 --- a/lang/tcl/buildlink3.mk +++ b/lang/tcl/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.19 2006/07/08 23:10:56 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2009/03/20 19:24:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TCL_BUILDLINK3_MK:= ${TCL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= tcl -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= tcl -.endif +.if !defined(TCL_BUILDLINK3_MK) +TCL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl} -BUILDLINK_PACKAGES+= tcl -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tcl - -.if !empty(TCL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.tcl+= tcl>=8.4.6nb1 BUILDLINK_ABI_DEPENDS.tcl+= tcl>=8.4.7nb1 BUILDLINK_PKGSRCDIR.tcl?= ../../lang/tcl @@ -28,8 +21,8 @@ TCLCONFIG_SH?= ${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh PRINT_PLIST_AWK+= /^@dirrm lib\/tcl$$/ \ { print "@comment in tcl: " $$0; next; } -.endif # TCL_BUILDLINK3_MK .include "../../mk/dlopen.buildlink3.mk" +.endif # TCL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -tcl diff --git a/lang/tcl83/buildlink3.mk b/lang/tcl83/buildlink3.mk index eb09fd86271..8fa5e27e5fc 100644 --- a/lang/tcl83/buildlink3.mk +++ b/lang/tcl83/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.6 2007/05/21 09:56:15 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TCL_BUILDLINK3_MK:= ${TCL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= tcl -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= tcl -.endif +.if !defined(TCL_BUILDLINK3_MK) +TCL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl} -BUILDLINK_PACKAGES+= tcl -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tcl - -.if !empty(TCL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.tcl+= tcl>=8.3.4<8.4 BUILDLINK_PKGSRCDIR.tcl?= ../../lang/tcl83 @@ -23,7 +16,6 @@ BUILDLINK_FILES.tcl= bin/tclsh* BUILDLINK_TRANSFORM+= l:tcl:tcl83 TCLCONFIG_SH?= ${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh +.endif # TCL_BUILDLINK3_MK -.endif # TCL_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -tcl diff --git a/lang/vala/buildlink3.mk b/lang/vala/buildlink3.mk index 11d1f921977..9c1a25b23ec 100644 --- a/lang/vala/buildlink3.mk +++ b/lang/vala/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/03/05 21:56:29 ahoka Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -VALA_BUILDLINK3_MK:= ${VALA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= vala -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= vala -.endif +.if !defined(VALA_BUILDLINK3_MK) +VALA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nvala} -BUILDLINK_PACKAGES+= vala -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}vala - -.if ${VALA_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.vala+= vala>=0.5.7 BUILDLINK_PKGSRCDIR.vala?= ../../lang/vala -.endif # VALA_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" +.endif # VALA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -vala diff --git a/mail/Pantomime/buildlink3.mk b/mail/Pantomime/buildlink3.mk index 5327ec7552b..d80d6b233f7 100644 --- a/mail/Pantomime/buildlink3.mk +++ b/mail/Pantomime/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.9 2008/01/18 05:08:20 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PANTOMIME_BUILDLINK3_MK:= ${PANTOMIME_BUILDLINK3_MK}+ +BUILDLINK_TREE+= Pantomime -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= Pantomime -.endif +.if !defined(PANTOMIME_BUILDLINK3_MK) +PANTOMIME_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NPantomime} -BUILDLINK_PACKAGES+= Pantomime -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Pantomime - -.if !empty(PANTOMIME_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.Pantomime+= Pantomime>=1.1.2 BUILDLINK_ABI_DEPENDS.Pantomime+= Pantomime>=1.1.2nb5 BUILDLINK_PKGSRCDIR.Pantomime?= ../../mail/Pantomime @@ -20,8 +13,7 @@ BUILDLINK_PKGSRCDIR.Pantomime?= ../../mail/Pantomime BUILDLINK_INCDIRS.Pantomime+= ${GNUSTEP_LOCAL_ROOT:Q}/${GNUSTEP_IDIR:Q}/Pantomime -.endif # PANTOMIME_BUILDLINK3_MK - .include "../../devel/gnustep-base/buildlink3.mk" +.endif # PANTOMIME_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -Pantomime diff --git a/mail/akonadi/buildlink3.mk b/mail/akonadi/buildlink3.mk index 5a578ea4f0b..e83dba1b926 100644 --- a/mail/akonadi/buildlink3.mk +++ b/mail/akonadi/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/03 11:19:56 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:54 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -AKONADI_BUILDLINK3_MK:= ${AKONADI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= akonadi -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= akonadi -.endif +.if !defined(AKONADI_BUILDLINK3_MK) +AKONADI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nakonadi} -BUILDLINK_PACKAGES+= akonadi -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}akonadi - -.if ${AKONADI_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.akonadi+= akonadi>=0.82.0 BUILDLINK_PKGSRCDIR.akonadi?= ../../mail/akonadi -.endif # AKONADI_BUILDLINK3_MK .include "../../x11/qt4-libs/buildlink3.mk" .include "../../x11/qt4-qdbus/buildlink3.mk" +.endif # AKONADI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -akonadi diff --git a/mail/clamav/buildlink3.mk b/mail/clamav/buildlink3.mk index e8791ba26ce..8045a3889d9 100644 --- a/mail/clamav/buildlink3.mk +++ b/mail/clamav/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.18 2008/11/27 06:07:49 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2009/03/20 19:24:54 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CLAMAV_BUILDLINK3_MK:= ${CLAMAV_BUILDLINK3_MK}+ +BUILDLINK_TREE+= clamav -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= clamav -.endif +.if !defined(CLAMAV_BUILDLINK3_MK) +CLAMAV_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nclamav} -BUILDLINK_PACKAGES+= clamav -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}clamav - -.if ${CLAMAV_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.clamav+= clamav>=0.94.2 BUILDLINK_PKGSRCDIR.clamav?= ../../mail/clamav -.endif # CLAMAV_BUILDLINK3_MK .include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../devel/gmp/buildlink3.mk" .include "../../security/tcp_wrappers/buildlink3.mk" +.endif # CLAMAV_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -clamav diff --git a/mail/claws-mail-pgpcore/buildlink3.mk b/mail/claws-mail-pgpcore/buildlink3.mk index 5fc78ba692f..8b5e6c694eb 100644 --- a/mail/claws-mail-pgpcore/buildlink3.mk +++ b/mail/claws-mail-pgpcore/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.4 2009/01/11 03:11:38 smb Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:24:54 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CLAWS_MAIL_PGPCORE_BUILDLINK3_MK:= ${CLAWS_MAIL_PGPCORE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= claws-mail-pgpcore -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= claws-mail-pgpcore -.endif +.if !defined(CLAWS_MAIL_PGPCORE_BUILDLINK3_MK) +CLAWS_MAIL_PGPCORE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nclaws-mail-pgpcore} -BUILDLINK_PACKAGES+= claws-mail-pgpcore -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}claws-mail-pgpcore - -.if ${CLAWS_MAIL_PGPCORE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.claws-mail-pgpcore+= claws-mail-pgpcore>=3.7.0 BUILDLINK_PKGSRCDIR.claws-mail-pgpcore?= ../../mail/claws-mail-pgpcore -.endif # CLAWS_MAIL_PGPCORE_BUILDLINK3_MK .include "../../x11/gtk2/buildlink3.mk" .include "../../security/gpgme/buildlink3.mk" +.endif # CLAWS_MAIL_PGPCORE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -claws-mail-pgpcore diff --git a/mail/claws-mail/buildlink3.mk b/mail/claws-mail/buildlink3.mk index b1b1e577cd8..4bf6c9782fd 100644 --- a/mail/claws-mail/buildlink3.mk +++ b/mail/claws-mail/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.4 2009/01/11 03:11:37 smb Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:24:54 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CLAWS_MAIL_BUILDLINK3_MK:= ${CLAWS_MAIL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= claws-mail -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= claws-mail -.endif +.if !defined(CLAWS_MAIL_BUILDLINK3_MK) +CLAWS_MAIL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nclaws-mail} -BUILDLINK_PACKAGES+= claws-mail -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}claws-mail - -.if ${CLAWS_MAIL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.claws-mail+= claws-mail>=3.7.0 BUILDLINK_PKGSRCDIR.claws-mail?= ../../mail/claws-mail -.endif # CLAWS_MAIL_BUILDLINK3_MK +.endif # CLAWS_MAIL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -claws-mail diff --git a/mail/dovecot/buildlink3.mk b/mail/dovecot/buildlink3.mk index 9de38cab06e..1184de8db01 100644 --- a/mail/dovecot/buildlink3.mk +++ b/mail/dovecot/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.4 2009/03/19 15:50:27 joerg Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -DOVECOT_BUILDLINK3_MK:= ${DOVECOT_BUILDLINK3_MK}+ +# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:24:54 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= dovecot -.endif +BUILDLINK_TREE+= dovecot -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndovecot} -BUILDLINK_PACKAGES+= dovecot -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dovecot +.if !defined(DOVECOT_BUILDLINK3_MK) +DOVECOT_BUILDLINK3_MK:= -.if !empty(DOVECOT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.dovecot+= dovecot>=1.1beta16 BUILDLINK_PKGSRCDIR.dovecot?= ../../mail/dovecot -.endif # DOVECOT_BUILDLINK3_MK pkgbase := dovecot .include "../../mk/pkg-build-options.mk" +.endif # DOVECOT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -dovecot diff --git a/mail/drac/buildlink3.mk b/mail/drac/buildlink3.mk index c09b4e9abc4..d6482712b44 100644 --- a/mail/drac/buildlink3.mk +++ b/mail/drac/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:57 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:54 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -DRAC_BUILDLINK3_MK:= ${DRAC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= drac -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= drac -.endif +.if !defined(DRAC_BUILDLINK3_MK) +DRAC_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndrac} -BUILDLINK_PACKAGES+= drac -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}drac - -.if !empty(DRAC_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.drac+= drac>=1.10 BUILDLINK_PKGSRCDIR.drac?= ../../mail/drac BUILDLINK_DEPMETHOD.drac?= build -.endif # DRAC_BUILDLINK3_MK +.endif # DRAC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -drac diff --git a/mail/evolution-data-server/buildlink3.mk b/mail/evolution-data-server/buildlink3.mk index 823469fcae9..eeffdfe0672 100644 --- a/mail/evolution-data-server/buildlink3.mk +++ b/mail/evolution-data-server/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.27 2009/03/19 12:02:09 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.28 2009/03/20 19:24:54 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EVOLUTION_DATA_SERVER_BUILDLINK3_MK:= ${EVOLUTION_DATA_SERVER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= evolution-data-server -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= evolution-data-server -.endif +.if !defined(EVOLUTION_DATA_SERVER_BUILDLINK3_MK) +EVOLUTION_DATA_SERVER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nevolution-data-server} -BUILDLINK_PACKAGES+= evolution-data-server -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}evolution-data-server - -.if !empty(EVOLUTION_DATA_SERVER_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.evolution-data-server+= evolution-data-server>=1.8.0 BUILDLINK_ABI_DEPENDS.evolution-data-server?= evolution-data-server>=2.22.3nb1 BUILDLINK_PKGSRCDIR.evolution-data-server?= ../../mail/evolution-data-server @@ -22,7 +15,6 @@ PRINT_PLIST_AWK+=/^@dirrm lib\/evolution-data-server-1.2\/camel-providers$$/ \ { print "@comment in evolution-data-server: " $$0; next } PRINT_PLIST_AWK+=/^@dirrm lib\/evolution-data-server-1.2$$/ \ { print "@comment in evolution-data-server: " $$0; next } -.endif # EVOLUTION_DATA_SERVER_BUILDLINK3_MK .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" @@ -31,5 +23,6 @@ PRINT_PLIST_AWK+=/^@dirrm lib\/evolution-data-server-1.2$$/ \ .include "../../databases/db4/buildlink3.mk" .include "../../net/libsoup24/buildlink3.mk" .include "../../time/libical/buildlink3.mk" +.endif # EVOLUTION_DATA_SERVER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -evolution-data-server diff --git a/mail/evolution/buildlink3.mk b/mail/evolution/buildlink3.mk index 3af7b9f08d2..a56580e4f0f 100644 --- a/mail/evolution/buildlink3.mk +++ b/mail/evolution/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.23 2008/09/06 20:54:33 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2009/03/20 19:24:54 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EVOLUTION_BUILDLINK3_MK:= ${EVOLUTION_BUILDLINK3_MK}+ +BUILDLINK_TREE+= evolution -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= evolution -.endif +.if !defined(EVOLUTION_BUILDLINK3_MK) +EVOLUTION_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nevolution} -BUILDLINK_PACKAGES+= evolution -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}evolution - -.if !empty(EVOLUTION_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.evolution+= evolution>=2.8.0 BUILDLINK_ABI_DEPENDS.evolution?= evolution>=2.22.3.1nb1 BUILDLINK_PKGSRCDIR.evolution?= ../../mail/evolution -.endif # EVOLUTION_BUILDLINK3_MK PRINT_PLIST_AWK+= /^@dirrm lib\/evolution\/2.10$$/ \ { print "@comment in evolution: " $$0; next } @@ -33,5 +25,6 @@ PRINT_PLIST_AWK+= /^@dirrm libexec\/evolution$$/ \ .include "../../devel/nss/buildlink3.mk" .include "../../mail/evolution-data-server/buildlink3.mk" .include "../../www/gtkhtml314/buildlink3.mk" +.endif # EVOLUTION_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -evolution diff --git a/mail/faces/buildlink3.mk b/mail/faces/buildlink3.mk index 0c22049a802..aba2f5f5107 100644 --- a/mail/faces/buildlink3.mk +++ b/mail/faces/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:57 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:54 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FACES_BUILDLINK3_MK:= ${FACES_BUILDLINK3_MK}+ +BUILDLINK_TREE+= faces -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= faces -.endif +.if !defined(FACES_BUILDLINK3_MK) +FACES_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfaces} -BUILDLINK_PACKAGES+= faces -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}faces - -.if !empty(FACES_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.faces+= faces>=1.6.1nb1 BUILDLINK_ABI_DEPENDS.faces+= faces>=1.6.1nb4 BUILDLINK_PKGSRCDIR.faces?= ../../mail/faces -.endif # FACES_BUILDLINK3_MK +.endif # FACES_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -faces diff --git a/mail/gmime/buildlink3.mk b/mail/gmime/buildlink3.mk index abff4d4e884..ecd3f729527 100644 --- a/mail/gmime/buildlink3.mk +++ b/mail/gmime/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:57 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:54 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GMIME_BUILDLINK3_MK:= ${GMIME_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gmime -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gmime -.endif +.if !defined(GMIME_BUILDLINK3_MK) +GMIME_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngmime} -BUILDLINK_PACKAGES+= gmime -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gmime - -.if !empty(GMIME_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gmime+= gmime>=2.1.7 BUILDLINK_PKGSRCDIR.gmime?= ../../mail/gmime -.endif # GMIME_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" +.endif # GMIME_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gmime diff --git a/mail/gmime24/buildlink3.mk b/mail/gmime24/buildlink3.mk index bb892a9af27..e647b0c441d 100644 --- a/mail/gmime24/buildlink3.mk +++ b/mail/gmime24/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/10/24 16:37:49 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:55 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GMIME24_BUILDLINK3_MK:= ${GMIME24_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gmime24 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= gmime24 -.endif +.if !defined(GMIME24_BUILDLINK3_MK) +GMIME24_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngmime24} -BUILDLINK_PACKAGES+= gmime24 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gmime24 - -.if ${GMIME24_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.gmime24+= gmime24>=2.4.3 BUILDLINK_PKGSRCDIR.gmime24?= ../../mail/gmime24 -.endif # GMIME24_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.endif # GMIME24_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gmime24 diff --git a/mail/imap-uw/buildlink3.mk b/mail/imap-uw/buildlink3.mk index 38ce81c6283..01e6fcfdc09 100644 --- a/mail/imap-uw/buildlink3.mk +++ b/mail/imap-uw/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.15 2008/11/13 14:20:20 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:24:55 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -IMAP_UW_BUILDLINK3_MK:= ${IMAP_UW_BUILDLINK3_MK}+ +BUILDLINK_TREE+= imap-uw -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= imap-uw -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nimap-uw} -BUILDLINK_PACKAGES+= imap-uw -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}imap-uw +.if !defined(IMAP_UW_BUILDLINK3_MK) +IMAP_UW_BUILDLINK3_MK:= .include "../../mk/bsd.fast.prefs.mk" -.if !empty(IMAP_UW_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.imap-uw+= imap-uw>=2007dnb1 BUILDLINK_ABI_DEPENDS.imap-uw+= imap-uw>=2007dnb1 BUILDLINK_PKGSRCDIR.imap-uw?= ../../mail/imap-uw @@ -23,8 +16,8 @@ BUILDLINK_LDFLAGS.imap-uw+= -flat_namespace # function symbols from the executable unless we do this: INSTALL_UNSTRIPPED?= yes . endif -.endif # IMAP_UW_BUILDLINK3_MK .include "../../security/openssl/buildlink3.mk" +.endif # IMAP_UW_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -imap-uw diff --git a/mail/libesmtp/buildlink3.mk b/mail/libesmtp/buildlink3.mk index 3b8db3e63dd..7755b020f3c 100644 --- a/mail/libesmtp/buildlink3.mk +++ b/mail/libesmtp/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.12 2008/01/18 05:08:26 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:55 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBESMTP_BUILDLINK3_MK:= ${LIBESMTP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libesmtp -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libesmtp -.endif +.if !defined(LIBESMTP_BUILDLINK3_MK) +LIBESMTP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibesmtp} -BUILDLINK_PACKAGES+= libesmtp -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libesmtp - -.if !empty(LIBESMTP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libesmtp+= libesmtp>=1.0rc1nb1 BUILDLINK_ABI_DEPENDS.libesmtp?= libesmtp>=1.0.4nb1 BUILDLINK_PKGSRCDIR.libesmtp?= ../../mail/libesmtp @@ -21,8 +14,7 @@ LIBESMTP= -lesmtp CONFIGURE_ENV+= LIBESMTP=${LIBESMTP:Q} MAKE_ENV+= LIBESMTP=${LIBESMTP:Q} -.endif # LIBESMTP_BUILDLINK3_MK - .include "../../security/openssl/buildlink3.mk" +.endif # LIBESMTP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libesmtp diff --git a/mail/libetpan/buildlink3.mk b/mail/libetpan/buildlink3.mk index 5ceecbe3d4e..e0e7ae0ea64 100644 --- a/mail/libetpan/buildlink3.mk +++ b/mail/libetpan/buildlink3.mk @@ -1,22 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.18 2008/10/05 22:42:36 smb Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2009/03/20 19:24:55 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBETPAN_BUILDLINK3_MK:= ${LIBETPAN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libetpan -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libetpan -.endif +.if !defined(LIBETPAN_BUILDLINK3_MK) +LIBETPAN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibetpan} -BUILDLINK_PACKAGES+= libetpan -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libetpan - -.if !empty(LIBETPAN_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libetpan+= libetpan>=0.38nb1 BUILDLINK_ABI_DEPENDS.libetpan?= libetpan>=0.52nb4 BUILDLINK_ABI_DEPENDS.libetpan?= libetpan>=0.56 BUILDLINK_PKGSRCDIR.libetpan?= ../../mail/libetpan -.endif # LIBETPAN_BUILDLINK3_MK .include "../../converters/libiconv/buildlink3.mk" .include "../../databases/db4/buildlink3.mk" @@ -25,5 +17,6 @@ BUILDLINK_PKGSRCDIR.libetpan?= ../../mail/libetpan .include "../../textproc/expat/buildlink3.mk" .include "../../www/curl/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.endif # LIBETPAN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libetpan diff --git a/mail/libmilter/buildlink3.mk b/mail/libmilter/buildlink3.mk index 5d915cd2acc..18e5d3b2481 100644 --- a/mail/libmilter/buildlink3.mk +++ b/mail/libmilter/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.7 2007/04/26 06:42:39 jnemeth Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:55 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBMILTER_BUILDLINK3_MK:= ${LIBMILTER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libmilter -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libmilter -.endif +.if !defined(LIBMILTER_BUILDLINK3_MK) +LIBMILTER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmilter} -BUILDLINK_PACKAGES+= libmilter -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmilter - -.if !empty(LIBMILTER_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libmilter+= libmilter>=8.14 BUILDLINK_PKGSRCDIR.libmilter?= ../../mail/libmilter BUILDLINK_DEPMETHOD.libmilter?= build PTHREAD_OPTS+= require -.endif # LIBMILTER_BUILDLINK3_MK .include "../../mk/pthread.buildlink3.mk" +.endif # LIBMILTER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libmilter diff --git a/mail/libsieve/buildlink3.mk b/mail/libsieve/buildlink3.mk index 46286397db6..a99f8f0d9de 100644 --- a/mail/libsieve/buildlink3.mk +++ b/mail/libsieve/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/09/08 12:26:15 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:55 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSIEVE_BUILDLINK3_MK:= ${LIBSIEVE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libsieve -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libsieve -.endif +.if !defined(LIBSIEVE_BUILDLINK3_MK) +LIBSIEVE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsieve} -BUILDLINK_PACKAGES+= libsieve -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsieve - -.if ${LIBSIEVE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libsieve+= libsieve>=2.2.5 BUILDLINK_PKGSRCDIR.libsieve?= ../../mail/libsieve -.endif # LIBSIEVE_BUILDLINK3_MK +.endif # LIBSIEVE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libsieve diff --git a/mail/libspf-alt/buildlink3.mk b/mail/libspf-alt/buildlink3.mk index 242d4af2373..104490b7471 100644 --- a/mail/libspf-alt/buildlink3.mk +++ b/mail/libspf-alt/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.9 2007/07/03 13:54:45 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:55 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSPF_ALT_BUILDLINK3_MK:= ${LIBSPF_ALT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libspf_alt -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libspf_alt -.endif +.if !defined(LIBSPF_ALT_BUILDLINK3_MK) +LIBSPF_ALT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibspf_alt} -BUILDLINK_PACKAGES+= libspf_alt -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libspf_alt - -.if !empty(LIBSPF_ALT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libspf_alt+= libspf_alt>=0.4.0nb1 BUILDLINK_ABI_DEPENDS.libspf_alt+= libspf_alt>=0.4.0nb3 BUILDLINK_PKGSRCDIR.libspf_alt?= ../../mail/libspf-alt -.endif # LIBSPF_ALT_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../mk/resolv.buildlink3.mk" +.endif # LIBSPF_ALT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libspf_alt diff --git a/mail/libspf2/buildlink3.mk b/mail/libspf2/buildlink3.mk index 88d647d28af..1a09017e399 100644 --- a/mail/libspf2/buildlink3.mk +++ b/mail/libspf2/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/02/05 21:59:32 adrianp Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:55 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSPF2_BUILDLINK3_MK:= ${LIBSPF2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libspf2 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libspf2 -.endif +.if !defined(LIBSPF2_BUILDLINK3_MK) +LIBSPF2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibspf2} -BUILDLINK_PACKAGES+= libspf2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libspf2 - -.if ${LIBSPF2_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libspf2+= libspf2>=1.2.5 BUILDLINK_PKGSRCDIR.libspf2?= ../../mail/libspf2 -.endif # LIBSPF2_BUILDLINK3_MK +.endif # LIBSPF2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libspf2 diff --git a/mail/libsylph/buildlink3.mk b/mail/libsylph/buildlink3.mk index ef1127156b3..f45a9ef938e 100644 --- a/mail/libsylph/buildlink3.mk +++ b/mail/libsylph/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/01/18 05:08:26 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:55 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSYLPH_BUILDLINK3_MK:= ${LIBSYLPH_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libsylph -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libsylph -.endif +.if !defined(LIBSYLPH_BUILDLINK3_MK) +LIBSYLPH_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsylph} -BUILDLINK_PACKAGES+= libsylph -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsylph - -.if ${LIBSYLPH_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libsylph+= libsylph>=0.3.0 BUILDLINK_ABI_DEPENDS.libsylph?= libsylph>=0.3.0nb1 BUILDLINK_PKGSRCDIR.libsylph?= ../../mail/libsylph -.endif # LIBSYLPH_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" +.endif # LIBSYLPH_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libsylph diff --git a/mail/libytnef/buildlink3.mk b/mail/libytnef/buildlink3.mk index 739da777aab..bb1df62954b 100644 --- a/mail/libytnef/buildlink3.mk +++ b/mail/libytnef/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1 2008/01/09 03:53:10 smb Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:55 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBYTNEF_BUILDLINK3_MK:= ${LIBYTNEF_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libytnef -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libytnef -.endif +.if !defined(LIBYTNEF_BUILDLINK3_MK) +LIBYTNEF_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibytnef} -BUILDLINK_PACKAGES+= libytnef -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libytnef - -.if ${LIBYTNEF_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libytnef+= libytnef>=1.5 BUILDLINK_PKGSRCDIR.libytnef?= ../../mail/libytnef -.endif # LIBYTNEF_BUILDLINK3_MK +.endif # LIBYTNEF_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libytnef diff --git a/mail/mew/buildlink3.mk b/mail/mew/buildlink3.mk index 2da53354f45..4f4a85d1404 100644 --- a/mail/mew/buildlink3.mk +++ b/mail/mew/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:41:18 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:56 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MEW_BUILDLINK3_MK:= ${MEW_BUILDLINK3_MK}+ +BUILDLINK_TREE+= mew -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= mew -.endif +.if !defined(MEW_BUILDLINK3_MK) +MEW_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmew} -BUILDLINK_PACKAGES+= mew -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mew - -.if ${MEW_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.mew+= ${EMACS_PKGNAME_PREFIX}mew>=5 BUILDLINK_PKGSRCDIR.mew?= ../../mail/mew -.endif # MEW_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.mew= ${EGREP} '.*\.el$$|.*\.elc$$' +.endif # MEW_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -mew diff --git a/mail/perdition/buildlink3.mk b/mail/perdition/buildlink3.mk index d1689bbda05..3b883d19b13 100644 --- a/mail/perdition/buildlink3.mk +++ b/mail/perdition/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:57 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:56 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PERDITION_BUILDLINK3_MK:= ${PERDITION_BUILDLINK3_MK}+ +BUILDLINK_TREE+= perdition -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= perdition -.endif +.if !defined(PERDITION_BUILDLINK3_MK) +PERDITION_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nperdition} -BUILDLINK_PACKAGES+= perdition -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}perdition - -.if !empty(PERDITION_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.perdition+= perdition>=1.17 BUILDLINK_ABI_DEPENDS.perdition?= perdition>=1.17nb1 BUILDLINK_PKGSRCDIR.perdition?= ../../mail/perdition -.endif # PERDITION_BUILDLINK3_MK # The following are included in Makefile.common for "configure"'s sake. #.include "../../devel/popt/buildlink3.mk" #.include "../../devel/vanessa_adt/buildlink3.mk" #.include "../../devel/vanessa_logger/buildlink3.mk" #.include "../../devel/vanessa_socket/buildlink3.mk" +.endif # PERDITION_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -perdition diff --git a/mail/squirrelmail/buildlink3.mk b/mail/squirrelmail/buildlink3.mk index 8039bcf7cd4..8fc1ef4c4ec 100644 --- a/mail/squirrelmail/buildlink3.mk +++ b/mail/squirrelmail/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.20 2008/12/04 07:18:46 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2009/03/20 19:24:56 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SQUIRRELMAIL_BUILDLINK3_MK:= ${SQUIRRELMAIL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= squirrelmail -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= squirrelmail -.endif +.if !defined(SQUIRRELMAIL_BUILDLINK3_MK) +SQUIRRELMAIL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsquirrelmail} -BUILDLINK_PACKAGES+= squirrelmail -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}squirrelmail - -.if ${SQUIRRELMAIL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.squirrelmail+= squirrelmail>=1.4.17 BUILDLINK_PKGSRCDIR.squirrelmail?= ../../mail/squirrelmail -.endif # SQUIRRELMAIL_BUILDLINK3_MK +.endif # SQUIRRELMAIL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -squirrelmail diff --git a/math/R/buildlink3.mk b/math/R/buildlink3.mk index 4c63eb8dc61..c8bdf4c4ff9 100644 --- a/math/R/buildlink3.mk +++ b/math/R/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:58 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:56 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -R_BUILDLINK3_MK:= ${R_BUILDLINK3_MK}+ +BUILDLINK_TREE+= R -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= R -.endif +.if !defined(R_BUILDLINK3_MK) +R_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NR} -BUILDLINK_PACKAGES+= R -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}R - -.if !empty(R_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.R+= R>=1.7.0 BUILDLINK_ABI_DEPENDS.R?= R>=2.2.1nb2 BUILDLINK_PKGSRCDIR.R?= ../../math/R -.endif # R_BUILDLINK3_MK +.endif # R_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -R diff --git a/math/blas/buildlink3.mk b/math/blas/buildlink3.mk index a8050cd8585..80124c99072 100644 --- a/math/blas/buildlink3.mk +++ b/math/blas/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:59 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:56 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BLAS_BUILDLINK3_MK:= ${BLAS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= blas -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= blas -.endif +.if !defined(BLAS_BUILDLINK3_MK) +BLAS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nblas} -BUILDLINK_PACKAGES+= blas -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}blas - -.if !empty(BLAS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.blas+= blas>=1.0nb2 BUILDLINK_ABI_DEPENDS.blas+= blas>=1.0nb3 BUILDLINK_PKGSRCDIR.blas?= ../../math/blas -.endif # BLAS_BUILDLINK3_MK +.endif # BLAS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -blas diff --git a/math/cln/buildlink3.mk b/math/cln/buildlink3.mk index 711e6587202..5d596386383 100644 --- a/math/cln/buildlink3.mk +++ b/math/cln/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:59 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:56 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CLN_BUILDLINK3_MK:= ${CLN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= cln -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= cln -.endif +.if !defined(CLN_BUILDLINK3_MK) +CLN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncln} -BUILDLINK_PACKAGES+= cln -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cln - -.if !empty(CLN_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.cln+= cln>=1.1.6 BUILDLINK_ABI_DEPENDS.cln+= cln>=1.1.9nb1 BUILDLINK_PKGSRCDIR.cln?= ../../math/cln -.endif # CLN_BUILDLINK3_MK +.endif # CLN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -cln diff --git a/math/djbfft/buildlink3.mk b/math/djbfft/buildlink3.mk index 8f45f62b3f5..a4b05080a66 100644 --- a/math/djbfft/buildlink3.mk +++ b/math/djbfft/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:59 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:56 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -DJBFFT_BUILDLINK3_MK:= ${DJBFFT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= djbfft -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= djbfft -.endif +.if !defined(DJBFFT_BUILDLINK3_MK) +DJBFFT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndjbfft} -BUILDLINK_PACKAGES+= djbfft -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}djbfft - -.if !empty(DJBFFT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.djbfft+= djbfft>=0.76 BUILDLINK_PKGSRCDIR.djbfft?= ../../math/djbfft BUILDLINK_DEPMETHOD.djbfft?= build -.endif # DJBFFT_BUILDLINK3_MK +.endif # DJBFFT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -djbfft diff --git a/math/eigen2/buildlink3.mk b/math/eigen2/buildlink3.mk index abe58f29fbb..0c95fa375dc 100644 --- a/math/eigen2/buildlink3.mk +++ b/math/eigen2/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/10 01:02:47 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:56 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EIGEN_BUILDLINK3_MK:= ${EIGEN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= eigen -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= eigen -.endif +.if !defined(EIGEN_BUILDLINK3_MK) +EIGEN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Neigen} -BUILDLINK_PACKAGES+= eigen -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}eigen - -.if ${EIGEN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.eigen+= eigen>=2.0beta3 BUILDLINK_PKGSRCDIR.eigen?= ../../math/eigen2 BUILDLINK_DEPMETHOD.eigen?= build -.endif # EIGEN_BUILDLINK3_MK +.endif # EIGEN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -eigen diff --git a/math/fftw/buildlink3.mk b/math/fftw/buildlink3.mk index 354e59a612f..da4835a80bc 100644 --- a/math/fftw/buildlink3.mk +++ b/math/fftw/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:59 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:56 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FFTW_BUILDLINK3_MK:= ${FFTW_BUILDLINK3_MK}+ +BUILDLINK_TREE+= fftw -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= fftw -.endif +.if !defined(FFTW_BUILDLINK3_MK) +FFTW_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfftw} -BUILDLINK_PACKAGES+= fftw -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fftw - -.if !empty(FFTW_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.fftw+= fftw>=3.0 BUILDLINK_ABI_DEPENDS.fftw+= fftw>=3.1nb1 BUILDLINK_PKGSRCDIR.fftw?= ../../math/fftw -.endif # FFTW_BUILDLINK3_MK +.endif # FFTW_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -fftw diff --git a/math/fftw2/buildlink3.mk b/math/fftw2/buildlink3.mk index 1324bd49e05..74979071ba2 100644 --- a/math/fftw2/buildlink3.mk +++ b/math/fftw2/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:59 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:56 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FFTW2_BUILDLINK3_MK:= ${FFTW2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= fftw2 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= fftw2 -.endif +.if !defined(FFTW2_BUILDLINK3_MK) +FFTW2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfftw2} -BUILDLINK_PACKAGES+= fftw2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fftw2 - -.if !empty(FFTW2_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.fftw2+= fftw2>=2.1.3 BUILDLINK_ABI_DEPENDS.fftw2?= fftw2>=2.1.5nb2 BUILDLINK_PKGSRCDIR.fftw2?= ../../math/fftw2 -.endif # FFTW2_BUILDLINK3_MK +.endif # FFTW2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -fftw2 diff --git a/math/fftwf/buildlink3.mk b/math/fftwf/buildlink3.mk index 21d8e9c70c3..c18b6c81c87 100644 --- a/math/fftwf/buildlink3.mk +++ b/math/fftwf/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:59 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:56 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FFTWF_BUILDLINK3_MK:= ${FFTWF_BUILDLINK3_MK}+ +BUILDLINK_TREE+= fftwf -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= fftwf -.endif +.if !defined(FFTWF_BUILDLINK3_MK) +FFTWF_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfftwf} -BUILDLINK_PACKAGES+= fftwf -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fftwf - -.if !empty(FFTWF_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.fftwf+= fftwf>=3.0 BUILDLINK_ABI_DEPENDS.fftwf+= fftwf>=3.0.1nb1 BUILDLINK_PKGSRCDIR.fftwf?= ../../math/fftwf -.endif # FFTWF_BUILDLINK3_MK .include "../../math/fftw/buildlink3.mk" +.endif # FFTWF_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -fftwf diff --git a/math/glpk/buildlink3.mk b/math/glpk/buildlink3.mk index 35c0a5db0da..3034cc2b040 100644 --- a/math/glpk/buildlink3.mk +++ b/math/glpk/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.8 2007/01/04 22:38:49 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:57 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GLPK_BUILDLINK3_MK:= ${GLPK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= glpk -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= glpk -.endif +.if !defined(GLPK_BUILDLINK3_MK) +GLPK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglpk} -BUILDLINK_PACKAGES+= glpk -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}glpk - -.if !empty(GLPK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.glpk+= glpk>=4.8nb1 BUILDLINK_ABI_DEPENDS.glpk+= glpk>=4.9nb1 BUILDLINK_PKGSRCDIR.glpk?= ../../math/glpk -.endif # GLPK_BUILDLINK3_MK .include "../../devel/gmp/buildlink3.mk" +.endif # GLPK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -glpk diff --git a/math/gsl/buildlink3.mk b/math/gsl/buildlink3.mk index 5da3d236a3a..bfa24953ada 100644 --- a/math/gsl/buildlink3.mk +++ b/math/gsl/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:59 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:57 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GSL_BUILDLINK3_MK:= ${GSL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gsl -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gsl -.endif +.if !defined(GSL_BUILDLINK3_MK) +GSL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngsl} -BUILDLINK_PACKAGES+= gsl -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gsl - -.if !empty(GSL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gsl+= gsl>=1.4 BUILDLINK_ABI_DEPENDS.gsl+= gsl>=1.5nb1 BUILDLINK_PKGSRCDIR.gsl?= ../../math/gsl -.endif # GSL_BUILDLINK3_MK +.endif # GSL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gsl diff --git a/math/lapack/buildlink3.mk b/math/lapack/buildlink3.mk index bc804754892..1eb9492d3d5 100644 --- a/math/lapack/buildlink3.mk +++ b/math/lapack/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2007/12/10 17:50:31 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:57 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LAPACK_BUILDLINK3_MK:= ${LAPACK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= lapack -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= lapack -.endif +.if !defined(LAPACK_BUILDLINK3_MK) +LAPACK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlapack} -BUILDLINK_PACKAGES+= lapack -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lapack - -.if !empty(LAPACK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.lapack+= lapack>=3.1.1 BUILDLINK_ABI_DEPENDS.lapack+= lapack>=3.1.1 BUILDLINK_PKGSRCDIR.lapack?= ../../math/lapack -.endif # LAPACK_BUILDLINK3_MK +.endif # LAPACK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -lapack diff --git a/math/libffm/buildlink3.mk b/math/libffm/buildlink3.mk index 324ffb514e2..008d0d11b96 100644 --- a/math/libffm/buildlink3.mk +++ b/math/libffm/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:59 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:57 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBFFM_BUILDLINK3_MK:= ${LIBFFM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libffm -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libffm -.endif +.if !defined(LIBFFM_BUILDLINK3_MK) +LIBFFM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibffm} -BUILDLINK_PACKAGES+= libffm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libffm - -.if !empty(LIBFFM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libffm+= libffm>=0.28 BUILDLINK_ABI_DEPENDS.libffm?= libffm>=0.28nb1 BUILDLINK_PKGSRCDIR.libffm?= ../../math/libffm -.endif # LIBFFM_BUILDLINK3_MK +.endif # LIBFFM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libffm diff --git a/math/libmatheval/buildlink3.mk b/math/libmatheval/buildlink3.mk index d04c45054bf..69e7364ea70 100644 --- a/math/libmatheval/buildlink3.mk +++ b/math/libmatheval/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:59 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:57 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBMATHEVAL_BUILDLINK3_MK:= ${LIBMATHEVAL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libmatheval -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libmatheval -.endif +.if !defined(LIBMATHEVAL_BUILDLINK3_MK) +LIBMATHEVAL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmatheval} -BUILDLINK_PACKAGES+= libmatheval -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmatheval - -.if !empty(LIBMATHEVAL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libmatheval+= libmatheval>=1.1.0 BUILDLINK_ABI_DEPENDS.libmatheval+= libmatheval>=1.1.1nb3 BUILDLINK_PKGSRCDIR.libmatheval?= ../../math/libmatheval -.endif # LIBMATHEVAL_BUILDLINK3_MK .include "../../devel/flex/buildlink3.mk" .include "../../lang/guile/buildlink3.mk" +.endif # LIBMATHEVAL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libmatheval diff --git a/math/ltm/buildlink3.mk b/math/ltm/buildlink3.mk index 69deca93cb0..74219529cc2 100644 --- a/math/ltm/buildlink3.mk +++ b/math/ltm/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:59 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:57 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LTM_BUILDLINK3_MK:= ${LTM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ltm -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ltm -.endif +.if !defined(LTM_BUILDLINK3_MK) +LTM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nltm} -BUILDLINK_PACKAGES+= ltm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ltm - -.if !empty(LTM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ltm+= ltm>=0.30 BUILDLINK_ABI_DEPENDS.ltm?= ltm>=0.30nb1 BUILDLINK_PKGSRCDIR.ltm?= ../../math/ltm BUILDLINK_DEPMETHOD.ltm?= build -.endif # LTM_BUILDLINK3_MK +.endif # LTM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ltm diff --git a/math/mpfr/buildlink3.mk b/math/mpfr/buildlink3.mk index e384d422432..efdc0430ce0 100644 --- a/math/mpfr/buildlink3.mk +++ b/math/mpfr/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.6 2007/09/18 20:15:58 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:57 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MPFR_BUILDLINK3_MK:= ${MPFR_BUILDLINK3_MK}+ +BUILDLINK_TREE+= mpfr -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= mpfr -.endif +.if !defined(MPFR_BUILDLINK3_MK) +MPFR_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmpfr} -BUILDLINK_PACKAGES+= mpfr -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mpfr - -.if !empty(MPFR_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.mpfr+= mpfr>=2.0.3 BUILDLINK_PKGSRCDIR.mpfr?= ../../math/mpfr -.endif # MPFR_BUILDLINK3_MK .include "../../devel/gmp/buildlink3.mk" +.endif # MPFR_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -mpfr diff --git a/math/ntl/buildlink3.mk b/math/ntl/buildlink3.mk index dfdb67a41b6..e7258e0144d 100644 --- a/math/ntl/buildlink3.mk +++ b/math/ntl/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:59 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:57 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -NTL_BUILDLINK3_MK:= ${NTL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ntl -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ntl -.endif +.if !defined(NTL_BUILDLINK3_MK) +NTL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nntl} -BUILDLINK_PACKAGES+= ntl -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ntl - -.if !empty(NTL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ntl+= ntl>=5.3.1 BUILDLINK_ABI_DEPENDS.ntl+= ntl>=5.3.1nb1 BUILDLINK_PKGSRCDIR.ntl?= ../../math/ntl -.endif # NTL_BUILDLINK3_MK .include "../../devel/gmp/buildlink3.mk" +.endif # NTL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ntl diff --git a/math/octave-forge/buildlink3.mk b/math/octave-forge/buildlink3.mk index 48523b55994..c669292c995 100644 --- a/math/octave-forge/buildlink3.mk +++ b/math/octave-forge/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.8 2007/01/07 12:25:54 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:57 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OCTAVE_FORGE_BUILDLINK3_MK:= ${OCTAVE_FORGE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= octave-forge -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= octave-forge -.endif +.if !defined(OCTAVE_FORGE_BUILDLINK3_MK) +OCTAVE_FORGE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Noctave-forge} -BUILDLINK_PACKAGES+= octave-forge -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}octave-forge - -.if !empty(OCTAVE_FORGE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.octave-forge+= octave-forge>=2005.06.13 BUILDLINK_ABI_DEPENDS.octave-forge?= octave-forge>=2006.03.17nb1 BUILDLINK_PKGSRCDIR.octave-forge?= ../../math/octave-forge -.endif # OCTAVE_FORGE_BUILDLINK3_MK .include "../../math/octave/buildlink3.mk" +.endif # OCTAVE_FORGE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -octave-forge diff --git a/math/octave/buildlink3.mk b/math/octave/buildlink3.mk index 254bccfeed8..4f9a976f704 100644 --- a/math/octave/buildlink3.mk +++ b/math/octave/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.12 2008/01/11 01:23:43 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:57 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OCTAVE_BUILDLINK3_MK:= ${OCTAVE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= octave -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= octave -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Noctave} -BUILDLINK_PACKAGES+= octave -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}octave +.if !defined(OCTAVE_BUILDLINK3_MK) +OCTAVE_BUILDLINK3_MK:= -.if !empty(OCTAVE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.octave+= octave>=3.0.0 BUILDLINK_ABI_DEPENDS.octave+= octave>=3.0.0 BUILDLINK_PKGSRCDIR.octave?= ../../math/octave -.endif # OCTAVE_BUILDLINK3_MK .include "../../mk/bsd.fast.prefs.mk" @@ -30,5 +22,6 @@ BUILDLINK_PKGSRCDIR.octave?= ../../math/octave .include "../../math/blas/buildlink3.mk" .include "../../math/fftw/buildlink3.mk" .include "../../math/lapack/buildlink3.mk" +.endif # OCTAVE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -octave diff --git a/math/pari/buildlink3.mk b/math/pari/buildlink3.mk index 164dabeafd8..4878aaaae75 100644 --- a/math/pari/buildlink3.mk +++ b/math/pari/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:59 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:58 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PARI_BUILDLINK3_MK:= ${PARI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pari -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pari -.endif +.if !defined(PARI_BUILDLINK3_MK) +PARI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npari} -BUILDLINK_PACKAGES+= pari -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pari - -.if !empty(PARI_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.pari+= pari>=2.1.5nb1 BUILDLINK_ABI_DEPENDS.pari+= pari>=2.1.6nb1 BUILDLINK_PKGSRCDIR.pari?= ../../math/pari -.endif # PARI_BUILDLINK3_MK +.endif # PARI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pari diff --git a/math/py-Numeric/buildlink3.mk b/math/py-Numeric/buildlink3.mk index 48ee19f74d9..0ff98324850 100644 --- a/math/py-Numeric/buildlink3.mk +++ b/math/py-Numeric/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 17:30:11 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:58 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_NUMERIC_BUILDLINK3_MK:= ${PY_NUMERIC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pynumeric -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pynumeric -.endif +.if !defined(PY_NUMERIC_BUILDLINK3_MK) +PY_NUMERIC_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npynumeric} -BUILDLINK_PACKAGES+= pynumeric -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pynumeric - -.if !empty(PY_NUMERIC_BUILDLINK3_MK:M+) . include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pynumeric+= ${PYPKGPREFIX}-Numeric-[0-9]* BUILDLINK_ABI_DEPENDS.pynumeric+= ${PYPKGPREFIX}-Numeric>=23.7nb1 BUILDLINK_PKGSRCDIR.pynumeric?= ../../math/py-Numeric -.endif # PY_NUMERIC_BUILDLINK3_MK +.endif # PY_NUMERIC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pynumeric diff --git a/math/py-ephem/buildlink3.mk b/math/py-ephem/buildlink3.mk index 660c11f21b2..351d5f1233c 100644 --- a/math/py-ephem/buildlink3.mk +++ b/math/py-ephem/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/13 15:55:55 wulf Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:58 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_EPHEM_BUILDLINK3_MK:= ${PY_EPHEM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= py-ephem -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= py-ephem -.endif +.if !defined(PY_EPHEM_BUILDLINK3_MK) +PY_EPHEM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-ephem} -BUILDLINK_PACKAGES+= py-ephem -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-ephem - -.if ${PY_EPHEM_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.py-ephem+= ${PYPKGPREFIX}-ephem>=3.7b BUILDLINK_PKGSRCDIR.py-ephem?= ../../math/py-ephem -.endif # PY_EPHEM_BUILDLINK3_MK +.endif # PY_EPHEM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -py-ephem diff --git a/math/py-fpconst/buildlink3.mk b/math/py-fpconst/buildlink3.mk index 0e63e393ba9..8bb6497ec62 100644 --- a/math/py-fpconst/buildlink3.mk +++ b/math/py-fpconst/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 17:30:11 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:58 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_FPCONST_BUILDLINK3_MK:= ${PY_FPCONST_BUILDLINK3_MK}+ +BUILDLINK_TREE+= py-fpconst -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= py-fpconst -.endif +.if !defined(PY_FPCONST_BUILDLINK3_MK) +PY_FPCONST_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-fpconst} -BUILDLINK_PACKAGES+= py-fpconst -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-fpconst - -.if !empty(PY_FPCONST_BUILDLINK3_MK:M+) .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.py-fpconst+= ${PYPKGPREFIX}-fpconst>=0.7.0 BUILDLINK_ABI_DEPENDS.py-fpconst?= ${PYPKGPREFIX}-fpconst>=0.7.0nb1 BUILDLINK_PKGSRCDIR.py-fpconst?= ../../math/py-fpconst -.endif # PY_FPCONST_BUILDLINK3_MK +.endif # PY_FPCONST_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -py-fpconst diff --git a/math/py-numarray/buildlink3.mk b/math/py-numarray/buildlink3.mk index f055cba912c..6991c592430 100644 --- a/math/py-numarray/buildlink3.mk +++ b/math/py-numarray/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 17:30:11 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:58 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_NUMARRAY_BUILDLINK3_MK:= ${PY_NUMARRAY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pynumarray -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pynumarray -.endif +.if !defined(PY_NUMARRAY_BUILDLINK3_MK) +PY_NUMARRAY_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npynumarray} -BUILDLINK_PACKAGES+= pynumarray -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pynumarray - -.if !empty(PY_NUMARRAY_BUILDLINK3_MK:M+) .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pynumarray+= ${PYPKGPREFIX}-numarray>=1.1.1 BUILDLINK_ABI_DEPENDS.pynumarray?= ${PYPKGPREFIX}-numarray>=1.3.3nb1 BUILDLINK_PKGSRCDIR.pynumarray?= ../../math/py-numarray -.endif # PY_NUMARRAY_BUILDLINK3_MK +.endif # PY_NUMARRAY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pynumarray diff --git a/math/py-numpy/buildlink3.mk b/math/py-numpy/buildlink3.mk index a1757419913..03fbb7f60df 100644 --- a/math/py-numpy/buildlink3.mk +++ b/math/py-numpy/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:11 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:58 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_NUMPY_BUILDLINK3_MK:= ${PY_NUMPY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pynumpy -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= pynumpy -.endif +.if !defined(PY_NUMPY_BUILDLINK3_MK) +PY_NUMPY_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npynumpy} -BUILDLINK_PACKAGES+= pynumpy -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pynumpy - -.if ${PY_NUMPY_BUILDLINK3_MK} == "+" .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pynumpy+= ${PYPKGPREFIX}-numpy>=1.0 BUILDLINK_PKGSRCDIR.pynumpy?= ../../math/py-numpy -.endif # PY_NUMPY_BUILDLINK3_MK .include "../../math/blas/buildlink3.mk" .include "../../math/lapack/buildlink3.mk" +.endif # PY_NUMPY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pynumpy diff --git a/math/qalculate/buildlink3.mk b/math/qalculate/buildlink3.mk index aa2f3de2eb9..d6fb715247f 100644 --- a/math/qalculate/buildlink3.mk +++ b/math/qalculate/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:00 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:58 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -QALCULATE_BUILDLINK3_MK:= ${QALCULATE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= qalculate -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= qalculate -.endif +.if !defined(QALCULATE_BUILDLINK3_MK) +QALCULATE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nqalculate} -BUILDLINK_PACKAGES+= qalculate -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qalculate - -.if !empty(QALCULATE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.qalculate+= qalculate>=0.8.2 BUILDLINK_ABI_DEPENDS.qalculate?= qalculate>=0.8.2nb2 BUILDLINK_PKGSRCDIR.qalculate?= ../../math/qalculate -.endif # QALCULATE_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../math/cln/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.endif # QALCULATE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -qalculate diff --git a/math/qhull/buildlink3.mk b/math/qhull/buildlink3.mk index 8f404b2e8f8..f8cbaac5a74 100644 --- a/math/qhull/buildlink3.mk +++ b/math/qhull/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/09/19 18:00:54 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:58 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -QHULL_BUILDLINK3_MK:= ${QHULL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= qhull -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= qhull -.endif +.if !defined(QHULL_BUILDLINK3_MK) +QHULL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nqhull} -BUILDLINK_PACKAGES+= qhull -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qhull - -.if ${QHULL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.qhull+= qhull>=2003.1 BUILDLINK_PKGSRCDIR.qhull?= ../../math/qhull -.endif # QHULL_BUILDLINK3_MK +.endif # QHULL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -qhull diff --git a/math/scilab/buildlink3.mk b/math/scilab/buildlink3.mk index 8c2efcb57f9..998391aee7a 100644 --- a/math/scilab/buildlink3.mk +++ b/math/scilab/buildlink3.mk @@ -1,29 +1,22 @@ -# $NetBSD: buildlink3.mk,v 1.12 2007/03/28 21:18:52 dmcmahill Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:58 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SCILAB_BUILDLINK3_MK:= ${SCILAB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= scilab -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= scilab -.endif +.if !defined(SCILAB_BUILDLINK3_MK) +SCILAB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nscilab} -BUILDLINK_PACKAGES+= scilab -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}scilab - -.if !empty(SCILAB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.scilab+= scilab>=4.1 BUILDLINK_ABI_DEPENDS.scilab?= scilab>=4.1 BUILDLINK_PKGSRCDIR.scilab?= ../../math/scilab BUILDLINK_FILES.scilab+= lib/scilab-${SCIVERSION}/Version.incl -.endif # SCILAB_BUILDLINK3_MK SCI= ${BUILDLINK_DIR}/lib/scilab-4.1 CONFIGURE_ENV+= SCI=${SCI:Q} MAKE_ENV+= SCI=${SCI:Q} SCIVERSION= 4.1 +.endif # SCILAB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -scilab diff --git a/math/slatec/buildlink3.mk b/math/slatec/buildlink3.mk index ac435ccad69..c2b98600d20 100644 --- a/math/slatec/buildlink3.mk +++ b/math/slatec/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:00 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:59 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SLATEC_BUILDLINK3_MK:= ${SLATEC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= slatec -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= slatec -.endif +.if !defined(SLATEC_BUILDLINK3_MK) +SLATEC_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nslatec} -BUILDLINK_PACKAGES+= slatec -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}slatec - -.if !empty(SLATEC_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.slatec+= slatec>=4.1nb1 BUILDLINK_ABI_DEPENDS.slatec+= slatec>=4.1nb2 BUILDLINK_PKGSRCDIR.slatec?= ../../math/slatec -.endif # SLATEC_BUILDLINK3_MK +.endif # SLATEC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -slatec diff --git a/math/superlu/buildlink3.mk b/math/superlu/buildlink3.mk index 8a2d5eaba90..9d51b55e623 100644 --- a/math/superlu/buildlink3.mk +++ b/math/superlu/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:00 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:59 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SUPERLU_BUILDLINK3_MK:= ${SUPERLU_BUILDLINK3_MK}+ +BUILDLINK_TREE+= superlu -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= superlu -.endif +.if !defined(SUPERLU_BUILDLINK3_MK) +SUPERLU_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsuperlu} -BUILDLINK_PACKAGES+= superlu -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}superlu - -.if !empty(SUPERLU_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.superlu+= superlu>=2.0nb2 BUILDLINK_PKGSRCDIR.superlu?= ../../math/superlu BUILDLINK_DEPMETHOD.superlu?= build -.endif # SUPERLU_BUILDLINK3_MK +.endif # SUPERLU_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -superlu diff --git a/math/tasp-vsipl/buildlink3.mk b/math/tasp-vsipl/buildlink3.mk index f6060dba78a..c24bf4bf771 100644 --- a/math/tasp-vsipl/buildlink3.mk +++ b/math/tasp-vsipl/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:00 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:59 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TASP_VSIPL_BUILDLINK3_MK:= ${TASP_VSIPL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= tasp-vsipl -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= tasp-vsipl -.endif +.if !defined(TASP_VSIPL_BUILDLINK3_MK) +TASP_VSIPL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntasp-vsipl} -BUILDLINK_PACKAGES+= tasp-vsipl -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tasp-vsipl - -.if !empty(TASP_VSIPL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.tasp-vsipl+= tasp-vsipl>=20030710 BUILDLINK_ABI_DEPENDS.tasp-vsipl?= tasp-vsipl>=20030710nb1 BUILDLINK_PKGSRCDIR.tasp-vsipl?= ../../math/tasp-vsipl -.endif # TASP_VSIPL_BUILDLINK3_MK +.endif # TASP_VSIPL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -tasp-vsipl diff --git a/math/udunits/buildlink3.mk b/math/udunits/buildlink3.mk index cede744b754..01324f03be4 100644 --- a/math/udunits/buildlink3.mk +++ b/math/udunits/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:00 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:59 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -UDUNITS_BUILDLINK3_MK:= ${UDUNITS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= udunits -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= udunits -.endif +.if !defined(UDUNITS_BUILDLINK3_MK) +UDUNITS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nudunits} -BUILDLINK_PACKAGES+= udunits -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}udunits - -.if !empty(UDUNITS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.udunits+= udunits>=1.11.7 BUILDLINK_PKGSRCDIR.udunits?= ../../math/udunits BUILDLINK_DEPMETHOD.udunits?= build BUILDLINK_FILES.udunits= include/udunits.inc -.endif # UDUNITS_BUILDLINK3_MK +.endif # UDUNITS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -udunits diff --git a/math/yorick/buildlink3.mk b/math/yorick/buildlink3.mk index 8f9b522e7f7..d84d6be16a5 100644 --- a/math/yorick/buildlink3.mk +++ b/math/yorick/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:00 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:59 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -YORICK_BUILDLINK3_MK:= ${YORICK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= yorick -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= yorick -.endif +.if !defined(YORICK_BUILDLINK3_MK) +YORICK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nyorick} -BUILDLINK_PACKAGES+= yorick -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}yorick - -.if !empty(YORICK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.yorick+= yorick>=1.5.12 BUILDLINK_DEPMETHOD.yorick?= build BUILDLINK_ABI_DEPENDS.yorick?= yorick>=1.6.02nb1 BUILDLINK_PKGSRCDIR.yorick?= ../../math/yorick -.endif # YORICK_BUILDLINK3_MK +.endif # YORICK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -yorick diff --git a/mbone/common-mml/buildlink3.mk b/mbone/common-mml/buildlink3.mk index 80d3be17e21..c7414f469d1 100644 --- a/mbone/common-mml/buildlink3.mk +++ b/mbone/common-mml/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:00 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:59 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -COMMON_MML_BUILDLINK3_MK:= ${COMMON_MML_BUILDLINK3_MK}+ +BUILDLINK_TREE+= common-mml -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= common-mml -.endif +.if !defined(COMMON_MML_BUILDLINK3_MK) +COMMON_MML_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncommon-mml} -BUILDLINK_PACKAGES+= common-mml -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}common-mml - -.if !empty(COMMON_MML_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.common-mml+= common-mml>=1.2.14 BUILDLINK_PKGSRCDIR.common-mml?= ../../mbone/common-mml -.endif # COMMON_MML_BUILDLINK3_MK +.endif # COMMON_MML_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -common-mml diff --git a/meta-pkgs/xfce4/buildlink3.mk b/meta-pkgs/xfce4/buildlink3.mk index 6641241ab49..30a7aa756df 100644 --- a/meta-pkgs/xfce4/buildlink3.mk +++ b/meta-pkgs/xfce4/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.19 2008/01/18 05:08:32 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2009/03/20 19:24:59 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_BUILDLINK3_MK:= ${XFCE4_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4 -.endif +.if !defined(XFCE4_BUILDLINK3_MK) +XFCE4_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4} -BUILDLINK_PACKAGES+= xfce4 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4 - -.if ${XFCE4_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4+= xfce4>=4.4.1 BUILDLINK_ABI_DEPENDS.xfce4?= xfce4>=4.4.2nb1 BUILDLINK_PKGSRCDIR.xfce4?= ../../meta-pkgs/xfce4 -.endif # XFCE4_BUILDLINK3_MK .include "../../audio/xfce4-mixer/buildlink3.mk" .include "../../editors/xfce4-mousepad/buildlink3.mk" @@ -36,5 +28,6 @@ BUILDLINK_PKGSRCDIR.xfce4?= ../../meta-pkgs/xfce4 .include "../../x11/libSM/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4 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 diff --git a/mk/bdb.buildlink3.mk b/mk/bdb.buildlink3.mk index f357f7bdf7a..fed6138940d 100644 --- a/mk/bdb.buildlink3.mk +++ b/mk/bdb.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bdb.buildlink3.mk,v 1.22 2008/11/26 09:10:30 rillig Exp $ +# $NetBSD: bdb.buildlink3.mk,v 1.23 2009/03/20 19:25:01 joerg Exp $ # # This Makefile fragment is meant to be included by packages that # require a Berkeley DB (BDB) implementation and that are not restricted @@ -134,9 +134,7 @@ BUILD_DEFS_EFFECTS+= BDBBASE BDB_LIBS BDB_TYPE PKG_FAIL_REASON= \ "[bdb.buildlink3.mk] ${_BDB_TYPE} is not an acceptable Berkeley DB type for ${PKGNAME}." .elif ${BDB_TYPE} == "db1" -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndb1} -BUILDLINK_PACKAGES+= db1 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}db1 +BUILDLINK_TREE+= db1 -db1 BUILDLINK_BUILTIN_MK.db1= ../../mk/db1.builtin.mk .else . include "${_BDB_PKGSRCDIR.${BDB_TYPE}}/buildlink3.mk" diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 536323f4ee9..8cff26eed8b 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1953 2009/02/06 15:27:00 joerg Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1954 2009/03/20 19:25:01 joerg Exp $ # # This file is in the public domain. # @@ -125,6 +125,11 @@ _INSTALL_UNSTRIPPED= # set (flag used by platform/*.mk) # Sanity checks ############################################################################ +.if defined(BUILDLINK_DEPTH) || defined(BUILDLINK_PACKAGES) || \ + defined(BUILDLINK_DEPENDS) || defined(BUILDLINK_ORDER) +PKG_FAIL_REASON+= "Out-dated buildlink3.mk detected, please update" +.endif + # PKG_INSTALLATION_TYPE can only be one of two values: "pkgviews" or # "overwrite". .if (${PKG_INSTALLATION_TYPE} != "pkgviews") && \ diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index 6336939ab02..b8b1da459c3 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.204 2009/03/16 18:37:07 joerg Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.205 2009/03/20 19:25:01 joerg Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -37,33 +37,26 @@ # An example package buildlink3.mk file: # # -------------8<-------------8<-------------8<-------------8<------------- -# BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -# FOO_BUILDLINK3_MK:= ${FOO_BUILDLINK3_MK}+ +# BUILDLINK_TREE+= foo # -# .if !empty(BUILDLINK_DEPTH:M+) -# BUILDLINK_DEPENDS+= foo -# .endif +# .if !defined(FOO_BUILDLINK3_MK) +# FOO_BUILDLINK3_MK:= # -# BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfoo} -# BUILDLINK_PACKAGES+= foo -# -# .if !empty(FOO_BUILDLINK3_MK:M+) # BUILDLINK_API_DEPENDS.foo+= foo-lib>=1.0 # BUILDLINK_ABI_DEPENDS.foo?= foo-lib>=1.0nb1 # BUILDLINK_PKGSRCDIR.foo?= ../../category/foo-lib # # # We want "-lbar" to eventually resolve to "-lfoo". # BUILDLINK_TRANSFORM+= l:bar:foo -# .endif # FOO_BUILDLINK3_MK # # .include "../../category/baz/buildlink3.mk" +# .endif # FOO_BUILDLINK3_MK # -# BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +# BUILDLINK_TREE+= -foo # -------------8<-------------8<-------------8<-------------8<------------- # # Most of the buildlink3.mk file is protected against multiple inclusion, -# except for the parts related to manipulating BUILDLINK_DEPTH and adding -# to BUILDLINK_DEPENDS. +# except for the parts related to manipulating BUILDLINK_TREE. # # Note that if a buildlink3.mk file is included, then the package Makefile # has the expectation that it can use the value of BUILDLINK_PREFIX.<pkg>. @@ -100,23 +93,42 @@ BUILDLINK_X11_DIR= ${BUILDLINK_DIR:H}/.x11-buildlink # Prepend ${BUILDLINK_BINDIR} to the PATH. PREPEND_PATH+= ${BUILDLINK_BINDIR} -# BUILDLINK_DEPENDS contains the list of packages for which we add -# dependencies. +# _BUILDLINK_DEPENDS contains the list of packages for which we add +# dependencies. This is only done for direct dependencies. # -BUILDLINK_DEPENDS?= # empty +_BUILDLINK_DEPENDS:= +_BUILDLINK_DEPTH:= +.for _pkg_ in ${BUILDLINK_TREE} +_BUILDLINK_pkg:= ${_pkg_:N-*} +. if empty(_BUILDLINK_pkg) +_BUILDLINK_DEPTH:= ${_BUILDLINK_DEPTH:S/+$//} +. else +. if empty(_BUILDLINK_DEPTH) +_BUILDLINK_DEPENDS+= ${_pkg_} +. endif +_BUILDLINK_DEPTH:= ${_BUILDLINK_DEPTH}+ +. endif +.endfor # For each package we use, check whether we are using the built-in # version of the package or if we are using the pkgsrc version. # -.for _pkg_ in ${BUILDLINK_PACKAGES} +.for _pkg_ in ${BUILDLINK_TREE:N-*} +.if !defined(_BUILDLINK_BUILTIN_MK_INCLUDED.${_pkg_}) +_BUILDLINK_BUILTIN_MK_INCLUDED.${_pkg_}= BUILDLINK_BUILTIN_MK.${_pkg_}?= ${BUILDLINK_PKGSRCDIR.${_pkg_}}/builtin.mk . sinclude "${BUILDLINK_BUILTIN_MK.${_pkg_}}" +.endif .endfor +# Sorted and unified version of BUILDLINK_TREE without recursion +# data. +_BUILDLINK_TREE:= ${BUILDLINK_TREE:N-*:O:u} + # Set IGNORE_PKG.<pkg> if <pkg> is the current package we're building. # We can then check for this value to avoid build loops. # -.for _pkg_ in ${BUILDLINK_PACKAGES} +.for _pkg_ in ${_BUILDLINK_TREE} . if defined(BUILDLINK_PKGSRCDIR.${_pkg_}) . if !defined(IGNORE_PKG.${_pkg_}) && \ (${BUILDLINK_PKGSRCDIR.${_pkg_}:C|.*/([^/]*/[^/]*)$|\1|} == ${PKGPATH}) @@ -126,12 +138,15 @@ MAKEFLAGS+= IGNORE_PKG.${_pkg_}=${IGNORE_PKG.${_pkg_}} . endif .endfor -# _BLNK_PACKAGES contains all of the unique elements of BUILDLINK_PACKAGES +# _BLNK_PACKAGES contains all of the unique elements of BUILDLINK_TREE # that shouldn't be skipped. # +# This does not use _BUILDLINK_TREE as the order matters. x11-links is +# sorted first to allow other packages to override the content. +# _BLNK_PACKAGES= # empty -.for _pkg_ in ${BUILDLINK_PACKAGES} -. if empty(_BLNK_PACKAGES:M${_pkg_}) && !defined(IGNORE_PKG.${_pkg_}) +.for _pkg_ in ${BUILDLINK_TREE:N-*:Mx11-links} ${BUILDLINK_TREE:N-*:Nx11-links} +. if !defined(IGNORE_PKG.${_pkg_}) _BLNK_PACKAGES+= ${_pkg_} . endif .endfor @@ -140,7 +155,7 @@ _VARGROUPS+= bl3 .for v in BINDIR CFLAGS CPPFLAGS DEPENDS LDFLAGS LIBS _SYS_VARS.bl3+= BUILDLINK_${v} .endfor -.for p in ${BUILDLINK_PACKAGES} +.for p in ${_BUILDLINK_TREE} . for v in AUTO_VARS BUILTIN_MK CONTENTS_FILTER CPPFLAGS DEPMETHOD FILES_CMD INCDIRS IS_DEPOT LDFLAGS LIBDIRS PKGNAME PREFIX RPATHDIRS _SYS_VARS.bl3+= BUILDLINK_${v}.${p} . endfor @@ -157,7 +172,7 @@ BUILDLINK_DEPMETHOD.${_pkg_}?= full # _BLNK_DEPENDS contains all of the elements of _BLNK_PACKAGES for which # we must add a dependency. We add a dependency if we aren't using the # built-in version of the package, and the package was either explicitly -# requested as a dependency (BUILDLINK_DEPENDS) or is a build dependency +# requested as a dependency (_BUILDLINK_DEPENDS) or is a build dependency # somewhere in the chain. # _BLNK_DEPENDS= # empty @@ -165,7 +180,7 @@ _BLNK_DEPENDS= # empty USE_BUILTIN.${_pkg_}?= no . if empty(_BLNK_DEPENDS:M${_pkg_}) && !defined(IGNORE_PKG.${_pkg_}) && \ !empty(USE_BUILTIN.${_pkg_}:M[nN][oO]) && \ - (!empty(BUILDLINK_DEPENDS:M${_pkg_}) || \ + (!empty(_BUILDLINK_DEPENDS:M${_pkg_}) || \ !empty(BUILDLINK_DEPMETHOD.${_pkg_}:Mbuild)) _BLNK_DEPENDS+= ${_pkg_} . endif @@ -1120,4 +1135,4 @@ do-buildlink: .PHONY: show-buildlink3 show-buildlink3: - @${SH} ${PKGSRCDIR}/mk/buildlink3/show-buildlink3.sh ${BUILDLINK_ORDER} + @${SH} ${PKGSRCDIR}/mk/buildlink3/show-buildlink3.sh ${BUILDLINK_TREE} diff --git a/mk/buildlink3/bsd.builtin.mk b/mk/buildlink3/bsd.builtin.mk index a614ac13920..578c84b81f4 100644 --- a/mk/buildlink3/bsd.builtin.mk +++ b/mk/buildlink3/bsd.builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.builtin.mk,v 1.9 2008/01/23 17:35:20 tnn Exp $ +# $NetBSD: bsd.builtin.mk,v 1.10 2009/03/20 19:25:01 joerg Exp $ # # Copyright (c) 2004-2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -35,8 +35,8 @@ # POSSIBILITY OF SUCH DAMAGE. # Include this file to set the value of USE_BUILTIN.<pkg> for each -# package listed in BUILDLINK_PACKAGES. Note that this file may -# indirectly add additional values to BUILDLINK_PACKAGES. +# package listed in BUILDLINK_TREE. Note that this file may +# indirectly add additional values to BUILDLINK_TREE. # # For each package which may duplicate built-in software on the system, # a builtin.mk file should be created. The only requirements of a diff --git a/mk/buildlink3/show-buildlink3.sh b/mk/buildlink3/show-buildlink3.sh index 1d2255158d2..1fa109ffdea 100644 --- a/mk/buildlink3/show-buildlink3.sh +++ b/mk/buildlink3/show-buildlink3.sh @@ -1,23 +1,21 @@ #!/bin/sh # -# $NetBSD: show-buildlink3.sh,v 1.1 2006/07/08 23:11:17 jlam Exp $ +# $NetBSD: show-buildlink3.sh,v 1.2 2009/03/20 19:25:01 joerg Exp $ # # This script is a helper for the show-buildlink3 target and outputs -# the arguments, each on a new line with any leading "+" signs replaced -# with four spaces. +# the arguments as tree. # while test $# -gt 0; do pkg="$1" - pkg="${pkg#+}" - prefix= - stripped=no - while test $stripped = no; do - case $pkg in - +*) prefix=" $prefix"; pkg="${pkg#+}"; stripped=no ;; - *) stripped=yes ;; - esac - done - echo "$prefix$pkg" + case $pkg in + -*) + indentation=${indendation# } + ;; + *) + echo "${indentation}${pkg}" + indentation="${indentation} " + ;; + esac shift done diff --git a/mk/curses.buildlink3.mk b/mk/curses.buildlink3.mk index 405834ef4ef..349b948ebb0 100644 --- a/mk/curses.buildlink3.mk +++ b/mk/curses.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: curses.buildlink3.mk,v 1.13 2008/09/16 04:38:49 minskim Exp $ +# $NetBSD: curses.buildlink3.mk,v 1.14 2009/03/20 19:25:01 joerg Exp $ # # This Makefile fragment is meant to be included by packages that require # any curses implementation instead of one particular one. The available @@ -77,9 +77,7 @@ _PKG_USE_CURSES= yes PKG_FAIL_REASON= \ "${_CURSES_TYPE} is not an acceptable curses type for ${PKGNAME}." .elif ${CURSES_TYPE} == "curses" -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncurses} -BUILDLINK_PACKAGES+= curses -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}curses +BUILDLINK_TREE+= curses -curses BUILDLINK_LDADD.curses?= ${BUILDLINK_LIBNAME.curses:S/^/-l/:S/^-l$//} BUILDLINK_BUILTIN_MK.curses= ../../mk/curses.builtin.mk .elif ${CURSES_TYPE} == "ncurses" diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index 25684949d42..dce0b36a14a 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.183 2009/03/08 15:27:59 tron Exp $ +# $NetBSD: mk.conf,v 1.184 2009/03/20 19:25:01 joerg Exp $ # # This file provides default values for variables that may be overridden @@ -218,7 +218,7 @@ PREFER_NATIVE?= yes # When building packages, whether to prefer the pkgsrc or native # versions of software that's also part of the base system. Its value # can be either yes/no, or a list of packages as named in the -# BUILDLINK_PACKAGES line in a package's buildlink3.mk file. +# BUILDLINK_TREE line in a package's buildlink3.mk file. # Preferences are determined by the most specific instance of the # package in either PREFER_PKGSRC or PREFER_NATIVE. If a package is # specified in neither or in both variables, then PREFER_PKGSRC has diff --git a/mk/dlopen.buildlink3.mk b/mk/dlopen.buildlink3.mk index 1c2542dd3d5..4856abf9716 100644 --- a/mk/dlopen.buildlink3.mk +++ b/mk/dlopen.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: dlopen.buildlink3.mk,v 1.16 2007/10/17 10:43:38 rillig Exp $ +# $NetBSD: dlopen.buildlink3.mk,v 1.17 2009/03/20 19:25:01 joerg Exp $ # # This Makefile fragment is included by package Makefiles and # buildlink3.mk files for the packages that use dlopen(). @@ -30,9 +30,7 @@ CHECK_BUILTIN.dl:= no DL_AUTO_VARS?= no .if !empty(USE_BUILTIN.dl:M[yY][eE][sS]) -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndl} -BUILDLINK_PACKAGES+= dl -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dl +BUILDLINK_TREE+= dl -dl BUILDLINK_BUILTIN_MK.dl= ../../mk/dlopen.builtin.mk BUILDLINK_AUTO_VARS.dl= ${DL_AUTO_VARS} .elif !empty(MACHINE_PLATFORM:MDarwin-[56].*) diff --git a/mk/dlopen.builtin.mk b/mk/dlopen.builtin.mk index 2d8c510341f..f8062ad2d8c 100644 --- a/mk/dlopen.builtin.mk +++ b/mk/dlopen.builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: dlopen.builtin.mk,v 1.19 2009/01/23 14:21:38 obache Exp $ +# $NetBSD: dlopen.builtin.mk,v 1.20 2009/03/20 19:25:01 joerg Exp $ BUILTIN_PKG:= dl @@ -93,9 +93,7 @@ BUILDLINK_PREFIX.dl= /usr BUILDLINK_LDADD.dl= -ldl . endif . if !empty(_BLNK_DLOPEN_REQUIRE_PTHREADS:M[yY][eE][sS]) -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ . include "../../mk/pthread.buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} . include "../../mk/pthread.builtin.mk" BUILDLINK_CFLAGS.dl+= ${PTHREAD_CFLAGS} BUILDLINK_LDFLAGS.dl+= ${PTHREAD_LDFLAGS} diff --git a/mk/oss.buildlink3.mk b/mk/oss.buildlink3.mk index 5499233c9e1..f24d6575dc4 100644 --- a/mk/oss.buildlink3.mk +++ b/mk/oss.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: oss.buildlink3.mk,v 1.9 2009/03/19 20:12:00 sno Exp $ +# $NetBSD: oss.buildlink3.mk,v 1.10 2009/03/20 19:25:01 joerg Exp $ # # This Makefile fragment is included by packages that require an Open Sound # System (OSS) implementation. After inclusion of this file, the following @@ -28,9 +28,7 @@ OSS_TYPE= ${_OSS_TYPE} .if ${OSS_TYPE} != "none" -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Noss} -BUILDLINK_PACKAGES+= oss -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}oss +BUILDLINK_TREE+= oss -oss BUILDLINK_BUILTIN_MK.oss= ../../mk/oss.builtin.mk .if !empty(OSS_BUILDLINK3_MK:M+) diff --git a/mk/pam.buildlink3.mk b/mk/pam.buildlink3.mk index 9441b303eb9..eb838df2b77 100644 --- a/mk/pam.buildlink3.mk +++ b/mk/pam.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: pam.buildlink3.mk,v 1.10 2007/10/13 11:04:16 dsl Exp $ +# $NetBSD: pam.buildlink3.mk,v 1.11 2009/03/20 19:25:01 joerg Exp $ # # This Makefile fragment is meant to be included by packages that # require a PAM implementation. @@ -96,7 +96,5 @@ PKG_FAIL_REASON= \ .elif ${PAM_TYPE} == "openpam" . include "../../security/openpam/buildlink3.mk" .elif ${PAM_TYPE} == "solaris-pam" -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsolaris-pam} -BUILDLINK_PACKAGES+= solaris-pam -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}solaris-pam +BUILDLINK_TREE+= solaris-pam -solaris-pam .endif diff --git a/mk/pkg-build-options.mk b/mk/pkg-build-options.mk index f4ebf9cefd6..4f72ffa1f2e 100644 --- a/mk/pkg-build-options.mk +++ b/mk/pkg-build-options.mk @@ -1,4 +1,4 @@ -# $NetBSD: pkg-build-options.mk,v 1.7 2007/10/13 11:04:17 dsl Exp $ +# $NetBSD: pkg-build-options.mk,v 1.8 2009/03/20 19:25:01 joerg Exp $ # # This procedure determines the PKG_OPTIONS that have been in effect # when the package ${pkgbase} has been built. When the package is not @@ -21,7 +21,24 @@ .include "bsd.fast.prefs.mk" -.if defined(BUILDLINK_DEPTH) && !empty(BUILDLINK_DEPTH) +# For the check for inclusion from non-buildlink3.mk, it is irrelevant +# whether BUILDLINK_TREE was empty or undefined, so defining it here +# avoids dealing one case. +BUILDLINK_TREE?= + +# Counting words doesn't work as expected for empty strings, they +# still have one word. Older make doesn't like the code without +# variable assignment for unknown reasons. +_BUILDLINK_TREE_WITH:= ${BUILDLINK_TREE:M-*:[\#]} +_BUILDLINK_TREE_WITHOUT:= ${BUILDLINK_TREE:N-*:[\#]} +.if (empty(BUILDLINK_TREE:M-*) && empty(BUILDLINK_TREE:N-*)) || \ + (!empty(BUILDLINK_TREE:M-*) && !empty(BUILDLINK_TREE:N-*) && \ + ${_BUILDLINK_TREE_WITH} == ${_BUILDLINK_TREE_WITHOUT}) +. for b in ${pkgbase} +PKG_BUILD_OPTIONS.${b}= +PKG_FAIL_REASON+= "[pkg-build-options.mk] This file may only be included from a buildlink3.mk file (pkgbase=${b})." +. endfor +.else . for b in ${pkgbase} . if !defined(PKG_BUILD_OPTIONS.${b}) PKG_BUILD_OPTIONS.${b} != \ @@ -35,8 +52,4 @@ MAKEFLAGS+= PKG_BUILD_OPTIONS.${b}=${PKG_BUILD_OPTIONS.${b}:Q} MAKEVARS+= PKG_BUILD_OPTIONS.${b} . endfor -.else -. for b in ${pkgbase} -PKG_FAIL_REASON+= "[pkg-build-options.mk] This file may only be included from a buildlink3.mk file (pkgbase=${b})." -. endfor .endif diff --git a/mk/pthread.buildlink3.mk b/mk/pthread.buildlink3.mk index 56c4dec0e4f..918f8b38e70 100644 --- a/mk/pthread.buildlink3.mk +++ b/mk/pthread.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: pthread.buildlink3.mk,v 1.27 2008/01/23 17:35:20 tnn Exp $ +# $NetBSD: pthread.buildlink3.mk,v 1.28 2009/03/20 19:25:01 joerg Exp $ # # The pthreads strategy for pkgsrc is to "bless" a particular pthread # package as the Official Pthread Replacement (OPR). The following @@ -113,9 +113,7 @@ PKG_FAIL_REASON= "${PKGNAME} requires a working pthreads implementation." PTHREAD_AUTO_VARS?= no .if ${PTHREAD_TYPE} == "native" -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npthread} -BUILDLINK_PACKAGES+= pthread -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pthread +BUILDLINK_TREE+= pthread -pthread BUILDLINK_BUILTIN_MK.pthread= ../../mk/pthread.builtin.mk BUILDLINK_AUTO_VARS.pthread?= ${PTHREAD_AUTO_VARS} .elif ${PTHREAD_TYPE} == "${_PKG_PTHREAD}" diff --git a/mk/resolv.buildlink3.mk b/mk/resolv.buildlink3.mk index bb3db94ee8c..a8d9ff5d3f6 100644 --- a/mk/resolv.buildlink3.mk +++ b/mk/resolv.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: resolv.buildlink3.mk,v 1.2 2009/01/20 21:30:41 adrianp Exp $ +# $NetBSD: resolv.buildlink3.mk,v 1.3 2009/03/20 19:25:01 joerg Exp $ # # This Makefile fragment is included by package Makefiles and # buildlink3.mk files for the packages that need a thread-safe @@ -40,9 +40,7 @@ USE_BUILTIN.resolv?= no .endif .if !empty(USE_BUILTIN.resolv:M[yY][eE][sS]) -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nresolv} -BUILDLINK_PACKAGES+= resolv -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}resolv +BUILDLINK_TREE+= resolv -resolv BUILDLINK_AUTO_VARS.resolv= ${RESOLV_AUTO_VARS} .else . include "../../net/bind9/buildlink3.mk" diff --git a/mk/termcap.buildlink3.mk b/mk/termcap.buildlink3.mk index d0c9a34f3aa..e601704a0cd 100644 --- a/mk/termcap.buildlink3.mk +++ b/mk/termcap.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: termcap.buildlink3.mk,v 1.6 2008/03/05 17:38:58 jlam Exp $ +# $NetBSD: termcap.buildlink3.mk,v 1.7 2009/03/20 19:25:01 joerg Exp $ # # This Makefile fragment is meant to be included by packages that require # a termcap implementation that supports the basic termcap functions: @@ -56,9 +56,7 @@ PKG_FAIL_REASON= "No usable termcap library found on the system." .elif (${TERMCAP_TYPE} == "termlib") || \ (${TERMCAP_TYPE} == "termcap") || \ (${TERMCAP_TYPE} == "tinfo") -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntermcap} -BUILDLINK_PACKAGES+= termcap -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}termcap +BUILDLINK_TREE+= termcap -termcap BUILDLINK_LIBNAME.termcap?= ${BUILTIN_LIBNAME.termcap} BUILDLINK_LDADD.termcap?= ${BUILDLINK_LIBNAME.termcap:S/^/-l/:S/^-l$//} BUILDLINK_BUILTIN_MK.termcap= ../../mk/termcap.builtin.mk diff --git a/mk/termcap.builtin.mk b/mk/termcap.builtin.mk index 712afb00934..42c99c8bfaf 100644 --- a/mk/termcap.builtin.mk +++ b/mk/termcap.builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: termcap.builtin.mk,v 1.5 2008/03/11 15:39:16 jlam Exp $ +# $NetBSD: termcap.builtin.mk,v 1.6 2009/03/20 19:25:01 joerg Exp $ BUILTIN_PKG:= termcap @@ -95,7 +95,7 @@ BUILDLINK_LIBNAME.termcap= ${BUILTIN_LIBNAME.termcap} # remove them as GNU configure scripts commonly check for one or both # of those library options. # -. if empty(BUILDLINK_PACKAGES:Mcurses) && empty(BUILDLINK_PACKAGES:Mncurses) +. if empty(BUILDLINK_TREE:Mcurses) && empty(BUILDLINK_TREE:Mncurses) BUILDLINK_TRANSFORM+= rm:-lcurses BUILDLINK_TRANSFORM+= rm:-lncurses . endif diff --git a/multimedia/bsdav/buildlink3.mk b/multimedia/bsdav/buildlink3.mk index d5627f277d4..3752a7d2d70 100644 --- a/multimedia/bsdav/buildlink3.mk +++ b/multimedia/bsdav/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/01/30 19:21:08 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:02 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BSDAV_BUILDLINK3_MK:= ${BSDAV_BUILDLINK3_MK}+ +BUILDLINK_TREE+= bsdav -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= bsdav -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbsdav} -BUILDLINK_PACKAGES+= bsdav -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}bsdav +.if !defined(BSDAV_BUILDLINK3_MK) +BSDAV_BUILDLINK3_MK:= -.if ${BSDAV_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.bsdav+= bsdav>=1.4 BUILDLINK_PKGSRCDIR.bsdav?= ../../multimedia/bsdav BUILDLINK_LDADD.bsdav= -lbsdav @@ -20,10 +13,10 @@ LIBBSDAV?= ${BUILDLINK_LDADD.bsdav} pkgbase := bsdav . include "../../mk/pkg-build-options.mk" -.endif # BSDAV_BUILDLINK3_MK .if !empty(PKG_BUILD_OPTIONS.bsdav:Mx11) . include "../../x11/libXv/buildlink3.mk" .endif +.endif # BSDAV_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -bsdav diff --git a/multimedia/clutter-gst/buildlink3.mk b/multimedia/clutter-gst/buildlink3.mk index 6f6870ef7c7..6ddfeaac176 100644 --- a/multimedia/clutter-gst/buildlink3.mk +++ b/multimedia/clutter-gst/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/12/14 11:10:01 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:02 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CLUTTER_GST_BUILDLINK3_MK:= ${CLUTTER_GST_BUILDLINK3_MK}+ +BUILDLINK_TREE+= clutter-gst -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= clutter-gst -.endif +.if !defined(CLUTTER_GST_BUILDLINK3_MK) +CLUTTER_GST_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nclutter-gst} -BUILDLINK_PACKAGES+= clutter-gst -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}clutter-gst - -.if ${CLUTTER_GST_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.clutter-gst+= clutter-gst>=0.8.0 BUILDLINK_PKGSRCDIR.clutter-gst?= ../../multimedia/clutter-gst -.endif # CLUTTER_GST_BUILDLINK3_MK .include "../../graphics/clutter/buildlink3.mk" .include "../../multimedia/gstreamer0.10/buildlink3.mk" .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" +.endif # CLUTTER_GST_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -clutter-gst diff --git a/multimedia/dirac/buildlink3.mk b/multimedia/dirac/buildlink3.mk index bef1733237c..880645ecc1f 100644 --- a/multimedia/dirac/buildlink3.mk +++ b/multimedia/dirac/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:00 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:02 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -DIRAC_BUILDLINK3_MK:= ${DIRAC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= dirac -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= dirac -.endif +.if !defined(DIRAC_BUILDLINK3_MK) +DIRAC_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndirac} -BUILDLINK_PACKAGES+= dirac -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dirac - -.if !empty(DIRAC_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.dirac+= dirac>=0.2.0 BUILDLINK_PKGSRCDIR.dirac?= ../../multimedia/dirac BUILDLINK_DEPMETHOD.dirac?= build -.endif # DIRAC_BUILDLINK3_MK - +.endif # DIRAC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -dirac diff --git a/multimedia/ffmpeg/buildlink3.mk b/multimedia/ffmpeg/buildlink3.mk index d65e9e4c001..8e106327c32 100644 --- a/multimedia/ffmpeg/buildlink3.mk +++ b/multimedia/ffmpeg/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.11 2008/12/18 17:28:16 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:02 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FFMPEG_BUILDLINK3_MK:= ${FFMPEG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ffmpeg -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= ffmpeg -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nffmpeg} -BUILDLINK_PACKAGES+= ffmpeg -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ffmpeg +.if !defined(FFMPEG_BUILDLINK3_MK) +FFMPEG_BUILDLINK3_MK:= -.if ${FFMPEG_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.ffmpeg+= ffmpeg>=20080727 BUILDLINK_ABI_DEPENDS.ffmpeg?= ffmpeg>=20080727nb6 BUILDLINK_PKGSRCDIR.ffmpeg?= ../../multimedia/ffmpeg @@ -19,8 +12,6 @@ BUILDLINK_PKGSRCDIR.ffmpeg?= ../../multimedia/ffmpeg pkgbase := ffmpeg . include "../../mk/pkg-build-options.mk" -.endif # FFMPEG_BUILDLINK3_MK - .include "../../mk/bsd.fast.prefs.mk" .if !empty(PKG_BUILD_OPTIONS.ffmpeg:Msdl) @@ -48,5 +39,6 @@ pkgbase := ffmpeg .endif .include "../../devel/libgetopt/buildlink3.mk" +.endif # FFMPEG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ffmpeg diff --git a/multimedia/gnome-media/buildlink3.mk b/multimedia/gnome-media/buildlink3.mk index e26783e0ad9..969f7734cb2 100644 --- a/multimedia/gnome-media/buildlink3.mk +++ b/multimedia/gnome-media/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.3 2008/03/06 14:53:52 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:02 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNOME_MEDIA_BUILDLINK3_MK:= ${GNOME_MEDIA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnome-media -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnome-media -.endif +.if !defined(GNOME_MEDIA_BUILDLINK3_MK) +GNOME_MEDIA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-media} -BUILDLINK_PACKAGES+= gnome-media -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-media - -.if !empty(GNOME_MEDIA_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gnome-media+= gnome-media>=2.12.0nb1 BUILDLINK_ABI_DEPENDS.gnome-media?= gnome-media>=2.20.1nb2 BUILDLINK_PKGSRCDIR.gnome-media?= ../../multimedia/gnome-media -.endif # GNOME_MEDIA_BUILDLINK3_MK .include "../../devel/GConf-ui/buildlink3.mk" .include "../../devel/libglade/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # GNOME_MEDIA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnome-media diff --git a/multimedia/gpac/buildlink3.mk b/multimedia/gpac/buildlink3.mk index d402d8bc35f..b13c207410a 100644 --- a/multimedia/gpac/buildlink3.mk +++ b/multimedia/gpac/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/23 14:54:23 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:02 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GPAC_BUILDLINK3_MK:= ${GPAC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gpac -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= gpac -.endif +.if !defined(GPAC_BUILDLINK3_MK) +GPAC_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngpac} -BUILDLINK_PACKAGES+= gpac -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gpac - -.if ${GPAC_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.gpac+= gpac>=0.4.5 BUILDLINK_PKGSRCDIR.gpac?= ../../multimedia/gpac -.endif # GPAC_BUILDLINK3_MK +.endif # GPAC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gpac diff --git a/multimedia/gst-plugins0.10-bad/buildlink3.mk b/multimedia/gst-plugins0.10-bad/buildlink3.mk index a410345c436..dba6174a859 100644 --- a/multimedia/gst-plugins0.10-bad/buildlink3.mk +++ b/multimedia/gst-plugins0.10-bad/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 23:11:01 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:02 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GST_PLUGINS0.10_BAD_BUILDLINK3_MK:= ${GST_PLUGINS0.10_BAD_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gst-plugins0.10-bad -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gst-plugins0.10-bad -.endif +.if !defined(GST_PLUGINS0.10_BAD_BUILDLINK3_MK) +GST_PLUGINS0.10_BAD_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngst-plugins0.10-bad} -BUILDLINK_PACKAGES+= gst-plugins0.10-bad -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gst-plugins0.10-bad - -.if !empty(GST_PLUGINS0.10_BAD_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gst-plugins0.10-bad+= gst-plugins0.10-bad>=0.10.3 BUILDLINK_ABI_DEPENDS.gst-plugins0.10-bad?= gst-plugins0.10-bad>=0.10.3 BUILDLINK_PKGSRCDIR.gst-plugins0.10-bad?= ../../multimedia/gst-plugins0.10-bad -.endif # GST_PLUGINS0.10_BAD_BUILDLINK3_MK .include "../../multimedia/gstreamer0.10/buildlink3.mk" .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" +.endif # GST_PLUGINS0.10_BAD_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gst-plugins0.10-bad diff --git a/multimedia/gst-plugins0.10-base/buildlink3.mk b/multimedia/gst-plugins0.10-base/buildlink3.mk index 3e9277f91e3..3efbae37e70 100644 --- a/multimedia/gst-plugins0.10-base/buildlink3.mk +++ b/multimedia/gst-plugins0.10-base/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:01 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:02 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GST_PLUGINS0.10_BASE_BUILDLINK3_MK:= ${GST_PLUGINS0.10_BASE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gst-plugins0.10-base -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gst-plugins0.10-base -.endif +.if !defined(GST_PLUGINS0.10_BASE_BUILDLINK3_MK) +GST_PLUGINS0.10_BASE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngst-plugins0.10-base} -BUILDLINK_PACKAGES+= gst-plugins0.10-base -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gst-plugins0.10-base - -.if !empty(GST_PLUGINS0.10_BASE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gst-plugins0.10-base+= gst-plugins0.10-base>=0.10.1 BUILDLINK_ABI_DEPENDS.gst-plugins0.10-base?= gst-plugins0.10-base>=0.10.2nb1 BUILDLINK_PKGSRCDIR.gst-plugins0.10-base?= ../../multimedia/gst-plugins0.10-base -.endif # GST_PLUGINS0.10_BASE_BUILDLINK3_MK .include "../../multimedia/gstreamer0.10/buildlink3.mk" +.endif # GST_PLUGINS0.10_BASE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gst-plugins0.10-base diff --git a/multimedia/gst-plugins0.10-gnonlin/buildlink3.mk b/multimedia/gst-plugins0.10-gnonlin/buildlink3.mk index 10ea9712dad..35c08ce6344 100644 --- a/multimedia/gst-plugins0.10-gnonlin/buildlink3.mk +++ b/multimedia/gst-plugins0.10-gnonlin/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/02/08 21:42:26 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:02 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GST_GNONLIN_BUILDLINK3_MK:= ${GST_GNONLIN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gst-gnonlin -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= gst-gnonlin -.endif +.if !defined(GST_GNONLIN_BUILDLINK3_MK) +GST_GNONLIN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngst-gnonlin} -BUILDLINK_PACKAGES+= gst-gnonlin -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gst-gnonlin - -.if ${GST_GNONLIN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.gst-gnonlin+= gst-gnonlin>=0.10.6 BUILDLINK_PKGSRCDIR.gst-gnonlin?= ../../multimedia/gst-plugins0.10-gnonlin -.endif # GST_GNONLIN_BUILDLINK3_MK +.endif # GST_GNONLIN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gst-gnonlin diff --git a/multimedia/gst-plugins0.10-good/buildlink3.mk b/multimedia/gst-plugins0.10-good/buildlink3.mk index 5172a4c7cec..8d882f7c473 100644 --- a/multimedia/gst-plugins0.10-good/buildlink3.mk +++ b/multimedia/gst-plugins0.10-good/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:01 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:02 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GST_PLUGINS0.10_GOOD_BUILDLINK3_MK:= ${GST_PLUGINS0.10_GOOD_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gst-plugins0.10-good -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gst-plugins0.10-good -.endif +.if !defined(GST_PLUGINS0.10_GOOD_BUILDLINK3_MK) +GST_PLUGINS0.10_GOOD_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngst-plugins0.10-good} -BUILDLINK_PACKAGES+= gst-plugins0.10-good -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gst-plugins0.10-good - -.if !empty(GST_PLUGINS0.10_GOOD_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gst-plugins0.10-good+= gst-plugins0.10-good>=0.10.1 BUILDLINK_ABI_DEPENDS.gst-plugins0.10-good?= gst-plugins0.10-good>=0.10.1nb1 BUILDLINK_PKGSRCDIR.gst-plugins0.10-good?= ../../multimedia/gst-plugins0.10-good -.endif # GST_PLUGINS0.10_GOOD_BUILDLINK3_MK .include "../../multimedia/gstreamer0.10/buildlink3.mk" .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" +.endif # GST_PLUGINS0.10_GOOD_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gst-plugins0.10-good diff --git a/multimedia/gst-plugins0.10-ugly/buildlink3.mk b/multimedia/gst-plugins0.10-ugly/buildlink3.mk index 53581113e29..e12759c4d1e 100644 --- a/multimedia/gst-plugins0.10-ugly/buildlink3.mk +++ b/multimedia/gst-plugins0.10-ugly/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 23:11:01 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:03 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GST_PLUGINS0.10_UGLY_BUILDLINK3_MK:= ${GST_PLUGINS0.10_UGLY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gst-plugins0.10-ugly -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gst-plugins0.10-ugly -.endif +.if !defined(GST_PLUGINS0.10_UGLY_BUILDLINK3_MK) +GST_PLUGINS0.10_UGLY_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngst-plugins0.10-ugly} -BUILDLINK_PACKAGES+= gst-plugins0.10-ugly -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gst-plugins0.10-ugly - -.if !empty(GST_PLUGINS0.10_UGLY_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gst-plugins0.10-ugly+= gst-plugins0.10-ugly>=0.10.3 BUILDLINK_ABI_DEPENDS.gst-plugins0.10-ugly?= gst-plugins0.10-ugly>=0.10.3 BUILDLINK_PKGSRCDIR.gst-plugins0.10-ugly?= ../../multimedia/gst-plugins0.10-ugly -.endif # GST_PLUGINS0.10_UGLY_BUILDLINK3_MK .include "../../multimedia/gstreamer0.10/buildlink3.mk" .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" +.endif # GST_PLUGINS0.10_UGLY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gst-plugins0.10-ugly diff --git a/multimedia/gstreamer0.10/buildlink3.mk b/multimedia/gstreamer0.10/buildlink3.mk index e9a9d36eb3e..daa241bac45 100644 --- a/multimedia/gstreamer0.10/buildlink3.mk +++ b/multimedia/gstreamer0.10/buildlink3.mk @@ -1,24 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.9 2007/05/31 08:34:52 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:03 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GSTREAMER0.10_BUILDLINK3_MK:= ${GSTREAMER0.10_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gstreamer0.10 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gstreamer0.10 -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngstreamer0.10} -BUILDLINK_PACKAGES+= gstreamer0.10 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gstreamer0.10 +.if !defined(GSTREAMER0.10_BUILDLINK3_MK) +GSTREAMER0.10_BUILDLINK3_MK:= -.if !empty(GSTREAMER0.10_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gstreamer0.10+= gstreamer0.10>=0.10.1 BUILDLINK_ABI_DEPENDS.gstreamer0.10?= gstreamer0.10>=0.10.2nb1 BUILDLINK_PKGSRCDIR.gstreamer0.10?= ../../multimedia/gstreamer0.10 PRINT_PLIST_AWK+= /^@dirrm (include|lib)\/gstreamer-0.10(\/gst)?$$/ \ { print "@comment in gstreamer0.10: " $$0; next; } -.endif # GSTREAMER0.10_BUILDLINK3_MK pkgbase := gstreamer0.10 .include "../../mk/pkg-build-options.mk" @@ -29,5 +21,6 @@ pkgbase := gstreamer0.10 .include "../../devel/glib2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.endif # GSTREAMER0.10_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gstreamer0.10 diff --git a/multimedia/kdemultimedia3/buildlink3.mk b/multimedia/kdemultimedia3/buildlink3.mk index c34822c8d4e..8d33ef30057 100644 --- a/multimedia/kdemultimedia3/buildlink3.mk +++ b/multimedia/kdemultimedia3/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.25 2008/01/18 05:08:38 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.26 2009/03/20 19:25:03 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -KDEMULTIMEDIA_BUILDLINK3_MK:= ${KDEMULTIMEDIA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= kdemultimedia -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= kdemultimedia -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkdemultimedia} -BUILDLINK_PACKAGES+= kdemultimedia -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kdemultimedia +.if !defined(KDEMULTIMEDIA_BUILDLINK3_MK) +KDEMULTIMEDIA_BUILDLINK3_MK:= -.if !empty(KDEMULTIMEDIA_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.kdemultimedia+= kdemultimedia>=3.5.0nb2 BUILDLINK_ABI_DEPENDS.kdemultimedia?= kdemultimedia>=3.5.8nb3 BUILDLINK_PKGSRCDIR.kdemultimedia?= ../../multimedia/kdemultimedia3 -.endif # KDEMULTIMEDIA_BUILDLINK3_MK .include "../../audio/arts/buildlink3.mk" .include "../../audio/lame/buildlink3.mk" @@ -28,5 +20,6 @@ BUILDLINK_PKGSRCDIR.kdemultimedia?= ../../multimedia/kdemultimedia3 .include "../../multimedia/xine-lib/buildlink3.mk" .include "../../x11/kdebase3/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" +.endif # KDEMULTIMEDIA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -kdemultimedia diff --git a/multimedia/libassetml/buildlink3.mk b/multimedia/libassetml/buildlink3.mk index 3cc771e946f..30519f32e69 100644 --- a/multimedia/libassetml/buildlink3.mk +++ b/multimedia/libassetml/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:01 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:03 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBASSETML_BUILDLINK3_MK:= ${LIBASSETML_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libassetml -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libassetml -.endif +.if !defined(LIBASSETML_BUILDLINK3_MK) +LIBASSETML_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibassetml} -BUILDLINK_PACKAGES+= libassetml -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libassetml - -.if !empty(LIBASSETML_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libassetml+= libassetml>=1.2.1 BUILDLINK_ABI_DEPENDS.libassetml?= libassetml>=1.2.1nb1 BUILDLINK_PKGSRCDIR.libassetml?= ../../multimedia/libassetml -.endif # LIBASSETML_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.endif # LIBASSETML_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libassetml diff --git a/multimedia/libdv/buildlink3.mk b/multimedia/libdv/buildlink3.mk index 7cdc76ab588..fb876d3a429 100644 --- a/multimedia/libdv/buildlink3.mk +++ b/multimedia/libdv/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:01 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:03 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBDV_BUILDLINK3_MK:= ${LIBDV_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libdv -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libdv -.endif +.if !defined(LIBDV_BUILDLINK3_MK) +LIBDV_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdv} -BUILDLINK_PACKAGES+= libdv -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdv - -.if !empty(LIBDV_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libdv+= libdv>=0.102 BUILDLINK_ABI_DEPENDS.libdv+= libdv>=0.104nb2 BUILDLINK_PKGSRCDIR.libdv?= ../../multimedia/libdv -.endif # LIBDV_BUILDLINK3_MK +.endif # LIBDV_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libdv diff --git a/multimedia/libdvbpsi/buildlink3.mk b/multimedia/libdvbpsi/buildlink3.mk index fa05515f018..8b275ee2faa 100644 --- a/multimedia/libdvbpsi/buildlink3.mk +++ b/multimedia/libdvbpsi/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/02/27 22:38:16 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:03 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBDVBPSI_BUILDLINK3_MK:= ${LIBDVBPSI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libdvbpsi -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libdvbpsi -.endif +.if !defined(LIBDVBPSI_BUILDLINK3_MK) +LIBDVBPSI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdvbpsi} -BUILDLINK_PACKAGES+= libdvbpsi -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdvbpsi - -.if !empty(LIBDVBPSI_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libdvbpsi+= libdvbpsi>=0.1.3 BUILDLINK_ABI_DEPENDS.libdvbpsi+= libdvbpsi>=0.1.6 BUILDLINK_PKGSRCDIR.libdvbpsi?= ../../multimedia/libdvbpsi -.endif # LIBDVBPSI_BUILDLINK3_MK +.endif # LIBDVBPSI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libdvbpsi diff --git a/multimedia/libdvdcss/buildlink3.mk b/multimedia/libdvdcss/buildlink3.mk index 548a5198bcf..4416e93ff09 100644 --- a/multimedia/libdvdcss/buildlink3.mk +++ b/multimedia/libdvdcss/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:01 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:03 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBDVDCSS_BUILDLINK3_MK:= ${LIBDVDCSS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libdvdcss -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libdvdcss -.endif +.if !defined(LIBDVDCSS_BUILDLINK3_MK) +LIBDVDCSS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdvdcss} -BUILDLINK_PACKAGES+= libdvdcss -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdvdcss - -.if !empty(LIBDVDCSS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libdvdcss+= libdvdcss>=1.2.4 BUILDLINK_ABI_DEPENDS.libdvdcss+= libdvdcss>=1.2.8nb1 BUILDLINK_PKGSRCDIR.libdvdcss?= ../../multimedia/libdvdcss -.endif # LIBDVDCSS_BUILDLINK3_MK +.endif # LIBDVDCSS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libdvdcss diff --git a/multimedia/libdvdnav/buildlink3.mk b/multimedia/libdvdnav/buildlink3.mk index dd9d2add40e..91bb06583ba 100644 --- a/multimedia/libdvdnav/buildlink3.mk +++ b/multimedia/libdvdnav/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/01/14 22:36:11 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:03 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBDVDNAV_BUILDLINK3_MK:= ${LIBDVDNAV_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libdvdnav -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libdvdnav -.endif +.if !defined(LIBDVDNAV_BUILDLINK3_MK) +LIBDVDNAV_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdvdnav} -BUILDLINK_PACKAGES+= libdvdnav -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdvdnav - -.if !empty(LIBDVDNAV_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libdvdnav+= libdvdnav>=4.1.3 BUILDLINK_ABI_DEPENDS.libdvdnav+= libdvdnav>=4.1.3 BUILDLINK_PKGSRCDIR.libdvdnav?= ../../multimedia/libdvdnav -.endif # LIBDVDNAV_BUILDLINK3_MK .include "../../multimedia/libdvdread/buildlink3.mk" +.endif # LIBDVDNAV_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libdvdnav diff --git a/multimedia/libdvdplay/buildlink3.mk b/multimedia/libdvdplay/buildlink3.mk index 68f4471f4a2..202cc926564 100644 --- a/multimedia/libdvdplay/buildlink3.mk +++ b/multimedia/libdvdplay/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:01 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:03 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBDVDPLAY_BUILDLINK3_MK:= ${LIBDVDPLAY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libdvdplay -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libdvdplay -.endif +.if !defined(LIBDVDPLAY_BUILDLINK3_MK) +LIBDVDPLAY_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdvdplay} -BUILDLINK_PACKAGES+= libdvdplay -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdvdplay - -.if !empty(LIBDVDPLAY_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libdvdplay+= libdvdplay>=1.0.1 BUILDLINK_ABI_DEPENDS.libdvdplay+= libdvdplay>=1.0.1nb3 BUILDLINK_PKGSRCDIR.libdvdplay?= ../../multimedia/libdvdplay -.endif # LIBDVDPLAY_BUILDLINK3_MK .include "../../multimedia/libdvdread/buildlink3.mk" +.endif # LIBDVDPLAY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libdvdplay diff --git a/multimedia/libdvdread/buildlink3.mk b/multimedia/libdvdread/buildlink3.mk index c171a436657..8be064eb411 100644 --- a/multimedia/libdvdread/buildlink3.mk +++ b/multimedia/libdvdread/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.9 2009/01/14 22:28:05 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:04 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBDVDREAD_BUILDLINK3_MK:= ${LIBDVDREAD_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libdvdread -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libdvdread -.endif +.if !defined(LIBDVDREAD_BUILDLINK3_MK) +LIBDVDREAD_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdvdread} -BUILDLINK_PACKAGES+= libdvdread -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdvdread - -.if !empty(LIBDVDREAD_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libdvdread+= libdvdread>=4.1.3 BUILDLINK_ABI_DEPENDS.libdvdread+= libdvdread>=4.1.3 BUILDLINK_PKGSRCDIR.libdvdread?= ../../multimedia/libdvdread -.endif # LIBDVDREAD_BUILDLINK3_MK +.endif # LIBDVDREAD_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libdvdread diff --git a/multimedia/libflash/buildlink3.mk b/multimedia/libflash/buildlink3.mk index 6a89dac49e4..588a0210c73 100644 --- a/multimedia/libflash/buildlink3.mk +++ b/multimedia/libflash/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:02 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:04 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBFLASH_BUILDLINK3_MK:= ${LIBFLASH_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libflash -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libflash -.endif +.if !defined(LIBFLASH_BUILDLINK3_MK) +LIBFLASH_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibflash} -BUILDLINK_PACKAGES+= libflash -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libflash - -.if !empty(LIBFLASH_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libflash+= libflash>=0.4.10nb4 BUILDLINK_ABI_DEPENDS.libflash+= libflash>=0.4.10nb6 BUILDLINK_PKGSRCDIR.libflash?= ../../multimedia/libflash -.endif # LIBFLASH_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" +.endif # LIBFLASH_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libflash diff --git a/multimedia/libmatroska/buildlink3.mk b/multimedia/libmatroska/buildlink3.mk index 265945676ce..ea581ac6e37 100644 --- a/multimedia/libmatroska/buildlink3.mk +++ b/multimedia/libmatroska/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.16 2007/11/14 18:27:48 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:25:04 joerg Exp $ # # This Makefile fragment is included by packages that use libmatroska. # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBMATROSKA_BUILDLINK3_MK:= ${LIBMATROSKA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libmatroska -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libmatroska -.endif +.if !defined(LIBMATROSKA_BUILDLINK3_MK) +LIBMATROSKA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmatroska} -BUILDLINK_PACKAGES+= libmatroska -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmatroska - -.if !empty(LIBMATROSKA_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libmatroska+= libmatroska>=0.8.0 BUILDLINK_ABI_DEPENDS.libmatroska?= libmatroska>=0.8.0nb1 BUILDLINK_PKGSRCDIR.libmatroska?= ../../multimedia/libmatroska -.endif # LIBMATROSKA_BUILDLINK3_MK .include "../../devel/libebml/buildlink3.mk" +.endif # LIBMATROSKA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libmatroska diff --git a/multimedia/libmp4v2/buildlink3.mk b/multimedia/libmp4v2/buildlink3.mk index 0d726e27f28..3015f25d3d3 100644 --- a/multimedia/libmp4v2/buildlink3.mk +++ b/multimedia/libmp4v2/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/02/09 19:57:48 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:04 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBMP4V2_BUILDLINK3_MK:= ${LIBMP4V2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libmp4v2 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libmp4v2 -.endif +.if !defined(LIBMP4V2_BUILDLINK3_MK) +LIBMP4V2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmp4v2} -BUILDLINK_PACKAGES+= libmp4v2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmp4v2 - -.if ${LIBMP4V2_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libmp4v2+= libmp4v2>=1.5.0.1 BUILDLINK_PKGSRCDIR.libmp4v2?= ../../multimedia/libmp4v2 -.endif # LIBMP4V2_BUILDLINK3_MK +.endif # LIBMP4V2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libmp4v2 diff --git a/multimedia/libmpeg2/buildlink3.mk b/multimedia/libmpeg2/buildlink3.mk index 75eea0f9dcb..48a15dd84ce 100644 --- a/multimedia/libmpeg2/buildlink3.mk +++ b/multimedia/libmpeg2/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.10 2007/02/22 17:43:51 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:04 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBMPEG2_BUILDLINK3_MK:= ${LIBMPEG2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libmpeg2 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libmpeg2 -.endif +.if !defined(LIBMPEG2_BUILDLINK3_MK) +LIBMPEG2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmpeg2} -BUILDLINK_PACKAGES+= libmpeg2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmpeg2 - -.if !empty(LIBMPEG2_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libmpeg2+= libmpeg2>=0.4.0 BUILDLINK_ABI_DEPENDS.libmpeg2+= libmpeg2>=0.4.0bnb5 BUILDLINK_PKGSRCDIR.libmpeg2?= ../../multimedia/libmpeg2 -.endif # LIBMPEG2_BUILDLINK3_MK +.endif # LIBMPEG2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libmpeg2 diff --git a/multimedia/libmpeg3/buildlink3.mk b/multimedia/libmpeg3/buildlink3.mk index 88b4c29aefd..b65ac02c671 100644 --- a/multimedia/libmpeg3/buildlink3.mk +++ b/multimedia/libmpeg3/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.7 2008/02/20 09:56:44 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:04 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBMPEG3_BUILDLINK3_MK:= ${LIBMPEG3_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libmpeg3 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libmpeg3 -.endif +.if !defined(LIBMPEG3_BUILDLINK3_MK) +LIBMPEG3_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmpeg3} -BUILDLINK_PACKAGES+= libmpeg3 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmpeg3 - -.if !empty(LIBMPEG3_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libmpeg3+= libmpeg3>=1.3nb4 BUILDLINK_ABI_DEPENDS.libmpeg3?= libmpeg3>=1.3nb6 BUILDLINK_PKGSRCDIR.libmpeg3?= ../../multimedia/libmpeg3 -.endif # LIBMPEG3_BUILDLINK3_MK .include "../../mk/pthread.buildlink3.mk" +.endif # LIBMPEG3_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libmpeg3 diff --git a/multimedia/libnms/buildlink3.mk b/multimedia/libnms/buildlink3.mk index e48de50a760..f08184649d3 100644 --- a/multimedia/libnms/buildlink3.mk +++ b/multimedia/libnms/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/09/10 16:27:14 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:04 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBNMS_BUILDLINK3_MK:= ${LIBNMS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libnms -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libnms -.endif +.if !defined(LIBNMS_BUILDLINK3_MK) +LIBNMS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibnms} -BUILDLINK_PACKAGES+= libnms -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libnms - -.if ${LIBNMS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libnms+= libnms>=0.6.0 BUILDLINK_PKGSRCDIR.libnms?= ../../multimedia/libnms -.endif # LIBNMS_BUILDLINK3_MK +.endif # LIBNMS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libnms diff --git a/multimedia/libogg/buildlink3.mk b/multimedia/libogg/buildlink3.mk index b50c4eb78ac..78946c7307f 100644 --- a/multimedia/libogg/buildlink3.mk +++ b/multimedia/libogg/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:02 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:04 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBOGG_BUILDLINK3_MK:= ${LIBOGG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libogg -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libogg -.endif +.if !defined(LIBOGG_BUILDLINK3_MK) +LIBOGG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibogg} -BUILDLINK_PACKAGES+= libogg -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libogg - -.if !empty(LIBOGG_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libogg+= libogg>=1.1 BUILDLINK_ABI_DEPENDS.libogg+= libogg>=1.1.2nb1 BUILDLINK_PKGSRCDIR.libogg?= ../../multimedia/libogg -.endif # LIBOGG_BUILDLINK3_MK +.endif # LIBOGG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libogg diff --git a/multimedia/libtheora/buildlink3.mk b/multimedia/libtheora/buildlink3.mk index a3eb6675c97..47b194b643d 100644 --- a/multimedia/libtheora/buildlink3.mk +++ b/multimedia/libtheora/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:02 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:04 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBTHEORA_BUILDLINK3_MK:= ${LIBTHEORA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libtheora -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libtheora -.endif +.if !defined(LIBTHEORA_BUILDLINK3_MK) +LIBTHEORA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibtheora} -BUILDLINK_PACKAGES+= libtheora -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libtheora - -.if !empty(LIBTHEORA_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libtheora+= libtheora>=1.0alpha3 BUILDLINK_ABI_DEPENDS.libtheora+= libtheora>=1.0alpha3nb1 BUILDLINK_PKGSRCDIR.libtheora?= ../../multimedia/libtheora -.endif # LIBTHEORA_BUILDLINK3_MK .include "../../audio/libvorbis/buildlink3.mk" .include "../../multimedia/libogg/buildlink3.mk" +.endif # LIBTHEORA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libtheora diff --git a/multimedia/ming/buildlink3.mk b/multimedia/ming/buildlink3.mk index 093452f68a7..d4932b8adfd 100644 --- a/multimedia/ming/buildlink3.mk +++ b/multimedia/ming/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/09/13 15:53:51 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:04 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MING_BUILDLINK3_MK:= ${MING_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ming -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ming -.endif +.if !defined(MING_BUILDLINK3_MK) +MING_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nming} -BUILDLINK_PACKAGES+= ming -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ming - -.if !empty(MING_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ming+= ming>=0.3.0 BUILDLINK_PKGSRCDIR.ming?= ../../multimedia/ming -.endif # MING_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.endif # MING_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ming diff --git a/multimedia/mjpegtools/buildlink3.mk b/multimedia/mjpegtools/buildlink3.mk index 0ec271666ec..06f3d574377 100644 --- a/multimedia/mjpegtools/buildlink3.mk +++ b/multimedia/mjpegtools/buildlink3.mk @@ -1,23 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.17 2007/05/30 08:54:30 rillig Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MJPEGTOOLS_BUILDLINK3_MK:= ${MJPEGTOOLS_BUILDLINK3_MK}+ +# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:25:05 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= mjpegtools -.endif +BUILDLINK_TREE+= mjpegtools -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmjpegtools} -BUILDLINK_PACKAGES+= mjpegtools -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mjpegtools +.if !defined(MJPEGTOOLS_BUILDLINK3_MK) +MJPEGTOOLS_BUILDLINK3_MK:= -.if !empty(MJPEGTOOLS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.mjpegtools+= mjpegtools>=1.8.0 BUILDLINK_ABI_DEPENDS.mjpegtools?= mjpegtools>=1.8.0nb5 BUILDLINK_PKGSRCDIR.mjpegtools?= ../../multimedia/mjpegtools -.endif # MJPEGTOOLS_BUILDLINK3_MK .include "../../audio/lame/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" @@ -29,5 +21,6 @@ pkgbase := mjpegtools .if !empty(PKG_BUILD_OPTIONS.mjpegtools:Mdv) . include "../../multimedia/libdv/buildlink3.mk" .endif +.endif # MJPEGTOOLS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -mjpegtools diff --git a/multimedia/mpeg-lib/buildlink3.mk b/multimedia/mpeg-lib/buildlink3.mk index 04c2457df0b..a0664139693 100644 --- a/multimedia/mpeg-lib/buildlink3.mk +++ b/multimedia/mpeg-lib/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:02 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:05 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MPEG_BUILDLINK3_MK:= ${MPEG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= mpeg -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= mpeg -.endif +.if !defined(MPEG_BUILDLINK3_MK) +MPEG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmpeg} -BUILDLINK_PACKAGES+= mpeg -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mpeg - -.if !empty(MPEG_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.mpeg+= mpeg>=1.3.1 BUILDLINK_ABI_DEPENDS.mpeg+= mpeg>=1.3.1nb1 BUILDLINK_PKGSRCDIR.mpeg?= ../../multimedia/mpeg-lib -.endif # MPEG_BUILDLINK3_MK +.endif # MPEG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -mpeg diff --git a/multimedia/mpeg4ip/buildlink3.mk b/multimedia/mpeg4ip/buildlink3.mk index ebd06793071..2bd454e91c2 100644 --- a/multimedia/mpeg4ip/buildlink3.mk +++ b/multimedia/mpeg4ip/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 23:11:02 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:05 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MPEG4IP_BUILDLINK3_MK:= ${MPEG4IP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= mpeg4ip -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= mpeg4ip -.endif +.if !defined(MPEG4IP_BUILDLINK3_MK) +MPEG4IP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmpeg4ip} -BUILDLINK_PACKAGES+= mpeg4ip -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mpeg4ip - -.if !empty(MPEG4IP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.mpeg4ip+= mpeg4ip>=1.4.1 BUILDLINK_PKGSRCDIR.mpeg4ip?= ../../multimedia/mpeg4ip -.endif # MPEG4IP_BUILDLINK3_MK +.endif # MPEG4IP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -mpeg4ip diff --git a/multimedia/ogle/buildlink3.mk b/multimedia/ogle/buildlink3.mk index a39a90bd232..fb9c238502c 100644 --- a/multimedia/ogle/buildlink3.mk +++ b/multimedia/ogle/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:02 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:05 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OGLE_BUILDLINK3_MK:= ${OGLE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ogle -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ogle -.endif +.if !defined(OGLE_BUILDLINK3_MK) +OGLE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nogle} -BUILDLINK_PACKAGES+= ogle -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ogle - -.if !empty(OGLE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ogle+= ogle>=0.9.2 BUILDLINK_ABI_DEPENDS.ogle+= ogle>=0.9.2nb3 BUILDLINK_PKGSRCDIR.ogle?= ../../multimedia/ogle -.endif # OGLE_BUILDLINK3_MK .include "../../textproc/libxml2/buildlink3.mk" +.endif # OGLE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ogle diff --git a/multimedia/openquicktime/buildlink3.mk b/multimedia/openquicktime/buildlink3.mk index b55568b5258..b9a85733dd7 100644 --- a/multimedia/openquicktime/buildlink3.mk +++ b/multimedia/openquicktime/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:02 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:05 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OPENQUICKTIME_BUILDLINK3_MK:= ${OPENQUICKTIME_BUILDLINK3_MK}+ +BUILDLINK_TREE+= openquicktime -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= openquicktime -.endif +.if !defined(OPENQUICKTIME_BUILDLINK3_MK) +OPENQUICKTIME_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenquicktime} -BUILDLINK_PACKAGES+= openquicktime -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openquicktime - -.if !empty(OPENQUICKTIME_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.openquicktime+= openquicktime>=1.0nb2 BUILDLINK_ABI_DEPENDS.openquicktime?= openquicktime>=1.0nb4 BUILDLINK_PKGSRCDIR.openquicktime?= ../../multimedia/openquicktime -.endif # OPENQUICKTIME_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" +.endif # OPENQUICKTIME_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -openquicktime diff --git a/multimedia/p5-GStreamer/buildlink3.mk b/multimedia/p5-GStreamer/buildlink3.mk index 06c47db3c9a..b33fd6e4326 100644 --- a/multimedia/p5-GStreamer/buildlink3.mk +++ b/multimedia/p5-GStreamer/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1 2008/11/06 14:21:10 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:05 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -P5_GSTREAMER_BUILDLINK3_MK:= ${P5_GSTREAMER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= p5-GStreamer -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= p5-GStreamer -.endif +.if !defined(P5_GSTREAMER_BUILDLINK3_MK) +P5_GSTREAMER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Np5-GStreamer} -BUILDLINK_PACKAGES+= p5-GStreamer -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}p5-GStreamer - -.if ${P5_GSTREAMER_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.p5-GStreamer+= p5-GStreamer>=0.11 BUILDLINK_PKGSRCDIR.p5-GStreamer?= ../../multimedia/p5-GStreamer -.endif # P5_GSTREAMER_BUILDLINK3_MK .include "../../devel/p5-glib2/buildlink3.mk" .include "../../multimedia/gstreamer0.10/buildlink3.mk" +.endif # P5_GSTREAMER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -p5-GStreamer diff --git a/multimedia/phonon/buildlink3.mk b/multimedia/phonon/buildlink3.mk index a267667f1d8..b6c362864e5 100644 --- a/multimedia/phonon/buildlink3.mk +++ b/multimedia/phonon/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/03 10:59:46 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:05 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PHONON_BUILDLINK3_MK:= ${PHONON_BUILDLINK3_MK}+ +BUILDLINK_TREE+= phonon -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= phonon -.endif +.if !defined(PHONON_BUILDLINK3_MK) +PHONON_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nphonon} -BUILDLINK_PACKAGES+= phonon -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}phonon - -.if ${PHONON_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.phonon+= phonon>=4.1.83 BUILDLINK_PKGSRCDIR.phonon?= ../../multimedia/phonon -.endif # PHONON_BUILDLINK3_MK .include "../../x11/qt4-libs/buildlink3.mk" .include "../../x11/qt4-qdbus/buildlink3.mk" +.endif # PHONON_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -phonon diff --git a/multimedia/py-gstreamer0.10/buildlink3.mk b/multimedia/py-gstreamer0.10/buildlink3.mk index 5aaaf06c607..a587468a7b1 100644 --- a/multimedia/py-gstreamer0.10/buildlink3.mk +++ b/multimedia/py-gstreamer0.10/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/01/05 11:04:42 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:05 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GST_PYTHON_BUILDLINK3_MK:= ${GST_PYTHON_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gst-python -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= gst-python -.endif +.if !defined(GST_PYTHON_BUILDLINK3_MK) +GST_PYTHON_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngst-python} -BUILDLINK_PACKAGES+= gst-python -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gst-python - -.if ${GST_PYTHON_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.gst-python+= gst-python>=0.10.5 BUILDLINK_PKGSRCDIR.gst-python?= ../../multimedia/py-gstreamer0.10 -.endif # GST_PYTHON_BUILDLINK3_MK +.endif # GST_PYTHON_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gst-python diff --git a/multimedia/smpeg/buildlink3.mk b/multimedia/smpeg/buildlink3.mk index 7783abb9c4c..abc9c0ce2f7 100644 --- a/multimedia/smpeg/buildlink3.mk +++ b/multimedia/smpeg/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.11 2009/03/19 15:31:42 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:05 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SMPEG_BUILDLINK3_MK:= ${SMPEG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= smpeg -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= smpeg -.endif +.if !defined(SMPEG_BUILDLINK3_MK) +SMPEG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsmpeg} -BUILDLINK_PACKAGES+= smpeg -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}smpeg - -.if !empty(SMPEG_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.smpeg+= smpeg>=0.4.4nb3 BUILDLINK_ABI_DEPENDS.smpeg+= smpeg>=0.4.4nb13 BUILDLINK_PKGSRCDIR.smpeg?= ../../multimedia/smpeg -.endif # SMPEG_BUILDLINK3_MK .include "../../devel/SDL/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" +.endif # SMPEG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -smpeg diff --git a/multimedia/swfdec/buildlink3.mk b/multimedia/swfdec/buildlink3.mk index 7aa9eb52cca..66b11763f09 100644 --- a/multimedia/swfdec/buildlink3.mk +++ b/multimedia/swfdec/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.14 2008/10/31 12:44:51 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:05 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SWFDEC_BUILDLINK3_MK:= ${SWFDEC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= swfdec -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= swfdec -.endif +.if !defined(SWFDEC_BUILDLINK3_MK) +SWFDEC_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nswfdec} -BUILDLINK_PACKAGES+= swfdec -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}swfdec - -.if ${SWFDEC_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.swfdec+= swfdec>=0.8.2 BUILDLINK_PKGSRCDIR.swfdec?= ../../multimedia/swfdec -.endif # SWFDEC_BUILDLINK3_MK .include "../../devel/liboil/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" @@ -25,5 +17,6 @@ BUILDLINK_PKGSRCDIR.swfdec?= ../../multimedia/swfdec .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" .include "../../net/libsoup24/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # SWFDEC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -swfdec diff --git a/multimedia/totem-pl-parser/buildlink3.mk b/multimedia/totem-pl-parser/buildlink3.mk index 6c69d7557f1..38c6ee20867 100644 --- a/multimedia/totem-pl-parser/buildlink3.mk +++ b/multimedia/totem-pl-parser/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/09/06 20:54:33 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:06 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TOTEM_PL_PARSER_BUILDLINK3_MK:= ${TOTEM_PL_PARSER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= totem-pl-parser -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= totem-pl-parser -.endif +.if !defined(TOTEM_PL_PARSER_BUILDLINK3_MK) +TOTEM_PL_PARSER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntotem-pl-parser} -BUILDLINK_PACKAGES+= totem-pl-parser -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}totem-pl-parser - -.if ${TOTEM_PL_PARSER_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.totem-pl-parser+= totem-pl-parser>=2.22.1 BUILDLINK_ABI_DEPENDS.totem-pl-parser?= totem-pl-parser>=2.22.3nb1 BUILDLINK_PKGSRCDIR.totem-pl-parser?= ../../multimedia/totem-pl-parser -.endif # TOTEM_PL_PARSER_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../mail/evolution-data-server/buildlink3.mk" +.endif # TOTEM_PL_PARSER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -totem-pl-parser diff --git a/multimedia/totem/buildlink3.mk b/multimedia/totem/buildlink3.mk index 5bf69c6494d..7292f853a60 100644 --- a/multimedia/totem/buildlink3.mk +++ b/multimedia/totem/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.11 2008/03/07 07:07:01 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:06 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TOTEM_BUILDLINK3_MK:= ${TOTEM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= totem -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= totem -.endif +.if !defined(TOTEM_BUILDLINK3_MK) +TOTEM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntotem} -BUILDLINK_PACKAGES+= totem -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}totem - -.if !empty(TOTEM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.totem+= {totem,totem-xine}>=1.4.0 BUILDLINK_ABI_DEPENDS.totem+= {totem,totem-xine}>=2.20.3nb2 BUILDLINK_PKGSRCDIR.totem?= ../../multimedia/totem -.endif # TOTEM_BUILDLINK3_MK .include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # TOTEM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -totem diff --git a/multimedia/vlc/buildlink3.mk b/multimedia/vlc/buildlink3.mk index c70695fb444..f977873b88d 100644 --- a/multimedia/vlc/buildlink3.mk +++ b/multimedia/vlc/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.23 2008/12/18 17:28:16 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2009/03/20 19:25:06 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -VLC_BUILDLINK3_MK:= ${VLC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= vlc -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= vlc -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nvlc} -BUILDLINK_PACKAGES+= vlc -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}vlc +.if !defined(VLC_BUILDLINK3_MK) +VLC_BUILDLINK3_MK:= -.if ${VLC_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.vlc+= vlc>=0.8.6d BUILDLINK_ABI_DEPENDS.vlc?= vlc>=0.9.8anb1 BUILDLINK_PKGSRCDIR.vlc?= ../../multimedia/vlc -.endif # VLC_BUILDLINK3_MK pkgbase:= vlc .include "../../mk/pkg-build-options.mk" @@ -50,5 +42,6 @@ pkgbase:= vlc .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/libXv/buildlink3.mk" .include "../../x11/libXxf86vm/buildlink3.mk" +.endif # VLC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -vlc diff --git a/multimedia/vlc08/buildlink3.mk b/multimedia/vlc08/buildlink3.mk index 95345d0d697..c08fe6a5b77 100644 --- a/multimedia/vlc08/buildlink3.mk +++ b/multimedia/vlc08/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2008/12/18 17:28:16 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:06 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -VLC08_BUILDLINK3_MK:= ${VLC08_BUILDLINK3_MK}+ +BUILDLINK_TREE+= vlc08 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= vlc08 -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nvlc08} -BUILDLINK_PACKAGES+= vlc08 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}vlc08 +.if !defined(VLC08_BUILDLINK3_MK) +VLC08_BUILDLINK3_MK:= -.if ${VLC08_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.vlc08+= vlc08>=0.8.6d BUILDLINK_ABI_DEPENDS.vlc08?= vlc08>=0.8.6inb1 BUILDLINK_PKGSRCDIR.vlc08?= ../../multimedia/vlc08 -.endif # VLC08_BUILDLINK3_MK pkgbase:= vlc08 .include "../../mk/pkg-build-options.mk" @@ -50,5 +42,6 @@ pkgbase:= vlc08 .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/libXv/buildlink3.mk" .include "../../x11/libXxf86vm/buildlink3.mk" +.endif # VLC08_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -vlc08 diff --git a/multimedia/x264-devel/buildlink3.mk b/multimedia/x264-devel/buildlink3.mk index 69da8b30aab..c46d9cc9493 100644 --- a/multimedia/x264-devel/buildlink3.mk +++ b/multimedia/x264-devel/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.8 2008/12/18 17:19:06 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:06 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -X264_DEVEL_BUILDLINK3_MK:= ${X264_DEVEL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= x264-devel -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= x264-devel -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nx264-devel} -BUILDLINK_PACKAGES+= x264-devel -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}x264-devel +.if !defined(X264_DEVEL_BUILDLINK3_MK) +X264_DEVEL_BUILDLINK3_MK:= -.if !empty(X264_DEVEL_BUILDLINK3_MK:M+) ### ### NOTE: When changing BUILDLINK_A[BP]I_DEPENDS.x264-devel, please record ### the value of X264_BUILD in x264.h along with the appropriate @@ -24,10 +17,10 @@ BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20081217 # X264_BUILD 65 BUILDLINK_PKGSRCDIR.x264-devel?= ../../multimedia/x264-devel pkgbase:= x264-devel . include "../../mk/pkg-build-options.mk" -.endif # X264_DEVEL_BUILDLINK3_MK .if !empty(PKG_BUILD_OPTIONS.x264-devel:Mthreads) . include "../../mk/pthread.buildlink3.mk" .endif +.endif # X264_DEVEL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -x264-devel diff --git a/multimedia/xfce4-mpc-plugin/buildlink3.mk b/multimedia/xfce4-mpc-plugin/buildlink3.mk index 53da150c0b6..ee5b6264f73 100644 --- a/multimedia/xfce4-mpc-plugin/buildlink3.mk +++ b/multimedia/xfce4-mpc-plugin/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.2 2007/12/05 07:49:16 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:06 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_MPC_PLUGIN_BUILDLINK3_MK:= ${XFCE4_MPC_PLUGIN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-mpc-plugin -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-mpc-plugin -.endif +.if !defined(XFCE4_MPC_PLUGIN_BUILDLINK3_MK) +XFCE4_MPC_PLUGIN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-mpc-plugin} -BUILDLINK_PACKAGES+= xfce4-mpc-plugin -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-mpc-plugin - -.if ${XFCE4_MPC_PLUGIN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-mpc-plugin+= xfce4-mpc-plugin>=0.3.2 BUILDLINK_PKGSRCDIR.xfce4-mpc-plugin?= ../../multimedia/xfce4-mpc-plugin -.endif # XFCE4_MPC_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_MPC_PLUGIN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-mpc-plugin diff --git a/multimedia/xine-lib/buildlink3.mk b/multimedia/xine-lib/buildlink3.mk index 5a22263fcd1..7abffb03110 100644 --- a/multimedia/xine-lib/buildlink3.mk +++ b/multimedia/xine-lib/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.21 2007/02/07 20:04:00 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:25:06 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XINE_LIB_BUILDLINK3_MK:= ${XINE_LIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xine-lib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= xine-lib -.endif +.if !defined(XINE_LIB_BUILDLINK3_MK) +XINE_LIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxine-lib} -BUILDLINK_PACKAGES+= xine-lib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xine-lib - -.if !empty(XINE_LIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.xine-lib+= xine-lib>=1rc3c BUILDLINK_ABI_DEPENDS.xine-lib+=xine-lib>=1.0.3a BUILDLINK_ABI_DEPENDS.xine-lib?= xine-lib>=1.1.3nb1 BUILDLINK_PKGSRCDIR.xine-lib?= ../../multimedia/xine-lib -.endif # XINE_LIB_BUILDLINK3_MK +.endif # XINE_LIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xine-lib diff --git a/multimedia/xvidcore/buildlink3.mk b/multimedia/xvidcore/buildlink3.mk index 7c36401226f..87064a7d66c 100644 --- a/multimedia/xvidcore/buildlink3.mk +++ b/multimedia/xvidcore/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:02 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:06 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XVIDCORE_BUILDLINK3_MK:= ${XVIDCORE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xvidcore -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= xvidcore -.endif +.if !defined(XVIDCORE_BUILDLINK3_MK) +XVIDCORE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxvidcore} -BUILDLINK_PACKAGES+= xvidcore -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xvidcore - -.if !empty(XVIDCORE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.xvidcore+= xvidcore>=1.0.0 BUILDLINK_ABI_DEPENDS.xvidcore?= xvidcore>=1.1.0nb1 BUILDLINK_PKGSRCDIR.xvidcore?= ../../multimedia/xvidcore -.endif # XVIDCORE_BUILDLINK3_MK +.endif # XVIDCORE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xvidcore diff --git a/net/GeoIP/buildlink3.mk b/net/GeoIP/buildlink3.mk index c7edfc62a11..efa000ac3d0 100644 --- a/net/GeoIP/buildlink3.mk +++ b/net/GeoIP/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:02 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:06 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GEOIP_BUILDLINK3_MK:= ${GEOIP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= GeoIP -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= GeoIP -.endif +.if !defined(GEOIP_BUILDLINK3_MK) +GEOIP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGeoIP} -BUILDLINK_PACKAGES+= GeoIP -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}GeoIP - -.if !empty(GEOIP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.GeoIP+= GeoIP>=1.3.1 BUILDLINK_ABI_DEPENDS.GeoIP+= GeoIP>=1.3.4nb1 BUILDLINK_PKGSRCDIR.GeoIP?= ../../net/GeoIP -.endif # GEOIP_BUILDLINK3_MK +.endif # GEOIP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -GeoIP diff --git a/net/ORBit/buildlink3.mk b/net/ORBit/buildlink3.mk index f8e1b664837..14064cb63c9 100644 --- a/net/ORBit/buildlink3.mk +++ b/net/ORBit/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:11:02 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:06 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ORBIT_BUILDLINK3_MK:= ${ORBIT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ORBit -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ORBit -.endif +.if !defined(ORBIT_BUILDLINK3_MK) +ORBIT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NORBit} -BUILDLINK_PACKAGES+= ORBit -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ORBit - -.if !empty(ORBIT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ORBit+= ORBit>=0.5.15nb5 BUILDLINK_ABI_DEPENDS.ORBit+= ORBit>=0.5.17nb1 BUILDLINK_PKGSRCDIR.ORBit?= ../../net/ORBit -.endif # ORBIT_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib/buildlink3.mk" .include "../../security/tcp_wrappers/buildlink3.mk" +.endif # ORBIT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ORBit diff --git a/net/ORBit2/buildlink3.mk b/net/ORBit2/buildlink3.mk index 9eebddc1980..eaaaa99c9af 100644 --- a/net/ORBit2/buildlink3.mk +++ b/net/ORBit2/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.14 2007/07/09 16:56:15 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:07 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ORBIT2_BUILDLINK3_MK:= ${ORBIT2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ORBit2 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ORBit2 -.endif +.if !defined(ORBIT2_BUILDLINK3_MK) +ORBIT2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NORBit2} -BUILDLINK_PACKAGES+= ORBit2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ORBit2 - -.if !empty(ORBIT2_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ORBit2+= ORBit2>=2.12.0 BUILDLINK_ABI_DEPENDS.ORBit2?= ORBit2>=2.12.4nb1 BUILDLINK_PKGSRCDIR.ORBit2?= ../../net/ORBit2 @@ -20,9 +13,9 @@ PRINT_PLIST_AWK+= /^@dirrm lib\/orbit-2.0$$/ \ { print "@comment in ORBit2: " $$0; next; } PRINT_PLIST_AWK+= /^@dirrm share\/idl$$/ \ { print "@comment in ORBit2: " $$0; next; } -.endif # ORBIT2_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../net/libIDL/buildlink3.mk" +.endif # ORBIT2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ORBit2 diff --git a/net/SDL_net/buildlink3.mk b/net/SDL_net/buildlink3.mk index 192ba042822..ba213936b75 100644 --- a/net/SDL_net/buildlink3.mk +++ b/net/SDL_net/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:11:03 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:07 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SDL_NET_BUILDLINK3_MK:= ${SDL_NET_BUILDLINK3_MK}+ +BUILDLINK_TREE+= SDL_net -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= SDL_net -.endif +.if !defined(SDL_NET_BUILDLINK3_MK) +SDL_NET_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDL_net} -BUILDLINK_PACKAGES+= SDL_net -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}SDL_net - -.if !empty(SDL_NET_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.SDL_net+= SDL_net>=1.2.5nb1 BUILDLINK_ABI_DEPENDS.SDL_net+= SDL_net>=1.2.6 BUILDLINK_PKGSRCDIR.SDL_net?= ../../net/SDL_net -.endif # SDL_NET_BUILDLINK3_MK .include "../../devel/SDL/buildlink3.mk" +.endif # SDL_NET_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -SDL_net diff --git a/net/adns/buildlink3.mk b/net/adns/buildlink3.mk index 2eddc2a2cef..141d66fe9c2 100644 --- a/net/adns/buildlink3.mk +++ b/net/adns/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:03 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:07 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ADNS_BUILDLINK3_MK:= ${ADNS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= adns -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= adns -.endif +.if !defined(ADNS_BUILDLINK3_MK) +ADNS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nadns} -BUILDLINK_PACKAGES+= adns -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}adns - -.if !empty(ADNS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.adns+= adns>=1.0 BUILDLINK_ABI_DEPENDS.adns+= adns>=1.1nb2 BUILDLINK_PKGSRCDIR.adns?= ../../net/adns -.endif # ADNS_BUILDLINK3_MK +.endif # ADNS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -adns diff --git a/net/avahi/buildlink3.mk b/net/avahi/buildlink3.mk index 91a393401a6..c45bcddca8f 100644 --- a/net/avahi/buildlink3.mk +++ b/net/avahi/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/12/20 17:36:14 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:07 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -AVAHI_BUILDLINK3_MK:= ${AVAHI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= avahi -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= avahi -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Navahi} -BUILDLINK_PACKAGES+= avahi -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}avahi +.if !defined(AVAHI_BUILDLINK3_MK) +AVAHI_BUILDLINK3_MK:= -.if ${AVAHI_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.avahi+= avahi>=0.6.23 BUILDLINK_PKGSRCDIR.avahi?= ../../net/avahi -.endif # AVAHI_BUILDLINK3_MK pkgbase := avahi .include "../../mk/pkg-build-options.mk" @@ -25,5 +17,6 @@ pkgbase := avahi .include "../../devel/glib2/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # AVAHI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -avahi diff --git a/net/bind9/buildlink3.mk b/net/bind9/buildlink3.mk index 6fc2c42c86b..9ef1a184ea2 100644 --- a/net/bind9/buildlink3.mk +++ b/net/bind9/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.12 2008/01/18 05:08:40 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:07 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BIND_BUILDLINK3_MK:= ${BIND_BUILDLINK3_MK}+ +BUILDLINK_TREE+= bind -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= bind -.endif +.if !defined(BIND_BUILDLINK3_MK) +BIND_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbind} -BUILDLINK_PACKAGES+= bind -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}bind - -.if !empty(BIND_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.bind+= bind>=9.2.2 BUILDLINK_ABI_DEPENDS.bind+= bind>=9.4.1pl1nb2 BUILDLINK_PKGSRCDIR.bind?= ../../net/bind9 BUILDLINK_INCDIRS.bind?= include/bind BUILDLINK_LDFLAGS.bind?= ${BUILDLINK_LDADD.bind} -.endif # BIND_BUILDLINK3_MK .include "../../security/openssl/buildlink3.mk" +.endif # BIND_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -bind diff --git a/net/bind95/buildlink3.mk b/net/bind95/buildlink3.mk index 6dba3b8d8c1..954f6d45716 100644 --- a/net/bind95/buildlink3.mk +++ b/net/bind95/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/06/21 23:15:28 adrianp Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:07 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BIND_BUILDLINK3_MK:= ${BIND_BUILDLINK3_MK}+ +BUILDLINK_TREE+= bind -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= bind -.endif +.if !defined(BIND_BUILDLINK3_MK) +BIND_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbind} -BUILDLINK_PACKAGES+= bind -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}bind - -.if ${BIND_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.bind+= bind>=9.5.0 BUILDLINK_PKGSRCDIR.bind?= ../../net/bind95 -.endif # BIND_BUILDLINK3_MK +.endif # BIND_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -bind diff --git a/net/bind96/buildlink3.mk b/net/bind96/buildlink3.mk index ebd9d6963c6..6539d0e019a 100644 --- a/net/bind96/buildlink3.mk +++ b/net/bind96/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/04 00:21:36 adrianp Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:07 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BIND_BUILDLINK3_MK:= ${BIND_BUILDLINK3_MK}+ +BUILDLINK_TREE+= bind -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= bind -.endif +.if !defined(BIND_BUILDLINK3_MK) +BIND_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbind} -BUILDLINK_PACKAGES+= bind -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}bind - -.if ${BIND_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.bind+= bind>=9.6.0 BUILDLINK_PKGSRCDIR.bind?= ../../net/bind96 -.endif # BIND_BUILDLINK3_MK +.endif # BIND_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -bind diff --git a/net/boinc3-libs/buildlink3.mk b/net/boinc3-libs/buildlink3.mk index 8b7f7b9761b..c630c9eac02 100644 --- a/net/boinc3-libs/buildlink3.mk +++ b/net/boinc3-libs/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:03 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:07 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BOINC_LIBS_BUILDLINK3_MK:= ${BOINC_LIBS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= boinclibs -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= boinclibs -.endif +.if !defined(BOINC_LIBS_BUILDLINK3_MK) +BOINC_LIBS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nboinclibs} -BUILDLINK_PACKAGES+= boinclibs -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}boinclibs - -.if !empty(BOINC_LIBS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.boinclibs+= boinc3-libs>=3.19.20040714 BUILDLINK_PKGSRCDIR.boinclibs?= ../../net/boinc3-libs # installs static libraries only BUILDLINK_DEPMETHOD.boinclibs?= build -.endif # BOINC_LIBS_BUILDLINK3_MK +.endif # BOINC_LIBS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -boinclibs diff --git a/net/dante/buildlink3.mk b/net/dante/buildlink3.mk index c3497541170..d02b3ed3c63 100644 --- a/net/dante/buildlink3.mk +++ b/net/dante/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:03 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:07 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -DANTE_BUILDLINK3_MK:= ${DANTE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= dante -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= dante -.endif +.if !defined(DANTE_BUILDLINK3_MK) +DANTE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndante} -BUILDLINK_PACKAGES+= dante -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dante - -.if !empty(DANTE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.dante+= dante>=1.1.13 BUILDLINK_ABI_DEPENDS.dante+= dante>=1.1.14nb1 BUILDLINK_PKGSRCDIR.dante?= ../../net/dante -.endif # DANTE_BUILDLINK3_MK +.endif # DANTE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -dante diff --git a/net/flow-tools/buildlink3.mk b/net/flow-tools/buildlink3.mk index 78be816c2d3..37cd6abbbea 100644 --- a/net/flow-tools/buildlink3.mk +++ b/net/flow-tools/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/07/29 21:34:31 seb Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:08 joerg Exp $ BUILDLINK_DEPMETHOD.flow-tools?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FLOW_TOOLS_BUILDLINK3_MK:= ${FLOW_TOOLS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= flow-tools -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= flow-tools -.endif +.if !defined(FLOW_TOOLS_BUILDLINK3_MK) +FLOW_TOOLS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nflow-tools} -BUILDLINK_PACKAGES+= flow-tools -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}flow-tools - -.if ${FLOW_TOOLS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.flow-tools+= flow-tools>=0.68nb2 BUILDLINK_PKGSRCDIR.flow-tools?= ../../net/flow-tools -.endif # FLOW_TOOLS_BUILDLINK3_MK +.endif # FLOW_TOOLS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -flow-tools diff --git a/net/freewais-sf/buildlink3.mk b/net/freewais-sf/buildlink3.mk index e146b6d8ab8..558c5a0d9a0 100644 --- a/net/freewais-sf/buildlink3.mk +++ b/net/freewais-sf/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:03 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:08 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FREEWAIS_SF_BUILDLINK3_MK:= ${FREEWAIS_SF_BUILDLINK3_MK}+ +BUILDLINK_TREE+= freewais-sf -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= freewais-sf -.endif +.if !defined(FREEWAIS_SF_BUILDLINK3_MK) +FREEWAIS_SF_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfreewais-sf} -BUILDLINK_PACKAGES+= freewais-sf -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}freewais-sf - -.if !empty(FREEWAIS_SF_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.freewais-sf+= freewais-sf>=2.2.12 BUILDLINK_ABI_DEPENDS.freewais-sf+= freewais-sf>=2.2.12nb2 BUILDLINK_PKGSRCDIR.freewais-sf?= ../../net/freewais-sf -.endif # FREEWAIS_SF_BUILDLINK3_MK +.endif # FREEWAIS_SF_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -freewais-sf diff --git a/net/gift/buildlink3.mk b/net/gift/buildlink3.mk index 5686a3c19fd..cba40ba86d5 100644 --- a/net/gift/buildlink3.mk +++ b/net/gift/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.8 2008/11/02 01:55:53 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:08 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GIFT_BUILDLINK3_MK:= ${GIFT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gift -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gift -.endif +.if !defined(GIFT_BUILDLINK3_MK) +GIFT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngift} -BUILDLINK_PACKAGES+= gift -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gift - -.if !empty(GIFT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gift+= gift>=0.11.6 BUILDLINK_ABI_DEPENDS.gift+= gift>=0.11.6nb2 BUILDLINK_PKGSRCDIR.gift?= ../../net/gift -.endif # GIFT_BUILDLINK3_MK .include "../../devel/libltdl/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" .include "../../sysutils/file/buildlink3.mk" +.endif # GIFT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gift diff --git a/net/gnet/buildlink3.mk b/net/gnet/buildlink3.mk index 405514de3be..0366bc2ec4d 100644 --- a/net/gnet/buildlink3.mk +++ b/net/gnet/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:03 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:08 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNET_BUILDLINK3_MK:= ${GNET_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnet -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnet -.endif +.if !defined(GNET_BUILDLINK3_MK) +GNET_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnet} -BUILDLINK_PACKAGES+= gnet -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnet - -.if !empty(GNET_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gnet+= gnet>=2.0.3nb1 BUILDLINK_ABI_DEPENDS.gnet+= gnet>=2.0.7nb2 BUILDLINK_PKGSRCDIR.gnet?= ../../net/gnet -.endif # GNET_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" +.endif # GNET_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnet diff --git a/net/gnet1/buildlink3.mk b/net/gnet1/buildlink3.mk index c8a485ac1ba..76fd071e3d7 100644 --- a/net/gnet1/buildlink3.mk +++ b/net/gnet1/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:03 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:08 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNET1_BUILDLINK3_MK:= ${GNET1_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnet1 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnet1 -.endif +.if !defined(GNET1_BUILDLINK3_MK) +GNET1_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnet1} -BUILDLINK_PACKAGES+= gnet1 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnet1 - -.if !empty(GNET1_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gnet1+= gnet1>=1.1.8nb2 BUILDLINK_ABI_DEPENDS.gnet1+= gnet1>=1.1.8nb4 BUILDLINK_PKGSRCDIR.gnet1?= ../../net/gnet1 -.endif # GNET1_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" +.endif # GNET1_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnet1 diff --git a/net/gsnmp/buildlink3.mk b/net/gsnmp/buildlink3.mk index 280bbdd2373..5e92cb3ede2 100644 --- a/net/gsnmp/buildlink3.mk +++ b/net/gsnmp/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/10/29 09:48:31 seb Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:08 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GSNMP_BUILDLINK3_MK:= ${GSNMP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gsnmp -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= gsnmp -.endif +.if !defined(GSNMP_BUILDLINK3_MK) +GSNMP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngsnmp} -BUILDLINK_PACKAGES+= gsnmp -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gsnmp - -.if ${GSNMP_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.gsnmp+= gsnmp>=0.2.0 BUILDLINK_PKGSRCDIR.gsnmp?= ../../net/gsnmp -.endif # GSNMP_BUILDLINK3_MK +.endif # GSNMP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gsnmp diff --git a/net/hesiod/buildlink3.mk b/net/hesiod/buildlink3.mk index 93cc6b416b1..89907f3b710 100644 --- a/net/hesiod/buildlink3.mk +++ b/net/hesiod/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:03 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:08 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -HESIOD_BUILDLINK3_MK:= ${HESIOD_BUILDLINK3_MK}+ +BUILDLINK_TREE+= hesiod -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= hesiod -.endif +.if !defined(HESIOD_BUILDLINK3_MK) +HESIOD_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nhesiod} -BUILDLINK_PACKAGES+= hesiod -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}hesiod - -.if !empty(HESIOD_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.hesiod+= hesiod>=3.0.2 BUILDLINK_PKGSRCDIR.hesiod?= ../../net/hesiod BUILDLINK_DEPMETHOD.hesiod?= build -.endif # HESIOD_BUILDLINK3_MK +.endif # HESIOD_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -hesiod diff --git a/net/howl/buildlink3.mk b/net/howl/buildlink3.mk index ad053395c05..42cc13cec79 100644 --- a/net/howl/buildlink3.mk +++ b/net/howl/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:03 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:08 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -HOWL_BUILDLINK3_MK:= ${HOWL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= howl -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= howl -.endif +.if !defined(HOWL_BUILDLINK3_MK) +HOWL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nhowl} -BUILDLINK_PACKAGES+= howl -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}howl - -.if !empty(HOWL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.howl+= howl>=0.9.5 BUILDLINK_ABI_DEPENDS.howl+= howl>=0.9.5nb1 BUILDLINK_PKGSRCDIR.howl?= ../../net/howl -.endif # HOWL_BUILDLINK3_MK +.endif # HOWL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -howl diff --git a/net/isc-dhcp/buildlink3.mk b/net/isc-dhcp/buildlink3.mk index 11c5fc0ffa5..d5680e30c18 100644 --- a/net/isc-dhcp/buildlink3.mk +++ b/net/isc-dhcp/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.3 2008/06/16 14:52:58 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:08 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ISC_DHCP_BASE_BUILDLINK3_MK:= ${ISC_DHCP_BASE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= isc-dhcp-base -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= isc-dhcp-base -.endif +.if !defined(ISC_DHCP_BASE_BUILDLINK3_MK) +ISC_DHCP_BASE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nisc-dhcp-base} -BUILDLINK_PACKAGES+= isc-dhcp-base -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}isc-dhcp-base - -.if ${ISC_DHCP_BASE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.isc-dhcp-base+= isc-dhcp-base>=3.1.0<4 BUILDLINK_PKGSRCDIR.isc-dhcp-base?= ../../net/isc-dhcp -.endif # ISC_DHCP_BASE_BUILDLINK3_MK +.endif # ISC_DHCP_BASE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -isc-dhcp-base diff --git a/net/isc-dhcp4/buildlink3.mk b/net/isc-dhcp4/buildlink3.mk index 9c1e452eca3..707db1b6f6c 100644 --- a/net/isc-dhcp4/buildlink3.mk +++ b/net/isc-dhcp4/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/01/04 00:56:32 adrianp Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:09 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ISC_DHCP_BUILDLINK3_MK:= ${ISC_DHCP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= isc-dhcp -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= isc-dhcp -.endif +.if !defined(ISC_DHCP_BUILDLINK3_MK) +ISC_DHCP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nisc-dhcp} -BUILDLINK_PACKAGES+= isc-dhcp -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}isc-dhcp - -.if ${ISC_DHCP_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.isc-dhcp+= isc-dhcp>=4.1.0 BUILDLINK_PKGSRCDIR.isc-dhcp?= ../../net/isc-dhcp4 -.endif # ISC_DHCP_BUILDLINK3_MK +.endif # ISC_DHCP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -isc-dhcp diff --git a/net/kdenetwork3/buildlink3.mk b/net/kdenetwork3/buildlink3.mk index a63d46c09c9..b696c094d65 100644 --- a/net/kdenetwork3/buildlink3.mk +++ b/net/kdenetwork3/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.15 2008/01/18 05:08:43 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:25:09 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -KDENETWORK_BUILDLINK3_MK:= ${KDENETWORK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= kdenetwork -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= kdenetwork -.endif +.if !defined(KDENETWORK_BUILDLINK3_MK) +KDENETWORK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkdenetwork} -BUILDLINK_PACKAGES+= kdenetwork -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kdenetwork - -.if !empty(KDENETWORK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.kdenetwork+= kdenetwork>=3.5.0nb1 BUILDLINK_ABI_DEPENDS.kdenetwork?= kdenetwork>=3.5.8nb2 BUILDLINK_PKGSRCDIR.kdenetwork?= ../../net/kdenetwork3 -.endif # KDENETWORK_BUILDLINK3_MK .include "../../converters/uulib/buildlink3.mk" .include "../../databases/gdbm/buildlink3.mk" @@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.kdenetwork?= ../../net/kdenetwork3 .include "../../net/openslp/buildlink3.mk" .include "../../x11/kdebase3/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" +.endif # KDENETWORK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -kdenetwork diff --git a/net/ldns/buildlink3.mk b/net/ldns/buildlink3.mk index df596a870f6..179d10f8745 100644 --- a/net/ldns/buildlink3.mk +++ b/net/ldns/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.3 2008/12/17 17:52:33 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:09 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LDNS_BUILDLINK3_MK:= ${LDNS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ldns -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= ldns -.endif +.if !defined(LDNS_BUILDLINK3_MK) +LDNS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nldns} -BUILDLINK_PACKAGES+= ldns -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ldns - -.if ${LDNS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.ldns+= ldns>=1.4 BUILDLINK_PKGSRCDIR.ldns?= ../../net/ldns -.endif # LDNS_BUILDLINK3_MK +.endif # LDNS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ldns diff --git a/net/libIDL/buildlink3.mk b/net/libIDL/buildlink3.mk index ab0ee88b361..adb4a5550d3 100644 --- a/net/libIDL/buildlink3.mk +++ b/net/libIDL/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:03 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:09 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBIDL_BUILDLINK3_MK:= ${LIBIDL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libIDL -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libIDL -.endif +.if !defined(LIBIDL_BUILDLINK3_MK) +LIBIDL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibIDL} -BUILDLINK_PACKAGES+= libIDL -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libIDL - -.if !empty(LIBIDL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libIDL+= libIDL>=0.8.3nb1 BUILDLINK_ABI_DEPENDS.libIDL+= libIDL>=0.8.6nb1 BUILDLINK_PKGSRCDIR.libIDL?= ../../net/libIDL -.endif # LIBIDL_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # LIBIDL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libIDL diff --git a/net/libares/buildlink3.mk b/net/libares/buildlink3.mk index 0959ac58e32..8ac9b70f640 100644 --- a/net/libares/buildlink3.mk +++ b/net/libares/buildlink3.mk @@ -1,23 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/12/12 21:52:36 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:09 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBARES_BUILDLINK3_MK:= ${LIBARES_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libares -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libares -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibares} -BUILDLINK_PACKAGES+= libares -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libares +.if !defined(LIBARES_BUILDLINK3_MK) +LIBARES_BUILDLINK3_MK:= .include "../../mk/bsd.fast.prefs.mk" -.if !empty(LIBARES_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libares+= libares>=1.1.1 BUILDLINK_PKGSRCDIR.libares?= ../../net/libares BUILDLINK_DEPMETHOD.libares?= build -.endif # LIBARES_BUILDLINK3_MK .if ${OPSYS} == "Interix" BUILDLINK_PASSTHRU_DIRS+= /usr/local/include/bind /usr/local/lib/bind @@ -25,5 +17,6 @@ BUILDLINK_CPPFLAGS.libares+= -I/usr/local/include/bind BUILDLINK_LDFLAGS.libares+= -L/usr/local/lib/bind BUILDLINK_LIBS.libares+= -lbind -ldb .endif +.endif # LIBARES_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libares diff --git a/net/libcares/buildlink3.mk b/net/libcares/buildlink3.mk index 4dedddbc527..85de59b99e5 100644 --- a/net/libcares/buildlink3.mk +++ b/net/libcares/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/18 22:38:18 adrianp Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:09 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBCARES_BUILDLINK3_MK:= ${LIBCARES_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libcares -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libcares -.endif +.if !defined(LIBCARES_BUILDLINK3_MK) +LIBCARES_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcares} -BUILDLINK_PACKAGES+= libcares -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libcares - -.if !empty(LIBCARES_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libcares+= libcares>=1.3.0nb1 BUILDLINK_PKGSRCDIR.libcares?= ../../net/libcares -.endif # LIBCARES_BUILDLINK3_MK +.endif # LIBCARES_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libcares diff --git a/net/libdnet/buildlink3.mk b/net/libdnet/buildlink3.mk index 2fd291e8cbd..d410fdad359 100644 --- a/net/libdnet/buildlink3.mk +++ b/net/libdnet/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:03 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:09 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBDNET_BUILDLINK3_MK:= ${LIBDNET_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libdnet -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libdnet -.endif +.if !defined(LIBDNET_BUILDLINK3_MK) +LIBDNET_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdnet} -BUILDLINK_PACKAGES+= libdnet -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdnet - -.if !empty(LIBDNET_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libdnet+= libdnet>=1.7 BUILDLINK_ABI_DEPENDS.libdnet?= libdnet>=1.10nb1 BUILDLINK_PKGSRCDIR.libdnet?= ../../net/libdnet -.endif # LIBDNET_BUILDLINK3_MK +.endif # LIBDNET_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libdnet diff --git a/net/libfetch/buildlink3.mk b/net/libfetch/buildlink3.mk index 5de5816a9c2..55fc9ba7f54 100644 --- a/net/libfetch/buildlink3.mk +++ b/net/libfetch/buildlink3.mk @@ -1,22 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.5 2009/02/05 16:59:45 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:09 joerg Exp $ BUILDLINK_DEPMETHOD.libfetch?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBFETCH_BUILDLINK3_MK:= ${LIBFETCH_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libfetch -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libfetch -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibfetch} -BUILDLINK_PACKAGES+= libfetch -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libfetch +.if !defined(LIBFETCH_BUILDLINK3_MK) +LIBFETCH_BUILDLINK3_MK:= -.if ${LIBFETCH_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libfetch+= libfetch>=2.21 BUILDLINK_PKGSRCDIR.libfetch?= ../../net/libfetch -.endif # LIBFETCH_BUILDLINK3_MK pkgbase := libfetch .include "../../mk/pkg-build-options.mk" @@ -24,5 +16,6 @@ pkgbase := libfetch .if !empty(PKG_BUILD_OPTIONS.libfetch:Mopenssl) .include "../../security/openssl/buildlink3.mk" .endif +.endif # LIBFETCH_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libfetch diff --git a/net/liblive/buildlink3.mk b/net/liblive/buildlink3.mk index 977778392f5..16923eea528 100644 --- a/net/liblive/buildlink3.mk +++ b/net/liblive/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.7 2008/07/17 10:11:19 ahoka Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:09 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBLIVE_BUILDLINK3_MK:= ${LIBLIVE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= liblive -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= liblive -.endif +.if !defined(LIBLIVE_BUILDLINK3_MK) +LIBLIVE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nliblive} -BUILDLINK_PACKAGES+= liblive -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}liblive - -.if !empty(LIBLIVE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.liblive+= liblive>=20080706 BUILDLINK_ABI_DEPENDS.liblive+= liblive>=20080706 BUILDLINK_PKGSRCDIR.liblive?= ../../net/liblive @@ -19,6 +12,6 @@ BUILDLINK_INCDIRS.liblive+= include/BasicUsageEnvironment BUILDLINK_INCDIRS.liblive+= include/UsageEnvironment BUILDLINK_INCDIRS.liblive+= include/groupsock BUILDLINK_INCDIRS.liblive+= include/liveMedia -.endif # LIBLIVE_BUILDLINK3_MK +.endif # LIBLIVE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -liblive diff --git a/net/libmms/buildlink3.mk b/net/libmms/buildlink3.mk index e2a4297d303..7727b933d3f 100644 --- a/net/libmms/buildlink3.mk +++ b/net/libmms/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/10/20 09:15:58 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:09 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBMMS_BUILDLINK3_MK:= ${LIBMMS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libmms -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libmms -.endif +.if !defined(LIBMMS_BUILDLINK3_MK) +LIBMMS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmms} -BUILDLINK_PACKAGES+= libmms -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmms - -.if ${LIBMMS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libmms+= libmms>=0.3 BUILDLINK_PKGSRCDIR.libmms?= ../../net/libmms -.endif # LIBMMS_BUILDLINK3_MK +.endif # LIBMMS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libmms diff --git a/net/libnids/buildlink3.mk b/net/libnids/buildlink3.mk index 9fab1433bf4..655e2d62c53 100644 --- a/net/libnids/buildlink3.mk +++ b/net/libnids/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:03 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:10 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBNIDS_BUILDLINK3_MK:= ${LIBNIDS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libnids -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libnids -.endif +.if !defined(LIBNIDS_BUILDLINK3_MK) +LIBNIDS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibnids} -BUILDLINK_PACKAGES+= libnids -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libnids - -.if !empty(LIBNIDS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libnids+= libnids>=1.18 BUILDLINK_PKGSRCDIR.libnids?= ../../net/libnids BUILDLINK_DEPMETHOD.libnids?= build -.endif # LIBNIDS_BUILDLINK3_MK +.endif # LIBNIDS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libnids diff --git a/net/libnipper/buildlink3.mk b/net/libnipper/buildlink3.mk index 6d39ec67eb3..5d350ab0a23 100644 --- a/net/libnipper/buildlink3.mk +++ b/net/libnipper/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/09/08 17:27:56 adrianp Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:10 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBNIPPER_BUILDLINK3_MK:= ${LIBNIPPER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libnipper -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libnipper -.endif +.if !defined(LIBNIPPER_BUILDLINK3_MK) +LIBNIPPER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibnipper} -BUILDLINK_PACKAGES+= libnipper -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libnipper - -.if ${LIBNIPPER_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libnipper+= libnipper>=0.12.1 BUILDLINK_PKGSRCDIR.libnipper?= ../../net/libnipper -.endif # LIBNIPPER_BUILDLINK3_MK +.endif # LIBNIPPER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libnipper diff --git a/net/libpcap/buildlink3.mk b/net/libpcap/buildlink3.mk index a154e59afd1..6dcfe2251db 100644 --- a/net/libpcap/buildlink3.mk +++ b/net/libpcap/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.20 2006/12/12 21:52:36 joerg Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBPCAP_BUILDLINK3_MK:= ${LIBPCAP_BUILDLINK3_MK}+ +# $NetBSD: buildlink3.mk,v 1.21 2009/03/20 19:25:10 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libpcap -.endif +BUILDLINK_TREE+= libpcap -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibpcap} -BUILDLINK_PACKAGES+= libpcap -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libpcap +.if !defined(LIBPCAP_BUILDLINK3_MK) +LIBPCAP_BUILDLINK3_MK:= -.if !empty(LIBPCAP_BUILDLINK3_MK:M+) # XXX? BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.5.0 BUILDLINK_PKGSRCDIR.libpcap?= ../../net/libpcap @@ -24,7 +17,6 @@ BUILDLINK_PKGSRCDIR.libpcap?= ../../net/libpcap BUILDLINK_LDADD.libpcap+= -lnsl -lsocket BUILDLINK_LDFLAGS.libpcap?= ${BUILDLINK_LDADD.libpcap} . endif +.endif # LIBPCAP_BUILDLINK3_MK -.endif # LIBPCAP_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libpcap diff --git a/net/libradius/buildlink3.mk b/net/libradius/buildlink3.mk index bb809272c07..aeda1becce4 100644 --- a/net/libradius/buildlink3.mk +++ b/net/libradius/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.10 2008/01/03 17:08:52 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:10 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBRADIUS_BUILDLINK3_MK:= ${LIBRADIUS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libradius -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libradius -.endif +.if !defined(LIBRADIUS_BUILDLINK3_MK) +LIBRADIUS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibradius} -BUILDLINK_PACKAGES+= libradius -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libradius - -.if ${LIBRADIUS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libradius+= libradius>=20040827 BUILDLINK_PKGSRCDIR.libradius?= ../../net/libradius BUILDLINK_DEPMETHOD.libradius?= build @@ -21,6 +14,6 @@ BUILDLINK_DEPMETHOD.libradius?= build BUILDLINK_LDADD.libradius+= -lmd BUILDLINK_LDFLAGS.libradius?= ${BUILDLINK_LDADD.libradius} . endif -.endif # LIBRADIUS_BUILDLINK3_MK +.endif # LIBRADIUS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libradius diff --git a/net/libsoup24/buildlink3.mk b/net/libsoup24/buildlink3.mk index 9d331d0184f..b2dc6b009f4 100644 --- a/net/libsoup24/buildlink3.mk +++ b/net/libsoup24/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/03/16 13:02:18 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:10 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSOUP24_BUILDLINK3_MK:= ${LIBSOUP24_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libsoup24 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libsoup24 -.endif +.if !defined(LIBSOUP24_BUILDLINK3_MK) +LIBSOUP24_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsoup24} -BUILDLINK_PACKAGES+= libsoup24 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsoup24 - -.if !empty(LIBSOUP24_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libsoup24+= libsoup24>=2.4.0 BUILDLINK_ABI_DEPENDS.libsoup24?= libsoup24>=2.4.0 BUILDLINK_PKGSRCDIR.libsoup24?= ../../net/libsoup24 -.endif # LIBSOUP24_BUILDLINK3_MK .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../security/gnutls/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../www/libproxy/buildlink3.mk" +.endif # LIBSOUP24_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libsoup24 diff --git a/net/libtorrent/buildlink3.mk b/net/libtorrent/buildlink3.mk index 953e1586f45..cf9fde1f991 100644 --- a/net/libtorrent/buildlink3.mk +++ b/net/libtorrent/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.15 2008/12/03 12:57:40 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:25:10 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBTORRENT_BUILDLINK3_MK:= ${LIBTORRENT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libtorrent -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libtorrent -.endif +.if !defined(LIBTORRENT_BUILDLINK3_MK) +LIBTORRENT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibtorrent} -BUILDLINK_PACKAGES+= libtorrent -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libtorrent - -.if !empty(LIBTORRENT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libtorrent+= libtorrent>=0.12.0 BUILDLINK_ABI_DEPENDS.libtorrent+= libtorrent>=0.12.0 BUILDLINK_PKGSRCDIR.libtorrent?= ../../net/libtorrent -.endif # LIBTORRENT_BUILDLINK3_MK .include "../../devel/libsigc++/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" +.endif # LIBTORRENT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libtorrent diff --git a/net/libupnp/buildlink3.mk b/net/libupnp/buildlink3.mk index 2399be4c3e0..d4a2b88a768 100644 --- a/net/libupnp/buildlink3.mk +++ b/net/libupnp/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.2 2007/08/19 01:36:22 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:10 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBUPNP_BUILDLINK3_MK:= ${LIBUPNP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libupnp -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libupnp -.endif +.if !defined(LIBUPNP_BUILDLINK3_MK) +LIBUPNP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibupnp} -BUILDLINK_PACKAGES+= libupnp -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libupnp - -.if ${LIBUPNP_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libupnp+= libupnp>=1.4.6 BUILDLINK_PKGSRCDIR.libupnp?= ../../net/libupnp -.endif # LIBUPNP_BUILDLINK3_MK +.endif # LIBUPNP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libupnp diff --git a/net/libvncserver/buildlink3.mk b/net/libvncserver/buildlink3.mk index e025d492b7b..a9031791332 100644 --- a/net/libvncserver/buildlink3.mk +++ b/net/libvncserver/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.2 2007/07/11 14:37:25 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:10 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBVNCSERVER_BUILDLINK3_MK:= ${LIBVNCSERVER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libVNCServer -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libVNCServer -.endif +.if !defined(LIBVNCSERVER_BUILDLINK3_MK) +LIBVNCSERVER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibVNCServer} -BUILDLINK_PACKAGES+= libVNCServer -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libVNCServer - -.if ${LIBVNCSERVER_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libVNCServer+= libVNCServer>=0.9.1 BUILDLINK_PKGSRCDIR.libVNCServer?= ../../net/libvncserver -.endif # LIBVNCSERVER_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" +.endif # LIBVNCSERVER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libVNCServer diff --git a/net/linc/buildlink3.mk b/net/linc/buildlink3.mk index 5fc6acdb55f..0bfd52ea87b 100644 --- a/net/linc/buildlink3.mk +++ b/net/linc/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.8 2008/01/18 05:08:44 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:10 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LINC_BUILDLINK3_MK:= ${LINC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= linc -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= linc -.endif +.if !defined(LINC_BUILDLINK3_MK) +LINC_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlinc} -BUILDLINK_PACKAGES+= linc -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}linc - -.if !empty(LINC_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.linc+= linc>=1.1.1 BUILDLINK_ABI_DEPENDS.linc+= linc>=1.1.1nb5 BUILDLINK_PKGSRCDIR.linc?= ../../net/linc -.endif # LINC_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" +.endif # LINC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -linc diff --git a/net/mDNSResponder/buildlink3.mk b/net/mDNSResponder/buildlink3.mk index a6ae10c699d..9c0b4678d99 100644 --- a/net/mDNSResponder/buildlink3.mk +++ b/net/mDNSResponder/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:04 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:10 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MDNSRESPONDER_BUILDLINK3_MK:= ${MDNSRESPONDER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= mDNSResponder -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= mDNSResponder -.endif +.if !defined(MDNSRESPONDER_BUILDLINK3_MK) +MDNSRESPONDER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NmDNSResponder} -BUILDLINK_PACKAGES+= mDNSResponder -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mDNSResponder - -.if !empty(MDNSRESPONDER_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.mDNSResponder+= mDNSResponder>=98 BUILDLINK_ABI_DEPENDS.mDNSResponder?= mDNSResponder>=107.5nb1 BUILDLINK_PKGSRCDIR.mDNSResponder?= ../../net/mDNSResponder -.endif # MDNSRESPONDER_BUILDLINK3_MK +.endif # MDNSRESPONDER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -mDNSResponder diff --git a/net/monotorrent/buildlink3.mk b/net/monotorrent/buildlink3.mk index a1e320630a0..e541c7f2a0c 100644 --- a/net/monotorrent/buildlink3.mk +++ b/net/monotorrent/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1 2008/11/30 11:26:35 kefren Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:11 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MONOTORRENT_BUILDLINK3_MK:= ${MONOTORRENT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= monotorrent -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= monotorrent -.endif +.if !defined(MONOTORRENT_BUILDLINK3_MK) +MONOTORRENT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmonotorrent} -BUILDLINK_PACKAGES+= monotorrent -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}monotorrent - -.if ${MONOTORRENT_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.monotorrent+= monotorrent>=0.62 BUILDLINK_PKGSRCDIR.monotorrent?= ../../net/monotorrent -.endif # MONOTORRENT_BUILDLINK3_MK .include "../../lang/mono/buildlink3.mk" +.endif # MONOTORRENT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -monotorrent diff --git a/net/net-snmp/buildlink3.mk b/net/net-snmp/buildlink3.mk index e4f17aaccf8..74a29cca570 100644 --- a/net/net-snmp/buildlink3.mk +++ b/net/net-snmp/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:04 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:11 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -NET_SNMP_BUILDLINK3_MK:= ${NET_SNMP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= net-snmp -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= net-snmp -.endif +.if !defined(NET_SNMP_BUILDLINK3_MK) +NET_SNMP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnet-snmp} -BUILDLINK_PACKAGES+= net-snmp -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}net-snmp - -.if !empty(NET_SNMP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.net-snmp+= net-snmp>=5.0.9nb3 BUILDLINK_ABI_DEPENDS.net-snmp+= net-snmp>=5.2.1.2 BUILDLINK_PKGSRCDIR.net-snmp?= ../../net/net-snmp -.endif # NET_SNMP_BUILDLINK3_MK .include "../../security/tcp_wrappers/buildlink3.mk" +.endif # NET_SNMP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -net-snmp diff --git a/net/net6/buildlink3.mk b/net/net6/buildlink3.mk index a3ccdf70a76..68709b9a1c8 100644 --- a/net/net6/buildlink3.mk +++ b/net/net6/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/03/06 14:53:53 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:11 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -NET6_BUILDLINK3_MK:= ${NET6_BUILDLINK3_MK}+ +BUILDLINK_TREE+= net6 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= net6 -.endif +.if !defined(NET6_BUILDLINK3_MK) +NET6_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnet6} -BUILDLINK_PACKAGES+= net6 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}net6 - -.if ${NET6_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.net6+= net6>=1.3.5 BUILDLINK_ABI_DEPENDS.net6?= net6>=1.3.5nb1 BUILDLINK_PKGSRCDIR.net6?= ../../net/net6 -.endif # NET6_BUILDLINK3_MK .include "../../devel/libsigc++/buildlink3.mk" .include "../../security/gnutls/buildlink3.mk" +.endif # NET6_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -net6 diff --git a/net/netatalk/buildlink3.mk b/net/netatalk/buildlink3.mk index 9486e547ada..2b2f3a4e077 100644 --- a/net/netatalk/buildlink3.mk +++ b/net/netatalk/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:04 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:11 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -NETATALK_BUILDLINK3_MK:= ${NETATALK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= netatalk -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= netatalk -.endif +.if !defined(NETATALK_BUILDLINK3_MK) +NETATALK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnetatalk} -BUILDLINK_PACKAGES+= netatalk -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}netatalk - -.if !empty(NETATALK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.netatalk+= netatalk>=2.0.3nb2 BUILDLINK_ABI_DEPENDS.netatalk?= netatalk>=2.0.3nb3 BUILDLINK_PKGSRCDIR.netatalk?= ../../net/netatalk BUILDLINK_DEPMETHOD.netatalk?= build -.endif # NETATALK_BUILDLINK3_MK +.endif # NETATALK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -netatalk diff --git a/net/openh323/buildlink3.mk b/net/openh323/buildlink3.mk index 98f1e9adc36..9e9f95f99a4 100644 --- a/net/openh323/buildlink3.mk +++ b/net/openh323/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.8 2008/01/18 05:08:47 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:11 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OPENH323_BUILDLINK3_MK:= ${OPENH323_BUILDLINK3_MK}+ +BUILDLINK_TREE+= openh323 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= openh323 -.endif +.if !defined(OPENH323_BUILDLINK3_MK) +OPENH323_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenh323} -BUILDLINK_PACKAGES+= openh323 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openh323 - -.if !empty(OPENH323_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.openh323+= openh323>=1.15.1 BUILDLINK_ABI_DEPENDS.openh323+= openh323>=1.15.2nb2 BUILDLINK_PKGSRCDIR.openh323?= ../../net/openh323 -.endif # OPENH323_BUILDLINK3_MK .include "../../devel/pwlib/buildlink3.mk" +.endif # OPENH323_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -openh323 diff --git a/net/openslp/buildlink3.mk b/net/openslp/buildlink3.mk index cedc1aa6003..43d625f8c6e 100644 --- a/net/openslp/buildlink3.mk +++ b/net/openslp/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:04 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:11 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OPENSLP_BUILDLINK3_MK:= ${OPENSLP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= openslp -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= openslp -.endif +.if !defined(OPENSLP_BUILDLINK3_MK) +OPENSLP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenslp} -BUILDLINK_PACKAGES+= openslp -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openslp - -.if !empty(OPENSLP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.openslp+= openslp>=1.0.1 BUILDLINK_ABI_DEPENDS.openslp+= openslp>=1.2.1 BUILDLINK_PKGSRCDIR.openslp?= ../../net/openslp -.endif # OPENSLP_BUILDLINK3_MK +.endif # OPENSLP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -openslp diff --git a/net/py-ORBit/buildlink3.mk b/net/py-ORBit/buildlink3.mk index d327f8b0f3e..a3535959a35 100644 --- a/net/py-ORBit/buildlink3.mk +++ b/net/py-ORBit/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 17:30:12 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:11 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_ORBIT_BUILDLINK3_MK:= ${PY_ORBIT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pyorbit -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pyorbit -.endif +.if !defined(PY_ORBIT_BUILDLINK3_MK) +PY_ORBIT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyorbit} -BUILDLINK_PACKAGES+= pyorbit -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyorbit - -.if !empty(PY_ORBIT_BUILDLINK3_MK:M+) .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pyorbit+= ${PYPKGPREFIX}-ORBit>=2.0.0nb1 BUILDLINK_ABI_DEPENDS.pyorbit+= ${PYPKGPREFIX}-ORBit>=2.0.1nb1 BUILDLINK_PKGSRCDIR.pyorbit?= ../../net/py-ORBit -.endif # PY_ORBIT_BUILDLINK3_MK .include "../../net/ORBit2/buildlink3.mk" +.endif # PY_ORBIT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pyorbit diff --git a/net/py-boto/buildlink3.mk b/net/py-boto/buildlink3.mk index b013ff343ca..6f199a1d6bf 100644 --- a/net/py-boto/buildlink3.mk +++ b/net/py-boto/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/04/25 21:54:15 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:11 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_BOTO_BUILDLINK3_MK:= ${PY_BOTO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= py-boto -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= py-boto -.endif +.if !defined(PY_BOTO_BUILDLINK3_MK) +PY_BOTO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-boto} -BUILDLINK_PACKAGES+= py-boto -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-boto - -.if ${PY_BOTO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.py-boto+= ${PYPKGPREFIX}-boto>=1.0a BUILDLINK_PKGSRCDIR.py-boto?= ../../net/py-boto -.endif # PY_BOTO_BUILDLINK3_MK +.endif # PY_BOTO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -py-boto diff --git a/net/py-libdnet/buildlink3.mk b/net/py-libdnet/buildlink3.mk index e823246b0e4..d6b84f267ad 100644 --- a/net/py-libdnet/buildlink3.mk +++ b/net/py-libdnet/buildlink3.mk @@ -1,23 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:04 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:11 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PYLIBDNET_BUILDLINK3_MK:= ${PYLIBDNET_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pylibdnet -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pylibdnet -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npylibdnet} -BUILDLINK_PACKAGES+= pylibdnet -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pylibdnet - -.if !empty(PYLIBDNET_BUILDLINK3_MK:M+) +.if !defined(PYLIBDNET_BUILDLINK3_MK) +PYLIBDNET_BUILDLINK3_MK:= .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pylibdnet+= ${PYPKGPREFIX}-libdnet>=1.7 BUILDLINK_ABI_DEPENDS.pylibdnet?= ${PYPKGPREFIX}-libdnet>=1.10nb1 BUILDLINK_PKGSRCDIR.pylibdnet?= ../../net/py-libdnet -.endif # PYLIBDNET_BUILDLINK3_MK +.endif # PYLIBDNET_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pylibdnet diff --git a/net/py-libpcap/buildlink3.mk b/net/py-libpcap/buildlink3.mk index 5f31b69c8b3..bdd9d3eed05 100644 --- a/net/py-libpcap/buildlink3.mk +++ b/net/py-libpcap/buildlink3.mk @@ -1,24 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:04 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:11 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PYLIBPCAP_BUILDLINK3_MK:= ${PYLIBPCAP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pylibpcap -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pylibpcap -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npylibpcap} -BUILDLINK_PACKAGES+= pylibpcap -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pylibpcap - -.if !empty(PYLIBPCAP_BUILDLINK3_MK:M+) +.if !defined(PYLIBPCAP_BUILDLINK3_MK) +PYLIBPCAP_BUILDLINK3_MK:= .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pylibpcap+= ${PYPKGPREFIX}-libpcap>=0.5.0 BUILDLINK_ABI_DEPENDS.pylibpcap?= ${PYPKGPREFIX}-libpcap>=0.5nb1 BUILDLINK_PKGSRCDIR.pylibpcap?= ../../net/py-libpcap +.endif # PYLIBPCAP_BUILDLINK3_MK -.endif # PYLIBPCAP_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pylibpcap diff --git a/net/py-soappy/buildlink3.mk b/net/py-soappy/buildlink3.mk index 7f62bc01455..e6c40155d1e 100644 --- a/net/py-soappy/buildlink3.mk +++ b/net/py-soappy/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 17:30:12 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:11 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_SOAPPY_BUILDLINK3_MK:= ${PY_SOAPPY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= py-SOAPpy -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= py-SOAPpy -.endif +.if !defined(PY_SOAPPY_BUILDLINK3_MK) +PY_SOAPPY_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-SOAPpy} -BUILDLINK_PACKAGES+= py-SOAPpy -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-SOAPpy - -.if !empty(PY_SOAPPY_BUILDLINK3_MK:M+) .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.py-SOAPpy+= ${PYPKGPREFIX}-SOAPpy>=0.11.4 BUILDLINK_ABI_DEPENDS.py-SOAPpy?= ${PYPKGPREFIX}-SOAPpy>=0.11.4nb4 BUILDLINK_PKGSRCDIR.py-SOAPpy?= ../../net/py-soappy -.endif # PY_SOAPPY_BUILDLINK3_MK .include "../../textproc/py-xml/buildlink3.mk" +.endif # PY_SOAPPY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -py-SOAPpy diff --git a/net/radiusclient-ng/buildlink3.mk b/net/radiusclient-ng/buildlink3.mk index cbfb2b886fd..a2c7a23c13d 100644 --- a/net/radiusclient-ng/buildlink3.mk +++ b/net/radiusclient-ng/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/04/13 19:58:56 bouyer Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -RADIUSCLIENT_NG_BUILDLINK3_MK:= ${RADIUSCLIENT_NG_BUILDLINK3_MK}+ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:12 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= radiusclient-ng -.endif +BUILDLINK_TREE+= radiusclient-ng -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nradiusclient-ng} -BUILDLINK_PACKAGES+= radiusclient-ng -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}radiusclient-ng +.if !defined(RADIUSCLIENT_NG_BUILDLINK3_MK) +RADIUSCLIENT_NG_BUILDLINK3_MK:= -.if !empty(RADIUSCLIENT_NG_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.radiusclient-ng+= radiusclient-ng>=0.5.5.1 BUILDLINK_PKGSRCDIR.radiusclient-ng?= ../../net/radiusclient-ng BUILDLINK_DEPMETHOD.radiusclient-ng?= build @@ -22,6 +15,6 @@ BUILDLINK_DEPMETHOD.radiusclient-ng?= build BUILDLINK_LDADD.radiusclient-ng+= -lmd BUILDLINK_LDFLAGS.radiusclient-ng?= ${BUILDLINK_LDADD.radiusclient-ng} . endif -.endif # RADIUSCLIENT_NG_BUILDLINK3_MK +.endif # RADIUSCLIENT_NG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -radiusclient-ng diff --git a/net/samba/buildlink3.mk b/net/samba/buildlink3.mk index 040e3e7be7d..47a50c6a5a1 100644 --- a/net/samba/buildlink3.mk +++ b/net/samba/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:04 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:12 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SAMBA_BUILDLINK3_MK:= ${SAMBA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= samba -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= samba -.endif +.if !defined(SAMBA_BUILDLINK3_MK) +SAMBA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsamba} -BUILDLINK_PACKAGES+= samba -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}samba - -.if !empty(SAMBA_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.samba+= samba>=3.0.7 BUILDLINK_PKGSRCDIR.samba?= ../../net/samba -.endif # SAMBA_BUILDLINK3_MK .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" +.endif # SAMBA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -samba diff --git a/net/socks4/buildlink3.mk b/net/socks4/buildlink3.mk index f7b38874b52..5338e8e211d 100644 --- a/net/socks4/buildlink3.mk +++ b/net/socks4/buildlink3.mk @@ -1,22 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:04 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:12 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SOCKS4_BUILDLINK3_MK:= ${SOCKS4_BUILDLINK3_MK}+ +BUILDLINK_TREE+= socks4 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= socks4 -.endif +.if !defined(SOCKS4_BUILDLINK3_MK) +SOCKS4_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsocks4} -BUILDLINK_PACKAGES+= socks4 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}socks4 - -.if !empty(SOCKS4_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.socks4+= socks4>=2.2 BUILDLINK_PKGSRCDIR.socks4?= ../../net/socks4 BUILDLINK_TRANSFORM+= l:socks:socks4 +.endif # SOCKS4_BUILDLINK3_MK -.endif # SOCKS4_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -socks4 diff --git a/net/socks5/buildlink3.mk b/net/socks5/buildlink3.mk index 10ece1c263f..ca7b4d64ba2 100644 --- a/net/socks5/buildlink3.mk +++ b/net/socks5/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:04 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:12 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SOCKS5_BUILDLINK3_MK:= ${SOCKS5_BUILDLINK3_MK}+ +BUILDLINK_TREE+= socks5 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= socks5 -.endif +.if !defined(SOCKS5_BUILDLINK3_MK) +SOCKS5_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsocks5} -BUILDLINK_PACKAGES+= socks5 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}socks5 - -.if !empty(SOCKS5_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.socks5+= socks5>=1.0.2 BUILDLINK_PKGSRCDIR.socks5?= ../../net/socks5 -.endif # SOCKS5_BUILDLINK3_MK +.endif # SOCKS5_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -socks5 diff --git a/net/solaris-tap/buildlink3.mk b/net/solaris-tap/buildlink3.mk index e89bd66f03e..03438132861 100644 --- a/net/solaris-tap/buildlink3.mk +++ b/net/solaris-tap/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/07/01 00:43:20 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:12 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SOLARIS_TAP_BUILDLINK3_MK:= ${SOLARIS_TAP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= solaris-tap -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= solaris-tap -.endif +.if !defined(SOLARIS_TAP_BUILDLINK3_MK) +SOLARIS_TAP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsolaris-tap} -BUILDLINK_PACKAGES+= solaris-tap -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}solaris-tap - -.if ${SOLARIS_TAP_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.solaris-tap+= solaris-tap>=20070525 BUILDLINK_PKGSRCDIR.solaris-tap?= ../../net/solaris-tap BUILDLINK_DEPMETHOD.solaris-tap?= build -.endif # SOLARIS_TAP_BUILDLINK3_MK +.endif # SOLARIS_TAP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -solaris-tap diff --git a/net/spread/buildlink3.mk b/net/spread/buildlink3.mk index f019606fe78..7f0edb629e2 100644 --- a/net/spread/buildlink3.mk +++ b/net/spread/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2007/05/22 14:04:33 reed Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:12 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SPREAD_BUILDLINK3_MK:= ${SPREAD_BUILDLINK3_MK}+ +BUILDLINK_TREE+= spread -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= spread -.endif +.if !defined(SPREAD_BUILDLINK3_MK) +SPREAD_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nspread} -BUILDLINK_PACKAGES+= spread -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}spread - -.if !empty(SPREAD_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.spread+= spread>=3.17.1 BUILDLINK_PKGSRCDIR.spread?= ../../net/spread BUILDLINK_INCDIRS.spread?= include/spread -.endif # SPREAD_BUILDLINK3_MK +.endif # SPREAD_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -spread diff --git a/net/tcl-scotty/buildlink3.mk b/net/tcl-scotty/buildlink3.mk index d18ecfc8e71..0dd4ca56bc5 100644 --- a/net/tcl-scotty/buildlink3.mk +++ b/net/tcl-scotty/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:04 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:12 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TCL_SCOTTY_BUILDLINK3_MK:= ${TCL_SCOTTY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= tcl-scotty -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= tcl-scotty -.endif +.if !defined(TCL_SCOTTY_BUILDLINK3_MK) +TCL_SCOTTY_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl-scotty} -BUILDLINK_PACKAGES+= tcl-scotty -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tcl-scotty - -.if !empty(TCL_SCOTTY_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.tcl-scotty+= tcl-scotty>=2.1.11 BUILDLINK_ABI_DEPENDS.tcl-scotty+= tcl-scotty>=2.1.11nb4 BUILDLINK_PKGSRCDIR.tcl-scotty?= ../../net/tcl-scotty -.endif # TCL_SCOTTY_BUILDLINK3_MK .include "../../lang/tcl/buildlink3.mk" +.endif # TCL_SCOTTY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -tcl-scotty diff --git a/net/whoson/buildlink3.mk b/net/whoson/buildlink3.mk index ec54d5743ea..ad0a3c7c231 100644 --- a/net/whoson/buildlink3.mk +++ b/net/whoson/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:04 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:12 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -WHOSON_BUILDLINK3_MK:= ${WHOSON_BUILDLINK3_MK}+ +BUILDLINK_TREE+= whoson -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= whoson -.endif +.if !defined(WHOSON_BUILDLINK3_MK) +WHOSON_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nwhoson} -BUILDLINK_PACKAGES+= whoson -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}whoson - -.if !empty(WHOSON_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.whoson+= whoson>=2.03 BUILDLINK_PKGSRCDIR.whoson?= ../../net/whoson -.endif # WHOSON_BUILDLINK3_MK +.endif # WHOSON_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -whoson diff --git a/net/xfce4-wavelan-plugin/buildlink3.mk b/net/xfce4-wavelan-plugin/buildlink3.mk index 6320d866b34..7857115af87 100644 --- a/net/xfce4-wavelan-plugin/buildlink3.mk +++ b/net/xfce4-wavelan-plugin/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.14 2007/04/12 09:55:11 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:12 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK:= ${XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-wavelan-plugin -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-wavelan-plugin -.endif +.if !defined(XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK) +XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-wavelan-plugin} -BUILDLINK_PACKAGES+= xfce4-wavelan-plugin -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-wavelan-plugin - -.if ${XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-wavelan-plugin+= xfce4-wavelan-plugin>=0.5.3 BUILDLINK_PKGSRCDIR.xfce4-wavelan-plugin?= ../../net/xfce4-wavelan-plugin -.endif # XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-wavelan-plugin diff --git a/net/yaz/buildlink3.mk b/net/yaz/buildlink3.mk index ee439e8d49c..2c27b1cdde9 100644 --- a/net/yaz/buildlink3.mk +++ b/net/yaz/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.11 2008/10/16 21:21:56 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:12 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -YAZ_BUILDLINK3_MK:= ${YAZ_BUILDLINK3_MK}+ +BUILDLINK_TREE+= yaz -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= yaz -.endif +.if !defined(YAZ_BUILDLINK3_MK) +YAZ_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nyaz} -BUILDLINK_PACKAGES+= yaz -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}yaz - -.if !empty(YAZ_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.yaz+= yaz>=2.0 BUILDLINK_ABI_DEPENDS.yaz+= yaz>=3.0 BUILDLINK_PKGSRCDIR.yaz?= ../../net/yaz -.endif # YAZ_BUILDLINK3_MK .include "../../converters/libiconv/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../textproc/icu/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" +.endif # YAZ_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -yaz diff --git a/news/inn/buildlink3.mk b/news/inn/buildlink3.mk index 4f0074bb66f..a62265a1241 100644 --- a/news/inn/buildlink3.mk +++ b/news/inn/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:04 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:13 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -INN_BUILDLINK3_MK:= ${INN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= inn -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= inn -.endif +.if !defined(INN_BUILDLINK3_MK) +INN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ninn} -BUILDLINK_PACKAGES+= inn -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}inn - -.if !empty(INN_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.inn+= inn>=2.3.4 BUILDLINK_PKGSRCDIR.inn?= ../../news/inn +.endif # INN_BUILDLINK3_MK -.endif # INN_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -inn diff --git a/parallel/mpi-ch/buildlink3.mk b/parallel/mpi-ch/buildlink3.mk index 154d9a90f45..fb07a2cccd0 100644 --- a/parallel/mpi-ch/buildlink3.mk +++ b/parallel/mpi-ch/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.12 2008/05/29 20:27:47 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:13 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MPICH2_BUILDLINK3_MK:= ${MPICH2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= mpich2 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= mpich2 -.endif +.if !defined(MPICH2_BUILDLINK3_MK) +MPICH2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmpich2} -BUILDLINK_PACKAGES+= mpich2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mpich2 - -.if !empty(MPICH2_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.mpich2+= mpich2>=1.0.7 BUILDLINK_PKGSRCDIR.mpich2?= ../../parallel/mpi-ch BUILDLINK_DEPMETHOD.mpich2?= build -.endif # MPICH2_BUILDLINK3_MK +.endif # MPICH2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -mpich2 diff --git a/parallel/pvm3/buildlink3.mk b/parallel/pvm3/buildlink3.mk index 00cb5e9639c..152701e13cc 100644 --- a/parallel/pvm3/buildlink3.mk +++ b/parallel/pvm3/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:05 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:13 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PVM_BUILDLINK3_MK:= ${PVM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pvm -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pvm -.endif +.if !defined(PVM_BUILDLINK3_MK) +PVM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npvm} -BUILDLINK_PACKAGES+= pvm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pvm - -.if !empty(PVM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.pvm+= pvm>=3.4.3 BUILDLINK_ABI_DEPENDS.pvm+= pvm>=3.4.5nb1 BUILDLINK_PKGSRCDIR.pvm?= ../../parallel/pvm3 @@ -19,7 +12,6 @@ BUILDLINK_PKGSRCDIR.pvm?= ../../parallel/pvm3 . include "${BUILDLINK_PKGSRCDIR.pvm}/arch.mk" BUILDLINK_INCDIRS.pvm?= pvm3/include BUILDLINK_LIBDIRS.pvm?= pvm3/lib/${PVM_ARCH} +.endif # PVM_BUILDLINK3_MK -.endif # PVM_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pvm diff --git a/pkgtools/compat_headers/buildlink3.mk b/pkgtools/compat_headers/buildlink3.mk index c9a401d8335..623c71141f1 100644 --- a/pkgtools/compat_headers/buildlink3.mk +++ b/pkgtools/compat_headers/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/05/25 17:38:37 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:13 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -COMPAT_HEADERS_BUILDLINK3_MK:= ${COMPAT_HEADERS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= compat_headers -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= compat_headers -.endif +.if !defined(COMPAT_HEADERS_BUILDLINK3_MK) +COMPAT_HEADERS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncompat_headers} -BUILDLINK_PACKAGES+= compat_headers -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}compat_headers - -.if !empty(COMPAT_HEADERS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.compat_headers+= compat_headers>=0.2 BUILDLINK_PKGSRCDIR.compat_headers?= ../../pkgtools/compat_headers BUILDLINK_DEPMETHOD.compat_headers?= build -.endif # COMPAT_HEADERS_BUILDLINK3_MK +.endif # COMPAT_HEADERS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -compat_headers diff --git a/pkgtools/createbuildlink/Makefile b/pkgtools/createbuildlink/Makefile index 1014f49bcb7..3d6cd597b05 100644 --- a/pkgtools/createbuildlink/Makefile +++ b/pkgtools/createbuildlink/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.44 2007/06/30 12:58:59 tnn Exp $ +# $NetBSD: Makefile,v 1.45 2009/03/20 19:25:13 joerg Exp $ -DISTNAME= createbuildlink-3.13 +DISTNAME= createbuildlink-3.14 CATEGORIES= pkgtools sysutils MASTER_SITES= # Nothing DISTFILES= # Nothing diff --git a/pkgtools/createbuildlink/files/createbuildlink b/pkgtools/createbuildlink/files/createbuildlink index abcd10015d8..0a6208fa9ea 100755 --- a/pkgtools/createbuildlink/files/createbuildlink +++ b/pkgtools/createbuildlink/files/createbuildlink @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: createbuildlink,v 1.33 2007/07/10 15:27:57 joerg Exp $ +# $NetBSD: createbuildlink,v 1.34 2009/03/20 19:25:13 joerg Exp $ # # Copyright (c) 2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -39,7 +39,7 @@ # Create an initial buildlink3.mk from a package's Makefile and PLIST # -REV=`echo '$Revision: 1.33 $' | sed 's/\\$//g'` +REV=`echo '$Revision: 1.34 $' | sed 's/\\$//g'` tmpdir=/tmp spacesintab=8 makefile=Makefile @@ -138,21 +138,11 @@ for i in 1 2 3; do done sed -f $sedrules <<EOF -BUILDLINK_DEPTH:=${gap}\${BUILDLINK_DEPTH}+ -${PKGUPPER}_BUILDLINK3_MK:= \${${PKGUPPER}_BUILDLINK3_MK}+ -EOF - -sed -f $sedrules <<EOF +BUILDLINK_TREE+= $PKGNOVER -.if \${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= ${PKGNOVER} -.endif +.if !defined(${PKGUPPER}_BUILDLINK3_MK) +${PKGUPPER}_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= \${BUILDLINK_PACKAGES:N${PKGNOVER}} -BUILDLINK_PACKAGES+= $PKGNOVER -BUILDLINK_ORDER:= \${BUILDLINK_ORDER} \${BUILDLINK_DEPTH}$PKGNOVER - -.if \${${PKGUPPER}_BUILDLINK3_MK} == "+" EOF sed -f $sedrules <<EOF @@ -169,10 +159,6 @@ if [ $CREATEPLSUBST = "true" ]; then echo "" fi -sed -f $sedrules <<EOF -.endif # ${PKGUPPER}_BUILDLINK3_MK -EOF - ## ## buildlinked dependencies ## @@ -192,8 +178,9 @@ for i in $makefile $commons ; do done sed -f $sedrules <<EOF +.endif # ${PKGUPPER}_BUILDLINK3_MK -BUILDLINK_DEPTH:=${gap}\${BUILDLINK_DEPTH:S/+\$//} +BUILDLINK_TREE+= -$PKGNOVER EOF rm -f $sedrules diff --git a/pkgtools/packagekit/buildlink3.mk b/pkgtools/packagekit/buildlink3.mk index 651abc90d3b..63ae2b2ae68 100644 --- a/pkgtools/packagekit/buildlink3.mk +++ b/pkgtools/packagekit/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/08 00:21:00 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:13 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PACKAGEKIT_BUILDLINK3_MK:= ${PACKAGEKIT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= packagekit -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= packagekit -.endif +.if !defined(PACKAGEKIT_BUILDLINK3_MK) +PACKAGEKIT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npackagekit} -BUILDLINK_PACKAGES+= packagekit -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}packagekit - -.if ${PACKAGEKIT_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.packagekit+= packagekit>=0.4.0 BUILDLINK_PKGSRCDIR.packagekit?= ../../pkgtools/packagekit -.endif # PACKAGEKIT_BUILDLINK3_MK .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" +.endif # PACKAGEKIT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -packagekit diff --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk index 4f2f17b866c..c53151c504c 100644 --- a/pkgtools/x11-links/buildlink3.mk +++ b/pkgtools/x11-links/buildlink3.mk @@ -1,23 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.20 2009/03/08 00:03:37 snj Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2009/03/20 19:25:13 joerg Exp $ # # Don't include this file manually! It will be included as necessary # by bsd.buildlink3.mk. -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -X11_LINKS_BUILDLINK3_MK:= ${X11_LINKS_BUILDLINK3_MK}+ +# x11-links is sorted first in mk/buildlink3/bsd.buildlink3.mk, +# so that symlinks created from it can be overriden by other packages. +# -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= x11-links -.endif +BUILDLINK_TREE+= x11-links -# x11-links must come first so that packages listed later can overwrite -# any symlinks created by buildlinking x11-links. -# -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nx11-links} -BUILDLINK_PACKAGES:= x11-links ${BUILDLINK_PACKAGES} -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}x11-links +.if !defined(X11_LINKS_BUILDLINK3_MK) +X11_LINKS_BUILDLINK3_MK:= -.if !empty(X11_LINKS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.43 BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links BUILDLINK_DEPMETHOD.x11-links?= build @@ -32,7 +26,6 @@ BUILDLINK_CONTENTS_FILTER.x11-links= \ # and ${BUILDLINK_X11_DIR}/lib. # BUILDLINK_FNAME_TRANSFORM.x11-links+= -e "s|/share/x11-links/|/|" +.endif # X11_LINKS_BUILDLINK3_MK -.endif # X11_LINKS_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -x11-links diff --git a/pkgtools/x11-links/xfree.mk b/pkgtools/x11-links/xfree.mk index ce9ed5e1836..22588b347f5 100644 --- a/pkgtools/x11-links/xfree.mk +++ b/pkgtools/x11-links/xfree.mk @@ -1,4 +1,4 @@ -# $NetBSD: xfree.mk,v 1.15 2006/12/15 20:33:00 joerg Exp $ +# $NetBSD: xfree.mk,v 1.16 2009/03/20 19:25:13 joerg Exp $ FILES_LIST= ${FILESDIR}/xfree @@ -18,14 +18,14 @@ FILES_LIST= ${FILESDIR}/xfree # Check if any headers and libraries for ${X11_MODULES} found in # ${X11BASE} actually belong to the base XFree86 or not. # -.for _pkg_ in ${BUILDLINK_PACKAGES:Nx11-links} +.for _pkg_ in ${BUILDLINK_TREE:N-*:Nx11-links:O:u} CHECK_BUILTIN.${_pkg_}:= yes USE_BUILTIN.${_pkg_}= yes . sinclude "${BUILDLINK_PKGSRCDIR.${_pkg_}}/builtin.mk" CHECK_BUILTIN.${_pkg_}:= no .endfor -.for _pkg_ in ${BUILDLINK_PACKAGES:Nx11-links} +.for _pkg_ in ${BUILDLINK_TREE:N-*:Nx11-links:O:u} IGNORE_PKG.${_pkg_}= yes . if (defined(IS_BUILTIN.${_pkg_}) && !empty(IS_BUILTIN.${_pkg_}:M[yY][eE][sS]) ) && \ exists(${FILESDIR}/xfree.${_pkg_}) diff --git a/pkgtools/x11-links/xorg.mk b/pkgtools/x11-links/xorg.mk index 9600b1917a0..0606645bc6f 100644 --- a/pkgtools/x11-links/xorg.mk +++ b/pkgtools/x11-links/xorg.mk @@ -1,4 +1,4 @@ -# $NetBSD: xorg.mk,v 1.14 2008/12/04 04:16:41 cube Exp $ +# $NetBSD: xorg.mk,v 1.15 2009/03/20 19:25:13 joerg Exp $ # # This is for X.org, but use "xfree" files also. @@ -76,14 +76,14 @@ FILES_LIST= ${FILESDIR}/xorg # ${X11BASE} actually belong to the base Xorg or not. # # XXX: maybe skip iconv and zlib too? -.for _pkg_ in ${BUILDLINK_PACKAGES:Nx11-links} +.for _pkg_ in ${BUILDLINK_TREE:N-*:Nx11-links:O:u} CHECK_BUILTIN.${_pkg_}:= yes USE_BUILTIN.${_pkg_}= yes . sinclude "${BUILDLINK_PKGSRCDIR.${_pkg_}}/builtin.mk" CHECK_BUILTIN.${_pkg_}:= no .endfor -.for _pkg_ in ${BUILDLINK_PACKAGES:Nx11-links} +.for _pkg_ in ${BUILDLINK_TREE:N-*:Nx11-links:O:u} IGNORE_PKG.${_pkg_}= yes . if defined(IS_BUILTIN.${_pkg_}) && !empty(IS_BUILTIN.${_pkg_}:M[yY][eE][sS]) . if exists(${FILESDIR}/xorg.${_pkg_}) diff --git a/print/a2ps/buildlink3.mk b/print/a2ps/buildlink3.mk index b960e22c42f..4d40bf26478 100644 --- a/print/a2ps/buildlink3.mk +++ b/print/a2ps/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:05 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:13 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -A2PS_BUILDLINK3_MK:= ${A2PS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= a2ps -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= a2ps -.endif +.if !defined(A2PS_BUILDLINK3_MK) +A2PS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Na2ps} -BUILDLINK_PACKAGES+= a2ps -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}a2ps - -.if !empty(A2PS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.a2ps+= a2ps>=4.13.0.2nb4 BUILDLINK_ABI_DEPENDS.a2ps?= a2ps>=4.13.0.2nb10 BUILDLINK_PKGSRCDIR.a2ps?= ../../print/a2ps -.endif # A2PS_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" +.endif # A2PS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -a2ps diff --git a/print/auctex/buildlink3.mk b/print/auctex/buildlink3.mk index 1a878e06050..44c2d932427 100644 --- a/print/auctex/buildlink3.mk +++ b/print/auctex/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 04:44:04 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:13 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -AUCTEX_BUILDLINK3_MK:= ${AUCTEX_BUILDLINK3_MK}+ +BUILDLINK_TREE+= auctex -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= auctex -.endif +.if !defined(AUCTEX_BUILDLINK3_MK) +AUCTEX_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nauctex} -BUILDLINK_PACKAGES+= auctex -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}auctex - -.if ${AUCTEX_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.auctex+= ${EMACS_PKGNAME_PREFIX}auctex>=11 BUILDLINK_PKGSRCDIR.auctex?= ../../print/auctex -.endif # AUCTEX_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.auctex= ${EGREP} '.*\.el$$|.*\.elc$$' +.endif # AUCTEX_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -auctex diff --git a/print/cups/buildlink3.mk b/print/cups/buildlink3.mk index 9ae87773968..332e94aeb7f 100644 --- a/print/cups/buildlink3.mk +++ b/print/cups/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.20 2008/03/01 14:14:20 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2009/03/20 19:25:14 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CUPS_BUILDLINK3_MK:= ${CUPS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= cups -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= cups -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncups} -BUILDLINK_PACKAGES+= cups -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cups +.if !defined(CUPS_BUILDLINK3_MK) +CUPS_BUILDLINK3_MK:= -.if !empty(CUPS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.cups+= cups>=1.1.19nb3 BUILDLINK_ABI_DEPENDS.cups+= cups>=1.2.12nb3 BUILDLINK_PKGSRCDIR.cups?= ../../print/cups -.endif # CUPS_BUILDLINK3_MK pkgbase := cups .include "../../mk/pkg-build-options.mk" @@ -27,5 +19,6 @@ pkgbase := cups .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" +.endif # CUPS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -cups diff --git a/print/evince/buildlink3.mk b/print/evince/buildlink3.mk index 5e6273a5b3d..9b3e4545b16 100644 --- a/print/evince/buildlink3.mk +++ b/print/evince/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1 2009/03/18 12:54:14 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:14 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EVINCE_BUILDLINK3_MK:= ${EVINCE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= evince -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= evince -.endif +.if !defined(EVINCE_BUILDLINK3_MK) +EVINCE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nevince} -BUILDLINK_PACKAGES+= evince -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}evince - -.if ${EVINCE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.evince+= evince>=2.26.0 BUILDLINK_PKGSRCDIR.evince?= ../../print/evince -.endif # EVINCE_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # EVINCE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -evince diff --git a/print/ghostscript/buildlink3.mk b/print/ghostscript/buildlink3.mk index 2003a0c9a7a..251f45d5203 100644 --- a/print/ghostscript/buildlink3.mk +++ b/print/ghostscript/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1 2008/09/03 21:31:12 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:14 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GHOSTSCRIPT_BUILDLINK3_MK:= ${GHOSTSCRIPT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ghostscript -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= ghostscript -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nghostscript} -BUILDLINK_PACKAGES+= ghostscript -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ghostscript +.if !defined(GHOSTSCRIPT_BUILDLINK3_MK) +GHOSTSCRIPT_BUILDLINK3_MK:= -.if ${GHOSTSCRIPT_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.ghostscript+= ghostscript>=8.63nb1 BUILDLINK_PKGSRCDIR.ghostscript?= ../../print/ghostscript -.endif # GHOSTSCRIPT_BUILDLINK3_MK .include "../../graphics/png/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" @@ -35,5 +27,6 @@ pkgbase := ghostscript .include "../../x11/libXt/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .endif +.endif # GHOSTSCRIPT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ghostscript diff --git a/print/gimp-print-lib/buildlink3.mk b/print/gimp-print-lib/buildlink3.mk index f3a44034402..0e94532fec8 100644 --- a/print/gimp-print-lib/buildlink3.mk +++ b/print/gimp-print-lib/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:05 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:14 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GIMP_PRINT_LIB_BUILDLINK3_MK:= ${GIMP_PRINT_LIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gimp-print-lib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gimp-print-lib -.endif +.if !defined(GIMP_PRINT_LIB_BUILDLINK3_MK) +GIMP_PRINT_LIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngimp-print-lib} -BUILDLINK_PACKAGES+= gimp-print-lib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gimp-print-lib - -.if !empty(GIMP_PRINT_LIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gimp-print-lib+= gimp-print-lib>=4.2.5nb1 BUILDLINK_ABI_DEPENDS.gimp-print-lib+= gimp-print-lib>=4.2.7nb2 BUILDLINK_PKGSRCDIR.gimp-print-lib?= ../../print/gimp-print-lib -.endif # GIMP_PRINT_LIB_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" +.endif # GIMP_PRINT_LIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gimp-print-lib diff --git a/print/gutenprint-lib/buildlink3.mk b/print/gutenprint-lib/buildlink3.mk index b520dc6ea9e..4f992005616 100644 --- a/print/gutenprint-lib/buildlink3.mk +++ b/print/gutenprint-lib/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/01/11 12:39:47 gdt Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:14 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GUTENPRINT_LIB_BUILDLINK3_MK:= ${GUTENPRINT_LIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gutenprint-lib -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= gutenprint-lib -.endif +.if !defined(GUTENPRINT_LIB_BUILDLINK3_MK) +GUTENPRINT_LIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngutenprint-lib} -BUILDLINK_PACKAGES+= gutenprint-lib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gutenprint-lib - -.if ${GUTENPRINT_LIB_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.gutenprint-lib+= gutenprint-lib>=5.0.1 BUILDLINK_PKGSRCDIR.gutenprint-lib?= ../../print/gutenprint-lib -.endif # GUTENPRINT_LIB_BUILDLINK3_MK +.endif # GUTENPRINT_LIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gutenprint-lib diff --git a/print/ijs/buildlink3.mk b/print/ijs/buildlink3.mk index 9e92f313e11..313d7bf5214 100644 --- a/print/ijs/buildlink3.mk +++ b/print/ijs/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:05 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:14 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -IJS_BUILDLINK3_MK:= ${IJS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ijs -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ijs -.endif +.if !defined(IJS_BUILDLINK3_MK) +IJS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nijs} -BUILDLINK_PACKAGES+= ijs -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ijs - -.if !empty(IJS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ijs+= ijs>=0.34 BUILDLINK_ABI_DEPENDS.ijs+= ijs>=0.34nb2 BUILDLINK_PKGSRCDIR.ijs?= ../../print/ijs -.endif # IJS_BUILDLINK3_MK +.endif # IJS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ijs diff --git a/print/ja-vflib-lib/buildlink3.mk b/print/ja-vflib-lib/buildlink3.mk index 4a58a10d241..bfd8d3d0251 100644 --- a/print/ja-vflib-lib/buildlink3.mk +++ b/print/ja-vflib-lib/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:05 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:14 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -JA_VFLIB_LIB_BUILDLINK3_MK:= ${JA_VFLIB_LIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ja-vflib-lib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ja-vflib-lib -.endif +.if !defined(JA_VFLIB_LIB_BUILDLINK3_MK) +JA_VFLIB_LIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nja-vflib-lib} -BUILDLINK_PACKAGES+= ja-vflib-lib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ja-vflib-lib - -.if !empty(JA_VFLIB_LIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ja-vflib-lib+= ja-vflib-lib>=2.24.2 BUILDLINK_ABI_DEPENDS.ja-vflib-lib+= ja-vflib-lib>=2.24.2nb2 BUILDLINK_PKGSRCDIR.ja-vflib-lib?= ../../print/ja-vflib-lib -.endif # JA_VFLIB_LIB_BUILDLINK3_MK .include "../../graphics/freetype-lib/buildlink3.mk" +.endif # JA_VFLIB_LIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ja-vflib-lib diff --git a/print/kpathsea/buildlink3.mk b/print/kpathsea/buildlink3.mk index dd72c5a546c..f7fc4f13cb5 100644 --- a/print/kpathsea/buildlink3.mk +++ b/print/kpathsea/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/03 22:12:42 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:14 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -KPATHSEA_BUILDLINK3_MK:= ${KPATHSEA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= kpathsea -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= kpathsea -.endif +.if !defined(KPATHSEA_BUILDLINK3_MK) +KPATHSEA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkpathsea} -BUILDLINK_PACKAGES+= kpathsea -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kpathsea - -.if ${KPATHSEA_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.kpathsea+= kpathsea>=3.5.7 BUILDLINK_PKGSRCDIR.kpathsea?= ../../print/kpathsea BUILDLINK_FILES.kpathsea+= bin/kpsewhich -.endif # KPATHSEA_BUILDLINK3_MK +.endif # KPATHSEA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -kpathsea diff --git a/print/libgnomecups/buildlink3.mk b/print/libgnomecups/buildlink3.mk index d0683e9339a..ded2682d912 100644 --- a/print/libgnomecups/buildlink3.mk +++ b/print/libgnomecups/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.11 2008/01/18 05:08:55 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:14 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGNOMECUPS_BUILDLINK3_MK:= ${LIBGNOMECUPS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgnomecups -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libgnomecups -.endif +.if !defined(LIBGNOMECUPS_BUILDLINK3_MK) +LIBGNOMECUPS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomecups} -BUILDLINK_PACKAGES+= libgnomecups -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgnomecups - -.if !empty(LIBGNOMECUPS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libgnomecups+= libgnomecups>=0.2.0 BUILDLINK_ABI_DEPENDS.libgnomecups?= libgnomecups>=0.2.2nb5 BUILDLINK_PKGSRCDIR.libgnomecups?= ../../print/libgnomecups -.endif # LIBGNOMECUPS_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../print/cups/buildlink3.mk" +.endif # LIBGNOMECUPS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgnomecups diff --git a/print/libgnomeprint/buildlink3.mk b/print/libgnomeprint/buildlink3.mk index df78a08ecc6..04f8bf6ab88 100644 --- a/print/libgnomeprint/buildlink3.mk +++ b/print/libgnomeprint/buildlink3.mk @@ -1,23 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.18 2008/01/18 05:08:55 tnn Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGNOMEPRINT_BUILDLINK3_MK:= ${LIBGNOMEPRINT_BUILDLINK3_MK}+ +# $NetBSD: buildlink3.mk,v 1.19 2009/03/20 19:25:14 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libgnomeprint -.endif +BUILDLINK_TREE+= libgnomeprint -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomeprint} -BUILDLINK_PACKAGES+= libgnomeprint -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgnomeprint +.if !defined(LIBGNOMEPRINT_BUILDLINK3_MK) +LIBGNOMEPRINT_BUILDLINK3_MK:= -.if !empty(LIBGNOMEPRINT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libgnomeprint+= libgnomeprint>=2.8.0 BUILDLINK_ABI_DEPENDS.libgnomeprint+= libgnomeprint>=2.18.2nb2 BUILDLINK_PKGSRCDIR.libgnomeprint?= ../../print/libgnomeprint -.endif # LIBGNOMEPRINT_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" @@ -32,5 +24,6 @@ pkgbase := libgnomeprint .if !empty(PKG_BUILD_OPTIONS.libgnomeprint:Mcups) . include "../../print/libgnomecups/buildlink3.mk" .endif +.endif # LIBGNOMEPRINT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgnomeprint diff --git a/print/libgnomeprintui/buildlink3.mk b/print/libgnomeprintui/buildlink3.mk index 6e892a90063..4a24e0bfaf0 100644 --- a/print/libgnomeprintui/buildlink3.mk +++ b/print/libgnomeprintui/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.15 2008/01/18 05:08:55 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:25:15 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGNOMEPRINTUI_BUILDLINK3_MK:= ${LIBGNOMEPRINTUI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgnomeprintui -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libgnomeprintui -.endif +.if !defined(LIBGNOMEPRINTUI_BUILDLINK3_MK) +LIBGNOMEPRINTUI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomeprintui} -BUILDLINK_PACKAGES+= libgnomeprintui -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgnomeprintui - -.if !empty(LIBGNOMEPRINTUI_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libgnomeprintui+= libgnomeprintui>=2.8.0 BUILDLINK_ABI_DEPENDS.libgnomeprintui+= libgnomeprintui>=2.18.1nb2 BUILDLINK_PKGSRCDIR.libgnomeprintui?= ../../print/libgnomeprintui -.endif # LIBGNOMEPRINTUI_BUILDLINK3_MK .include "../../devel/GConf/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -27,5 +19,6 @@ BUILDLINK_PKGSRCDIR.libgnomeprintui?= ../../print/libgnomeprintui .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../print/libgnomeprint/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.endif # LIBGNOMEPRINTUI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgnomeprintui diff --git a/print/libpaper/buildlink3.mk b/print/libpaper/buildlink3.mk index c756d28f2fd..34b72f67163 100644 --- a/print/libpaper/buildlink3.mk +++ b/print/libpaper/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/09/04 20:10:12 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:15 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBPAPER_BUILDLINK3_MK:= ${LIBPAPER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libpaper -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libpaper -.endif +.if !defined(LIBPAPER_BUILDLINK3_MK) +LIBPAPER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibpaper} -BUILDLINK_PACKAGES+= libpaper -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libpaper - -.if ${LIBPAPER_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libpaper+= libpaper>=1.1.22 BUILDLINK_PKGSRCDIR.libpaper?= ../../print/libpaper -.endif # LIBPAPER_BUILDLINK3_MK +.endif # LIBPAPER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libpaper diff --git a/print/libspectre/buildlink3.mk b/print/libspectre/buildlink3.mk index 26b3d584be8..d53ec248aee 100644 --- a/print/libspectre/buildlink3.mk +++ b/print/libspectre/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/09/03 21:36:46 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:15 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSPECTRE_BUILDLINK3_MK:= ${LIBSPECTRE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libspectre -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libspectre -.endif +.if !defined(LIBSPECTRE_BUILDLINK3_MK) +LIBSPECTRE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibspectre} -BUILDLINK_PACKAGES+= libspectre -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libspectre - -.if ${LIBSPECTRE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libspectre+= libspectre>=0.2.1 BUILDLINK_PKGSRCDIR.libspectre?= ../../print/libspectre -.endif # LIBSPECTRE_BUILDLINK3_MK .include "../../print/ghostscript/buildlink3.mk" +.endif # LIBSPECTRE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libspectre diff --git a/print/pdflib-lite/buildlink3.mk b/print/pdflib-lite/buildlink3.mk index 0dfe9009819..2ed8ad7b250 100644 --- a/print/pdflib-lite/buildlink3.mk +++ b/print/pdflib-lite/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/05/15 20:06:03 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:15 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PDFLIB_LITE_BUILDLINK3_MK:= ${PDFLIB_LITE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pdflib-lite -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= pdflib-lite -.endif +.if !defined(PDFLIB_LITE_BUILDLINK3_MK) +PDFLIB_LITE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npdflib-lite} -BUILDLINK_PACKAGES+= pdflib-lite -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pdflib-lite - -.if ${PDFLIB_LITE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.pdflib-lite+= pdflib-lite>=7.0.3 BUILDLINK_PKGSRCDIR.pdflib-lite?= ../../print/pdflib-lite -.endif # PDFLIB_LITE_BUILDLINK3_MK +.endif # PDFLIB_LITE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pdflib-lite diff --git a/print/pdflib/buildlink3.mk b/print/pdflib/buildlink3.mk index b1a1c128241..c3cc61b61fb 100644 --- a/print/pdflib/buildlink3.mk +++ b/print/pdflib/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:05 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:15 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PDFLIB_BUILDLINK3_MK:= ${PDFLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pdflib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pdflib -.endif +.if !defined(PDFLIB_BUILDLINK3_MK) +PDFLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npdflib} -BUILDLINK_PACKAGES+= pdflib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pdflib - -.if !empty(PDFLIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.pdflib+= pdflib>=4.0.3nb2 BUILDLINK_ABI_DEPENDS.pdflib+= pdflib>=4.0.3nb7 BUILDLINK_PKGSRCDIR.pdflib?= ../../print/pdflib -.endif # PDFLIB_BUILDLINK3_MK .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" +.endif # PDFLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pdflib diff --git a/print/poppler-glib/buildlink3.mk b/print/poppler-glib/buildlink3.mk index 7a95e830904..774b294bac5 100644 --- a/print/poppler-glib/buildlink3.mk +++ b/print/poppler-glib/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/01/06 22:58:49 reed Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:15 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -POPPLER_GLIB_BUILDLINK3_MK:= ${POPPLER_GLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= poppler-glib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= poppler-glib -.endif +.if !defined(POPPLER_GLIB_BUILDLINK3_MK) +POPPLER_GLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npoppler-glib} -BUILDLINK_PACKAGES+= poppler-glib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}poppler-glib - -.if !empty(POPPLER_GLIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.poppler-glib+= poppler-glib>=0.5.1 BUILDLINK_ABI_DEPENDS.poppler-glib+= poppler-glib>=0.10.0 BUILDLINK_PKGSRCDIR.poppler-glib?= ../../print/poppler-glib -.endif # POPPLER_GLIB_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" .include "../../print/poppler/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # POPPLER_GLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -poppler-glib diff --git a/print/poppler-includes/buildlink3.mk b/print/poppler-includes/buildlink3.mk index 9c4c3dfbd1d..bd0c6ed5596 100644 --- a/print/poppler-includes/buildlink3.mk +++ b/print/poppler-includes/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/20 14:32:19 dillo Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:15 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -POPPLER_INCLUDES_BUILDLINK3_MK:= ${POPPLER_INCLUDES_BUILDLINK3_MK}+ +BUILDLINK_TREE+= poppler-includes -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= poppler-includes -.endif +.if !defined(POPPLER_INCLUDES_BUILDLINK3_MK) +POPPLER_INCLUDES_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npoppler-includes} -BUILDLINK_PACKAGES+= poppler-includes -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}poppler-includes - -.if !empty(POPPLER_INCLUDES_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.poppler-includes+= poppler-includes>=0.10.0 BUILDLINK_PKGSRCDIR.poppler-includes?= ../../print/poppler-includes -.endif # POPPLER_INCLUDES_BUILDLINK3_MK +.endif # POPPLER_INCLUDES_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -poppler-includes diff --git a/print/poppler-qt/buildlink3.mk b/print/poppler-qt/buildlink3.mk index 3f90380ae71..81387994a85 100644 --- a/print/poppler-qt/buildlink3.mk +++ b/print/poppler-qt/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:05 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:15 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -POPPLER_QT_BUILDLINK3_MK:= ${POPPLER_QT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= poppler-qt -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= poppler-qt -.endif +.if !defined(POPPLER_QT_BUILDLINK3_MK) +POPPLER_QT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npoppler-qt} -BUILDLINK_PACKAGES+= poppler-qt -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}poppler-qt - -.if !empty(POPPLER_QT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.poppler-qt+= poppler-qt>=0.4.5nb1 BUILDLINK_PKGSRCDIR.poppler-qt?= ../../print/poppler-qt -.endif # POPPLER_QT_BUILDLINK3_MK .include "../../print/poppler/buildlink3.mk" +.endif # POPPLER_QT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -poppler-qt diff --git a/print/poppler-qt4/buildlink3.mk b/print/poppler-qt4/buildlink3.mk index 825de32eea8..f9639ebc467 100644 --- a/print/poppler-qt4/buildlink3.mk +++ b/print/poppler-qt4/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/12/12 01:29:22 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:15 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -POPPLER_QT4_BUILDLINK3_MK:= ${POPPLER_QT4_BUILDLINK3_MK}+ +BUILDLINK_TREE+= poppler-qt4 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= poppler-qt4 -.endif +.if !defined(POPPLER_QT4_BUILDLINK3_MK) +POPPLER_QT4_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npoppler-qt4} -BUILDLINK_PACKAGES+= poppler-qt4 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}poppler-qt4 - -.if ${POPPLER_QT4_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.poppler-qt4+= poppler-qt4>=0.6.1 BUILDLINK_PKGSRCDIR.poppler-qt4?= ../../print/poppler-qt4 -.endif # POPPLER_QT4_BUILDLINK3_MK .include "../../print/poppler/buildlink3.mk" +.endif # POPPLER_QT4_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -poppler-qt4 diff --git a/print/poppler/buildlink3.mk b/print/poppler/buildlink3.mk index fd032e6fd26..05938ccf642 100644 --- a/print/poppler/buildlink3.mk +++ b/print/poppler/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.14 2009/02/12 20:55:07 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:15 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -POPPLER_BUILDLINK3_MK:= ${POPPLER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= poppler -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= poppler -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npoppler} -BUILDLINK_PACKAGES+= poppler -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}poppler +.if !defined(POPPLER_BUILDLINK3_MK) +POPPLER_BUILDLINK3_MK:= -.if !empty(POPPLER_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.poppler+= poppler>=0.5.1 BUILDLINK_ABI_DEPENDS.poppler+= poppler>=0.10.0 BUILDLINK_PKGSRCDIR.poppler?= ../../print/poppler @@ -19,7 +12,6 @@ BUILDLINK_PKGSRCDIR.poppler?= ../../print/poppler PRINT_PLIST_AWK+= /^@exec ..MKDIR. %D\/include\/poppler$$/ { next; } PRINT_PLIST_AWK+= /^@dirrm include\/poppler$$/ \ { print "@comment in poppler: " $$0; next; } -.endif # POPPLER_BUILDLINK3_MK pkgbase := poppler .include "../../mk/pkg-build-options.mk" @@ -29,5 +21,6 @@ pkgbase := poppler .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" +.endif # POPPLER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -poppler diff --git a/print/pslib/buildlink3.mk b/print/pslib/buildlink3.mk index cbd82b22355..f5c5ce558d8 100644 --- a/print/pslib/buildlink3.mk +++ b/print/pslib/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:05 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:16 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PSLIB_BUILDLINK3_MK:= ${PSLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pslib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pslib -.endif +.if !defined(PSLIB_BUILDLINK3_MK) +PSLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npslib} -BUILDLINK_PACKAGES+= pslib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pslib - -.if !empty(PSLIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.pslib+= pslib>=0.2.6 BUILDLINK_ABI_DEPENDS.pslib?= pslib>=0.2.6nb3 BUILDLINK_PKGSRCDIR.pslib?= ../../print/pslib -.endif # PSLIB_BUILDLINK3_MK +.endif # PSLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pslib diff --git a/print/py-cups/buildlink3.mk b/print/py-cups/buildlink3.mk index b3808e3a2f5..2e551d2a63f 100644 --- a/print/py-cups/buildlink3.mk +++ b/print/py-cups/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/10 20:13:29 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:16 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_CUPS_BUILDLINK3_MK:= ${PY_CUPS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= py-cups -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= py-cups -.endif +.if !defined(PY_CUPS_BUILDLINK3_MK) +PY_CUPS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-cups} -BUILDLINK_PACKAGES+= py-cups -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-cups - -.if ${PY_CUPS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.py-cups+= ${PYPKGPREFIX}-cups>=1.9.44 BUILDLINK_PKGSRCDIR.py-cups?= ../../print/py-cups -.endif # PY_CUPS_BUILDLINK3_MK #.include "../../print/cups/buildlink3.mk" +.endif # PY_CUPS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -py-cups diff --git a/print/ruby-gnome2-gnomeprint/buildlink3.mk b/print/ruby-gnome2-gnomeprint/buildlink3.mk index e8feca43b71..174305f2d5a 100644 --- a/print/ruby-gnome2-gnomeprint/buildlink3.mk +++ b/print/ruby-gnome2-gnomeprint/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/01/19 04:12:55 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:16 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -RUBY_GNOME2_GNOMEPRINT_BUILDLINK3_MK:= ${RUBY_GNOME2_GNOMEPRINT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ruby-gnome2-gnomeprint -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= ruby-gnome2-gnomeprint -.endif +.if !defined(RUBY_GNOME2_GNOMEPRINT_BUILDLINK3_MK) +RUBY_GNOME2_GNOMEPRINT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nruby-gnome2-gnomeprint} -BUILDLINK_PACKAGES+= ruby-gnome2-gnomeprint -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ruby-gnome2-gnomeprint - -.if ${RUBY_GNOME2_GNOMEPRINT_BUILDLINK3_MK} == "+" .include "../../lang/ruby/rubyversion.mk" BUILDLINK_API_DEPENDS.ruby-gnome2-gnomeprint+= ${RUBY_PKGPREFIX}-gnome2-gnomeprint>=0.17.0 BUILDLINK_PKGSRCDIR.ruby-gnome2-gnomeprint?= ../../print/ruby-gnome2-gnomeprint -.endif # RUBY_GNOME2_GNOMEPRINT_BUILDLINK3_MK +.endif # RUBY_GNOME2_GNOMEPRINT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ruby-gnome2-gnomeprint diff --git a/print/teTeX3-bin/buildlink3.mk b/print/teTeX3-bin/buildlink3.mk index cbe5d90aaa6..c704e51bf4b 100644 --- a/print/teTeX3-bin/buildlink3.mk +++ b/print/teTeX3-bin/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.12 2008/12/07 06:40:47 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:16 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TETEX_BIN_BUILDLINK3_MK:= ${TETEX_BIN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= teTeX-bin -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= teTeX-bin -.endif +.if !defined(TETEX_BIN_BUILDLINK3_MK) +TETEX_BIN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NteTeX-bin} -BUILDLINK_PACKAGES+= teTeX-bin -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}teTeX-bin - -.if !empty(TETEX_BIN_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.teTeX-bin+= teTeX-bin>=3.0nb2 BUILDLINK_ABI_DEPENDS.teTeX-bin?= teTeX-bin>=3.0nb7 BUILDLINK_PKGSRCDIR.teTeX-bin?= ../../print/teTeX3-bin -.endif # TETEX_BIN_BUILDLINK3_MK TEXMFDIST= ${PREFIX}/share/texmf-dist PLIST_SUBST+= TEXMFDIST=${TEXMFDIST:C|^${PREFIX}/||} @@ -27,5 +19,6 @@ PKG_TEXMFPREFIX= ${PREFIX}/share/texmf PKG_LOCALTEXMFPREFIX= ${PREFIX}/share/texmf-local PLIST_SUBST+= PKG_TEXMFPREFIX=${PKG_TEXMFPREFIX:C|^${PREFIX}/||} PLIST_SUBST+= PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX:C|^${PREFIX}/||} +.endif # TETEX_BIN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -teTeX-bin diff --git a/print/transfig/buildlink3.mk b/print/transfig/buildlink3.mk index 0d1f051c3df..413e8e005ed 100644 --- a/print/transfig/buildlink3.mk +++ b/print/transfig/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/12/15 20:33:00 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:16 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TRANSFIG_BUILDLINK3_MK:= ${TRANSFIG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= transfig -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= transfig -.endif +.if !defined(TRANSFIG_BUILDLINK3_MK) +TRANSFIG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntransfig} -BUILDLINK_PACKAGES+= transfig -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}transfig - -.if !empty(TRANSFIG_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.transfig+= transfig>=3.2.4 BUILDLINK_ABI_DEPENDS.transfig?= transfig>=3.2.5alpha7nb2 BUILDLINK_PKGSRCDIR.transfig?= ../../print/transfig -.endif # TRANSFIG_BUILDLINK3_MK .include "../../graphics/png/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.endif # TRANSFIG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -transfig diff --git a/print/xfce4-print/buildlink3.mk b/print/xfce4-print/buildlink3.mk index c2d12b6d9aa..382011ac57b 100644 --- a/print/xfce4-print/buildlink3.mk +++ b/print/xfce4-print/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.24 2008/12/18 16:46:29 hira Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2009/03/20 19:25:16 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_PRINT_BUILDLINK3_MK:= ${XFCE4_PRINT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-print -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-print -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-print} -BUILDLINK_PACKAGES+= xfce4-print -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-print +.if !defined(XFCE4_PRINT_BUILDLINK3_MK) +XFCE4_PRINT_BUILDLINK3_MK:= -.if ${XFCE4_PRINT_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-print+= xfce4-print>=4.4.3nb1 BUILDLINK_ABI_DEPENDS.xfce4-print?= xfce4-print>=4.4.3nb1 BUILDLINK_PKGSRCDIR.xfce4-print?= ../../print/xfce4-print -.endif # XFCE4_PRINT_BUILDLINK3_MK .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../print/a2ps/buildlink3.mk" @@ -29,5 +21,6 @@ pkgbase := xfce4-print .if !empty(PKG_BUILD_OPTIONS.xfce4-print:Mcups) . include "../../print/cups/buildlink3.mk" .endif +.endif # XFCE4_PRINT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-print diff --git a/security/PAM/buildlink3.mk b/security/PAM/buildlink3.mk index 5aaf4b1a87e..0eae66d6ff0 100644 --- a/security/PAM/buildlink3.mk +++ b/security/PAM/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.24 2006/07/08 23:11:05 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2009/03/20 19:25:16 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LINUX_PAM_BUILDLINK3_MK:= ${LINUX_PAM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= linux-pam -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= linux-pam -.endif +.if !defined(LINUX_PAM_BUILDLINK3_MK) +LINUX_PAM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlinux-pam} -BUILDLINK_PACKAGES+= linux-pam -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}linux-pam - -.if !empty(LINUX_PAM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.linux-pam+= PAM>=0.75 BUILDLINK_ABI_DEPENDS.linux-pam+= PAM>=0.77nb5 BUILDLINK_PKGSRCDIR.linux-pam?= ../../security/PAM -.endif # LINUX_PAM_BUILDLINK3_MK .include "../../mk/dlopen.buildlink3.mk" +.endif # LINUX_PAM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -linux-pam diff --git a/security/beecrypt/buildlink3.mk b/security/beecrypt/buildlink3.mk index fc5618fc335..5a3dae4b0a4 100644 --- a/security/beecrypt/buildlink3.mk +++ b/security/beecrypt/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:05 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:16 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BEECRYPT_BUILDLINK3_MK:= ${BEECRYPT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= beecrypt -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= beecrypt -.endif +.if !defined(BEECRYPT_BUILDLINK3_MK) +BEECRYPT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbeecrypt} -BUILDLINK_PACKAGES+= beecrypt -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}beecrypt - -.if !empty(BEECRYPT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.beecrypt+= beecrypt>=3.0.0 BUILDLINK_ABI_DEPENDS.beecrypt+= beecrypt>=3.0.0nb1 BUILDLINK_PKGSRCDIR.beecrypt?= ../../security/beecrypt -.endif # BEECRYPT_BUILDLINK3_MK +.endif # BEECRYPT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -beecrypt diff --git a/security/botan/buildlink3.mk b/security/botan/buildlink3.mk index 792599a4133..c3263fd7301 100644 --- a/security/botan/buildlink3.mk +++ b/security/botan/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:06 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:16 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BOTAN_BUILDLINK3_MK:= ${BOTAN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= botan -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= botan -.endif +.if !defined(BOTAN_BUILDLINK3_MK) +BOTAN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbotan} -BUILDLINK_PACKAGES+= botan -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}botan - -.if !empty(BOTAN_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.botan+= botan>=1.4.11 BUILDLINK_PKGSRCDIR.botan?= ../../security/botan -.endif # BOTAN_BUILDLINK3_MK +.endif # BOTAN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -botan diff --git a/security/ccid/buildlink3.mk b/security/ccid/buildlink3.mk index 4f842494b59..3f4f7c76f99 100644 --- a/security/ccid/buildlink3.mk +++ b/security/ccid/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/03/04 15:52:15 shannonjr Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:16 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CCID_BUILDLINK3_MK:= ${CCID_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ccid -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= ccid -.endif +.if !defined(CCID_BUILDLINK3_MK) +CCID_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nccid} -BUILDLINK_PACKAGES+= ccid -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ccid - -.if ${CCID_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.ccid+= ccid>=1.3.2 BUILDLINK_PKGSRCDIR.ccid?= ../../security/ccid -.endif # CCID_BUILDLINK3_MK .include "../../security/pcsc-lite/buildlink3.mk" +.endif # CCID_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ccid diff --git a/security/courier-authlib/buildlink3.mk b/security/courier-authlib/buildlink3.mk index af966e15b58..40c0e9e9272 100644 --- a/security/courier-authlib/buildlink3.mk +++ b/security/courier-authlib/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:06 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:16 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -COURIER_AUTHLIB_BUILDLINK3_MK:= ${COURIER_AUTHLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= courier-authlib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= courier-authlib -.endif +.if !defined(COURIER_AUTHLIB_BUILDLINK3_MK) +COURIER_AUTHLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncourier-authlib} -BUILDLINK_PACKAGES+= courier-authlib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}courier-authlib - -.if !empty(COURIER_AUTHLIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.courier-authlib+= courier-authlib>=0.53 BUILDLINK_ABI_DEPENDS.courier-authlib?= courier-authlib>=0.58nb2 BUILDLINK_PKGSRCDIR.courier-authlib?= ../../security/courier-authlib -.endif # COURIER_AUTHLIB_BUILDLINK3_MK +.endif # COURIER_AUTHLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -courier-authlib diff --git a/security/crypto++/buildlink3.mk b/security/crypto++/buildlink3.mk index 4dc5333250c..046c3684afb 100644 --- a/security/crypto++/buildlink3.mk +++ b/security/crypto++/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.8 2007/12/01 04:17:50 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:17 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CRYPTOPP_BUILDLINK3_MK:= ${CRYPTOPP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= cryptopp -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= cryptopp -.endif +.if !defined(CRYPTOPP_BUILDLINK3_MK) +CRYPTOPP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncryptopp} -BUILDLINK_PACKAGES+= cryptopp -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cryptopp - -.if !empty(CRYPTOPP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.cryptopp+= cryptopp>=5.1 BUILDLINK_DEPMETHOD.cryptopp?= build BUILDLINK_ABI_DEPENDS.cryptopp?= cryptopp>=5.2.1nb1 BUILDLINK_PKGSRCDIR.cryptopp?= ../../security/crypto++ -.endif # CRYPTOPP_BUILDLINK3_MK +.endif # CRYPTOPP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -cryptopp diff --git a/security/cvm/buildlink3.mk b/security/cvm/buildlink3.mk index 7b65f1734b3..dd12e99acb2 100644 --- a/security/cvm/buildlink3.mk +++ b/security/cvm/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2008/04/13 06:51:19 schmonz Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:17 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CVM_BUILDLINK3_MK:= ${CVM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= cvm -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= cvm -.endif +.if !defined(CVM_BUILDLINK3_MK) +CVM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncvm} -BUILDLINK_PACKAGES+= cvm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cvm - -.if !empty(CVM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.cvm+= cvm>=0.90 BUILDLINK_PKGSRCDIR.cvm?= ../../security/cvm BUILDLINK_DEPMETHOD.cvm?= build -.endif # CVM_BUILDLINK3_MK +.endif # CVM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -cvm diff --git a/security/cyrus-sasl/buildlink3.mk b/security/cyrus-sasl/buildlink3.mk index a89968ced7d..44eaa9aabdb 100644 --- a/security/cyrus-sasl/buildlink3.mk +++ b/security/cyrus-sasl/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:06 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:17 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CYRUS_SASL_BUILDLINK3_MK:= ${CYRUS_SASL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= cyrus-sasl -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= cyrus-sasl -.endif +.if !defined(CYRUS_SASL_BUILDLINK3_MK) +CYRUS_SASL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncyrus-sasl} -BUILDLINK_PACKAGES+= cyrus-sasl -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cyrus-sasl - -.if !empty(CYRUS_SASL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.cyrus-sasl+= cyrus-sasl>=2.1.12 BUILDLINK_ABI_DEPENDS.cyrus-sasl?= cyrus-sasl>=2.1.20nb3 BUILDLINK_PKGSRCDIR.cyrus-sasl?= ../../security/cyrus-sasl -.endif # CYRUS_SASL_BUILDLINK3_MK # Cyrus SASL mechanisms are shared modules loaded via dlopen(). .include "../../mk/dlopen.buildlink3.mk" +.endif # CYRUS_SASL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -cyrus-sasl diff --git a/security/dirmngr/buildlink3.mk b/security/dirmngr/buildlink3.mk index c0359935108..c00ef3a7f05 100644 --- a/security/dirmngr/buildlink3.mk +++ b/security/dirmngr/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:06 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:17 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -DIRMNGR_BUILDLINK3_MK:= ${DIRMNGR_BUILDLINK3_MK}+ +BUILDLINK_TREE+= dirmngr -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= dirmngr -.endif +.if !defined(DIRMNGR_BUILDLINK3_MK) +DIRMNGR_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndirmngr} -BUILDLINK_PACKAGES+= dirmngr -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dirmngr - -.if !empty(DIRMNGR_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.dirmngr+= dirmngr>=0.9.3nb1 BUILDLINK_ABI_DEPENDS.dirmngr?= dirmngr>=0.9.3nb2 BUILDLINK_PKGSRCDIR.dirmngr?= ../../security/dirmngr -.endif # DIRMNGR_BUILDLINK3_MK +.endif # DIRMNGR_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -dirmngr diff --git a/security/gnome-keyring/buildlink3.mk b/security/gnome-keyring/buildlink3.mk index cff5e479b5d..50c258f5aec 100644 --- a/security/gnome-keyring/buildlink3.mk +++ b/security/gnome-keyring/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.11 2007/03/21 12:04:58 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:17 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNOME_KEYRING_BUILDLINK3_MK:= ${GNOME_KEYRING_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnome-keyring -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnome-keyring -.endif +.if !defined(GNOME_KEYRING_BUILDLINK3_MK) +GNOME_KEYRING_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-keyring} -BUILDLINK_PACKAGES+= gnome-keyring -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-keyring - -.if !empty(GNOME_KEYRING_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gnome-keyring+= gnome-keyring>=0.4.0 BUILDLINK_ABI_DEPENDS.gnome-keyring?= gnome-keyring>=0.8 BUILDLINK_PKGSRCDIR.gnome-keyring?= ../../security/gnome-keyring @@ -20,7 +13,6 @@ BUILDLINK_PKGSRCDIR.gnome-keyring?= ../../security/gnome-keyring .include "../../devel/glib2/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # GNOME_KEYRING_BUILDLINK3_MK -.endif # GNOME_KEYRING_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnome-keyring diff --git a/security/gnupg2/buildlink3.mk b/security/gnupg2/buildlink3.mk index 9cbc129f98a..d221cc38c8e 100644 --- a/security/gnupg2/buildlink3.mk +++ b/security/gnupg2/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.3 2007/11/08 21:06:33 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:17 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNUPG2_BUILDLINK3_MK:= ${GNUPG2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnupg2 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= gnupg2 -.endif +.if !defined(GNUPG2_BUILDLINK3_MK) +GNUPG2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnupg2} -BUILDLINK_PACKAGES+= gnupg2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnupg2 - -.if ${GNUPG2_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.gnupg2+= gnupg2>=2.0.0 BUILDLINK_PKGSRCDIR.gnupg2?= ../../security/gnupg2 BUILDLINK_PREFIX.gnupg2?= ${LOCALBASE} @@ -26,12 +19,12 @@ pkgbase:= libgcrypt PKGSRC_MAKE_ENV+= PKG_OPTIONS.libgcrypt+=idea . endif . endif -.endif # GNUPG2_BUILDLINK3_MK .include "../../security/libgpg-error/buildlink3.mk" .include "../../security/libgcrypt/buildlink3.mk" .include "../../security/libksba/buildlink3.mk" .include "../../security/pinentry/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.endif # GNUPG2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnupg2 diff --git a/security/gnutls/buildlink3.mk b/security/gnutls/buildlink3.mk index ecc9f9b509b..c166c25043e 100644 --- a/security/gnutls/buildlink3.mk +++ b/security/gnutls/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.21 2008/03/06 14:52:12 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:25:17 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNUTLS_BUILDLINK3_MK:= ${GNUTLS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnutls -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnutls -.endif +.if !defined(GNUTLS_BUILDLINK3_MK) +GNUTLS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnutls} -BUILDLINK_PACKAGES+= gnutls -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnutls - -.if !empty(GNUTLS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gnutls+= gnutls>=1.2.6 BUILDLINK_ABI_DEPENDS.gnutls+= gnutls>=2.2.2 BUILDLINK_PKGSRCDIR.gnutls?= ../../security/gnutls -.endif # GNUTLS_BUILDLINK3_MK .include "../../archivers/lzo/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -24,5 +16,6 @@ BUILDLINK_PKGSRCDIR.gnutls?= ../../security/gnutls .include "../../security/libgcrypt/buildlink3.mk" .include "../../security/libtasn1/buildlink3.mk" .include "../../security/opencdk/buildlink3.mk" +.endif # GNUTLS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnutls diff --git a/security/gpgme/buildlink3.mk b/security/gpgme/buildlink3.mk index 8982fb9030e..2cb25aefc85 100644 --- a/security/gpgme/buildlink3.mk +++ b/security/gpgme/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.16 2006/07/19 23:01:49 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:25:17 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GPGME_BUILDLINK3_MK:= ${GPGME_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gpgme -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= gpgme -.endif +.if !defined(GPGME_BUILDLINK3_MK) +GPGME_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngpgme} -BUILDLINK_PACKAGES+= gpgme -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gpgme - -.if ${GPGME_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.gpgme+= gpgme>=0.9.0 BUILDLINK_ABI_DEPENDS.gpgme+= gpgme>=1.0.3nb1 BUILDLINK_PKGSRCDIR.gpgme?= ../../security/gpgme -.endif # GPGME_BUILDLINK3_MK .include "../../security/libgpg-error/buildlink3.mk" .include "../../devel/librfuncs/buildlink3.mk" +.endif # GPGME_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gpgme diff --git a/security/gsasl/buildlink3.mk b/security/gsasl/buildlink3.mk index b94fe95929b..7426770d73f 100644 --- a/security/gsasl/buildlink3.mk +++ b/security/gsasl/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.12 2006/12/09 14:06:13 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:17 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GSASL_BUILDLINK3_MK:= ${GSASL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gsasl -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gsasl -.endif +.if !defined(GSASL_BUILDLINK3_MK) +GSASL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngsasl} -BUILDLINK_PACKAGES+= gsasl -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gsasl - -.if !empty(GSASL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gsasl+= gsasl>=0.2.15 BUILDLINK_PKGSRCDIR.gsasl?= ../../security/gsasl -.endif # GSASL_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libidn/buildlink3.mk" .include "../../devel/libntlm/buildlink3.mk" .include "../../security/libgcrypt/buildlink3.mk" .include "../../mk/krb5.buildlink3.mk" +.endif # GSASL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gsasl diff --git a/security/gss/buildlink3.mk b/security/gss/buildlink3.mk index ca536d436d0..83e79628de0 100644 --- a/security/gss/buildlink3.mk +++ b/security/gss/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:06 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:17 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GSS_BUILDLINK3_MK:= ${GSS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gss -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gss -.endif +.if !defined(GSS_BUILDLINK3_MK) +GSS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngss} -BUILDLINK_PACKAGES+= gss -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gss - -.if !empty(GSS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gss+= gss>=0.0.6nb1 BUILDLINK_ABI_DEPENDS.gss+= gss>=0.0.13nb1 BUILDLINK_PKGSRCDIR.gss?= ../../security/gss -.endif # GSS_BUILDLINK3_MK +.endif # GSS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gss diff --git a/security/heimdal/buildlink3.mk b/security/heimdal/buildlink3.mk index ecd3766230e..c7fa5f9c789 100644 --- a/security/heimdal/buildlink3.mk +++ b/security/heimdal/buildlink3.mk @@ -1,24 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.34 2008/02/28 08:14:41 jlam Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -HEIMDAL_BUILDLINK3_MK:= ${HEIMDAL_BUILDLINK3_MK}+ +# $NetBSD: buildlink3.mk,v 1.35 2009/03/20 19:25:18 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= heimdal -.endif +BUILDLINK_TREE+= heimdal -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nheimdal} -BUILDLINK_PACKAGES+= heimdal -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}heimdal +.if !defined(HEIMDAL_BUILDLINK3_MK) +HEIMDAL_BUILDLINK3_MK:= -.if !empty(HEIMDAL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.heimdal+= heimdal>=0.4e BUILDLINK_ABI_DEPENDS.heimdal+= heimdal>=1.1 BUILDLINK_PKGSRCDIR.heimdal?= ../../security/heimdal BUILDLINK_INCDIRS.heimdal?= include/krb5 -.endif # HEIMDAL_BUILDLINK3_MK pkgbase := heimdal .include "../../mk/pkg-build-options.mk" @@ -28,5 +20,6 @@ pkgbase := heimdal .endif .include "../../security/openssl/buildlink3.mk" .include "../../mk/bdb.buildlink3.mk" +.endif # HEIMDAL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -heimdal diff --git a/security/kth-krb4/buildlink3.mk b/security/kth-krb4/buildlink3.mk index cf6668d7a30..f3e9833f61c 100644 --- a/security/kth-krb4/buildlink3.mk +++ b/security/kth-krb4/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/09/07 08:46:20 wennmach Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:18 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -KTH_KRB4_BUILDLINK3_MK:= ${KTH_KRB4_BUILDLINK3_MK}+ +BUILDLINK_TREE+= kth-krb4 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= kth-krb4 -.endif +.if !defined(KTH_KRB4_BUILDLINK3_MK) +KTH_KRB4_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkth-krb4} -BUILDLINK_PACKAGES+= kth-krb4 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kth-krb4 - -.if !empty(KTH_KRB4_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.kth-krb4+= kth-krb4>=1.1.1 BUILDLINK_ABI_DEPENDS.kth-krb4+= kth-krb4>=1.2.1nb5 BUILDLINK_ABI_DEPENDS.kth-krb4?= kth-krb4>=1.2.1nb6 BUILDLINK_PKGSRCDIR.kth-krb4?= ../../security/kth-krb4 -.endif # KTH_KRB4_BUILDLINK3_MK +.endif # KTH_KRB4_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -kth-krb4 diff --git a/security/lasso/buildlink3.mk b/security/lasso/buildlink3.mk index 06ca01fb320..dca511c1b8e 100644 --- a/security/lasso/buildlink3.mk +++ b/security/lasso/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/03/02 16:46:01 manu Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:18 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LASSO_BUILDLINK3_MK:= ${LASSO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= lasso -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= lasso -.endif +.if !defined(LASSO_BUILDLINK3_MK) +LASSO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlasso} -BUILDLINK_PACKAGES+= lasso -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lasso - -.if ${LASSO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.lasso+= lasso>=2.2.1 BUILDLINK_PKGSRCDIR.lasso?= ../../security/lasso -.endif # LASSO_BUILDLINK3_MK .include "../../security/xmlsec1/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" +.endif # LASSO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -lasso diff --git a/security/libassuan/buildlink3.mk b/security/libassuan/buildlink3.mk index 7196caa7884..e709cc6007d 100644 --- a/security/libassuan/buildlink3.mk +++ b/security/libassuan/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/11/17 12:34:47 shannonjr Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:18 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBASSUAN_BUILDLINK3_MK:= ${LIBASSUAN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libassuan -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libassuan -.endif +.if !defined(LIBASSUAN_BUILDLINK3_MK) +LIBASSUAN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibassuan} -BUILDLINK_PACKAGES+= libassuan -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libassuan - -.if !empty(LIBASSUAN_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libassuan+= libassuan>=1.0.0 BUILDLINK_ABI_DEPENDS.libassuan?= libassuan>=1.0.0 BUILDLINK_PKGSRCDIR.libassuan?= ../../security/libassuan -.endif # LIBASSUAN_BUILDLINK3_MK .include "../../security/libgpg-error/buildlink3.mk" +.endif # LIBASSUAN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libassuan diff --git a/security/libcrack/buildlink3.mk b/security/libcrack/buildlink3.mk index 66b5c989349..f38d78f96cd 100644 --- a/security/libcrack/buildlink3.mk +++ b/security/libcrack/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:11:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:18 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBCRACK_BUILDLINK3_MK:= ${LIBCRACK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libcrack -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libcrack -.endif +.if !defined(LIBCRACK_BUILDLINK3_MK) +LIBCRACK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcrack} -BUILDLINK_PACKAGES+= libcrack -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libcrack - -.if !empty(LIBCRACK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libcrack+= libcrack>=2.7 BUILDLINK_ABI_DEPENDS.libcrack+= libcrack>=2.7nb1 BUILDLINK_PKGSRCDIR.libcrack?= ../../security/libcrack -.endif # LIBCRACK_BUILDLINK3_MK +.endif # LIBCRACK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libcrack diff --git a/security/libdes/buildlink3.mk b/security/libdes/buildlink3.mk index 35a58d67f48..8c0c6045ee2 100644 --- a/security/libdes/buildlink3.mk +++ b/security/libdes/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:18 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBDES_BUILDLINK3_MK:= ${LIBDES_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libdes -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libdes -.endif +.if !defined(LIBDES_BUILDLINK3_MK) +LIBDES_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdes} -BUILDLINK_PACKAGES+= libdes -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdes - -.if !empty(LIBDES_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libdes+= libdes>=4.04b BUILDLINK_PKGSRCDIR.libdes?= ../../security/libdes BUILDLINK_DEPMETHOD.libdes?= build -.endif # LIBDES_BUILDLINK3_MK +.endif # LIBDES_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libdes diff --git a/security/libfprint/buildlink3.mk b/security/libfprint/buildlink3.mk index c3456f39fa2..a3ebaf34bfa 100644 --- a/security/libfprint/buildlink3.mk +++ b/security/libfprint/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/02/26 21:51:06 plunky Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:18 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBFPRINT_BUILDLINK3_MK:= ${LIBFPRINT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libfprint -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libfprint -.endif +.if !defined(LIBFPRINT_BUILDLINK3_MK) +LIBFPRINT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibfprint} -BUILDLINK_PACKAGES+= libfprint -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libfprint - -.if !empty(LIBFPRINT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libfprint+= libfprint>=0.0.6 BUILDLINK_ABI_DEPENDS.libfprint+= libfprint>=0.0.6 BUILDLINK_PKGSRCDIR.libfprint?= ../../security/libfprint -.endif # LIBFPRINT_BUILDLINK3_MK +.endif # LIBFPRINT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libfprint diff --git a/security/libfwbuilder/buildlink3.mk b/security/libfwbuilder/buildlink3.mk index c19aa2ba82a..2cb300fc3fe 100644 --- a/security/libfwbuilder/buildlink3.mk +++ b/security/libfwbuilder/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.17 2006/10/14 01:42:51 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:25:18 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBFWBUILDER_BUILDLINK3_MK:= ${LIBFWBUILDER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libfwbuilder -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libfwbuilder -.endif +.if !defined(LIBFWBUILDER_BUILDLINK3_MK) +LIBFWBUILDER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibfwbuilder} -BUILDLINK_PACKAGES+= libfwbuilder -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libfwbuilder - -.if !empty(LIBFWBUILDER_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libfwbuilder+= libfwbuilder>=2.0.12 BUILDLINK_ABI_DEPENDS.libfwbuilder+= libfwbuilder>=2.0.12 BUILDLINK_PKGSRCDIR.libfwbuilder?= ../../security/libfwbuilder -.endif # LIBFWBUILDER_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../net/net-snmp/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" .include "../../x11/qt3-libs/buildlink3.mk" +.endif # LIBFWBUILDER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libfwbuilder diff --git a/security/libfwbuilder21/buildlink3.mk b/security/libfwbuilder21/buildlink3.mk index a7037975e43..8c359123f49 100644 --- a/security/libfwbuilder21/buildlink3.mk +++ b/security/libfwbuilder21/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.4 2008/01/28 20:34:54 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:18 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBFWBUILDER21_BUILDLINK3_MK:= ${LIBFWBUILDER21_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libfwbuilder21 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libfwbuilder21 -.endif +.if !defined(LIBFWBUILDER21_BUILDLINK3_MK) +LIBFWBUILDER21_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibfwbuilder21} -BUILDLINK_PACKAGES+= libfwbuilder21 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libfwbuilder21 - -.if !empty(LIBFWBUILDER21_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libfwbuilder21+= libfwbuilder21>=2.1.16 BUILDLINK_ABI_DEPENDS.libfwbuilder21+= libfwbuilder21>=2.1.16 BUILDLINK_PKGSRCDIR.libfwbuilder21?= ../../security/libfwbuilder21 -.endif # LIBFWBUILDER21_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../net/net-snmp/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" .include "../../x11/qt3-libs/buildlink3.mk" +.endif # LIBFWBUILDER21_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libfwbuilder21 diff --git a/security/libgcrypt/buildlink3.mk b/security/libgcrypt/buildlink3.mk index b66305bc572..e294c9992bd 100644 --- a/security/libgcrypt/buildlink3.mk +++ b/security/libgcrypt/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:11:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:18 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGCRYPT_BUILDLINK3_MK:= ${LIBGCRYPT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgcrypt -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libgcrypt -.endif +.if !defined(LIBGCRYPT_BUILDLINK3_MK) +LIBGCRYPT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgcrypt} -BUILDLINK_PACKAGES+= libgcrypt -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgcrypt - -.if !empty(LIBGCRYPT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libgcrypt+= libgcrypt>=1.2.0 BUILDLINK_ABI_DEPENDS.libgcrypt+= libgcrypt>=1.2.2nb1 BUILDLINK_PKGSRCDIR.libgcrypt?= ../../security/libgcrypt -.endif # LIBGCRYPT_BUILDLINK3_MK .include "../../security/libgpg-error/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.endif # LIBGCRYPT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgcrypt diff --git a/security/libgpg-error/buildlink3.mk b/security/libgpg-error/buildlink3.mk index 72c8c4a22c3..77493642ed9 100644 --- a/security/libgpg-error/buildlink3.mk +++ b/security/libgpg-error/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:19 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGPG_ERROR_BUILDLINK3_MK:= ${LIBGPG_ERROR_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgpg-error -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libgpg-error -.endif +.if !defined(LIBGPG_ERROR_BUILDLINK3_MK) +LIBGPG_ERROR_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgpg-error} -BUILDLINK_PACKAGES+= libgpg-error -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgpg-error - -.if !empty(LIBGPG_ERROR_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=0.6 BUILDLINK_ABI_DEPENDS.libgpg-error+= libgpg-error>=1.0nb1 BUILDLINK_PKGSRCDIR.libgpg-error?= ../../security/libgpg-error -.endif # LIBGPG_ERROR_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" +.endif # LIBGPG_ERROR_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgpg-error diff --git a/security/libidea/buildlink3.mk b/security/libidea/buildlink3.mk index 481fe6888bb..5446756dcb6 100644 --- a/security/libidea/buildlink3.mk +++ b/security/libidea/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:19 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBIDEA_BUILDLINK3_MK:= ${LIBIDEA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libidea -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libidea -.endif +.if !defined(LIBIDEA_BUILDLINK3_MK) +LIBIDEA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibidea} -BUILDLINK_PACKAGES+= libidea -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libidea - -.if !empty(LIBIDEA_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libidea+= libidea>=0.8.2 BUILDLINK_PKGSRCDIR.libidea?= ../../security/libidea BUILDLINK_DEPMETHOD.libidea?= build -.endif # LIBIDEA_BUILDLINK3_MK +.endif # LIBIDEA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libidea diff --git a/security/libident/buildlink3.mk b/security/libident/buildlink3.mk index 4ecc91b66a8..799e782dad5 100644 --- a/security/libident/buildlink3.mk +++ b/security/libident/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:19 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBIDENT_BUILDLINK3_MK:= ${LIBIDENT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libident -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libident -.endif +.if !defined(LIBIDENT_BUILDLINK3_MK) +LIBIDENT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibident} -BUILDLINK_PACKAGES+= libident -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libident - -.if !empty(LIBIDENT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libident+= libident>=0.22 BUILDLINK_ABI_DEPENDS.libident+= libident>=0.22nb1 BUILDLINK_PKGSRCDIR.libident?= ../../security/libident -.endif # LIBIDENT_BUILDLINK3_MK +.endif # LIBIDENT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libident diff --git a/security/libksba/buildlink3.mk b/security/libksba/buildlink3.mk index 93873c7c766..2f05f077fa5 100644 --- a/security/libksba/buildlink3.mk +++ b/security/libksba/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:19 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBKSBA_BUILDLINK3_MK:= ${LIBKSBA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libksba -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libksba -.endif +.if !defined(LIBKSBA_BUILDLINK3_MK) +LIBKSBA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibksba} -BUILDLINK_PACKAGES+= libksba -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libksba - -.if !empty(LIBKSBA_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libksba+= libksba>=0.9.7 BUILDLINK_ABI_DEPENDS.libksba+= libksba>=0.9.13nb1 BUILDLINK_PKGSRCDIR.libksba?= ../../security/libksba -.endif # LIBKSBA_BUILDLINK3_MK .include "../../security/libgcrypt/buildlink3.mk" .include "../../security/libgpg-error/buildlink3.mk" +.endif # LIBKSBA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libksba diff --git a/security/libksba04/buildlink3.mk b/security/libksba04/buildlink3.mk index d9350ed3286..278992e7aae 100644 --- a/security/libksba04/buildlink3.mk +++ b/security/libksba04/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:19 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBKSBA_BUILDLINK3_MK:= ${LIBKSBA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libksba -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libksba -.endif +.if !defined(LIBKSBA_BUILDLINK3_MK) +LIBKSBA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibksba} -BUILDLINK_PACKAGES+= libksba -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libksba - -.if !empty(LIBKSBA_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libksba+= libksba>=0.4.7nb1 BUILDLINK_ABI_DEPENDS.libksba+= libksba>=0.4.7nb2 BUILDLINK_PKGSRCDIR.libksba?= ../../security/libksba04 -.endif # LIBKSBA_BUILDLINK3_MK +.endif # LIBKSBA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libksba diff --git a/security/libmcrypt/buildlink3.mk b/security/libmcrypt/buildlink3.mk index 61cac0b7e62..31bf57e252a 100644 --- a/security/libmcrypt/buildlink3.mk +++ b/security/libmcrypt/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:19 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBMCRYPT_BUILDLINK3_MK:= ${LIBMCRYPT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libmcrypt -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libmcrypt -.endif +.if !defined(LIBMCRYPT_BUILDLINK3_MK) +LIBMCRYPT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmcrypt} -BUILDLINK_PACKAGES+= libmcrypt -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmcrypt - -.if !empty(LIBMCRYPT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libmcrypt+= libmcrypt>=2.5.6 BUILDLINK_ABI_DEPENDS.libmcrypt+= libmcrypt>=2.5.7nb1 BUILDLINK_PKGSRCDIR.libmcrypt?= ../../security/libmcrypt -.endif # LIBMCRYPT_BUILDLINK3_MK +.endif # LIBMCRYPT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libmcrypt diff --git a/security/libnasl/buildlink3.mk b/security/libnasl/buildlink3.mk index b000b90530a..1939db7e5ff 100644 --- a/security/libnasl/buildlink3.mk +++ b/security/libnasl/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.13 2008/10/13 22:32:54 bad Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:19 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBNASL_BUILDLINK3_MK:= ${LIBNASL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libnasl -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libnasl -.endif +.if !defined(LIBNASL_BUILDLINK3_MK) +LIBNASL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibnasl} -BUILDLINK_PACKAGES+= libnasl -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libnasl - -.if !empty(LIBNASL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libnasl+= libnasl>=2.2.11 BUILDLINK_ABI_DEPENDS.libnasl?= libnasl>=2.2.11nb1 BUILDLINK_PKGSRCDIR.libnasl?= ../../security/libnasl -.endif # LIBNASL_BUILDLINK3_MK .include "../../security/nessus-libraries/buildlink3.mk" +.endif # LIBNASL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libnasl diff --git a/security/libp11/buildlink3.mk b/security/libp11/buildlink3.mk index c8be83f7139..a6704b6b353 100644 --- a/security/libp11/buildlink3.mk +++ b/security/libp11/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/03/05 20:28:24 hasso Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:19 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBP11_BUILDLINK3_MK:= ${LIBP11_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libp11 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libp11 -.endif +.if !defined(LIBP11_BUILDLINK3_MK) +LIBP11_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibp11} -BUILDLINK_PACKAGES+= libp11 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libp11 - -.if !empty(LIBP11_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libp11+= libp11>=0.2.4 BUILDLINK_PKGSRCDIR.libp11?= ../../security/libp11 -.endif # LIBP11_BUILDLINK3_MK .include "../../devel/libltdl/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" +.endif # LIBP11_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libp11 diff --git a/security/libprelude/buildlink3.mk b/security/libprelude/buildlink3.mk index 74b1e442524..7213b715a38 100644 --- a/security/libprelude/buildlink3.mk +++ b/security/libprelude/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.11 2008/03/06 14:53:53 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:19 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBPRELUDE_BUILDLINK3_MK:= ${LIBPRELUDE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libprelude -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libprelude -.endif +.if !defined(LIBPRELUDE_BUILDLINK3_MK) +LIBPRELUDE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibprelude} -BUILDLINK_PACKAGES+= libprelude -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libprelude - -.if !empty(LIBPRELUDE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libprelude+= libprelude>=0.9.0 BUILDLINK_ABI_DEPENDS.libprelude+= libprelude>=0.9.16nb1 BUILDLINK_PKGSRCDIR.libprelude?= ../../security/libprelude -.endif # LIBPRELUDE_BUILDLINK3_MK .include "../../security/gnutls/buildlink3.mk" +.endif # LIBPRELUDE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libprelude diff --git a/security/libpreludedb/buildlink3.mk b/security/libpreludedb/buildlink3.mk index 2b84e18ec2e..20134722b8b 100644 --- a/security/libpreludedb/buildlink3.mk +++ b/security/libpreludedb/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.11 2008/03/06 14:53:53 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:19 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBPRELUDEDB_BUILDLINK3_MK:= ${LIBPRELUDEDB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libpreludedb -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libpreludedb -.endif +.if !defined(LIBPRELUDEDB_BUILDLINK3_MK) +LIBPRELUDEDB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibpreludedb} -BUILDLINK_PACKAGES+= libpreludedb -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libpreludedb - -.if !empty(LIBPRELUDEDB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libpreludedb+= libpreludedb>=0.9.3 BUILDLINK_ABI_DEPENDS.libpreludedb?= libpreludedb>=0.9.13nb2 BUILDLINK_PKGSRCDIR.libpreludedb?= ../../security/libpreludedb -.endif # LIBPRELUDEDB_BUILDLINK3_MK .include "../../security/libprelude/buildlink3.mk" .include "../../lang/perl5/buildlink3.mk" +.endif # LIBPRELUDEDB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libpreludedb diff --git a/security/libssh/buildlink3.mk b/security/libssh/buildlink3.mk index bfc028d841b..5b71f5e9bc8 100644 --- a/security/libssh/buildlink3.mk +++ b/security/libssh/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:20 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSSH_BUILDLINK3_MK:= ${NETWIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libssh -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libssh -.endif +.if !defined(LIBSSH_BUILDLINK3_MK) +LIBSSH_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibssh} -BUILDLINK_PACKAGES+= libssh -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libssh - -.if !empty(LIBSSH_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libssh+= libssh>=0.11 BUILDLINK_PKGSRCDIR.libssh?= ../../security/libssh -.endif # LIBSSH_BUILDLINK3_MK +.endif # LIBSSH_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libssh diff --git a/security/libssh2/buildlink3.mk b/security/libssh2/buildlink3.mk index 47b94f20918..fd884595fb5 100644 --- a/security/libssh2/buildlink3.mk +++ b/security/libssh2/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/03/02 14:11:54 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:20 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSSH2_BUILDLINK3_MK:= ${LIBSSH2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libssh2 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libssh2 -.endif +.if !defined(LIBSSH2_BUILDLINK3_MK) +LIBSSH2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibssh2} -BUILDLINK_PACKAGES+= libssh2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libssh2 - -.if ${LIBSSH2_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libssh2+= libssh2>=0.18 BUILDLINK_PKGSRCDIR.libssh2?= ../../security/libssh2 -.endif # LIBSSH2_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" +.endif # LIBSSH2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libssh2 diff --git a/security/libtasn1/buildlink3.mk b/security/libtasn1/buildlink3.mk index 8afbc6257a1..abc7aed1cc9 100644 --- a/security/libtasn1/buildlink3.mk +++ b/security/libtasn1/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:20 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBTASN1_BUILDLINK3_MK:= ${LIBTASN1_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libtasn1 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libtasn1 -.endif +.if !defined(LIBTASN1_BUILDLINK3_MK) +LIBTASN1_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibtasn1} -BUILDLINK_PACKAGES+= libtasn1 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libtasn1 - -.if !empty(LIBTASN1_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libtasn1+= libtasn1>=0.2.7 BUILDLINK_ABI_DEPENDS.libtasn1+= libtasn1>=0.3.0 BUILDLINK_PKGSRCDIR.libtasn1?= ../../security/libtasn1 -.endif # LIBTASN1_BUILDLINK3_MK +.endif # LIBTASN1_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libtasn1 diff --git a/security/libtcpa/buildlink3.mk b/security/libtcpa/buildlink3.mk index 1461b7d3bf5..a071eb50c74 100644 --- a/security/libtcpa/buildlink3.mk +++ b/security/libtcpa/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.10 2008/01/18 05:09:38 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:20 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBTCPA_BUILDLINK3_MK:= ${LIBTCPA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libtcpa -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libtcpa -.endif +.if !defined(LIBTCPA_BUILDLINK3_MK) +LIBTCPA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibtcpa} -BUILDLINK_PACKAGES+= libtcpa -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libtcpa - -.if !empty(LIBTCPA_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libtcpa+= libtcpa>=1.1b BUILDLINK_ABI_DEPENDS.libtcpa?= libtcpa>=1.1bnb3 BUILDLINK_PKGSRCDIR.libtcpa?= ../../security/libtcpa BUILDLINK_DEPMETHOD.libtcpa?= build -.endif # LIBTCPA_BUILDLINK3_MK .include "../../security/openssl/buildlink3.mk" +.endif # LIBTCPA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libtcpa diff --git a/security/mhash/buildlink3.mk b/security/mhash/buildlink3.mk index 23ee2e1fa5f..a1d56a9efc8 100644 --- a/security/mhash/buildlink3.mk +++ b/security/mhash/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:08 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:20 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MHASH_BUILDLINK3_MK:= ${MHASH_BUILDLINK3_MK}+ +BUILDLINK_TREE+= mhash -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= mhash -.endif +.if !defined(MHASH_BUILDLINK3_MK) +MHASH_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmhash} -BUILDLINK_PACKAGES+= mhash -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mhash - -.if !empty(MHASH_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.mhash+= mhash>=0.8.3 BUILDLINK_ABI_DEPENDS.mhash+= mhash>=0.9.2nb1 BUILDLINK_PKGSRCDIR.mhash?= ../../security/mhash -.endif # MHASH_BUILDLINK3_MK +.endif # MHASH_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -mhash diff --git a/security/mit-krb5/buildlink3.mk b/security/mit-krb5/buildlink3.mk index 02476012150..c28799aa577 100644 --- a/security/mit-krb5/buildlink3.mk +++ b/security/mit-krb5/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:08 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:20 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MIT_KRB5_BUILDLINK3_MK:= ${MIT_KRB5_BUILDLINK3_MK}+ +BUILDLINK_TREE+= mit-krb5 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= mit-krb5 -.endif +.if !defined(MIT_KRB5_BUILDLINK3_MK) +MIT_KRB5_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmit-krb5} -BUILDLINK_PACKAGES+= mit-krb5 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mit-krb5 - -.if !empty(MIT_KRB5_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.mit-krb5+= mit-krb5>=1.3.1 BUILDLINK_ABI_DEPENDS.mit-krb5+= mit-krb5>=1.4nb1 BUILDLINK_PKGSRCDIR.mit-krb5?= ../../security/mit-krb5 -.endif # MIT_KRB5_BUILDLINK3_MK +.endif # MIT_KRB5_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -mit-krb5 diff --git a/security/nessus-core/buildlink3.mk b/security/nessus-core/buildlink3.mk index ce8970aa212..807e5ef8e47 100644 --- a/security/nessus-core/buildlink3.mk +++ b/security/nessus-core/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.14 2008/10/13 22:32:54 bad Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:20 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -NESSUS_CORE_BUILDLINK3_MK:= ${NESSUS_CORE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= nessus-core -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= nessus-core -.endif +.if !defined(NESSUS_CORE_BUILDLINK3_MK) +NESSUS_CORE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnessus-core} -BUILDLINK_PACKAGES+= nessus-core -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}nessus-core - -.if !empty(NESSUS_CORE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.nessus-core+= nessus-core>=2.2.11 BUILDLINK_ABI_DEPENDS.nessus-core?= nessus-core>=2.2.11nb1 BUILDLINK_PKGSRCDIR.nessus-core?= ../../security/nessus-core -.endif # NESSUS_CORE_BUILDLINK3_MK .include "../../security/libnasl/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # NESSUS_CORE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -nessus-core diff --git a/security/nessus-libraries/buildlink3.mk b/security/nessus-libraries/buildlink3.mk index 66f9bbbe120..4e61ee75d02 100644 --- a/security/nessus-libraries/buildlink3.mk +++ b/security/nessus-libraries/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.14 2008/10/13 22:32:54 bad Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:20 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -NESSUS_LIBRARIES_BUILDLINK3_MK:= ${NESSUS_LIBRARIES_BUILDLINK3_MK}+ +BUILDLINK_TREE+= nessus-libraries -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= nessus-libraries -.endif +.if !defined(NESSUS_LIBRARIES_BUILDLINK3_MK) +NESSUS_LIBRARIES_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnessus-libraries} -BUILDLINK_PACKAGES+= nessus-libraries -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}nessus-libraries - -.if !empty(NESSUS_LIBRARIES_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.nessus-libraries+= nessus-libraries>=2.2.11 BUILDLINK_ABI_DEPENDS.nessus-libraries?= nessus-libraries>=2.2.11nb1 BUILDLINK_PKGSRCDIR.nessus-libraries?= ../../security/nessus-libraries -.endif # NESSUS_LIBRARIES_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" +.endif # NESSUS_LIBRARIES_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -nessus-libraries diff --git a/security/ocaml-ssl/buildlink3.mk b/security/ocaml-ssl/buildlink3.mk index cb5f32a4cff..7e0c6f9685b 100644 --- a/security/ocaml-ssl/buildlink3.mk +++ b/security/ocaml-ssl/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/01/18 05:09:39 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:20 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OCAML_SSL_BUILDLINK3_MK:= ${OCAML_SSL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ocaml-ssl -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= ocaml-ssl -.endif +.if !defined(OCAML_SSL_BUILDLINK3_MK) +OCAML_SSL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nocaml-ssl} -BUILDLINK_PACKAGES+= ocaml-ssl -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ocaml-ssl - -.if ${OCAML_SSL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.ocaml-ssl+= ocaml-ssl>=0.4.0 BUILDLINK_ABI_DEPENDS.ocaml-ssl?= ocaml-ssl>=0.4.1nb1 BUILDLINK_PKGSRCDIR.ocaml-ssl?= ../../security/ocaml-ssl -.endif # OCAML_SSL_BUILDLINK3_MK .include "../../security/openssl/buildlink3.mk" +.endif # OCAML_SSL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ocaml-ssl diff --git a/security/opencdk/buildlink3.mk b/security/opencdk/buildlink3.mk index 67323938e2a..465a98de2c9 100644 --- a/security/opencdk/buildlink3.mk +++ b/security/opencdk/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.12 2007/06/05 05:35:20 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:20 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OPENCDK_BUILDLINK3_MK:= ${OPENCDK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= opencdk -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= opencdk -.endif +.if !defined(OPENCDK_BUILDLINK3_MK) +OPENCDK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopencdk} -BUILDLINK_PACKAGES+= opencdk -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}opencdk - -.if !empty(OPENCDK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.opencdk+= opencdk>=0.5.4nb1 BUILDLINK_ABI_DEPENDS.opencdk+= opencdk>=0.6.0 BUILDLINK_PKGSRCDIR.opencdk?= ../../security/opencdk -.endif # OPENCDK_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" .include "../../security/libgcrypt/buildlink3.mk" +.endif # OPENCDK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -opencdk diff --git a/security/openct/buildlink3.mk b/security/openct/buildlink3.mk index e1932998569..d3d887eeebd 100644 --- a/security/openct/buildlink3.mk +++ b/security/openct/buildlink3.mk @@ -1,22 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/02/26 10:07:49 hasso Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:21 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OPENCT_BUILDLINK3_MK:= ${OPENCT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= openct -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= openct -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenct} -BUILDLINK_PACKAGES+= openct -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openct +.if !defined(OPENCT_BUILDLINK3_MK) +OPENCT_BUILDLINK3_MK:= -.if !empty(OPENCT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.openct+= openct>=0.6.15 BUILDLINK_PKGSRCDIR.openct?= ../../security/openct pkgbase := openct .include "../../mk/pkg-build-options.mk" -.endif # OPENCT_BUILDLINK3_MK .if !empty(PKG_BUILD_OPTIONS.openct:Mpcsc-lite) .include "../../security/pcsc-lite/buildlink3.mk" @@ -27,5 +19,6 @@ pkgbase := openct .endif .include "../../devel/libltdl/buildlink3.mk" +.endif # OPENCT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -openct diff --git a/security/openpam/buildlink3.mk b/security/openpam/buildlink3.mk index 5a8f988f221..91bddb82584 100644 --- a/security/openpam/buildlink3.mk +++ b/security/openpam/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 23:11:08 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:21 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OPENPAM_BUILDLINK3_MK:= ${OPENPAM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= openpam -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= openpam -.endif +.if !defined(OPENPAM_BUILDLINK3_MK) +OPENPAM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenpam} -BUILDLINK_PACKAGES+= openpam -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openpam - -.if !empty(OPENPAM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.openpam+= openpam>=20040210 BUILDLINK_PKGSRCDIR.openpam?= ../../security/openpam -.endif # OPENPAM_BUILDLINK3_MK .include "../../mk/dlopen.buildlink3.mk" +.endif # OPENPAM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -openpam diff --git a/security/opensc/buildlink3.mk b/security/opensc/buildlink3.mk index 67d059f6813..45051aee729 100644 --- a/security/opensc/buildlink3.mk +++ b/security/opensc/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/02/26 10:50:05 hasso Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:21 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OPENSC_BUILDLINK3_MK:= ${OPENSC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= opensc -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= opensc -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopensc} -BUILDLINK_PACKAGES+= opensc -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}opensc +.if !defined(OPENSC_BUILDLINK3_MK) +OPENSC_BUILDLINK3_MK:= -.if !empty(OPENSC_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.opensc+= opensc>=0.11.5 BUILDLINK_PKGSRCDIR.opensc?= ../../security/opensc pkgbase := opensc .include "../../mk/pkg-build-options.mk" -.endif # OPENSC_BUILDLINK3_MK .include "../../devel/libltdl/buildlink3.mk" .if !empty(PKG_BUILD_OPTIONS.opensc:Mopenct) .include "../../security/openct/buildlink3.mk" .endif +.endif # OPENSC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -opensc diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk index faf498d7e6f..3be853512e8 100644 --- a/security/openssl/buildlink3.mk +++ b/security/openssl/buildlink3.mk @@ -1,17 +1,9 @@ -# $NetBSD: buildlink3.mk,v 1.39 2008/01/17 06:42:47 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.40 2009/03/20 19:25:21 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OPENSSL_BUILDLINK3_MK:= ${OPENSSL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= openssl -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= openssl -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenssl} -BUILDLINK_PACKAGES+= openssl -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openssl - -.if !empty(OPENSSL_BUILDLINK3_MK:M+) +.if !defined(OPENSSL_BUILDLINK3_MK) +OPENSSL_BUILDLINK3_MK:= . include "../../mk/bsd.fast.prefs.mk" @@ -26,7 +18,6 @@ WRAPPER_REORDER_CMDS+= reorder:l:crypt:crypto SSLBASE= ${BUILDLINK_PREFIX.openssl} BUILD_DEFS+= SSLBASE -.endif # OPENSSL_BUILDLINK3_MK pkgbase := openssl .include "../../mk/pkg-build-options.mk" @@ -34,5 +25,6 @@ pkgbase := openssl .if !empty(PKG_BUILD_OPTIONS.openssl:Mrsaref) . include "../../security/rsaref/buildlink3.mk" .endif +.endif # OPENSSL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -openssl diff --git a/security/openvas-libnasl/buildlink3.mk b/security/openvas-libnasl/buildlink3.mk index 4c185872de8..25997571405 100644 --- a/security/openvas-libnasl/buildlink3.mk +++ b/security/openvas-libnasl/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/04 01:09:31 adrianp Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:21 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OPENVAS_LIBNASL_BUILDLINK3_MK:= ${OPENVAS_LIBNASL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= openvas-libnasl -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= openvas-libnasl -.endif +.if !defined(OPENVAS_LIBNASL_BUILDLINK3_MK) +OPENVAS_LIBNASL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenvas-libnasl} -BUILDLINK_PACKAGES+= openvas-libnasl -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openvas-libnasl - -.if ${OPENVAS_LIBNASL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.openvas-libnasl+= openvas-libnasl>=2.0.0 BUILDLINK_PKGSRCDIR.openvas-libnasl?= ../../security/openvas-libnasl -.endif # OPENVAS_LIBNASL_BUILDLINK3_MK +.endif # OPENVAS_LIBNASL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -openvas-libnasl diff --git a/security/openvas-libraries/buildlink3.mk b/security/openvas-libraries/buildlink3.mk index e92d1b82446..17c140214ec 100644 --- a/security/openvas-libraries/buildlink3.mk +++ b/security/openvas-libraries/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/04 01:08:52 adrianp Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:21 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OPENVAS_LIBRARIES_BUILDLINK3_MK:= ${OPENVAS_LIBRARIES_BUILDLINK3_MK}+ +BUILDLINK_TREE+= openvas-libraries -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= openvas-libraries -.endif +.if !defined(OPENVAS_LIBRARIES_BUILDLINK3_MK) +OPENVAS_LIBRARIES_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenvas-libraries} -BUILDLINK_PACKAGES+= openvas-libraries -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openvas-libraries - -.if ${OPENVAS_LIBRARIES_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.openvas-libraries+= openvas-libraries>=2.0.0 BUILDLINK_PKGSRCDIR.openvas-libraries?= ../../security/openvas-libraries -.endif # OPENVAS_LIBRARIES_BUILDLINK3_MK +.endif # OPENVAS_LIBRARIES_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -openvas-libraries diff --git a/security/openvas-server/buildlink3.mk b/security/openvas-server/buildlink3.mk index cc0ad5d109f..0d3ec0e0715 100644 --- a/security/openvas-server/buildlink3.mk +++ b/security/openvas-server/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/04 01:11:55 adrianp Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:21 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OPENVAS_SERVER_BUILDLINK3_MK:= ${OPENVAS_SERVER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= openvas-server -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= openvas-server -.endif +.if !defined(OPENVAS_SERVER_BUILDLINK3_MK) +OPENVAS_SERVER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenvas-server} -BUILDLINK_PACKAGES+= openvas-server -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openvas-server - -.if ${OPENVAS_SERVER_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.openvas-server+= openvas-server>=2.0.0 BUILDLINK_PKGSRCDIR.openvas-server?= ../../security/openvas-server -.endif # OPENVAS_SERVER_BUILDLINK3_MK +.endif # OPENVAS_SERVER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -openvas-server diff --git a/security/pakchois/buildlink3.mk b/security/pakchois/buildlink3.mk index b2b505d783e..22ab0e15663 100644 --- a/security/pakchois/buildlink3.mk +++ b/security/pakchois/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/10/30 03:32:19 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:21 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PAKCHOIS_BUILDLINK3_MK:= ${PAKCHOIS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pakchois -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= pakchois -.endif +.if !defined(PAKCHOIS_BUILDLINK3_MK) +PAKCHOIS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npakchois} -BUILDLINK_PACKAGES+= pakchois -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pakchois - -.if ${PAKCHOIS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.pakchois+= pakchois>=0.4 BUILDLINK_PKGSRCDIR.pakchois?= ../../security/pakchois -.endif # PAKCHOIS_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" +.endif # PAKCHOIS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pakchois diff --git a/security/pcsc-lite/buildlink3.mk b/security/pcsc-lite/buildlink3.mk index 86845b86f32..34033eec5c1 100644 --- a/security/pcsc-lite/buildlink3.mk +++ b/security/pcsc-lite/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/03/04 15:52:15 shannonjr Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:21 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PCSC_LITE_BUILDLINK3_MK:= ${PCSC_LITE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pcsc-lite -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= pcsc-lite -.endif +.if !defined(PCSC_LITE_BUILDLINK3_MK) +PCSC_LITE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npcsc-lite} -BUILDLINK_PACKAGES+= pcsc-lite -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pcsc-lite - -.if ${PCSC_LITE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.pcsc-lite+= pcsc-lite>=1.4.99 BUILDLINK_PKGSRCDIR.pcsc-lite?= ../../security/pcsc-lite -.endif # PCSC_LITE_BUILDLINK3_MK .include "../../devel/libusb/buildlink3.mk" +.endif # PCSC_LITE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pcsc-lite diff --git a/security/pinentry/buildlink3.mk b/security/pinentry/buildlink3.mk index 1eb47253bee..68e7dda36d1 100644 --- a/security/pinentry/buildlink3.mk +++ b/security/pinentry/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:08 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:21 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PINENTRY_BUILDLINK3_MK:= ${PINENTRY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pinentry -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pinentry -.endif +.if !defined(PINENTRY_BUILDLINK3_MK) +PINENTRY_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npinentry} -BUILDLINK_PACKAGES+= pinentry -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pinentry - -.if !empty(PINENTRY_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.pinentry+= pinentry>=0.7.1 BUILDLINK_ABI_DEPENDS.pinentry+= pinentry>=0.7.1nb3 BUILDLINK_PKGSRCDIR.pinentry?= ../../security/pinentry -.endif # PINENTRY_BUILDLINK3_MK +.endif # PINENTRY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pinentry diff --git a/security/policykit-gnome/buildlink3.mk b/security/policykit-gnome/buildlink3.mk index 636fbe80218..7bdfa8292fa 100644 --- a/security/policykit-gnome/buildlink3.mk +++ b/security/policykit-gnome/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1 2008/11/22 21:21:48 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:22 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -POLICYKIT_GNOME_BUILDLINK3_MK:= ${POLICYKIT_GNOME_BUILDLINK3_MK}+ +BUILDLINK_TREE+= policykit-gnome -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= policykit-gnome -.endif +.if !defined(POLICYKIT_GNOME_BUILDLINK3_MK) +POLICYKIT_GNOME_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npolicykit-gnome} -BUILDLINK_PACKAGES+= policykit-gnome -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}policykit-gnome - -.if ${POLICYKIT_GNOME_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.policykit-gnome+= policykit-gnome>=0.9.2 BUILDLINK_PKGSRCDIR.policykit-gnome?= ../../security/policykit-gnome -.endif # POLICYKIT_GNOME_BUILDLINK3_MK .include "../../security/policykit/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" +.endif # POLICYKIT_GNOME_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -policykit-gnome diff --git a/security/policykit/buildlink3.mk b/security/policykit/buildlink3.mk index d72f2db89ac..e59fa205927 100644 --- a/security/policykit/buildlink3.mk +++ b/security/policykit/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/22 03:33:38 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:21 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -POLICYKIT_BUILDLINK3_MK:= ${POLICYKIT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= policykit -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= policykit -.endif +.if !defined(POLICYKIT_BUILDLINK3_MK) +POLICYKIT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npolicykit} -BUILDLINK_PACKAGES+= policykit -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}policykit - -.if ${POLICYKIT_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.policykit+= policykit>=0.9 BUILDLINK_PKGSRCDIR.policykit?= ../../security/policykit -.endif # POLICYKIT_BUILDLINK3_MK .include "../../sysutils/dbus/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" +.endif # POLICYKIT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -policykit diff --git a/security/py-SSLCrypto/buildlink3.mk b/security/py-SSLCrypto/buildlink3.mk index 168d27bd775..267aef7a77a 100644 --- a/security/py-SSLCrypto/buildlink3.mk +++ b/security/py-SSLCrypto/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.3 2008/04/25 22:16:20 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:22 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_SSLCRYPTO_BUILDLINK3_MK:= ${PY_SSLCRYPTO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= py-SSLCrypto -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= py-SSLCrypto -.endif +.if !defined(PY_SSLCRYPTO_BUILDLINK3_MK) +PY_SSLCRYPTO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-SSLCrypto} -BUILDLINK_PACKAGES+= py-SSLCrypto -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-SSLCrypto - -.if ${PY_SSLCRYPTO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.py-SSLCrypto+= ${PYPKGPREFIX}-SSLCrypto>=0.1.1 BUILDLINK_ABI_DEPENDS.py-SSLCrypto?= ${PYPKGPREFIX}-SSLCrypto>=0.1.1nb1 BUILDLINK_PKGSRCDIR.py-SSLCrypto?= ../../security/py-SSLCrypto -.endif # PY_SSLCRYPTO_BUILDLINK3_MK #.include "../../security/openssl/buildlink3.mk" +.endif # PY_SSLCRYPTO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -py-SSLCrypto diff --git a/security/py-amkCrypto/buildlink3.mk b/security/py-amkCrypto/buildlink3.mk index 5c2fe79a573..4d2bc406139 100644 --- a/security/py-amkCrypto/buildlink3.mk +++ b/security/py-amkCrypto/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 17:30:12 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:22 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY24_AMKCRYPTO_BUILDLINK3_MK:= ${PY24_AMKCRYPTO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= py-amkCrypto -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= py-amkCrypto -.endif +.if !defined(PY24_AMKCRYPTO_BUILDLINK3_MK) +PY24_AMKCRYPTO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-amkCrypto} -BUILDLINK_PACKAGES+= py-amkCrypto -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-amkCrypto - -.if ${PY24_AMKCRYPTO_BUILDLINK3_MK} == "+" .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.py-amkCrypto+= ${PYPKGPREFIX}-amkCrypto>=2.0.1nb1 BUILDLINK_PKGSRCDIR.py-amkCrypto?= ../../security/py-amkCrypto -.endif # PY24_AMKCRYPTO_BUILDLINK3_MK +.endif # PY24_AMKCRYPTO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -py-amkCrypto diff --git a/security/py-gnupg/buildlink3.mk b/security/py-gnupg/buildlink3.mk index 32fe4ac0d92..c0a8d4c1b03 100644 --- a/security/py-gnupg/buildlink3.mk +++ b/security/py-gnupg/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:12 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:22 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_GNUPG_BUILDLINK3_MK:= ${PY_GNUPG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= py-gnupg -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= py-gnupg -.endif +.if !defined(PY_GNUPG_BUILDLINK3_MK) +PY_GNUPG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-gnupg} -BUILDLINK_PACKAGES+= py-gnupg -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-gnupg - -.if !empty(PY_GNUPG_BUILDLINK3_MK:M+) . include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.py-gnupg+= ${PYPKGPREFIX}-gnupg-[0-9]* BUILDLINK_ABI_DEPENDS.py-gnupg+= ${PYPKGPREFIX}-gnupg>=0.3.2 BUILDLINK_PKGSRCDIR.py-gnupg?= ../../security/py-gnupg -.endif # PY_GNUPG_BUILDLINK3_MK +.endif # PY_GNUPG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -py-gnupg diff --git a/security/qca/buildlink3.mk b/security/qca/buildlink3.mk index 316589f0045..d6bb7e3ea12 100644 --- a/security/qca/buildlink3.mk +++ b/security/qca/buildlink3.mk @@ -1,23 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.11 2007/12/20 20:37:22 jdolecek Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:22 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -QCA_BUILDLINK3_MK:= ${QCA_BUILDLINK3_MK}+ -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= qca -.endif +BUILDLINK_TREE+= qca -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nqca} -BUILDLINK_PACKAGES+= qca -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qca +.if !defined(QCA_BUILDLINK3_MK) +QCA_BUILDLINK3_MK:= -.if !empty(QCA_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.qca+= qca>=1.0 BUILDLINK_ABI_DEPENDS.qca?= qca>=1.0nb3 BUILDLINK_PKGSRCDIR.qca?= ../../security/qca -.endif # QCA_BUILDLINK3_MK .include "../../x11/qt3-libs/buildlink3.mk" .include "../../x11/qt3-tools/buildlink3.mk" +.endif # QCA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -qca diff --git a/security/qca2/buildlink3.mk b/security/qca2/buildlink3.mk index 8b9685a7332..7a8e2a37c7b 100644 --- a/security/qca2/buildlink3.mk +++ b/security/qca2/buildlink3.mk @@ -1,23 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/03/19 15:32:42 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:22 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -QCA2_BUILDLINK3_MK:= ${QCA2_BUILDLINK3_MK}+ -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= qca2 -.endif +BUILDLINK_TREE+= qca2 -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nqca2} -BUILDLINK_PACKAGES+= qca2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qca2 +.if !defined(QCA2_BUILDLINK3_MK) +QCA2_BUILDLINK3_MK:= -.if !empty(QCA2_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.qca2+= qca2>=2.0.0 BUILDLINK_ABI_DEPENDS.qca2?= qca2>=2.0.0 BUILDLINK_PKGSRCDIR.qca2?= ../../security/qca2 -.endif # QCA2_BUILDLINK3_MK .include "../../x11/qt4-libs/buildlink3.mk" .include "../../x11/qt4-tools/buildlink3.mk" +.endif # QCA2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -qca2 diff --git a/security/rsaref/buildlink3.mk b/security/rsaref/buildlink3.mk index fa001a516fa..6fb42dd3df0 100644 --- a/security/rsaref/buildlink3.mk +++ b/security/rsaref/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:11:08 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:22 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -RSAREF_BUILDLINK3_MK:= ${RSAREF_BUILDLINK3_MK}+ +BUILDLINK_TREE+= rsaref -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= rsaref -.endif +.if !defined(RSAREF_BUILDLINK3_MK) +RSAREF_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrsaref} -BUILDLINK_PACKAGES+= rsaref -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rsaref - -.if !empty(RSAREF_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.rsaref+= rsaref>=2.0p3 BUILDLINK_ABI_DEPENDS.rsaref+= rsaref>=2.0p3nb1 BUILDLINK_PKGSRCDIR.rsaref?= ../../security/rsaref -.endif # RSAREF_BUILDLINK3_MK +.endif # RSAREF_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -rsaref diff --git a/security/seahorse/buildlink3.mk b/security/seahorse/buildlink3.mk index c74314af267..04574faf982 100644 --- a/security/seahorse/buildlink3.mk +++ b/security/seahorse/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.12 2008/10/27 16:51:59 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:22 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SEAHORSE_BUILDLINK3_MK:= ${SEAHORSE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= seahorse -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= seahorse -.endif +.if !defined(SEAHORSE_BUILDLINK3_MK) +SEAHORSE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nseahorse} -BUILDLINK_PACKAGES+= seahorse -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}seahorse - -.if ${SEAHORSE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.seahorse+= seahorse>=2.24.1 BUILDLINK_PKGSRCDIR.seahorse?= ../../security/seahorse -.endif # SEAHORSE_BUILDLINK3_MK .include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # SEAHORSE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -seahorse diff --git a/security/skey/buildlink3.mk b/security/skey/buildlink3.mk index d06ec3332dd..9a5c12a4a19 100644 --- a/security/skey/buildlink3.mk +++ b/security/skey/buildlink3.mk @@ -1,22 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/01/20 14:48:56 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:22 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SKEY_BUILDLINK3_MK:= ${SKEY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= skey -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= skey -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nskey} -BUILDLINK_PACKAGES+= skey -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}skey +.if !defined(SKEY_BUILDLINK3_MK) +SKEY_BUILDLINK3_MK:= -.if !empty(SKEY_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.skey+= skey>=1.1.5 BUILDLINK_ABI_DEPENDS.skey?= skey>=1.1.5nb2 BUILDLINK_PKGSRCDIR.skey?= ../../security/skey BUILDLINK_DEPMETHOD.skey?= build -.endif # SKEY_BUILDLINK3_MK .include "../../mk/bsd.fast.prefs.mk" @@ -24,5 +16,6 @@ BUILDLINK_DEPMETHOD.skey?= build .if ${OPSYS} == "SunOS" BUILDLINK_TRANSFORM+= l:skey:skey:md5 .endif +.endif # SKEY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -skey diff --git a/security/tcl-tls/buildlink3.mk b/security/tcl-tls/buildlink3.mk index f417be13713..983198f1489 100644 --- a/security/tcl-tls/buildlink3.mk +++ b/security/tcl-tls/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:08 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:22 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TCL_TLS_BUILDLINK3_MK:= ${TCL_TLS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= tcl-tls -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= tcl-tls -.endif +.if !defined(TCL_TLS_BUILDLINK3_MK) +TCL_TLS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl-tls} -BUILDLINK_PACKAGES+= tcl-tls -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tcl-tls - -.if !empty(TCL_TLS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.tcl-tls+= tcl-tls>=1.5.0 BUILDLINK_PKGSRCDIR.tcl-tls?= ../../security/tcl-tls -.endif # TCL_TLS_BUILDLINK3_MK +.endif # TCL_TLS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -tcl-tls diff --git a/security/tcp_wrappers/buildlink3.mk b/security/tcp_wrappers/buildlink3.mk index 5776176e524..caf277f634a 100644 --- a/security/tcp_wrappers/buildlink3.mk +++ b/security/tcp_wrappers/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.13 2006/12/12 21:52:37 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:23 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TCP_WRAPPERS_BUILDLINK3_MK:= ${TCP_WRAPPERS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= tcp_wrappers -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= tcp_wrappers -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcp_wrappers} -BUILDLINK_PACKAGES+= tcp_wrappers -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tcp_wrappers +.if !defined(TCP_WRAPPERS_BUILDLINK3_MK) +TCP_WRAPPERS_BUILDLINK3_MK:= -.if !empty(TCP_WRAPPERS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.tcp_wrappers+= tcp_wrappers>=7.6.1nb1 BUILDLINK_ABI_DEPENDS.tcp_wrappers+= tcp_wrappers>=7.6.1nb3 BUILDLINK_PKGSRCDIR.tcp_wrappers?= ../../security/tcp_wrappers -.endif # TCP_WRAPPERS_BUILDLINK3_MK # need libnsl and libsocket to link into an executable on Solaris. .include "../../mk/bsd.fast.prefs.mk" @@ -24,5 +16,6 @@ BUILDLINK_PKGSRCDIR.tcp_wrappers?= ../../security/tcp_wrappers BUILDLINK_LDADD.tcp_wrappers+= -lnsl -lsocket BUILDLINK_LDFLAGS.tcp_wrappers?= ${BUILDLINK_LDADD.tcp_wrappers} .endif +.endif # TCP_WRAPPERS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -tcp_wrappers diff --git a/security/xmlsec1/buildlink3.mk b/security/xmlsec1/buildlink3.mk index 550b4472d68..74567b34610 100644 --- a/security/xmlsec1/buildlink3.mk +++ b/security/xmlsec1/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/02 21:08:34 manu Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:23 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XMLSEC1_BUILDLINK3_MK:= ${XMLSEC1_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xmlsec1 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xmlsec1 -.endif +.if !defined(XMLSEC1_BUILDLINK3_MK) +XMLSEC1_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxmlsec1} -BUILDLINK_PACKAGES+= xmlsec1 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xmlsec1 - -.if ${XMLSEC1_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xmlsec1+= xmlsec1>=1.2.6nb6 BUILDLINK_PKGSRCDIR.xmlsec1?= ../../security/xmlsec1 BUILDLINK_INCDIRS.xmlsec1+= include/xmlsec1 BUILDLINK_CPPFLAGS.xmlsec1+= -DXMLSEC_CRYPTO_OPENSSL BUILDLINK_LIBS.xmlsec1+= -lxmlsec1-openssl -.endif # XMLSEC1_BUILDLINK3_MK .include "../../security/openssl/buildlink3.mk" +.endif # XMLSEC1_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xmlsec1 diff --git a/sysutils/amanda-common/buildlink3.mk b/sysutils/amanda-common/buildlink3.mk index ffed3925cfc..aa3f70cdc00 100644 --- a/sysutils/amanda-common/buildlink3.mk +++ b/sysutils/amanda-common/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.11 2008/02/15 16:23:09 gdt Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:23 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -AMANDA_COMMON_BUILDLINK3_MK:= ${AMANDA_COMMON_BUILDLINK3_MK}+ +BUILDLINK_TREE+= amanda-common -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= amanda-common -.endif +.if !defined(AMANDA_COMMON_BUILDLINK3_MK) +AMANDA_COMMON_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Namanda-common} -BUILDLINK_PACKAGES+= amanda-common -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}amanda-common - -.if !empty(AMANDA_COMMON_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.amanda-common+= amanda-common>=2.5.2p1 BUILDLINK_ABI_DEPENDS.amanda-common+= amanda-common>=2.5.2p1 BUILDLINK_PKGSRCDIR.amanda-common?= ../../sysutils/amanda-common -.endif # AMANDA_COMMON_BUILDLINK3_MK +.endif # AMANDA_COMMON_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -amanda-common diff --git a/sysutils/brasero/buildlink3.mk b/sysutils/brasero/buildlink3.mk index 8b21da72c76..c67a3728283 100644 --- a/sysutils/brasero/buildlink3.mk +++ b/sysutils/brasero/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1 2009/03/17 23:40:37 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:23 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BRASERO_BUILDLINK3_MK:= ${BRASERO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= brasero -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= brasero -.endif +.if !defined(BRASERO_BUILDLINK3_MK) +BRASERO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbrasero} -BUILDLINK_PACKAGES+= brasero -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}brasero - -.if ${BRASERO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.brasero+= brasero>=2.26.0 BUILDLINK_PKGSRCDIR.brasero?= ../../sysutils/brasero -.endif # BRASERO_BUILDLINK3_MK +.endif # BRASERO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -brasero diff --git a/sysutils/consolekit/buildlink3.mk b/sysutils/consolekit/buildlink3.mk index 1540d0b4e6a..0c63e5578c0 100644 --- a/sysutils/consolekit/buildlink3.mk +++ b/sysutils/consolekit/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/22 03:32:22 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:23 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CONSOLEKIT_BUILDLINK3_MK:= ${CONSOLEKIT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= consolekit -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= consolekit -.endif +.if !defined(CONSOLEKIT_BUILDLINK3_MK) +CONSOLEKIT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nconsolekit} -BUILDLINK_PACKAGES+= consolekit -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}consolekit - -.if ${CONSOLEKIT_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.consolekit+= consolekit>=0.3.0 BUILDLINK_PKGSRCDIR.consolekit?= ../../sysutils/consolekit -.endif # CONSOLEKIT_BUILDLINK3_MK .include "../../sysutils/dbus/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" +.endif # CONSOLEKIT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -consolekit diff --git a/sysutils/dbus-glib/buildlink3.mk b/sysutils/dbus-glib/buildlink3.mk index 9f19fc902df..9a318789a71 100644 --- a/sysutils/dbus-glib/buildlink3.mk +++ b/sysutils/dbus-glib/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.11 2006/08/23 09:45:16 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:23 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -DBUS_GLIB_BUILDLINK3_MK:= ${DBUS_GLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= dbus-glib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= dbus-glib -.endif +.if !defined(DBUS_GLIB_BUILDLINK3_MK) +DBUS_GLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndbus-glib} -BUILDLINK_PACKAGES+= dbus-glib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dbus-glib - -.if !empty(DBUS_GLIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.61 BUILDLINK_ABI_DEPENDS.dbus-glib+= dbus-glib>=0.71 BUILDLINK_PKGSRCDIR.dbus-glib?= ../../sysutils/dbus-glib -.endif # DBUS_GLIB_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" +.endif # DBUS_GLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -dbus-glib diff --git a/sysutils/dbus-qt3/buildlink3.mk b/sysutils/dbus-qt3/buildlink3.mk index 13c6062cf06..a7892387b8e 100644 --- a/sysutils/dbus-qt3/buildlink3.mk +++ b/sysutils/dbus-qt3/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/04/21 14:31:18 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:23 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -DBUS_QT3_BUILDLINK3_MK:= ${DBUS_QT3_BUILDLINK3_MK}+ +BUILDLINK_TREE+= dbus-qt3 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= dbus-qt3 -.endif +.if !defined(DBUS_QT3_BUILDLINK3_MK) +DBUS_QT3_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndbus-qt3} -BUILDLINK_PACKAGES+= dbus-qt3 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dbus-qt3 - -.if ${DBUS_QT3_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.dbus-qt3+= dbus-qt3>=0.70 BUILDLINK_PKGSRCDIR.dbus-qt3?= ../../sysutils/dbus-qt3 -.endif # DBUS_QT3_BUILDLINK3_MK .include "../../sysutils/dbus/buildlink3.mk" .include "../../x11/qt3-libs/buildlink3.mk" +.endif # DBUS_QT3_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -dbus-qt3 diff --git a/sysutils/dbus/buildlink3.mk b/sysutils/dbus/buildlink3.mk index d01f314dac8..679a718b3fb 100644 --- a/sysutils/dbus/buildlink3.mk +++ b/sysutils/dbus/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.12 2009/02/23 11:00:01 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:23 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -DBUS_BUILDLINK3_MK:= ${DBUS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= dbus -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= dbus -.endif +.if !defined(DBUS_BUILDLINK3_MK) +DBUS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndbus} -BUILDLINK_PACKAGES+= dbus -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dbus - -.if !empty(DBUS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.dbus+= dbus>=0.91 BUILDLINK_PKGSRCDIR.dbus?= ../../sysutils/dbus @@ -22,8 +15,8 @@ PRINT_PLIST_AWK+= /^@dirrm share\/dbus-1\/services/ \ { print "@comment in dbus: " $$0; next } PRINT_PLIST_AWK+= /^@dirrm share\/dbus-1/ \ { print "@comment in dbus: " $$0; next } -.endif # DBUS_BUILDLINK3_MK .include "../../textproc/expat/buildlink3.mk" +.endif # DBUS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -dbus diff --git a/sysutils/desktop-file-utils/buildlink3.mk b/sysutils/desktop-file-utils/buildlink3.mk index ca6de9465ca..ecafdf8f3ba 100644 --- a/sysutils/desktop-file-utils/buildlink3.mk +++ b/sysutils/desktop-file-utils/buildlink3.mk @@ -1,23 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:08 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:23 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -DESKTOP_FILE_UTILS_BUILDLINK3_MK:= ${DESKTOP_FILE_UTILS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= desktop-file-utils -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= desktop-file-utils -.endif +.if !defined(DESKTOP_FILE_UTILS_BUILDLINK3_MK) +DESKTOP_FILE_UTILS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndesktop-file-utils} -BUILDLINK_PACKAGES+= desktop-file-utils -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}desktop-file-utils - -.if !empty(DESKTOP_FILE_UTILS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.desktop-file-utils+= desktop-file-utils>=0.8 BUILDLINK_ABI_DEPENDS.desktop-file-utils+= desktop-file-utils>=0.10nb1 BUILDLINK_PKGSRCDIR.desktop-file-utils?=../../sysutils/desktop-file-utils -.endif # DESKTOP_FILE_UTILS_BUILDLINK3_MK -.if !empty(DESKTOP_FILE_UTILS_BUILDLINK3_MK:M+) BUILDLINK_TARGETS+= desktop-file-utils-buildlink-fake _DFU_FAKE_UPDATEDB= ${BUILDLINK_DIR}/bin/update-desktop-database @@ -31,6 +22,6 @@ desktop-file-utils-buildlink-fake: ${ECHO} "echo '[pkgsrc] Doing nothing for update-desktop-database' \$$*" >> ${_DFU_FAKE_UPDATEDB}; \ ${CHMOD} +x ${_DFU_FAKE_UPDATEDB}; \ fi -.endif # DESKTOP_FILE_UTILS_BUILDLINK3_MK +.endif # DESKTOP_FILE_UTILS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -desktop-file-utils diff --git a/sysutils/fam/buildlink3.mk b/sysutils/fam/buildlink3.mk index dfdc6f92ea2..b95c6e22796 100644 --- a/sysutils/fam/buildlink3.mk +++ b/sysutils/fam/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:08 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:23 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FAM_BUILDLINK3_MK:= ${FAM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= fam -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= fam -.endif +.if !defined(FAM_BUILDLINK3_MK) +FAM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfam} -BUILDLINK_PACKAGES+= fam -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fam - -.if !empty(FAM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.fam+= fam>=2.6.10 BUILDLINK_ABI_DEPENDS.fam+= fam>=2.7.0nb7 BUILDLINK_PKGSRCDIR.fam?= ../../sysutils/fam -.endif # FAM_BUILDLINK3_MK +.endif # FAM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -fam diff --git a/sysutils/file/buildlink3.mk b/sysutils/file/buildlink3.mk index a5d9c722d4e..99c0c8e35f8 100644 --- a/sysutils/file/buildlink3.mk +++ b/sysutils/file/buildlink3.mk @@ -1,26 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.7 2008/10/29 20:50:16 christos Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:24 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FILE_BUILDLINK3_MK:= ${FILE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= file -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= file -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfile} -BUILDLINK_PACKAGES+= file -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}file - -.if !empty(FILE_BUILDLINK3_MK:M+) +.if !defined(FILE_BUILDLINK3_MK) +FILE_BUILDLINK3_MK:= . include "../../mk/bsd.fast.prefs.mk" BUILDLINK_API_DEPENDS.file+= file>=4.17 BUILDLINK_ABI_DEPENDS.file+= file>=4.17 BUILDLINK_PKGSRCDIR.file?= ../../sysutils/file -.endif # FILE_BUILDLINK3_MK pkgbase := file .include "../../mk/pkg-build-options.mk" +.endif # FILE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -file diff --git a/sysutils/gkrellm/buildlink3.mk b/sysutils/gkrellm/buildlink3.mk index 664836f7efb..0a4aefa1aa3 100644 --- a/sysutils/gkrellm/buildlink3.mk +++ b/sysutils/gkrellm/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.14 2008/01/18 05:09:43 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:24 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GKRELLM_BUILDLINK3_MK:= ${GKRELLM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gkrellm -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gkrellm -.endif +.if !defined(GKRELLM_BUILDLINK3_MK) +GKRELLM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngkrellm} -BUILDLINK_PACKAGES+= gkrellm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gkrellm - -.if !empty(GKRELLM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gkrellm+= gkrellm>=2.1.22 BUILDLINK_ABI_DEPENDS.gkrellm?= gkrellm>=2.2.10nb1 BUILDLINK_PKGSRCDIR.gkrellm?= ../../sysutils/gkrellm -.endif # GKRELLM_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # GKRELLM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gkrellm diff --git a/sysutils/gnome-menus/buildlink3.mk b/sysutils/gnome-menus/buildlink3.mk index 894ebc03497..85a6dfcf255 100644 --- a/sysutils/gnome-menus/buildlink3.mk +++ b/sysutils/gnome-menus/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.15 2008/04/15 17:33:21 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:25:24 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNOME_MENUS_BUILDLINK3_MK:= ${GNOME_MENUS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnome-menus -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnome-menus -.endif +.if !defined(GNOME_MENUS_BUILDLINK3_MK) +GNOME_MENUS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-menus} -BUILDLINK_PACKAGES+= gnome-menus -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-menus - -.if !empty(GNOME_MENUS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gnome-menus+= gnome-menus>=2.13.5 BUILDLINK_ABI_DEPENDS.gnome-menus?= gnome-menus>=2.20.3nb1 BUILDLINK_PKGSRCDIR.gnome-menus?= ../../sysutils/gnome-menus -.endif # GNOME_MENUS_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" +.endif # GNOME_MENUS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnome-menus diff --git a/sysutils/gnome-mount/buildlink3.mk b/sysutils/gnome-mount/buildlink3.mk index c89e1cad6e1..a0fa0a1032a 100644 --- a/sysutils/gnome-mount/buildlink3.mk +++ b/sysutils/gnome-mount/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1 2008/12/02 19:59:08 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:24 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNOME_MOUNT_BUILDLINK3_MK:= ${GNOME_MOUNT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnome-mount -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= gnome-mount -.endif +.if !defined(GNOME_MOUNT_BUILDLINK3_MK) +GNOME_MOUNT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-mount} -BUILDLINK_PACKAGES+= gnome-mount -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-mount - -.if ${GNOME_MOUNT_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.gnome-mount+= gnome-mount>=0.8nb1 BUILDLINK_PKGSRCDIR.gnome-mount?= ../../sysutils/gnome-mount -.endif # GNOME_MOUNT_BUILDLINK3_MK #.include "../../security/gnome-keyring/buildlink3.mk" #.include "../../sysutils/dbus-glib/buildlink3.mk" @@ -22,5 +14,6 @@ BUILDLINK_PKGSRCDIR.gnome-mount?= ../../sysutils/gnome-mount #.include "../../sysutils/libnotify/buildlink3.mk" #.include "../../sysutils/nautilus/buildlink3.mk" #.include "../../x11/gtk2/buildlink3.mk" +.endif # GNOME_MOUNT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnome-mount diff --git a/sysutils/gnome-settings-daemon/buildlink3.mk b/sysutils/gnome-settings-daemon/buildlink3.mk index dafd77ed0e5..c570dcd8275 100644 --- a/sysutils/gnome-settings-daemon/buildlink3.mk +++ b/sysutils/gnome-settings-daemon/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/04/11 19:12:09 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:24 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNOME_SETTINGS_DAEMON_BUILDLINK3_MK:= ${GNOME_SETTINGS_DAEMON_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnome-settings-daemon -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= gnome-settings-daemon -.endif +.if !defined(GNOME_SETTINGS_DAEMON_BUILDLINK3_MK) +GNOME_SETTINGS_DAEMON_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-settings-daemon} -BUILDLINK_PACKAGES+= gnome-settings-daemon -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-settings-daemon - -.if ${GNOME_SETTINGS_DAEMON_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.gnome-settings-daemon+= gnome-settings-daemon>=2.22.0 BUILDLINK_PKGSRCDIR.gnome-settings-daemon?= ../../sysutils/gnome-settings-daemon -.endif # GNOME_SETTINGS_DAEMON_BUILDLINK3_MK .include "../../sysutils/dbus-glib/buildlink3.mk" +.endif # GNOME_SETTINGS_DAEMON_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnome-settings-daemon diff --git a/sysutils/gnome-vfs/buildlink3.mk b/sysutils/gnome-vfs/buildlink3.mk index 498bc8e381f..e07c99a8a57 100644 --- a/sysutils/gnome-vfs/buildlink3.mk +++ b/sysutils/gnome-vfs/buildlink3.mk @@ -1,24 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.19 2008/03/06 14:53:54 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2009/03/20 19:25:24 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNOME_VFS_BUILDLINK3_MK:= ${GNOME_VFS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnome-vfs -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnome-vfs -.endif +.if !defined(GNOME_VFS_BUILDLINK3_MK) +GNOME_VFS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-vfs} -BUILDLINK_PACKAGES+= gnome-vfs -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-vfs - -.if !empty(GNOME_VFS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=2.8.0 BUILDLINK_ABI_DEPENDS.gnome-vfs+= gnome-vfs>=2.20.1nb1 BUILDLINK_PKGSRCDIR.gnome-vfs?= ../../sysutils/gnome-vfs PRINT_PLIST_AWK+= /^@dirrm lib\/gnome-vfs-2.0\/modules/ \ { print "@comment in gnome-vfs: " $$0; next; } -.endif # GNOME_VFS_BUILDLINK3_MK .include "../../devel/GConf/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" @@ -26,5 +18,6 @@ PRINT_PLIST_AWK+= /^@dirrm lib\/gnome-vfs-2.0\/modules/ \ .include "../../security/gnutls/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../mk/fam.buildlink3.mk" +.endif # GNOME_VFS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnome-vfs diff --git a/sysutils/gnome-vfsmm/buildlink3.mk b/sysutils/gnome-vfsmm/buildlink3.mk index 4e9e1979271..2491b8c62d5 100644 --- a/sysutils/gnome-vfsmm/buildlink3.mk +++ b/sysutils/gnome-vfsmm/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.13 2008/03/06 14:53:54 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:24 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNOME_VFSMM_BUILDLINK3_MK:= ${GNOME_VFSMM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnome-vfsmm -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnome-vfsmm -.endif +.if !defined(GNOME_VFSMM_BUILDLINK3_MK) +GNOME_VFSMM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-vfsmm} -BUILDLINK_PACKAGES+= gnome-vfsmm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-vfsmm - -.if !empty(GNOME_VFSMM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gnome-vfsmm+= gnome-vfsmm>=2.10.0 BUILDLINK_ABI_DEPENDS.gnome-vfsmm+= gnome-vfsmm>=2.20.0nb1 BUILDLINK_PKGSRCDIR.gnome-vfsmm?= ../../sysutils/gnome-vfsmm -.endif # GNOME_VFSMM_BUILDLINK3_MK .include "../../devel/glibmm/buildlink3.mk" .include "../../sysutils/gnome-vfs/buildlink3.mk" +.endif # GNOME_VFSMM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnome-vfsmm diff --git a/sysutils/hal-info/buildlink3.mk b/sysutils/hal-info/buildlink3.mk index b373c253dd5..5c35cc03001 100644 --- a/sysutils/hal-info/buildlink3.mk +++ b/sysutils/hal-info/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/22 13:04:41 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:24 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -HAL_INFO_BUILDLINK3_MK:= ${HAL_INFO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= hal-info -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= hal-info -.endif +.if !defined(HAL_INFO_BUILDLINK3_MK) +HAL_INFO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nhal-info} -BUILDLINK_PACKAGES+= hal-info -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}hal-info - -.if ${HAL_INFO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.hal-info+= hal-info>=20081022 BUILDLINK_PKGSRCDIR.hal-info?= ../../sysutils/hal-info -.endif # HAL_INFO_BUILDLINK3_MK +.endif # HAL_INFO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -hal-info diff --git a/sysutils/hal/buildlink3.mk b/sysutils/hal/buildlink3.mk index 11e9240c02e..09a7589c968 100644 --- a/sysutils/hal/buildlink3.mk +++ b/sysutils/hal/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/22 15:20:51 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:24 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -HAL_BUILDLINK3_MK:= ${HAL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= hal -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= hal -.endif +.if !defined(HAL_BUILDLINK3_MK) +HAL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nhal} -BUILDLINK_PACKAGES+= hal -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}hal - -.if ${HAL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.hal+= hal>=0.5.11 BUILDLINK_PKGSRCDIR.hal?= ../../sysutils/hal -.endif # HAL_BUILDLINK3_MK .include "../../sysutils/dbus/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" +.endif # HAL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -hal diff --git a/sysutils/ipa/buildlink3.mk b/sysutils/ipa/buildlink3.mk index 4981738832f..66053838346 100644 --- a/sysutils/ipa/buildlink3.mk +++ b/sysutils/ipa/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/01/03 15:01:25 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:24 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -IPA_BUILDLINK3_MK:= ${IPA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ipa -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= ipa -.endif +.if !defined(IPA_BUILDLINK3_MK) +IPA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nipa} -BUILDLINK_PACKAGES+= ipa -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ipa - -.if ${IPA_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.ipa+= ipa>=2.0 BUILDLINK_PKGSRCDIR.ipa?= ../../sysutils/ipa BUILDLINK_DEPMETHOD.ipa?= build -.endif # IPA_BUILDLINK3_MK +.endif # IPA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ipa diff --git a/sysutils/libgamin/buildlink3.mk b/sysutils/libgamin/buildlink3.mk index ff750edf395..f0aa2eb793d 100644 --- a/sysutils/libgamin/buildlink3.mk +++ b/sysutils/libgamin/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/03/15 21:29:14 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:24 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGAMIN_BUILDLINK3_MK:= ${LIBGAMIN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgamin -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libgamin -.endif +.if !defined(LIBGAMIN_BUILDLINK3_MK) +LIBGAMIN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgamin} -BUILDLINK_PACKAGES+= libgamin -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgamin - -.if ${LIBGAMIN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libgamin+= libgamin>=0.1.10 BUILDLINK_PKGSRCDIR.libgamin?= ../../sysutils/libgamin -.endif # LIBGAMIN_BUILDLINK3_MK +.endif # LIBGAMIN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgamin diff --git a/sysutils/libgksu/buildlink3.mk b/sysutils/libgksu/buildlink3.mk index 495a0224273..5622a39568c 100644 --- a/sysutils/libgksu/buildlink3.mk +++ b/sysutils/libgksu/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/11/15 19:37:06 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:25 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGKSU_BUILDLINK3_MK:= ${LIBGKSU_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgksu -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libgksu -.endif +.if !defined(LIBGKSU_BUILDLINK3_MK) +LIBGKSU_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgksu} -BUILDLINK_PACKAGES+= libgksu -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgksu - -.if ${LIBGKSU_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libgksu+= libgksu>=2.0.7 BUILDLINK_PKGSRCDIR.libgksu?= ../../sysutils/libgksu -.endif # LIBGKSU_BUILDLINK3_MK .include "../../security/gnome-keyring/buildlink3.mk" .include "../../sysutils/libgtop/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" +.endif # LIBGKSU_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgksu diff --git a/sysutils/libgtop/buildlink3.mk b/sysutils/libgtop/buildlink3.mk index e203c1190e2..48a0b2542d5 100644 --- a/sysutils/libgtop/buildlink3.mk +++ b/sysutils/libgtop/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.5 2008/11/15 19:34:11 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:25 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGTOP_BUILDLINK3_MK:= ${LIBGTOP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgtop -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libgtop -.endif +.if !defined(LIBGTOP_BUILDLINK3_MK) +LIBGTOP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgtop} -BUILDLINK_PACKAGES+= libgtop -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgtop - -.if !empty(LIBGTOP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libgtop+= libgtop>=2.14.0 BUILDLINK_PKGSRCDIR.libgtop?= ../../sysutils/libgtop -.endif # LIBGTOP_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../x11/libXau/buildlink3.mk" +.endif # LIBGTOP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgtop diff --git a/sysutils/libnotify/buildlink3.mk b/sysutils/libnotify/buildlink3.mk index 9fa4a6f199d..abea5d96f09 100644 --- a/sysutils/libnotify/buildlink3.mk +++ b/sysutils/libnotify/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:09 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:25 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBNOTIFY_BUILDLINK3_MK:= ${LIBNOTIFY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libnotify -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libnotify -.endif +.if !defined(LIBNOTIFY_BUILDLINK3_MK) +LIBNOTIFY_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibnotify} -BUILDLINK_PACKAGES+= libnotify -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libnotify - -.if !empty(LIBNOTIFY_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libnotify+= libnotify>=0.3.2 BUILDLINK_ABI_DEPENDS.libnotify?= libnotify>=0.3.2nb1 BUILDLINK_PKGSRCDIR.libnotify?= ../../sysutils/libnotify -.endif # LIBNOTIFY_BUILDLINK3_MK #.include "../../devel/glib2/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" #.include "../../x11/gtk2/buildlink3.mk" +.endif # LIBNOTIFY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libnotify diff --git a/sysutils/libol/buildlink3.mk b/sysutils/libol/buildlink3.mk index deb5833c470..23958689451 100644 --- a/sysutils/libol/buildlink3.mk +++ b/sysutils/libol/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:09 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:25 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBOL_BUILDLINK3_MK:= ${LIBOL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libol -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libol -.endif +.if !defined(LIBOL_BUILDLINK3_MK) +LIBOL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibol} -BUILDLINK_PACKAGES+= libol -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libol - -.if !empty(LIBOL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libol+= libol>=0.3.17 BUILDLINK_PKGSRCDIR.libol?= ../../sysutils/libol -.endif # LIBOL_BUILDLINK3_MK +.endif # LIBOL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libol diff --git a/sysutils/liboobs/buildlink3.mk b/sysutils/liboobs/buildlink3.mk index 19c10c4bce2..428ec1785d5 100644 --- a/sysutils/liboobs/buildlink3.mk +++ b/sysutils/liboobs/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/15 18:30:22 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:25 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBOOBS_BUILDLINK3_MK:= ${LIBOOBS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= liboobs -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= liboobs -.endif +.if !defined(LIBOOBS_BUILDLINK3_MK) +LIBOOBS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nliboobs} -BUILDLINK_PACKAGES+= liboobs -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}liboobs - -.if ${LIBOOBS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.liboobs+= liboobs>=2.22.0 BUILDLINK_PKGSRCDIR.liboobs?= ../../sysutils/liboobs -.endif # LIBOOBS_BUILDLINK3_MK +.endif # LIBOOBS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -liboobs diff --git a/sysutils/libpciaccess/buildlink3.mk b/sysutils/libpciaccess/buildlink3.mk index 1ea93f6ca1a..bbdc9e223e7 100644 --- a/sysutils/libpciaccess/buildlink3.mk +++ b/sysutils/libpciaccess/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/10/30 20:58:11 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:25 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBPCIACCESS_BUILDLINK3_MK:= ${LIBPCIACCESS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libpciaccess -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libpciaccess -.endif +.if !defined(LIBPCIACCESS_BUILDLINK3_MK) +LIBPCIACCESS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibpciaccess} -BUILDLINK_PACKAGES+= libpciaccess -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libpciaccess - -.if ${LIBPCIACCESS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libpciaccess+= libpciaccess>=0.10.4 BUILDLINK_PKGSRCDIR.libpciaccess?= ../../sysutils/libpciaccess -.endif # LIBPCIACCESS_BUILDLINK3_MK +.endif # LIBPCIACCESS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libpciaccess diff --git a/sysutils/nautilus-cd-burner/buildlink3.mk b/sysutils/nautilus-cd-burner/buildlink3.mk index 099b218ce2a..2574d4773d3 100644 --- a/sysutils/nautilus-cd-burner/buildlink3.mk +++ b/sysutils/nautilus-cd-burner/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.17 2008/12/07 15:16:53 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:25:25 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -NAUTILUS_CD_BURNER_BUILDLINK3_MK:= ${NAUTILUS_CD_BURNER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= nautilus-cd-burner -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= nautilus-cd-burner -.endif +.if !defined(NAUTILUS_CD_BURNER_BUILDLINK3_MK) +NAUTILUS_CD_BURNER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnautilus-cd-burner} -BUILDLINK_PACKAGES+= nautilus-cd-burner -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}nautilus-cd-burner - -.if ${NAUTILUS_CD_BURNER_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.nautilus-cd-burner+= nautilus-cd-burner>=2.24.0 BUILDLINK_PKGSRCDIR.nautilus-cd-burner?= ../../sysutils/nautilus-cd-burner -.endif # NAUTILUS_CD_BURNER_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../sysutils/hal/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # NAUTILUS_CD_BURNER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -nautilus-cd-burner diff --git a/sysutils/nautilus/buildlink3.mk b/sysutils/nautilus/buildlink3.mk index 5d39b67a3ef..bb9dbcc2f29 100644 --- a/sysutils/nautilus/buildlink3.mk +++ b/sysutils/nautilus/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.32 2009/03/18 06:17:39 snj Exp $ +# $NetBSD: buildlink3.mk,v 1.33 2009/03/20 19:25:25 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -NAUTILUS_BUILDLINK3_MK:= ${NAUTILUS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= nautilus -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= nautilus -.endif +.if !defined(NAUTILUS_BUILDLINK3_MK) +NAUTILUS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnautilus} -BUILDLINK_PACKAGES+= nautilus -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}nautilus - -.if !empty(NAUTILUS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.nautilus+= nautilus>=2.12.1nb1 BUILDLINK_ABI_DEPENDS.nautilus?= nautilus>=2.20.0nb2 BUILDLINK_PKGSRCDIR.nautilus?= ../../sysutils/nautilus @@ -20,7 +13,6 @@ PRINT_PLIST_AWK+= /^@dirrm lib\/nautilus$$/ \ { print "@comment in nautilus: " $$0; next; } PRINT_PLIST_AWK+= /^@dirrm lib\/nautilus\/extensions-1.0$$/ \ { print "@comment in nautilus: " $$0; next; } -.endif # NAUTILUS_BUILDLINK3_MK .include "../../devel/GConf/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" @@ -30,5 +22,6 @@ PRINT_PLIST_AWK+= /^@dirrm lib\/nautilus\/extensions-1.0$$/ \ .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gnome-desktop/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # NAUTILUS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -nautilus diff --git a/sysutils/ndesk-dbus-glib/buildlink3.mk b/sysutils/ndesk-dbus-glib/buildlink3.mk index 337f3b9a51e..b2f1ba57267 100644 --- a/sysutils/ndesk-dbus-glib/buildlink3.mk +++ b/sysutils/ndesk-dbus-glib/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/04/25 15:49:30 kefren Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:25 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -NDESK_DBUS_GLIB_BUILDLINK3_MK:= ${NDESK_DBUS_GLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ndesk-dbus-glib -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= ndesk-dbus-glib -.endif +.if !defined(NDESK_DBUS_GLIB_BUILDLINK3_MK) +NDESK_DBUS_GLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nndesk-dbus-glib} -BUILDLINK_PACKAGES+= ndesk-dbus-glib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ndesk-dbus-glib - -.if ${NDESK_DBUS_GLIB_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.ndesk-dbus-glib+= ndesk-dbus-glib>=0.4.1 BUILDLINK_PKGSRCDIR.ndesk-dbus-glib?= ../../sysutils/ndesk-dbus-glib -.endif # NDESK_DBUS_GLIB_BUILDLINK3_MK .include "../../lang/mono/buildlink3.mk" +.endif # NDESK_DBUS_GLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ndesk-dbus-glib diff --git a/sysutils/ndesk-dbus/buildlink3.mk b/sysutils/ndesk-dbus/buildlink3.mk index a53363f231e..181ef5969e3 100644 --- a/sysutils/ndesk-dbus/buildlink3.mk +++ b/sysutils/ndesk-dbus/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/04/25 15:18:28 kefren Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:25 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -NDESK_DBUS_BUILDLINK3_MK:= ${NDESK_DBUS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ndesk-dbus -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= ndesk-dbus -.endif +.if !defined(NDESK_DBUS_BUILDLINK3_MK) +NDESK_DBUS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nndesk-dbus} -BUILDLINK_PACKAGES+= ndesk-dbus -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ndesk-dbus - -.if ${NDESK_DBUS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.ndesk-dbus+= ndesk-dbus>=0.6.1a BUILDLINK_PKGSRCDIR.ndesk-dbus?= ../../sysutils/ndesk-dbus -.endif # NDESK_DBUS_BUILDLINK3_MK +.endif # NDESK_DBUS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ndesk-dbus diff --git a/sysutils/pciutils/buildlink3.mk b/sysutils/pciutils/buildlink3.mk index 27c7c1b7a66..006fbc95659 100644 --- a/sysutils/pciutils/buildlink3.mk +++ b/sysutils/pciutils/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2008/11/03 22:01:29 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:26 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PCIUTILS_BUILDLINK3_MK:= ${PCIUTILS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pciutils -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pciutils -.endif +.if !defined(PCIUTILS_BUILDLINK3_MK) +PCIUTILS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npciutils} -BUILDLINK_PACKAGES+= pciutils -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pciutils - -.if !empty(PCIUTILS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.pciutils+= pciutils>=3.0.2 BUILDLINK_PKGSRCDIR.pciutils?= ../../sysutils/pciutils BUILDLINK_DEPMETHOD.pciutils?= build -.endif # PCIUTILS_BUILDLINK3_MK +.endif # PCIUTILS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pciutils diff --git a/sysutils/py-dbus/buildlink3.mk b/sysutils/py-dbus/buildlink3.mk index 7269ca4eab6..f88572fb7cb 100644 --- a/sysutils/py-dbus/buildlink3.mk +++ b/sysutils/py-dbus/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 17:30:12 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:26 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_DBUS_BUILDLINK3_MK:= ${PY_DBUS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= py-dbus -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= py-dbus -.endif +.if !defined(PY_DBUS_BUILDLINK3_MK) +PY_DBUS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-dbus} -BUILDLINK_PACKAGES+= py-dbus -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-dbus - -.if !empty(PY_DBUS_BUILDLINK3_MK:M+) .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.py-dbus+= ${PYPKGPREFIX}-dbus>=0.23.4 BUILDLINK_ABI_DEPENDS.py-dbus?= ${PYPKGPREFIX}-dbus>=0.71 BUILDLINK_PKGSRCDIR.py-dbus?= ../../sysutils/py-dbus -.endif # PY_DBUS_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" +.endif # PY_DBUS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -py-dbus diff --git a/sysutils/py-gnome-menus/buildlink3.mk b/sysutils/py-gnome-menus/buildlink3.mk index d6e3f6477b6..755c3c4856c 100644 --- a/sysutils/py-gnome-menus/buildlink3.mk +++ b/sysutils/py-gnome-menus/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/24 12:55:31 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:26 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_GNOME_MENUS_BUILDLINK3_MK:= ${PY_GNOME_MENUS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= py-gnome-menus -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= py-gnome-menus -.endif +.if !defined(PY_GNOME_MENUS_BUILDLINK3_MK) +PY_GNOME_MENUS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-gnome-menus} -BUILDLINK_PACKAGES+= py-gnome-menus -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-gnome-menus - -.if ${PY_GNOME_MENUS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.py-gnome-menus+= ${PYPKGPREFIX}-gnome-menus>=2.16.1 BUILDLINK_PKGSRCDIR.py-gnome-menus?= ../../sysutils/py-gnome-menus -.endif # PY_GNOME_MENUS_BUILDLINK3_MK +.endif # PY_GNOME_MENUS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -py-gnome-menus diff --git a/sysutils/py-notify/buildlink3.mk b/sysutils/py-notify/buildlink3.mk index dfbe15058a4..1788b97bc1d 100644 --- a/sysutils/py-notify/buildlink3.mk +++ b/sysutils/py-notify/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:12 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:26 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_NOTIFY_BUILDLINK3_MK:= ${PY_NOTIFY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= py-notify -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= py-notify -.endif +.if !defined(PY_NOTIFY_BUILDLINK3_MK) +PY_NOTIFY_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-notify} -BUILDLINK_PACKAGES+= py-notify -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-notify - -.if ${PY_NOTIFY_BUILDLINK3_MK} == "+" .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.py-notify+= ${PYPKGPREFIX}-notify>=0.1.1 BUILDLINK_PKGSRCDIR.py-notify?= ../../sysutils/py-notify -.endif # PY_NOTIFY_BUILDLINK3_MK .include "../../x11/py-gtk2/buildlink3.mk" +.endif # PY_NOTIFY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -py-notify diff --git a/sysutils/strigi/buildlink3.mk b/sysutils/strigi/buildlink3.mk index 8deadba9d22..048f45e7a40 100644 --- a/sysutils/strigi/buildlink3.mk +++ b/sysutils/strigi/buildlink3.mk @@ -1,23 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/01/09 22:28:02 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:26 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -STRIGI_BUILDLINK3_MK:= ${STRIGI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= strigi -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= strigi -.endif +.if !defined(STRIGI_BUILDLINK3_MK) +STRIGI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nstrigi} -BUILDLINK_PACKAGES+= strigi -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}strigi - -.if ${STRIGI_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.strigi+= strigi>=0.6.2 BUILDLINK_PKGSRCDIR.strigi?= ../../sysutils/strigi PRINT_PLIST_AWK+= /^@dirrm lib\/strigi$$/ \ { print "@comment in strigi: " $$0; next; } -.endif # STRIGI_BUILDLINK3_MK .include "../../archivers/bzip2/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" @@ -25,5 +17,6 @@ PRINT_PLIST_AWK+= /^@dirrm lib\/strigi$$/ \ .include "../../textproc/libclucene/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" +.endif # STRIGI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -strigi diff --git a/sysutils/system-tools-backends/buildlink3.mk b/sysutils/system-tools-backends/buildlink3.mk index 8345a3f04b6..0019cc1b542 100644 --- a/sysutils/system-tools-backends/buildlink3.mk +++ b/sysutils/system-tools-backends/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/15 18:28:56 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:26 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SYSTEM_TOOLS_BACKENDS_BUILDLINK3_MK:= ${SYSTEM_TOOLS_BACKENDS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= system-tools-backends -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= system-tools-backends -.endif +.if !defined(SYSTEM_TOOLS_BACKENDS_BUILDLINK3_MK) +SYSTEM_TOOLS_BACKENDS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsystem-tools-backends} -BUILDLINK_PACKAGES+= system-tools-backends -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}system-tools-backends - -.if ${SYSTEM_TOOLS_BACKENDS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.system-tools-backends+= system-tools-backends>=2.6.0 BUILDLINK_PKGSRCDIR.system-tools-backends?= ../../sysutils/system-tools-backends -.endif # SYSTEM_TOOLS_BACKENDS_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" +.endif # SYSTEM_TOOLS_BACKENDS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -system-tools-backends diff --git a/sysutils/vcdimager-devel/buildlink3.mk b/sysutils/vcdimager-devel/buildlink3.mk index 5976a34b683..c89e85d2562 100644 --- a/sysutils/vcdimager-devel/buildlink3.mk +++ b/sysutils/vcdimager-devel/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:09 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:26 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -VCDIMAGER_BUILDLINK3_MK:= ${VCDIMAGER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= vcdimager -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= vcdimager -.endif +.if !defined(VCDIMAGER_BUILDLINK3_MK) +VCDIMAGER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nvcdimager} -BUILDLINK_PACKAGES+= vcdimager -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}vcdimager - -.if !empty(VCDIMAGER_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20 BUILDLINK_ABI_DEPENDS.vcdimager+= vcdimager>=0.7.23nb1 BUILDLINK_PKGSRCDIR.vcdimager?= ../../sysutils/vcdimager-devel -.endif # VCDIMAGER_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../misc/libcdio/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.endif # VCDIMAGER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -vcdimager diff --git a/sysutils/xentools3/buildlink3.mk b/sysutils/xentools3/buildlink3.mk index e213dda0d95..1153d9177a9 100644 --- a/sysutils/xentools3/buildlink3.mk +++ b/sysutils/xentools3/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.3 2008/02/15 20:34:35 bouyer Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:26 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XENTOOLS3_BUILDLINK3_MK:= ${XENTOOLS3_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xentools3 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xentools3 -.endif +.if !defined(XENTOOLS3_BUILDLINK3_MK) +XENTOOLS3_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxentools3} -BUILDLINK_PACKAGES+= xentools3 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xentools3 - -.if ${XENTOOLS3_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xentools3+= xentools3>=3.1.3 BUILDLINK_PKGSRCDIR.xentools3?= ../../sysutils/xentools3 -.endif # XENTOOLS3_BUILDLINK3_MK +.endif # XENTOOLS3_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xentools3 diff --git a/sysutils/xfce4-appfinder/buildlink3.mk b/sysutils/xfce4-appfinder/buildlink3.mk index 13e96ee9434..ebc26663d71 100644 --- a/sysutils/xfce4-appfinder/buildlink3.mk +++ b/sysutils/xfce4-appfinder/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.17 2008/12/18 16:46:29 hira Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:25:26 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_APPFINDER_BUILDLINK3_MK:= ${XFCE4_APPFINDER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-appfinder -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-appfinder -.endif +.if !defined(XFCE4_APPFINDER_BUILDLINK3_MK) +XFCE4_APPFINDER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-appfinder} -BUILDLINK_PACKAGES+= xfce4-appfinder -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-appfinder - -.if ${XFCE4_APPFINDER_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-appfinder+= xfce4-appfinder>=4.4.3nb1 BUILDLINK_PKGSRCDIR.xfce4-appfinder?= ../../sysutils/xfce4-appfinder -.endif # XFCE4_APPFINDER_BUILDLINK3_MK .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/libxfce4gui/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_APPFINDER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-appfinder diff --git a/sysutils/xfce4-battery-plugin/buildlink3.mk b/sysutils/xfce4-battery-plugin/buildlink3.mk index 279271bb011..20fb6a00796 100644 --- a/sysutils/xfce4-battery-plugin/buildlink3.mk +++ b/sysutils/xfce4-battery-plugin/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.3 2007/05/04 10:18:17 hira Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:26 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_BATTERY_PLUGIN_BUILDLINK3_MK:= ${XFCE4_BATTERY_PLUGIN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-battery-plugin -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-battery-plugin -.endif +.if !defined(XFCE4_BATTERY_PLUGIN_BUILDLINK3_MK) +XFCE4_BATTERY_PLUGIN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-battery-plugin} -BUILDLINK_PACKAGES+= xfce4-battery-plugin -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-battery-plugin - -.if ${XFCE4_BATTERY_PLUGIN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-battery-plugin+= xfce4-battery-plugin>=0.5.0nb2 BUILDLINK_PKGSRCDIR.xfce4-battery-plugin?= ../../sysutils/xfce4-battery-plugin -.endif # XFCE4_BATTERY_PLUGIN_BUILDLINK3_MK .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/xfce4-panel/buildlink3.mk" @@ -22,5 +14,6 @@ BUILDLINK_PKGSRCDIR.xfce4-battery-plugin?= ../../sysutils/xfce4-battery-plugin .include "../../x11/libSM/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_BATTERY_PLUGIN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-battery-plugin diff --git a/sysutils/xfce4-cpugraph-plugin/buildlink3.mk b/sysutils/xfce4-cpugraph-plugin/buildlink3.mk index 0c40dac8e25..ce2f481cbef 100644 --- a/sysutils/xfce4-cpugraph-plugin/buildlink3.mk +++ b/sysutils/xfce4-cpugraph-plugin/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.13 2007/04/12 09:55:13 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:27 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK:= ${XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-cpugraph-plugin -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-cpugraph-plugin -.endif +.if !defined(XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK) +XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-cpugraph-plugin} -BUILDLINK_PACKAGES+= xfce4-cpugraph-plugin -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-cpugraph-plugin - -.if ${XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-cpugraph-plugin+= xfce4-cpugraph-plugin>=0.3.0 BUILDLINK_PKGSRCDIR.xfce4-cpugraph-plugin?= ../../sysutils/xfce4-cpugraph-plugin -.endif # XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-cpugraph-plugin diff --git a/sysutils/xfce4-diskperf-plugin/buildlink3.mk b/sysutils/xfce4-diskperf-plugin/buildlink3.mk index 92167e81682..c8f5ff9b441 100644 --- a/sysutils/xfce4-diskperf-plugin/buildlink3.mk +++ b/sysutils/xfce4-diskperf-plugin/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.14 2007/04/12 09:55:13 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:27 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK:= ${XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-diskperf-plugin -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-diskperf-plugin -.endif +.if !defined(XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK) +XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-diskperf-plugin} -BUILDLINK_PACKAGES+= xfce4-diskperf-plugin -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-diskperf-plugin - -.if ${XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-diskperf-plugin+= xfce4-diskperf-plugin>=2.1.0 BUILDLINK_PKGSRCDIR.xfce4-diskperf-plugin?= ../../sysutils/xfce4-diskperf-plugin -.endif # XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-diskperf-plugin diff --git a/sysutils/xfce4-fsguard-plugin/buildlink3.mk b/sysutils/xfce4-fsguard-plugin/buildlink3.mk index 1667031207c..0eedbd70010 100644 --- a/sysutils/xfce4-fsguard-plugin/buildlink3.mk +++ b/sysutils/xfce4-fsguard-plugin/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.12 2007/12/05 07:49:44 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:27 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK:= ${XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-fsguard-plugin -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-fsguard-plugin -.endif +.if !defined(XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK) +XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-fsguard-plugin} -BUILDLINK_PACKAGES+= xfce4-fsguard-plugin -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-fsguard-plugin - -.if ${XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-fsguard-plugin+= xfce4-fsguard-plugin>=0.4.0 BUILDLINK_PKGSRCDIR.xfce4-fsguard-plugin?= ../../sysutils/xfce4-fsguard-plugin -.endif # XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-fsguard-plugin diff --git a/sysutils/xfce4-genmon-plugin/buildlink3.mk b/sysutils/xfce4-genmon-plugin/buildlink3.mk index 34d152b3b1b..cedaa9c2aed 100644 --- a/sysutils/xfce4-genmon-plugin/buildlink3.mk +++ b/sysutils/xfce4-genmon-plugin/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/04/27 10:48:06 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:27 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_GENMON_PLUGIN_BUILDLINK3_MK:= ${XFCE4_GENMON_PLUGIN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-genmon-plugin -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-genmon-plugin -.endif +.if !defined(XFCE4_GENMON_PLUGIN_BUILDLINK3_MK) +XFCE4_GENMON_PLUGIN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-genmon-plugin} -BUILDLINK_PACKAGES+= xfce4-genmon-plugin -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-genmon-plugin - -.if ${XFCE4_GENMON_PLUGIN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-genmon-plugin+= xfce4-genmon-plugin>=3.1 BUILDLINK_PKGSRCDIR.xfce4-genmon-plugin?= ../../sysutils/xfce4-genmon-plugin -.endif # XFCE4_GENMON_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_GENMON_PLUGIN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-genmon-plugin diff --git a/sysutils/xfce4-netload-plugin/buildlink3.mk b/sysutils/xfce4-netload-plugin/buildlink3.mk index 29f396d9a46..fc75b596fec 100644 --- a/sysutils/xfce4-netload-plugin/buildlink3.mk +++ b/sysutils/xfce4-netload-plugin/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.17 2007/04/12 09:55:16 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:25:27 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK:= ${XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-netload-plugin -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-netload-plugin -.endif +.if !defined(XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK) +XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-netload-plugin} -BUILDLINK_PACKAGES+= xfce4-netload-plugin -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-netload-plugin - -.if ${XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-netload-plugin+= xfce4-netload-plugin>=0.4.0 BUILDLINK_PKGSRCDIR.xfce4-netload-plugin?= ../../sysutils/xfce4-netload-plugin -.endif # XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-netload-plugin diff --git a/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk b/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk index b655b895197..e122a57c0a8 100644 --- a/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk +++ b/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.13 2007/12/05 07:50:16 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:27 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK:= ${XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-quicklauncher-plugin -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-quicklauncher-plugin -.endif +.if !defined(XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK) +XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-quicklauncher-plugin} -BUILDLINK_PACKAGES+= xfce4-quicklauncher-plugin -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-quicklauncher-plugin - -.if ${XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-quicklauncher-plugin+= xfce4-quicklauncher-plugin>=1.9.4 BUILDLINK_PKGSRCDIR.xfce4-quicklauncher-plugin?= ../../sysutils/xfce4-quicklauncher-plugin -.endif # XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-quicklauncher-plugin diff --git a/sysutils/xfce4-systemload-plugin/buildlink3.mk b/sysutils/xfce4-systemload-plugin/buildlink3.mk index 5fa2774b767..2f58776eabf 100644 --- a/sysutils/xfce4-systemload-plugin/buildlink3.mk +++ b/sysutils/xfce4-systemload-plugin/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.15 2007/04/12 09:55:17 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:25:27 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK:= ${XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-systemload-plugin -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-systemload-plugin -.endif +.if !defined(XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK) +XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-systemload-plugin} -BUILDLINK_PACKAGES+= xfce4-systemload-plugin -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-systemload-plugin - -.if ${XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-systemload-plugin+= xfce4-systemload-plugin>=0.4.2 BUILDLINK_PKGSRCDIR.xfce4-systemload-plugin?= ../../sysutils/xfce4-systemload-plugin -.endif # XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-systemload-plugin diff --git a/sysutils/xfce4-thunar/buildlink3.mk b/sysutils/xfce4-thunar/buildlink3.mk index 1728459afc9..1aff93314d7 100644 --- a/sysutils/xfce4-thunar/buildlink3.mk +++ b/sysutils/xfce4-thunar/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.6 2008/12/19 23:54:47 hira Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:27 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_THUNAR_BUILDLINK3_MK:= ${XFCE4_THUNAR_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-thunar -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-thunar -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-thunar} -BUILDLINK_PACKAGES+= xfce4-thunar -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-thunar +.if !defined(XFCE4_THUNAR_BUILDLINK3_MK) +XFCE4_THUNAR_BUILDLINK3_MK:= -.if ${XFCE4_THUNAR_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-thunar+= xfce4-thunar>=0.9.3nb2 BUILDLINK_PKGSRCDIR.xfce4-thunar?= ../../sysutils/xfce4-thunar -.endif # XFCE4_THUNAR_BUILDLINK3_MK pkgbase := xfce4-thunar .include "../../mk/pkg-build-options.mk" @@ -35,5 +27,6 @@ pkgbase := xfce4-thunar .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../mk/fam.buildlink3.mk" +.endif # XFCE4_THUNAR_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-thunar diff --git a/sysutils/xfce4-xarchiver/buildlink3.mk b/sysutils/xfce4-xarchiver/buildlink3.mk index 0edb5e67bba..b715395ac20 100644 --- a/sysutils/xfce4-xarchiver/buildlink3.mk +++ b/sysutils/xfce4-xarchiver/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/12/18 16:46:29 hira Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:27 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_XARCHIVER_BUILDLINK3_MK:= ${XFCE4_XARCHIVER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-xarchiver -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-xarchiver -.endif +.if !defined(XFCE4_XARCHIVER_BUILDLINK3_MK) +XFCE4_XARCHIVER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-xarchiver} -BUILDLINK_PACKAGES+= xfce4-xarchiver -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-xarchiver - -.if ${XFCE4_XARCHIVER_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-xarchiver+= xfce4-xarchiver>=0.5.2nb1 BUILDLINK_PKGSRCDIR.xfce4-xarchiver?= ../../sysutils/xfce4-xarchiver -.endif # XFCE4_XARCHIVER_BUILDLINK3_MK .include "../../x11/libxfce4gui/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_XARCHIVER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-xarchiver diff --git a/sysutils/xfce4-xkb-plugin/buildlink3.mk b/sysutils/xfce4-xkb-plugin/buildlink3.mk index ff8de8d535e..ffd4b3d6700 100644 --- a/sysutils/xfce4-xkb-plugin/buildlink3.mk +++ b/sysutils/xfce4-xkb-plugin/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.14 2007/04/12 09:55:19 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:27 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_XKB_PLUGIN_BUILDLINK3_MK:= ${XFCE4_XKB_PLUGIN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-xkb-plugin -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-xkb-plugin -.endif +.if !defined(XFCE4_XKB_PLUGIN_BUILDLINK3_MK) +XFCE4_XKB_PLUGIN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-xkb-plugin} -BUILDLINK_PACKAGES+= xfce4-xkb-plugin -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-xkb-plugin - -.if ${XFCE4_XKB_PLUGIN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-xkb-plugin+= xfce4-xkb-plugin>=0.4.3 BUILDLINK_PKGSRCDIR.xfce4-xkb-plugin?= ../../sysutils/xfce4-xkb-plugin -.endif # XFCE4_XKB_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_XKB_PLUGIN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-xkb-plugin diff --git a/textproc/aiksaurus/buildlink3.mk b/textproc/aiksaurus/buildlink3.mk index e32fe0c48ab..dcad0d5b0d5 100644 --- a/textproc/aiksaurus/buildlink3.mk +++ b/textproc/aiksaurus/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:28 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -AIKSAURUS_BUILDLINK3_MK:= ${AIKSAURUS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= aiksaurus -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= aiksaurus -.endif +.if !defined(AIKSAURUS_BUILDLINK3_MK) +AIKSAURUS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Naiksaurus} -BUILDLINK_PACKAGES+= aiksaurus -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}aiksaurus - -.if !empty(AIKSAURUS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.aiksaurus+= aiksaurus>=1.2.1 BUILDLINK_PKGSRCDIR.aiksaurus?= ../../textproc/aiksaurus -.endif # AIKSAURUS_BUILDLINK3_MK +.endif # AIKSAURUS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -aiksaurus diff --git a/textproc/aspell/buildlink3.mk b/textproc/aspell/buildlink3.mk index d69a126dead..a814ef4bda3 100644 --- a/textproc/aspell/buildlink3.mk +++ b/textproc/aspell/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.14 2007/01/06 22:07:42 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:28 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ASPELL_BUILDLINK3_MK:= ${ASPELL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= aspell -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= aspell -.endif +.if !defined(ASPELL_BUILDLINK3_MK) +ASPELL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Naspell} -BUILDLINK_PACKAGES+= aspell -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}aspell - -.if ${ASPELL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.aspell+= aspell>=0.50.3 BUILDLINK_ABI_DEPENDS.aspell+= aspell>=0.60.4nb1 BUILDLINK_PKGSRCDIR.aspell?= ../../textproc/aspell -.endif # ASPELL_BUILDLINK3_MK BUILDLINK_FILES.aspell= bin/aspell bin/prezip-bin bin/word-list-compress +.endif # ASPELL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -aspell diff --git a/textproc/btparse/buildlink3.mk b/textproc/btparse/buildlink3.mk index d365e55313e..d5c2582361b 100644 --- a/textproc/btparse/buildlink3.mk +++ b/textproc/btparse/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:28 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BTPARSE_BUILDLINK3_MK:= ${BTPARSE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= btparse -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= btparse -.endif +.if !defined(BTPARSE_BUILDLINK3_MK) +BTPARSE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbtparse} -BUILDLINK_PACKAGES+= btparse -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}btparse - -.if !empty(BTPARSE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.btparse+= btparse>=0.34 BUILDLINK_PKGSRCDIR.btparse?= ../../textproc/btparse -.endif # BTPARSE_BUILDLINK3_MK +.endif # BTPARSE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -btparse diff --git a/textproc/chasen-base/buildlink3.mk b/textproc/chasen-base/buildlink3.mk index ffa8bda6091..259e0248f27 100644 --- a/textproc/chasen-base/buildlink3.mk +++ b/textproc/chasen-base/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:28 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CHASEN_BASE_BUILDLINK3_MK:= ${CHASEN_BASE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= chasen-base -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= chasen-base -.endif +.if !defined(CHASEN_BASE_BUILDLINK3_MK) +CHASEN_BASE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nchasen-base} -BUILDLINK_PACKAGES+= chasen-base -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}chasen-base - -.if !empty(CHASEN_BASE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.chasen-base+= chasen-base>=2.3.3 BUILDLINK_ABI_DEPENDS.chasen-base+= chasen-base>=2.3.3nb1 BUILDLINK_PKGSRCDIR.chasen-base?= ../../textproc/chasen-base -.endif # CHASEN_BASE_BUILDLINK3_MK .include "../../devel/darts/buildlink3.mk" +.endif # CHASEN_BASE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -chasen-base diff --git a/textproc/chasen/buildlink3.mk b/textproc/chasen/buildlink3.mk index 787d893639b..f1e048f622e 100644 --- a/textproc/chasen/buildlink3.mk +++ b/textproc/chasen/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:28 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CHASEN_BUILDLINK3_MK:= ${CHASEN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= chasen -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= chasen -.endif +.if !defined(CHASEN_BUILDLINK3_MK) +CHASEN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nchasen} -BUILDLINK_PACKAGES+= chasen -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}chasen - -.if !empty(CHASEN_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.chasen+= chasen>=2.0 BUILDLINK_PKGSRCDIR.chasen?= ../../textproc/chasen BUILDLINK_FILES.chasen= include/chasen.h BUILDLINK_FILES.chasen+= lib/libchasen.* -.endif # CHASEN_BUILDLINK3_MK +.endif # CHASEN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -chasen diff --git a/textproc/eb/buildlink3.mk b/textproc/eb/buildlink3.mk index 52605be5407..e16917a2381 100644 --- a/textproc/eb/buildlink3.mk +++ b/textproc/eb/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.13 2007/04/27 04:08:19 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:28 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EB_BUILDLINK3_MK:= ${EB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= eb -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= eb -.endif +.if !defined(EB_BUILDLINK3_MK) +EB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Neb} -BUILDLINK_PACKAGES+= eb -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}eb - -.if !empty(EB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.eb+= eb>=3.3.2nb1 BUILDLINK_ABI_DEPENDS.eb+= eb>=4.1.3nb1 BUILDLINK_PKGSRCDIR.eb?= ../../textproc/eb -.endif # EB_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.endif # EB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -eb diff --git a/textproc/ebook-tools/buildlink3.mk b/textproc/ebook-tools/buildlink3.mk index be261098e5a..045862cf0c9 100644 --- a/textproc/ebook-tools/buildlink3.mk +++ b/textproc/ebook-tools/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/10 22:20:23 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:28 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EBOOK_TOOLS_BUILDLINK3_MK:= ${EBOOK_TOOLS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ebook-tools -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= ebook-tools -.endif +.if !defined(EBOOK_TOOLS_BUILDLINK3_MK) +EBOOK_TOOLS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nebook-tools} -BUILDLINK_PACKAGES+= ebook-tools -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ebook-tools - -.if ${EBOOK_TOOLS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.ebook-tools+= ebook-tools>=0.1.1 BUILDLINK_PKGSRCDIR.ebook-tools?= ../../textproc/ebook-tools -.endif # EBOOK_TOOLS_BUILDLINK3_MK .include "../../archivers/libzip/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.endif # EBOOK_TOOLS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ebook-tools diff --git a/textproc/enca/buildlink3.mk b/textproc/enca/buildlink3.mk index e496e247c30..8a12f22a120 100644 --- a/textproc/enca/buildlink3.mk +++ b/textproc/enca/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/03/18 18:56:30 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:28 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ENCA_BUILDLINK3_MK:= ${ENCA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= enca -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= enca -.endif +.if !defined(ENCA_BUILDLINK3_MK) +ENCA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nenca} -BUILDLINK_PACKAGES+= enca -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}enca - -.if ${ENCA_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.enca+= enca>=1.9 BUILDLINK_PKGSRCDIR.enca?= ../../textproc/enca -.endif # ENCA_BUILDLINK3_MK +.endif # ENCA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -enca diff --git a/textproc/enchant/buildlink3.mk b/textproc/enchant/buildlink3.mk index da01847a78f..7546090660f 100644 --- a/textproc/enchant/buildlink3.mk +++ b/textproc/enchant/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.11 2008/04/14 11:35:50 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:28 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ENCHANT_BUILDLINK3_MK:= ${ENCHANT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= enchant -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= enchant -.endif +.if !defined(ENCHANT_BUILDLINK3_MK) +ENCHANT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nenchant} -BUILDLINK_PACKAGES+= enchant -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}enchant - -.if !empty(ENCHANT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.enchant+= enchant>=1.1.3 BUILDLINK_ABI_DEPENDS.enchant+= enchant>=1.1.6nb1 BUILDLINK_PKGSRCDIR.enchant?= ../../textproc/enchant -.endif # ENCHANT_BUILDLINK3_MK # spelling libraries are loaded dynamically and do not need # to be included here .include "../../devel/glib2/buildlink3.mk" +.endif # ENCHANT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -enchant diff --git a/textproc/expat/buildlink3.mk b/textproc/expat/buildlink3.mk index 1eb5c6a7a3b..1630d31c3da 100644 --- a/textproc/expat/buildlink3.mk +++ b/textproc/expat/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.18 2006/07/08 23:11:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2009/03/20 19:25:28 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EXPAT_BUILDLINK3_MK:= ${EXPAT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= expat -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= expat -.endif +.if !defined(EXPAT_BUILDLINK3_MK) +EXPAT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nexpat} -BUILDLINK_PACKAGES+= expat -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}expat - -.if !empty(EXPAT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.expat+= expat>=1.95.7 BUILDLINK_ABI_DEPENDS.expat+= expat>=2.0.0nb1 BUILDLINK_PKGSRCDIR.expat?= ../../textproc/expat -.endif # EXPAT_BUILDLINK3_MK +.endif # EXPAT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -expat diff --git a/textproc/gdome2/buildlink3.mk b/textproc/gdome2/buildlink3.mk index 38ffe5ddcf4..a539982272d 100644 --- a/textproc/gdome2/buildlink3.mk +++ b/textproc/gdome2/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:29 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GDOME2_BUILDLINK3_MK:= ${GDOME2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gdome2 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gdome2 -.endif +.if !defined(GDOME2_BUILDLINK3_MK) +GDOME2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngdome2} -BUILDLINK_PACKAGES+= gdome2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gdome2 - -.if !empty(GDOME2_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gdome2+= gdome2>=0.8.1nb1 BUILDLINK_ABI_DEPENDS.gdome2?= gdome2>=0.8.1nb2 BUILDLINK_PKGSRCDIR.gdome2?= ../../textproc/gdome2 -.endif # GDOME2_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.endif # GDOME2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gdome2 diff --git a/textproc/gnome-doc-utils/buildlink3.mk b/textproc/gnome-doc-utils/buildlink3.mk index 3de84313d5f..65c42804d74 100644 --- a/textproc/gnome-doc-utils/buildlink3.mk +++ b/textproc/gnome-doc-utils/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.12 2006/09/15 15:05:52 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:29 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNOME_DOC_UTILS_BUILDLINK3_MK:= ${GNOME_DOC_UTILS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnome-doc-utils -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnome-doc-utils -.endif +.if !defined(GNOME_DOC_UTILS_BUILDLINK3_MK) +GNOME_DOC_UTILS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-doc-utils} -BUILDLINK_PACKAGES+= gnome-doc-utils -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-doc-utils - -.if !empty(GNOME_DOC_UTILS_BUILDLINK3_MK:M+) BUILDLINK_DEPMETHOD.gnome-doc-utils+= build BUILDLINK_API_DEPENDS.gnome-doc-utils+= gnome-doc-utils>=0.8.0 BUILDLINK_PKGSRCDIR.gnome-doc-utils?= ../../textproc/gnome-doc-utils -.endif # GNOME_DOC_UTILS_BUILDLINK3_MK +.endif # GNOME_DOC_UTILS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnome-doc-utils diff --git a/textproc/gnome-spell/buildlink3.mk b/textproc/gnome-spell/buildlink3.mk index b636efc3ffb..756fe562065 100644 --- a/textproc/gnome-spell/buildlink3.mk +++ b/textproc/gnome-spell/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.19 2008/03/06 14:53:55 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2009/03/20 19:25:29 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNOME_SPELL_BUILDLINK3_MK:= ${GNOME_SPELL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnome-spell -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnome-spell -.endif +.if !defined(GNOME_SPELL_BUILDLINK3_MK) +GNOME_SPELL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-spell} -BUILDLINK_PACKAGES+= gnome-spell -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-spell - -.if !empty(GNOME_SPELL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gnome-spell+= gnome-spell>=1.0.5 BUILDLINK_ABI_DEPENDS.gnome-spell+= gnome-spell>=1.0.7nb4 BUILDLINK_PKGSRCDIR.gnome-spell?= ../../textproc/gnome-spell -.endif # GNOME_SPELL_BUILDLINK3_MK .include "../../devel/libbonobo/buildlink3.mk" .include "../../devel/libbonoboui/buildlink3.mk" @@ -24,5 +16,6 @@ BUILDLINK_PKGSRCDIR.gnome-spell?= ../../textproc/gnome-spell .include "../../net/ORBit2/buildlink3.mk" .include "../../textproc/aspell/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # GNOME_SPELL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnome-spell diff --git a/textproc/gtk-doc/buildlink3.mk b/textproc/gtk-doc/buildlink3.mk index 6c00b765631..264eabe78d7 100644 --- a/textproc/gtk-doc/buildlink3.mk +++ b/textproc/gtk-doc/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 23:11:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:29 joerg Exp $ # provided mostly for pkg-config -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GTK_DOC_BUILDLINK3_MK:= ${GTK_DOC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gtk-doc -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gtk-doc -.endif +.if !defined(GTK_DOC_BUILDLINK3_MK) +GTK_DOC_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtk-doc} -BUILDLINK_PACKAGES+= gtk-doc -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtk-doc - -.if !empty(GTK_DOC_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gtk-doc+= gtk-doc>=1.4nb1 BUILDLINK_PKGSRCDIR.gtk-doc?= ../../textproc/gtk-doc -.endif # GTK_DOC_BUILDLINK3_MK BUILDLINK_DEPMETHOD.gtk-doc?= build +.endif # GTK_DOC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gtk-doc diff --git a/textproc/gtkspell/buildlink3.mk b/textproc/gtkspell/buildlink3.mk index b35fdccaf43..fdd510c4f04 100644 --- a/textproc/gtkspell/buildlink3.mk +++ b/textproc/gtkspell/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.12 2008/05/30 12:28:42 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:29 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GTKSPELL_BUILDLINK3_MK:= ${GTKSPELL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gtkspell -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gtkspell -.endif +.if !defined(GTKSPELL_BUILDLINK3_MK) +GTKSPELL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtkspell} -BUILDLINK_PACKAGES+= gtkspell -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtkspell - -.if !empty(GTKSPELL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gtkspell+= gtkspell>=2.0.13 BUILDLINK_PKGSRCDIR.gtkspell?= ../../textproc/gtkspell -.endif # GTKSPELL_BUILDLINK3_MK .include "../../textproc/enchant/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # GTKSPELL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gtkspell diff --git a/textproc/hre/buildlink3.mk b/textproc/hre/buildlink3.mk index 7a5ba43806e..899d0a6052a 100644 --- a/textproc/hre/buildlink3.mk +++ b/textproc/hre/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:29 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -HRE_BUILDLINK3_MK:= ${HRE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= hre -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= hre -.endif +.if !defined(HRE_BUILDLINK3_MK) +HRE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nhre} -BUILDLINK_PACKAGES+= hre -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}hre - -.if !empty(HRE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.hre+= hre>=0.9.7 BUILDLINK_ABI_DEPENDS.hre+= hre>=0.9.8anb1 BUILDLINK_PKGSRCDIR.hre?= ../../textproc/hre -.endif # HRE_BUILDLINK3_MK +.endif # HRE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -hre diff --git a/textproc/hunspell/buildlink3.mk b/textproc/hunspell/buildlink3.mk index 1a3e299faf4..7dd4f26cc42 100644 --- a/textproc/hunspell/buildlink3.mk +++ b/textproc/hunspell/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/04/14 09:39:00 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:29 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -HUNSPELL_BUILDLINK3_MK:= ${HUNSPELL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= hunspell -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= hunspell -.endif +.if !defined(HUNSPELL_BUILDLINK3_MK) +HUNSPELL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nhunspell} -BUILDLINK_PACKAGES+= hunspell -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}hunspell - -.if ${HUNSPELL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.hunspell+= hunspell>=1.2.2 BUILDLINK_PKGSRCDIR.hunspell?= ../../textproc/hunspell -.endif # HUNSPELL_BUILDLINK3_MK +.endif # HUNSPELL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -hunspell diff --git a/textproc/hyperestraier/buildlink3.mk b/textproc/hyperestraier/buildlink3.mk index 1482ad35b44..b9bc41b9165 100644 --- a/textproc/hyperestraier/buildlink3.mk +++ b/textproc/hyperestraier/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.1 2006/11/17 15:11:31 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:29 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -HYPERESTRAIER_BUILDLINK3_MK:= ${HYPERESTRAIER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= hyperestraier -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= hyperestraier -.endif +.if !defined(HYPERESTRAIER_BUILDLINK3_MK) +HYPERESTRAIER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nhyperestraier} -BUILDLINK_PACKAGES+= hyperestraier -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}hyperestraier - -.if ${HYPERESTRAIER_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.hyperestraier+= hyperestraier>=1.1.2 BUILDLINK_PKGSRCDIR.hyperestraier?= ../../textproc/hyperestraier -.endif # HYPERESTRAIER_BUILDLINK3_MK .include "../../archivers/bzip2/buildlink3.mk" .include "../../archivers/lzo/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../databases/qdbm/buildlink3.mk" +.endif # HYPERESTRAIER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -hyperestraier diff --git a/textproc/icu/buildlink3.mk b/textproc/icu/buildlink3.mk index 1a4a48d2a10..2554e1603fa 100644 --- a/textproc/icu/buildlink3.mk +++ b/textproc/icu/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:11:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:29 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ICU_BUILDLINK3_MK:= ${ICU_BUILDLINK3_MK}+ +BUILDLINK_TREE+= icu -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= icu -.endif +.if !defined(ICU_BUILDLINK3_MK) +ICU_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nicu} -BUILDLINK_PACKAGES+= icu -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}icu - -.if !empty(ICU_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.icu+= icu>=3.4 BUILDLINK_ABI_DEPENDS.icu?= icu>=3.4nb1 BUILDLINK_PKGSRCDIR.icu?= ../../textproc/icu -.endif # ICU_BUILDLINK3_MK +.endif # ICU_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -icu diff --git a/textproc/iso-codes/buildlink3.mk b/textproc/iso-codes/buildlink3.mk index 6ddbf6340e1..f4f3161906e 100644 --- a/textproc/iso-codes/buildlink3.mk +++ b/textproc/iso-codes/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:29 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ISO_CODES_BUILDLINK3_MK:= ${ISO_CODES_BUILDLINK3_MK}+ +BUILDLINK_TREE+= iso-codes -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= iso-codes -.endif +.if !defined(ISO_CODES_BUILDLINK3_MK) +ISO_CODES_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Niso-codes} -BUILDLINK_PACKAGES+= iso-codes -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}iso-codes - -.if !empty(ISO_CODES_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.iso-codes+= iso-codes>=0.50 BUILDLINK_PKGSRCDIR.iso-codes?= ../../textproc/iso-codes -.endif # ISO_CODES_BUILDLINK3_MK +.endif # ISO_CODES_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -iso-codes diff --git a/textproc/jade/buildlink3.mk b/textproc/jade/buildlink3.mk index 5b5cf724563..db557abd62a 100644 --- a/textproc/jade/buildlink3.mk +++ b/textproc/jade/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:29 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -JADE_BUILDLINK3_MK:= ${JADE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= jade -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= jade -.endif +.if !defined(JADE_BUILDLINK3_MK) +JADE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Njade} -BUILDLINK_PACKAGES+= jade -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}jade - -.if !empty(JADE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.jade+= jade>=1.2.1nb7 BUILDLINK_ABI_DEPENDS.jade+= jade>=1.2.1nb10 BUILDLINK_PKGSRCDIR.jade?= ../../textproc/jade -.endif # JADE_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" +.endif # JADE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -jade diff --git a/textproc/json-glib/buildlink3.mk b/textproc/json-glib/buildlink3.mk index b8aff038507..d713300539b 100644 --- a/textproc/json-glib/buildlink3.mk +++ b/textproc/json-glib/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/05 13:07:14 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:30 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -JSON_GLIB_BUILDLINK3_MK:= ${JSON_GLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= json-glib -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= json-glib -.endif +.if !defined(JSON_GLIB_BUILDLINK3_MK) +JSON_GLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Njson-glib} -BUILDLINK_PACKAGES+= json-glib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}json-glib - -.if ${JSON_GLIB_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.json-glib+= json-glib>=0.6.2 BUILDLINK_PKGSRCDIR.json-glib?= ../../textproc/json-glib -.endif # JSON_GLIB_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" +.endif # JSON_GLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -json-glib diff --git a/textproc/kakasi/buildlink3.mk b/textproc/kakasi/buildlink3.mk index 2ec7796089b..b73e6def746 100644 --- a/textproc/kakasi/buildlink3.mk +++ b/textproc/kakasi/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:30 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -KAKASI_BUILDLINK3_MK:= ${KAKASI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= kakasi -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= kakasi -.endif +.if !defined(KAKASI_BUILDLINK3_MK) +KAKASI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkakasi} -BUILDLINK_PACKAGES+= kakasi -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kakasi - -.if !empty(KAKASI_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.kakasi+= kakasi>=2.3.0 BUILDLINK_ABI_DEPENDS.kakasi+= kakasi>=2.3.4nb4 BUILDLINK_PKGSRCDIR.kakasi?= ../../textproc/kakasi -.endif # KAKASI_BUILDLINK3_MK +.endif # KAKASI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -kakasi diff --git a/textproc/libclucene/buildlink3.mk b/textproc/libclucene/buildlink3.mk index 456f12a7e16..9d198ccf774 100644 --- a/textproc/libclucene/buildlink3.mk +++ b/textproc/libclucene/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/04 10:52:53 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:30 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBCLUCENE_BUILDLINK3_MK:= ${LIBCLUCENE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libclucene -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libclucene -.endif +.if !defined(LIBCLUCENE_BUILDLINK3_MK) +LIBCLUCENE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibclucene} -BUILDLINK_PACKAGES+= libclucene -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libclucene - -.if ${LIBCLUCENE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libclucene+= libclucene>=0.9.21 BUILDLINK_PKGSRCDIR.libclucene?= ../../textproc/libclucene -.endif # LIBCLUCENE_BUILDLINK3_MK +.endif # LIBCLUCENE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libclucene diff --git a/textproc/libcroco/buildlink3.mk b/textproc/libcroco/buildlink3.mk index f9b83caa12e..c4aec5d6ba8 100644 --- a/textproc/libcroco/buildlink3.mk +++ b/textproc/libcroco/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.21 2009/02/20 20:02:30 reed Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:25:30 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBCROCO_BUILDLINK3_MK:= ${LIBCROCO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libcroco -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libcroco -.endif +.if !defined(LIBCROCO_BUILDLINK3_MK) +LIBCROCO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcroco} -BUILDLINK_PACKAGES+= libcroco -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libcroco - -.if !empty(LIBCROCO_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libcroco+= libcroco>=0.6.0 BUILDLINK_ABI_DEPENDS.libcroco+= libcroco>=0.6.1nb7 BUILDLINK_PKGSRCDIR.libcroco?= ../../textproc/libcroco -.endif # LIBCROCO_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.endif # LIBCROCO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libcroco diff --git a/textproc/liblinebreak/buildlink3.mk b/textproc/liblinebreak/buildlink3.mk index aa38e32199b..c7537dd0414 100644 --- a/textproc/liblinebreak/buildlink3.mk +++ b/textproc/liblinebreak/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/18 17:38:15 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:30 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBLINEBREAK_BUILDLINK3_MK:= ${LIBLINEBREAK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= liblinebreak -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= liblinebreak -.endif +.if !defined(LIBLINEBREAK_BUILDLINK3_MK) +LIBLINEBREAK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nliblinebreak} -BUILDLINK_PACKAGES+= liblinebreak -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}liblinebreak - -.if ${LIBLINEBREAK_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.liblinebreak+= liblinebreak>=1.0 BUILDLINK_PKGSRCDIR.liblinebreak?= ../../textproc/liblinebreak -.endif # LIBLINEBREAK_BUILDLINK3_MK +.endif # LIBLINEBREAK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -liblinebreak diff --git a/textproc/liblrdf/buildlink3.mk b/textproc/liblrdf/buildlink3.mk index 57fbdc82737..21466127136 100644 --- a/textproc/liblrdf/buildlink3.mk +++ b/textproc/liblrdf/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1 2008/08/19 19:07:44 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:30 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBLRDF_BUILDLINK3_MK:= ${LIBLRDF_BUILDLINK3_MK}+ +BUILDLINK_TREE+= liblrdf -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= liblrdf -.endif +.if !defined(LIBLRDF_BUILDLINK3_MK) +LIBLRDF_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nliblrdf} -BUILDLINK_PACKAGES+= liblrdf -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}liblrdf - -.if ${LIBLRDF_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.liblrdf+= liblrdf>=0.4.0nb1 BUILDLINK_PKGSRCDIR.liblrdf?= ../../textproc/liblrdf -.endif # LIBLRDF_BUILDLINK3_MK .include "../../textproc/raptor/buildlink3.mk" +.endif # LIBLRDF_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -liblrdf diff --git a/textproc/libpathan/buildlink3.mk b/textproc/libpathan/buildlink3.mk index 7d785a2d32b..6a940c8a53d 100644 --- a/textproc/libpathan/buildlink3.mk +++ b/textproc/libpathan/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:11:11 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:30 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBPATHAN_BUILDLINK3_MK:= ${LIBPATHAN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libpathan -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libpathan -.endif +.if !defined(LIBPATHAN_BUILDLINK3_MK) +LIBPATHAN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibpathan} -BUILDLINK_PACKAGES+= libpathan -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libpathan - -.if !empty(LIBPATHAN_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libpathan+= libpathan>=1.2.2 BUILDLINK_ABI_DEPENDS.libpathan+= libpathan>=1.2.2nb2 BUILDLINK_PKGSRCDIR.libpathan?= ../../textproc/libpathan -.endif # LIBPATHAN_BUILDLINK3_MK .include "../../textproc/xerces-c/buildlink3.mk" +.endif # LIBPATHAN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libpathan diff --git a/textproc/libunicode/buildlink3.mk b/textproc/libunicode/buildlink3.mk index 9c1e25b2838..a02fa5ed53e 100644 --- a/textproc/libunicode/buildlink3.mk +++ b/textproc/libunicode/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:11 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:30 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBUNICODE_BUILDLINK3_MK:= ${LIBUNICODE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libunicode -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libunicode -.endif +.if !defined(LIBUNICODE_BUILDLINK3_MK) +LIBUNICODE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibunicode} -BUILDLINK_PACKAGES+= libunicode -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libunicode - -.if !empty(LIBUNICODE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libunicode+= libunicode>=0.4 BUILDLINK_ABI_DEPENDS.libunicode+= libunicode>=0.4nb1 BUILDLINK_PKGSRCDIR.libunicode?= ../../textproc/libunicode -.endif # LIBUNICODE_BUILDLINK3_MK +.endif # LIBUNICODE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libunicode diff --git a/textproc/libxml++/buildlink3.mk b/textproc/libxml++/buildlink3.mk index fc247a43e03..9016002fa19 100644 --- a/textproc/libxml++/buildlink3.mk +++ b/textproc/libxml++/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.3 2007/09/20 21:03:51 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:31 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXMLPP_BUILDLINK3_MK:= ${LIBXMLPP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libxmlpp -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libxmlpp -.endif +.if !defined(LIBXMLPP_BUILDLINK3_MK) +LIBXMLPP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxmlpp} -BUILDLINK_PACKAGES+= libxmlpp -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxmlpp - -.if !empty(LIBXMLPP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libxmlpp+= libxml++>=2.10.0 BUILDLINK_ABI_DEPENDS.libxmlpp+= libxml++>=2.10.0nb1 BUILDLINK_PKGSRCDIR.libxmlpp?= ../../textproc/libxml++ -.endif # LIBXMLPP_BUILDLINK3_MK .include "../../textproc/libxml2/buildlink3.mk" .include "../../devel/glibmm/buildlink3.mk" +.endif # LIBXMLPP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libxmlpp diff --git a/textproc/libxml++1/buildlink3.mk b/textproc/libxml++1/buildlink3.mk index fb4ff633373..f93566926f0 100644 --- a/textproc/libxml++1/buildlink3.mk +++ b/textproc/libxml++1/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/09/20 21:03:52 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:31 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXMLPP1_BUILDLINK3_MK:= ${LIBXMLPP1_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libxmlpp1 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libxmlpp1 -.endif +.if !defined(LIBXMLPP1_BUILDLINK3_MK) +LIBXMLPP1_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxmlpp1} -BUILDLINK_PACKAGES+= libxmlpp1 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxmlpp1 - -.if ${LIBXMLPP1_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libxmlpp1+= libxml++1>=1.0.5 BUILDLINK_PKGSRCDIR.libxmlpp1?= ../../textproc/libxml++1 -.endif # LIBXMLPP1_BUILDLINK3_MK .include "../../textproc/libxml2/buildlink3.mk" +.endif # LIBXMLPP1_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libxmlpp1 diff --git a/textproc/libxml/buildlink3.mk b/textproc/libxml/buildlink3.mk index fad1bf8eab6..0ff9f0b1bbd 100644 --- a/textproc/libxml/buildlink3.mk +++ b/textproc/libxml/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:11:11 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:30 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXML_BUILDLINK3_MK:= ${LIBXML_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libxml -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libxml -.endif +.if !defined(LIBXML_BUILDLINK3_MK) +LIBXML_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxml} -BUILDLINK_PACKAGES+= libxml -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxml - -.if !empty(LIBXML_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libxml+= libxml>=1.8.11 BUILDLINK_ABI_DEPENDS.libxml+= libxml>=1.8.17nb3 BUILDLINK_FILES.libxml+= include/gnome-xml/libxml/*.h BUILDLINK_PKGSRCDIR.libxml?= ../../textproc/libxml -.endif # LIBXML_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" +.endif # LIBXML_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libxml diff --git a/textproc/libxml2/buildlink3.mk b/textproc/libxml2/buildlink3.mk index fa8b727385b..0769e7abb53 100644 --- a/textproc/libxml2/buildlink3.mk +++ b/textproc/libxml2/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.16 2009/03/16 23:17:14 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:25:31 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXML2_BUILDLINK3_MK:= ${LIBXML2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libxml2 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libxml2 -.endif +.if !defined(LIBXML2_BUILDLINK3_MK) +LIBXML2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxml2} -BUILDLINK_PACKAGES+= libxml2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxml2 - -.if !empty(LIBXML2_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.6.2 BUILDLINK_ABI_DEPENDS.libxml2+= libxml2>=2.6.23nb1 BUILDLINK_PKGSRCDIR.libxml2?= ../../textproc/libxml2 @@ -19,9 +12,9 @@ BUILDLINK_PKGSRCDIR.libxml2?= ../../textproc/libxml2 BUILDLINK_FILES.libxml2+= bin/xml2-config USE_FEATURES+= glob -.endif # LIBXML2_BUILDLINK3_MK .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.endif # LIBXML2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libxml2 diff --git a/textproc/libxslt/buildlink3.mk b/textproc/libxslt/buildlink3.mk index 51a160226ca..9dc5976f376 100644 --- a/textproc/libxslt/buildlink3.mk +++ b/textproc/libxslt/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 23:11:11 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:25:31 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXSLT_BUILDLINK3_MK:= ${LIBXSLT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libxslt -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libxslt -.endif +.if !defined(LIBXSLT_BUILDLINK3_MK) +LIBXSLT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxslt} -BUILDLINK_PACKAGES+= libxslt -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxslt - -.if !empty(LIBXSLT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libxslt+= libxslt>=1.1.8 BUILDLINK_ABI_DEPENDS.libxslt+= libxslt>=1.1.15nb1 BUILDLINK_PKGSRCDIR.libxslt?= ../../textproc/libxslt -.endif # LIBXSLT_BUILDLINK3_MK .include "../../security/libgcrypt/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.endif # LIBXSLT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libxslt diff --git a/textproc/link-grammar/buildlink3.mk b/textproc/link-grammar/buildlink3.mk index e73fdd67eb9..21718e6d34d 100644 --- a/textproc/link-grammar/buildlink3.mk +++ b/textproc/link-grammar/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1 2008/04/14 22:25:55 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:31 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LINK_GRAMMAR_BUILDLINK3_MK:= ${LINK_GRAMMAR_BUILDLINK3_MK}+ +BUILDLINK_TREE+= link-grammar -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= link-grammar -.endif +.if !defined(LINK_GRAMMAR_BUILDLINK3_MK) +LINK_GRAMMAR_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlink-grammar} -BUILDLINK_PACKAGES+= link-grammar -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}link-grammar - -.if ${LINK_GRAMMAR_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.link-grammar+= link-grammar>=4.3.4 BUILDLINK_PKGSRCDIR.link-grammar?= ../../textproc/link-grammar -.endif # LINK_GRAMMAR_BUILDLINK3_MK +.endif # LINK_GRAMMAR_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -link-grammar diff --git a/textproc/mecab-base/buildlink3.mk b/textproc/mecab-base/buildlink3.mk index 1f195a86996..e396fc8ce0f 100644 --- a/textproc/mecab-base/buildlink3.mk +++ b/textproc/mecab-base/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/05/12 13:47:03 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:31 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MECAB_BASE_BUILDLINK3_MK:= ${MECAB_BASE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= mecab-base -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= mecab-base -.endif +.if !defined(MECAB_BASE_BUILDLINK3_MK) +MECAB_BASE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmecab-base} -BUILDLINK_PACKAGES+= mecab-base -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mecab-base - -.if ${MECAB_BASE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.mecab-base+= mecab-base>=0.90 BUILDLINK_PKGSRCDIR.mecab-base?= ../../textproc/mecab-base BUILDLINK_FILES.mecab-base+= include/mecab.h BUILDLINK_FILES.mecab-base+= lib/libmecab.* -.endif # MECAB_BASE_BUILDLINK3_MK .include "../../mk/pthread.buildlink3.mk" +.endif # MECAB_BASE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -mecab-base diff --git a/textproc/mecab/buildlink3.mk b/textproc/mecab/buildlink3.mk index fda3b775696..e5a56e36801 100644 --- a/textproc/mecab/buildlink3.mk +++ b/textproc/mecab/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/05/12 13:48:24 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:31 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MECAB_BUILDLINK3_MK:= ${MECAB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= mecab -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= mecab -.endif +.if !defined(MECAB_BUILDLINK3_MK) +MECAB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmecab} -BUILDLINK_PACKAGES+= mecab -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mecab - -.if ${MECAB_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.mecab+= mecab>=0.90 BUILDLINK_PKGSRCDIR.mecab?= ../../textproc/mecab -.endif # MECAB_BUILDLINK3_MK .include "../../textproc/mecab-base/buildlink3.mk" +.endif # MECAB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -mecab diff --git a/textproc/mxml/buildlink3.mk b/textproc/mxml/buildlink3.mk index 97d2131afce..87a07047e1d 100644 --- a/textproc/mxml/buildlink3.mk +++ b/textproc/mxml/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/10/12 17:30:04 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:31 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MXML_BUILDLINK3_MK:= ${MXML_BUILDLINK3_MK}+ +BUILDLINK_TREE+= mxml -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= mxml -.endif +.if !defined(MXML_BUILDLINK3_MK) +MXML_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmxml} -BUILDLINK_PACKAGES+= mxml -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mxml - -.if ${MXML_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.mxml+= mxml>=2.3 BUILDLINK_PKGSRCDIR.mxml?= ../../textproc/mxml -.endif # MXML_BUILDLINK3_MK +.endif # MXML_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -mxml diff --git a/textproc/oniguruma/buildlink3.mk b/textproc/oniguruma/buildlink3.mk index 4a0189b3e09..218994e04ab 100644 --- a/textproc/oniguruma/buildlink3.mk +++ b/textproc/oniguruma/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/08/09 17:52:57 ahoka Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:31 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -ONIGURUMA_BUILDLINK3_MK:= ${ONIGURUMA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= oniguruma -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= oniguruma -.endif +.if !defined(ONIGURUMA_BUILDLINK3_MK) +ONIGURUMA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Noniguruma} -BUILDLINK_PACKAGES+= oniguruma -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}oniguruma - -.if ${ONIGURUMA_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.oniguruma+= oniguruma>=5.9.1 BUILDLINK_PKGSRCDIR.oniguruma?= ../../textproc/oniguruma -.endif # ONIGURUMA_BUILDLINK3_MK +.endif # ONIGURUMA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -oniguruma diff --git a/textproc/opensp/buildlink3.mk b/textproc/opensp/buildlink3.mk index fa153c0f7a8..be5210cbd2e 100644 --- a/textproc/opensp/buildlink3.mk +++ b/textproc/opensp/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:11 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:32 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OPENSP_BUILDLINK3_MK:= ${OPENSP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= opensp -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= opensp -.endif +.if !defined(OPENSP_BUILDLINK3_MK) +OPENSP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopensp} -BUILDLINK_PACKAGES+= opensp -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}opensp - -.if !empty(OPENSP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.opensp+= opensp>=1.5.1 BUILDLINK_ABI_DEPENDS.opensp+= opensp>=1.5.1nb3 BUILDLINK_PKGSRCDIR.opensp?= ../../textproc/opensp -.endif # OPENSP_BUILDLINK3_MK PTHREAD_OPTS+= require .include "../../devel/gettext-lib/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.endif # OPENSP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -opensp diff --git a/textproc/py-elementtree/buildlink3.mk b/textproc/py-elementtree/buildlink3.mk index 8cb0cf6dc34..cfea71408be 100644 --- a/textproc/py-elementtree/buildlink3.mk +++ b/textproc/py-elementtree/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:12 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:32 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_ELEMENTTREE_BUILDLINK3_MK:= ${PY_ELEMENTTREE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= py-elementtree -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= py-elementtree -.endif +.if !defined(PY_ELEMENTTREE_BUILDLINK3_MK) +PY_ELEMENTTREE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-elementtree} -BUILDLINK_PACKAGES+= py-elementtree -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-elementtree - -.if ${PY_ELEMENTTREE_BUILDLINK3_MK} == "+" .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.py-elementtree+= ${PYPKGPREFIX}-elementtree>=1.2.6nb3 BUILDLINK_PKGSRCDIR.py-elementtree= ../../textproc/py-elementtree -.endif # PY_ELEMENTTREE_BUILDLINK3_MK +.endif # PY_ELEMENTTREE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -py-elementtree diff --git a/textproc/py-libxml2/buildlink3.mk b/textproc/py-libxml2/buildlink3.mk index 3b4b58c8abe..24746cec185 100644 --- a/textproc/py-libxml2/buildlink3.mk +++ b/textproc/py-libxml2/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:12 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:32 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_LIBXML2_BUILDLINK3_MK:= ${PY_LIBXML2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= py-libxml2 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= py-libxml2 -.endif +.if !defined(PY_LIBXML2_BUILDLINK3_MK) +PY_LIBXML2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-libxml2} -BUILDLINK_PACKAGES+= py-libxml2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-libxml2 - -.if ${PY_LIBXML2_BUILDLINK3_MK} == "+" .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.py-libxml2+= ${PYPKGPREFIX}-libxml2>=2.6.27 BUILDLINK_PKGSRCDIR.py-libxml2?= ../../textproc/py-libxml2 -.endif # PY_LIBXML2_BUILDLINK3_MK +.endif # PY_LIBXML2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -py-libxml2 diff --git a/textproc/py-xml/buildlink3.mk b/textproc/py-xml/buildlink3.mk index 3a8fe4c9b2d..94abda313b3 100644 --- a/textproc/py-xml/buildlink3.mk +++ b/textproc/py-xml/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 17:30:12 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:32 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PYXML_BUILDLINK3_MK:= ${PYXML_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pyxml -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pyxml -.endif +.if !defined(PYXML_BUILDLINK3_MK) +PYXML_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyxml} -BUILDLINK_PACKAGES+= pyxml -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyxml - -.if !empty(PYXML_BUILDLINK3_MK:M+) .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pyxml+= ${PYPKGPREFIX}-xml>=0.8.3nb1 BUILDLINK_ABI_DEPENDS.pyxml?= ${PYPKGPREFIX}-xml>=0.8.4nb2 BUILDLINK_PKGSRCDIR.pyxml?= ../../textproc/py-xml -.endif # PYXML_BUILDLINK3_MK .include "../../textproc/expat/buildlink3.mk" +.endif # PYXML_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pyxml diff --git a/textproc/raptor/buildlink3.mk b/textproc/raptor/buildlink3.mk index 45dd8b9b1df..41ebb3c8f55 100644 --- a/textproc/raptor/buildlink3.mk +++ b/textproc/raptor/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.11 2008/05/09 21:45:23 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:32 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -RAPTOR_BUILDLINK3_MK:= ${RAPTOR_BUILDLINK3_MK}+ +BUILDLINK_TREE+= raptor -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= raptor -.endif +.if !defined(RAPTOR_BUILDLINK3_MK) +RAPTOR_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nraptor} -BUILDLINK_PACKAGES+= raptor -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}raptor - -.if ${RAPTOR_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.raptor?= raptor>=1.0.0 BUILDLINK_ABI_DEPENDS.raptor+= raptor>=1.4.15nb1 BUILDLINK_PKGSRCDIR.raptor?= ../../textproc/raptor -.endif # RAPTOR_BUILDLINK3_MK .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" .include "../../www/curl/buildlink3.mk" +.endif # RAPTOR_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -raptor diff --git a/textproc/rarian/buildlink3.mk b/textproc/rarian/buildlink3.mk index 415dc5bee1e..ec0a4ecbfc0 100644 --- a/textproc/rarian/buildlink3.mk +++ b/textproc/rarian/buildlink3.mk @@ -1,22 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.2 2007/11/05 17:06:33 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:32 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -RARIAN_BUILDLINK3_MK:= ${RARIAN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= rarian -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= rarian -.endif +.if !defined(RARIAN_BUILDLINK3_MK) +RARIAN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrarian} -BUILDLINK_PACKAGES+= rarian -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rarian - -.if ${RARIAN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.rarian+= rarian>=0.6.0 BUILDLINK_PKGSRCDIR.rarian?= ../../textproc/rarian -.endif # RARIAN_BUILDLINK3_MK -.if !empty(RARIAN_BUILDLINK3_MK:M+) BUILDLINK_TARGETS+= rarian-buildlink-fake rarian-buildlink-fake: @@ -36,6 +27,6 @@ rarian-buildlink-fake: ${CHMOD} +x ${BUILDLINK_DIR}/bin/$${fake}; \ fi; \ done -.endif # RARIAN_BUILDLINK3_MK +.endif # RARIAN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -rarian diff --git a/textproc/rasqal/buildlink3.mk b/textproc/rasqal/buildlink3.mk index c580695ca13..27cb545f26a 100644 --- a/textproc/rasqal/buildlink3.mk +++ b/textproc/rasqal/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/01/07 21:33:37 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:32 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -RASQAL_BUILDLINK3_MK:= ${RASQAL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= rasqal -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= rasqal -.endif +.if !defined(RASQAL_BUILDLINK3_MK) +RASQAL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrasqal} -BUILDLINK_PACKAGES+= rasqal -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rasqal - -.if ${RASQAL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.rasqal+= rasqal>=0.9.16 BUILDLINK_PKGSRCDIR.rasqal?= ../../textproc/rasqal -.endif # RASQAL_BUILDLINK3_MK .include "../../textproc/raptor/buildlink3.mk" .include "../../devel/pcre/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.endif # RASQAL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -rasqal diff --git a/textproc/redland/buildlink3.mk b/textproc/redland/buildlink3.mk index bc010794240..1dac5ba5423 100644 --- a/textproc/redland/buildlink3.mk +++ b/textproc/redland/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/04 10:39:40 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:32 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -REDLAND_BUILDLINK3_MK:= ${REDLAND_BUILDLINK3_MK}+ +BUILDLINK_TREE+= redland -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= redland -.endif +.if !defined(REDLAND_BUILDLINK3_MK) +REDLAND_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nredland} -BUILDLINK_PACKAGES+= redland -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}redland - -.if ${REDLAND_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.redland+= redland>=1.0.7 BUILDLINK_PKGSRCDIR.redland?= ../../textproc/redland -.endif # REDLAND_BUILDLINK3_MK .include "../../security/openssl/buildlink3.mk" .include "../../textproc/raptor/buildlink3.mk" .include "../../textproc/rasqal/buildlink3.mk" .include "../../mk/bdb.buildlink3.mk" +.endif # REDLAND_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -redland diff --git a/textproc/ruby-eruby/buildlink3.mk b/textproc/ruby-eruby/buildlink3.mk index f15827c59c7..8e48264499b 100644 --- a/textproc/ruby-eruby/buildlink3.mk +++ b/textproc/ruby-eruby/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:11 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:32 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -RUBY_ERUBY_BUILDLINK3_MK:= ${RUBY_ERUBY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ${RUBY_PKGPREFIX}-eruby -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ${RUBY_PKGPREFIX}-eruby -.endif +.if !defined(RUBY_ERUBY_BUILDLINK3_MK) +RUBY_ERUBY_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:N${RUBY_PKGPREFIX}-eruby} -BUILDLINK_PACKAGES+= ${RUBY_PKGPREFIX}-eruby -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}${RUBY_PKGPREFIX}-eruby - -.if !empty(RUBY_ERUBY_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ruby18-eruby+= ${RUBY_PKGPREFIX}-eruby>=0.9.7 BUILDLINK_PKGSRCDIR.ruby18-eruby?= ../../textproc/ruby-eruby -.endif # RUBY_ERUBY_BUILDLINK3_MK +.endif # RUBY_ERUBY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -${RUBY_PKGPREFIX}-eruby diff --git a/textproc/ruby-rdtool/buildlink3.mk b/textproc/ruby-rdtool/buildlink3.mk index 34f6284d626..06e8a8a20e5 100644 --- a/textproc/ruby-rdtool/buildlink3.mk +++ b/textproc/ruby-rdtool/buildlink3.mk @@ -1,18 +1,9 @@ -# $NetBSD: buildlink3.mk,v 1.10 2009/03/19 15:34:41 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:32 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +BUILDLINK_TREE+= ${RUBY_PKGPREFIX}-rdtool -RUBY_RDTOOL_BUILDLINK3_MK:= ${RUBY_RDTOOL_BUILDLINK3_MK}+ - -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ${RUBY_PKGPREFIX}-rdtool -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:N${RUBY_PKGPREFIX}-rdtool} -BUILDLINK_PACKAGES+= ${RUBY_PKGPREFIX}-rdtool -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}${RUBY_PKGPREFIX}-rdtool - -.if !empty(RUBY_RDTOOL_BUILDLINK3_MK:M+) +.if !defined(RUBY_RDTOOL_BUILDLINK3_MK) +RUBY_RDTOOL_BUILDLINK3_MK:= RUBY_RD= rd2 RUBY_RD_VERSION = 0.6.18 @@ -27,4 +18,4 @@ BUILDLINK_API_DEPENDS.ruby18-rdtool+= {${RUBY_RD_LIST}}>=0.6.14 BUILDLINK_PKGSRCDIR.ruby18-rdtool?= ../../textproc/ruby-rdtool .endif # RUBY_RDTOOL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -${RUBY_PKGPREFIX}-rdtool diff --git a/textproc/sablotron/buildlink3.mk b/textproc/sablotron/buildlink3.mk index 4375ed3f31f..109fb438ab8 100644 --- a/textproc/sablotron/buildlink3.mk +++ b/textproc/sablotron/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:11 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:33 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SABLOTRON_BUILDLINK3_MK:= ${SABLOTRON_BUILDLINK3_MK}+ +BUILDLINK_TREE+= sablotron -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= sablotron -.endif +.if !defined(SABLOTRON_BUILDLINK3_MK) +SABLOTRON_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsablotron} -BUILDLINK_PACKAGES+= sablotron -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sablotron - -.if !empty(SABLOTRON_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.sablotron+= sablotron>=1.0 BUILDLINK_ABI_DEPENDS.sablotron+= sablotron>=1.0.2nb2 BUILDLINK_PKGSRCDIR.sablotron?= ../../textproc/sablotron -.endif # SABLOTRON_BUILDLINK3_MK .include "../../converters/libiconv/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" +.endif # SABLOTRON_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -sablotron diff --git a/textproc/sary/buildlink3.mk b/textproc/sary/buildlink3.mk index 9eb9215cebf..eee46436345 100644 --- a/textproc/sary/buildlink3.mk +++ b/textproc/sary/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/03/01 08:29:07 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:33 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SARY_BUILDLINK3_MK:= ${SARY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= sary -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= sary -.endif +.if !defined(SARY_BUILDLINK3_MK) +SARY_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsary} -BUILDLINK_PACKAGES+= sary -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sary - -.if ${SARY_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.sary+= sary>=1.2.0 BUILDLINK_PKGSRCDIR.sary?= ../../textproc/sary -.endif # SARY_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" +.endif # SARY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -sary diff --git a/textproc/soprano/buildlink3.mk b/textproc/soprano/buildlink3.mk index f541d88ee50..4f40fbb5564 100644 --- a/textproc/soprano/buildlink3.mk +++ b/textproc/soprano/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/04 11:01:41 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:33 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SOPRANO_BUILDLINK3_MK:= ${SOPRANO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= soprano -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= soprano -.endif +.if !defined(SOPRANO_BUILDLINK3_MK) +SOPRANO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsoprano} -BUILDLINK_PACKAGES+= soprano -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}soprano - -.if ${SOPRANO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.soprano+= soprano>=2.0.3 BUILDLINK_PKGSRCDIR.soprano?= ../../textproc/soprano -.endif # SOPRANO_BUILDLINK3_MK .include "../../textproc/libclucene/buildlink3.mk" .include "../../x11/qt4-libs/buildlink3.mk" .include "../../x11/qt4-qdbus/buildlink3.mk" +.endif # SOPRANO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -soprano diff --git a/textproc/sublib/buildlink3.mk b/textproc/sublib/buildlink3.mk index 49e892983ef..6ecbdcea2b0 100644 --- a/textproc/sublib/buildlink3.mk +++ b/textproc/sublib/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/06 08:54:21 kefren Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:33 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SUBLIB_BUILDLINK3_MK:= ${SUBLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= sublib -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= sublib -.endif +.if !defined(SUBLIB_BUILDLINK3_MK) +SUBLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsublib} -BUILDLINK_PACKAGES+= sublib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sublib - -.if ${SUBLIB_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.sublib+= sublib>=0.9 BUILDLINK_PKGSRCDIR.sublib?= ../../textproc/sublib -.endif # SUBLIB_BUILDLINK3_MK .include "../../lang/mono/buildlink3.mk" +.endif # SUBLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -sublib diff --git a/textproc/tokyodystopia/buildlink3.mk b/textproc/tokyodystopia/buildlink3.mk index b7a41279804..ad567cfc2b1 100644 --- a/textproc/tokyodystopia/buildlink3.mk +++ b/textproc/tokyodystopia/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.4 2008/12/15 11:18:41 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:33 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TOKYODYSTOPIA_BUILDLINK3_MK:= ${TOKYODYSTOPIA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= tokyodystopia -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= tokyodystopia -.endif +.if !defined(TOKYODYSTOPIA_BUILDLINK3_MK) +TOKYODYSTOPIA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntokyodystopia} -BUILDLINK_PACKAGES+= tokyodystopia -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tokyodystopia - -.if ${TOKYODYSTOPIA_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.tokyodystopia+= tokyodystopia>=0.9.5 BUILDLINK_ABI_DEPENDS.tokyodystopia+= tokyodystopia>=0.9.8nb2 BUILDLINK_PKGSRCDIR.tokyodystopia?= ../../textproc/tokyodystopia -.endif # TOKYODYSTOPIA_BUILDLINK3_MK .include "../../databases/tokyocabinet/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../archivers/bzip2/buildlink3.mk" +.endif # TOKYODYSTOPIA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -tokyodystopia diff --git a/textproc/uriparser/buildlink3.mk b/textproc/uriparser/buildlink3.mk index 514118a0811..b4373345ee1 100644 --- a/textproc/uriparser/buildlink3.mk +++ b/textproc/uriparser/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/11/08 18:36:14 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:33 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -URIPARSER_BUILDLINK3_MK:= ${URIPARSER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= uriparser -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= uriparser -.endif +.if !defined(URIPARSER_BUILDLINK3_MK) +URIPARSER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nuriparser} -BUILDLINK_PACKAGES+= uriparser -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}uriparser - -.if ${URIPARSER_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.uriparser+= uriparser>=0.6.0 BUILDLINK_PKGSRCDIR.uriparser?= ../../textproc/uriparser -.endif # URIPARSER_BUILDLINK3_MK +.endif # URIPARSER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -uriparser diff --git a/textproc/wbxml2/buildlink3.mk b/textproc/wbxml2/buildlink3.mk index eff6449c9af..95b321ef5e9 100644 --- a/textproc/wbxml2/buildlink3.mk +++ b/textproc/wbxml2/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/01/12 14:05:17 dillo Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:33 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -WBXML2_BUILDLINK3_MK:= ${WBXML2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= wbxml2 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= wbxml2 -.endif +.if !defined(WBXML2_BUILDLINK3_MK) +WBXML2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nwbxml2} -BUILDLINK_PACKAGES+= wbxml2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wbxml2 - -.if ${WBXML2_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.wbxml2+= wbxml2>=0.9.2 BUILDLINK_PKGSRCDIR.wbxml2?= ../../textproc/wbxml2 -.endif # WBXML2_BUILDLINK3_MK .include "../../textproc/expat/buildlink3.mk" +.endif # WBXML2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -wbxml2 diff --git a/textproc/xalan-c/buildlink3.mk b/textproc/xalan-c/buildlink3.mk index dc5ade4b298..e6b58ec6a6a 100644 --- a/textproc/xalan-c/buildlink3.mk +++ b/textproc/xalan-c/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:11 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:33 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XALAN_C_BUILDLINK3_MK:= ${XALAN_C_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xalan-c -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= xalan-c -.endif +.if !defined(XALAN_C_BUILDLINK3_MK) +XALAN_C_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxalan-c} -BUILDLINK_PACKAGES+= xalan-c -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xalan-c - -.if !empty(XALAN_C_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.xalan-c+= xalan-c>=1.6nb3 BUILDLINK_ABI_DEPENDS.xalan-c?= xalan-c>=1.6nb4 BUILDLINK_PKGSRCDIR.xalan-c?= ../../textproc/xalan-c -.endif # XALAN_C_BUILDLINK3_MK .include "../../textproc/icu/buildlink3.mk" .include "../../textproc/xerces-c/buildlink3.mk" +.endif # XALAN_C_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xalan-c diff --git a/textproc/xapian/buildlink3.mk b/textproc/xapian/buildlink3.mk index 781a08c1d7d..d4f0f26b607 100644 --- a/textproc/xapian/buildlink3.mk +++ b/textproc/xapian/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/07/26 23:35:05 schmonz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:33 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XAPIAN_BUILDLINK3_MK:= ${XAPIAN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xapian -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xapian -.endif +.if !defined(XAPIAN_BUILDLINK3_MK) +XAPIAN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxapian} -BUILDLINK_PACKAGES+= xapian -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xapian - -.if ${XAPIAN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xapian+= xapian>=1.0.7 BUILDLINK_PKGSRCDIR.xapian?= ../../textproc/xapian -.endif # XAPIAN_BUILDLINK3_MK +.endif # XAPIAN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xapian diff --git a/textproc/xerces-c/buildlink3.mk b/textproc/xerces-c/buildlink3.mk index c81c2d39e5c..2cd6b0a0400 100644 --- a/textproc/xerces-c/buildlink3.mk +++ b/textproc/xerces-c/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/08/10 13:44:21 abs Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:33 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XERCES_C_BUILDLINK3_MK:= ${XERCES_C_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xerces-c -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= xerces-c -.endif +.if !defined(XERCES_C_BUILDLINK3_MK) +XERCES_C_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxerces-c} -BUILDLINK_PACKAGES+= xerces-c -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xerces-c - -.if !empty(XERCES_C_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.xerces-c+= xerces-c>=2.7.0 BUILDLINK_ABI_DEPENDS.xerces-c?= xerces-c>=2.7.0 BUILDLINK_PKGSRCDIR.xerces-c?= ../../textproc/xerces-c -.endif # XERCES_C_BUILDLINK3_MK .include "../../converters/libiconv/buildlink3.mk" +.endif # XERCES_C_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xerces-c diff --git a/textproc/xfce4-dict-plugin/buildlink3.mk b/textproc/xfce4-dict-plugin/buildlink3.mk index a8a981890bb..87990ac02c7 100644 --- a/textproc/xfce4-dict-plugin/buildlink3.mk +++ b/textproc/xfce4-dict-plugin/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/04/27 10:48:06 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:34 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_DICT_PLUGIN_BUILDLINK3_MK:= ${XFCE4_DICT_PLUGIN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-dict-plugin -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-dict-plugin -.endif +.if !defined(XFCE4_DICT_PLUGIN_BUILDLINK3_MK) +XFCE4_DICT_PLUGIN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-dict-plugin} -BUILDLINK_PACKAGES+= xfce4-dict-plugin -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-dict-plugin - -.if ${XFCE4_DICT_PLUGIN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-dict-plugin+= xfce4-dict-plugin>=0.2.1 BUILDLINK_PKGSRCDIR.xfce4-dict-plugin?= ../../textproc/xfce4-dict-plugin -.endif # XFCE4_DICT_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_DICT_PLUGIN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-dict-plugin diff --git a/textproc/xmlcatmgr/buildlink3.mk b/textproc/xmlcatmgr/buildlink3.mk index 57416be2337..41f88a5fa1c 100644 --- a/textproc/xmlcatmgr/buildlink3.mk +++ b/textproc/xmlcatmgr/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:11 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:34 joerg Exp $ # # This Makefile fragment is included by packages that use xmlcatmgr. # @@ -12,18 +12,11 @@ # type of tool they are. # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XMLCATMGR_BUILDLINK3_MK:= ${XMLCATMGR_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xmlcatmgr -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= xmlcatmgr -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxmlcatmgr} -BUILDLINK_PACKAGES+= xmlcatmgr -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xmlcatmgr +.if !defined(XMLCATMGR_BUILDLINK3_MK) +XMLCATMGR_BUILDLINK3_MK:= -.if !empty(XMLCATMGR_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.xmlcatmgr+= xmlcatmgr>=2.0beta1 BUILDLINK_PKGSRCDIR.xmlcatmgr?= ../../textproc/xmlcatmgr @@ -43,7 +36,6 @@ XML_DEFAULT_CATALOG= ${PKG_SYSCONFBASEDIR}/xml/catalog PRINT_PLIST_AWK+= /^@dirrm share\/(sgml|xml)$$/ \ { print "@comment in xmlcatmgr: " $$0; next } +.endif # XMLCATMGR_BUILDLINK3_MK -.endif # XMLCATMGR_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xmlcatmgr diff --git a/textproc/xmlrpc-c/buildlink3.mk b/textproc/xmlrpc-c/buildlink3.mk index 41ea0aecacd..3ec45a46bb3 100644 --- a/textproc/xmlrpc-c/buildlink3.mk +++ b/textproc/xmlrpc-c/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/01/18 05:09:46 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:34 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XMLRPC_C_BUILDLINK3_MK:= ${XMLRPC_C_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xmlrpc-c -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xmlrpc-c -.endif +.if !defined(XMLRPC_C_BUILDLINK3_MK) +XMLRPC_C_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxmlrpc-c} -BUILDLINK_PACKAGES+= xmlrpc-c -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xmlrpc-c - -.if ${XMLRPC_C_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xmlrpc-c+= xmlrpc-c>=1.09.00 BUILDLINK_ABI_DEPENDS.xmlrpc-c?= xmlrpc-c>=1.09.00nb3 BUILDLINK_PKGSRCDIR.xmlrpc-c?= ../../textproc/xmlrpc-c -.endif # XMLRPC_C_BUILDLINK3_MK .include "../../www/libwww/buildlink3.mk" .include "../../www/curl/buildlink3.mk" +.endif # XMLRPC_C_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xmlrpc-c diff --git a/time/libical/buildlink3.mk b/time/libical/buildlink3.mk index acbc8706ee4..11457565f1d 100644 --- a/time/libical/buildlink3.mk +++ b/time/libical/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/12/19 21:48:05 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:34 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBICAL_BUILDLINK3_MK:= ${LIBICAL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libical -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libical -.endif +.if !defined(LIBICAL_BUILDLINK3_MK) +LIBICAL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibical} -BUILDLINK_PACKAGES+= libical -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libical - -.if ${LIBICAL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libical+= libical>=0.42 BUILDLINK_PKGSRCDIR.libical?= ../../time/libical -.endif # LIBICAL_BUILDLINK3_MK +.endif # LIBICAL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libical diff --git a/time/py-mxDateTime/buildlink3.mk b/time/py-mxDateTime/buildlink3.mk index 7c99741d404..248165078f6 100644 --- a/time/py-mxDateTime/buildlink3.mk +++ b/time/py-mxDateTime/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 17:30:12 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:34 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_MXDATETIME_BUILDLINK3_MK:= ${PY_MXDATETIME_BUILDLINK3_MK}+ +BUILDLINK_TREE+= py-mxDateTime -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= py-mxDateTime -.endif +.if !defined(PY_MXDATETIME_BUILDLINK3_MK) +PY_MXDATETIME_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-mxDateTime} -BUILDLINK_PACKAGES+= py-mxDateTime -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-mxDateTime - -.if !empty(PY_MXDATETIME_BUILDLINK3_MK:M+) .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.py-mxDateTime+= ${PYPKGPREFIX}-mxDateTime>=2.0.5 BUILDLINK_ABI_DEPENDS.py-mxDateTime?= ${PYPKGPREFIX}-mxDateTime>=2.0.6nb1 BUILDLINK_PKGSRCDIR.py-mxDateTime?= ../../time/py-mxDateTime BUILDLINK_INCDIRS.py-mxDateTime+= ${PYSITELIB}/mx/DateTime/mxDateTime -.endif # PY_MXDATETIME_BUILDLINK3_MK +.endif # PY_MXDATETIME_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -py-mxDateTime diff --git a/time/xfce4-datetime-plugin/buildlink3.mk b/time/xfce4-datetime-plugin/buildlink3.mk index 8dec343a651..7e61f6c3d0c 100644 --- a/time/xfce4-datetime-plugin/buildlink3.mk +++ b/time/xfce4-datetime-plugin/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.13 2007/04/12 09:55:19 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:34 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK:= ${XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-datetime-plugin -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-datetime-plugin -.endif +.if !defined(XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK) +XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-datetime-plugin} -BUILDLINK_PACKAGES+= xfce4-datetime-plugin -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-datetime-plugin - -.if ${XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-datetime-plugin+= xfce4-datetime-plugin>=0.4.1 BUILDLINK_PKGSRCDIR.xfce4-datetime-plugin?= ../../time/xfce4-datetime-plugin -.endif # XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-datetime-plugin diff --git a/time/xfce4-orage/buildlink3.mk b/time/xfce4-orage/buildlink3.mk index 0025e6052ea..b86b618ca5f 100644 --- a/time/xfce4-orage/buildlink3.mk +++ b/time/xfce4-orage/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.3 2008/12/18 16:46:29 hira Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:34 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_ORAGE_BUILDLINK3_MK:= ${XFCE4_ORAGE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-orage -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-orage -.endif +.if !defined(XFCE4_ORAGE_BUILDLINK3_MK) +XFCE4_ORAGE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-orage} -BUILDLINK_PACKAGES+= xfce4-orage -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-orage - -.if ${XFCE4_ORAGE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-orage+= xfce4-orage>=4.4.3nb1 BUILDLINK_PKGSRCDIR.xfce4-orage?= ../../time/xfce4-orage -.endif # XFCE4_ORAGE_BUILDLINK3_MK .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_ORAGE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-orage diff --git a/time/xfce4-timer-plugin/buildlink3.mk b/time/xfce4-timer-plugin/buildlink3.mk index ac16ae257db..ec6e87529f4 100644 --- a/time/xfce4-timer-plugin/buildlink3.mk +++ b/time/xfce4-timer-plugin/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/04/27 10:48:06 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:34 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_TIMER_PLUGIN_BUILDLINK3_MK:= ${XFCE4_TIMER_PLUGIN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-timer-plugin -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-timer-plugin -.endif +.if !defined(XFCE4_TIMER_PLUGIN_BUILDLINK3_MK) +XFCE4_TIMER_PLUGIN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-timer-plugin} -BUILDLINK_PACKAGES+= xfce4-timer-plugin -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-timer-plugin - -.if ${XFCE4_TIMER_PLUGIN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-timer-plugin+= xfce4-timer-plugin>=0.5.1 BUILDLINK_PKGSRCDIR.xfce4-timer-plugin?= ../../time/xfce4-timer-plugin -.endif # XFCE4_TIMER_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_TIMER_PLUGIN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-timer-plugin diff --git a/wm/blackbox70/buildlink3.mk b/wm/blackbox70/buildlink3.mk index 1d54581158a..5534fe7ebea 100644 --- a/wm/blackbox70/buildlink3.mk +++ b/wm/blackbox70/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.2 2007/02/01 21:56:13 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:34 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BLACKBOX70_BUILDLINK3_MK:= ${BLACKBOX70_BUILDLINK3_MK}+ +BUILDLINK_TREE+= blackbox70 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= blackbox70 -.endif +.if !defined(BLACKBOX70_BUILDLINK3_MK) +BLACKBOX70_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nblackbox70} -BUILDLINK_PACKAGES+= blackbox70 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}blackbox70 - -.if !empty(BLACKBOX70_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.blackbox70+= blackbox70>=0.70.0 BUILDLINK_ABI_DEPENDS.blackbox70+= blackbox70>=0.70.0 BUILDLINK_PKGSRCDIR.blackbox70?= ../../wm/blackbox70 -.endif # BLACKBOX70_BUILDLINK3_MK .include "../../x11/libX11/buildlink3.mk" +.endif # BLACKBOX70_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -blackbox70 diff --git a/wm/compiz-fusion-plugins-main/buildlink3.mk b/wm/compiz-fusion-plugins-main/buildlink3.mk index f2f6952e8d0..04633250bbd 100644 --- a/wm/compiz-fusion-plugins-main/buildlink3.mk +++ b/wm/compiz-fusion-plugins-main/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1 2008/05/12 13:19:17 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:34 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -COMPIZ_FUSION_PLUGINS_MAIN_BUILDLINK3_MK:= ${COMPIZ_FUSION_PLUGINS_MAIN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= compiz-fusion-plugins-main -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= compiz-fusion-plugins-main -.endif +.if !defined(COMPIZ_FUSION_PLUGINS_MAIN_BUILDLINK3_MK) +COMPIZ_FUSION_PLUGINS_MAIN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncompiz-fusion-plugins-main} -BUILDLINK_PACKAGES+= compiz-fusion-plugins-main -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}compiz-fusion-plugins-main - -.if ${COMPIZ_FUSION_PLUGINS_MAIN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.compiz-fusion-plugins-main+= compiz-fusion-plugins-main>=0.6.0nb1 BUILDLINK_PKGSRCDIR.compiz-fusion-plugins-main?= ../../wm/compiz-fusion-plugins-main -.endif # COMPIZ_FUSION_PLUGINS_MAIN_BUILDLINK3_MK .include "../../wm/compiz/buildlink3.mk" +.endif # COMPIZ_FUSION_PLUGINS_MAIN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -compiz-fusion-plugins-main diff --git a/wm/compiz/buildlink3.mk b/wm/compiz/buildlink3.mk index c59d53a4406..485aeb7e49b 100644 --- a/wm/compiz/buildlink3.mk +++ b/wm/compiz/buildlink3.mk @@ -1,21 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1 2008/04/23 18:34:52 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:34 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -COMPIZ_BUILDLINK3_MK:= ${COMPIZ_BUILDLINK3_MK}+ +BUILDLINK_TREE+= compiz -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= compiz -.endif +.if !defined(COMPIZ_BUILDLINK3_MK) +COMPIZ_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncompiz} -BUILDLINK_PACKAGES+= compiz -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}compiz - -.if ${COMPIZ_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.compiz+= compiz>=0.6.2 BUILDLINK_PKGSRCDIR.compiz?= ../../wm/compiz -.endif # COMPIZ_BUILDLINK3_MK - .include "../../devel/libwnck/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" @@ -35,5 +26,6 @@ BUILDLINK_PKGSRCDIR.compiz?= ../../wm/compiz .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" +.endif # COMPIZ_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -compiz diff --git a/wm/metacity/buildlink3.mk b/wm/metacity/buildlink3.mk index 4a53c731def..005ae536c3a 100644 --- a/wm/metacity/buildlink3.mk +++ b/wm/metacity/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.19 2008/04/15 17:53:51 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2009/03/20 19:25:35 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -METACITY_BUILDLINK3_MK:= ${METACITY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= metacity -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= metacity -.endif +.if !defined(METACITY_BUILDLINK3_MK) +METACITY_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmetacity} -BUILDLINK_PACKAGES+= metacity -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}metacity - -.if !empty(METACITY_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.metacity+= metacity>=2.8.5 BUILDLINK_ABI_DEPENDS.metacity+= metacity>=2.14.1nb1 BUILDLINK_PKGSRCDIR.metacity?= ../../wm/metacity -.endif # METACITY_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" @@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.metacity?= ../../wm/metacity .include "../../x11/startup-notification/buildlink3.mk" .include "../../x11/libXcomposite/buildlink3.mk" .include "../../x11/libXdamage/buildlink3.mk" +.endif # METACITY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -metacity diff --git a/wm/openbox/buildlink3.mk b/wm/openbox/buildlink3.mk index 478fbd7f604..3d2ae1cdcae 100644 --- a/wm/openbox/buildlink3.mk +++ b/wm/openbox/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.11 2006/12/15 20:33:02 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:35 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OPENBOX_BUILDLINK3_MK:= ${OPENBOX_BUILDLINK3_MK}+ +BUILDLINK_TREE+= openbox -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= openbox -.endif +.if !defined(OPENBOX_BUILDLINK3_MK) +OPENBOX_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenbox} -BUILDLINK_PACKAGES+= openbox -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openbox - -.if !empty(OPENBOX_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.openbox+= openbox>=3.1 BUILDLINK_ABI_DEPENDS.openbox+= openbox>=3.2nb3 BUILDLINK_PKGSRCDIR.openbox?= ../../wm/openbox -.endif # OPENBOX_BUILDLINK3_MK .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.endif # OPENBOX_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -openbox diff --git a/wm/windowmaker/buildlink3.mk b/wm/windowmaker/buildlink3.mk index d7c24c774c3..51ca1001946 100644 --- a/wm/windowmaker/buildlink3.mk +++ b/wm/windowmaker/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.15 2006/12/15 20:33:03 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:25:35 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -WINDOWMAKER_BUILDLINK3_MK:= ${WINDOWMAKER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= windowmaker -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= windowmaker -.endif +.if !defined(WINDOWMAKER_BUILDLINK3_MK) +WINDOWMAKER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nwindowmaker} -BUILDLINK_PACKAGES+= windowmaker -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}windowmaker - -.if !empty(WINDOWMAKER_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.windowmaker+= windowmaker>=0.80.2nb3 BUILDLINK_ABI_DEPENDS.windowmaker+= windowmaker>=0.92.0nb7 BUILDLINK_PKGSRCDIR.windowmaker?= ../../wm/windowmaker -.endif # WINDOWMAKER_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" @@ -24,5 +16,6 @@ BUILDLINK_PKGSRCDIR.windowmaker?= ../../wm/windowmaker .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.endif # WINDOWMAKER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -windowmaker diff --git a/wm/xfce4-wm-themes/buildlink3.mk b/wm/xfce4-wm-themes/buildlink3.mk index b97ea0db45c..4710aab1c99 100644 --- a/wm/xfce4-wm-themes/buildlink3.mk +++ b/wm/xfce4-wm-themes/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.21 2008/12/18 16:46:29 hira Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:25:35 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_WM_THEMES_BUILDLINK3_MK:= ${XFCE4_WM_THEMES_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-wm-themes -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-wm-themes -.endif +.if !defined(XFCE4_WM_THEMES_BUILDLINK3_MK) +XFCE4_WM_THEMES_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-wm-themes} -BUILDLINK_PACKAGES+= xfce4-wm-themes -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-wm-themes - -.if ${XFCE4_WM_THEMES_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-wm-themes+= xfce4-wm-themes>=4.4.3nb1 BUILDLINK_PKGSRCDIR.xfce4-wm-themes?= ../../wm/xfce4-wm-themes -.endif # XFCE4_WM_THEMES_BUILDLINK3_MK .include "../../wm/xfce4-wm/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_WM_THEMES_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-wm-themes diff --git a/wm/xfce4-wm/buildlink3.mk b/wm/xfce4-wm/buildlink3.mk index 12e3012314a..a38027dfeb0 100644 --- a/wm/xfce4-wm/buildlink3.mk +++ b/wm/xfce4-wm/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.24 2008/12/18 16:46:29 hira Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2009/03/20 19:25:35 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_WM_BUILDLINK3_MK:= ${XFCE4_WM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-wm -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-wm -.endif +.if !defined(XFCE4_WM_BUILDLINK3_MK) +XFCE4_WM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-wm} -BUILDLINK_PACKAGES+= xfce4-wm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-wm - -.if ${XFCE4_WM_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-wm+= xfce4-wm>=4.4.3nb1 BUILDLINK_PKGSRCDIR.xfce4-wm?= ../../wm/xfce4-wm -.endif # XFCE4_WM_BUILDLINK3_MK .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" @@ -22,5 +14,6 @@ BUILDLINK_PKGSRCDIR.xfce4-wm?= ../../wm/xfce4-wm .include "../../x11/startup-notification/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_WM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-wm diff --git a/www/ap-perl/buildlink3.mk b/www/ap-perl/buildlink3.mk index e81263b9a88..5cf36de0362 100644 --- a/www/ap-perl/buildlink3.mk +++ b/www/ap-perl/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:11:12 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:35 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -AP_PERL_BUILDLINK3_MK:= ${AP_PERL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ap13-perl -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ap13-perl -.endif +.if !defined(AP_PERL_BUILDLINK3_MK) +AP_PERL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nap-perl} -BUILDLINK_PACKAGES+= ap13-perl -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ap13-perl - -.if !empty(AP_PERL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ap13-perl+= ap13-perl>=1.29 BUILDLINK_ABI_DEPENDS.ap13-perl?= ap13-perl>=1.29 BUILDLINK_PKGSRCDIR.ap13-perl?= ../../www/ap-perl @@ -21,8 +14,8 @@ BUILDLINK_FILES.ap13-perl+= \ ${PERL5_SUB_INSTALLVENDORARCH}/auto/Apache/include/* BUILDLINK_FILES.ap13-perl+= \ ${PERL5_SUB_INSTALLVENDORARCH}/auto/Apache/include/modules/perl/* -.endif # AP_PERL_BUILDLINK3_MK .include "../../www/apache/buildlink3.mk" +.endif # AP_PERL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ap13-perl diff --git a/www/ap2-perl/buildlink3.mk b/www/ap2-perl/buildlink3.mk index ab550bcdbee..43c2dc77937 100644 --- a/www/ap2-perl/buildlink3.mk +++ b/www/ap2-perl/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.10 2007/06/30 16:09:09 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:35 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -AP2_PERL_BUILDLINK3_MK:= ${AP2_PERL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ap2-perl -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ap2-perl -.endif +.if !defined(AP2_PERL_BUILDLINK3_MK) +AP2_PERL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nap2-perl} -BUILDLINK_PACKAGES+= ap2-perl -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ap2-perl - -.if !empty(AP2_PERL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ap2-perl+= ${APACHE_PKG_PREFIX}-perl>=2.0.1 BUILDLINK_ABI_DEPENDS.ap2-perl?= ${APACHE_PKG_PREFIX}-perl>=2.0.3 BUILDLINK_PKGSRCDIR.ap2-perl?= ../../www/ap2-perl -.endif # AP2_PERL_BUILDLINK3_MK .include "../../mk/apache.mk" +.endif # AP2_PERL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ap2-perl diff --git a/www/apache/buildlink3.mk b/www/apache/buildlink3.mk index 52b1fc1030e..fa3783b17af 100644 --- a/www/apache/buildlink3.mk +++ b/www/apache/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.18 2006/07/08 23:11:12 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2009/03/20 19:25:35 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -APACHE_BUILDLINK3_MK:= ${APACHE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= apache -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= apache -.endif +.if !defined(APACHE_BUILDLINK3_MK) +APACHE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Napache} -BUILDLINK_PACKAGES+= apache -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}apache - -.if !empty(APACHE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.apache+= apache-1.3.* BUILDLINK_ABI_DEPENDS.apache?= apache>=1.3.34nb5 BUILDLINK_PKGSRCDIR.apache?= ../../www/apache @@ -32,7 +25,6 @@ CONFIGURE_ARGS+= --with-apxs=${APXS:Q} # required because httpd/os.h includes <dlfcn.h> when it is found by # Apache's configure script. .include "../../mk/dlopen.buildlink3.mk" +.endif # APACHE_BUILDLINK3_MK -.endif # APACHE_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -apache diff --git a/www/apache2/buildlink3.mk b/www/apache2/buildlink3.mk index f8f78a397b8..91eb634448d 100644 --- a/www/apache2/buildlink3.mk +++ b/www/apache2/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.27 2008/09/06 20:54:34 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.28 2009/03/20 19:25:35 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -APACHE_BUILDLINK3_MK:= ${APACHE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= apache -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= apache -.endif +.if !defined(APACHE_BUILDLINK3_MK) +APACHE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Napache} -BUILDLINK_PACKAGES+= apache -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}apache - -.if !empty(APACHE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.apache+= apache>=2.0.51<2.2 BUILDLINK_ABI_DEPENDS.apache+= apache>=2.0.63nb4 BUILDLINK_PKGSRCDIR.apache?= ../../www/apache2 @@ -26,8 +19,8 @@ APXS?= ${BUILDLINK_PREFIX.apache}/sbin/apxs . if defined(GNU_CONFIGURE) CONFIGURE_ARGS+= --with-apxs2=${APXS:Q} . endif -.endif # APACHE_BUILDLINK3_MK .include "../../devel/apr0/buildlink3.mk" +.endif # APACHE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -apache diff --git a/www/apache22/buildlink3.mk b/www/apache22/buildlink3.mk index 162c4cbacf1..89383370fd0 100644 --- a/www/apache22/buildlink3.mk +++ b/www/apache22/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.6 2008/09/06 20:54:34 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:35 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -APACHE_BUILDLINK3_MK:= ${APACHE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= apache -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= apache -.endif +.if !defined(APACHE_BUILDLINK3_MK) +APACHE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Napache} -BUILDLINK_PACKAGES+= apache -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}apache - -.if !empty(APACHE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.apache+= apache>=2.2.3 BUILDLINK_ABI_DEPENDS.apache?= apache>=2.2.9nb3 BUILDLINK_PKGSRCDIR.apache?= ../../www/apache22 @@ -26,9 +19,9 @@ APXS?= ${BUILDLINK_PREFIX.apache}/sbin/apxs . if defined(GNU_CONFIGURE) CONFIGURE_ARGS+= --with-apxs2=${APXS:Q} . endif -.endif # APACHE_BUILDLINK3_MK .include "../../devel/apr/buildlink3.mk" .include "../../devel/apr-util/buildlink3.mk" +.endif # APACHE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -apache diff --git a/www/cgic/buildlink3.mk b/www/cgic/buildlink3.mk index 5132df5a982..864a87c4eb7 100644 --- a/www/cgic/buildlink3.mk +++ b/www/cgic/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:12 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:36 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CGIC_BUILDLINK3_MK:= ${CGIC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= cgic -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= cgic -.endif +.if !defined(CGIC_BUILDLINK3_MK) +CGIC_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncgic} -BUILDLINK_PACKAGES+= cgic -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cgic - -.if !empty(CGIC_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.cgic+= cgic>=2.02nb1 BUILDLINK_PKGSRCDIR.cgic?= ../../www/cgic -.endif # CGIC_BUILDLINK3_MK +.endif # CGIC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -cgic diff --git a/www/cgilib/buildlink3.mk b/www/cgilib/buildlink3.mk index a387a8b8836..44796173190 100644 --- a/www/cgilib/buildlink3.mk +++ b/www/cgilib/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:12 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:36 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CGILIB_BUILDLINK3_MK:= ${CGILIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= cgilib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= cgilib -.endif +.if !defined(CGILIB_BUILDLINK3_MK) +CGILIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncgilib} -BUILDLINK_PACKAGES+= cgilib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cgilib - -.if !empty(CGILIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.cgilib+= cgilib>=0.5nb1 BUILDLINK_ABI_DEPENDS.cgilib+= cgilib>=0.5nb2 BUILDLINK_PKGSRCDIR.cgilib?= ../../www/cgilib -.endif # CGILIB_BUILDLINK3_MK +.endif # CGILIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -cgilib diff --git a/www/clearsilver/buildlink3.mk b/www/clearsilver/buildlink3.mk index f7042e8fce0..e279cf24d23 100644 --- a/www/clearsilver/buildlink3.mk +++ b/www/clearsilver/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.7 2009/03/19 17:05:51 cube Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:36 joerg Exp $ BUILDLINK_DEPMETHOD.clearsilver?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CLEARSILVER_BUILDLINK3_MK:= ${CLEARSILVER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= clearsilver-base -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= clearsilver-base -.endif +.if !defined(CLEARSILVER_BUILDLINK3_MK) +CLEARSILVER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nclearsilver-base} -BUILDLINK_PACKAGES+= clearsilver-base -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}clearsilver-base - -.if !empty(CLEARSILVER_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.clearsilver+= clearsilver-base>=0.9.0 BUILDLINK_ABI_DEPENDS.clearsilver+= clearsilver>=0.10.1 BUILDLINK_PKGSRCDIR.clearsilver?= ../../www/clearsilver-base -.endif # CLEARSILVER_BUILDLINK3_MK +.endif # CLEARSILVER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -clearsilver-base diff --git a/www/curl/buildlink3.mk b/www/curl/buildlink3.mk index 269f5071aee..06e6ea70840 100644 --- a/www/curl/buildlink3.mk +++ b/www/curl/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.20 2008/03/10 18:35:54 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2009/03/20 19:25:36 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CURL_BUILDLINK3_MK:= ${CURL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= curl -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= curl -.endif +.if !defined(CURL_BUILDLINK3_MK) +CURL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncurl} -BUILDLINK_PACKAGES+= curl -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}curl - -.if !empty(CURL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.curl+= curl>=7.12.3 BUILDLINK_ABI_DEPENDS.curl+= curl>=7.17.1nb1 BUILDLINK_PKGSRCDIR.curl?= ../../www/curl @@ -24,10 +17,10 @@ pkgbase:= curl . if !empty(PKG_BUILD_OPTIONS.curl:Mgssapi) . include "../../mk/krb5.buildlink3.mk" . endif -.endif # CURL_BUILDLINK3_MK .include "../../devel/libidn/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" +.endif # CURL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -curl diff --git a/www/emacs-w3m/buildlink3.mk b/www/emacs-w3m/buildlink3.mk index 539ed72cb8f..c047da877f2 100644 --- a/www/emacs-w3m/buildlink3.mk +++ b/www/emacs-w3m/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:41:18 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:36 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EMACS_W3M_BUILDLINK3_MK:= ${EMACS_W3M_BUILDLINK3_MK}+ +BUILDLINK_TREE+= emacs-w3m -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= emacs-w3m -.endif +.if !defined(EMACS_W3M_BUILDLINK3_MK) +EMACS_W3M_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nemacs-w3m} -BUILDLINK_PACKAGES+= emacs-w3m -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}emacs-w3m - -.if ${EMACS_W3M_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.emacs-w3m+= ${EMACS_PKGNAME_PREFIX}emacs-w3m>=1.4 BUILDLINK_PKGSRCDIR.emacs-w3m?= ../../www/emacs-w3m -.endif # EMACS_W3M_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.emacs-w3m= ${EGREP} '.*\.el$$|.*\.elc$$' +.endif # EMACS_W3M_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -emacs-w3m diff --git a/www/epiphany/buildlink3.mk b/www/epiphany/buildlink3.mk index c6a6fc570b4..7bdc53db7b1 100644 --- a/www/epiphany/buildlink3.mk +++ b/www/epiphany/buildlink3.mk @@ -1,20 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.27 2008/04/15 18:16:16 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.28 2009/03/20 19:25:36 joerg Exp $ # # This Makefile fragment is included by packages that use epiphany. # # This file was created automatically using createbuildlink-3.1. # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EPIPHANY_BUILDLINK3_MK:= ${EPIPHANY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= epiphany -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= epiphany -.endif +.if !defined(EPIPHANY_BUILDLINK3_MK) +EPIPHANY_BUILDLINK3_MK:= -.if !empty(EPIPHANY_BUILDLINK3_MK:M+) -BUILDLINK_PACKAGES+= epiphany -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}epiphany BUILDLINK_API_DEPENDS.epiphany+= epiphany>=1.8.2 BUILDLINK_ABI_DEPENDS.epiphany?= epiphany>=2.20.3nb2 BUILDLINK_PKGSRCDIR.epiphany?= ../../www/epiphany @@ -32,4 +27,4 @@ BUILDLINK_PKGSRCDIR.epiphany?= ../../www/epiphany # this is already pulled in directly by the only user, epiphany-extensions .endif # EPIPHANY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -epiphany diff --git a/www/fcgi/buildlink3.mk b/www/fcgi/buildlink3.mk index 80828c1fb6c..23177a51042 100644 --- a/www/fcgi/buildlink3.mk +++ b/www/fcgi/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:12 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:36 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FCGI_BUILDLINK3_MK:= ${FCGI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= fcgi -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= fcgi -.endif +.if !defined(FCGI_BUILDLINK3_MK) +FCGI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfcgi} -BUILDLINK_PACKAGES+= fcgi -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fcgi - -.if !empty(FCGI_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.fcgi+= fcgi>=2.2.2nb1 BUILDLINK_ABI_DEPENDS.fcgi+= fcgi>=2.4.0nb1 BUILDLINK_PKGSRCDIR.fcgi?= ../../www/fcgi -.endif # FCGI_BUILDLINK3_MK +.endif # FCGI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -fcgi diff --git a/www/firefox-gtk1/buildlink3.mk b/www/firefox-gtk1/buildlink3.mk index ddea80e2821..431c7ba7142 100644 --- a/www/firefox-gtk1/buildlink3.mk +++ b/www/firefox-gtk1/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.15 2008/05/19 10:43:02 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:25:36 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FIREFOX_GTK1_BUILDLINK3_MK:= ${FIREFOX_GTK1_BUILDLINK3_MK}+ +BUILDLINK_TREE+= firefox-gtk1 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= firefox-gtk1 -.endif +.if !defined(FIREFOX_GTK1_BUILDLINK3_MK) +FIREFOX_GTK1_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfirefox-gtk1} -BUILDLINK_PACKAGES+= firefox-gtk1 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}firefox-gtk1 - -.if !empty(FIREFOX_GTK1_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.firefox-gtk1+= firefox-gtk1>=2.0 BUILDLINK_ABI_DEPENDS.firefox-gtk1+= firefox-gtk1>=2.0.0.3nb1 BUILDLINK_PKGSRCDIR.firefox-gtk1?= ../../www/firefox-gtk1 -.endif # FIREFOX_GTK1_BUILDLINK3_MK +.endif # FIREFOX_GTK1_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -firefox-gtk1 diff --git a/www/firefox/buildlink3.mk b/www/firefox/buildlink3.mk index d3c293b0110..14d602597cf 100644 --- a/www/firefox/buildlink3.mk +++ b/www/firefox/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.17 2008/05/31 23:08:33 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:25:36 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FIREFOX_BUILDLINK3_MK:= ${FIREFOX_BUILDLINK3_MK}+ +BUILDLINK_TREE+= firefox -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= firefox -.endif +.if !defined(FIREFOX_BUILDLINK3_MK) +FIREFOX_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfirefox} -BUILDLINK_PACKAGES+= firefox -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}firefox - -.if !empty(FIREFOX_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.firefox+= firefox>=2.0 BUILDLINK_API_DEPENDS.firefox+= firefox<=2.99 BUILDLINK_ABI_DEPENDS.firefox+= firefox>=2.0.0.3nb1 BUILDLINK_PKGSRCDIR.firefox?= ../../www/firefox -.endif # FIREFOX_BUILDLINK3_MK +.endif # FIREFOX_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -firefox diff --git a/www/firefox3/buildlink3.mk b/www/firefox3/buildlink3.mk index c784d13c03d..34982d7fce6 100644 --- a/www/firefox3/buildlink3.mk +++ b/www/firefox3/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/06/28 10:01:06 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:36 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FIREFOX3_BUILDLINK3_MK:= ${FIREFOX3_BUILDLINK3_MK}+ +BUILDLINK_TREE+= firefox3 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= firefox3 -.endif +.if !defined(FIREFOX3_BUILDLINK3_MK) +FIREFOX3_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfirefox3} -BUILDLINK_PACKAGES+= firefox3 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}firefox3 - -.if !empty(FIREFOX3_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.firefox3+= firefox3>=3.0 BUILDLINK_PKGSRCDIR.firefox3?= ../../www/firefox3 # XXX wip @@ -22,6 +15,6 @@ GECKO_EXTRA_INC_DIRS= \ xpconnect GECKO_EXTRA_INCLUDE= ${GECKO_EXTRA_INC_DIRS:C,^,-I${BUILDLINK_PREFIX.firefox3}/include/firefox3/,} -.endif # FIREFOX3_BUILDLINK3_MK +.endif # FIREFOX3_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -firefox3 diff --git a/www/gtkhtml314/buildlink3.mk b/www/gtkhtml314/buildlink3.mk index 54fb03b9453..45fd5298eee 100644 --- a/www/gtkhtml314/buildlink3.mk +++ b/www/gtkhtml314/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.10 2008/10/24 20:35:37 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:37 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GTKHTML314_BUILDLINK3_MK:= ${GTKHTML314_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gtkhtml314 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gtkhtml314 -.endif +.if !defined(GTKHTML314_BUILDLINK3_MK) +GTKHTML314_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtkhtml314} -BUILDLINK_PACKAGES+= gtkhtml314 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtkhtml314 - -.if !empty(GTKHTML314_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gtkhtml314+= gtkhtml314>=3.24.0 BUILDLINK_PKGSRCDIR.gtkhtml314?= ../../www/gtkhtml314 -.endif # GTKHTML314_BUILDLINK3_MK .include "../../devel/libglade/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../textproc/enchant/buildlink3.mk" .include "../../textproc/iso-codes/buildlink3.mk" +.endif # GTKHTML314_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gtkhtml314 diff --git a/www/libghttp/buildlink3.mk b/www/libghttp/buildlink3.mk index db1f8fa54da..6edf0d9009c 100644 --- a/www/libghttp/buildlink3.mk +++ b/www/libghttp/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:12 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:37 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGHTTP_BUILDLINK3_MK:= ${LIBGHTTP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libghttp -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libghttp -.endif +.if !defined(LIBGHTTP_BUILDLINK3_MK) +LIBGHTTP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibghttp} -BUILDLINK_PACKAGES+= libghttp -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libghttp - -.if !empty(LIBGHTTP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libghttp+= libghttp>=1.0.9 BUILDLINK_ABI_DEPENDS.libghttp+= libghttp>=1.0.9nb1 BUILDLINK_PKGSRCDIR.libghttp?= ../../www/libghttp -.endif # LIBGHTTP_BUILDLINK3_MK +.endif # LIBGHTTP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libghttp diff --git a/www/libgtkhtml/buildlink3.mk b/www/libgtkhtml/buildlink3.mk index ba15dc2bcb6..c724cb7aebd 100644 --- a/www/libgtkhtml/buildlink3.mk +++ b/www/libgtkhtml/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.21 2008/10/16 14:02:29 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:25:37 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGTKHTML_BUILDLINK3_MK:= ${LIBGTKHTML_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgtkhtml -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libgtkhtml -.endif +.if !defined(LIBGTKHTML_BUILDLINK3_MK) +LIBGTKHTML_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgtkhtml} -BUILDLINK_PACKAGES+= libgtkhtml -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgtkhtml - -.if !empty(LIBGTKHTML_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libgtkhtml+= libgtkhtml>=2.6.0 BUILDLINK_ABI_DEPENDS.libgtkhtml+= libgtkhtml>=2.6.3nb10 BUILDLINK_PKGSRCDIR.libgtkhtml?= ../../www/libgtkhtml -.endif # LIBGTKHTML_BUILDLINK3_MK .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # LIBGTKHTML_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgtkhtml diff --git a/www/libproxy/buildlink3.mk b/www/libproxy/buildlink3.mk index d18f1551d87..744cd6c120e 100644 --- a/www/libproxy/buildlink3.mk +++ b/www/libproxy/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/03/04 02:11:07 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:37 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBPROXY_BUILDLINK3_MK:= ${LIBPROXY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libproxy -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libproxy -.endif +.if !defined(LIBPROXY_BUILDLINK3_MK) +LIBPROXY_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibproxy} -BUILDLINK_PACKAGES+= libproxy -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libproxy - -.if ${LIBPROXY_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libproxy+= libproxy>=0.2.3 BUILDLINK_PKGSRCDIR.libproxy?= ../../www/libproxy -.endif # LIBPROXY_BUILDLINK3_MK +.endif # LIBPROXY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libproxy diff --git a/www/libwww/buildlink3.mk b/www/libwww/buildlink3.mk index 430e8215f77..b69f2a49956 100644 --- a/www/libwww/buildlink3.mk +++ b/www/libwww/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.14 2008/01/18 05:09:51 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:37 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBWWW_BUILDLINK3_MK:= ${LIBWWW_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libwww -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libwww -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibwww} -BUILDLINK_PACKAGES+= libwww -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libwww +.if !defined(LIBWWW_BUILDLINK3_MK) +LIBWWW_BUILDLINK3_MK:= -.if !empty(LIBWWW_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libwww+= libwww>=5.3.2nb2 BUILDLINK_ABI_DEPENDS.libwww+= libwww>=5.4.0nb6 BUILDLINK_PKGSRCDIR.libwww?= ../../www/libwww -.endif # LIBWWW_BUILDLINK3_MK .include "../../mk/bsd.fast.prefs.mk" @@ -32,5 +24,6 @@ pkgbase := libwww .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" +.endif # LIBWWW_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libwww diff --git a/www/mono-xsp/buildlink3.mk b/www/mono-xsp/buildlink3.mk index 523f2c898d4..93ce4e47358 100644 --- a/www/mono-xsp/buildlink3.mk +++ b/www/mono-xsp/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/10/07 13:25:12 kefren Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:37 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MONO_XSP_BUILDLINK3_MK:= ${MONO_XSP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= mono-xsp -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= mono-xsp -.endif +.if !defined(MONO_XSP_BUILDLINK3_MK) +MONO_XSP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmono-xsp} -BUILDLINK_PACKAGES+= mono-xsp -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mono-xsp - -.if ${MONO_XSP_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.mono-xsp+= mono-xsp>=2.0 BUILDLINK_PKGSRCDIR.mono-xsp?= ../../www/mono-xsp -.endif # MONO_XSP_BUILDLINK3_MK .include "../../databases/sqlite3/buildlink3.mk" .include "../../lang/mono/buildlink3.mk" +.endif # MONO_XSP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -mono-xsp diff --git a/www/neon/buildlink3.mk b/www/neon/buildlink3.mk index 8cb5ff41b2b..08377f4ce2d 100644 --- a/www/neon/buildlink3.mk +++ b/www/neon/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.13 2008/01/18 05:09:52 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:37 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -NEON_BUILDLINK3_MK:= ${NEON_BUILDLINK3_MK}+ +BUILDLINK_TREE+= neon -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= neon -.endif +.if !defined(NEON_BUILDLINK3_MK) +NEON_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nneon} -BUILDLINK_PACKAGES+= neon -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}neon - -.if !empty(NEON_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.neon+= neon>=0.24.4 BUILDLINK_ABI_DEPENDS.neon+= neon>=0.26.3nb2 BUILDLINK_PKGSRCDIR.neon?= ../../www/neon -.endif # NEON_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" +.endif # NEON_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -neon diff --git a/www/php4/buildlink3.mk b/www/php4/buildlink3.mk index 94576cb42c1..4904be4b583 100644 --- a/www/php4/buildlink3.mk +++ b/www/php4/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:13 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:37 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PHP_BUILDLINK3_MK:= ${PHP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= php -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= php -.endif +.if !defined(PHP_BUILDLINK3_MK) +PHP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nphp} -BUILDLINK_PACKAGES+= php -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}php - -.if !empty(PHP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.php+= php-4.4.* BUILDLINK_ABI_DEPENDS.php+= php>=4.4.1nb3 BUILDLINK_PKGSRCDIR.php?= ../../www/php4 -.endif # PHP_BUILDLINK3_MK +.endif # PHP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -php diff --git a/www/py-gdata/buildlink3.mk b/www/py-gdata/buildlink3.mk index f6cb7489d29..212f2c70749 100644 --- a/www/py-gdata/buildlink3.mk +++ b/www/py-gdata/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:13 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:37 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_GDATA_BUILDLINK3_MK:= ${PY_GDATA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= py-gdata -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= py-gdata -.endif +.if !defined(PY_GDATA_BUILDLINK3_MK) +PY_GDATA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-gdata} -BUILDLINK_PACKAGES+= py-gdata -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-gdata - -.if ${PY_GDATA_BUILDLINK3_MK} == "+" .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.py-gdata+= ${PYPKGPREFIX}-gdata>=1.2.1 BUILDLINK_PKGSRCDIR.py-gdata?= ../../www/py-gdata -.endif # PY_GDATA_BUILDLINK3_MK +.endif # PY_GDATA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -py-gdata diff --git a/www/seamonkey-gtk1/buildlink3.mk b/www/seamonkey-gtk1/buildlink3.mk index 2021aec1e34..43f27a28fe6 100644 --- a/www/seamonkey-gtk1/buildlink3.mk +++ b/www/seamonkey-gtk1/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2009/03/18 00:08:40 abs Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:38 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SEAMONKEY_GTK1_BUILDLINK3_MK:= ${SEAMONKEY_GTK1_BUILDLINK3_MK}+ +BUILDLINK_TREE+= seamonkey-gtk1 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= seamonkey-gtk1 -.endif +.if !defined(SEAMONKEY_GTK1_BUILDLINK3_MK) +SEAMONKEY_GTK1_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nseamonkey-gtk1} -BUILDLINK_PACKAGES+= seamonkey-gtk1 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}seamonkey-gtk1 - -.if !empty(SEAMONKEY_GTK1_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.seamonkey-gtk1+= seamonkey-gtk1>=1.0 BUILDLINK_ABI_DEPENDS.seamonkey-gtk1?= seamonkey-gtk1>=1.0.1nb1 BUILDLINK_PKGSRCDIR.seamonkey-gtk1?= ../../www/seamonkey-gtk1 -.endif # SEAMONKEY_GTK1_BUILDLINK3_MK .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/gdk-pixbuf/buildlink3.mk" @@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.seamonkey-gtk1?= ../../www/seamonkey-gtk1 .include "../../graphics/png/buildlink3.mk" .include "../../net/ORBit/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" +.endif # SEAMONKEY_GTK1_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -seamonkey-gtk1 diff --git a/www/seamonkey/buildlink3.mk b/www/seamonkey/buildlink3.mk index 747c507216c..2ddd07aab25 100644 --- a/www/seamonkey/buildlink3.mk +++ b/www/seamonkey/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.8 2008/05/19 10:43:02 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:37 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SEAMONKEY_BUILDLINK3_MK:= ${SEAMONKEY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= seamonkey -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= seamonkey -.endif +.if !defined(SEAMONKEY_BUILDLINK3_MK) +SEAMONKEY_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nseamonkey} -BUILDLINK_PACKAGES+= seamonkey -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}seamonkey - -.if !empty(SEAMONKEY_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.seamonkey+= seamonkey>=1.0 BUILDLINK_ABI_DEPENDS.seamonkey?= seamonkey>=1.0.1nb1 BUILDLINK_PKGSRCDIR.seamonkey?= ../../www/seamonkey -.endif # SEAMONKEY_BUILDLINK3_MK .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../net/libIDL/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # SEAMONKEY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -seamonkey diff --git a/www/serf/buildlink3.mk b/www/serf/buildlink3.mk index eb8c02c98fb..9148942a84c 100644 --- a/www/serf/buildlink3.mk +++ b/www/serf/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.7 2008/09/06 20:54:34 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:38 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SERF_BUILDLINK3_MK:= ${SERF_BUILDLINK3_MK}+ +BUILDLINK_TREE+= serf -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= serf -.endif +.if !defined(SERF_BUILDLINK3_MK) +SERF_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nserf} -BUILDLINK_PACKAGES+= serf -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}serf - -.if ${SERF_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.serf+= serf>=0.1.0 BUILDLINK_ABI_DEPENDS.serf?= serf>=0.1.2nb3 BUILDLINK_PKGSRCDIR.serf?= ../../www/serf -.endif # SERF_BUILDLINK3_MK .include "../../devel/apr/buildlink3.mk" .include "../../devel/apr-util/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" +.endif # SERF_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -serf diff --git a/www/sope/buildlink3.mk b/www/sope/buildlink3.mk index e06c52e0ed7..88ca99a3784 100644 --- a/www/sope/buildlink3.mk +++ b/www/sope/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:13 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:38 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SOPE_BUILDLINK3_MK:= ${SOPE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= sope -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= sope -.endif +.if !defined(SOPE_BUILDLINK3_MK) +SOPE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsope} -BUILDLINK_PACKAGES+= sope -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sope - -.if !empty(SOPE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.sope+= sope>=4.5.4nb2 BUILDLINK_ABI_DEPENDS.sope?= sope>=4.5.4nb3 BUILDLINK_PKGSRCDIR.sope?= ../../www/sope -.endif # SOPE_BUILDLINK3_MK +.endif # SOPE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -sope diff --git a/www/swish-e/buildlink3.mk b/www/swish-e/buildlink3.mk index 8894ec28984..a731813633d 100644 --- a/www/swish-e/buildlink3.mk +++ b/www/swish-e/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/08/29 14:17:06 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:38 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SWISH_E_BUILDLINK3_MK:= ${SWISH_E_BUILDLINK3_MK}+ +BUILDLINK_TREE+= swish-e -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= swish-e -.endif +.if !defined(SWISH_E_BUILDLINK3_MK) +SWISH_E_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nswish-e} -BUILDLINK_PACKAGES+= swish-e -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}swish-e - -.if ${SWISH_E_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.swish-e+= swish-e>=2.4.5nb1 BUILDLINK_PKGSRCDIR.swish-e?= ../../www/swish-e -.endif # SWISH_E_BUILDLINK3_MK .include "../../devel/pcre/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.endif # SWISH_E_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -swish-e diff --git a/www/tidy/buildlink3.mk b/www/tidy/buildlink3.mk index 2da1799d4aa..6f42308976d 100644 --- a/www/tidy/buildlink3.mk +++ b/www/tidy/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.8 2008/04/09 09:01:52 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:38 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TIDY_BUILDLINK3_MK:= ${TIDY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= tidy -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= tidy -.endif +.if !defined(TIDY_BUILDLINK3_MK) +TIDY_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntidy} -BUILDLINK_PACKAGES+= tidy -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tidy - -.if !empty(TIDY_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.tidy+= tidy>=20080324 BUILDLINK_PKGSRCDIR.tidy?= ../../www/tidy -.endif # TIDY_BUILDLINK3_MK +.endif # TIDY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -tidy diff --git a/www/w3/buildlink3.mk b/www/w3/buildlink3.mk index 0cba45f9682..1bedbd715b7 100644 --- a/www/w3/buildlink3.mk +++ b/www/w3/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/12/16 13:45:59 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:38 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -W3_BUILDLINK3_MK:= ${W3_BUILDLINK3_MK}+ +BUILDLINK_TREE+= w3 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= w3 -.endif +.if !defined(W3_BUILDLINK3_MK) +W3_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nw3} -BUILDLINK_PACKAGES+= w3 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}w3 - -.if ${W3_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.w3+= ${EMACS_PKGNAME_PREFIX}w3>=3.99 # 4.0betaX BUILDLINK_PKGSRCDIR.w3?= ../../www/w3 -.endif # W3_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.w3= ${EGREP} '.*\.el$$|.*\.elc$$' +.endif # W3_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -w3 diff --git a/www/webkit-gtk/buildlink3.mk b/www/webkit-gtk/buildlink3.mk index de229f9485d..de631d977f3 100644 --- a/www/webkit-gtk/buildlink3.mk +++ b/www/webkit-gtk/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/18 03:13:12 snj Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:38 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -WEBKIT_GTK_BUILDLINK3_MK:= ${WEBKIT_GTK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= webkit-gtk -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= webkit-gtk -.endif +.if !defined(WEBKIT_GTK_BUILDLINK3_MK) +WEBKIT_GTK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nwebkit-gtk} -BUILDLINK_PACKAGES+= webkit-gtk -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}webkit-gtk - -.if ${WEBKIT_GTK_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.webkit-gtk+= webkit-gtk>=1.1.3 BUILDLINK_PKGSRCDIR.webkit-gtk?= ../../www/webkit-gtk -.endif # WEBKIT_GTK_BUILDLINK3_MK .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/gperf/buildlink3.mk" @@ -26,5 +18,6 @@ BUILDLINK_PKGSRCDIR.webkit-gtk?= ../../www/webkit-gtk .include "../../textproc/libxslt/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" +.endif # WEBKIT_GTK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -webkit-gtk diff --git a/x11/Xaw-Xpm/buildlink3.mk b/x11/Xaw-Xpm/buildlink3.mk index 77f2c5f58ac..dfa2cfce754 100644 --- a/x11/Xaw-Xpm/buildlink3.mk +++ b/x11/Xaw-Xpm/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.14 2008/12/13 03:20:41 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:38 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XAW_XPM_BUILDLINK3_MK:= ${XAW_XPM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= Xaw-Xpm -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= Xaw-Xpm -.endif +.if !defined(XAW_XPM_BUILDLINK3_MK) +XAW_XPM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXaw-Xpm} -BUILDLINK_PACKAGES+= Xaw-Xpm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Xaw-Xpm - -.if !empty(XAW_XPM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.Xaw-Xpm+= Xaw-Xpm>=1.1 BUILDLINK_ABI_DEPENDS.Xaw-Xpm?= Xaw-Xpm>=1.1nb2 BUILDLINK_PKGSRCDIR.Xaw-Xpm?= ../../x11/Xaw-Xpm @@ -33,9 +26,8 @@ LIBXAW?= -L${BUILDLINK_PREFIX.Xaw-Xpm}/lib \ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libXpm}/lib \ -lXaw3d -lXpm -.endif # XAW_XPM_BUILDLINK3_MK - .include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.endif # XAW_XPM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -Xaw-Xpm diff --git a/x11/Xaw3d/buildlink3.mk b/x11/Xaw3d/buildlink3.mk index 5f38ad345b2..c42d3667702 100644 --- a/x11/Xaw3d/buildlink3.mk +++ b/x11/Xaw3d/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.11 2007/02/08 00:08:20 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:38 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XAW3D_BUILDLINK3_MK:= ${XAW3D_BUILDLINK3_MK}+ +BUILDLINK_TREE+= Xaw3d -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= Xaw3d -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXaw3d} -BUILDLINK_PACKAGES+= Xaw3d -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Xaw3d +.if !defined(XAW3D_BUILDLINK3_MK) +XAW3D_BUILDLINK3_MK:= -.if !empty(XAW3D_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.Xaw3d+= Xaw3d>=1.5 BUILDLINK_ABI_DEPENDS.Xaw3d?= Xaw3d>=1.5Enb1 BUILDLINK_PKGSRCDIR.Xaw3d?= ../../x11/Xaw3d @@ -29,12 +22,12 @@ buildlink-Xaw3d-inc-hack: buildlink-directories ${MKDIR} ${BUILDLINK_DIR}/include/X11 && \ ${LN} -s Xaw3d ${BUILDLINK_DIR}/include/X11/Xaw .endif -.endif # XAW3D_BUILDLINK3_MK .include "../../x11/libXmu/buildlink3.mk" LIBXAW?= -L${BUILDLINK_PREFIX.Xaw3d}/lib \ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.Xaw3d}/lib \ -lXaw3d +.endif # XAW3D_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -Xaw3d diff --git a/x11/Xbae/buildlink3.mk b/x11/Xbae/buildlink3.mk index 77865ce48e1..539623a4ffe 100644 --- a/x11/Xbae/buildlink3.mk +++ b/x11/Xbae/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:13 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:39 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XBAE_BUILDLINK3_MK:= ${XBAE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= Xbae -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= Xbae -.endif +.if !defined(XBAE_BUILDLINK3_MK) +XBAE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXbae} -BUILDLINK_PACKAGES+= Xbae -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Xbae - -.if !empty(XBAE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.Xbae+= Xbae>=4.8.4 BUILDLINK_ABI_DEPENDS.Xbae+= Xbae>=4.51.01nb2 BUILDLINK_PKGSRCDIR.Xbae?= ../../x11/Xbae -.endif # XBAE_BUILDLINK3_MK .include "../../mk/motif.buildlink3.mk" +.endif # XBAE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -Xbae diff --git a/x11/Xcomposite/buildlink3.mk b/x11/Xcomposite/buildlink3.mk index 5cc83b00570..7e310da356e 100644 --- a/x11/Xcomposite/buildlink3.mk +++ b/x11/Xcomposite/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.12 2008/01/07 13:59:35 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:39 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XCOMPOSITE_BUILDLINK3_MK:= ${XCOMPOSITE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= Xcomposite -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= Xcomposite -.endif +.if !defined(XCOMPOSITE_BUILDLINK3_MK) +XCOMPOSITE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXcomposite} -BUILDLINK_PACKAGES+= Xcomposite -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Xcomposite - -.if !empty(XCOMPOSITE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.Xcomposite+= Xcomposite>=1.0.1 BUILDLINK_ABI_DEPENDS.Xcomposite?= Xcomposite>=1.0.1nb2 BUILDLINK_PKGSRCDIR.Xcomposite?= ../../x11/Xcomposite -.endif # XCOMPOSITE_BUILDLINK3_MK .include "../../x11/libXfixes/buildlink3.mk" .include "../../x11/compositeproto/buildlink3.mk" .include "../../x11/fixesproto/buildlink3.mk" +.endif # XCOMPOSITE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -Xcomposite diff --git a/x11/Xfixes/buildlink3.mk b/x11/Xfixes/buildlink3.mk index 986ac3d0f84..fb3b06412d6 100644 --- a/x11/Xfixes/buildlink3.mk +++ b/x11/Xfixes/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.15 2008/01/07 13:59:35 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:25:39 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFIXES_BUILDLINK3_MK:= ${XFIXES_BUILDLINK3_MK}+ +BUILDLINK_TREE+= Xfixes -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= Xfixes -.endif +.if !defined(XFIXES_BUILDLINK3_MK) +XFIXES_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXfixes} -BUILDLINK_PACKAGES+= Xfixes -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Xfixes - -.if !empty(XFIXES_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.Xfixes+= Xfixes>=2.0.0 BUILDLINK_ABI_DEPENDS.Xfixes+= Xfixes>=2.0.1nb2 BUILDLINK_PKGSRCDIR.Xfixes?= ../../x11/Xfixes -.endif # XFIXES_BUILDLINK3_MK .include "../../mk/x11.buildlink3.mk" .include "../../x11/fixesproto/buildlink3.mk" +.endif # XFIXES_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -Xfixes diff --git a/x11/XmHTML/buildlink3.mk b/x11/XmHTML/buildlink3.mk index df92bd0fd35..ddf83c65a1c 100644 --- a/x11/XmHTML/buildlink3.mk +++ b/x11/XmHTML/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/12/15 20:33:03 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:39 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XMHTML_BUILDLINK3_MK:= ${XMHTML_BUILDLINK3_MK}+ +BUILDLINK_TREE+= XmHTML -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= XmHTML -.endif +.if !defined(XMHTML_BUILDLINK3_MK) +XMHTML_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXmHTML} -BUILDLINK_PACKAGES+= XmHTML -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}XmHTML - -.if !empty(XMHTML_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.XmHTML+= XmHTML>=1.1.7nb2 BUILDLINK_ABI_DEPENDS.XmHTML+= XmHTML>=1.1.7nb6 BUILDLINK_PKGSRCDIR.XmHTML?= ../../x11/XmHTML -.endif # XMHTML_BUILDLINK3_MK .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.endif # XMHTML_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -XmHTML diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk index 4be6da2fdf5..dfca28c50ca 100644 --- a/x11/Xrender/buildlink3.mk +++ b/x11/Xrender/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.44 2006/12/12 21:52:37 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.45 2009/03/20 19:25:39 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XRENDER_BUILDLINK3_MK:= ${XRENDER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= Xrender -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= Xrender -.endif +.if !defined(XRENDER_BUILDLINK3_MK) +XRENDER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXrender} -BUILDLINK_PACKAGES+= Xrender -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Xrender - -.if !empty(XRENDER_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.2 BUILDLINK_ABI_DEPENDS.Xrender+= Xrender>=0.9.0nb1 BUILDLINK_PKGSRCDIR.Xrender?= ../../x11/Xrender -.endif # XRENDER_BUILDLINK3_MK .include "../../mk/x11.buildlink3.mk" .include "../../x11/renderproto/buildlink3.mk" +.endif # XRENDER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -Xrender diff --git a/x11/bigreqsproto/buildlink3.mk b/x11/bigreqsproto/buildlink3.mk index 96895eb837c..cb32497067e 100644 --- a/x11/bigreqsproto/buildlink3.mk +++ b/x11/bigreqsproto/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 17:38:16 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:39 joerg Exp $ BUILDLINK_DEPMETHOD.bigreqsproto?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BIGREQSPROTO_BUILDLINK3_MK:= ${BIGREQSPROTO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= bigreqsproto -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= bigreqsproto -.endif +.if !defined(BIGREQSPROTO_BUILDLINK3_MK) +BIGREQSPROTO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbigreqsproto} -BUILDLINK_PACKAGES+= bigreqsproto -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}bigreqsproto - -.if ${BIGREQSPROTO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.bigreqsproto+= bigreqsproto>=1.0 BUILDLINK_PKGSRCDIR.bigreqsproto?= ../../x11/bigreqsproto -.endif # BIGREQSPROTO_BUILDLINK3_MK +.endif # BIGREQSPROTO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -bigreqsproto diff --git a/x11/blt/buildlink3.mk b/x11/blt/buildlink3.mk index 7b46252c08d..28ec2128976 100644 --- a/x11/blt/buildlink3.mk +++ b/x11/blt/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:13 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:39 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BLT_BUILDLINK3_MK:= ${BLT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= blt -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= blt -.endif +.if !defined(BLT_BUILDLINK3_MK) +BLT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nblt} -BUILDLINK_PACKAGES+= blt -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}blt - -.if !empty(BLT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.blt+= blt>=2.4z BUILDLINK_ABI_DEPENDS.blt?= blt>=2.4znb2 BUILDLINK_PKGSRCDIR.blt?= ../../x11/blt -.endif # BLT_BUILDLINK3_MK .include "../../lang/tcl/buildlink3.mk" .include "../../x11/tk/buildlink3.mk" +.endif # BLT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -blt diff --git a/x11/compositeproto/buildlink3.mk b/x11/compositeproto/buildlink3.mk index 77e7f7e7179..1079642ae88 100644 --- a/x11/compositeproto/buildlink3.mk +++ b/x11/compositeproto/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.8 2008/01/07 13:59:36 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:39 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" BUILDLINK_DEPMETHOD.compositeproto?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -COMPOSITEPROTO_BUILDLINK3_MK:= ${COMPOSITEPROTO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= compositeproto -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= compositeproto -.endif +.if !defined(COMPOSITEPROTO_BUILDLINK3_MK) +COMPOSITEPROTO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncompositeproto} -BUILDLINK_PACKAGES+= compositeproto -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}compositeproto - -.if !empty(COMPOSITEPROTO_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.compositeproto+= compositeproto>=0.3.1 BUILDLINK_PKGSRCDIR.compositeproto?= ../../x11/compositeproto -.endif # COMPOSITEPROTO_BUILDLINK3_MK .include "../../x11/fixesproto/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" +.endif # COMPOSITEPROTO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -compositeproto diff --git a/x11/damageproto/buildlink3.mk b/x11/damageproto/buildlink3.mk index f5f213384f5..1d6a0fad8e4 100644 --- a/x11/damageproto/buildlink3.mk +++ b/x11/damageproto/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.2 2007/01/18 17:30:44 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:39 joerg Exp $ BUILDLINK_DEPMETHOD.damageproto?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -DAMAGEPROTO_BUILDLINK3_MK:= ${DAMAGEPROTO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= damageproto -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= damageproto -.endif +.if !defined(DAMAGEPROTO_BUILDLINK3_MK) +DAMAGEPROTO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndamageproto} -BUILDLINK_PACKAGES+= damageproto -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}damageproto - -.if ${DAMAGEPROTO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.damageproto+= damageproto>=1.1.0 BUILDLINK_PKGSRCDIR.damageproto?= ../../x11/damageproto -.endif # DAMAGEPROTO_BUILDLINK3_MK .include "../../x11/xproto/buildlink3.mk" .include "../../x11/fixesproto/buildlink3.mk" +.endif # DAMAGEPROTO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -damageproto diff --git a/x11/efltk/buildlink3.mk b/x11/efltk/buildlink3.mk index adeeeddbf9b..3b763b0e72f 100644 --- a/x11/efltk/buildlink3.mk +++ b/x11/efltk/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.11 2007/01/13 18:35:40 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:39 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EFLTK_BUILDLINK3_MK:= ${EFLTK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= efltk -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= efltk -.endif +.if !defined(EFLTK_BUILDLINK3_MK) +EFLTK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nefltk} -BUILDLINK_PACKAGES+= efltk -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}efltk - -.if !empty(EFLTK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.efltk+= efltk>=2.0.5nb1 BUILDLINK_ABI_DEPENDS.efltk?= efltk>=2.0.5nb7 BUILDLINK_PKGSRCDIR.efltk?= ../../x11/efltk -.endif # EFLTK_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" +.endif # EFLTK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -efltk diff --git a/x11/evieext/buildlink3.mk b/x11/evieext/buildlink3.mk index a7fa1b914d5..cb77f292167 100644 --- a/x11/evieext/buildlink3.mk +++ b/x11/evieext/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 21:47:55 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:40 joerg Exp $ BUILDLINK_DEPMETHOD.evieext?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EVIEEXT_BUILDLINK3_MK:= ${EVIEEXT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= evieext -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= evieext -.endif +.if !defined(EVIEEXT_BUILDLINK3_MK) +EVIEEXT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nevieext} -BUILDLINK_PACKAGES+= evieext -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}evieext - -.if ${EVIEEXT_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.evieext+= evieext>=1.0.2 BUILDLINK_PKGSRCDIR.evieext?= ../../x11/evieext -.endif # EVIEEXT_BUILDLINK3_MK +.endif # EVIEEXT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -evieext diff --git a/x11/fixesproto/buildlink3.mk b/x11/fixesproto/buildlink3.mk index da7b2bc8cd1..f196d4432ef 100644 --- a/x11/fixesproto/buildlink3.mk +++ b/x11/fixesproto/buildlink3.mk @@ -1,27 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.7 2008/01/07 13:59:36 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:40 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" BUILDLINK_DEPMETHOD.fixesproto?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FIXESPROTO_BUILDLINK3_MK:= ${FIXESPROTO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= fixesproto -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= fixesproto -.endif +.if !defined(FIXESPROTO_BUILDLINK3_MK) +FIXESPROTO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfixesproto} -BUILDLINK_PACKAGES+= fixesproto -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fixesproto - -.if !empty(FIXESPROTO_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=3.0.0 BUILDLINK_PKGSRCDIR.fixesproto?= ../../x11/fixesproto -.endif # FIXESPROTO_BUILDLINK3_MK .include "../../x11/xextproto/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" +.endif # FIXESPROTO_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -fixesproto diff --git a/x11/fltk/buildlink3.mk b/x11/fltk/buildlink3.mk index b7d419490b1..336b2b728c7 100644 --- a/x11/fltk/buildlink3.mk +++ b/x11/fltk/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.16 2007/01/02 12:42:45 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:25:40 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FLTK_BUILDLINK3_MK:= ${FLTK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= fltk -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= fltk -.endif +.if !defined(FLTK_BUILDLINK3_MK) +FLTK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfltk} -BUILDLINK_PACKAGES+= fltk -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fltk - -.if !empty(FLTK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.fltk+= fltk>=1.1.5rc1 BUILDLINK_ABI_DEPENDS.fltk+= fltk>=1.1.7nb1 BUILDLINK_PKGSRCDIR.fltk?= ../../x11/fltk BUILDLINK_FILES.fltk+= include/Fl/* -.endif # FLTK_BUILDLINK3_MK .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" +.endif # FLTK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -fltk diff --git a/x11/fltk2/buildlink3.mk b/x11/fltk2/buildlink3.mk index cd5cecf0323..0188a322dab 100644 --- a/x11/fltk2/buildlink3.mk +++ b/x11/fltk2/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/14 12:06:49 abs Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:40 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FLTK2_BUILDLINK3_MK:= ${FLTK2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= fltk2 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= fltk2 -.endif +.if !defined(FLTK2_BUILDLINK3_MK) +FLTK2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfltk2} -BUILDLINK_PACKAGES+= fltk2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fltk2 - -.if ${FLTK2_BUILDLINK3_MK} == "+" BUILDLINK_DEPMETHOD.fltk2?= build BUILDLINK_API_DEPENDS.fltk2+= fltk2>=2.0pre6129 BUILDLINK_PKGSRCDIR.fltk2?= ../../x11/fltk2 -.endif # FLTK2_BUILDLINK3_MK .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" @@ -25,5 +17,6 @@ BUILDLINK_PKGSRCDIR.fltk2?= ../../x11/fltk2 .include "../../x11/libXft/buildlink3.mk" .include "../../x11/libXi/buildlink3.mk" .include "../../x11/libXinerama/buildlink3.mk" +.endif # FLTK2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -fltk2 diff --git a/x11/fontcacheproto/buildlink3.mk b/x11/fontcacheproto/buildlink3.mk index 5aea8836caa..abb438e5221 100644 --- a/x11/fontcacheproto/buildlink3.mk +++ b/x11/fontcacheproto/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 19:54:04 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:40 joerg Exp $ BUILDLINK_DEPMETHOD.fontcacheproto?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FONTCACHEPROTO_BUILDLINK3_MK:= ${FONTCACHEPROTO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= fontcacheproto -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= fontcacheproto -.endif +.if !defined(FONTCACHEPROTO_BUILDLINK3_MK) +FONTCACHEPROTO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfontcacheproto} -BUILDLINK_PACKAGES+= fontcacheproto -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fontcacheproto - -.if ${FONTCACHEPROTO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.fontcacheproto+= fontcacheproto>=0.1 BUILDLINK_PKGSRCDIR.fontcacheproto?= ../../x11/fontcacheproto -.endif # FONTCACHEPROTO_BUILDLINK3_MK +.endif # FONTCACHEPROTO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -fontcacheproto diff --git a/x11/fontsproto/buildlink3.mk b/x11/fontsproto/buildlink3.mk index a78cd400235..86cbf8cf9fc 100644 --- a/x11/fontsproto/buildlink3.mk +++ b/x11/fontsproto/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.2 2006/11/03 17:19:22 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:40 joerg Exp $ BUILDLINK_DEPMETHOD.fontsproto?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FONTSPROTO_BUILDLINK3_MK:= ${FONTSPROTO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= fontsproto -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= fontsproto -.endif +.if !defined(FONTSPROTO_BUILDLINK3_MK) +FONTSPROTO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfontsproto} -BUILDLINK_PACKAGES+= fontsproto -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fontsproto - -.if ${FONTSPROTO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.fontsproto+= fontsproto>=2.0 BUILDLINK_PKGSRCDIR.fontsproto?= ../../x11/fontsproto -.endif # FONTSPROTO_BUILDLINK3_MK +.endif # FONTSPROTO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -fontsproto diff --git a/x11/fox/buildlink3.mk b/x11/fox/buildlink3.mk index 5e09105f3aa..69add363d83 100644 --- a/x11/fox/buildlink3.mk +++ b/x11/fox/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.16 2007/04/13 05:45:36 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:25:40 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FOX_BUILDLINK3_MK:= ${FOX_BUILDLINK3_MK}+ +BUILDLINK_TREE+= fox -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= fox -.endif +.if !defined(FOX_BUILDLINK3_MK) +FOX_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfox} -BUILDLINK_PACKAGES+= fox -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fox - -.if !empty(FOX_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.fox+= fox>=1.6.25 BUILDLINK_PKGSRCDIR.fox?= ../../x11/fox BUILDLINK_INCDIRS.fox?= include/fox-1.6 -.endif # FOX_BUILDLINK3_MK .include "../../archivers/bzip2/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" @@ -28,5 +20,6 @@ BUILDLINK_INCDIRS.fox?= include/fox-1.6 .include "../../x11/libXft/buildlink3.mk" .include "../../x11/libXrandr/buildlink3.mk" .include "../../x11/xextproto/buildlink3.mk" +.endif # FOX_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -fox diff --git a/x11/glproto/buildlink3.mk b/x11/glproto/buildlink3.mk index 1d4c49442f9..17da6cf1fa3 100644 --- a/x11/glproto/buildlink3.mk +++ b/x11/glproto/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/14 13:30:57 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:40 joerg Exp $ BUILDLINK_DEPMETHOD.glproto?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GLPROTO_BUILDLINK3_MK:= ${GLPROTO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= glproto -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= glproto -.endif +.if !defined(GLPROTO_BUILDLINK3_MK) +GLPROTO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglproto} -BUILDLINK_PACKAGES+= glproto -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}glproto - -.if ${GLPROTO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.6 BUILDLINK_PKGSRCDIR.glproto?= ../../x11/glproto -.endif # GLPROTO_BUILDLINK3_MK +.endif # GLPROTO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -glproto diff --git a/x11/gnome-control-center/buildlink3.mk b/x11/gnome-control-center/buildlink3.mk index a241ee05b32..348b6749824 100644 --- a/x11/gnome-control-center/buildlink3.mk +++ b/x11/gnome-control-center/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.3 2008/09/06 20:54:34 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:40 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNOME_CONTROL_CENTER_BUILDLINK3_MK:= ${GNOME_CONTROL_CENTER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnome-control-center -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= gnome-control-center -.endif +.if !defined(GNOME_CONTROL_CENTER_BUILDLINK3_MK) +GNOME_CONTROL_CENTER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-control-center} -BUILDLINK_PACKAGES+= gnome-control-center -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-control-center - -.if ${GNOME_CONTROL_CENTER_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.gnome-control-center+= gnome-control-center>=2.20.0.1 BUILDLINK_ABI_DEPENDS.gnome-control-center?= gnome-control-center>=2.22.2.1nb1 BUILDLINK_PKGSRCDIR.gnome-control-center?= ../../x11/gnome-control-center -.endif # GNOME_CONTROL_CENTER_BUILDLINK3_MK .include "../../audio/esound/buildlink3.mk" .include "../../devel/libbonoboui/buildlink3.mk" @@ -27,5 +19,6 @@ BUILDLINK_PKGSRCDIR.gnome-control-center?= ../../x11/gnome-control-center .include "../../wm/metacity/buildlink3.mk" .include "../../x11/gnome-desktop/buildlink3.mk" .include "../../x11/gnome-panel/buildlink3.mk" +.endif # GNOME_CONTROL_CENTER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnome-control-center diff --git a/x11/gnome-desktop-sharp/buildlink3.mk b/x11/gnome-desktop-sharp/buildlink3.mk index 617d953cd27..362fa87e425 100644 --- a/x11/gnome-desktop-sharp/buildlink3.mk +++ b/x11/gnome-desktop-sharp/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.3 2008/10/24 20:59:54 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:41 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNOME_DESKTOP_SHARP_BUILDLINK3_MK:= ${GNOME_DESKTOP_SHARP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnome-desktop-sharp -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= gnome-desktop-sharp -.endif +.if !defined(GNOME_DESKTOP_SHARP_BUILDLINK3_MK) +GNOME_DESKTOP_SHARP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-desktop-sharp} -BUILDLINK_PACKAGES+= gnome-desktop-sharp -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-desktop-sharp - -.if ${GNOME_DESKTOP_SHARP_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.gnome-desktop-sharp+= gnome-desktop-sharp>=2.24.0 BUILDLINK_PKGSRCDIR.gnome-desktop-sharp?= ../../x11/gnome-desktop-sharp -.endif # GNOME_DESKTOP_SHARP_BUILDLINK3_MK .include "../../devel/libwnck/buildlink3.mk" .include "../../graphics/librsvg/buildlink3.mk" @@ -26,5 +18,6 @@ BUILDLINK_PKGSRCDIR.gnome-desktop-sharp?= ../../x11/gnome-desktop-sharp .include "../../x11/gtk-sharp/buildlink3.mk" .include "../../x11/gtksourceview2/buildlink3.mk" .include "../../x11/vte/buildlink3.mk" +.endif # GNOME_DESKTOP_SHARP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnome-desktop-sharp diff --git a/x11/gnome-desktop/buildlink3.mk b/x11/gnome-desktop/buildlink3.mk index 29c54a5926a..41f31b97a88 100644 --- a/x11/gnome-desktop/buildlink3.mk +++ b/x11/gnome-desktop/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.27 2009/03/16 12:35:59 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.28 2009/03/20 19:25:40 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNOME_DESKTOP_BUILDLINK3_MK:= ${GNOME_DESKTOP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnome-desktop -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnome-desktop -.endif +.if !defined(GNOME_DESKTOP_BUILDLINK3_MK) +GNOME_DESKTOP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-desktop} -BUILDLINK_PACKAGES+= gnome-desktop -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-desktop - -.if !empty(GNOME_DESKTOP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gnome-desktop+= gnome-desktop>=2.25.3 BUILDLINK_ABI_DEPENDS.gnome-desktop?= gnome-desktop>=2.25.1 BUILDLINK_PKGSRCDIR.gnome-desktop?= ../../x11/gnome-desktop -.endif # GNOME_DESKTOP_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" +.endif # GNOME_DESKTOP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnome-desktop diff --git a/x11/gnome-mag/buildlink3.mk b/x11/gnome-mag/buildlink3.mk index 91edfdbb128..9dffb4e56f8 100644 --- a/x11/gnome-mag/buildlink3.mk +++ b/x11/gnome-mag/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:11:13 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:25:41 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNOME_MAG_BUILDLINK3_MK:= ${GNOME_MAG_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnome-mag -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnome-mag -.endif +.if !defined(GNOME_MAG_BUILDLINK3_MK) +GNOME_MAG_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-mag} -BUILDLINK_PACKAGES+= gnome-mag -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-mag - -.if !empty(GNOME_MAG_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gnome-mag+= gnome-mag>=0.12.0 BUILDLINK_ABI_DEPENDS.gnome-mag?= gnome-mag>=0.12.4nb1 BUILDLINK_PKGSRCDIR.gnome-mag?= ../../x11/gnome-mag -.endif # GNOME_MAG_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # GNOME_MAG_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnome-mag diff --git a/x11/gnome-panel/buildlink3.mk b/x11/gnome-panel/buildlink3.mk index dec75ce98f5..e6fef7e81aa 100644 --- a/x11/gnome-panel/buildlink3.mk +++ b/x11/gnome-panel/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.29 2008/09/06 20:54:34 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.30 2009/03/20 19:25:41 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNOME_PANEL_BUILDLINK3_MK:= ${GNOME_PANEL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnome-panel -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnome-panel -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-panel} -BUILDLINK_PACKAGES+= gnome-panel -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-panel +.if !defined(GNOME_PANEL_BUILDLINK3_MK) +GNOME_PANEL_BUILDLINK3_MK:= -.if !empty(GNOME_PANEL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gnome-panel+= gnome-panel>=2.12.1nb3 BUILDLINK_ABI_DEPENDS.gnome-panel?= gnome-panel>=2.22.2nb1 BUILDLINK_PKGSRCDIR.gnome-panel?= ../../x11/gnome-panel @@ -21,7 +14,6 @@ pkgbase:= gnome-panel .if !empty(PKG_BUILD_OPTIONS.gnome-panel:Mevolution) .include "../../mail/evolution-data-server/buildlink3.mk" .endif -.endif # GNOME_PANEL_BUILDLINK3_MK .include "../../devel/GConf/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -37,5 +29,6 @@ pkgbase:= gnome-panel .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" +.endif # GNOME_PANEL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnome-panel diff --git a/x11/gnome-sharp/buildlink3.mk b/x11/gnome-sharp/buildlink3.mk index 98cefef5b4f..5ddacba99a9 100644 --- a/x11/gnome-sharp/buildlink3.mk +++ b/x11/gnome-sharp/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.8 2008/10/24 20:51:11 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:41 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNOME_SHARP_BUILDLINK3_MK:= ${GNOME_SHARP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnome-sharp -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= gnome-sharp -.endif +.if !defined(GNOME_SHARP_BUILDLINK3_MK) +GNOME_SHARP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-sharp} -BUILDLINK_PACKAGES+= gnome-sharp -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-sharp - -.if ${GNOME_SHARP_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.gnome-sharp+= gnome-sharp>=2.24.0 BUILDLINK_PKGSRCDIR.gnome-sharp?= ../../x11/gnome-sharp -.endif # GNOME_SHARP_BUILDLINK3_MK .include "../../devel/libgnomeui/buildlink3.mk" .include "../../graphics/libart/buildlink3.mk" @@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.gnome-sharp?= ../../x11/gnome-sharp .include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/gtk-sharp/buildlink3.mk" +.endif # GNOME_SHARP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnome-sharp diff --git a/x11/gnustep-back/buildlink3.mk b/x11/gnustep-back/buildlink3.mk index e440b935a4c..1f47ebbae53 100644 --- a/x11/gnustep-back/buildlink3.mk +++ b/x11/gnustep-back/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.16 2008/01/18 05:09:55 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:25:41 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNUSTEP_BACK_BUILDLINK3_MK:= ${GNUSTEP_BACK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnustep-back -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnustep-back -.endif +.if !defined(GNUSTEP_BACK_BUILDLINK3_MK) +GNUSTEP_BACK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnustep-back} -BUILDLINK_PACKAGES+= gnustep-back -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnustep-back - -.if !empty(GNUSTEP_BACK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gnustep-back+= gnustep-back>=0.9.2 BUILDLINK_ABI_DEPENDS.gnustep-back+= gnustep-back>=0.12.0nb1 BUILDLINK_PKGSRCDIR.gnustep-back?= ../../x11/gnustep-back -.endif # GNUSTEP_BACK_BUILDLINK3_MK .include "../../graphics/cairo/buildlink3.mk" .include "../../graphics/libart/buildlink3.mk" .include "../../x11/gnustep-gui/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" +.endif # GNUSTEP_BACK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnustep-back diff --git a/x11/gnustep-gui/buildlink3.mk b/x11/gnustep-gui/buildlink3.mk index 7c0ec96763a..58d47b749df 100644 --- a/x11/gnustep-gui/buildlink3.mk +++ b/x11/gnustep-gui/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.14 2008/01/18 05:09:55 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:41 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNUSTEP_GUI_BUILDLINK3_MK:= ${GNUSTEP_GUI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnustep-gui -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnustep-gui -.endif +.if !defined(GNUSTEP_GUI_BUILDLINK3_MK) +GNUSTEP_GUI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnustep-gui} -BUILDLINK_PACKAGES+= gnustep-gui -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnustep-gui - -.if !empty(GNUSTEP_GUI_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gnustep-gui+= gnustep-gui>=0.9.2 BUILDLINK_ABI_DEPENDS.gnustep-gui+= gnustep-gui>=0.12.0nb1 BUILDLINK_PKGSRCDIR.gnustep-gui?= ../../x11/gnustep-gui @@ -41,13 +34,12 @@ PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/PostSc PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Services\/GSspell.service$$/ { next; } PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Services\/GSspell.service\/Resources$$/ { next; } -.endif # GNUSTEP_GUI_BUILDLINK3_MK - .include "../../audio/libaudiofile/buildlink3.mk" .include "../../devel/gnustep-base/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" +.endif # GNUSTEP_GUI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnustep-gui diff --git a/x11/gnustep-preferences/buildlink3.mk b/x11/gnustep-preferences/buildlink3.mk index ec219c8f21c..70262cf29ef 100644 --- a/x11/gnustep-preferences/buildlink3.mk +++ b/x11/gnustep-preferences/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.10 2008/12/28 07:56:38 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:41 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNUSTEP_PREFERENCES_BUILDLINK3_MK:= ${GNUSTEP_PREFERENCES_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnustep-preferences -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnustep-preferences -.endif +.if !defined(GNUSTEP_PREFERENCES_BUILDLINK3_MK) +GNUSTEP_PREFERENCES_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnustep-preferences} -BUILDLINK_PACKAGES+= gnustep-preferences -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnustep-preferences - -.if !empty(GNUSTEP_PREFERENCES_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gnustep-preferences+= gnustep-preferences>=1.2.0 BUILDLINK_ABI_DEPENDS.gnustep-preferences+= gnustep-preferences>=1.2.0nb16 BUILDLINK_PKGSRCDIR.gnustep-preferences?= ../../x11/gnustep-preferences -.endif # GNUSTEP_PREFERENCES_BUILDLINK3_MK .include "../../x11/gnustep-back/buildlink3.mk" +.endif # GNUSTEP_PREFERENCES_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnustep-preferences diff --git a/x11/gtk+extra/buildlink3.mk b/x11/gtk+extra/buildlink3.mk index 6d03dd5a9db..0afefae249b 100644 --- a/x11/gtk+extra/buildlink3.mk +++ b/x11/gtk+extra/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.7 2009/03/19 16:20:52 cube Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:41 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GTK_EXTRA_BUILDLINK3_MK:= ${GTK+EXTRA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gtk+extra -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gtk+extra -.endif +.if !defined(GTK_EXTRA_BUILDLINK3_MK) +GTK_EXTRA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtk+extra} -BUILDLINK_PACKAGES+= gtk+extra -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtk+extra - -.if !empty(GTK_EXTRA_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gtk+extra+= gtk+extra>=0.99.17nb2 BUILDLINK_ABI_DEPENDS.gtk+extra?= gtk+extra>=0.99.17nb5 BUILDLINK_PKGSRCDIR.gtk+extra?= ../../x11/gtk+extra -.endif # GTK_EXTRA_BUILDLINK3_MK .include "../../x11/gtk/buildlink3.mk" +.endif # GTK_EXTRA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gtk+extra diff --git a/x11/gtk-sharp/buildlink3.mk b/x11/gtk-sharp/buildlink3.mk index 669730a68f7..28092ee0b8c 100644 --- a/x11/gtk-sharp/buildlink3.mk +++ b/x11/gtk-sharp/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/03/06 14:28:44 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:41 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GTK_SHARP_BUILDLINK3_MK:= ${GTK_SHARP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gtk-sharp -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= gtk-sharp -.endif +.if !defined(GTK_SHARP_BUILDLINK3_MK) +GTK_SHARP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtk-sharp} -BUILDLINK_PACKAGES+= gtk-sharp -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtk-sharp - -.if ${GTK_SHARP_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.gtk-sharp+= gtk-sharp>=2.12.1 BUILDLINK_PKGSRCDIR.gtk-sharp?= ../../x11/gtk-sharp -.endif # GTK_SHARP_BUILDLINK3_MK PRINT_PLIST_AWK+= /^@dirrm share\/gapi-2.0$$/ \ { print "@comment in gtk-sharp: " $$0; next; } @@ -22,5 +14,6 @@ PRINT_PLIST_AWK+= /^@dirrm lib\/mono\/gtk-sharp-2.0$$/ \ { print "@comment in gtk-sharp: " $$0; next; } PRINT_PLIST_AWK+= /^@dirrm lib\/gtk-sharp-2.0$$/ \ { print "@comment in gtk-sharp: " $$0; next; } +.endif # GTK_SHARP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gtk-sharp diff --git a/x11/gtk/buildlink3.mk b/x11/gtk/buildlink3.mk index 1121a5d658b..7b17d6fa28d 100644 --- a/x11/gtk/buildlink3.mk +++ b/x11/gtk/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.17 2007/01/02 11:26:58 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:25:41 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GTK_BUILDLINK3_MK:= ${GTK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gtk -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gtk -.endif +.if !defined(GTK_BUILDLINK3_MK) +GTK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtk} -BUILDLINK_PACKAGES+= gtk -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtk - -.if !empty(GTK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gtk+= gtk+>=1.2.10 BUILDLINK_ABI_DEPENDS.gtk+= gtk+>=1.2.10nb9 BUILDLINK_PKGSRCDIR.gtk?= ../../x11/gtk -.endif # GTK_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXi/buildlink3.mk" +.endif # GTK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gtk diff --git a/x11/gtk2+extra/buildlink3.mk b/x11/gtk2+extra/buildlink3.mk index 85b697cf99a..97c029d7253 100644 --- a/x11/gtk2+extra/buildlink3.mk +++ b/x11/gtk2+extra/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.9 2009/03/19 16:20:52 cube Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:42 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GTK2_EXTRA_BUILDLINK3_MK:= ${GTK2+EXTRA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gtk2+extra -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gtk2+extra -.endif +.if !defined(GTK2_EXTRA_BUILDLINK3_MK) +GTK2_EXTRA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtk2+extra} -BUILDLINK_PACKAGES+= gtk2+extra -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtk2+extra - -.if !empty(GTK2_EXTRA_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gtk2+extra+= gtk2+extra>=2.1.1 BUILDLINK_ABI_DEPENDS.gtk2+extra?= gtk2+extra>=2.1.1nb3 BUILDLINK_PKGSRCDIR.gtk2+extra?= ../../x11/gtk2+extra -.endif # GTK2_EXTRA_BUILDLINK3_MK .include "../../x11/gtk2/buildlink3.mk" +.endif # GTK2_EXTRA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gtk2+extra diff --git a/x11/gtk2-engines/buildlink3.mk b/x11/gtk2-engines/buildlink3.mk index 9b9d2c9875d..d598db0acc9 100644 --- a/x11/gtk2-engines/buildlink3.mk +++ b/x11/gtk2-engines/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:14 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:42 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GTK2_ENGINES_BUILDLINK3_MK:= ${GTK2_ENGINES_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gtk2-engines -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gtk2-engines -.endif +.if !defined(GTK2_ENGINES_BUILDLINK3_MK) +GTK2_ENGINES_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtk2-engines} -BUILDLINK_PACKAGES+= gtk2-engines -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtk2-engines - -.if !empty(GTK2_ENGINES_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gtk2-engines+= gtk2-engines>=2.6.0 BUILDLINK_ABI_DEPENDS.gtk2-engines?= gtk2-engines>=2.6.8nb1 BUILDLINK_PKGSRCDIR.gtk2-engines?= ../../x11/gtk2-engines -.endif # GTK2_ENGINES_BUILDLINK3_MK .include "../../x11/gtk2/buildlink3.mk" +.endif # GTK2_ENGINES_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gtk2-engines diff --git a/x11/gtk2/buildlink3.mk b/x11/gtk2/buildlink3.mk index 96ef70ad066..2d75994aa87 100644 --- a/x11/gtk2/buildlink3.mk +++ b/x11/gtk2/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.39 2008/09/11 09:34:04 dsainty Exp $ +# $NetBSD: buildlink3.mk,v 1.40 2009/03/20 19:25:42 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GTK2_BUILDLINK3_MK:= ${GTK2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gtk2 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gtk2 -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtk2} -BUILDLINK_PACKAGES+= gtk2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtk2 +.if !defined(GTK2_BUILDLINK3_MK) +GTK2_BUILDLINK3_MK:= -.if !empty(GTK2_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.4.0 BUILDLINK_ABI_DEPENDS.gtk2+= gtk2+>=2.8.17nb1 BUILDLINK_PKGSRCDIR.gtk2?= ../../x11/gtk2 @@ -22,7 +15,6 @@ PRINT_PLIST_AWK+= /^@dirrm lib\/gtk-2.0\/(engines|filesystems|immodules|loaders| PRINT_PLIST_AWK+= /^@dirrm lib\/gtk-2.0\/2.10.0$$/ { next; } PRINT_PLIST_AWK+= /^@dirrm lib\/gtk-2.0\/2.10.0\/(engines|filesystems|immodules|loaders|modules|printbackends)$$/ \ { print "@comment in gtk2: " $$0; next; } -.endif # GTK2_BUILDLINK3_MK .include "../../mk/bsd.fast.prefs.mk" @@ -49,5 +41,6 @@ pkgbase := gtk2 .include "../../graphics/cairo/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.endif # GTK2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gtk2 diff --git a/x11/gtkglarea/buildlink3.mk b/x11/gtkglarea/buildlink3.mk index ca5356a3899..19bf04eb8b7 100644 --- a/x11/gtkglarea/buildlink3.mk +++ b/x11/gtkglarea/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:14 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:42 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GTKGLAREA_BUILDLINK3_MK:= ${GTKGLAREA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gtkglarea -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gtkglarea -.endif +.if !defined(GTKGLAREA_BUILDLINK3_MK) +GTKGLAREA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtkglarea} -BUILDLINK_PACKAGES+= gtkglarea -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtkglarea - -.if !empty(GTKGLAREA_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gtkglarea+= gtkglarea>=1.2.2nb3 BUILDLINK_ABI_DEPENDS.gtkglarea?= gtkglarea>=1.2.3nb2 BUILDLINK_PKGSRCDIR.gtkglarea?= ../../x11/gtkglarea -.endif # GTKGLAREA_BUILDLINK3_MK .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" +.endif # GTKGLAREA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gtkglarea diff --git a/x11/gtkmm/buildlink3.mk b/x11/gtkmm/buildlink3.mk index d77ff4efa2e..34b95f16e05 100644 --- a/x11/gtkmm/buildlink3.mk +++ b/x11/gtkmm/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.14 2008/10/16 21:34:08 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:42 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GTKMM_BUILDLINK3_MK:= ${GTKMM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gtkmm -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gtkmm -.endif +.if !defined(GTKMM_BUILDLINK3_MK) +GTKMM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtkmm} -BUILDLINK_PACKAGES+= gtkmm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtkmm - -.if !empty(GTKMM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gtkmm+= gtkmm>=2.6.3 BUILDLINK_ABI_DEPENDS.gtkmm+= gtkmm>=2.14.1 BUILDLINK_PKGSRCDIR.gtkmm?= ../../x11/gtkmm -.endif # GTKMM_BUILDLINK3_MK .include "../../devel/pangomm/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # GTKMM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gtkmm diff --git a/x11/gtksourceview-sharp2/buildlink3.mk b/x11/gtksourceview-sharp2/buildlink3.mk index ed9b4a257e2..488fa18e914 100644 --- a/x11/gtksourceview-sharp2/buildlink3.mk +++ b/x11/gtksourceview-sharp2/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/03/17 22:44:11 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:42 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GTKSOURCEVIEW_SHARP2_BUILDLINK3_MK:= ${GTKSOURCEVIEW_SHARP2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gtksourceview-sharp2 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= gtksourceview-sharp2 -.endif +.if !defined(GTKSOURCEVIEW_SHARP2_BUILDLINK3_MK) +GTKSOURCEVIEW_SHARP2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtksourceview-sharp2} -BUILDLINK_PACKAGES+= gtksourceview-sharp2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtksourceview-sharp2 - -.if ${GTKSOURCEVIEW_SHARP2_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.gtksourceview-sharp2+= gtksourceview-sharp2>=0.10 BUILDLINK_PKGSRCDIR.gtksourceview-sharp2?= ../../x11/gtksourceview-sharp2 -.endif # GTKSOURCEVIEW_SHARP2_BUILDLINK3_MK +.endif # GTKSOURCEVIEW_SHARP2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gtksourceview-sharp2 diff --git a/x11/gtksourceview/buildlink3.mk b/x11/gtksourceview/buildlink3.mk index 8e4890e8891..a71106e667e 100644 --- a/x11/gtksourceview/buildlink3.mk +++ b/x11/gtksourceview/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.15 2008/02/20 11:28:19 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:25:42 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GTKSOURCEVIEW_BUILDLINK3_MK:= ${GTKSOURCEVIEW_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gtksourceview -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= gtksourceview -.endif +.if !defined(GTKSOURCEVIEW_BUILDLINK3_MK) +GTKSOURCEVIEW_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtksourceview} -BUILDLINK_PACKAGES+= gtksourceview -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtksourceview - -.if ${GTKSOURCEVIEW_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.gtksourceview+= gtksourceview>=1.8.5 BUILDLINK_PKGSRCDIR.gtksourceview?= ../../x11/gtksourceview -.endif # GTKSOURCEVIEW_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" @@ -22,5 +14,6 @@ BUILDLINK_PKGSRCDIR.gtksourceview?= ../../x11/gtksourceview .include "../../print/libgnomeprint/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # GTKSOURCEVIEW_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gtksourceview diff --git a/x11/gtksourceview2/buildlink3.mk b/x11/gtksourceview2/buildlink3.mk index 3541203c4b4..bb822ee46e8 100644 --- a/x11/gtksourceview2/buildlink3.mk +++ b/x11/gtksourceview2/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.4 2008/02/22 08:15:47 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:42 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GTKSOURCEVIEW2_BUILDLINK3_MK:= ${GTKSOURCEVIEW2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gtksourceview2 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= gtksourceview2 -.endif +.if !defined(GTKSOURCEVIEW2_BUILDLINK3_MK) +GTKSOURCEVIEW2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtksourceview2} -BUILDLINK_PACKAGES+= gtksourceview2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtksourceview2 - -.if ${GTKSOURCEVIEW2_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.gtksourceview2+= gtksourceview2>=2.0.2 BUILDLINK_PKGSRCDIR.gtksourceview2?= ../../x11/gtksourceview2 -.endif # GTKSOURCEVIEW2_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # GTKSOURCEVIEW2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gtksourceview2 diff --git a/x11/inputproto/buildlink3.mk b/x11/inputproto/buildlink3.mk index bd7b226bf06..43565b97d9d 100644 --- a/x11/inputproto/buildlink3.mk +++ b/x11/inputproto/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.3 2008/07/30 09:56:48 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:42 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -INPUTPROTO_BUILDLINK3_MK:= ${INPUTPROTO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= inputproto -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= inputproto -.endif +.if !defined(INPUTPROTO_BUILDLINK3_MK) +INPUTPROTO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ninputproto} -BUILDLINK_PACKAGES+= inputproto -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}inputproto - -.if ${INPUTPROTO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.inputproto+= inputproto>=1.4 BUILDLINK_PKGSRCDIR.inputproto?= ../../x11/inputproto BUILDLINK_DEPMETHOD.inputproto?= build -.endif # INPUTPROTO_BUILDLINK3_MK +.endif # INPUTPROTO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -inputproto diff --git a/x11/kbproto/buildlink3.mk b/x11/kbproto/buildlink3.mk index c9f0d927c9a..293d83f0b93 100644 --- a/x11/kbproto/buildlink3.mk +++ b/x11/kbproto/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 18:08:58 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:42 joerg Exp $ BUILDLINK_DEPMETHOD.kbproto?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -KBPROTO_BUILDLINK3_MK:= ${KBPROTO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= kbproto -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= kbproto -.endif +.if !defined(KBPROTO_BUILDLINK3_MK) +KBPROTO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkbproto} -BUILDLINK_PACKAGES+= kbproto -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kbproto - -.if ${KBPROTO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.kbproto+= kbproto>=1.0.2 BUILDLINK_PKGSRCDIR.kbproto?= ../../x11/kbproto -.endif # KBPROTO_BUILDLINK3_MK +.endif # KBPROTO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -kbproto diff --git a/x11/kdebase3/buildlink3.mk b/x11/kdebase3/buildlink3.mk index 53157ffb688..a5e77c8ffe1 100644 --- a/x11/kdebase3/buildlink3.mk +++ b/x11/kdebase3/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.27 2008/01/18 05:10:05 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.28 2009/03/20 19:25:42 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -KDEBASE_BUILDLINK3_MK:= ${KDEBASE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= kdebase -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= kdebase -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkdebase} -BUILDLINK_PACKAGES+= kdebase -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kdebase +.if !defined(KDEBASE_BUILDLINK3_MK) +KDEBASE_BUILDLINK3_MK:= -.if !empty(KDEBASE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.kdebase+= kdebase>=3.5.0nb2 BUILDLINK_ABI_DEPENDS.kdebase?= kdebase>=3.5.8nb5 BUILDLINK_PKGSRCDIR.kdebase?= ../../x11/kdebase3 -.endif # KDEBASE_BUILDLINK3_MK pkgbase := kdebase .include "../../mk/pkg-build-options.mk" @@ -35,5 +27,6 @@ BUILDLINK_API_DEPENDS.Xrandr+= Xrandr>=1.0 .include "../../x11/kdelibs3/buildlink3.mk" .include "../../x11/libXcursor/buildlink3.mk" .include "../../x11/libXrandr/buildlink3.mk" +.endif # KDEBASE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -kdebase diff --git a/x11/kdebindings-ruby/buildlink3.mk b/x11/kdebindings-ruby/buildlink3.mk index 4fab64808f0..73346097cdf 100644 --- a/x11/kdebindings-ruby/buildlink3.mk +++ b/x11/kdebindings-ruby/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.4 2008/01/18 05:10:05 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:43 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -KDEBINDINGS_RUBY_BUILDLINK3_MK:= ${KDEBINDINGS_RUBY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= kdebindings-ruby -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= kdebindings-ruby -.endif +.if !defined(KDEBINDINGS_RUBY_BUILDLINK3_MK) +KDEBINDINGS_RUBY_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkdebindings-ruby} -BUILDLINK_PACKAGES+= kdebindings-ruby -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kdebindings-ruby - -.if ${KDEBINDINGS_RUBY_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.kdebindings-ruby+= kdebindings-ruby>=3.5.5 BUILDLINK_ABI_DEPENDS.kdebindings-ruby?= kdebindings-ruby>=3.5.8nb2 BUILDLINK_PKGSRCDIR.kdebindings-ruby?= ../../x11/kdebindings-ruby -.endif # KDEBINDINGS_RUBY_BUILDLINK3_MK .include "../../lang/ruby/buildlink3.mk" .include "../../x11/kdebase3/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" +.endif # KDEBINDINGS_RUBY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -kdebindings-ruby diff --git a/x11/kdelibs3/buildlink3.mk b/x11/kdelibs3/buildlink3.mk index 81f999e4db7..7aba15b0f52 100644 --- a/x11/kdelibs3/buildlink3.mk +++ b/x11/kdelibs3/buildlink3.mk @@ -1,23 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.29 2008/01/18 05:10:06 tnn Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -KDELIBS_BUILDLINK3_MK:= ${KDELIBS_BUILDLINK3_MK}+ +# $NetBSD: buildlink3.mk,v 1.30 2009/03/20 19:25:43 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= kdelibs -.endif +BUILDLINK_TREE+= kdelibs -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkdelibs} -BUILDLINK_PACKAGES+= kdelibs -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kdelibs +.if !defined(KDELIBS_BUILDLINK3_MK) +KDELIBS_BUILDLINK3_MK:= -.if !empty(KDELIBS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.kdelibs+= kdelibs>=3.5.6 BUILDLINK_ABI_DEPENDS.kdelibs?= kdelibs>=3.5.8nb5 BUILDLINK_PKGSRCDIR.kdelibs?= ../../x11/kdelibs3 -.endif # KDELIBS_BUILDLINK3_MK pkgbase := kdelibs .include "../../mk/pkg-build-options.mk" @@ -43,5 +35,6 @@ pkgbase := kdelibs .include "../../x11/qt3-libs/buildlink3.mk" .include "../../mk/krb5.buildlink3.mk" .include "../../mk/oss.buildlink3.mk" +.endif # KDELIBS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -kdelibs diff --git a/x11/lablgtk/buildlink3.mk b/x11/lablgtk/buildlink3.mk index 0d0ae4c6af0..c857cbc746a 100644 --- a/x11/lablgtk/buildlink3.mk +++ b/x11/lablgtk/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.9 2007/09/21 13:00:53 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:43 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LABLGTK_BUILDLINK3_MK:= ${LABLGTK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= lablgtk -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= lablgtk -.endif +.if !defined(LABLGTK_BUILDLINK3_MK) +LABLGTK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlablgtk} -BUILDLINK_PACKAGES+= lablgtk -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lablgtk - -.if !empty(LABLGTK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.lablgtk+= lablgtk>=2.6.0nb3 BUILDLINK_ABI_DEPENDS.lablgtk?= lablgtk>=2.6.0nb5 BUILDLINK_PKGSRCDIR.lablgtk?= ../../x11/lablgtk -.endif # LABLGTK_BUILDLINK3_MK +.endif # LABLGTK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -lablgtk diff --git a/x11/lablgtk1/buildlink3.mk b/x11/lablgtk1/buildlink3.mk index 80f4beafd8c..451e999b505 100644 --- a/x11/lablgtk1/buildlink3.mk +++ b/x11/lablgtk1/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/09/21 13:00:55 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:43 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LABLGTK1_BUILDLINK3_MK:= ${LABLGTK1_BUILDLINK3_MK}+ +BUILDLINK_TREE+= lablgtk1 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= lablgtk1 -.endif +.if !defined(LABLGTK1_BUILDLINK3_MK) +LABLGTK1_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlablgtk1} -BUILDLINK_PACKAGES+= lablgtk1 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lablgtk1 - -.if !empty(LABLGTK1_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.lablgtk1+= lablgtk1>=1.2.5nb3 BUILDLINK_ABI_DEPENDS.lablgtk1?= lablgtk1>=1.2.7nb2 BUILDLINK_PKGSRCDIR.lablgtk1?= ../../x11/lablgtk1 -.endif # LABLGTK1_BUILDLINK3_MK .include "../../x11/gtk/buildlink3.mk" .include "../../lang/ocaml/buildlink3.mk" +.endif # LABLGTK1_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -lablgtk1 diff --git a/x11/lesstif/buildlink3.mk b/x11/lesstif/buildlink3.mk index 268be1310f9..d3423eaf01e 100644 --- a/x11/lesstif/buildlink3.mk +++ b/x11/lesstif/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.17 2008/05/24 15:01:38 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:25:43 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LESSTIF_BUILDLINK3_MK:= ${LESSTIF_BUILDLINK3_MK}+ +BUILDLINK_TREE+= lesstif -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= lesstif -.endif +.if !defined(LESSTIF_BUILDLINK3_MK) +LESSTIF_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlesstif} -BUILDLINK_PACKAGES+= lesstif -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lesstif - -.if !empty(LESSTIF_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.lesstif+= lesstif>=0.95.0nb1 BUILDLINK_PKGSRCDIR.lesstif?= ../../x11/lesstif -.endif # LESSTIF_BUILDLINK3_MK .include "../../fonts/fontconfig/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" .include "../../x11/printproto/buildlink3.mk" +.endif # LESSTIF_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -lesstif diff --git a/x11/libFS/buildlink3.mk b/x11/libFS/buildlink3.mk index d2fd474cf80..b1e216d0fd3 100644 --- a/x11/libFS/buildlink3.mk +++ b/x11/libFS/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.2 2006/11/03 17:24:25 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:43 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBFS_BUILDLINK3_MK:= ${LIBFS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libFS -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libFS -.endif +.if !defined(LIBFS_BUILDLINK3_MK) +LIBFS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibFS} -BUILDLINK_PACKAGES+= libFS -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libFS - -.if ${LIBFS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libFS+= libFS>=1.0.0 BUILDLINK_PKGSRCDIR.libFS?= ../../x11/libFS -.endif # LIBFS_BUILDLINK3_MK .include "../../x11/fontsproto/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" +.endif # LIBFS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libFS diff --git a/x11/libICE/buildlink3.mk b/x11/libICE/buildlink3.mk index fc6c2117007..0b18af51f5a 100644 --- a/x11/libICE/buildlink3.mk +++ b/x11/libICE/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2007/12/17 13:27:28 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:43 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -6,22 +6,15 @@ .include "../../mk/x11.buildlink3.mk" .else -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBICE_BUILDLINK3_MK:= ${LIBICE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libICE -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libICE -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibICE} -BUILDLINK_PACKAGES+= libICE -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libICE +.if !defined(LIBICE_BUILDLINK3_MK) +LIBICE_BUILDLINK3_MK:= -.if ${LIBICE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libICE+= libICE>=0.99.1 BUILDLINK_PKGSRCDIR.libICE?= ../../x11/libICE -.endif # LIBICE_BUILDLINK3_MK +.endif # LIBICE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libICE .endif diff --git a/x11/libSM/buildlink3.mk b/x11/libSM/buildlink3.mk index 4900e1ff751..e0c06795326 100644 --- a/x11/libSM/buildlink3.mk +++ b/x11/libSM/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2007/12/17 14:24:06 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:43 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -6,24 +6,17 @@ .include "../../mk/x11.buildlink3.mk" .else -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBSM_BUILDLINK3_MK:= ${LIBSM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libSM -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libSM -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibSM} -BUILDLINK_PACKAGES+= libSM -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libSM +.if !defined(LIBSM_BUILDLINK3_MK) +LIBSM_BUILDLINK3_MK:= -.if ${LIBSM_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libSM+= libSM>=0.99.2 BUILDLINK_PKGSRCDIR.libSM?= ../../x11/libSM -.endif # LIBSM_BUILDLINK3_MK .include "../../x11/libICE/buildlink3.mk" +.endif # LIBSM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libSM .endif diff --git a/x11/libX11/buildlink3.mk b/x11/libX11/buildlink3.mk index 4f1848035d1..7fabade9f01 100644 --- a/x11/libX11/buildlink3.mk +++ b/x11/libX11/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2007/12/15 15:21:53 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:43 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -6,31 +6,24 @@ .include "../../mk/x11.buildlink3.mk" .else -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBX11_BUILDLINK3_MK:= ${LIBX11_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libX11 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libX11 -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibX11} -BUILDLINK_PACKAGES+= libX11 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libX11 +.if !defined(LIBX11_BUILDLINK3_MK) +LIBX11_BUILDLINK3_MK:= -.if ${LIBX11_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libX11+= libX11>=1.1 BUILDLINK_ABI_DEPENDS.libX11+= libX11>=0.99 BUILDLINK_PKGSRCDIR.libX11?= ../../x11/libX11 X11_LDFLAGS+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libX11}/lib X11_LDFLAGS+= -L${BUILDLINK_PREFIX.libX11}/lib -.endif # LIBX11_BUILDLINK3_MK .include "../../x11/kbproto/buildlink3.mk" .include "../../x11/libXau/buildlink3.mk" .include "../../x11/libXdmcp/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" +.endif # LIBX11_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libX11 .endif diff --git a/x11/libXScrnSaver/buildlink3.mk b/x11/libXScrnSaver/buildlink3.mk index 4e990d9f568..15ddc4c21fc 100644 --- a/x11/libXScrnSaver/buildlink3.mk +++ b/x11/libXScrnSaver/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/10/05 21:36:33 cube Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:43 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXSCRNSAVER_BUILDLINK3_MK:= ${LIBXSCRNSAVER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libXScrnSaver -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libXScrnSaver -.endif +.if !defined(LIBXSCRNSAVER_BUILDLINK3_MK) +LIBXSCRNSAVER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXScrnSaver} -BUILDLINK_PACKAGES+= libXScrnSaver -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXScrnSaver - -.if ${LIBXSCRNSAVER_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libXScrnSaver+= libXScrnSaver>=1.1.2 BUILDLINK_PKGSRCDIR.libXScrnSaver?= ../../x11/libXScrnSaver -.endif # LIBXSCRNSAVER_BUILDLINK3_MK .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/scrnsaverproto/buildlink3.mk" +.endif # LIBXSCRNSAVER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libXScrnSaver diff --git a/x11/libXTrap/buildlink3.mk b/x11/libXTrap/buildlink3.mk index d1c6fa027df..e5d72a0e219 100644 --- a/x11/libXTrap/buildlink3.mk +++ b/x11/libXTrap/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 20:58:20 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:44 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXTRAP_BUILDLINK3_MK:= ${LIBXTRAP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libXTrap -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libXTrap -.endif +.if !defined(LIBXTRAP_BUILDLINK3_MK) +LIBXTRAP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXTrap} -BUILDLINK_PACKAGES+= libXTrap -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXTrap - -.if ${LIBXTRAP_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libXTrap+= libXTrap>=1.0.0 BUILDLINK_PKGSRCDIR.libXTrap?= ../../x11/libXTrap -.endif # LIBXTRAP_BUILDLINK3_MK .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" +.endif # LIBXTRAP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libXTrap diff --git a/x11/libXau/buildlink3.mk b/x11/libXau/buildlink3.mk index 8e745b21349..c477be048dd 100644 --- a/x11/libXau/buildlink3.mk +++ b/x11/libXau/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.3 2006/11/25 00:09:19 reed Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:44 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXAU_BUILDLINK3_MK:= ${LIBXAU_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libXau -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libXau -.endif +.if !defined(LIBXAU_BUILDLINK3_MK) +LIBXAU_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXau} -BUILDLINK_PACKAGES+= libXau -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXau - -.if ${LIBXAU_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libXau+= libXau>=1.0 BUILDLINK_PKGSRCDIR.libXau?= ../../x11/libXau -.endif # LIBXAU_BUILDLINK3_MK .include "../../x11/xproto/buildlink3.mk" +.endif # LIBXAU_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libXau diff --git a/x11/libXaw/buildlink3.mk b/x11/libXaw/buildlink3.mk index 294c80461b4..d543bd002a5 100644 --- a/x11/libXaw/buildlink3.mk +++ b/x11/libXaw/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2008/11/10 17:21:06 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:44 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -6,22 +6,14 @@ .include "../../mk/x11.buildlink3.mk" .else -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXAW_BUILDLINK3_MK:= ${LIBXAW_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libXaw -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libXaw -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXaw} -BUILDLINK_PACKAGES+= libXaw -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXaw +.if !defined(LIBXAW_BUILDLINK3_MK) +LIBXAW_BUILDLINK3_MK:= -.if ${LIBXAW_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libXaw+= libXaw>=1.0.5 BUILDLINK_PKGSRCDIR.libXaw?= ../../x11/libXaw BUILDLINK_TRANSFORM+= l:Xaw:Xaw7 -.endif # LIBXAW_BUILDLINK3_MK .include "../../x11/libICE/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" @@ -32,7 +24,8 @@ BUILDLINK_TRANSFORM+= l:Xaw:Xaw7 .include "../../x11/libXt/buildlink3.mk" .include "../../x11/xextproto/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" +.endif # LIBXAW_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libXaw .endif diff --git a/x11/libXcomposite/buildlink3.mk b/x11/libXcomposite/buildlink3.mk index afbada7ca60..debc91da2a8 100644 --- a/x11/libXcomposite/buildlink3.mk +++ b/x11/libXcomposite/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2006/12/15 20:16:18 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:44 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -6,28 +6,21 @@ .include "../../x11/Xcomposite/buildlink3.mk" .else -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXCOMPOSITE_BUILDLINK3_MK:= ${LIBXCOMPOSITE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libXcomposite -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libXcomposite -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXcomposite} -BUILDLINK_PACKAGES+= libXcomposite -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXcomposite +.if !defined(LIBXCOMPOSITE_BUILDLINK3_MK) +LIBXCOMPOSITE_BUILDLINK3_MK:= -.if ${LIBXCOMPOSITE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libXcomposite+= libXcomposite>=0.3.1 BUILDLINK_PKGSRCDIR.libXcomposite?= ../../x11/libXcomposite -.endif # LIBXCOMPOSITE_BUILDLINK3_MK .include "../../x11/compositeproto/buildlink3.mk" .include "../../x11/fixesproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXfixes/buildlink3.mk" +.endif # LIBXCOMPOSITE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libXcomposite .endif diff --git a/x11/libXcursor/buildlink3.mk b/x11/libXcursor/buildlink3.mk index 2d5dbbe662c..8f306f4d4f4 100644 --- a/x11/libXcursor/buildlink3.mk +++ b/x11/libXcursor/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2006/11/05 16:55:28 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:44 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -6,27 +6,20 @@ .include "../../x11/xcursor/buildlink3.mk" .else -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXCURSOR_BUILDLINK3_MK:= ${LIBXCURSOR_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libXcursor -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libXcursor -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXcursor} -BUILDLINK_PACKAGES+= libXcursor -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXcursor +.if !defined(LIBXCURSOR_BUILDLINK3_MK) +LIBXCURSOR_BUILDLINK3_MK:= -.if ${LIBXCURSOR_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libXcursor+= libXcursor>=1.1.1 BUILDLINK_PKGSRCDIR.libXcursor?= ../../x11/libXcursor -.endif # LIBXCURSOR_BUILDLINK3_MK .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXfixes/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" +.endif # LIBXCURSOR_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libXcursor .endif diff --git a/x11/libXdamage/buildlink3.mk b/x11/libXdamage/buildlink3.mk index 24feddda819..e7f2f9aea9e 100644 --- a/x11/libXdamage/buildlink3.mk +++ b/x11/libXdamage/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.3 2008/10/05 21:36:33 cube Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:44 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXDAMAGE_BUILDLINK3_MK:= ${LIBXDAMAGE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libXdamage -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libXdamage -.endif +.if !defined(LIBXDAMAGE_BUILDLINK3_MK) +LIBXDAMAGE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXdamage} -BUILDLINK_PACKAGES+= libXdamage -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXdamage - -.if ${LIBXDAMAGE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libXdamage+= libXdamage>=1.0.3 BUILDLINK_PKGSRCDIR.libXdamage?= ../../x11/libXdamage -.endif # LIBXDAMAGE_BUILDLINK3_MK .include "../../x11/damageproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXfixes/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" +.endif # LIBXDAMAGE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libXdamage diff --git a/x11/libXdmcp/buildlink3.mk b/x11/libXdmcp/buildlink3.mk index 689600f7eaf..193fb39eddb 100644 --- a/x11/libXdmcp/buildlink3.mk +++ b/x11/libXdmcp/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 17:59:48 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:44 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXDMCP_BUILDLINK3_MK:= ${LIBXDMCP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libXdmcp -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libXdmcp -.endif +.if !defined(LIBXDMCP_BUILDLINK3_MK) +LIBXDMCP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXdmcp} -BUILDLINK_PACKAGES+= libXdmcp -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXdmcp - -.if ${LIBXDMCP_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libXdmcp+= libXdmcp>=0.99 BUILDLINK_PKGSRCDIR.libXdmcp?= ../../x11/libXdmcp -.endif # LIBXDMCP_BUILDLINK3_MK +.endif # LIBXDMCP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libXdmcp diff --git a/x11/libXevie/buildlink3.mk b/x11/libXevie/buildlink3.mk index 0aee158e886..9b25712c3ab 100644 --- a/x11/libXevie/buildlink3.mk +++ b/x11/libXevie/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 21:50:18 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:44 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXEVIE_BUILDLINK3_MK:= ${LIBXEVIE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libXevie -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libXevie -.endif +.if !defined(LIBXEVIE_BUILDLINK3_MK) +LIBXEVIE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXevie} -BUILDLINK_PACKAGES+= libXevie -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXevie - -.if ${LIBXEVIE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libXevie+= libXevie>=1.0.2 BUILDLINK_PKGSRCDIR.libXevie?= ../../x11/libXevie -.endif # LIBXEVIE_BUILDLINK3_MK .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" +.endif # LIBXEVIE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libXevie diff --git a/x11/libXext/buildlink3.mk b/x11/libXext/buildlink3.mk index 1537467a023..5eb51446f49 100644 --- a/x11/libXext/buildlink3.mk +++ b/x11/libXext/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2007/12/16 23:38:12 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:44 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -6,26 +6,19 @@ .include "../../mk/x11.buildlink3.mk" .else -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXEXT_BUILDLINK3_MK:= ${LIBXEXT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libXext -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libXext -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXext} -BUILDLINK_PACKAGES+= libXext -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXext +.if !defined(LIBXEXT_BUILDLINK3_MK) +LIBXEXT_BUILDLINK3_MK:= -.if ${LIBXEXT_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libXext+= libXext>=0.99.0 BUILDLINK_PKGSRCDIR.libXext?= ../../x11/libXext -.endif # LIBXEXT_BUILDLINK3_MK .include "../../x11/libX11/buildlink3.mk" # XXX don't include xextproto/bl3 here; packages checking for xext.pc must # include it theirselfes +.endif # LIBXEXT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libXext .endif diff --git a/x11/libXfixes/buildlink3.mk b/x11/libXfixes/buildlink3.mk index 9f1781996e7..80a1ec29f84 100644 --- a/x11/libXfixes/buildlink3.mk +++ b/x11/libXfixes/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2006/11/05 16:55:28 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:44 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -6,25 +6,18 @@ .include "../../x11/Xfixes/buildlink3.mk" .else -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXFIXES_BUILDLINK3_MK:= ${LIBXFIXES_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libXfixes -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libXfixes -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXfixes} -BUILDLINK_PACKAGES+= libXfixes -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXfixes +.if !defined(LIBXFIXES_BUILDLINK3_MK) +LIBXFIXES_BUILDLINK3_MK:= -.if ${LIBXFIXES_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libXfixes+= libXfixes>=4.0.1 BUILDLINK_PKGSRCDIR.libXfixes?= ../../x11/libXfixes -.endif # LIBXFIXES_BUILDLINK3_MK .include "../../x11/fixesproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" +.endif # LIBXFIXES_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libXfixes .endif diff --git a/x11/libXfont/buildlink3.mk b/x11/libXfont/buildlink3.mk index 101219ae571..6deb013d17b 100644 --- a/x11/libXfont/buildlink3.mk +++ b/x11/libXfont/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 21:45:46 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:45 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXFONT_BUILDLINK3_MK:= ${LIBXFONT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libXfont -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libXfont -.endif +.if !defined(LIBXFONT_BUILDLINK3_MK) +LIBXFONT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXfont} -BUILDLINK_PACKAGES+= libXfont -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXfont - -.if ${LIBXFONT_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libXfont+= libXfont>=1.2.0 BUILDLINK_PKGSRCDIR.libXfont?= ../../x11/libXfont -.endif # LIBXFONT_BUILDLINK3_MK .include "../../graphics/freetype2/buildlink3.mk" .include "../../fonts/libfontenc/buildlink3.mk" .include "../../x11/fontsproto/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" +.endif # LIBXFONT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libXfont 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 diff --git a/x11/libXi/buildlink3.mk b/x11/libXi/buildlink3.mk index 9914fa29b1f..a2a243cc3f7 100644 --- a/x11/libXi/buildlink3.mk +++ b/x11/libXi/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2007/01/23 21:15:08 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:45 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -6,27 +6,20 @@ .include "../../mk/x11.buildlink3.mk" .else -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXI_BUILDLINK3_MK:= ${LIBXI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libXi -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libXi -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXi} -BUILDLINK_PACKAGES+= libXi -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXi +.if !defined(LIBXI_BUILDLINK3_MK) +LIBXI_BUILDLINK3_MK:= -.if ${LIBXI_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libXi+= libXi>=1.0.0 BUILDLINK_PKGSRCDIR.libXi?= ../../x11/libXi -.endif # LIBXI_BUILDLINK3_MK .include "../../x11/inputproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" +.endif # LIBXI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libXi .endif diff --git a/x11/libXinerama/buildlink3.mk b/x11/libXinerama/buildlink3.mk index 684a3522575..ce5eb45375d 100644 --- a/x11/libXinerama/buildlink3.mk +++ b/x11/libXinerama/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2007/12/16 23:08:05 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:45 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -6,27 +6,20 @@ .include "../../mk/x11.buildlink3.mk" .else -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXINERAMA_BUILDLINK3_MK:= ${LIBXINERAMA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libXinerama -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libXinerama -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXinerama} -BUILDLINK_PACKAGES+= libXinerama -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXinerama +.if !defined(LIBXINERAMA_BUILDLINK3_MK) +LIBXINERAMA_BUILDLINK3_MK:= -.if ${LIBXINERAMA_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libXinerama+= libXinerama>=1.0.1 BUILDLINK_PKGSRCDIR.libXinerama?= ../../x11/libXinerama -.endif # LIBXINERAMA_BUILDLINK3_MK .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/xextproto/buildlink3.mk" .include "../../x11/xineramaproto/buildlink3.mk" +.endif # LIBXINERAMA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libXinerama .endif diff --git a/x11/libXmu/buildlink3.mk b/x11/libXmu/buildlink3.mk index db32c0eaf8f..2a3b7eaaf3a 100644 --- a/x11/libXmu/buildlink3.mk +++ b/x11/libXmu/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2007/12/16 19:04:28 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:45 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -6,27 +6,20 @@ .include "../../mk/x11.buildlink3.mk" .else -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXMU_BUILDLINK3_MK:= ${LIBXMU_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libXmu -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libXmu -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXmu} -BUILDLINK_PACKAGES+= libXmu -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXmu +.if !defined(LIBXMU_BUILDLINK3_MK) +LIBXMU_BUILDLINK3_MK:= -.if ${LIBXMU_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libXmu+= libXmu>=1.0.0 BUILDLINK_PKGSRCDIR.libXmu?= ../../x11/libXmu -.endif # LIBXMU_BUILDLINK3_MK .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" +.endif # LIBXMU_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libXmu .endif diff --git a/x11/libXp/buildlink3.mk b/x11/libXp/buildlink3.mk index 2cb29a82011..40900e94fbe 100644 --- a/x11/libXp/buildlink3.mk +++ b/x11/libXp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2006/11/06 11:33:02 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:45 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -6,26 +6,19 @@ .include "../../mk/x11.buildlink3.mk" .else -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXP_BUILDLINK3_MK:= ${LIBXP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libXp -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libXp -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXp} -BUILDLINK_PACKAGES+= libXp -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXp +.if !defined(LIBXP_BUILDLINK3_MK) +LIBXP_BUILDLINK3_MK:= -.if ${LIBXP_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libXp+= libXp>=1.0.0 BUILDLINK_PKGSRCDIR.libXp?= ../../x11/libXp -.endif # LIBXP_BUILDLINK3_MK .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/printproto/buildlink3.mk" +.endif # LIBXP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libXp .endif diff --git a/x11/libXpm/buildlink3.mk b/x11/libXpm/buildlink3.mk index 7bbae188573..7e7d1a9d70b 100644 --- a/x11/libXpm/buildlink3.mk +++ b/x11/libXpm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2006/12/27 13:37:42 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:45 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -8,25 +8,18 @@ BUILDLINK_PREFIX.libXpm= ${BUILDLINK_PREFIX.xpm} .else -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXPM_BUILDLINK3_MK:= ${LIBXPM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libXpm -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libXpm -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXpm} -BUILDLINK_PACKAGES+= libXpm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXpm +.if !defined(LIBXPM_BUILDLINK3_MK) +LIBXPM_BUILDLINK3_MK:= -.if ${LIBXPM_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libXpm+= libXpm>=3.5.4.2 BUILDLINK_PKGSRCDIR.libXpm?= ../../x11/libXpm -.endif # LIBXPM_BUILDLINK3_MK .include "../../x11/libX11/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" +.endif # LIBXPM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libXpm .endif diff --git a/x11/libXprintUtil/buildlink3.mk b/x11/libXprintUtil/buildlink3.mk index 2ca9e88ca3d..d610cc24d69 100644 --- a/x11/libXprintUtil/buildlink3.mk +++ b/x11/libXprintUtil/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/04/12 15:05:24 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:45 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXPRINTUTIL_BUILDLINK3_MK:= ${LIBXPRINTUTIL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libXprintUtil -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libXprintUtil -.endif +.if !defined(LIBXPRINTUTIL_BUILDLINK3_MK) +LIBXPRINTUTIL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXprintUtil} -BUILDLINK_PACKAGES+= libXprintUtil -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXprintUtil - -.if ${LIBXPRINTUTIL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libXprintUtil+= libXprintUtil>=1.0.1 BUILDLINK_PKGSRCDIR.libXprintUtil?= ../../x11/libXprintUtil -.endif # LIBXPRINTUTIL_BUILDLINK3_MK .include "../../x11/libXp/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" +.endif # LIBXPRINTUTIL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libXprintUtil diff --git a/x11/libXrandr/buildlink3.mk b/x11/libXrandr/buildlink3.mk index 6218168ebd5..d7b959e5b1c 100644 --- a/x11/libXrandr/buildlink3.mk +++ b/x11/libXrandr/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2008/03/03 12:31:09 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:45 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -6,27 +6,20 @@ .include "../../x11/liboldXrandr/buildlink3.mk" .else -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXRANDR_BUILDLINK3_MK:= ${LIBXRANDR_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libXrandr -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libXrandr -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXrandr} -BUILDLINK_PACKAGES+= libXrandr -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXrandr +.if !defined(LIBXRANDR_BUILDLINK3_MK) +LIBXRANDR_BUILDLINK3_MK:= -.if ${LIBXRANDR_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libXrandr+= libXrandr>=1.1.2 BUILDLINK_PKGSRCDIR.libXrandr?= ../../x11/libXrandr -.endif # LIBXRANDR_BUILDLINK3_MK .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" +.endif # LIBXRANDR_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libXrandr .endif diff --git a/x11/libXrender/buildlink3.mk b/x11/libXrender/buildlink3.mk index 981a7444d5f..3bf41d30937 100644 --- a/x11/libXrender/buildlink3.mk +++ b/x11/libXrender/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2007/12/16 19:38:25 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:45 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -6,25 +6,18 @@ .include "../../x11/Xrender/buildlink3.mk" .else -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXRENDER_BUILDLINK3_MK:= ${LIBXRENDER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libXrender -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libXrender -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXrender} -BUILDLINK_PACKAGES+= libXrender -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXrender +.if !defined(LIBXRENDER_BUILDLINK3_MK) +LIBXRENDER_BUILDLINK3_MK:= -.if ${LIBXRENDER_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libXrender+= libXrender>=0.9.2 BUILDLINK_PKGSRCDIR.libXrender?= ../../x11/libXrender -.endif # LIBXRENDER_BUILDLINK3_MK .include "../../x11/renderproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" +.endif # LIBXRENDER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libXrender .endif diff --git a/x11/libXres/buildlink3.mk b/x11/libXres/buildlink3.mk index c2dfd269147..43afeba8866 100644 --- a/x11/libXres/buildlink3.mk +++ b/x11/libXres/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.3 2008/10/05 21:36:33 cube Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:45 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXRES_BUILDLINK3_MK:= ${LIBXRES_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libXres -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libXres -.endif +.if !defined(LIBXRES_BUILDLINK3_MK) +LIBXRES_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXres} -BUILDLINK_PACKAGES+= libXres -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXres - -.if ${LIBXRES_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libXres+= libXres>=1.0.0 BUILDLINK_PKGSRCDIR.libXres?= ../../x11/libXres -.endif # LIBXRES_BUILDLINK3_MK .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" +.endif # LIBXRES_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libXres diff --git a/x11/libXt/buildlink3.mk b/x11/libXt/buildlink3.mk index 80a3e96e2d5..be9ffc63396 100644 --- a/x11/libXt/buildlink3.mk +++ b/x11/libXt/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2007/12/17 15:02:26 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:46 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -6,26 +6,19 @@ .include "../../mk/x11.buildlink3.mk" .else -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXT_BUILDLINK3_MK:= ${LIBXT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libXt -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libXt -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXt} -BUILDLINK_PACKAGES+= libXt -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXt +.if !defined(LIBXT_BUILDLINK3_MK) +LIBXT_BUILDLINK3_MK:= -.if ${LIBXT_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libXt+= libXt>=1.0.0 BUILDLINK_PKGSRCDIR.libXt?= ../../x11/libXt -.endif # LIBXT_BUILDLINK3_MK .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" +.endif # LIBXT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libXt .endif diff --git a/x11/libXtst/buildlink3.mk b/x11/libXtst/buildlink3.mk index 9ce27c56382..db95b4a6486 100644 --- a/x11/libXtst/buildlink3.mk +++ b/x11/libXtst/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.3 2008/12/04 04:16:41 cube Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:46 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXTST_BUILDLINK3_MK:= ${LIBXTST_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libXtst -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libXtst -.endif +.if !defined(LIBXTST_BUILDLINK3_MK) +LIBXTST_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXtst} -BUILDLINK_PACKAGES+= libXtst -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXtst - -.if ${LIBXTST_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libXtst+= libXtst>=1.0.1 BUILDLINK_PKGSRCDIR.libXtst?= ../../x11/libXtst -.endif # LIBXTST_BUILDLINK3_MK .include "../../x11/recordproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" +.endif # LIBXTST_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libXtst diff --git a/x11/libXv/buildlink3.mk b/x11/libXv/buildlink3.mk index 50a0ddf5c4e..febfeb6aab3 100644 --- a/x11/libXv/buildlink3.mk +++ b/x11/libXv/buildlink3.mk @@ -1,27 +1,20 @@ -# $NetBSD: buildlink3.mk,v 1.3 2008/10/29 21:14:01 cube Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:46 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXV_BUILDLINK3_MK:= ${LIBXV_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libXv -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libXv -.endif +.if !defined(LIBXV_BUILDLINK3_MK) +LIBXV_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXv} -BUILDLINK_PACKAGES+= libXv -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXv - -.if ${LIBXV_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libXv+= libXv>=1.0.1 BUILDLINK_PKGSRCDIR.libXv?= ../../x11/libXv -.endif # LIBXV_BUILDLINK3_MK .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/videoproto/buildlink3.mk" .include "../../x11/xextproto/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" +.endif # LIBXV_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libXv diff --git a/x11/libXvMC/buildlink3.mk b/x11/libXvMC/buildlink3.mk index 23177536105..244f454b685 100644 --- a/x11/libXvMC/buildlink3.mk +++ b/x11/libXvMC/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/07/22 03:21:38 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:46 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -6,27 +6,20 @@ .include "../../mk/x11.buildlink3.mk" .else -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXVMC_BUILDLINK3_MK:= ${LIBXVMC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libXvMC -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libXvMC -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXvMC} -BUILDLINK_PACKAGES+= libXvMC -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXvMC +.if !defined(LIBXVMC_BUILDLINK3_MK) +LIBXVMC_BUILDLINK3_MK:= -.if ${LIBXVMC_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libXvMC+= libXvMC>=1.0.2 BUILDLINK_PKGSRCDIR.libXvMC?= ../../x11/libXvMC -.endif # LIBXVMC_BUILDLINK3_MK .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXv/buildlink3.mk" .include "../../x11/videoproto/buildlink3.mk" +.endif # LIBXVMC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libXvMC .endif diff --git a/x11/libXxf86dga/buildlink3.mk b/x11/libXxf86dga/buildlink3.mk index 19ba974dbb5..a4db95885da 100644 --- a/x11/libXxf86dga/buildlink3.mk +++ b/x11/libXxf86dga/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/12/27 12:24:15 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:46 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -6,26 +6,19 @@ .include "../../mk/x11.buildlink3.mk" .else -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXXF86DGA_BUILDLINK3_MK:= ${LIBXXF86DGA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libXxf86dga -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libXxf86dga -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXxf86dga} -BUILDLINK_PACKAGES+= libXxf86dga -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXxf86dga +.if !defined(LIBXXF86DGA_BUILDLINK3_MK) +LIBXXF86DGA_BUILDLINK3_MK:= -.if ${LIBXXF86DGA_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libXxf86dga+= libXxf86dga>=1.0.1 BUILDLINK_PKGSRCDIR.libXxf86dga?= ../../x11/libXxf86dga -.endif # LIBXXF86DGA_BUILDLINK3_MK .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/xf86dgaproto/buildlink3.mk" +.endif # LIBXXF86DGA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libXxf86dga .endif diff --git a/x11/libXxf86misc/buildlink3.mk b/x11/libXxf86misc/buildlink3.mk index f1a490a5e6b..3aeea0aedbc 100644 --- a/x11/libXxf86misc/buildlink3.mk +++ b/x11/libXxf86misc/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2007/01/10 17:09:32 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:46 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -6,26 +6,19 @@ .include "../../mk/x11.buildlink3.mk" .else -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXXF86MISC_BUILDLINK3_MK:= ${LIBXXF86MISC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libXxf86misc -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libXxf86misc -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXxf86misc} -BUILDLINK_PACKAGES+= libXxf86misc -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXxf86misc +.if !defined(LIBXXF86MISC_BUILDLINK3_MK) +LIBXXF86MISC_BUILDLINK3_MK:= -.if ${LIBXXF86MISC_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libXxf86misc+= libXxf86misc>=1.0.0 BUILDLINK_PKGSRCDIR.libXxf86misc?= ../../x11/libXxf86misc -.endif # LIBXXF86MISC_BUILDLINK3_MK .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/xf86miscproto/buildlink3.mk" +.endif # LIBXXF86MISC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libXxf86misc .endif diff --git a/x11/libXxf86vm/buildlink3.mk b/x11/libXxf86vm/buildlink3.mk index 40e2c0ad945..c81146c005c 100644 --- a/x11/libXxf86vm/buildlink3.mk +++ b/x11/libXxf86vm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2006/12/17 21:31:09 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:46 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -6,26 +6,19 @@ .include "../../mk/x11.buildlink3.mk" .else -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXXF86VM_BUILDLINK3_MK:= ${LIBXXF86VM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libXxf86vm -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libXxf86vm -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXxf86vm} -BUILDLINK_PACKAGES+= libXxf86vm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXxf86vm +.if !defined(LIBXXF86VM_BUILDLINK3_MK) +LIBXXF86VM_BUILDLINK3_MK:= -.if ${LIBXXF86VM_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libXxf86vm+= libXxf86vm>=1.0.1 BUILDLINK_PKGSRCDIR.libXxf86vm?= ../../x11/libXxf86vm -.endif # LIBXXF86VM_BUILDLINK3_MK .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/xf86vidmodeproto/buildlink3.mk" +.endif # LIBXXF86VM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libXxf86vm .endif diff --git a/x11/libdrm/buildlink3.mk b/x11/libdrm/buildlink3.mk index f01bdfc92a1..8009f398777 100644 --- a/x11/libdrm/buildlink3.mk +++ b/x11/libdrm/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.3 2008/07/16 06:41:17 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:46 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBDRM_BUILDLINK3_MK:= ${LIBDRM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libdrm -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libdrm -.endif +.if !defined(LIBDRM_BUILDLINK3_MK) +LIBDRM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdrm} -BUILDLINK_PACKAGES+= libdrm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdrm - -.if ${LIBDRM_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.3.0 ### ### XXX Explicitly required by (at least) Mesa 7.1, which is nearing release. @@ -20,8 +13,8 @@ BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.3.0 ### and a recursive dependency bump performed. ### [bjs 20080714] ### -#BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.3.1 +#BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.3.1 BUILDLINK_PKGSRCDIR.libdrm?= ../../x11/libdrm -.endif # LIBDRM_BUILDLINK3_MK +.endif # LIBDRM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libdrm diff --git a/x11/libgnomekbd/buildlink3.mk b/x11/libgnomekbd/buildlink3.mk index 67bfaed9976..949d6911147 100644 --- a/x11/libgnomekbd/buildlink3.mk +++ b/x11/libgnomekbd/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/11/15 09:59:59 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:46 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGNOMEKBD_BUILDLINK3_MK:= ${LIBGNOMEKBD_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgnomekbd -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libgnomekbd -.endif +.if !defined(LIBGNOMEKBD_BUILDLINK3_MK) +LIBGNOMEKBD_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomekbd} -BUILDLINK_PACKAGES+= libgnomekbd -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgnomekbd - -.if ${LIBGNOMEKBD_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libgnomekbd+= libgnomekbd>=2.18.0 BUILDLINK_PKGSRCDIR.libgnomekbd?= ../../x11/libgnomekbd -.endif # LIBGNOMEKBD_BUILDLINK3_MK .include "../../x11/libxklavier/buildlink3.mk" +.endif # LIBGNOMEKBD_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgnomekbd diff --git a/x11/liblbxutil/buildlink3.mk b/x11/liblbxutil/buildlink3.mk index 336e1d23048..979a041880f 100644 --- a/x11/liblbxutil/buildlink3.mk +++ b/x11/liblbxutil/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/14 15:27:49 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:46 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBLBXUTIL_BUILDLINK3_MK:= ${LIBLBXUTIL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= liblbxutil -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= liblbxutil -.endif +.if !defined(LIBLBXUTIL_BUILDLINK3_MK) +LIBLBXUTIL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nliblbxutil} -BUILDLINK_PACKAGES+= liblbxutil -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}liblbxutil - -.if ${LIBLBXUTIL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.liblbxutil+= liblbxutil>=1.0.0 BUILDLINK_PKGSRCDIR.liblbxutil?= ../../x11/liblbxutil -.endif # LIBLBXUTIL_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" +.endif # LIBLBXUTIL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -liblbxutil diff --git a/x11/liboldXrandr/buildlink3.mk b/x11/liboldXrandr/buildlink3.mk index 18c3b51b6f0..b73ea11e6bd 100644 --- a/x11/liboldXrandr/buildlink3.mk +++ b/x11/liboldXrandr/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.2 2007/05/30 16:00:51 seb Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:47 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XRANDR_BUILDLINK3_MK:= ${XRANDR_BUILDLINK3_MK}+ +BUILDLINK_TREE+= Xrandr -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= Xrandr -.endif +.if !defined(XRANDR_BUILDLINK3_MK) +XRANDR_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXrandr} -BUILDLINK_PACKAGES+= Xrandr -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Xrandr - -.if !empty(XRANDR_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.Xrandr+= Xrandr>=0.99 BUILDLINK_ABI_DEPENDS.Xrandr+= Xrandr>=1.0.2nb3 BUILDLINK_PKGSRCDIR.Xrandr?= ../../x11/liboldXrandr -.endif # XRANDR_BUILDLINK3_MK .include "../../x11/libXrender/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" +.endif # XRANDR_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -Xrandr diff --git a/x11/libunique/buildlink3.mk b/x11/libunique/buildlink3.mk index e3fdd437f01..e718ddd1ae8 100644 --- a/x11/libunique/buildlink3.mk +++ b/x11/libunique/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/12/18 00:32:14 ahoka Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:47 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBUNIQUE_BUILDLINK3_MK:= ${LIBUNIQUE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libunique -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libunique -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibunique} -BUILDLINK_PACKAGES+= libunique -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libunique +.if !defined(LIBUNIQUE_BUILDLINK3_MK) +LIBUNIQUE_BUILDLINK3_MK:= -.if ${LIBUNIQUE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libunique+= libunique>=1.0.4 BUILDLINK_PKGSRCDIR.libunique?= ../../x11/libunique -.endif # LIBUNIQUE_BUILDLINK3_MK pkgbase := libunique .include "../../mk/pkg-build-options.mk" @@ -24,5 +16,6 @@ pkgbase := libunique .endif .include "../../x11/gtk2/buildlink3.mk" +.endif # LIBUNIQUE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libunique diff --git a/x11/libxfce4gui/buildlink3.mk b/x11/libxfce4gui/buildlink3.mk index 1bca887fbbc..26eed6a989c 100644 --- a/x11/libxfce4gui/buildlink3.mk +++ b/x11/libxfce4gui/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.24 2008/12/18 16:46:29 hira Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2009/03/20 19:25:47 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXFCE4GUI_BUILDLINK3_MK:= ${LIBXFCE4GUI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libxfce4gui -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libxfce4gui -.endif +.if !defined(LIBXFCE4GUI_BUILDLINK3_MK) +LIBXFCE4GUI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxfce4gui} -BUILDLINK_PACKAGES+= libxfce4gui -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxfce4gui - -.if ${LIBXFCE4GUI_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libxfce4gui+= libxfce4gui>=4.4.3nb1 BUILDLINK_PKGSRCDIR.libxfce4gui?= ../../x11/libxfce4gui -.endif # LIBXFCE4GUI_BUILDLINK3_MK .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" @@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.libxfce4gui?= ../../x11/libxfce4gui .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # LIBXFCE4GUI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libxfce4gui diff --git a/x11/libxfce4mcs/buildlink3.mk b/x11/libxfce4mcs/buildlink3.mk index e35af5f7967..cb1e5ff0ae4 100644 --- a/x11/libxfce4mcs/buildlink3.mk +++ b/x11/libxfce4mcs/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.22 2008/12/18 16:46:29 hira Exp $ +# $NetBSD: buildlink3.mk,v 1.23 2009/03/20 19:25:47 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXFCE4MCS_BUILDLINK3_MK:= ${LIBXFCE4MCS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libxfce4mcs -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libxfce4mcs -.endif +.if !defined(LIBXFCE4MCS_BUILDLINK3_MK) +LIBXFCE4MCS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxfce4mcs} -BUILDLINK_PACKAGES+= libxfce4mcs -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxfce4mcs - -.if ${LIBXFCE4MCS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libxfce4mcs+= libxfce4mcs>=4.4.3nb1 BUILDLINK_PKGSRCDIR.libxfce4mcs?= ../../x11/libxfce4mcs -.endif # LIBXFCE4MCS_BUILDLINK3_MK .include "../../x11/libxfce4util/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # LIBXFCE4MCS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libxfce4mcs diff --git a/x11/libxfce4util/buildlink3.mk b/x11/libxfce4util/buildlink3.mk index 272d58b5d24..48a2df1c78c 100644 --- a/x11/libxfce4util/buildlink3.mk +++ b/x11/libxfce4util/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.21 2008/12/18 16:46:29 hira Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:25:47 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXFCE4UTIL_BUILDLINK3_MK:= ${LIBXFCE4UTIL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libxfce4util -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libxfce4util -.endif +.if !defined(LIBXFCE4UTIL_BUILDLINK3_MK) +LIBXFCE4UTIL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxfce4util} -BUILDLINK_PACKAGES+= libxfce4util -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxfce4util - -.if ${LIBXFCE4UTIL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libxfce4util+= libxfce4util>=4.4.3nb1 BUILDLINK_PKGSRCDIR.libxfce4util?= ../../x11/libxfce4util -.endif # LIBXFCE4UTIL_BUILDLINK3_MK .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # LIBXFCE4UTIL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libxfce4util diff --git a/x11/libxkbfile/buildlink3.mk b/x11/libxkbfile/buildlink3.mk index 945d7ddc941..67ae09f6c3b 100644 --- a/x11/libxkbfile/buildlink3.mk +++ b/x11/libxkbfile/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2007/01/11 09:22:50 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:47 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -6,25 +6,18 @@ .include "../../mk/x11.buildlink3.mk" .else -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXKBFILE_BUILDLINK3_MK:= ${LIBXKBFILE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libxkbfile -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libxkbfile -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxkbfile} -BUILDLINK_PACKAGES+= libxkbfile -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxkbfile +.if !defined(LIBXKBFILE_BUILDLINK3_MK) +LIBXKBFILE_BUILDLINK3_MK:= -.if ${LIBXKBFILE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libxkbfile+= libxkbfile>=0.99.1 BUILDLINK_PKGSRCDIR.libxkbfile?= ../../x11/libxkbfile -.endif # LIBXKBFILE_BUILDLINK3_MK .include "../../x11/kbproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" +.endif # LIBXKBFILE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libxkbfile .endif diff --git a/x11/libxkbui/buildlink3.mk b/x11/libxkbui/buildlink3.mk index 6af007a9694..cd35a7e4c41 100644 --- a/x11/libxkbui/buildlink3.mk +++ b/x11/libxkbui/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2007/11/23 14:34:34 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:47 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -6,25 +6,18 @@ .include "../../mk/x11.buildlink3.mk" .else -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXKBUI_BUILDLINK3_MK:= ${LIBXKBUI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libxkbui -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libxkbui -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxkbui} -BUILDLINK_PACKAGES+= libxkbui -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxkbui +.if !defined(LIBXKBUI_BUILDLINK3_MK) +LIBXKBUI_BUILDLINK3_MK:= -.if ${LIBXKBUI_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libxkbui+= libxkbui>=1.0.2 BUILDLINK_PKGSRCDIR.libxkbui?= ../../x11/libxkbui -.endif # LIBXKBUI_BUILDLINK3_MK .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libxkbfile/buildlink3.mk" +.endif # LIBXKBUI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libxkbui .endif diff --git a/x11/libxklavier/buildlink3.mk b/x11/libxklavier/buildlink3.mk index d8d86a2b122..2f3fdd69a2b 100644 --- a/x11/libxklavier/buildlink3.mk +++ b/x11/libxklavier/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.14 2007/01/15 19:26:33 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:47 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXKLAVIER_BUILDLINK3_MK:= ${LIBXKLAVIER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libxklavier -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libxklavier -.endif +.if !defined(LIBXKLAVIER_BUILDLINK3_MK) +LIBXKLAVIER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxklavier} -BUILDLINK_PACKAGES+= libxklavier -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxklavier - -.if !empty(LIBXKLAVIER_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libxklavier+= libxklavier>=3.0 BUILDLINK_PKGSRCDIR.libxklavier?= ../../x11/libxklavier -.endif # LIBXKLAVIER_BUILDLINK3_MK .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/libxkbfile/buildlink3.mk" +.endif # LIBXKLAVIER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libxklavier diff --git a/x11/modular-xorg-server/buildlink3.mk b/x11/modular-xorg-server/buildlink3.mk index 346543bf537..b9309873cfd 100644 --- a/x11/modular-xorg-server/buildlink3.mk +++ b/x11/modular-xorg-server/buildlink3.mk @@ -1,22 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.5 2008/09/18 20:56:01 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:47 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MODULAR_XORG_SERVER_BUILDLINK3_MK:= ${MODULAR_XORG_SERVER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= modular-xorg-server -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= modular-xorg-server -.endif +.if !defined(MODULAR_XORG_SERVER_BUILDLINK3_MK) +MODULAR_XORG_SERVER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmodular-xorg-server} -BUILDLINK_PACKAGES+= modular-xorg-server -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}modular-xorg-server - -.if ${MODULAR_XORG_SERVER_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.4.2 BUILDLINK_PKGSRCDIR.modular-xorg-server?= ../../x11/modular-xorg-server -.endif # MODULAR_XORG_SERVER_BUILDLINK3_MK - .include "../../x11/pixman/buildlink3.mk" .include "../../x11/compositeproto/buildlink3.mk" @@ -28,5 +19,6 @@ BUILDLINK_PKGSRCDIR.modular-xorg-server?= ../../x11/modular-xorg-server .include "../../x11/xextproto/buildlink3.mk" .include "../../x11/xf86driproto/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" +.endif # MODULAR_XORG_SERVER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -modular-xorg-server diff --git a/x11/mowitz/buildlink3.mk b/x11/mowitz/buildlink3.mk index d82f06f4573..1dfc1ec57d2 100644 --- a/x11/mowitz/buildlink3.mk +++ b/x11/mowitz/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.9 2008/01/09 19:00:25 reed Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:47 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MOWITZ_BUILDLINK3_MK:= ${MOWITZ_BUILDLINK3_MK}+ +BUILDLINK_TREE+= Mowitz -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= Mowitz -.endif +.if !defined(MOWITZ_BUILDLINK3_MK) +MOWITZ_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NMowitz} -BUILDLINK_PACKAGES+= Mowitz -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Mowitz - -.if !empty(MOWITZ_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.Mowitz+= Mowitz>=0.3.0 BUILDLINK_PKGSRCDIR.Mowitz?= ../../x11/mowitz -.endif # MOWITZ_BUILDLINK3_MK .include "../../x11/libXpm/buildlink3.mk" +.endif # MOWITZ_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -Mowitz diff --git a/x11/neXtaw/buildlink3.mk b/x11/neXtaw/buildlink3.mk index ef874276be6..1cfc5ac406f 100644 --- a/x11/neXtaw/buildlink3.mk +++ b/x11/neXtaw/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.13 2008/01/04 01:25:51 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:48 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -NEXTAW_BUILDLINK3_MK:= ${NEXTAW_BUILDLINK3_MK}+ +BUILDLINK_TREE+= neXtaw -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= neXtaw -.endif +.if !defined(NEXTAW_BUILDLINK3_MK) +NEXTAW_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NneXtaw} -BUILDLINK_PACKAGES+= neXtaw -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}neXtaw - -.if !empty(NEXTAW_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.neXtaw+= neXtaw>=0.15.1 BUILDLINK_ABI_DEPENDS.neXtaw+= neXtaw>=0.15.1nb2 BUILDLINK_PKGSRCDIR.neXtaw?= ../../x11/neXtaw @@ -32,10 +25,9 @@ LIBXAW?= -L${BUILDLINK_PREFIX.neXtaw}/lib \ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.neXtaw}/lib \ -lneXtaw -.endif # NEXTAW_BUILDLINK3_MK - .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" +.endif # NEXTAW_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -neXtaw diff --git a/x11/nucleo/buildlink3.mk b/x11/nucleo/buildlink3.mk index c9627d630a0..b785a931699 100644 --- a/x11/nucleo/buildlink3.mk +++ b/x11/nucleo/buildlink3.mk @@ -1,23 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.4 2008/12/18 17:28:16 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:48 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -NUCLEO_BUILDLINK3_MK:= ${NUCLEO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= nucleo -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= nucleo -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnucleo} -BUILDLINK_PACKAGES+= nucleo -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}nucleo +.if !defined(NUCLEO_BUILDLINK3_MK) +NUCLEO_BUILDLINK3_MK:= -.if ${NUCLEO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.nucleo+= nucleo>=0.6 BUILDLINK_ABI_DEPENDS.nucleo?= nucleo>=0.7.1nb2 BUILDLINK_PKGSRCDIR.nucleo?= ../../x11/nucleo pkgbase:=nucleo . include "../../mk/pkg-build-options.mk" -.endif # NUCLEO_BUILDLINK3_MK .if !empty(PKG_BUILD_OPTIONS.nucleo:Mgnutls) . include "../../security/gnutls/buildlink3.mk" @@ -36,5 +28,6 @@ pkgbase:=nucleo .include "../../net/mDNSResponder/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.endif # NUCLEO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -nucleo diff --git a/x11/ocaml-graphics/buildlink3.mk b/x11/ocaml-graphics/buildlink3.mk index 72f45c876d2..8d516031da7 100644 --- a/x11/ocaml-graphics/buildlink3.mk +++ b/x11/ocaml-graphics/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:15 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:48 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OCAML_GRAPHICS_BUILDLINK3_MK:= ${OCAML_GRAPHICS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ocaml-graphics -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ocaml-graphics -.endif +.if !defined(OCAML_GRAPHICS_BUILDLINK3_MK) +OCAML_GRAPHICS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nocaml-graphics} -BUILDLINK_PACKAGES+= ocaml-graphics -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ocaml-graphics - -.if !empty(OCAML_GRAPHICS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ocaml-graphics+= ocaml-graphics>=3.08.2 BUILDLINK_ABI_DEPENDS.ocaml-graphics?= ocaml-graphics>=3.09.1 BUILDLINK_PKGSRCDIR.ocaml-graphics?= ../../x11/ocaml-graphics -.endif # OCAML_GRAPHICS_BUILDLINK3_MK .include "../../lang/ocaml/buildlink3.mk" +.endif # OCAML_GRAPHICS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ocaml-graphics diff --git a/x11/openmotif/buildlink3.mk b/x11/openmotif/buildlink3.mk index 27e00af8a7a..586af7b683a 100644 --- a/x11/openmotif/buildlink3.mk +++ b/x11/openmotif/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.11 2008/07/17 09:02:54 dsainty Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:48 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OPENMOTIF_BUILDLINK3_MK:= ${OPENMOTIF_BUILDLINK3_MK}+ +BUILDLINK_TREE+= openmotif -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= openmotif -.endif +.if !defined(OPENMOTIF_BUILDLINK3_MK) +OPENMOTIF_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenmotif} -BUILDLINK_PACKAGES+= openmotif -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openmotif - -.if !empty(OPENMOTIF_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.openmotif+= openmotif>=2.3.1 BUILDLINK_ABI_DEPENDS.openmotif?= openmotif>=2.3.1 BUILDLINK_PKGSRCDIR.openmotif?= ../../x11/openmotif -.endif # OPENMOTIF_BUILDLINK3_MK .include "../../x11/xextproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" @@ -25,5 +17,6 @@ BUILDLINK_PKGSRCDIR.openmotif?= ../../x11/openmotif .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" .include "../../x11/xbitmaps/buildlink3.mk" +.endif # OPENMOTIF_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -openmotif diff --git a/x11/p5-gtk2/buildlink3.mk b/x11/p5-gtk2/buildlink3.mk index 32d6f076f0a..51cc80bfe2d 100644 --- a/x11/p5-gtk2/buildlink3.mk +++ b/x11/p5-gtk2/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1 2008/10/12 18:55:15 kefren Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:48 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -P5_GTK2_BUILDLINK3_MK:= ${P5_GTK2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= p5-gtk2 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= p5-gtk2 -.endif +.if !defined(P5_GTK2_BUILDLINK3_MK) +P5_GTK2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Np5-gtk2} -BUILDLINK_PACKAGES+= p5-gtk2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}p5-gtk2 - -.if ${P5_GTK2_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.p5-gtk2+= p5-gtk2>=1.182 BUILDLINK_PKGSRCDIR.p5-gtk2?= ../../x11/p5-gtk2 -.endif # P5_GTK2_BUILDLINK3_MK .include "../../devel/p5-glib2/buildlink3.mk" .include "../../graphics/p5-cairo/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # P5_GTK2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -p5-gtk2 diff --git a/x11/paragui/buildlink3.mk b/x11/paragui/buildlink3.mk index 8e14c4c95f9..21a2012861b 100644 --- a/x11/paragui/buildlink3.mk +++ b/x11/paragui/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:11:15 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:25:48 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PARAGUI_BUILDLINK3_MK:= ${PARAGUI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= paragui -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= paragui -.endif +.if !defined(PARAGUI_BUILDLINK3_MK) +PARAGUI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nparagui} -BUILDLINK_PACKAGES+= paragui -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}paragui - -.if !empty(PARAGUI_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.paragui+= paragui>=1.0.4nb3 BUILDLINK_ABI_DEPENDS.paragui+= paragui>=1.0.4nb12 BUILDLINK_PKGSRCDIR.paragui?= ../../x11/paragui -.endif # PARAGUI_BUILDLINK3_MK .include "../../devel/SDL/buildlink3.mk" .include "../../devel/physfs/buildlink3.mk" .include "../../graphics/SDL_image/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" +.endif # PARAGUI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -paragui diff --git a/x11/pixman/buildlink3.mk b/x11/pixman/buildlink3.mk index dc05a7b0ce8..5ecc055a089 100644 --- a/x11/pixman/buildlink3.mk +++ b/x11/pixman/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/11/08 19:51:43 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:48 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PIXMAN_BUILDLINK3_MK:= ${PIXMAN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pixman -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= pixman -.endif +.if !defined(PIXMAN_BUILDLINK3_MK) +PIXMAN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npixman} -BUILDLINK_PACKAGES+= pixman -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pixman - -.if ${PIXMAN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.pixman+= pixman>=0.9.6 BUILDLINK_PKGSRCDIR.pixman?= ../../x11/pixman -.endif # PIXMAN_BUILDLINK3_MK +.endif # PIXMAN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pixman diff --git a/x11/printproto/buildlink3.mk b/x11/printproto/buildlink3.mk index ce43629541b..7da3a290870 100644 --- a/x11/printproto/buildlink3.mk +++ b/x11/printproto/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 19:53:21 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:48 joerg Exp $ BUILDLINK_DEPMETHOD.printproto?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PRINTPROTO_BUILDLINK3_MK:= ${PRINTPROTO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= printproto -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= printproto -.endif +.if !defined(PRINTPROTO_BUILDLINK3_MK) +PRINTPROTO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nprintproto} -BUILDLINK_PACKAGES+= printproto -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}printproto - -.if ${PRINTPROTO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.printproto+= printproto>=1.0.3 BUILDLINK_PKGSRCDIR.printproto?= ../../x11/printproto -.endif # PRINTPROTO_BUILDLINK3_MK .include "../../x11/xproto/buildlink3.mk" +.endif # PRINTPROTO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -printproto diff --git a/x11/py-Pmw/buildlink3.mk b/x11/py-Pmw/buildlink3.mk index abd918e22e1..e632d36ee18 100644 --- a/x11/py-Pmw/buildlink3.mk +++ b/x11/py-Pmw/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 17:30:13 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:48 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_PMW_BUILDLINK3_MK:= ${PY_PMW_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pypmw -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pypmw -.endif +.if !defined(PY_PMW_BUILDLINK3_MK) +PY_PMW_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npypmw} -BUILDLINK_PACKAGES+= pypmw -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pypmw - -.if !empty(PY_PMW_BUILDLINK3_MK:M+) .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pypmw+= ${PYPKGPREFIX}-Pmw-[0-9]* BUILDLINK_ABI_DEPENDS.pypmw?= ${PYPKGPREFIX}-Pmw>=1.2nb1 BUILDLINK_PKGSRCDIR.pypmw?= ../../x11/py-Pmw -.endif # PY_PMW_BUILDLINK3_MK +.endif # PY_PMW_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pypmw diff --git a/x11/py-Tk/buildlink3.mk b/x11/py-Tk/buildlink3.mk index 715edde4676..35ca1bc93f7 100644 --- a/x11/py-Tk/buildlink3.mk +++ b/x11/py-Tk/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 17:30:13 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:48 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PYTK_BUILDLINK3_MK:= ${PYTK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pytk -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pytk -.endif +.if !defined(PYTK_BUILDLINK3_MK) +PYTK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npytk} -BUILDLINK_PACKAGES+= pytk -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pytk - -.if !empty(PYTK_BUILDLINK3_MK:M+) .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pytk+= ${PYPKGPREFIX}-Tk-[0-9]* BUILDLINK_ABI_DEPENDS.pytk?= ${PYPKGPREFIX}-Tk>=0nb4 BUILDLINK_PKGSRCDIR.pytk?= ../../x11/py-Tk -.endif # PYTK_BUILDLINK3_MK .include "../../x11/tk/buildlink3.mk" +.endif # PYTK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pytk diff --git a/x11/py-Xlib/buildlink3.mk b/x11/py-Xlib/buildlink3.mk index a3d422c5b6f..3d64c0eff64 100644 --- a/x11/py-Xlib/buildlink3.mk +++ b/x11/py-Xlib/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 17:30:13 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:48 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_XLIB_BUILDLINK3_MK:= ${PY_XLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= py-Xlib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= py-Xlib -.endif +.if !defined(PY_XLIB_BUILDLINK3_MK) +PY_XLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-Xlib} -BUILDLINK_PACKAGES+= py-Xlib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-Xlib - -.if !empty(PY_XLIB_BUILDLINK3_MK:M+) .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.py-Xlib+= ${PYPKGPREFIX}-Xlib>=0.12 BUILDLINK_ABI_DEPENDS.py-Xlib?= ${PYPKGPREFIX}-Xlib>=0.12nb1 BUILDLINK_PKGSRCDIR.py-Xlib?= ../../x11/py-Xlib -.endif # PY_XLIB_BUILDLINK3_MK +.endif # PY_XLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -py-Xlib diff --git a/x11/py-gnome2-desktop/buildlink3.mk b/x11/py-gnome2-desktop/buildlink3.mk index 408dc132cf5..ee1339e5a42 100644 --- a/x11/py-gnome2-desktop/buildlink3.mk +++ b/x11/py-gnome2-desktop/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/02/04 09:33:42 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:49 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_GNOME2_DESKTOP_BUILDLINK3_MK:= ${PY_GNOME2_DESKTOP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= py-gnome2-desktop -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= py-gnome2-desktop -.endif +.if !defined(PY_GNOME2_DESKTOP_BUILDLINK3_MK) +PY_GNOME2_DESKTOP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-gnome2-desktop} -BUILDLINK_PACKAGES+= py-gnome2-desktop -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-gnome2-desktop - -.if ${PY_GNOME2_DESKTOP_BUILDLINK3_MK} == "+" .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.py-gnome2-desktop+= ${PYPKGPREFIX}-gnome2-desktop>=2.16.0 BUILDLINK_PKGSRCDIR.py-gnome2-desktop?= ../../x11/py-gnome2-desktop -.endif # PY_GNOME2_DESKTOP_BUILDLINK3_MK .include "../../x11/py-gnome2/buildlink3.mk" +.endif # PY_GNOME2_DESKTOP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -py-gnome2-desktop diff --git a/x11/py-gnome2-extras/buildlink3.mk b/x11/py-gnome2-extras/buildlink3.mk index e63c487b105..082e873fef5 100644 --- a/x11/py-gnome2-extras/buildlink3.mk +++ b/x11/py-gnome2-extras/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 17:30:13 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:49 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PYGNOME2EX_BUILDLINK3_MK:= ${PYGNOME2EX_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pygnome2ex -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= pygnome2ex -.endif +.if !defined(PYGNOME2EX_BUILDLINK3_MK) +PYGNOME2EX_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npygnome2ex} -BUILDLINK_PACKAGES+= pygnome2ex -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pygnome2ex - -.if ${PYGNOME2EX_BUILDLINK3_MK} == "+" .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pygnome2ex+= ${PYPKGPREFIX}-gnome2-extras>=2.12.0nb3 BUILDLINK_ABI_DEPENDS.pygnome2ex+= ${PYPKGPREFIX}-gnome2-extras>=2.12.0nb7 BUILDLINK_PKGSRCDIR.pygnome2ex?= ../../x11/py-gnome2-extras -.endif # PYGNOME2EX_BUILDLINK3_MK .include "../../x11/py-gnome2/buildlink3.mk" +.endif # PYGNOME2EX_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pygnome2ex diff --git a/x11/py-gnome2/buildlink3.mk b/x11/py-gnome2/buildlink3.mk index 4c78f6da090..26b5816d6ee 100644 --- a/x11/py-gnome2/buildlink3.mk +++ b/x11/py-gnome2/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.21 2008/01/05 20:45:59 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:25:49 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PYGNOME2_BUILDLINK3_MK:= ${PYGNOME2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pygnome2 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pygnome2 -.endif +.if !defined(PYGNOME2_BUILDLINK3_MK) +PYGNOME2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npygnome2} -BUILDLINK_PACKAGES+= pygnome2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pygnome2 - -.if !empty(PYGNOME2_BUILDLINK3_MK:M+) .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pygnome2+= ${PYPKGPREFIX}-gnome2>=2.10.0 BUILDLINK_ABI_DEPENDS.pygnome2+= ${PYPKGPREFIX}-gnome2>=2.12.4 BUILDLINK_PKGSRCDIR.pygnome2?= ../../x11/py-gnome2 -.endif # PYGNOME2_BUILDLINK3_MK .include "../../net/py-ORBit/buildlink3.mk" .include "../../x11/py-gtk2/buildlink3.mk" +.endif # PYGNOME2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pygnome2 diff --git a/x11/py-gtk2/buildlink3.mk b/x11/py-gtk2/buildlink3.mk index 199dfb02636..c77807373c9 100644 --- a/x11/py-gtk2/buildlink3.mk +++ b/x11/py-gtk2/buildlink3.mk @@ -1,27 +1,20 @@ -# $NetBSD: buildlink3.mk,v 1.22 2008/01/05 20:45:59 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.23 2009/03/20 19:25:49 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PYGTK2_BUILDLINK3_MK:= ${PYGTK2_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pygtk2 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pygtk2 -.endif +.if !defined(PYGTK2_BUILDLINK3_MK) +PYGTK2_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npygtk2} -BUILDLINK_PACKAGES+= pygtk2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pygtk2 - -.if !empty(PYGTK2_BUILDLINK3_MK:M+) .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.8.4 BUILDLINK_ABI_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.8.5nb1 BUILDLINK_PKGSRCDIR.pygtk2?= ../../x11/py-gtk2 -.endif # PYGTK2_BUILDLINK3_MK .include "../../devel/py-gobject/buildlink3.mk" .include "../../devel/libglade/buildlink3.mk" .include "../../math/py-Numeric/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # PYGTK2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pygtk2 diff --git a/x11/py-kiwi/buildlink3.mk b/x11/py-kiwi/buildlink3.mk index 6e81714353c..cc6986cd6df 100644 --- a/x11/py-kiwi/buildlink3.mk +++ b/x11/py-kiwi/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/06 18:13:58 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:49 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_KIWI_BUILDLINK3_MK:= ${PY_KIWI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= py-kiwi -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= py-kiwi -.endif +.if !defined(PY_KIWI_BUILDLINK3_MK) +PY_KIWI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-kiwi} -BUILDLINK_PACKAGES+= py-kiwi -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-kiwi - -.if ${PY_KIWI_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.py-kiwi+= ${PYPKGPREFIX}-kiwi>=1.9.22 BUILDLINK_PKGSRCDIR.py-kiwi?= ../../x11/py-kiwi -.endif # PY_KIWI_BUILDLINK3_MK .include "../../x11/py-gtk2/buildlink3.mk" +.endif # PY_KIWI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -py-kiwi diff --git a/x11/py-qt3-base/buildlink3.mk b/x11/py-qt3-base/buildlink3.mk index 93ce13793bc..1c94b089e01 100644 --- a/x11/py-qt3-base/buildlink3.mk +++ b/x11/py-qt3-base/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 17:30:13 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:49 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PYQT3_BASE_BUILDLINK3_MK:= ${PYQT3_BASE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pyqt3-base -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pyqt3-base -.endif +.if !defined(PYQT3_BASE_BUILDLINK3_MK) +PYQT3_BASE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyqt3-base} -BUILDLINK_PACKAGES+= pyqt3-base -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyqt3-base - -.if !empty(PYQT3_BASE_BUILDLINK3_MK:M+) .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pyqt3-base+= ${PYPKGPREFIX}-qt3-base>=3.11 @@ -19,10 +12,10 @@ BUILDLINK_ABI_DEPENDS.pyqt3-base?= ${PYPKGPREFIX}-qt3-base>=3.15.1nb3 BUILDLINK_PKGSRCDIR.pyqt3-base?= ../../x11/py-qt3-base BUILDLINK_LIBDIRS.pyqt3-base+= ${PYSITELIB} -.endif # PYQT3_BASE_BUILDLINK3_MK .include "../../x11/py-sip/buildlink3.mk" .include "../../x11/qt3-libs/buildlink3.mk" .include "../../x11/qt3-tools/buildlink3.mk" +.endif # PYQT3_BASE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pyqt3-base diff --git a/x11/py-qt3-modules/buildlink3.mk b/x11/py-qt3-modules/buildlink3.mk index 51e6ba2275f..213c3d14078 100644 --- a/x11/py-qt3-modules/buildlink3.mk +++ b/x11/py-qt3-modules/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 17:30:13 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:49 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PYQT3_MOD_BUILDLINK3_MK:= ${PYQT3_MOD_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pyqt3-mod -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pyqt3-mod -.endif +.if !defined(PYQT3_MOD_BUILDLINK3_MK) +PYQT3_MOD_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyqt3-mod} -BUILDLINK_PACKAGES+= pyqt3-mod -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyqt3-mod - -.if !empty(PYQT3_MOD_BUILDLINK3_MK:M+) .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pyqt3-mod+= ${PYPKGPREFIX}-qt3-modules>=3.11 @@ -19,8 +12,8 @@ BUILDLINK_ABI_DEPENDS.pyqt3-mod+= ${PYPKGPREFIX}-qt3-modules>=3.15.1nb3 BUILDLINK_PKGSRCDIR.pyqt3-mod?= ../../x11/py-qt3-modules BUILDLINK_LIBDIRS.pyqt3-mod+= ${PYSITELIB} -.endif # PYQT3_MOD_BUILDLINK3_MK .include "../../x11/py-qt3-base/buildlink3.mk" +.endif # PYQT3_MOD_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pyqt3-mod diff --git a/x11/py-qt4/buildlink3.mk b/x11/py-qt4/buildlink3.mk index 953eee04824..ae6b30ddab9 100644 --- a/x11/py-qt4/buildlink3.mk +++ b/x11/py-qt4/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:13 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:49 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_QT4_BUILDLINK3_MK:= ${PY_QT4_BUILDLINK3_MK}+ +BUILDLINK_TREE+= py-qt4 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= py-qt4 -.endif +.if !defined(PY_QT4_BUILDLINK3_MK) +PY_QT4_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-qt4} -BUILDLINK_PACKAGES+= py-qt4 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-qt4 - -.if ${PY_QT4_BUILDLINK3_MK} == "+" .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.py-qt4+= ${PYPKGPREFIX}-qt4>=4.4.4 BUILDLINK_PKGSRCDIR.py-qt4?= ../../x11/py-qt4 -.endif # PY_QT4_BUILDLINK3_MK +.endif # PY_QT4_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -py-qt4 diff --git a/x11/py-sip/buildlink3.mk b/x11/py-sip/buildlink3.mk index 665f6ad8420..aed7b88b0b4 100644 --- a/x11/py-sip/buildlink3.mk +++ b/x11/py-sip/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:13 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:49 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_SIP_BUILDLINK3_MK:= ${PY_SIP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= py-sip -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= py-sip -.endif +.if !defined(PY_SIP_BUILDLINK3_MK) +PY_SIP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-sip} -BUILDLINK_PACKAGES+= py-sip -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-sip - -.if ${PY_SIP_BUILDLINK3_MK} == "+" .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.py-sip+= ${PYPKGPREFIX}-sip>=4.7.7 BUILDLINK_PKGSRCDIR.py-sip?= ../../x11/py-sip -.endif # PY_SIP_BUILDLINK3_MK +.endif # PY_SIP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -py-sip diff --git a/x11/py-wxWidgets/buildlink3.mk b/x11/py-wxWidgets/buildlink3.mk index 968d52de47a..4618cb58971 100644 --- a/x11/py-wxWidgets/buildlink3.mk +++ b/x11/py-wxWidgets/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 17:30:14 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:49 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_WXWIDGETS_BUILDLINK3_MK:= ${PY_WXWIDGETS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ${PYPKGPREFIX}-wxWidgets -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ${PYPKGPREFIX}-wxWidgets -.endif +.if !defined(PY_WXWIDGETS_BUILDLINK3_MK) +PY_WXWIDGETS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:N${PYPKGPREFIX}-wxWidgets} -BUILDLINK_PACKAGES+= ${PYPKGPREFIX}-wxWidgets -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}${PYPKGPREFIX}-wxWidgets - -.if !empty(PY_WXWIDGETS_BUILDLINK3_MK:M+) .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-wxWidgets+= ${PYPKGPREFIX}-wxWidgets>=2.6.1.0 @@ -19,7 +12,6 @@ BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-wxWidgets?= ${PYPKGPREFIX}-wxWidgets>=2.6.1 BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-wxWidgets?= ../../x11/py-wxWidgets .include "../../x11/wxGTK26/buildlink3.mk" +.endif # PY_WXWIDGETS_BUILDLINK3_MK -.endif # PY_WXWIDGETS_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -${PYPKGPREFIX}-wxWidgets diff --git a/x11/qt3-libs/buildlink3.mk b/x11/qt3-libs/buildlink3.mk index a57a380c8c3..4409a48043e 100644 --- a/x11/qt3-libs/buildlink3.mk +++ b/x11/qt3-libs/buildlink3.mk @@ -1,24 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.21 2007/01/15 16:19:43 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:25:50 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -QT3_LIBS_BUILDLINK3_MK:= ${QT3_LIBS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= qt3-libs -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= qt3-libs -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nqt3-libs} -BUILDLINK_PACKAGES+= qt3-libs -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qt3-libs +.if !defined(QT3_LIBS_BUILDLINK3_MK) +QT3_LIBS_BUILDLINK3_MK:= -.if !empty(QT3_LIBS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.qt3-libs+= qt3-libs>=3.2.3 BUILDLINK_ABI_DEPENDS.qt3-libs?= qt3-libs>=3.3.6nb1 BUILDLINK_PKGSRCDIR.qt3-libs?= ../../x11/qt3-libs BUILDLINK_INCDIRS.qt3-libs+= qt3/include BUILDLINK_LIBDIRS.qt3-libs+= qt3/lib -.endif # QT3_LIBS_BUILDLINK3_MK QTDIR= ${BUILDLINK_PREFIX.qt3-libs}/qt3 BUILDLINK_PASSTHRU_DIRS+= ${QTDIR} @@ -52,5 +44,6 @@ MAKE_ENV+= MOC="${QTDIR}/bin/moc" CONFIGURE_ENV+= QTDIR=${QTDIR:Q} MAKE_ENV+= QTDIR=${QTDIR:Q} .endif +.endif # QT3_LIBS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -qt3-libs diff --git a/x11/qt3-qscintilla/buildlink3.mk b/x11/qt3-qscintilla/buildlink3.mk index 05d0d55cfad..3f993f85c87 100644 --- a/x11/qt3-qscintilla/buildlink3.mk +++ b/x11/qt3-qscintilla/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:16 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:50 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -QT3_QSCINTILLA_BUILDLINK3_MK:= ${QT3_QSCINTILLA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= qt3-qscintilla -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= qt3-qscintilla -.endif +.if !defined(QT3_QSCINTILLA_BUILDLINK3_MK) +QT3_QSCINTILLA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nqt3-qscintilla} -BUILDLINK_PACKAGES+= qt3-qscintilla -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qt3-qscintilla - -.if !empty(QT3_QSCINTILLA_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.qt3-qscintilla+= qt3-qscintilla>=1.2 BUILDLINK_ABI_DEPENDS.qt3-qscintilla+= qt3-qscintilla>=1.6nb3 BUILDLINK_PKGSRCDIR.qt3-qscintilla?= ../../x11/qt3-qscintilla -.endif # QT3_QSCINTILLA_BUILDLINK3_MK .include "../../x11/qt3-libs/buildlink3.mk" +.endif # QT3_QSCINTILLA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -qt3-qscintilla diff --git a/x11/qt3-tools/buildlink3.mk b/x11/qt3-tools/buildlink3.mk index a1730cfef37..37706655a80 100644 --- a/x11/qt3-tools/buildlink3.mk +++ b/x11/qt3-tools/buildlink3.mk @@ -1,22 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 23:11:16 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:50 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -QT3_TOOLS_BUILDLINK3_MK:= ${QT3_TOOLS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= qt3-tools -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= qt3-tools -.endif +.if !defined(QT3_TOOLS_BUILDLINK3_MK) +QT3_TOOLS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nqt3-tools} -BUILDLINK_PACKAGES+= qt3-tools -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qt3-tools - -.if !empty(QT3_TOOLS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.qt3-tools+= qt3-tools>=3.1.2nb3 BUILDLINK_ABI_DEPENDS.qt3-tools+= qt3-tools>=3.3.6nb1 BUILDLINK_PKGSRCDIR.qt3-tools?= ../../x11/qt3-tools BUILDLINK_DEPMETHOD.qt3-tools?= build -.endif # QT3_TOOLS_BUILDLINK3_MK .include "../../x11/qt3-libs/buildlink3.mk" @@ -31,5 +23,6 @@ MAKE_ENV+= QMAKE="${QTDIR}/bin/qmake" # platforms (solaris for example) CONFIGURE_ENV+= QMAKESPEC=${QTDIR}/mkspecs/netbsd-g++ MAKE_ENV+= QMAKESPEC=${QTDIR}/mkspecs/netbsd-g++ +.endif # QT3_TOOLS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -qt3-tools diff --git a/x11/qt4-libs/buildlink3.mk b/x11/qt4-libs/buildlink3.mk index 747d0c60066..8bfafa0fee5 100644 --- a/x11/qt4-libs/buildlink3.mk +++ b/x11/qt4-libs/buildlink3.mk @@ -1,24 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.11 2007/10/13 12:02:14 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:50 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -QT4_LIBS_BUILDLINK3_MK:= ${QT4_LIBS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= qt4-libs -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= qt4-libs -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nqt4-libs} -BUILDLINK_PACKAGES+= qt4-libs -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qt4-libs +.if !defined(QT4_LIBS_BUILDLINK3_MK) +QT4_LIBS_BUILDLINK3_MK:= -.if !empty(QT4_LIBS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.1.0 BUILDLINK_ABI_DEPENDS.qt4-libs+= qt4-libs>=4.1.2nb1 BUILDLINK_PKGSRCDIR.qt4-libs?= ../../x11/qt4-libs BUILDLINK_INCDIRS.qt4-libs+= qt4/include BUILDLINK_LIBDIRS.qt4-libs+= qt4/lib -.endif # QT4_LIBS_BUILDLINK3_MK QTDIR= ${BUILDLINK_PREFIX.qt4-libs}/qt4 BUILDLINK_PASSTHRU_DIRS+= ${QTDIR} @@ -50,5 +42,6 @@ MAKE_ENV+= QTDIR=${QTDIR:Q} CONFIGURE_ENV+= MOC="${QTDIR}/bin/moc" MAKE_ENV+= MOC="${QTDIR}/bin/moc" +.endif # QT4_LIBS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -qt4-libs diff --git a/x11/qt4-qdbus/buildlink3.mk b/x11/qt4-qdbus/buildlink3.mk index 8f05a433e76..81f55f20252 100644 --- a/x11/qt4-qdbus/buildlink3.mk +++ b/x11/qt4-qdbus/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/12/06 11:28:09 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:50 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -QT4_QDBUS_BUILDLINK3_MK:= ${QT4_QDBUS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= qt4-qdbus -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= qt4-qdbus -.endif +.if !defined(QT4_QDBUS_BUILDLINK3_MK) +QT4_QDBUS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nqt4-qdbus} -BUILDLINK_PACKAGES+= qt4-qdbus -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qt4-qdbus - -.if ${QT4_QDBUS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.qt4-qdbus+= qt4-qdbus>=4.3.2 BUILDLINK_PKGSRCDIR.qt4-qdbus?= ../../x11/qt4-qdbus -.endif # QT4_QDBUS_BUILDLINK3_MK .include "../../x11/qt4-libs/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" +.endif # QT4_QDBUS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -qt4-qdbus diff --git a/x11/qt4-tools/buildlink3.mk b/x11/qt4-tools/buildlink3.mk index b0429e3b35b..97d96ca60b7 100644 --- a/x11/qt4-tools/buildlink3.mk +++ b/x11/qt4-tools/buildlink3.mk @@ -1,22 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.9 2008/06/03 20:14:45 abs Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:50 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -QT4_TOOLS_BUILDLINK3_MK:= ${QT4_TOOLS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= qt4-tools -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= qt4-tools -.endif +.if !defined(QT4_TOOLS_BUILDLINK3_MK) +QT4_TOOLS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nqt4-tools} -BUILDLINK_PACKAGES+= qt4-tools -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qt4-tools - -.if !empty(QT4_TOOLS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.qt4-tools+= qt4-tools>=4.1.0 BUILDLINK_ABI_DEPENDS.qt4-tools+= qt4-tools>=4.1.2nb1 BUILDLINK_PKGSRCDIR.qt4-tools?= ../../x11/qt4-tools BUILDLINK_DEPMETHOD.qt4-tools?= build -.endif # QT4_TOOLS_BUILDLINK3_MK .include "../../x11/qt4-libs/buildlink3.mk" @@ -31,5 +23,6 @@ MAKE_ENV+= QMAKE="${QTDIR}/bin/qmake" # platforms (solaris for example) CONFIGURE_ENV+= QMAKESPEC=${QTDIR}/mkspecs/netbsd-g++ MAKE_ENV+= QMAKESPEC=${QTDIR}/mkspecs/netbsd-g++ +.endif # QT4_TOOLS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -qt4-tools diff --git a/x11/randrproto/buildlink3.mk b/x11/randrproto/buildlink3.mk index 564c27d2635..b0d5efc73a6 100644 --- a/x11/randrproto/buildlink3.mk +++ b/x11/randrproto/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.8 2008/01/07 13:59:36 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:50 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" BUILDLINK_DEPMETHOD.randrproto?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -RANDRPROTO_BUILDLINK3_MK:= ${RANDRPROTO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= randrproto -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= randrproto -.endif +.if !defined(RANDRPROTO_BUILDLINK3_MK) +RANDRPROTO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrandrproto} -BUILDLINK_PACKAGES+= randrproto -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}randrproto - -.if !empty(RANDRPROTO_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.2.0 BUILDLINK_PKGSRCDIR.randrproto?= ../../x11/randrproto -.endif # RANDRPROTO_BUILDLINK3_MK +.endif # RANDRPROTO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -randrproto diff --git a/x11/recordproto/buildlink3.mk b/x11/recordproto/buildlink3.mk index 05d1d826e8f..9758d9f0b16 100644 --- a/x11/recordproto/buildlink3.mk +++ b/x11/recordproto/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.2 2007/10/23 15:34:32 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:50 joerg Exp $ BUILDLINK_DEPMETHOD.recordproto?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -RECORDPROTO_BUILDLINK3_MK:= ${RECORDPROTO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= recordproto -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= recordproto -.endif +.if !defined(RECORDPROTO_BUILDLINK3_MK) +RECORDPROTO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrecordproto} -BUILDLINK_PACKAGES+= recordproto -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}recordproto - -.if ${RECORDPROTO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.recordproto+= recordproto>=1.13.1 BUILDLINK_PKGSRCDIR.recordproto?= ../../x11/recordproto -.endif # RECORDPROTO_BUILDLINK3_MK +.endif # RECORDPROTO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -recordproto diff --git a/x11/renderproto/buildlink3.mk b/x11/renderproto/buildlink3.mk index fd0f11d85d2..3cb333cf1a0 100644 --- a/x11/renderproto/buildlink3.mk +++ b/x11/renderproto/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.10 2008/01/17 14:06:07 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:50 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -RENDERPROTO_BUILDLINK3_MK:= ${RENDERPROTO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= renderproto -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= renderproto -.endif +.if !defined(RENDERPROTO_BUILDLINK3_MK) +RENDERPROTO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrenderproto} -BUILDLINK_PACKAGES+= renderproto -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}renderproto - -.if !empty(RENDERPROTO_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.9.3nb1 BUILDLINK_PKGSRCDIR.renderproto?= ../../x11/renderproto BUILDLINK_DEPMETHOD.renderproto?= build -.endif # RENDERPROTO_BUILDLINK3_MK +.endif # RENDERPROTO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -renderproto diff --git a/x11/resourceproto/buildlink3.mk b/x11/resourceproto/buildlink3.mk index 563649fb2a5..78e1245aa74 100644 --- a/x11/resourceproto/buildlink3.mk +++ b/x11/resourceproto/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 22:03:23 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:50 joerg Exp $ BUILDLINK_DEPMETHOD.resourceproto?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -RESOURCEPROTO_BUILDLINK3_MK:= ${RESOURCEPROTO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= resourceproto -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= resourceproto -.endif +.if !defined(RESOURCEPROTO_BUILDLINK3_MK) +RESOURCEPROTO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nresourceproto} -BUILDLINK_PACKAGES+= resourceproto -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}resourceproto - -.if ${RESOURCEPROTO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.resourceproto+= resourceproto>=1.0.1 BUILDLINK_PKGSRCDIR.resourceproto?= ../../x11/resourceproto -.endif # RESOURCEPROTO_BUILDLINK3_MK +.endif # RESOURCEPROTO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -resourceproto diff --git a/x11/ruby-gnome2-gtk/buildlink3.mk b/x11/ruby-gnome2-gtk/buildlink3.mk index 053c01ab2b5..d8d75ccbea7 100644 --- a/x11/ruby-gnome2-gtk/buildlink3.mk +++ b/x11/ruby-gnome2-gtk/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1 2008/12/16 12:23:58 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:51 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -RUBY_GNOME2_GTK_BUILDLINK3_MK:= ${RUBY_GNOME2_GTK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ruby-gnome2-gtk -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= ruby-gnome2-gtk -.endif +.if !defined(RUBY_GNOME2_GTK_BUILDLINK3_MK) +RUBY_GNOME2_GTK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nruby-gnome2-gtk} -BUILDLINK_PACKAGES+= ruby-gnome2-gtk -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ruby-gnome2-gtk - -.if ${RUBY_GNOME2_GTK_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.ruby-gnome2-gtk+= ${RUBY_PKGPREFIX}-gnome2-gtk>=0.17.0 BUILDLINK_PKGSRCDIR.ruby-gnome2-gtk?= ../../x11/ruby-gnome2-gtk -.endif # RUBY_GNOME2_GTK_BUILDLINK3_MK .include "../../devel/ruby-gnome2-glib/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # RUBY_GNOME2_GTK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ruby-gnome2-gtk diff --git a/x11/scrnsaverproto/buildlink3.mk b/x11/scrnsaverproto/buildlink3.mk index 777af764267..bdb2d5cb941 100644 --- a/x11/scrnsaverproto/buildlink3.mk +++ b/x11/scrnsaverproto/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 20:11:57 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:51 joerg Exp $ BUILDLINK_DEPMETHOD.scrnsaverproto?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SCRNSAVERPROTO_BUILDLINK3_MK:= ${SCRNSAVERPROTO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= scrnsaverproto -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= scrnsaverproto -.endif +.if !defined(SCRNSAVERPROTO_BUILDLINK3_MK) +SCRNSAVERPROTO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nscrnsaverproto} -BUILDLINK_PACKAGES+= scrnsaverproto -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}scrnsaverproto - -.if ${SCRNSAVERPROTO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.scrnsaverproto+= scrnsaverproto>=1.1.0 BUILDLINK_PKGSRCDIR.scrnsaverproto?= ../../x11/scrnsaverproto -.endif # SCRNSAVERPROTO_BUILDLINK3_MK .include "../../x11/xproto/buildlink3.mk" +.endif # SCRNSAVERPROTO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -scrnsaverproto diff --git a/x11/startup-notification/buildlink3.mk b/x11/startup-notification/buildlink3.mk index 57ebce6b61a..cf17c51a19f 100644 --- a/x11/startup-notification/buildlink3.mk +++ b/x11/startup-notification/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.9 2009/03/17 16:28:36 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:51 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -STARTUP_NOTIFICATION_BUILDLINK3_MK:= ${STARTUP_NOTIFICATION_BUILDLINK3_MK}+ +BUILDLINK_TREE+= startup-notification -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= startup-notification -.endif +.if !defined(STARTUP_NOTIFICATION_BUILDLINK3_MK) +STARTUP_NOTIFICATION_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nstartup-notification} -BUILDLINK_PACKAGES+= startup-notification -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}startup-notification - -.if !empty(STARTUP_NOTIFICATION_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.startup-notification+= startup-notification>=0.5 BUILDLINK_ABI_DEPENDS.startup-notification+= startup-notification>=0.8nb1 BUILDLINK_PKGSRCDIR.startup-notification?= ../../x11/startup-notification -.endif # STARTUP_NOTIFICATION_BUILDLINK3_MK .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" +.endif # STARTUP_NOTIFICATION_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -startup-notification diff --git a/x11/tk-BWidget/buildlink3.mk b/x11/tk-BWidget/buildlink3.mk index 1ef5a87c43b..3a902f80e75 100644 --- a/x11/tk-BWidget/buildlink3.mk +++ b/x11/tk-BWidget/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:16 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:51 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TK_BWIDGET_BUILDLINK3_MK:= ${TK_BWIDGET_BUILDLINK3_MK}+ +BUILDLINK_TREE+= tk-BWidget -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= tk-BWidget -.endif +.if !defined(TK_BWIDGET_BUILDLINK3_MK) +TK_BWIDGET_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntk-BWidget} -BUILDLINK_PACKAGES+= tk-BWidget -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tk-BWidget - -.if !empty(TK_BWIDGET_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.tk-BWidget+= tk-BWidget>=1.7.0 BUILDLINK_ABI_DEPENDS.tk-BWidget?= tk-BWidget>=1.7.0nb1 BUILDLINK_PKGSRCDIR.tk-BWidget?= ../../x11/tk-BWidget -.endif # TK_BWIDGET_BUILDLINK3_MK +.endif # TK_BWIDGET_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -tk-BWidget diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk index ec956766e2c..6adfa0d6a14 100644 --- a/x11/tk/buildlink3.mk +++ b/x11/tk/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.22 2007/01/02 11:03:11 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.23 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.4.6nb1 BUILDLINK_ABI_DEPENDS.tk+= tk>=8.4.12nb1 BUILDLINK_PKGSRCDIR.tk?= ../../x11/tk @@ -25,10 +18,10 @@ BUILDLINK_TRANSFORM+= l:tk:tk84 BUILDLINK_TRANSFORM+= l:tk8.4:tk84 TKCONFIG_SH?= ${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh -.endif # TK_BUILDLINK3_MK .include "../../lang/tcl/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" +.endif # TK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -tk 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 diff --git a/x11/trapproto/buildlink3.mk b/x11/trapproto/buildlink3.mk index a5b1777ed1e..7f437de05af 100644 --- a/x11/trapproto/buildlink3.mk +++ b/x11/trapproto/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.2 2006/12/17 22:38:14 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:51 joerg Exp $ BUILDLINK_DEPMETHOD.trapproto?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TRAPPROTO_BUILDLINK3_MK:= ${TRAPPROTO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= trapproto -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= trapproto -.endif +.if !defined(TRAPPROTO_BUILDLINK3_MK) +TRAPPROTO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntrapproto} -BUILDLINK_PACKAGES+= trapproto -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}trapproto - -.if ${TRAPPROTO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.trapproto+= trapproto>=3.4.3 BUILDLINK_PKGSRCDIR.trapproto?= ../../x11/trapproto -.endif # TRAPPROTO_BUILDLINK3_MK .include "../../x11/libX11/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" +.endif # TRAPPROTO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -trapproto diff --git a/x11/videoproto/buildlink3.mk b/x11/videoproto/buildlink3.mk index 5c6f3d4338a..1fbfd536d2d 100644 --- a/x11/videoproto/buildlink3.mk +++ b/x11/videoproto/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 20:18:23 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:51 joerg Exp $ BUILDLINK_DEPMETHOD.videoproto?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -VIDEOPROTO_BUILDLINK3_MK:= ${VIDEOPROTO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= videoproto -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= videoproto -.endif +.if !defined(VIDEOPROTO_BUILDLINK3_MK) +VIDEOPROTO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nvideoproto} -BUILDLINK_PACKAGES+= videoproto -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}videoproto - -.if ${VIDEOPROTO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.videoproto+= videoproto>=2.2.1 BUILDLINK_PKGSRCDIR.videoproto?= ../../x11/videoproto -.endif # VIDEOPROTO_BUILDLINK3_MK +.endif # VIDEOPROTO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -videoproto diff --git a/x11/vte/buildlink3.mk b/x11/vte/buildlink3.mk index cae5b3ba12a..950b9802203 100644 --- a/x11/vte/buildlink3.mk +++ b/x11/vte/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.17 2009/02/03 12:13:37 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:25:51 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -VTE_BUILDLINK3_MK:= ${VTE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= vte -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= vte -.endif +.if !defined(VTE_BUILDLINK3_MK) +VTE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nvte} -BUILDLINK_PACKAGES+= vte -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}vte - -.if !empty(VTE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.vte+= vte>=0.14.0 BUILDLINK_ABI_DEPENDS.vte?= vte>=0.17.4nb1 BUILDLINK_PKGSRCDIR.vte?= ../../x11/vte -.endif # VTE_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/termcap.buildlink3.mk" +.endif # VTE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -vte diff --git a/x11/wxGTK24/buildlink3.mk b/x11/wxGTK24/buildlink3.mk index 7962efa40cb..12b289d11c3 100644 --- a/x11/wxGTK24/buildlink3.mk +++ b/x11/wxGTK24/buildlink3.mk @@ -1,23 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/12/12 21:52:38 joerg Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -WXGTK24_BUILDLINK3_MK:= ${WXGTK24_BUILDLINK3_MK}+ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:51 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= wxGTK24 -.endif +BUILDLINK_TREE+= wxGTK24 -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NwxGTK24} -BUILDLINK_PACKAGES+= wxGTK24 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wxGTK24 +.if !defined(WXGTK24_BUILDLINK3_MK) +WXGTK24_BUILDLINK3_MK:= -.if !empty(WXGTK24_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.wxGTK24+= wxGTK24>=2.4.2 BUILDLINK_ABI_DEPENDS.wxGTK24?= wxGTK24>=2.4.2nb10 BUILDLINK_PKGSRCDIR.wxGTK24?= ../../x11/wxGTK24 -.endif # WXGTK24_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" @@ -25,5 +17,6 @@ BUILDLINK_PKGSRCDIR.wxGTK24?= ../../x11/wxGTK24 .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # WXGTK24_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -wxGTK24 diff --git a/x11/wxGTK26-contrib/buildlink3.mk b/x11/wxGTK26-contrib/buildlink3.mk index 1bb7ae18b39..da4df671563 100644 --- a/x11/wxGTK26-contrib/buildlink3.mk +++ b/x11/wxGTK26-contrib/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/09/22 19:58:52 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:52 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -WXGTK_CONTRIB_BUILDLINK3_MK:= ${WXGTK_CONTRIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= wxGTK-contrib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= wxGTK-contrib -.endif +.if !defined(WXGTK_CONTRIB_BUILDLINK3_MK) +WXGTK_CONTRIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NwxGTK-contrib} -BUILDLINK_PACKAGES+= wxGTK-contrib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wxGTK-contrib - -.if !empty(WXGTK_CONTRIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.wxGTK-contrib+= wxGTK-contrib>=2.6.0nb2 BUILDLINK_ABI_DEPENDS.wxGTK-contrib?= wxGTK-contrib>=2.6.3nb1 BUILDLINK_PKGSRCDIR.wxGTK-contrib?= ../../x11/wxGTK26-contrib @@ -23,7 +16,6 @@ BUILDLINK_PKGSRCDIR.wxGTK-contrib?= ../../x11/wxGTK26-contrib .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/wxGTK26/buildlink3.mk" +.endif # WXGTK_CONTRIB_BUILDLINK3_MK -.endif # WXGTK_CONTRIB_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -wxGTK-contrib diff --git a/x11/wxGTK26/buildlink3.mk b/x11/wxGTK26/buildlink3.mk index 259f2dc7111..4aed2f0bde6 100644 --- a/x11/wxGTK26/buildlink3.mk +++ b/x11/wxGTK26/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/09/22 19:58:52 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:52 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -WXGTK_BUILDLINK3_MK:= ${WXGTK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= wxGTK -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= wxGTK -.endif +.if !defined(WXGTK_BUILDLINK3_MK) +WXGTK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NwxGTK} -BUILDLINK_PACKAGES+= wxGTK -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wxGTK - -.if !empty(WXGTK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.wxGTK+= wxGTK>=2.6.0nb2 BUILDLINK_ABI_DEPENDS.wxGTK+= wxGTK>=2.6.3nb1 BUILDLINK_PKGSRCDIR.wxGTK?= ../../x11/wxGTK26 -.endif # WXGTK_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" @@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.wxGTK?= ../../x11/wxGTK26 .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # WXGTK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -wxGTK diff --git a/x11/wxGTK28-contrib/buildlink3.mk b/x11/wxGTK28-contrib/buildlink3.mk index 61e8a3f0f55..eb1f3cc4b28 100644 --- a/x11/wxGTK28-contrib/buildlink3.mk +++ b/x11/wxGTK28-contrib/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/09/12 11:15:38 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:52 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -WXGTK28_CONTRIB_BUILDLINK3_MK:= ${WXGTK28_CONTRIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= wxGTK28-contrib -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= wxGTK28-contrib -.endif +.if !defined(WXGTK28_CONTRIB_BUILDLINK3_MK) +WXGTK28_CONTRIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NwxGTK28-contrib} -BUILDLINK_PACKAGES+= wxGTK28-contrib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wxGTK28-contrib - -.if ${WXGTK28_CONTRIB_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.wxGTK28-contrib+= wxGTK28-contrib>=2.8.8 BUILDLINK_PKGSRCDIR.wxGTK28-contrib?= ../../x11/wxGTK28-contrib -.endif # WXGTK28_CONTRIB_BUILDLINK3_MK .include "../../x11/wxGTK28/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -26,5 +18,6 @@ BUILDLINK_PKGSRCDIR.wxGTK28-contrib?= ../../x11/wxGTK28-contrib .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" +.endif # WXGTK28_CONTRIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -wxGTK28-contrib diff --git a/x11/wxGTK28/buildlink3.mk b/x11/wxGTK28/buildlink3.mk index 8b7785c3648..1e02782d367 100644 --- a/x11/wxGTK28/buildlink3.mk +++ b/x11/wxGTK28/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/19 15:26:33 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:52 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -WXGTK28_BUILDLINK3_MK:= ${WXGTK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= wxGTK28 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= wxGTK28 -.endif +.if !defined(WXGTK28_BUILDLINK3_MK) +WXGTK28_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NwxGTK28} -BUILDLINK_PACKAGES+= wxGTK28 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wxGTK28 - -.if ${WXGTK28_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.wxGTK28+= wxGTK28>=2.8.8 BUILDLINK_PKGSRCDIR.wxGTK28?= ../../x11/wxGTK28 -.endif # WXGTK28_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" @@ -25,5 +17,6 @@ BUILDLINK_PKGSRCDIR.wxGTK28?= ../../x11/wxGTK28 .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" +.endif # WXGTK28_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -wxGTK28 diff --git a/x11/xbitmaps/buildlink3.mk b/x11/xbitmaps/buildlink3.mk index b733d67db5a..42d8809d2d4 100644 --- a/x11/xbitmaps/buildlink3.mk +++ b/x11/xbitmaps/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2006/11/06 10:29:33 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:52 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -8,22 +8,15 @@ BUILDLINK_DEPMETHOD.xbitmaps?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XBITMAPS_BUILDLINK3_MK:= ${XBITMAPS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xbitmaps -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xbitmaps -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxbitmaps} -BUILDLINK_PACKAGES+= xbitmaps -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xbitmaps +.if !defined(XBITMAPS_BUILDLINK3_MK) +XBITMAPS_BUILDLINK3_MK:= -.if ${XBITMAPS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xbitmaps+= xbitmaps>=1.0 BUILDLINK_PKGSRCDIR.xbitmaps?= ../../x11/xbitmaps -.endif # XBITMAPS_BUILDLINK3_MK +.endif # XBITMAPS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xbitmaps .endif diff --git a/x11/xcmiscproto/buildlink3.mk b/x11/xcmiscproto/buildlink3.mk index 3437d44f999..f3643de095f 100644 --- a/x11/xcmiscproto/buildlink3.mk +++ b/x11/xcmiscproto/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 17:50:36 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:52 joerg Exp $ BUILDLINK_DEPMETHOD.xcmiscproto?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XCMISCPROTO_BUILDLINK3_MK:= ${XCMISCPROTO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xcmiscproto -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xcmiscproto -.endif +.if !defined(XCMISCPROTO_BUILDLINK3_MK) +XCMISCPROTO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxcmiscproto} -BUILDLINK_PACKAGES+= xcmiscproto -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xcmiscproto - -.if ${XCMISCPROTO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xcmiscproto+= xcmiscproto>=1.1 BUILDLINK_PKGSRCDIR.xcmiscproto?= ../../x11/xcmiscproto -.endif # XCMISCPROTO_BUILDLINK3_MK +.endif # XCMISCPROTO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xcmiscproto diff --git a/x11/xcursor/buildlink3.mk b/x11/xcursor/buildlink3.mk index 3c621417abc..05df8befb68 100644 --- a/x11/xcursor/buildlink3.mk +++ b/x11/xcursor/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.23 2006/12/15 20:33:05 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2009/03/20 19:25:52 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XCURSOR_BUILDLINK3_MK:= ${XCURSOR_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xcursor -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= xcursor -.endif +.if !defined(XCURSOR_BUILDLINK3_MK) +XCURSOR_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxcursor} -BUILDLINK_PACKAGES+= xcursor -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xcursor - -.if !empty(XCURSOR_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.xcursor+= xcursor>=1.0 BUILDLINK_ABI_DEPENDS.xcursor+= xcursor>=1.1.2nb1 BUILDLINK_PKGSRCDIR.xcursor?= ../../x11/xcursor -.endif # XCURSOR_BUILDLINK3_MK .include "../../x11/libXfixes/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" +.endif # XCURSOR_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xcursor diff --git a/x11/xcursor/builtin.mk b/x11/xcursor/builtin.mk index d7f190b458c..0e9077c2620 100644 --- a/x11/xcursor/builtin.mk +++ b/x11/xcursor/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.13 2008/10/05 21:36:34 cube Exp $ +# $NetBSD: builtin.mk,v 1.14 2009/03/20 19:25:52 joerg Exp $ BUILTIN_PKG:= xcursor @@ -86,9 +86,7 @@ CHECK_BUILTIN.xcursor?= no BUILDLINK_API_DEPENDS.xcursor+= xcursor>=1.1.1 BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8 . for _mkfile_ in buildlink3.mk builtin.mk -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ . sinclude "../../x11/Xfixes/${_mkfile_}" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} . endfor . endif diff --git a/x11/xextproto/buildlink3.mk b/x11/xextproto/buildlink3.mk index cb685af331b..ba3eb799fdd 100644 --- a/x11/xextproto/buildlink3.mk +++ b/x11/xextproto/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.8 2008/01/07 13:59:36 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:52 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" BUILDLINK_DEPMETHOD.xextproto?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XEXTPROTO_BUILDLINK3_MK:= ${XEXTPROTO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xextproto -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= xextproto -.endif +.if !defined(XEXTPROTO_BUILDLINK3_MK) +XEXTPROTO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxextproto} -BUILDLINK_PACKAGES+= xextproto -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xextproto - -.if !empty(XEXTPROTO_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0 BUILDLINK_PKGSRCDIR.xextproto?= ../../x11/xextproto -.endif # XEXTPROTO_BUILDLINK3_MK .include "../../x11/inputproto/buildlink3.mk" +.endif # XEXTPROTO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xextproto diff --git a/x11/xf86bigfontproto/buildlink3.mk b/x11/xf86bigfontproto/buildlink3.mk index 2549bb339f4..a366b50fbdd 100644 --- a/x11/xf86bigfontproto/buildlink3.mk +++ b/x11/xf86bigfontproto/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 17:53:21 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:52 joerg Exp $ BUILDLINK_DEPMETHOD.xf86bigfontproto?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XF86BIGFONTPROTO_BUILDLINK3_MK:= ${XF86BIGFONTPROTO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xf86bigfontproto -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xf86bigfontproto -.endif +.if !defined(XF86BIGFONTPROTO_BUILDLINK3_MK) +XF86BIGFONTPROTO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxf86bigfontproto} -BUILDLINK_PACKAGES+= xf86bigfontproto -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xf86bigfontproto - -.if ${XF86BIGFONTPROTO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xf86bigfontproto+= xf86bigfontproto>=1.1 BUILDLINK_PKGSRCDIR.xf86bigfontproto?= ../../x11/xf86bigfontproto -.endif # XF86BIGFONTPROTO_BUILDLINK3_MK +.endif # XF86BIGFONTPROTO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xf86bigfontproto diff --git a/x11/xf86dgaproto/buildlink3.mk b/x11/xf86dgaproto/buildlink3.mk index 8f958a09fc6..d2ce1e4ef10 100644 --- a/x11/xf86dgaproto/buildlink3.mk +++ b/x11/xf86dgaproto/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/01/15 23:27:32 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:52 joerg Exp $ BUILDLINK_DEPMETHOD.xf86dgaproto?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XF86DGAPROTO_BUILDLINK3_MK:= ${XF86DGAPROTO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xf86dgaproto -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xf86dgaproto -.endif +.if !defined(XF86DGAPROTO_BUILDLINK3_MK) +XF86DGAPROTO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxf86dgaproto} -BUILDLINK_PACKAGES+= xf86dgaproto -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xf86dgaproto - -.if ${XF86DGAPROTO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xf86dgaproto+= xf86dgaproto>=2.0.3 BUILDLINK_PKGSRCDIR.xf86dgaproto?= ../../x11/xf86dgaproto -.endif # XF86DGAPROTO_BUILDLINK3_MK .include "../../x11/xproto/buildlink3.mk" +.endif # XF86DGAPROTO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xf86dgaproto diff --git a/x11/xf86driproto/buildlink3.mk b/x11/xf86driproto/buildlink3.mk index 9ab3c961cd5..3e1c709ca22 100644 --- a/x11/xf86driproto/buildlink3.mk +++ b/x11/xf86driproto/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/14 15:52:42 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:53 joerg Exp $ BUILDLINK_DEPMETHOD.xf86driproto?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XF86DRIPROTO_BUILDLINK3_MK:= ${XF86DRIPROTO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xf86driproto -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xf86driproto -.endif +.if !defined(XF86DRIPROTO_BUILDLINK3_MK) +XF86DRIPROTO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxf86driproto} -BUILDLINK_PACKAGES+= xf86driproto -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xf86driproto - -.if ${XF86DRIPROTO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.0.3 BUILDLINK_PKGSRCDIR.xf86driproto?= ../../x11/xf86driproto -.endif # XF86DRIPROTO_BUILDLINK3_MK .include "../../x11/glproto/buildlink3.mk" .include "../../x11/libdrm/buildlink3.mk" +.endif # XF86DRIPROTO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xf86driproto diff --git a/x11/xf86miscproto/buildlink3.mk b/x11/xf86miscproto/buildlink3.mk index cad8a8b4fc9..4cf6abdfa3a 100644 --- a/x11/xf86miscproto/buildlink3.mk +++ b/x11/xf86miscproto/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/14 14:53:41 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:53 joerg Exp $ BUILDLINK_DEPMETHOD.xf86miscproto?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XF86MISCPROTO_BUILDLINK3_MK:= ${XF86MISCPROTO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xf86miscproto -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xf86miscproto -.endif +.if !defined(XF86MISCPROTO_BUILDLINK3_MK) +XF86MISCPROTO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxf86miscproto} -BUILDLINK_PACKAGES+= xf86miscproto -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xf86miscproto - -.if ${XF86MISCPROTO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xf86miscproto+= xf86miscproto>=0.9.2 BUILDLINK_PKGSRCDIR.xf86miscproto?= ../../x11/xf86miscproto -.endif # XF86MISCPROTO_BUILDLINK3_MK .include "../../x11/xproto/buildlink3.mk" +.endif # XF86MISCPROTO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xf86miscproto diff --git a/x11/xf86vidmodeproto/buildlink3.mk b/x11/xf86vidmodeproto/buildlink3.mk index a6ad006257b..d05d4895662 100644 --- a/x11/xf86vidmodeproto/buildlink3.mk +++ b/x11/xf86vidmodeproto/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/14 15:01:55 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:53 joerg Exp $ BUILDLINK_DEPMETHOD.xf86vidmodeproto?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XF86VIDMODEPROTO_BUILDLINK3_MK:= ${XF86VIDMODEPROTO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xf86vidmodeproto -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xf86vidmodeproto -.endif +.if !defined(XF86VIDMODEPROTO_BUILDLINK3_MK) +XF86VIDMODEPROTO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxf86vidmodeproto} -BUILDLINK_PACKAGES+= xf86vidmodeproto -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xf86vidmodeproto - -.if ${XF86VIDMODEPROTO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xf86vidmodeproto+= xf86vidmodeproto>=2.2.1 BUILDLINK_PKGSRCDIR.xf86vidmodeproto?= ../../x11/xf86vidmodeproto -.endif # XF86VIDMODEPROTO_BUILDLINK3_MK .include "../../x11/xproto/buildlink3.mk" +.endif # XF86VIDMODEPROTO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xf86vidmodeproto diff --git a/x11/xfce4-clipman-plugin/buildlink3.mk b/x11/xfce4-clipman-plugin/buildlink3.mk index 5a57784c3ed..9fdc575f2e3 100644 --- a/x11/xfce4-clipman-plugin/buildlink3.mk +++ b/x11/xfce4-clipman-plugin/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.15 2007/04/12 09:55:21 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:25:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK:= ${XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-clipman-plugin -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-clipman-plugin -.endif +.if !defined(XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK) +XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-clipman-plugin} -BUILDLINK_PACKAGES+= xfce4-clipman-plugin -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-clipman-plugin - -.if ${XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-clipman-plugin+= xfce4-clipman-plugin>=0.8.0 BUILDLINK_PKGSRCDIR.xfce4-clipman-plugin?= ../../x11/xfce4-clipman-plugin -.endif # XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-clipman-plugin diff --git a/x11/xfce4-desktop/buildlink3.mk b/x11/xfce4-desktop/buildlink3.mk index e1dad667c0f..25ed08b1646 100644 --- a/x11/xfce4-desktop/buildlink3.mk +++ b/x11/xfce4-desktop/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.23 2008/12/18 16:46:29 hira Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2009/03/20 19:25:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_DESKTOP_BUILDLINK3_MK:= ${XFCE4_DESKTOP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-desktop -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-desktop -.endif +.if !defined(XFCE4_DESKTOP_BUILDLINK3_MK) +XFCE4_DESKTOP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-desktop} -BUILDLINK_PACKAGES+= xfce4-desktop -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-desktop - -.if ${XFCE4_DESKTOP_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-desktop+= xfce4-desktop>=4.4.3nb1 BUILDLINK_PKGSRCDIR.xfce4-desktop?= ../../x11/xfce4-desktop -.endif # XFCE4_DESKTOP_BUILDLINK3_MK .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" @@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.xfce4-desktop?= ../../x11/xfce4-desktop .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_DESKTOP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-desktop diff --git a/x11/xfce4-exo/buildlink3.mk b/x11/xfce4-exo/buildlink3.mk index 624b9d63c42..139345502f2 100644 --- a/x11/xfce4-exo/buildlink3.mk +++ b/x11/xfce4-exo/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.3 2008/12/09 10:33:36 ahoka Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_EXO_BUILDLINK3_MK:= ${XFCE4_EXO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-exo -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-exo -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-exo} -BUILDLINK_PACKAGES+= xfce4-exo -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-exo +.if !defined(XFCE4_EXO_BUILDLINK3_MK) +XFCE4_EXO_BUILDLINK3_MK:= -.if ${XFCE4_EXO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-exo+= xfce4-exo>=0.3.4 BUILDLINK_PKGSRCDIR.xfce4-exo?= ../../x11/xfce4-exo -.endif # XFCE4_EXO_BUILDLINK3_MK pkgbase := xfce4-exo .include "../../mk/pkg-build-options.mk" @@ -27,5 +19,6 @@ pkgbase := xfce4-exo .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_EXO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-exo diff --git a/x11/xfce4-eyes-plugin/buildlink3.mk b/x11/xfce4-eyes-plugin/buildlink3.mk index 15afbecc142..ed0db5d33d6 100644 --- a/x11/xfce4-eyes-plugin/buildlink3.mk +++ b/x11/xfce4-eyes-plugin/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/04/27 10:48:06 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_EYES_PLUGIN_BUILDLINK3_MK:= ${XFCE4_EYES_PLUGIN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-eyes-plugin -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-eyes-plugin -.endif +.if !defined(XFCE4_EYES_PLUGIN_BUILDLINK3_MK) +XFCE4_EYES_PLUGIN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-eyes-plugin} -BUILDLINK_PACKAGES+= xfce4-eyes-plugin -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-eyes-plugin - -.if ${XFCE4_EYES_PLUGIN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-eyes-plugin+= xfce4-eyes-plugin>=4.4.0 BUILDLINK_PKGSRCDIR.xfce4-eyes-plugin?= ../../x11/xfce4-eyes-plugin -.endif # XFCE4_EYES_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_EYES_PLUGIN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-eyes-plugin diff --git a/x11/xfce4-gtk2-engine/buildlink3.mk b/x11/xfce4-gtk2-engine/buildlink3.mk index 4dc46e9ea87..73a6570fb54 100644 --- a/x11/xfce4-gtk2-engine/buildlink3.mk +++ b/x11/xfce4-gtk2-engine/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.14 2008/12/18 16:43:28 hira Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_GTK2_ENGINE_BUILDLINK3_MK:= ${XFCE4_GTK2_ENGINE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-gtk2-engine -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-gtk2-engine -.endif +.if !defined(XFCE4_GTK2_ENGINE_BUILDLINK3_MK) +XFCE4_GTK2_ENGINE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-gtk2-engine} -BUILDLINK_PACKAGES+= xfce4-gtk2-engine -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-gtk2-engine - -.if ${XFCE4_GTK2_ENGINE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-gtk2-engine+= xfce4-gtk2-engine>=2.4.3 BUILDLINK_PKGSRCDIR.xfce4-gtk2-engine?= ../../x11/xfce4-gtk2-engine -.endif # XFCE4_GTK2_ENGINE_BUILDLINK3_MK .include "../../x11/gtk2/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_GTK2_ENGINE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-gtk2-engine diff --git a/x11/xfce4-mcs-manager/buildlink3.mk b/x11/xfce4-mcs-manager/buildlink3.mk index ecd8704ad4c..a84b867874c 100644 --- a/x11/xfce4-mcs-manager/buildlink3.mk +++ b/x11/xfce4-mcs-manager/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.21 2008/12/18 16:46:29 hira Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:25:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_MCS_MANAGER_BUILDLINK3_MK:= ${XFCE4_MCS_MANAGER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-mcs-manager -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-mcs-manager -.endif +.if !defined(XFCE4_MCS_MANAGER_BUILDLINK3_MK) +XFCE4_MCS_MANAGER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-mcs-manager} -BUILDLINK_PACKAGES+= xfce4-mcs-manager -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-mcs-manager - -.if ${XFCE4_MCS_MANAGER_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-mcs-manager+= xfce4-mcs-manager>=4.4.3nb1 BUILDLINK_PKGSRCDIR.xfce4-mcs-manager?= ../../x11/xfce4-mcs-manager -.endif # XFCE4_MCS_MANAGER_BUILDLINK3_MK .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/libxfce4gui/buildlink3.mk" .include "../../x11/libxfce4mcs/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_MCS_MANAGER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-mcs-manager diff --git a/x11/xfce4-mcs-plugins/buildlink3.mk b/x11/xfce4-mcs-plugins/buildlink3.mk index 6d43f2aa6b4..427b1d6037f 100644 --- a/x11/xfce4-mcs-plugins/buildlink3.mk +++ b/x11/xfce4-mcs-plugins/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.21 2008/12/18 16:46:29 hira Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:25:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_MCS_PLUGINS_BUILDLINK3_MK:= ${XFCE4_MCS_PLUGINS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-mcs-plugins -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-mcs-plugins -.endif +.if !defined(XFCE4_MCS_PLUGINS_BUILDLINK3_MK) +XFCE4_MCS_PLUGINS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-mcs-plugins} -BUILDLINK_PACKAGES+= xfce4-mcs-plugins -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-mcs-plugins - -.if ${XFCE4_MCS_PLUGINS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-mcs-plugins+= xfce4-mcs-plugins>=4.4.3nb1 BUILDLINK_PKGSRCDIR.xfce4-mcs-plugins?= ../../x11/xfce4-mcs-plugins -.endif # XFCE4_MCS_PLUGINS_BUILDLINK3_MK .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/xfce4-mcs-manager/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_MCS_PLUGINS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-mcs-plugins diff --git a/x11/xfce4-notes-plugin/buildlink3.mk b/x11/xfce4-notes-plugin/buildlink3.mk index 0a07678874f..74220dafe08 100644 --- a/x11/xfce4-notes-plugin/buildlink3.mk +++ b/x11/xfce4-notes-plugin/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.17 2007/12/05 07:50:47 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:25:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_NOTES_PLUGIN_BUILDLINK3_MK:= ${XFCE4_NOTES_PLUGIN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-notes-plugin -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-notes-plugin -.endif +.if !defined(XFCE4_NOTES_PLUGIN_BUILDLINK3_MK) +XFCE4_NOTES_PLUGIN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-notes-plugin} -BUILDLINK_PACKAGES+= xfce4-notes-plugin -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-notes-plugin - -.if ${XFCE4_NOTES_PLUGIN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-notes-plugin+= xfce4-notes-plugin>=1.6.0 BUILDLINK_PKGSRCDIR.xfce4-notes-plugin?= ../../x11/xfce4-notes-plugin -.endif # XFCE4_NOTES_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_NOTES_PLUGIN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-notes-plugin diff --git a/x11/xfce4-panel/buildlink3.mk b/x11/xfce4-panel/buildlink3.mk index 6e9e50c0ceb..8ddfe41ab56 100644 --- a/x11/xfce4-panel/buildlink3.mk +++ b/x11/xfce4-panel/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.22 2008/12/18 16:46:29 hira Exp $ +# $NetBSD: buildlink3.mk,v 1.23 2009/03/20 19:25:54 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_PANEL_BUILDLINK3_MK:= ${XFCE4_PANEL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-panel -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-panel -.endif +.if !defined(XFCE4_PANEL_BUILDLINK3_MK) +XFCE4_PANEL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-panel} -BUILDLINK_PACKAGES+= xfce4-panel -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-panel - -.if ${XFCE4_PANEL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-panel+= xfce4-panel>=4.4.3nb1 BUILDLINK_PKGSRCDIR.xfce4-panel?= ../../x11/xfce4-panel -.endif # XFCE4_PANEL_BUILDLINK3_MK .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" @@ -22,5 +14,6 @@ BUILDLINK_PKGSRCDIR.xfce4-panel?= ../../x11/xfce4-panel .include "../../x11/startup-notification/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_PANEL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-panel diff --git a/x11/xfce4-places-plugin/buildlink3.mk b/x11/xfce4-places-plugin/buildlink3.mk index 48f20d41738..67e55a41891 100644 --- a/x11/xfce4-places-plugin/buildlink3.mk +++ b/x11/xfce4-places-plugin/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.2 2007/12/05 07:51:18 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:54 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_PLACES_PLUGIN_BUILDLINK3_MK:= ${XFCE4_PLACES_PLUGIN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-places-plugin -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-places-plugin -.endif +.if !defined(XFCE4_PLACES_PLUGIN_BUILDLINK3_MK) +XFCE4_PLACES_PLUGIN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-places-plugin} -BUILDLINK_PACKAGES+= xfce4-places-plugin -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-places-plugin - -.if ${XFCE4_PLACES_PLUGIN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-places-plugin+= xfce4-places-plugin>=1.0.0 BUILDLINK_PKGSRCDIR.xfce4-places-plugin?= ../../x11/xfce4-places-plugin -.endif # XFCE4_PLACES_PLUGIN_BUILDLINK3_MK .include "../../sysutils/xfce4-thunar/buildlink3.mk" .include "../../x11/xfce4-panel/buildlink3.mk" @@ -22,5 +14,6 @@ BUILDLINK_PKGSRCDIR.xfce4-places-plugin?= ../../x11/xfce4-places-plugin .include "../../x11/libSM/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_PLACES_PLUGIN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-places-plugin diff --git a/x11/xfce4-screenshooter-plugin/buildlink3.mk b/x11/xfce4-screenshooter-plugin/buildlink3.mk index 485b0a908eb..5fbbe1f362a 100644 --- a/x11/xfce4-screenshooter-plugin/buildlink3.mk +++ b/x11/xfce4-screenshooter-plugin/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/04/27 10:48:06 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:54 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_SCREENSHOOTER_PLUGIN_BUILDLINK3_MK:= ${XFCE4_SCREENSHOOTER_PLUGIN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-screenshooter-plugin -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-screenshooter-plugin -.endif +.if !defined(XFCE4_SCREENSHOOTER_PLUGIN_BUILDLINK3_MK) +XFCE4_SCREENSHOOTER_PLUGIN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-screenshooter-plugin} -BUILDLINK_PACKAGES+= xfce4-screenshooter-plugin -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-screenshooter-plugin - -.if ${XFCE4_SCREENSHOOTER_PLUGIN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-screenshooter-plugin+= xfce4-screenshooter-plugin>=1.0.0 BUILDLINK_PKGSRCDIR.xfce4-screenshooter-plugin?= ../../x11/xfce4-screenshooter-plugin -.endif # XFCE4_SCREENSHOOTER_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_SCREENSHOOTER_PLUGIN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-screenshooter-plugin diff --git a/x11/xfce4-session/buildlink3.mk b/x11/xfce4-session/buildlink3.mk index 3e25914a363..36c20f9d023 100644 --- a/x11/xfce4-session/buildlink3.mk +++ b/x11/xfce4-session/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.18 2008/12/19 23:58:18 hira Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2009/03/20 19:25:54 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_SESSION_BUILDLINK3_MK:= ${XFCE4_SESSION_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-session -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-session -.endif +.if !defined(XFCE4_SESSION_BUILDLINK3_MK) +XFCE4_SESSION_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-session} -BUILDLINK_PACKAGES+= xfce4-session -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-session - -.if ${XFCE4_SESSION_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-session+= xfce4-session>=4.4.3nb2 BUILDLINK_PKGSRCDIR.xfce4-session?= ../../x11/xfce4-session -.endif # XFCE4_SESSION_BUILDLINK3_MK .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_SESSION_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-session diff --git a/x11/xfce4-terminal/buildlink3.mk b/x11/xfce4-terminal/buildlink3.mk index 503745a4b89..55d532d5054 100644 --- a/x11/xfce4-terminal/buildlink3.mk +++ b/x11/xfce4-terminal/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.4 2008/12/18 16:46:30 hira Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:54 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_TERMINAL_BUILDLINK3_MK:= ${XFCE4_TERMINAL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-terminal -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-terminal -.endif +.if !defined(XFCE4_TERMINAL_BUILDLINK3_MK) +XFCE4_TERMINAL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-terminal} -BUILDLINK_PACKAGES+= xfce4-terminal -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-terminal - -.if ${XFCE4_TERMINAL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-terminal+= xfce4-terminal>=0.2.8.3nb1 BUILDLINK_PKGSRCDIR.xfce4-terminal?= ../../x11/xfce4-terminal -.endif # XFCE4_TERMINAL_BUILDLINK3_MK .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/xfce4-exo/buildlink3.mk" .include "../../x11/vte/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_TERMINAL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-terminal diff --git a/x11/xfce4-utils/buildlink3.mk b/x11/xfce4-utils/buildlink3.mk index 48c1054af3d..deb39b06c9e 100644 --- a/x11/xfce4-utils/buildlink3.mk +++ b/x11/xfce4-utils/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.25 2008/12/18 16:46:30 hira Exp $ +# $NetBSD: buildlink3.mk,v 1.26 2009/03/20 19:25:54 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_UTILS_BUILDLINK3_MK:= ${XFCE4_UTILS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-utils -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-utils -.endif +.if !defined(XFCE4_UTILS_BUILDLINK3_MK) +XFCE4_UTILS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-utils} -BUILDLINK_PACKAGES+= xfce4-utils -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-utils - -.if ${XFCE4_UTILS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-utils+= xfce4-utils>=4.4.3nb1 BUILDLINK_PKGSRCDIR.xfce4-utils?= ../../x11/xfce4-utils -.endif # XFCE4_UTILS_BUILDLINK3_MK .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_UTILS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-utils diff --git a/x11/xforms/buildlink3.mk b/x11/xforms/buildlink3.mk index df263f2a44e..b76de4cc6a1 100644 --- a/x11/xforms/buildlink3.mk +++ b/x11/xforms/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/12/15 20:33:05 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:54 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFORMS_BUILDLINK3_MK:= ${XFORMS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xforms -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= xforms -.endif +.if !defined(XFORMS_BUILDLINK3_MK) +XFORMS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxforms} -BUILDLINK_PACKAGES+= xforms -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xforms - -.if !empty(XFORMS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.xforms+= xforms>=1.0nb2 BUILDLINK_ABI_DEPENDS.xforms+= xforms>=1.0nb5 BUILDLINK_PKGSRCDIR.xforms?= ../../x11/xforms -.endif # XFORMS_BUILDLINK3_MK .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.endif # XFORMS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xforms diff --git a/x11/xineramaproto/buildlink3.mk b/x11/xineramaproto/buildlink3.mk index 810f4830073..cc3e46073aa 100644 --- a/x11/xineramaproto/buildlink3.mk +++ b/x11/xineramaproto/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 20:07:33 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:54 joerg Exp $ BUILDLINK_DEPMETHOD.xineramaproto?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XINERAMAPROTO_BUILDLINK3_MK:= ${XINERAMAPROTO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xineramaproto -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xineramaproto -.endif +.if !defined(XINERAMAPROTO_BUILDLINK3_MK) +XINERAMAPROTO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxineramaproto} -BUILDLINK_PACKAGES+= xineramaproto -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xineramaproto - -.if ${XINERAMAPROTO_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xineramaproto+= xineramaproto>=1.1.1 BUILDLINK_PKGSRCDIR.xineramaproto?= ../../x11/xineramaproto -.endif # XINERAMAPROTO_BUILDLINK3_MK .include "../../x11/libX11/buildlink3.mk" +.endif # XINERAMAPROTO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xineramaproto diff --git a/x11/xlt/buildlink3.mk b/x11/xlt/buildlink3.mk index 2e316a0d277..e18edef1ffe 100644 --- a/x11/xlt/buildlink3.mk +++ b/x11/xlt/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/07/16 07:40:14 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:54 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XLT_BUILDLINK3_MK:= ${XLT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xlt -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xlt -.endif +.if !defined(XLT_BUILDLINK3_MK) +XLT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxlt} -BUILDLINK_PACKAGES+= xlt -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xlt - -.if ${XLT_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xlt+= xlt>=13.0.13 BUILDLINK_PKGSRCDIR.xlt?= ../../x11/xlt -.endif # XLT_BUILDLINK3_MK .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" +.endif # XLT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xlt diff --git a/x11/xosd/buildlink3.mk b/x11/xosd/buildlink3.mk index 03148485848..28ca9a05126 100644 --- a/x11/xosd/buildlink3.mk +++ b/x11/xosd/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:17 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:54 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XOSD_BUILDLINK3_MK:= ${XOSD_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xosd -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= xosd -.endif +.if !defined(XOSD_BUILDLINK3_MK) +XOSD_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxosd} -BUILDLINK_PACKAGES+= xosd -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xosd - -.if !empty(XOSD_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.xosd+= xosd>=2.2.12 BUILDLINK_ABI_DEPENDS.xosd+= xosd>=2.2.12nb2 BUILDLINK_PKGSRCDIR.xosd?= ../../x11/xosd -.endif # XOSD_BUILDLINK3_MK +.endif # XOSD_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xosd diff --git a/x11/xproto/buildlink3.mk b/x11/xproto/buildlink3.mk index f88a51bd4a4..3daa76dbc36 100644 --- a/x11/xproto/buildlink3.mk +++ b/x11/xproto/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.9 2008/02/14 20:01:44 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:55 joerg Exp $ # # This Makefile fragment is included by packages that use xproto. # .include "../../mk/bsd.fast.prefs.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XPROTO_BUILDLINK3_MK:= ${XPROTO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xproto -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= xproto -.endif +.if !defined(XPROTO_BUILDLINK3_MK) +XPROTO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxproto} -BUILDLINK_PACKAGES+= xproto -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xproto - -.if !empty(XPROTO_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.xproto?= xproto>=7.0.9 BUILDLINK_PKGSRCDIR.xproto?= ../../x11/xproto BUILDLINK_DEPMETHOD.xproto?= build .endif # XPROTO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xproto diff --git a/x11/xproxymanagementprotocol/buildlink3.mk b/x11/xproxymanagementprotocol/buildlink3.mk index 4aaa3f7a348..3c3d94ae37e 100644 --- a/x11/xproxymanagementprotocol/buildlink3.mk +++ b/x11/xproxymanagementprotocol/buildlink3.mk @@ -1,21 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/04/10 13:47:08 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:55 joerg Exp $ BUILDLINK_DEPMETHOD.xproxymanagementprotocol?= build -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XPROXYMANAGEMENTPROTOCOL_BUILDLINK3_MK:= ${XPROXYMANAGEMENTPROTOCOL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xproxymanagementprotocol -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xproxymanagementprotocol -.endif +.if !defined(XPROXYMANAGEMENTPROTOCOL_BUILDLINK3_MK) +XPROXYMANAGEMENTPROTOCOL_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxproxymanagementprotocol} -BUILDLINK_PACKAGES+= xproxymanagementprotocol -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xproxymanagementprotocol - -.if ${XPROXYMANAGEMENTPROTOCOL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xproxymanagementprotocol+= xproxymanagementprotocol>=1.0.2 BUILDLINK_PKGSRCDIR.xproxymanagementprotocol?= ../../x11/xproxymanagementprotocol -.endif # XPROXYMANAGEMENTPROTOCOL_BUILDLINK3_MK +.endif # XPROXYMANAGEMENTPROTOCOL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xproxymanagementprotocol diff --git a/x11/xscreensaver/buildlink3.mk b/x11/xscreensaver/buildlink3.mk index f89a4bd7ff7..2840231ef05 100644 --- a/x11/xscreensaver/buildlink3.mk +++ b/x11/xscreensaver/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:17 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:55 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XSCREENSAVER_BUILDLINK3_MK:= ${XSCREENSAVER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xscreensaver -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= xscreensaver -.endif +.if !defined(XSCREENSAVER_BUILDLINK3_MK) +XSCREENSAVER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxscreensaver} -BUILDLINK_PACKAGES+= xscreensaver -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xscreensaver - -.if !empty(XSCREENSAVER_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.xscreensaver+= xscreensaver>=4.14 BUILDLINK_ABI_DEPENDS.xscreensaver?= xscreensaver>=4.22nb3 BUILDLINK_PKGSRCDIR.xscreensaver?= ../../x11/xscreensaver -.endif # XSCREENSAVER_BUILDLINK3_MK .include "../../textproc/libxml2/buildlink3.mk" +.endif # XSCREENSAVER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xscreensaver diff --git a/x11/xtrans/buildlink3.mk b/x11/xtrans/buildlink3.mk index d3a2234a747..2297f84d626 100644 --- a/x11/xtrans/buildlink3.mk +++ b/x11/xtrans/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/03/05 21:03:35 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:55 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XTRANS_BUILDLINK3_MK:= ${XTRANS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xtrans -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xtrans -.endif +.if !defined(XTRANS_BUILDLINK3_MK) +XTRANS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxtrans} -BUILDLINK_PACKAGES+= xtrans -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xtrans - -.if ${XTRANS_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xtrans?= xtrans>=1.0.3 BUILDLINK_PKGSRCDIR.xtrans?= ../../x11/xtrans BUILDLINK_DEPMETHOD.xtrans?= build -.endif # XTRANS_BUILDLINK3_MK +.endif # XTRANS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xtrans diff --git a/x11/xview-lib/buildlink3.mk b/x11/xview-lib/buildlink3.mk index 5af97e6b220..79a300645a5 100644 --- a/x11/xview-lib/buildlink3.mk +++ b/x11/xview-lib/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.8 2008/08/30 20:01:28 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:55 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XVIEW_LIB_BUILDLINK3_MK:= ${XVIEW_LIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xview-lib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= xview-lib -.endif +.if !defined(XVIEW_LIB_BUILDLINK3_MK) +XVIEW_LIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxview-lib} -BUILDLINK_PACKAGES+= xview-lib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xview-lib - -.if !empty(XVIEW_LIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.xview-lib+= xview-lib>=3.2.1 BUILDLINK_ABI_DEPENDS.xview-lib?= xview-lib>=3.2.1nb7 BUILDLINK_PKGSRCDIR.xview-lib?= ../../x11/xview-lib -.endif # XVIEW_LIB_BUILDLINK3_MK .include "../../x11/libX11/buildlink3.mk" +.endif # XVIEW_LIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xview-lib |