diff options
272 files changed, 785 insertions, 963 deletions
diff --git a/archivers/libcomprex/buildlink3.mk b/archivers/libcomprex/buildlink3.mk index 28e35cdeb99..fdfe3ef91c4 100644 --- a/archivers/libcomprex/buildlink3.mk +++ b/archivers/libcomprex/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:06 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:08 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBCOMPREX_BUILDLINK3_MK:= ${LIBCOMPREX_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= libcomprex .if !empty(LIBCOMPREX_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libcomprex+= libcomprex>=0.3.2 BUILDLINK_PKGSRCDIR.libcomprex?= ../../archivers/libcomprex +.endif # LIBCOMPREX_BUILDLINK3_MK .include "../../www/curl/buildlink3.mk" -.endif # LIBCOMPREX_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/archivers/zziplib/buildlink3.mk b/archivers/zziplib/buildlink3.mk index fcb533f8fe3..69fb3564a63 100644 --- a/archivers/zziplib/buildlink3.mk +++ b/archivers/zziplib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/11 06:45:55 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:08 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ZZIPLIB_BUILDLINK3_MK:= ${ZZIPLIB_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= zziplib .if !empty(ZZIPLIB_BUILDLINK3_MK:M+) BUILDLINK_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/+$//} diff --git a/audio/SDL_mixer/buildlink3.mk b/audio/SDL_mixer/buildlink3.mk index b18af6d5313..6b7920d0c0b 100644 --- a/audio/SDL_mixer/buildlink3.mk +++ b/audio/SDL_mixer/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:06 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2004/03/18 09:12:08 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SDL_MIXER_BUILDLINK3_MK:= ${SDL_MIXER_BUILDLINK3_MK}+ @@ -14,9 +14,8 @@ BUILDLINK_PACKAGES+= SDL_mixer BUILDLINK_DEPENDS.SDL_mixer+= SDL_mixer>=1.2.5nb2 BUILDLINK_PKGSRCDIR.SDL_mixer?= ../../audio/SDL_mixer BUILDLINK_INCDIRS.SDL_mixer?= include/SDL +.endif # SDL_MIXER_BUILDLINK3_MK .include "../../devel/SDL/buildlink3.mk" -.endif # SDL_MIXER_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/audio/SDL_sound/buildlink3.mk b/audio/SDL_sound/buildlink3.mk index ababb099b28..a625fc85355 100644 --- a/audio/SDL_sound/buildlink3.mk +++ b/audio/SDL_sound/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/07 06:58:39 snj Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:08 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SDL_SOUND_BUILDLINK3_MK:= ${SDL_SOUND_BUILDLINK3_MK}+ @@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+= SDL_sound .if !empty(SDL_SOUND_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.SDL_sound+= SDL_sound>=1.0.1 BUILDLINK_PKGSRCDIR.SDL_sound?= ../../audio/SDL_sound +.endif # SDL_SOUND_BUILDLINK3_MK .include "../../audio/libmikmod/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" .include "../../devel/smpeg/buildlink3.mk" -.endif # SDL_SOUND_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/audio/arts/buildlink3.mk b/audio/arts/buildlink3.mk index 3f059f61836..c814e5f8dc1 100644 --- a/audio/arts/buildlink3.mk +++ b/audio/arts/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2004/03/05 19:25:06 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 09:12:08 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ARTS_BUILDLINK3_MK:= ${ARTS_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= arts .if !empty(ARTS_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.arts+= arts>=1.1.4nb1 BUILDLINK_PKGSRCDIR.arts?= ../../audio/arts +.endif # ARTS_BUILDLINK3_MK .include "../../audio/esound/buildlink3.mk" .include "../../audio/libaudiofile/buildlink3.mk" @@ -22,6 +23,4 @@ BUILDLINK_PKGSRCDIR.arts?= ../../audio/arts .include "../../devel/glib2/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" -.endif # ARTS_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/audio/esound/buildlink3.mk b/audio/esound/buildlink3.mk index 98e87b91a9d..808b0be08ba 100644 --- a/audio/esound/buildlink3.mk +++ b/audio/esound/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:06 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:08 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ESOUND_BUILDLINK3_MK:= ${ESOUND_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= esound .if !empty(ESOUND_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.esound+= esound>=0.2.18 BUILDLINK_PKGSRCDIR.esound?= ../../audio/esound +.endif # ESOUND_BUILDLINK3_MK .include "../../audio/libaudiofile/buildlink3.mk" -.endif # ESOUND_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/audio/flac/buildlink3.mk b/audio/flac/buildlink3.mk index fefacf24551..762d2e2c9a1 100644 --- a/audio/flac/buildlink3.mk +++ b/audio/flac/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:08 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ FLAC_BUILDLINK3_MK:= ${FLAC_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= flac .if !empty(FLAC_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.flac+= flac>=1.1.0nb1 BUILDLINK_PKGSRCDIR.flac?= ../../audio/flac +.endif # FLAC_BUILDLINK3_MK .include "../../audio/libogg/buildlink3.mk" -.endif # FLAC_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/audio/gnome-speech/buildlink3.mk b/audio/gnome-speech/buildlink3.mk index 125b95fe0d8..bbf69e17fa1 100644 --- a/audio/gnome-speech/buildlink3.mk +++ b/audio/gnome-speech/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:08 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GNOME_SPEECH_BUILDLINK3_MK:= ${GNOME_SPEECH_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= gnome-speech .if !empty(GNOME_SPEECH_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gnome-speech+= gnome-speech>=0.2.7 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/+$//} diff --git a/audio/id3lib/buildlink3.mk b/audio/id3lib/buildlink3.mk index 9de98ef63d1..337eb2d0b0d 100644 --- a/audio/id3lib/buildlink3.mk +++ b/audio/id3lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:08 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ID3LIB_BUILDLINK3_MK:= ${ID3LIB_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= id3lib .if !empty(ID3LIB_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.id3lib+= id3lib>=3.8.3 BUILDLINK_PKGSRCDIR.id3lib?= ../../audio/id3lib +.endif # ID3LIB_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" -.endif # ID3LIB_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/audio/libcddb/buildlink3.mk b/audio/libcddb/buildlink3.mk index 4f63722908c..80c2d447713 100644 --- a/audio/libcddb/buildlink3.mk +++ b/audio/libcddb/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:08 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBCDDB_BUILDLINK3_MK:= ${LIBCDDB_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= libcddb .if !empty(LIBCDDB_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libcddb+= libcddb>=0.9.4 BUILDLINK_PKGSRCDIR.libcddb?= ../../audio/libcddb +.endif # LIBCDDB_BUILDLINK3_MK .include "../../misc/libcdio/buildlink3.mk" -.endif # LIBCDDB_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/audio/libid3tag/buildlink3.mk b/audio/libid3tag/buildlink3.mk index ac0d30632d5..2e903e0cb97 100644 --- a/audio/libid3tag/buildlink3.mk +++ b/audio/libid3tag/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:08 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBID3TAG_BUILDLINK3_MK:= ${LIBID3TAG_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= libid3tag .if !empty(LIBID3TAG_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libid3tag+= libid3tag>=0.15.0b BUILDLINK_PKGSRCDIR.libid3tag?= ../../audio/libid3tag +.endif # LIBID3TAG_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" -.endif # LIBID3TAG_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/audio/libmikmod/buildlink3.mk b/audio/libmikmod/buildlink3.mk index 68fd31fb511..24cba5871c5 100644 --- a/audio/libmikmod/buildlink3.mk +++ b/audio/libmikmod/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:08 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBMIKMOD_BUILDLINK3_MK:= ${LIBMIKMOD_BUILDLINK3_MK}+ @@ -15,11 +15,10 @@ BUILDLINK_PACKAGES+= libmikmod .if !empty(LIBMIKMOD_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libmikmod+= libmikmod>=3.1.9 BUILDLINK_PKGSRCDIR.libmikmod?= ../../audio/libmikmod +.endif # LIBMIKMOD_BUILDLINK3_MK .if defined(USE_ESOUND) && !empty(USE_ESOUND:M[Yy][Ee][Ss]) . include "../../audio/esound/buildlink3.mk" .endif -.endif # LIBMIKMOD_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/audio/libsamplerate/buildlink3.mk b/audio/libsamplerate/buildlink3.mk index cede6cf55e4..e91ed2ba4f3 100644 --- a/audio/libsamplerate/buildlink3.mk +++ b/audio/libsamplerate/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:08 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBSAMPLERATE_BUILDLINK3_MK:= ${LIBSAMPLERATE_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= libsamplerate .if !empty(LIBSAMPLERATE_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libsamplerate+= libsamplerate>=0.0.13nb1 BUILDLINK_PKGSRCDIR.libsamplerate?= ../../audio/libsamplerate +.endif # LIBSAMPLERATE_BUILDLINK3_MK .include "../../audio/libsndfile/buildlink3.mk" -.endif # LIBSAMPLERATE_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/audio/libshout/buildlink3.mk b/audio/libshout/buildlink3.mk index bb0e7293c3e..1fd4d51c3aa 100644 --- a/audio/libshout/buildlink3.mk +++ b/audio/libshout/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:08 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:08 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBSHOUT_BUILDLINK3_MK:= ${LIBSHOUT_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= libshout .if !empty(LIBSHOUT_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libshout+= libshout>=2.0 BUILDLINK_PKGSRCDIR.libshout?= ../../audio/libshout +.endif # LIBSHOUT_BUILDLINK3_MK .include "../../audio/libvorbis/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" -.endif # LIBSHOUT_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/audio/libvorbis/buildlink3.mk b/audio/libvorbis/buildlink3.mk index ae8f1f0110a..b5b345c03ef 100644 --- a/audio/libvorbis/buildlink3.mk +++ b/audio/libvorbis/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:08 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:08 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBVORBIS_BUILDLINK3_MK:= ${LIBVORBIS_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= libvorbis .if !empty(LIBVORBIS_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libvorbis+= libvorbis>=1.0.1 BUILDLINK_PKGSRCDIR.libvorbis?= ../../audio/libvorbis +.endif # LIBVORBIS_BUILDLINK3_MK .include "../../audio/libogg/buildlink3.mk" -.endif # LIBVORBIS_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/audio/musicbrainz/buildlink3.mk b/audio/musicbrainz/buildlink3.mk index 32960ab1666..87fe870929d 100644 --- a/audio/musicbrainz/buildlink3.mk +++ b/audio/musicbrainz/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:08 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:08 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ MUSICBRAINZ_BUILDLINK3_MK:= ${MUSICBRAINZ_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= musicbrainz .if !empty(MUSICBRAINZ_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.musicbrainz+= musicbrainz>=2.0.2 BUILDLINK_PKGSRCDIR.musicbrainz?= ../../audio/musicbrainz +.endif # MUSICBRAINZ_BUILDLINK3_MK .include "../../textproc/expat/buildlink3.mk" -.endif # MUSICBRAINZ_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/audio/py-ogg/buildlink3.mk b/audio/py-ogg/buildlink3.mk index 2e4cf004c25..e92e95c4747 100644 --- a/audio/py-ogg/buildlink3.mk +++ b/audio/py-ogg/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2004/03/16 18:23:26 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:08 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PY_OGG_BUILDLINK3_MK:= ${PY_OGG_BUILDLINK3_MK}+ @@ -16,9 +16,8 @@ BUILDLINK_PACKAGES+= pyogg BUILDLINK_PKGBASE.pyogg?= ${PYPKGPREFIX}-ogg BUILDLINK_DEPENDS.pyogg+= ${PYPKGPREFIX}-ogg>=1.3 BUILDLINK_PKGSRCDIR.pyogg?= ../../audio/py-ogg +.endif # PY_OGG_BUILDLINK3_MK .include "../../audio/libogg/buildlink3.mk" -.endif # PY_OGG_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/audio/rplay/buildlink3.mk b/audio/rplay/buildlink3.mk index 7266eda4026..487283b645c 100644 --- a/audio/rplay/buildlink3.mk +++ b/audio/rplay/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:08 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:08 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ RPLAY_BUILDLINK3_MK:= ${RPLAY_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= rplay .if !empty(RPLAY_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.rplay+= rplay>=3.3.2nb1 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/+$//} diff --git a/audio/speex/buildlink3.mk b/audio/speex/buildlink3.mk index 06af32cd1bf..0e8597f5ed1 100644 --- a/audio/speex/buildlink3.mk +++ b/audio/speex/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:08 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:08 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SPEEX_BUILDLINK3_MK:= ${SPEEX_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= speex .if !empty(SPEEX_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.speex+= speex>=1.0.2nb1 BUILDLINK_PKGSRCDIR.speex?= ../../audio/speex +.endif # SPEEX_BUILDLINK3_MK .include "../../audio/libogg/buildlink3.mk" -.endif # SPEEX_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/audio/sweep/buildlink3.mk b/audio/sweep/buildlink3.mk index 00c65f54464..8d784c58692 100644 --- a/audio/sweep/buildlink3.mk +++ b/audio/sweep/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:08 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:08 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SWEEP_BUILDLINK3_MK:= ${SWEEP_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= sweep .if !empty(SWEEP_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.sweep+= sweep>=0.8.2nb6 BUILDLINK_PKGSRCDIR.sweep?= ../../audio/sweep +.endif # SWEEP_BUILDLINK3_MK .include "../../audio/libmad/buildlink3.mk" .include "../../audio/libsamplerate/buildlink3.mk" @@ -24,6 +25,4 @@ BUILDLINK_PKGSRCDIR.sweep?= ../../audio/sweep .include "../../devel/gettext-lib/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" -.endif # SWEEP_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/audio/wsoundserver/buildlink3.mk b/audio/wsoundserver/buildlink3.mk index b2e76eaad54..64a80d9fcae 100644 --- a/audio/wsoundserver/buildlink3.mk +++ b/audio/wsoundserver/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/07 03:41:45 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:08 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ WSOUNDSERVER_BUILDLINK3_MK:= ${WSOUNDSERVER_BUILDLINK3_MK}+ @@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+= wsoundserver .if !empty(WSOUNDSERVER_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.wsoundserver+= wsoundserver>=0.4.0nb4 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/+$//} diff --git a/audio/xfce4-mixer/buildlink3.mk b/audio/xfce4-mixer/buildlink3.mk index 752135ff61e..0341a84bac6 100644 --- a/audio/xfce4-mixer/buildlink3.mk +++ b/audio/xfce4-mixer/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:08 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_MIXER_BUILDLINK3_MK:= ${XFCE4_MIXER_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= xfce4-mixer .if !empty(XFCE4_MIXER_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xfce4-mixer+= xfce4-mixer>=4.0.4nb1 BUILDLINK_PKGSRCDIR.xfce4-mixer?= ../../audio/xfce4-mixer +.endif # XFCE4_MIXER_BUILDLINK3_MK .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_MIXER_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/audio/xfce4-xmms-plugin/buildlink3.mk b/audio/xfce4-xmms-plugin/buildlink3.mk index f7c53657df8..d9f0b923c1c 100644 --- a/audio/xfce4-xmms-plugin/buildlink3.mk +++ b/audio/xfce4-xmms-plugin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:59:31 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:08 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_XMMS_PLUGIN_BUILDLINK3_MK:= ${XFCE4_XMMS_PLUGIN_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= xfce4-xmms-plugin .if !empty(XFCE4_XMMS_PLUGIN_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xfce4-xmms-plugin+= xfce4-xmms-plugin>=0.1.1nb4 BUILDLINK_PKGSRCDIR.xfce4-xmms-plugin?= ../../audio/xfce4-xmms-plugin +.endif # XFCE4_XMMS_PLUGIN_BUILDLINK3_MK .include "../../audio/xmms/buildlink3.mk" .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_XMMS_PLUGIN_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/audio/xmms-meta-input/buildlink3.mk b/audio/xmms-meta-input/buildlink3.mk index 5affb30e179..310b563f532 100644 --- a/audio/xmms-meta-input/buildlink3.mk +++ b/audio/xmms-meta-input/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/12 02:55:49 snj Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:08 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XMMS_META_INPUT_BUILDLINK3_MK:= ${XMMS_META_INPUT_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= xmms-meta-input .if !empty(XMMS_META_INPUT_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xmms-meta-input+= xmms-meta-input>=0.4 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/+$//} diff --git a/audio/xmms/buildlink3.mk b/audio/xmms/buildlink3.mk index d966c7626a4..e9184b9bf5b 100644 --- a/audio/xmms/buildlink3.mk +++ b/audio/xmms/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:08 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XMMS_BUILDLINK3_MK:= ${XMMS_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= xmms .if !empty(XMMS_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xmms+= xmms>=1.2.7nb10 BUILDLINK_PKGSRCDIR.xmms?= ../../audio/xmms +.endif # XMMS_BUILDLINK3_MK PTHREAD_OPTS+= require @@ -25,6 +26,4 @@ PTHREAD_OPTS+= require .include "../../mk/pthread.buildlink3.mk" -.endif # XMMS_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/cad/libgeda/buildlink3.mk b/cad/libgeda/buildlink3.mk index 243b8bfc34d..091f67ab3cb 100644 --- a/cad/libgeda/buildlink3.mk +++ b/cad/libgeda/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:08 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGEDA_BUILDLINK3_MK:= ${LIBGEDA_BUILDLINK3_MK}+ @@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+= libgeda .if !empty(LIBGEDA_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libgeda+= libgeda-20040111{,nb[0-9]*} BUILDLINK_PKGSRCDIR.libgeda?= ../../cad/libgeda +.endif # LIBGEDA_BUILDLINK3_MK .include "../../devel/libstroke/buildlink3.mk" .include "../../graphics/libgdgeda/buildlink3.mk" .include "../../lang/guile/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.endif # LIBGEDA_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/chat/ekg/buildlink3.mk b/chat/ekg/buildlink3.mk index f83769314da..8418065b766 100644 --- a/chat/ekg/buildlink3.mk +++ b/chat/ekg/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:08 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ EKG_BUILDLINK3_MK:= ${EKG_BUILDLINK3_MK}+ @@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+= ekg .if !empty(EKG_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.ekg+= ekg>=1.1 BUILDLINK_PKGSRCDIR.ekg?= ../../chat/ekg +.endif # EKG_BUILDLINK3_MK .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" -.endif # EKG_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/chat/jabberd/buildlink3.mk b/chat/jabberd/buildlink3.mk index e2f4567b73a..8ae72a01805 100644 --- a/chat/jabberd/buildlink3.mk +++ b/chat/jabberd/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:08 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ JABBERD_BUILDLINK3_MK:= ${JABBERD_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= jabberd .if !empty(JABBERD_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.jabberd+= jabberd>=1.4.2 BUILDLINK_PKGSRCDIR.jabberd?= ../../chat/jabberd +.endif # JABBERD_BUILDLINK3_MK .include "../../security/openssl/buildlink3.mk" -.endif # JABBERD_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/chat/loudmouth/buildlink3.mk b/chat/loudmouth/buildlink3.mk index 5dfdd1da418..e56d740e941 100644 --- a/chat/loudmouth/buildlink3.mk +++ b/chat/loudmouth/buildlink3.mk @@ -1,10 +1,8 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/07 22:45:44 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LOUDMOUTH_BUILDLINK3_MK:= ${LOUDMOUTH_BUILDLINK3_MK}+ -.include "../../mk/bsd.prefs.mk" - .if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= loudmouth .endif @@ -15,11 +13,10 @@ BUILDLINK_PACKAGES+= loudmouth .if !empty(LOUDMOUTH_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.loudmouth+= loudmouth>=0.15.1nb3 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/+$//} diff --git a/comms/jpilot/buildlink3.mk b/comms/jpilot/buildlink3.mk index cacde221d46..6badfc7a827 100644 --- a/comms/jpilot/buildlink3.mk +++ b/comms/jpilot/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ JPILOT_BUILDLINK3_MK:= ${JPILOT_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= jpilot .if !empty(JPILOT_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.jpilot+= jpilot>=0.99.5nb4 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/+$//} diff --git a/comms/pilot-link-libs/buildlink3.mk b/comms/pilot-link-libs/buildlink3.mk index 74119fed909..118e0d79bb7 100644 --- a/comms/pilot-link-libs/buildlink3.mk +++ b/comms/pilot-link-libs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PILOT_LINK_LIBS_BUILDLINK3_MK:= ${PILOT_LINK_LIBS_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= pilot-link-libs .if !empty(PILOT_LINK_LIBS_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.pilot-link-libs+= pilot-link-libs>=0.11.7nb1 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/+$//} diff --git a/converters/wv/buildlink3.mk b/converters/wv/buildlink3.mk index fac1628f6f0..c3904e20818 100644 --- a/converters/wv/buildlink3.mk +++ b/converters/wv/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ WV_BUILDLINK3_MK:= ${WV_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= wv .if !empty(WV_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.wv+= wv>=1.0.0 BUILDLINK_PKGSRCDIR.wv?= ../../converters/wv +.endif # WV_BUILDLINK3_MK .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -22,6 +23,4 @@ BUILDLINK_PKGSRCDIR.wv?= ../../converters/wv .include "../../graphics/png/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" -.endif # WV_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/databases/db/buildlink3.mk b/databases/db/buildlink3.mk index d2512a82cc8..7b76c35ce95 100644 --- a/databases/db/buildlink3.mk +++ b/databases/db/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2004/03/16 18:23:27 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ DB_BUILDLINK3_MK:= ${DB_BUILDLINK3_MK}+ @@ -16,12 +16,10 @@ BUILDLINK_PACKAGES+= db2 BUILDLINK_PKGBASE.db2?= db BUILDLINK_DEPENDS.db2+= db>=2.7.3 BUILDLINK_PKGSRCDIR.db2?= ../../databases/db - -.if defined(USE_DB185) -BUILDLINK_INCDIRS.db2?= include/db2 -BUILDLINK_TRANSFORM+= l:db:db2 -.endif - +. if defined(USE_DB185) +BUILDLINK_INCDIRS.db2?= include/db2 +BUILDLINK_TRANSFORM+= l:db:db2 +. endif .endif # DB_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/databases/db3/buildlink3.mk b/databases/db3/buildlink3.mk index 69bd9f16bff..0ddccdba878 100644 --- a/databases/db3/buildlink3.mk +++ b/databases/db3/buildlink3.mk @@ -1,8 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/03/10 18:06:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ DB3_BUILDLINK3_MK:= ${DB3_BUILDLINK3_MK}+ +.include "../../mk/bsd.prefs.mk" + .if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= db3 .endif @@ -13,12 +15,10 @@ BUILDLINK_PACKAGES+= db3 .if !empty(DB3_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.db3+= db3>=2.9.2 BUILDLINK_PKGSRCDIR.db3?= ../../databases/db3 - -.if defined(USE_DB185) -BUILDLINK_INCDIRS.db3?= include/db3 -BUILDLINK_TRANSFORM+= l:db:db3 -.endif - +. if defined(USE_DB185) +BUILDLINK_INCDIRS.db3?= include/db3 +BUILDLINK_TRANSFORM+= l:db:db3 +. endif .endif # DB3_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/databases/db4/buildlink3.mk b/databases/db4/buildlink3.mk index 9a515cf7893..363385bf3af 100644 --- a/databases/db4/buildlink3.mk +++ b/databases/db4/buildlink3.mk @@ -1,8 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.10 2004/03/12 21:35:58 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ DB4_BUILDLINK3_MK:= ${DB4_BUILDLINK3_MK}+ +.include "../../mk/bsd.prefs.mk" + .if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= db4 .endif @@ -13,13 +15,12 @@ BUILDLINK_PACKAGES+= db4 .if !empty(DB4_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.db4+= db4>=4.2.52 BUILDLINK_PKGSRCDIR.db4?= ../../databases/db4 - -.if defined(USE_DB185) -BUILDLINK_DEPENDS.db4+= db4>=4.2.52nb1 # older ones didn't enable 1.85 compat -BUILDLINK_INCDIRS.db4?= include/db4 -BUILDLINK_TRANSFORM+= l:db:db4 -.endif - +. if defined(USE_DB185) +BUILDLINK_DEPENDS.db4+= db4>=4.2.52nb1 # older ones didn't enable + # db-1.85 compat +BUILDLINK_INCDIRS.db4?= include/db4 +BUILDLINK_TRANSFORM+= l:db:db4 +. endif .endif # DB4_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/databases/dbxml/buildlink3.mk b/databases/dbxml/buildlink3.mk index 760c19d01c8..794b8486b1d 100644 --- a/databases/dbxml/buildlink3.mk +++ b/databases/dbxml/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ DBXML_BUILDLINK3_MK:= ${DBXML_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= dbxml .if !empty(DBXML_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.dbxml+= dbxml>=1.2.0 BUILDLINK_PKGSRCDIR.dbxml?= ../../databases/dbxml +.endif # DBXML_BUILDLINK3_MK .include "../../databases/db4/buildlink3.mk" .include "../../textproc/libpathan/buildlink3.mk" .include "../../textproc/xerces-c/buildlink3.mk" -.endif # DBXML_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/databases/gnome-mime-data/buildlink3.mk b/databases/gnome-mime-data/buildlink3.mk index de2c610a1c5..c5f3b9b4ed8 100644 --- a/databases/gnome-mime-data/buildlink3.mk +++ b/databases/gnome-mime-data/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GNOME_MIME_DATA_BUILDLINK3_MK:= ${GNOME_MIME_DATA_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= gnome-mime-data .if !empty(GNOME_MIME_DATA_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gnome-mime-data+= gnome-mime-data>=2.4.0 BUILDLINK_PKGSRCDIR.gnome-mime-data?= ../../databases/gnome-mime-data +.endif # GNOME_MIME_DATA_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../lang/perl5/buildlink3.mk" -.endif # GNOME_MIME_DATA_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/databases/libgda/buildlink3.mk b/databases/libgda/buildlink3.mk index cfcb2deece8..f68793294fb 100644 --- a/databases/libgda/buildlink3.mk +++ b/databases/libgda/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/11 14:00:29 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGDA_BUILDLINK3_MK:= ${LIBGDA_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= libgda .if !empty(LIBGDA_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libgda+= libgda>=1.0.3 BUILDLINK_PKGSRCDIR.libgda?= ../../databases/libgda +.endif # LIBGDA_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" @@ -20,6 +21,4 @@ BUILDLINK_PKGSRCDIR.libgda?= ../../databases/libgda .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" -.endif # LIBGDA_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/databases/libgnomedb/buildlink3.mk b/databases/libgnomedb/buildlink3.mk index 34024f41fc4..b17ebf9e0fa 100644 --- a/databases/libgnomedb/buildlink3.mk +++ b/databases/libgnomedb/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/11 14:01:34 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGNOMEDB_BUILDLINK3_MK:= ${LIBGNOMEDB_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= libgnomedb .if !empty(LIBGNOMEDB_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libgnomedb+= libgnomedb>=1.0.3 BUILDLINK_PKGSRCDIR.libgnomedb?= ../../databases/libgnomedb +.endif # LIBGNOMEDB_BUILDLINK3_MK .include "../../databases/libgda/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -22,6 +23,4 @@ BUILDLINK_PKGSRCDIR.libgnomedb?= ../../databases/libgnomedb .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/gtksourceview/buildlink3.mk" -.endif # LIBGNOMEDB_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/databases/mysql-client/buildlink3.mk b/databases/mysql-client/buildlink3.mk index 69fa5cd982c..955ea2c358e 100644 --- a/databases/mysql-client/buildlink3.mk +++ b/databases/mysql-client/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:09 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ MYSQL_CLIENT_BUILDLINK3_MK:= ${MYSQL_CLIENT_BUILDLINK3_MK}+ @@ -14,9 +14,8 @@ BUILDLINK_PACKAGES+= mysql-client BUILDLINK_DEPENDS.mysql-client+= mysql-client>=3.23.58 BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mysql-client BUILDLINK_LIBDIRS.mysql-client?= lib/mysql +.endif # MYSQL_CLIENT_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" -.endif # MYSQL_CLIENT_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/databases/openldap/buildlink3.mk b/databases/openldap/buildlink3.mk index cb66ceb0733..7f06d3ba5d5 100644 --- a/databases/openldap/buildlink3.mk +++ b/databases/openldap/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2004/03/05 19:25:09 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OPENLDAP_BUILDLINK3_MK:= ${OPENLDAP_BUILDLINK3_MK}+ @@ -15,6 +15,7 @@ BUILDLINK_PACKAGES+= openldap .if !empty(OPENLDAP_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.openldap+= openldap>=2.1.22 BUILDLINK_PKGSRCDIR.openldap?= ../../databases/openldap +.endif # OPENLDAP_BUILDLINK3_MK .if defined(USE_SASL2) && (${USE_SASL2} == "YES") . include "../../security/cyrus-sasl2/buildlink3.mk" @@ -23,6 +24,4 @@ BUILDLINK_PKGSRCDIR.openldap?= ../../databases/openldap .endif .include "../../security/openssl/buildlink3.mk" -.endif # OPENLDAP_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/databases/p5-DBI/buildlink3.mk b/databases/p5-DBI/buildlink3.mk index 80c46a2c73a..06d17796350 100644 --- a/databases/p5-DBI/buildlink3.mk +++ b/databases/p5-DBI/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2004/03/12 22:01:08 heinz Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ P5_DBI_BUILDLINK3_MK:= ${P5_DBI_BUILDLINK3_MK}+ @@ -18,9 +18,8 @@ BUILDLINK_INCDIRS.p5-DBI?= ${PERL5_SUB_INSTALLSITEARCH}/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/+$//} diff --git a/databases/postgresql-lib/buildlink3.mk b/databases/postgresql-lib/buildlink3.mk index d2d293ccff5..44542141619 100644 --- a/databases/postgresql-lib/buildlink3.mk +++ b/databases/postgresql-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:09 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ POSTGRESQL_LIB_BUILDLINK3_MK:= ${POSTGRESQL_LIB_BUILDLINK3_MK}+ @@ -14,9 +14,8 @@ BUILDLINK_PACKAGES+= postgresql-lib BUILDLINK_DEPENDS.postgresql-lib+= postgresql-lib>=7.3.1 BUILDLINK_PKGSRCDIR.postgresql-lib?= ../../databases/postgresql-lib BUILDLINK_INCDIRS.postgresql-lib?= include/postgresql +.endif # POSTGRESQL_LIB_BUILDLINK3_MK .include "../../security/openssl/buildlink3.mk" -.endif # POSTGRESQL_LIB_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/databases/rrdtool/buildlink3.mk b/databases/rrdtool/buildlink3.mk index 46fbad0209f..eede9d83d2c 100644 --- a/databases/rrdtool/buildlink3.mk +++ b/databases/rrdtool/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:09 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ RRDTOOL_BUILDLINK3_MK:= ${RRDTOOL_BUILDLINK3_MK}+ @@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+= rrdtool .if !empty(RRDTOOL_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.rrdtool+= rrdtool>=1.0.40 BUILDLINK_PKGSRCDIR.rrdtool?= ../../databases/rrdtool +.endif # RRDTOOL_BUILDLINK3_MK .include "../../graphics/freetype-lib/buildlink3.mk" .include "../../graphics/gd/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../www/cgilib/buildlink3.mk" -.endif # RRDTOOL_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/databases/tcl-postgresql/buildlink3.mk b/databases/tcl-postgresql/buildlink3.mk index b44389694ef..621864184d7 100644 --- a/databases/tcl-postgresql/buildlink3.mk +++ b/databases/tcl-postgresql/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/17 15:45:49 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ TCL_POSTGRESQL_BUILDLINK3_MK:= ${TCL_POSTGRESQL_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= tcl-postgresql .if !empty(TCL_POSTGRESQL_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.tcl-postgresql+= tcl-postgresql>=7.3.1 BUILDLINK_PKGSRCDIR.tcl-postgresql?= ../../databases/tcl-postgresql +.endif # TCL_POSTGRESQL_BUILDLINK3_MK .include "../../lang/tcl/buildlink3.mk" -.endif # TCL_POSTGRESQL_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/GConf/buildlink3.mk b/devel/GConf/buildlink3.mk index d867a02d491..de0c2091099 100644 --- a/devel/GConf/buildlink3.mk +++ b/devel/GConf/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GCONF_BUILDLINK3_MK:= ${GCONF_BUILDLINK3_MK}+ @@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+= GConf .if !empty(GCONF_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.GConf+= GConf>=1.0.9nb5 BUILDLINK_PKGSRCDIR.GConf?= ../../devel/GConf +.endif # GCONF_BUILDLINK3_MK .include "../../databases/db3/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/oaf/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" -.endif # GCONF_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/GConf2-ui/buildlink3.mk b/devel/GConf2-ui/buildlink3.mk index c3645562716..d1cd19c9037 100644 --- a/devel/GConf2-ui/buildlink3.mk +++ b/devel/GConf2-ui/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GCONF2_UI_BUILDLINK3_MK:= ${GCONF2_UI_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= GConf2-ui .if !empty(GCONF2_UI_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.GConf2-ui+= GConf2-ui>=2.4.0.1nb1 BUILDLINK_PKGSRCDIR.GConf2-ui?= ../../devel/GConf2-ui +.endif # GCONF2_UI_BUILDLINK3_MK .include "../../devel/GConf2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.endif # GCONF2_UI_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/GConf2/buildlink3.mk b/devel/GConf2/buildlink3.mk index 89f475bb5a4..577c3b2fe91 100644 --- a/devel/GConf2/buildlink3.mk +++ b/devel/GConf2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GCONF2_BUILDLINK3_MK:= ${GCONF2_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= GConf2 .if !empty(GCONF2_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.GConf2+= GConf2>=2.4.0.1 BUILDLINK_PKGSRCDIR.GConf2?= ../../devel/GConf2 +.endif # GCONF2_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" @@ -21,8 +22,8 @@ BUILDLINK_PKGSRCDIR.GConf2?= ../../devel/GConf2 .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/xmlcatmgr/buildlink3.mk" +.if !empty(GCONF2_BUILDLINK3_MK:M+) BUILDLINK_TARGETS+= GConf2-buildlink-fake - _GCONF2_FAKE= ${BUILDLINK_DIR}/bin/gconftool-2 GConf2-buildlink-fake: @@ -33,7 +34,6 @@ GConf2-buildlink-fake: ${ECHO} "#!${SH}" > ${_GCONF2_FAKE}; \ ${CHMOD} +x ${_GCONF2_FAKE}; \ fi - .endif # GCONF2_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/SDL/buildlink3.mk b/devel/SDL/buildlink3.mk index 58c42834eef..91a687995d1 100644 --- a/devel/SDL/buildlink3.mk +++ b/devel/SDL/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:09 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SDL_BUILDLINK3_MK:= ${SDL_BUILDLINK3_MK}+ @@ -13,9 +13,10 @@ BUILDLINK_PACKAGES+= SDL .if !empty(SDL_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.SDL+= SDL>=1.2.5nb5 BUILDLINK_PKGSRCDIR.SDL?= ../../devel/SDL +.endif # SDL_BUILDLINK3_MK -USE_X11= yes -PTHREAD_OPTS+= require +USE_X11= yes +PTHREAD_OPTS+= require .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/aalib-x11/buildlink3.mk" @@ -23,6 +24,4 @@ PTHREAD_OPTS+= require .include "../../mk/pthread.buildlink3.mk" -.endif # SDL_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/SDL_gfx/buildlink3.mk b/devel/SDL_gfx/buildlink3.mk index 270fea80041..8e3b463daf8 100644 --- a/devel/SDL_gfx/buildlink3.mk +++ b/devel/SDL_gfx/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/07 04:21:55 snj Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SDL_GFX_BUILDLINK3_MK:= ${SDL_GFX_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= SDL_gfx .if !empty(SDL_GFX_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.SDL_gfx+= SDL_gfx>=2.0.3nb2 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/+$//} diff --git a/devel/SDL_ttf/buildlink3.mk b/devel/SDL_ttf/buildlink3.mk index acb1bfa53bd..3f9af3c3350 100644 --- a/devel/SDL_ttf/buildlink3.mk +++ b/devel/SDL_ttf/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/06 17:47:30 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SDL_TTF_BUILDLINK3_MK:= ${SDL_TTF_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= SDL_ttf .if !empty(SDL_TTF_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.SDL_ttf+= SDL_ttf>=2.0.3nb3 BUILDLINK_PKGSRCDIR.SDL_ttf?= ../../devel/SDL_ttf +.endif # SDL_TTF_BUILDLINK3_MK .include "../../devel/SDL/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" -.endif # SDL_TTF_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/SDLmm/buildlink3.mk b/devel/SDLmm/buildlink3.mk index 5c19f4b2f5f..5c5ada11f1f 100644 --- a/devel/SDLmm/buildlink3.mk +++ b/devel/SDLmm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/06 23:19:38 snj Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:09 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SDLMM_BUILDLINK3_MK:= ${SDLMM_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= SDLmm .if !empty(SDLMM_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.SDLmm+= SDLmm>=0.1.8nb1 BUILDLINK_PKGSRCDIR.SDLmm?= ../../devel/SDLmm +.endif # SDLMM_BUILDLINK3_MK .include "../../devel/SDL/buildlink3.mk" -.endif # SDLMM_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/apr/buildlink3.mk b/devel/apr/buildlink3.mk index 23de408c4ce..585afad0b8c 100644 --- a/devel/apr/buildlink3.mk +++ b/devel/apr/buildlink3.mk @@ -1,8 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/07 22:32:05 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ APR_BUILDLINK3_MK:= ${APR_BUILDLINK3_MK}+ +.include "../../mk/bsd.prefs.mk" + .if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= apr .endif @@ -17,14 +19,11 @@ BUILDLINK_PKGSRCDIR.apr?= ../../devel/apr BUILDLINK_FILES.apr+= bin/apr-config BUILDLINK_FILES.apr+= bin/apu-config BUILDLINK_FILES.apr+= lib/*.exp +.endif # APR_BUILDLINK3_MK -.include "../../mk/bsd.prefs.mk" -.if ${APR_USE_DB4} == "YES" -.include "../../databases/db4/buildlink3.mk" +.if !empty(APR_USE_DB4:M[yY][eE][sS]) +. include "../../databases/db4/buildlink3.mk" .endif - .include "../../textproc/expat/buildlink3.mk" -.endif # APR_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/at-spi/buildlink3.mk b/devel/at-spi/buildlink3.mk index 4b5c09ded92..1ec4d508c96 100644 --- a/devel/at-spi/buildlink3.mk +++ b/devel/at-spi/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/16 17:58:01 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ AT_SPI_BUILDLINK3_MK:= ${AT_SPI_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= at-spi .if !empty(AT_SPI_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.at-spi+= at-spi>=1.3.8nb1 BUILDLINK_PKGSRCDIR.at-spi?= ../../devel/at-spi +.endif # AT_SPI_BUILDLINK3_MK .include "../../devel/atk/buildlink3.mk" .include "../../devel/gail/buildlink3.mk" @@ -20,6 +21,4 @@ BUILDLINK_PKGSRCDIR.at-spi?= ../../devel/at-spi .include "../../devel/popt/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.endif # AT_SPI_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/atk/buildlink3.mk b/devel/atk/buildlink3.mk index 56bc53f3697..f2269d06a76 100644 --- a/devel/atk/buildlink3.mk +++ b/devel/atk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/16 17:58:01 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ATK_BUILDLINK3_MK:= ${ATK_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= atk .if !empty(ATK_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.atk+= atk>=1.4.1 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/+$//} diff --git a/devel/devIL/buildlink3.mk b/devel/devIL/buildlink3.mk index 562dc4084b1..184c0deea1f 100644 --- a/devel/devIL/buildlink3.mk +++ b/devel/devIL/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ DEVIL_BUILDLINK3_MK:= ${DEVIL_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= devIL .if !empty(DEVIL_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.devIL+= devIL>=1.6.6nb1 BUILDLINK_PKGSRCDIR.devIL?= ../../devel/devIL +.endif # DEVIL_BUILDLINK3_MK .include "../../devel/SDL/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" @@ -22,6 +23,4 @@ BUILDLINK_PKGSRCDIR.devIL?= ../../devel/devIL .include "../../graphics/tiff/buildlink3.mk" .include "../../graphics/xpm/buildlink3.mk" -.endif # DEVIL_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/eel2/buildlink3.mk b/devel/eel2/buildlink3.mk index 79a65e307f5..e2d87acfb80 100644 --- a/devel/eel2/buildlink3.mk +++ b/devel/eel2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ EEL2_BUILDLINK3_MK:= ${EEL2_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= eel2 .if !empty(EEL2_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.eel2+= eel2>=2.4.1nb2 BUILDLINK_PKGSRCDIR.eel2?= ../../devel/eel2 +.endif # EEL2_BUILDLINK3_MK .include "../../devel/GConf2/buildlink3.mk" .include "../../devel/gail/buildlink3.mk" @@ -27,6 +28,4 @@ BUILDLINK_PKGSRCDIR.eel2?= ../../devel/eel2 .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.endif # EEL2_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/gail/buildlink3.mk b/devel/gail/buildlink3.mk index ec9d520122a..27ce5eafad9 100644 --- a/devel/gail/buildlink3.mk +++ b/devel/gail/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GAIL_BUILDLINK3_MK:= ${GAIL_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= gail .if !empty(GAIL_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gail+= gail>=1.4.1nb1 BUILDLINK_PKGSRCDIR.gail?= ../../devel/gail +.endif # GAIL_BUILDLINK3_MK .include "../../devel/atk/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -20,6 +21,4 @@ BUILDLINK_PKGSRCDIR.gail?= ../../devel/gail .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.endif # GAIL_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/gal2/buildlink3.mk b/devel/gal2/buildlink3.mk index 9589a298a2d..3a06bcd4022 100644 --- a/devel/gal2/buildlink3.mk +++ b/devel/gal2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GAL2_BUILDLINK3_MK:= ${GAL2_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= gal2 .if !empty(GAL2_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gal2+= gal2>=1.99.10nb3 BUILDLINK_PKGSRCDIR.gal2?= ../../devel/gal2 +.endif # GAL2_BUILDLINK3_MK .include "../../devel/libgnomeui/buildlink3.mk" .include "../../print/libgnomeprintui/buildlink3.mk" -.endif # GAL2_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk index a8916d30539..0b9e4943251 100644 --- a/devel/gettext-lib/buildlink3.mk +++ b/devel/gettext-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2004/03/16 18:23:27 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GETTEXT_BUILDLINK3_MK:= ${GETTEXT_BUILDLINK3_MK}+ @@ -14,10 +14,9 @@ BUILDLINK_PACKAGES+= gettext BUILDLINK_PKGBASE.gettext?= gettext-lib BUILDLINK_DEPENDS.gettext+= gettext-lib>=0.10.35nb1 BUILDLINK_PKGSRCDIR.gettext?= ../../devel/gettext-lib +.endif # GETTEXT_BUILDLINK3_MK # libiconv/buildlink3.mk is included by gettext-lib/builtin.mk #.include "../../converters/libiconv/buildlink3.mk" -.endif # GETTEXT_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/giblib/buildlink3.mk b/devel/giblib/buildlink3.mk index 8837b3df8de..f66a31cf8eb 100644 --- a/devel/giblib/buildlink3.mk +++ b/devel/giblib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GIBLIB_BUILDLINK3_MK:= ${GIBLIB_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= giblib .if !empty(GIBLIB_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.giblib+= giblib>=1.2.3nb3 BUILDLINK_PKGSRCDIR.giblib?= ../../devel/giblib +.endif # GIBLIB_BUILDLINK3_MK .include "../../graphics/imlib2/buildlink3.mk" -.endif # GIBLIB_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/glib/buildlink3.mk b/devel/glib/buildlink3.mk index 65dc4ce3aeb..77cc5be1cc3 100644 --- a/devel/glib/buildlink3.mk +++ b/devel/glib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GLIB_BUILDLINK3_MK:= ${GLIB_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= glib .if !empty(GLIB_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.glib+= glib>=1.2.10nb5 BUILDLINK_PKGSRCDIR.glib?= ../../devel/glib +.endif # GLIB_BUILDLINK3_MK PTHREAD_OPTS+= require .include "../../mk/pthread.buildlink3.mk" -.endif # GLIB_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/glib2/buildlink3.mk b/devel/glib2/buildlink3.mk index 7f1e83f5bd2..0e47d3a57a6 100644 --- a/devel/glib2/buildlink3.mk +++ b/devel/glib2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GLIB2_BUILDLINK3_MK:= ${GLIB2_BUILDLINK3_MK}+ @@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+= glib2 .if !empty(GLIB2_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.glib2+= glib2>=2.2.2nb1 BUILDLINK_PKGSRCDIR.glib2?= ../../devel/glib2 +.endif # GLIB2_BUILDLINK3_MK .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" -.endif # GLIB2_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/gnome-objc/buildlink3.mk b/devel/gnome-objc/buildlink3.mk index 2b07528874f..afa316c7b85 100644 --- a/devel/gnome-objc/buildlink3.mk +++ b/devel/gnome-objc/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/12 22:51:25 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GNOME_OBJC_BUILDLINK3_MK:= ${GNOME_OBJC_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= gnome-objc .if !empty(GNOME_OBJC_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gnome-objc+= gnome-objc>=1.0.40nb4 BUILDLINK_PKGSRCDIR.gnome-objc?= ../../devel/gnome-objc +.endif # GNOME_OBJC_BUILDLINK3_MK .include "../../x11/gnome-libs/buildlink3.mk" -.endif # GNOME_OBJC_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/libast/buildlink3.mk b/devel/libast/buildlink3.mk index da6053f6a0e..a8b2e139eec 100644 --- a/devel/libast/buildlink3.mk +++ b/devel/libast/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBAST_BUILDLINK3_MK:= ${LIBAST_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= libast .if !empty(LIBAST_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libast+= libast>=0.5nb5 BUILDLINK_PKGSRCDIR.libast?= ../../devel/libast +.endif # LIBAST_BUILDLINK3_MK .include "../../devel/pcre/buildlink3.mk" .include "../../graphics/imlib2/buildlink3.mk" -.endif # LIBAST_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/libbonobo/buildlink3.mk b/devel/libbonobo/buildlink3.mk index f0287f6cb5d..46578b80e21 100644 --- a/devel/libbonobo/buildlink3.mk +++ b/devel/libbonobo/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBBONOBO_BUILDLINK3_MK:= ${LIBBONOBO_BUILDLINK3_MK}+ @@ -16,6 +16,7 @@ BUILDLINK_PKGSRCDIR.libbonobo?= ../../devel/libbonobo BUILDLINK_FILES.libbonobo+= share/idl/bonobo-2.0/* BUILDLINK_FILES.libbonobo+= share/idl/bonobo-activation-2.0/* +.endif # LIBBONOBO_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" @@ -23,6 +24,4 @@ BUILDLINK_FILES.libbonobo+= share/idl/bonobo-activation-2.0/* .include "../../net/ORBit2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" -.endif # LIBBONOBO_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/libbonoboui/buildlink3.mk b/devel/libbonoboui/buildlink3.mk index 6287e3189bb..f951470a70e 100644 --- a/devel/libbonoboui/buildlink3.mk +++ b/devel/libbonoboui/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBBONOBOUI_BUILDLINK3_MK:= ${LIBBONOBOUI_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= libbonoboui .if !empty(LIBBONOBOUI_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libbonoboui+= libbonoboui>=2.4.1nb2 BUILDLINK_PKGSRCDIR.libbonoboui?= ../../devel/libbonoboui +.endif # LIBBONOBOUI_BUILDLINK3_MK .include "../../devel/GConf2/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -24,6 +25,4 @@ BUILDLINK_PKGSRCDIR.libbonoboui?= ../../devel/libbonoboui .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.endif # LIBBONOBOUI_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/libdockapp/buildlink3.mk b/devel/libdockapp/buildlink3.mk index e4f9517b4c7..5eb3422c599 100644 --- a/devel/libdockapp/buildlink3.mk +++ b/devel/libdockapp/buildlink3.mk @@ -1,22 +1,20 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/07 14:10:39 minskim Exp $ -# -# This Makefile fragment is included by packages that use libdockapp. -# +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:10 jlam Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBDOCKAPP_BUILDLINK3_MK:= ${LIBDOCKAPP_BUILDLINK3_MK}+ .if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= libdockapp .endif +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdockapp} +BUILDLINK_PACKAGES+= libdockapp + .if !empty(LIBDOCKAPP_BUILDLINK3_MK:M+) -BUILDLINK_PACKAGES+= libdockapp BUILDLINK_DEPENDS.libdockapp+= libdockapp>=0.4.0 -BUILDLINK_PKGSRCDIR.libdockapp?= ../../devel/libdockapp +BUILDLINK_PKGSRCDIR.libdockapp?= ../../devel/libdockapp +.endif # LIBDOCKAPP_BUILDLINK3_MK .include "../../graphics/xpm/buildlink3.mk" -.endif # LIBDOCKAPP_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/libglade/buildlink3.mk b/devel/libglade/buildlink3.mk index c1fb649dcfc..386ffa2ead2 100644 --- a/devel/libglade/buildlink3.mk +++ b/devel/libglade/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGLADE_BUILDLINK3_MK:= ${LIBGLADE_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= libglade .if !empty(LIBGLADE_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libglade+= libglade>=0.17nb5 BUILDLINK_PKGSRCDIR.libglade?= ../../devel/libglade +.endif # LIBGLADE_BUILDLINK3_MK .include "../../textproc/libxml/buildlink3.mk" .include "../../x11/gnome-libs/buildlink3.mk" -.endif # LIBGLADE_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/libglade2/buildlink3.mk b/devel/libglade2/buildlink3.mk index 9b7d29937b4..6c618350adb 100644 --- a/devel/libglade2/buildlink3.mk +++ b/devel/libglade2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGLADE2_BUILDLINK3_MK:= ${LIBGLADE2_BUILDLINK3_MK}+ @@ -14,10 +14,9 @@ BUILDLINK_PACKAGES+= libglade2 BUILDLINK_DEPENDS.libglade2+= libglade2>=2.0.1nb13 BUILDLINK_PKGSRCDIR.libglade2?= ../../devel/libglade2 BUILDLINK_INCDIRS.libglade2?= include/libglade-2.0 +.endif # LIBGLADE2_BUILDLINK3_MK .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.endif # LIBGLADE2_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/libgnome/buildlink3.mk b/devel/libgnome/buildlink3.mk index 620173c9627..ebeabfa2e92 100644 --- a/devel/libgnome/buildlink3.mk +++ b/devel/libgnome/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGNOME_BUILDLINK3_MK:= ${LIBGNOME_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= libgnome .if !empty(LIBGNOME_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libgnome+= libgnome>=2.4.0 BUILDLINK_PKGSRCDIR.libgnome?= ../../devel/libgnome +.endif # LIBGNOME_BUILDLINK3_MK .include "../../audio/esound/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -24,6 +25,4 @@ BUILDLINK_PKGSRCDIR.libgnome?= ../../devel/libgnome .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" -.endif # LIBGNOME_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/libgnomeui/buildlink3.mk b/devel/libgnomeui/buildlink3.mk index 9f35e843281..445d65e02cf 100644 --- a/devel/libgnomeui/buildlink3.mk +++ b/devel/libgnomeui/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGNOMEUI_BUILDLINK3_MK:= ${LIBGNOMEUI_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= libgnomeui .if !empty(LIBGNOMEUI_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libgnomeui+= libgnomeui>=2.4.0.1nb2 BUILDLINK_PKGSRCDIR.libgnomeui?= ../../devel/libgnomeui +.endif # LIBGNOMEUI_BUILDLINK3_MK .include "../../audio/esound/buildlink3.mk" .include "../../devel/GConf2/buildlink3.mk" @@ -23,6 +24,4 @@ BUILDLINK_PKGSRCDIR.libgnomeui?= ../../devel/libgnomeui .include "../../devel/popt/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" -.endif # LIBGNOMEUI_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/libgphoto2/buildlink3.mk b/devel/libgphoto2/buildlink3.mk index d609b592c8b..9baa629be0d 100644 --- a/devel/libgphoto2/buildlink3.mk +++ b/devel/libgphoto2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGPHOTO2_BUILDLINK3_MK:= ${LIBGPHOTO2_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= libgphoto2 .if !empty(LIBGPHOTO2_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libgphoto2+= libgphoto2>=2.1.2 BUILDLINK_PKGSRCDIR.libgphoto2?= ../../devel/libgphoto2 +.endif # LIBGPHOTO2_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/libexif/buildlink3.mk" -.endif # LIBGPHOTO2_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/libgsf/buildlink3.mk b/devel/libgsf/buildlink3.mk index 4e0b969909a..0b958b2c2bd 100644 --- a/devel/libgsf/buildlink3.mk +++ b/devel/libgsf/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGSF_BUILDLINK3_MK:= ${LIBGSF_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= libgsf .if !empty(LIBGSF_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libgsf+= libgsf>=1.8.2nb3 BUILDLINK_PKGSRCDIR.libgsf?= ../../devel/libgsf +.endif # LIBGSF_BUILDLINK3_MK .include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" @@ -21,6 +22,4 @@ BUILDLINK_PKGSRCDIR.libgsf?= ../../devel/libgsf .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" -.endif # LIBGSF_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/libgtop2/buildlink3.mk b/devel/libgtop2/buildlink3.mk index ddb5a293889..d140646089e 100644 --- a/devel/libgtop2/buildlink3.mk +++ b/devel/libgtop2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:11 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGTOP2_BUILDLINK3_MK:= ${LIBGTOP2_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= libgtop2 .if !empty(LIBGTOP2_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libgtop2+= libgtop2>=2.0.0nb4 BUILDLINK_PKGSRCDIR.libgtop2?= ../../devel/libgtop2 +.endif # LIBGTOP2_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" -.endif # LIBGTOP2_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/libidn/buildlink3.mk b/devel/libidn/buildlink3.mk index eaa56f60459..9ea9f7e8e41 100644 --- a/devel/libidn/buildlink3.mk +++ b/devel/libidn/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBIDN_BUILDLINK3_MK:= ${LIBIDN_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= libidn .if !empty(LIBIDN_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libidn+= libidn>=0.3.3 BUILDLINK_PKGSRCDIR.libidn?= ../../devel/libidn +.endif # LIBIDN_BUILDLINK3_MK .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/libgetopt/buildlink3.mk" -.endif # LIBIDN_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/libslang/buildlink3.mk b/devel/libslang/buildlink3.mk index f40ecae1e17..eae4c783592 100644 --- a/devel/libslang/buildlink3.mk +++ b/devel/libslang/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:11 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBSLANG_BUILDLINK3_MK:= ${LIBSLANG_BUILDLINK3_MK}+ @@ -15,12 +15,11 @@ BUILDLINK_PACKAGES+= libslang .if !empty(LIBSLANG_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libslang+= libslang>=1.4.9nb1 BUILDLINK_PKGSRCDIR.libslang?= ../../devel/libslang +.endif # LIBSLANG_BUILDLINK3_MK # Debian adds a dependency on ncurses. .if (${OPSYS} == "Linux") && (${LOWER_VENDOR} == "debian") . include "../../devel/ncurses/buildlink3.mk" .endif -.endif # LIBSLANG_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/libstroke/buildlink3.mk b/devel/libstroke/buildlink3.mk index e73fd4ed531..90a32e49c16 100644 --- a/devel/libstroke/buildlink3.mk +++ b/devel/libstroke/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/08 19:52:51 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBSTROKE_BUILDLINK3_MK:= ${LIBSTROKE_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= libstroke .if !empty(LIBSTROKE_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libstroke+= libstroke>=0.3nb1 BUILDLINK_PKGSRCDIR.libstroke?= ../../devel/libstroke +.endif # LIBSTROKE_BUILDLINK3_MK .include "../../lang/tcl83/buildlink3.mk" -.endif # LIBSTROKE_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/libtar/buildlink3.mk b/devel/libtar/buildlink3.mk index f5375c009a4..5c7df57a76f 100644 --- a/devel/libtar/buildlink3.mk +++ b/devel/libtar/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBTAR_BUILDLINK3_MK:= ${LIBTAR_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= libtar .if !empty(LIBTAR_BUILDLINK3_MK:M+) BUILDLINK_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/+$//} diff --git a/devel/libwnck/buildlink3.mk b/devel/libwnck/buildlink3.mk index 414ae3a71f3..43960b49ed8 100644 --- a/devel/libwnck/buildlink3.mk +++ b/devel/libwnck/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBWNCK_BUILDLINK3_MK:= ${LIBWNCK_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= libwnck .if !empty(LIBWNCK_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libwnck+= libwnck>=2.4.0.1nb1 BUILDLINK_PKGSRCDIR.libwnck?= ../../devel/libwnck +.endif # LIBWNCK_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" -.endif # LIBWNCK_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/oaf/buildlink3.mk b/devel/oaf/buildlink3.mk index 455c5898258..8522e9424b6 100644 --- a/devel/oaf/buildlink3.mk +++ b/devel/oaf/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OAF_BUILDLINK3_MK:= ${OAF_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= oaf .if !empty(OAF_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.oaf+= oaf>=0.6.10nb4 BUILDLINK_PKGSRCDIR.oaf?= ../../devel/oaf +.endif # OAF_BUILDLINK3_MK .include "../../devel/popt/buildlink3.mk" .include "../../textproc/libxml/buildlink3.mk" .include "../../x11/gnome-libs/buildlink3.mk" -.endif # OAF_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/ogre/buildlink3.mk b/devel/ogre/buildlink3.mk index e07306add7f..bed1f45d2ac 100644 --- a/devel/ogre/buildlink3.mk +++ b/devel/ogre/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OGRE_BUILDLINK3_MK:= ${OGRE_BUILDLINK3_MK}+ @@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+= ogre .if !empty(OGRE_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.ogre+= ogre>=0.12.1nb1 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/+$//} diff --git a/devel/pango/buildlink3.mk b/devel/pango/buildlink3.mk index 1f5e24a82da..0e8b377e4c0 100644 --- a/devel/pango/buildlink3.mk +++ b/devel/pango/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:11 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:10 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PANGO_BUILDLINK3_MK:= ${PANGO_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= pango .if !empty(PANGO_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.pango+= pango>=1.2.5nb1 BUILDLINK_PKGSRCDIR.pango?= ../../devel/pango +.endif # PANGO_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../fonts/Xft2/buildlink3.mk" -.endif # PANGO_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/physfs/buildlink3.mk b/devel/physfs/buildlink3.mk index c8bec497752..2218c03c174 100644 --- a/devel/physfs/buildlink3.mk +++ b/devel/physfs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/07 00:30:04 snj Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:11 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PHYSFS_BUILDLINK3_MK:= ${PHYSFS_BUILDLINK3_MK}+ @@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+= physfs .if !empty(PHYSFS_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.physfs+= physfs>=0.1.8 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/+$//} diff --git a/devel/popt/buildlink3.mk b/devel/popt/buildlink3.mk index dd0243c92dc..ad256256f13 100644 --- a/devel/popt/buildlink3.mk +++ b/devel/popt/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:11 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:11 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ POPT_BUILDLINK3_MK:= ${POPT_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= popt .if !empty(POPT_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.popt+= popt>=1.7nb3 BUILDLINK_PKGSRCDIR.popt?= ../../devel/popt +.endif # POPT_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" -.endif # POPT_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/smpeg/buildlink3.mk b/devel/smpeg/buildlink3.mk index 7b2f5315f05..931749e93db 100644 --- a/devel/smpeg/buildlink3.mk +++ b/devel/smpeg/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:12 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:11 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SPMEG_BUILDLINK3_MK:= ${SPMEG_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= smpeg .if !empty(SPMEG_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.smpeg+= smpeg>=0.4.4nb3 BUILDLINK_PKGSRCDIR.smpeg?= ../../devel/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/+$//} diff --git a/devel/subversion/buildlink3.mk b/devel/subversion/buildlink3.mk index 90ad399a38c..14252cf9428 100644 --- a/devel/subversion/buildlink3.mk +++ b/devel/subversion/buildlink3.mk @@ -1,8 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/08 00:15:53 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:11 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SUBVERSION_BASE_BUILDLINK3_MK:= ${SUBVERSION_BASE_BUILDLINK3_MK}+ +.include "../../devel/subversion/Makefile.version" + .if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= subversion-base .endif @@ -15,13 +17,10 @@ BUILDLINK_DEPENDS.subversion-base+= subversion-base>=${SVNVER} BUILDLINK_PKGSRCDIR.subversion-base?= ../../devel/subversion-base BUILDLINK_FILES.subversion-base+= bin/svn-config +.endif # SUBVERSION_BASE_BUILDLINK3_MK .include "../../databases/db4/buildlink3.mk" .include "../../devel/apr/buildlink3.mk" .include "../../www/neon/buildlink3.mk" -.include "../../devel/subversion/Makefile.version" - -.endif # SUBVERSION_BASE_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/swig-build/buildlink3.mk b/devel/swig-build/buildlink3.mk index 008e6c4f834..3afb9fb61c3 100644 --- a/devel/swig-build/buildlink3.mk +++ b/devel/swig-build/buildlink3.mk @@ -1,8 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/07 23:20:55 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:11 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SWIG_BUILD_BUILDLINK3_MK:= ${SWIG_BUILD_BUILDLINK3_MK}+ +.include "../../devel/swig-build/Makefile.version" + .if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= swig-build .endif @@ -11,14 +13,11 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nswig-build} BUILDLINK_PACKAGES+= swig-build .if !empty(SWIG_BUILD_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.swig-build+= swig-build>=${SWIG_VERSION} +BUILDLINK_DEPENDS.swig-build+= swig-build>=${SWIG_VERSION} BUILDLINK_PKGSRCDIR.swig-build?= ../../devel/swig-build # This package contains no run-time components. BUILDLINK_DEPMETHOD.swig-build?= build - -.include "../../devel/swig-build/Makefile.version" - .endif # SWIG_BUILD_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/swig-perl/buildlink3.mk b/devel/swig-perl/buildlink3.mk index 30fc93f0a3f..ee28032d8d5 100644 --- a/devel/swig-perl/buildlink3.mk +++ b/devel/swig-perl/buildlink3.mk @@ -1,8 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/08 00:15:53 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:11 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SWIG_PERL_BUILDLINK3_MK:= ${SWIG_PERL_BUILDLINK3_MK}+ +.include "../../devel/swig-build/Makefile.version" + .if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= swig-perl .endif @@ -13,11 +15,8 @@ BUILDLINK_PACKAGES+= swig-perl .if !empty(SWIG_PERL_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.swig-perl+= swig-perl>=${SWIG_VERSION} BUILDLINK_PKGSRCDIR.swig-perl?= ../../devel/swig-perl +.endif # SWIG_PERL_BUILDLINK3_MK .include "../../lang/perl5/buildlink3.mk" -.include "../../devel/swig-build/Makefile.version" - -.endif # SWIG_PERL_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/swig-python/buildlink3.mk b/devel/swig-python/buildlink3.mk index 606cc5fce84..ad30cc7cf1a 100644 --- a/devel/swig-python/buildlink3.mk +++ b/devel/swig-python/buildlink3.mk @@ -1,8 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/07 23:20:35 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:11 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SWIG_PYTHON_BUILDLINK3_MK:= ${SWIG_PYTHON_BUILDLINK3_MK}+ +PYTHON_VERSION_ACCEPTED= 22 22pth + +.include "../../lang/python/pyversion.mk" +.include "../../devel/swig-build/Makefile.version" + .if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= swig-python .endif @@ -11,14 +16,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nswig-python} BUILDLINK_PACKAGES+= swig-python .if !empty(SWIG_PYTHON_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.swig-python+= swig-python>=${SWIG_VERSION} +BUILDLINK_DEPENDS.swig-python+= swig-python>=${SWIG_VERSION} BUILDLINK_PKGSRCDIR.swig-python?= ../../devel/swig-python - -PYTHON_VERSION_ACCEPTED= 22 22pth -.include "../../lang/python/pyversion.mk" - -.include "../../devel/swig-build/Makefile.version" - .endif # SWIG_PYTHON_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/tcl-tclcl/buildlink3.mk b/devel/tcl-tclcl/buildlink3.mk index 80e23074ff5..3729e503fdb 100644 --- a/devel/tcl-tclcl/buildlink3.mk +++ b/devel/tcl-tclcl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/08 23:49:41 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:11 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ TCL_TCLCL_BUILDLINK3_MK:= ${TCL_TCLCL_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= tcl-tclcl .if !empty(TCL_TCLCL_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.tcl-tclcl+= tcl-tclcl>=1.15 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/+$//} diff --git a/emulators/libspectrum/buildlink3.mk b/emulators/libspectrum/buildlink3.mk index 8c61d33c1f0..ad435822d3a 100644 --- a/emulators/libspectrum/buildlink3.mk +++ b/emulators/libspectrum/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:12 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:11 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBSPECTRUM_BUILDLINK3_MK:= ${LIBSPECTRUM_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= libspectrum .if !empty(LIBSPECTRUM_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libspectrum+= libspectrum>=0.2.1 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/+$//} diff --git a/fonts/Xft2/buildlink3.mk b/fonts/Xft2/buildlink3.mk index 2d0efbbf216..e60edd22623 100644 --- a/fonts/Xft2/buildlink3.mk +++ b/fonts/Xft2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2004/03/10 17:57:14 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2004/03/18 09:12:11 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFT2_BUILDLINK3_MK:= ${XFT2_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= Xft2 .if !empty(XFT2_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.Xft2+= Xft2>=2.1 BUILDLINK_PKGSRCDIR.Xft2?= ../../fonts/Xft2 +.endif # XFT2_BUILDLINK3_MK .include "../../fonts/fontconfig/buildlink3.mk" .include "../../x11/Xrender/buildlink3.mk" -.endif # XFT2_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/fonts/fontconfig/buildlink3.mk b/fonts/fontconfig/buildlink3.mk index 5ceb235e08f..e5192629380 100644 --- a/fonts/fontconfig/buildlink3.mk +++ b/fonts/fontconfig/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2004/03/10 17:57:14 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2004/03/18 09:12:11 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ FONTCONFIG_BUILDLINK3_MK:= ${FONTCONFIG_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= fontconfig .if !empty(FONTCONFIG_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.fontconfig+= fontconfig>=1.0.1 BUILDLINK_PKGSRCDIR.fontconfig?= ../../fonts/fontconfig +.endif # FONTCONFIG_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/+$//} diff --git a/fonts/gucharmap/buildlink3.mk b/fonts/gucharmap/buildlink3.mk index 6d0f96933cd..961330c8d25 100644 --- a/fonts/gucharmap/buildlink3.mk +++ b/fonts/gucharmap/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:12 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:11 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GUCHARMAP_BUILDLINK3_MK:= ${GUCHARMAP_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= gucharmap .if !empty(GUCHARMAP_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gucharmap+= gucharmap>=1.2.0nb2 BUILDLINK_PKGSRCDIR.gucharmap?= ../../fonts/gucharmap +.endif # GUCHARMAP_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" @@ -21,6 +22,4 @@ BUILDLINK_PKGSRCDIR.gucharmap?= ../../fonts/gucharmap .include "../../devel/popt/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.endif # GUCHARMAP_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/games/gnome2-games/buildlink3.mk b/games/gnome2-games/buildlink3.mk index 158d3890950..e054424f16c 100644 --- a/games/gnome2-games/buildlink3.mk +++ b/games/gnome2-games/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:12 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:11 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GNOME_GAMES_BUILDLINK3_MK:= ${GNOME_GAMES_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= gnome-games .if !empty(GNOME_GAMES_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gnome-games+= gnome-games>=2.4.1nb1 BUILDLINK_PKGSRCDIR.gnome-games?= ../../games/gnome2-games +.endif # GNOME_GAMES_BUILDLINK3_MK .include "../../devel/GConf2-ui/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -21,6 +22,4 @@ BUILDLINK_PKGSRCDIR.gnome-games?= ../../games/gnome2-games .include "../../lang/guile/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" -.endif # GNOME_GAMES_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/ImageMagick/buildlink3.mk b/graphics/ImageMagick/buildlink3.mk index c2ea1c3b63f..40891ef95fb 100644 --- a/graphics/ImageMagick/buildlink3.mk +++ b/graphics/ImageMagick/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:12 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:11 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ IMAGEMAGICK_BUILDLINK3_MK:= ${IMAGEMAGICK_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= ImageMagick .if !empty(IMAGEMAGICK_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.ImageMagick+= ImageMagick>=5.5.7.11nb1 BUILDLINK_PKGSRCDIR.ImageMagick?= ../../graphics/ImageMagick +.endif # IMAGEMAGICK_BUILDLINK3_MK .include "../../archivers/bzip2/buildlink3.mk" .include "../../graphics/jasper/buildlink3.mk" @@ -20,6 +21,4 @@ BUILDLINK_PKGSRCDIR.ImageMagick?= ../../graphics/ImageMagick .include "../../graphics/libwmf/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" -.endif # IMAGEMAGICK_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/OpenRM/buildlink3.mk b/graphics/OpenRM/buildlink3.mk index d3bd6d2279c..3e9595cab40 100644 --- a/graphics/OpenRM/buildlink3.mk +++ b/graphics/OpenRM/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:12 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:11 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OPENRM_BUILDLINK3_MK:= ${OPENRM_BUILDLINK3_MK}+ @@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+= OpenRM .if !empty(OPENRM_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.OpenRM+= OpenRM>=1.5.1 BUILDLINK_PKGSRCDIR.OpenRM?= ../../graphics/OpenRM +.endif # OPENRM_BUILDLINK3_MK .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/Mesa/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" -.endif # OPENRM_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/SDL_image/buildlink3.mk b/graphics/SDL_image/buildlink3.mk index c45aa30c163..3c96a56d96f 100644 --- a/graphics/SDL_image/buildlink3.mk +++ b/graphics/SDL_image/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:12 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2004/03/18 09:12:11 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SDL_IMAGE_BUILDLINK3_MK:= ${SDL_IMAGE_BUILDLINK3_MK}+ @@ -14,12 +14,11 @@ BUILDLINK_PACKAGES+= SDL_image BUILDLINK_DEPENDS.SDL_image+= SDL_image>=1.2.3nb1 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/+$//} diff --git a/graphics/cairo/buildlink3.mk b/graphics/cairo/buildlink3.mk index 988b633c49b..f1e3ffc9522 100644 --- a/graphics/cairo/buildlink3.mk +++ b/graphics/cairo/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:12 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:11 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ CAIRO_BUILDLINK3_MK:= ${CAIRO_BUILDLINK3_MK}+ @@ -17,12 +17,11 @@ BUILDLINK_PKGSRCDIR.cairo?= ../../graphics/cairo BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.5 BUILDLINK_DEPENDS.Xft2+= Xft2>=2.1.2 BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8 +.endif # CAIRO_BUILDLINK3_MK .include "../../fonts/Xft2/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/libpixman/buildlink3.mk" .include "../../x11/Xrender/buildlink3.mk" -.endif # CAIRO_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/cal3d/buildlink3.mk b/graphics/cal3d/buildlink3.mk index 33e4d818a85..a57be9c75ec 100644 --- a/graphics/cal3d/buildlink3.mk +++ b/graphics/cal3d/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/16 17:58:01 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:11 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ CAL3D_BUILDLINK3_MK:= ${CAL3D_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= cal3d .if !empty(CAL3D_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.cal3d+= cal3d>=0.9.1 BUILDLINK_PKGSRCDIR.cal3d?= ../../graphics/cal3d +.endif # CAL3D_BUILDLINK3_MK .include "../../graphics/Mesa/buildlink3.mk" -.endif # CAL3D_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/fnlib/buildlink3.mk b/graphics/fnlib/buildlink3.mk index 437af938513..11b87c55ca6 100644 --- a/graphics/fnlib/buildlink3.mk +++ b/graphics/fnlib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 13:26:08 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:11 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ FNLIB_BUILDLINK3_MK:= ${FNLIB_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= fnlib .if !empty(FNLIB_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.fnlib+= fnlib>=0.5nb6 BUILDLINK_PKGSRCDIR.fnlib?= ../../graphics/fnlib +.endif # FNLIB_BUILDLINK3_MK .include "../../graphics/imlib/buildlink3.mk" -.endif # FNLIB_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/freetype-lib/buildlink3.mk b/graphics/freetype-lib/buildlink3.mk index 3291c18499c..d16c424718e 100644 --- a/graphics/freetype-lib/buildlink3.mk +++ b/graphics/freetype-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/03/16 18:23:27 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2004/03/18 09:12:11 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ FREETYPE_BUILDLINK3_MK:= ${FREETYPE_BUILDLINK3_MK}+ @@ -14,9 +14,8 @@ BUILDLINK_PACKAGES+= freetype BUILDLINK_PKGBASE.freetype?= freetype-lib BUILDLINK_DEPENDS.freetype+= freetype-lib>=1.3.1nb1 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/+$//} diff --git a/graphics/gd/buildlink3.mk b/graphics/gd/buildlink3.mk index e450d18b5bb..f0aad25d152 100644 --- a/graphics/gd/buildlink3.mk +++ b/graphics/gd/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2004/03/05 19:25:13 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 09:12:11 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GD_BUILDLINK3_MK:= ${GD_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= gd .if !empty(GD_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gd+= gd>=2.0.15 BUILDLINK_PKGSRCDIR.gd?= ../../graphics/gd +.endif # GD_BUILDLINK3_MK USE_X11= yes @@ -24,6 +25,4 @@ USE_X11= yes .include "../../mk/pthread.buildlink3.mk" -.endif # GD_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/gdk-pixbuf-gnome/buildlink3.mk b/graphics/gdk-pixbuf-gnome/buildlink3.mk index cac0869a856..2d39f037f00 100644 --- a/graphics/gdk-pixbuf-gnome/buildlink3.mk +++ b/graphics/gdk-pixbuf-gnome/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:13 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:11 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GDK_PIXBUF_GNOME_BUILDLINK3_MK:= ${GDK_PIXBUF_GNOME_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= gdk-pixbuf-gnome .if !empty(GDK_PIXBUF_GNOME_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gdk-pixbuf-gnome+= gdk-pixbuf-gnome>=0.22.0nb2 BUILDLINK_PKGSRCDIR.gdk-pixbuf-gnome?= ../../graphics/gdk-pixbuf-gnome +.endif # GDK_PIXBUF_GNOME_BUILDLINK3_MK .include "../../graphics/gdk-pixbuf/buildlink3.mk" .include "../../x11/gnome-libs/buildlink3.mk" -.endif # GDK_PIXBUF_GNOME_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/gdk-pixbuf/buildlink3.mk b/graphics/gdk-pixbuf/buildlink3.mk index 19a42bfb724..842e11d6cad 100644 --- a/graphics/gdk-pixbuf/buildlink3.mk +++ b/graphics/gdk-pixbuf/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:13 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:11 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GDK_PIXBUF_BUILDLINK3_MK:= ${GDK_PIXBUF_BUILDLINK3_MK}+ @@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+= gdk-pixbuf .if !empty(GDK_PIXBUF_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gdk-pixbuf+= gdk-pixbuf>=0.22.0nb2 BUILDLINK_PKGSRCDIR.gdk-pixbuf?= ../../graphics/gdk-pixbuf +.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/+$//} diff --git a/graphics/gle/buildlink3.mk b/graphics/gle/buildlink3.mk index 40e050ffaf9..15abe919b72 100644 --- a/graphics/gle/buildlink3.mk +++ b/graphics/gle/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:13 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:11 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GLE_BUILDLINK3_MK:= ${GLE_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= gle .if !empty(GLE_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gle+= gle>=3.0.3 BUILDLINK_PKGSRCDIR.gle?= ../../graphics/gle +.endif # GLE_BUILDLINK3_MK .include "../../graphics/Mesa/buildlink3.mk" -.endif # GLE_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/glu/buildlink3.mk b/graphics/glu/buildlink3.mk index 767de23601a..d465592ae79 100644 --- a/graphics/glu/buildlink3.mk +++ b/graphics/glu/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.24 2004/03/15 17:38:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2004/03/18 09:12:11 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GLU_BUILDLINK3_MK:= ${GLU_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= glu .if !empty(GLU_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.glu+= glu>=3.4.2 BUILDLINK_PKGSRCDIR.glu?= ../../graphics/glu +.endif # GLU_BUILDLINK3_MK .include "../../graphics/MesaLib/buildlink3.mk" -.endif # GLU_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/glut/buildlink3.mk b/graphics/glut/buildlink3.mk index c2985a3331a..78be610a179 100644 --- a/graphics/glut/buildlink3.mk +++ b/graphics/glut/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:13 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2004/03/18 09:12:11 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GLUT_BUILDLINK3_MK:= ${GLUT_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= glut .if !empty(GLUT_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.glut+= glut>=${_MESA_REQD} BUILDLINK_PKGSRCDIR.glut?= ../../graphics/glut +.endif # GLUT_BUILDLINK3_MK MESA_REQD+= 6.0 .include "../../graphics/MesaLib/buildlink3.mk" -.endif # GLUT_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/gtkglext/buildlink3.mk b/graphics/gtkglext/buildlink3.mk index 405c95159f5..5240fbcb916 100644 --- a/graphics/gtkglext/buildlink3.mk +++ b/graphics/gtkglext/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/16 17:58:01 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:11 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GTKGLEXT_BUILDLINK3_MK:= ${GTKGLEXT_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= gtkglext .if !empty(GTKGLEXT_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gtkglext+= gtkglext>=0.7.1nb4 BUILDLINK_PKGSRCDIR.gtkglext?= ../../graphics/gtkglext +.endif # GTKGLEXT_BUILDLINK3_MK .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.endif # GTKGLEXT_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/imlib/buildlink3.mk b/graphics/imlib/buildlink3.mk index 81cce4d3140..6ade02def1f 100644 --- a/graphics/imlib/buildlink3.mk +++ b/graphics/imlib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:34 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:11 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ IMLIB_BUILDLINK3_MK:= ${IMLIB_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= imlib .if !empty(IMLIB_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.imlib+= imlib>=1.9.14nb5 BUILDLINK_PKGSRCDIR.imlib?= ../../graphics/imlib +.endif # IMLIB_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" @@ -22,6 +23,4 @@ BUILDLINK_PKGSRCDIR.imlib?= ../../graphics/imlib .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" -.endif # IMLIB_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/imlib2/buildlink3.mk b/graphics/imlib2/buildlink3.mk index fa4e230e678..18afb48df5d 100644 --- a/graphics/imlib2/buildlink3.mk +++ b/graphics/imlib2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:34 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:12 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ IMLIB2_BUILDLINK3_MK:= ${IMLIB2_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= imlib2 .if !empty(IMLIB2_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.imlib2+= imlib2>=1.1.0nb2 BUILDLINK_PKGSRCDIR.imlib2?= ../../graphics/imlib2 +.endif # IMLIB2_BUILDLINK3_MK .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" @@ -20,6 +21,4 @@ BUILDLINK_PKGSRCDIR.imlib2?= ../../graphics/imlib2 .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" -.endif # IMLIB2_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/jasper/buildlink3.mk b/graphics/jasper/buildlink3.mk index a1f94e0ae98..7dd9543ca4b 100644 --- a/graphics/jasper/buildlink3.mk +++ b/graphics/jasper/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:12 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ JASPER_BUILDLINK3_MK:= ${JASPER_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= jasper .if !empty(JASPER_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.jasper+= jasper>=1.600.0 BUILDLINK_PKGSRCDIR.jasper?= ../../graphics/jasper +.endif # JASPER_BUILDLINK3_MK .include "../../graphics/jpeg/buildlink3.mk" -.endif # JASPER_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/libexif/buildlink3.mk b/graphics/libexif/buildlink3.mk index 9ad454c8cba..bb124c87c61 100644 --- a/graphics/libexif/buildlink3.mk +++ b/graphics/libexif/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:12 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBEXIF_BUILDLINK3_MK:= ${LIBEXIF_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= libexif .if !empty(LIBEXIF_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libexif+= libexif>=0.5.12 BUILDLINK_PKGSRCDIR.libexif?= ../../graphics/libexif +.endif # LIBEXIF_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" -.endif # LIBEXIF_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/libgdgeda/buildlink3.mk b/graphics/libgdgeda/buildlink3.mk index e154042f751..cfab6fca303 100644 --- a/graphics/libgdgeda/buildlink3.mk +++ b/graphics/libgdgeda/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:12 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGDGEDA_BUILDLINK3_MK:= ${LIBGDGEDA_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= libgdgeda .if !empty(LIBGDGEDA_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libgdgeda+= libgdgeda>=2.0.15 BUILDLINK_PKGSRCDIR.libgdgeda?= ../../graphics/libgdgeda +.endif # LIBGDGEDA_BUILDLINK3_MK .include "../../graphics/png/buildlink3.mk" -.endif # LIBGDGEDA_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/libgdiplus/buildlink3.mk b/graphics/libgdiplus/buildlink3.mk index 4c25847fd5a..1c9d6beb90c 100644 --- a/graphics/libgdiplus/buildlink3.mk +++ b/graphics/libgdiplus/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:12 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGDIPLUS_BUILDLINK3_MK:= ${LIBGDIPLUS_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= libgdiplus .if !empty(LIBGDIPLUS_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libgdiplus+= libgdiplus>=0.1 BUILDLINK_PKGSRCDIR.libgdiplus?= ../../graphics/libgdiplus +.endif # LIBGDIPLUS_BUILDLINK3_MK .include "../../graphics/cairo/buildlink3.mk" .include "../../lang/mono/buildlink3.mk" .include "../../x11/Xrender/buildlink3.mk" -.endif # LIBGDIPLUS_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/libgnomecanvas/buildlink3.mk b/graphics/libgnomecanvas/buildlink3.mk index e9e2a6b9d15..8cc3449e4aa 100644 --- a/graphics/libgnomecanvas/buildlink3.mk +++ b/graphics/libgnomecanvas/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:12 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGNOMECANVAS_BUILDLINK3_MK:= ${LIBGNOMECANVAS_BUILDLINK3_MK}+ @@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+= libgnomecanvas .if !empty(LIBGNOMECANVAS_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libgnomecanvas+= libgnomecanvas>=2.4.0nb1 BUILDLINK_PKGSRCDIR.libgnomecanvas?= ../../graphics/libgnomecanvas +.endif # LIBGNOMECANVAS_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.endif # LIBGNOMECANVAS_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/librsvg2/buildlink3.mk b/graphics/librsvg2/buildlink3.mk index 126ec454ba7..4f1352ff848 100644 --- a/graphics/librsvg2/buildlink3.mk +++ b/graphics/librsvg2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:12 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBRSVG2_BUILDLINK3_MK:= ${LIBRSVG2_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= librsvg2 .if !empty(LIBRSVG2_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.librsvg2+= librsvg2>=2.5.0nb4 BUILDLINK_PKGSRCDIR.librsvg2?= ../../graphics/librsvg2 +.endif # LIBRSVG2_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libgsf/buildlink3.mk" @@ -24,6 +25,4 @@ BUILDLINK_PKGSRCDIR.librsvg2?= ../../graphics/librsvg2 .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.endif # LIBRSVG2_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/libwmf/buildlink3.mk b/graphics/libwmf/buildlink3.mk index f67958ac362..ced43e32981 100644 --- a/graphics/libwmf/buildlink3.mk +++ b/graphics/libwmf/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:12 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBWMF_BUILDLINK3_MK:= ${LIBWMF_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= libwmf .if !empty(LIBWMF_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libwmf+= libwmf>=0.2.8nb2 BUILDLINK_PKGSRCDIR.libwmf?= ../../graphics/libwmf +.endif # LIBWMF_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" @@ -21,6 +22,4 @@ BUILDLINK_PKGSRCDIR.libwmf?= ../../graphics/libwmf .include "../../graphics/xpm/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" -.endif # LIBWMF_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/mng/buildlink3.mk b/graphics/mng/buildlink3.mk index c1e1307803e..95309e01156 100644 --- a/graphics/mng/buildlink3.mk +++ b/graphics/mng/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:12 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ MNG_BUILDLINK3_MK:= ${MNG_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= mng .if !empty(MNG_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.mng+= mng>=1.0.0 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/+$//} diff --git a/graphics/netpbm/buildlink3.mk b/graphics/netpbm/buildlink3.mk index ef3ad4b8f0f..46f39e87bc0 100644 --- a/graphics/netpbm/buildlink3.mk +++ b/graphics/netpbm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:12 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ NETPBM_BUILDLINK3_MK:= ${NETPBM_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= netpbm .if !empty(NETPBM_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.netpbm+= netpbm>=10.11.6 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/+$//} diff --git a/graphics/plotutils/buildlink3.mk b/graphics/plotutils/buildlink3.mk index 92b53fbed8b..a3cf714b8f3 100644 --- a/graphics/plotutils/buildlink3.mk +++ b/graphics/plotutils/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:12 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PLOTUTILS_BUILDLINK3_MK:= ${PLOTUTILS_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= plotutils .if !empty(PLOTUTILS_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.plotutils+= plotutils>=2.4.1nb2 BUILDLINK_PKGSRCDIR.plotutils?= ../../graphics/plotutils +.endif # PLOTUTILS_BUILDLINK3_MK .include "../../graphics/png/buildlink3.mk" -.endif # PLOTUTILS_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/png/buildlink3.mk b/graphics/png/buildlink3.mk index 07ba0db974d..c91d32bc008 100644 --- a/graphics/png/buildlink3.mk +++ b/graphics/png/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:12 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PNG_BUILDLINK3_MK:= ${PNG_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= png .if !empty(PNG_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.png+= png>=1.2.4 BUILDLINK_PKGSRCDIR.png?= ../../graphics/png +.endif # PNG_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" -.endif # PNG_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/py-imaging/buildlink3.mk b/graphics/py-imaging/buildlink3.mk index fec16d971ac..b4aa8a1a24e 100644 --- a/graphics/py-imaging/buildlink3.mk +++ b/graphics/py-imaging/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/16 18:23:27 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:12 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PY_IMAGING_BUILDLINK3_MK:= ${PY_IMAGING_BUILDLINK3_MK}+ @@ -16,9 +16,8 @@ BUILDLINK_PACKAGES+= pyimaging BUILDLINK_PKGBASE.pyimaging?= ${PYPKGPREFIX}-imaging BUILDLINK_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.4 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/+$//} diff --git a/graphics/swfdec/buildlink3.mk b/graphics/swfdec/buildlink3.mk index 2f3c2b2d7df..b8c740e073f 100644 --- a/graphics/swfdec/buildlink3.mk +++ b/graphics/swfdec/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:12 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SWFDEC_BUILDLINK3_MK:= ${SWFDEC_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= swfdec .if !empty(SWFDEC_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.swfdec+= swfdec>=0.2.1nb7 BUILDLINK_PKGSRCDIR.swfdec?= ../../graphics/swfdec +.endif # SWFDEC_BUILDLINK3_MK .include "../../devel/SDL/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.endif # SWFDEC_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/tiff/buildlink3.mk b/graphics/tiff/buildlink3.mk index 9e121d4e21e..38d4f4f857c 100644 --- a/graphics/tiff/buildlink3.mk +++ b/graphics/tiff/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2004/03/18 09:12:12 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ TIFF_BUILDLINK3_MK:= ${TIFF_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= tiff .if !empty(TIFF_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.tiff+= tiff>=3.6.1 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/+$//} diff --git a/graphics/xfce4-artwork/buildlink3.mk b/graphics/xfce4-artwork/buildlink3.mk index 9e75e669946..95147260237 100644 --- a/graphics/xfce4-artwork/buildlink3.mk +++ b/graphics/xfce4-artwork/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:59:31 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:12 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_ARTWORK_BUILDLINK3_MK:= ${XFCE4_ARTWORK_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= xfce4-artwork .if !empty(XFCE4_ARTWORK_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xfce4-artwork+= xfce4-artwork>=0.0.4nb4 BUILDLINK_PKGSRCDIR.xfce4-artwork?= ../../graphics/xfce4-artwork +.endif # XFCE4_ARTWORK_BUILDLINK3_MK .include "../../x11/xfce4-desktop/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_ARTWORK_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/xfce4-iconbox/buildlink3.mk b/graphics/xfce4-iconbox/buildlink3.mk index 12a01f799e0..478a7602f21 100644 --- a/graphics/xfce4-iconbox/buildlink3.mk +++ b/graphics/xfce4-iconbox/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:12 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_ICONBOX_BUILDLINK3_MK:= ${XFCE4_ICONBOX_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= xfce4-iconbox .if !empty(XFCE4_ICONBOX_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xfce4-iconbox+= xfce4-iconbox>=4.0.4nb1 BUILDLINK_PKGSRCDIR.xfce4-iconbox?= ../../graphics/xfce4-iconbox +.endif # XFCE4_ICONBOX_BUILDLINK3_MK .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_ICONBOX_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/inputmethod/sj3-lib/buildlink3.mk b/inputmethod/sj3-lib/buildlink3.mk index 99209eca2ca..a628dae5e0d 100644 --- a/inputmethod/sj3-lib/buildlink3.mk +++ b/inputmethod/sj3-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/05 21:23:00 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:12 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SJ3_LIB_BUILDLINK3_MK:= ${SJ3_LIB_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= sj3-lib .if !empty(SJ3_LIB_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.sj3-lib+= sj3-lib>=2.0.1.20nb1 BUILDLINK_PKGSRCDIR.sj3-lib?= ../../inputmethod/sj3-lib +.endif # SJ3_LIB_BUILDLINK3_MK .include "../../devel/nbitools/buildlink3.mk" -.endif # SJ3_LIB_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/lang/gcc/buildlink3.mk b/lang/gcc/buildlink3.mk index 24a032b0b80..d6fee20ee6b 100644 --- a/lang/gcc/buildlink3.mk +++ b/lang/gcc/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:12 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GCC_BUILDLINK3_MK:= ${GCC_BUILDLINK3_MK}+ @@ -19,12 +19,11 @@ BUILDLINK_LIBDIRS.gcc?= \ lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc}\///} # Packages that link against shared libraries need a full dependency. -.if defined(USE_GCC_SHLIB) +. if defined(USE_GCC_SHLIB) BUILDLINK_DEPMETHOD.gcc+= full -.else +. else BUILDLINK_DEPMETHOD.gcc?= build -.endif - +. endif .endif # GCC_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/lang/gcc3-c++/buildlink3.mk b/lang/gcc3-c++/buildlink3.mk index 0710de0d411..8ea27408d16 100644 --- a/lang/gcc3-c++/buildlink3.mk +++ b/lang/gcc3-c++/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 04:19:39 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2004/03/18 09:12:12 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GCC3_CXX_BUILDLINK3_MK:= ${GCC3_CXX_BUILDLINK3_MK}+ @@ -25,12 +25,11 @@ BUILDLINK_LIBDIRS.gcc3-cxx?= \ lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-cxx}\///} # Packages that link against shared libraries need a full dependency. -.if defined(USE_GCC_SHLIB) +. if defined(USE_GCC_SHLIB) BUILDLINK_DEPMETHOD.gcc3-cxx+= full -.else +. else BUILDLINK_DEPMETHOD.gcc3-cxx?= build -.endif - +. endif .endif # GCC3_CXX_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/lang/gcc3-c/buildlink3.mk b/lang/gcc3-c/buildlink3.mk index 7400e8aa181..d1cd0e6ff8b 100644 --- a/lang/gcc3-c/buildlink3.mk +++ b/lang/gcc3-c/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2004/03/18 04:19:39 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 09:12:12 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GCC3_C_BUILDLINK3_MK:= ${GCC3_C_BUILDLINK3_MK}+ @@ -29,12 +29,11 @@ BUILDLINK_LIBDIRS.gcc3-c?= \ lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-c}\///} # Packages that link against shared libraries need a full dependency. -.if defined(USE_GCC_SHLIB) +. if defined(USE_GCC_SHLIB) BUILDLINK_DEPMETHOD.gcc3-c+= full -.else +. else BUILDLINK_DEPMETHOD.gcc3-c?= build -.endif - +. endif .endif # GCC3_C_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/lang/gcc3-f77/buildlink3.mk b/lang/gcc3-f77/buildlink3.mk index d0fb0605932..609452718b4 100644 --- a/lang/gcc3-f77/buildlink3.mk +++ b/lang/gcc3-f77/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 04:19:39 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2004/03/18 09:12:12 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GCC3_F77_BUILDLINK3_MK:= ${GCC3_F77_BUILDLINK3_MK}+ @@ -25,12 +25,11 @@ BUILDLINK_LIBDIRS.gcc3-f77?= \ lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-f77}\///} # Packages that link against shared libraries need a full dependency. -.if defined(USE_GCC_SHLIB) +. if defined(USE_GCC_SHLIB) BUILDLINK_DEPMETHOD.gcc3-f77+= full -.else +. else BUILDLINK_DEPMETHOD.gcc3-f77?= build -.endif - +. endif .endif # GCC3_F77_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/lang/gcc3-java/buildlink3.mk b/lang/gcc3-java/buildlink3.mk index 5fead2ef83b..fef0942499f 100644 --- a/lang/gcc3-java/buildlink3.mk +++ b/lang/gcc3-java/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 04:19:39 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2004/03/18 09:12:12 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GCC3_JAVA_BUILDLINK3_MK:= ${GCC3_JAVA_BUILDLINK3_MK}+ @@ -25,12 +25,11 @@ BUILDLINK_LIBDIRS.gcc3-java?= \ lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-java}\///} # Packages that link against shared libraries need a full dependency. -.if defined(USE_GCC_SHLIB) +. if defined(USE_GCC_SHLIB) BUILDLINK_DEPMETHOD.gcc3-java+= full -.else +. else BUILDLINK_DEPMETHOD.gcc3-java?= build -.endif - +. endif .endif # GCC3_JAVA_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/lang/gcc3-objc/buildlink3.mk b/lang/gcc3-objc/buildlink3.mk index feb6ed62b2f..12ac1f9ad8e 100644 --- a/lang/gcc3-objc/buildlink3.mk +++ b/lang/gcc3-objc/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 04:19:39 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2004/03/18 09:12:12 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GCC3_OBJC_BUILDLINK3_MK:= ${GCC3_OBJC_BUILDLINK3_MK}+ @@ -25,12 +25,11 @@ BUILDLINK_LIBDIRS.gcc3-objc?= \ lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-objc}\///} # Packages that link against shared libraries need a full dependency. -.if defined(USE_GCC_SHLIB) +. if defined(USE_GCC_SHLIB) BUILDLINK_DEPMETHOD.gcc3-objc+= full -.else +. else BUILDLINK_DEPMETHOD.gcc3-objc?= build -.endif - +. endif .endif # GCC3_OBJC_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/lang/guile/buildlink3.mk b/lang/guile/buildlink3.mk index 0774a312cee..87211d7d41b 100644 --- a/lang/guile/buildlink3.mk +++ b/lang/guile/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:36 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:12 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GUILE_BUILDLINK3_MK:= ${GUILE_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= guile .if !empty(GUILE_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.guile+= guile>=1.6.3nb1 BUILDLINK_PKGSRCDIR.guile?= ../../lang/guile +.endif # GUILE_BUILDLINK3_MK .include "../../devel/libtool/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" -.endif # GUILE_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/lang/libperl/buildlink3.mk b/lang/libperl/buildlink3.mk index d941a7de213..f1be5d6c1fd 100644 --- a/lang/libperl/buildlink3.mk +++ b/lang/libperl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:36 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2004/03/18 09:12:12 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBPERL_BUILDLINK3_MK:= ${LIBPERL_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= libperl .if !empty(LIBPERL_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libperl+= {libperl>=${LIBPERL5_REQD},perl>=5.8.0} BUILDLINK_PKGSRCDIR.libperl?= ../../lang/libperl +.endif # LIBPERL_BUILDLINK3_MK LIBPERL5_REQD?= ${_PERL5_REQD} .include "../../lang/perl5/buildlink3.mk" -.endif # LIBPERL_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/lang/librep/buildlink3.mk b/lang/librep/buildlink3.mk index 36263ed67e4..a0c96c66117 100644 --- a/lang/librep/buildlink3.mk +++ b/lang/librep/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:36 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:12 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBREP_BUILDLINK3_MK:= ${LIBREP_BUILDLINK3_MK}+ @@ -13,12 +13,10 @@ BUILDLINK_PACKAGES+= librep .if !empty(LIBREP_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.librep+= librep>=0.16.1nb1 BUILDLINK_PKGSRCDIR.librep?= ../../lang/librep - -MAKE_FLAGS+= rep_LIBTOOL=${LIBTOOL} +MAKE_FLAGS+= rep_LIBTOOL=${LIBTOOL} +.endif # LIBREP_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/gmp/buildlink3.mk" -.endif # LIBREP_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/lang/mono/buildlink3.mk b/lang/mono/buildlink3.mk index d799856b414..09b9628d306 100644 --- a/lang/mono/buildlink3.mk +++ b/lang/mono/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:36 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:12 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ MONO_BUILDLINK3_MK:= ${MONO_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= mono .if !empty(MONO_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.mono+= mono>=0.30 BUILDLINK_PKGSRCDIR.mono?= ../../lang/mono +.endif # MONO_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../textproc/icu/buildlink3.mk" -.endif # MONO_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/lang/pnet/buildlink3.mk b/lang/pnet/buildlink3.mk index 95a41e194ce..552d7d9d033 100644 --- a/lang/pnet/buildlink3.mk +++ b/lang/pnet/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/11 08:06:56 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:13 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PNET_BUILDLINK3_MK:= ${PNET_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= pnet .if !empty(PNET_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.pnet+= pnet>=0.6.2 BUILDLINK_PKGSRCDIR.pnet?= ../../lang/pnet +.endif # PNET_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" -.endif # PNET_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/lang/pnetC/buildlink3.mk b/lang/pnetC/buildlink3.mk index 1c82f6ae4c1..c89aa89bcd0 100644 --- a/lang/pnetC/buildlink3.mk +++ b/lang/pnetC/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:36 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:13 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PNETC_BUILDLINK3_MK:= ${PNETC_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= pnetC .if !empty(PNETC_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.pnetC+= pnetC>=0.6.0 BUILDLINK_PKGSRCDIR.pnetC?= ../../lang/pnetC +.endif # PNETC_BUILDLINK3_MK .include "../../lang/pnet/buildlink3.mk" -.endif # PNETC_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/lang/pnetlib/buildlink3.mk b/lang/pnetlib/buildlink3.mk index e455f8e5728..0a1be727dc9 100644 --- a/lang/pnetlib/buildlink3.mk +++ b/lang/pnetlib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:36 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:13 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PNETLIB_BUILDLINK3_MK:= ${PNETLIB_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= pnetlib .if !empty(PNETLIB_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.pnetlib+= pnetlib>=0.6.2 BUILDLINK_PKGSRCDIR.pnetlib?= ../../lang/pnetlib +.endif # PNETLIB_BUILDLINK3_MK .include "../../fonts/Xft2/buildlink3.mk" .include "../../lang/pnet/buildlink3.mk" -.endif # PNETLIB_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/lang/tcl-expect/buildlink3.mk b/lang/tcl-expect/buildlink3.mk index 94ea32bd4a8..7d58877bf10 100644 --- a/lang/tcl-expect/buildlink3.mk +++ b/lang/tcl-expect/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/11 20:19:38 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:13 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ TCL_EXPECT_BUILDLINK3_MK:= ${TCL_EXPECT_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= tcl-expect .if !empty(TCL_EXPECT_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.tcl-expect+= tcl-expect>=5.38.0nb1 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/+$//} diff --git a/lang/tcl-otcl/buildlink3.mk b/lang/tcl-otcl/buildlink3.mk index 9c4f28a0505..9d3145edf79 100644 --- a/lang/tcl-otcl/buildlink3.mk +++ b/lang/tcl-otcl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/08 23:47:44 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:13 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ TCL_OTCL_BUILDLINK3_MK:= ${TCL_OTCL_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= tcl-otcl .if !empty(TCL_OTCL_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.tcl-otcl+= tcl-otcl>=1.8 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/+$//} diff --git a/mail/libesmtp/buildlink3.mk b/mail/libesmtp/buildlink3.mk index 3a34b9a03a7..24ac0dffd42 100644 --- a/mail/libesmtp/buildlink3.mk +++ b/mail/libesmtp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:37 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:13 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBESMTP_BUILDLINK3_MK:= ${LIBESMTP_BUILDLINK3_MK}+ @@ -19,8 +19,8 @@ LIBESMTP= -lesmtp CONFIGURE_ENV+= LIBESMTP="${LIBESMTP}" MAKE_ENV+= LIBESMTP="${LIBESMTP}" -.include "../../security/openssl/buildlink3.mk" - .endif # LIBESMTP_BUILDLINK3_MK +.include "../../security/openssl/buildlink3.mk" + BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/mail/sylpheed-claws/buildlink3.mk b/mail/sylpheed-claws/buildlink3.mk index bfe767702ba..365cbfb8443 100644 --- a/mail/sylpheed-claws/buildlink3.mk +++ b/mail/sylpheed-claws/buildlink3.mk @@ -1,11 +1,6 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/11 13:17:00 jmmv Exp $ -# -# This Makefile fragment is included by packages that use sylpheed-claws. -# -# This file was created automatically using createbuildlink-3.1. -# +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:13 jlam Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SYLPHEED_CLAWS_BUILDLINK3_MK:= ${SYLPHEED_CLAWS_BUILDLINK3_MK}+ .if !empty(BUILDLINK_DEPTH:M+) @@ -16,9 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsylpheed-claws} BUILDLINK_PACKAGES+= sylpheed-claws .if !empty(SYLPHEED_CLAWS_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.sylpheed-claws+= sylpheed-claws>=0.9.7nb1 -BUILDLINK_PKGSRCDIR.sylpheed-claws?= ../../mail/sylpheed-claws - -.endif # SYLPHEED_CLAWS_BUILDLINK3_MK +BUILDLINK_DEPENDS.sylpheed-claws+= sylpheed-claws>=0.9.7nb1 +BUILDLINK_PKGSRCDIR.sylpheed-claws?= ../../mail/sylpheed-claws +.endif # SYLPHEED_CLAWS_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/math/gsl/buildlink3.mk b/math/gsl/buildlink3.mk index 49535ee8a25..fc36ce6dc05 100644 --- a/math/gsl/buildlink3.mk +++ b/math/gsl/buildlink3.mk @@ -1,9 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/11 13:45:57 dmcmahill Exp $ -# -# This Makefile fragment is included by packages that use gsl. -# -# This file was created automatically using createbuildlink-3.1. -# +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:13 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GSL_BUILDLINK3_MK:= ${GSL_BUILDLINK3_MK}+ @@ -12,11 +7,12 @@ GSL_BUILDLINK3_MK:= ${GSL_BUILDLINK3_MK}+ BUILDLINK_DEPENDS+= gsl .endif +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngsl} +BUILDLINK_PACKAGES+= gsl + .if !empty(GSL_BUILDLINK3_MK:M+) -BUILDLINK_PACKAGES+= gsl BUILDLINK_DEPENDS.gsl+= gsl>=1.4 BUILDLINK_PKGSRCDIR.gsl?= ../../math/gsl - -.endif # GSL_BUILDLINK3_MK +.endif # GSL_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/meta-pkgs/xfce4/buildlink3.mk b/meta-pkgs/xfce4/buildlink3.mk index d06ee3b6b8f..ce7df390b3d 100644 --- a/meta-pkgs/xfce4/buildlink3.mk +++ b/meta-pkgs/xfce4/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:13 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_BUILDLINK3_MK:= ${XFCE4_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= xfce4 .if !empty(XFCE4_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xfce4+= xfce4>=4.0.4nb1 BUILDLINK_PKGSRCDIR.xfce4?= ../../meta-pkgs/xfce4 +.endif # XFCE4_BUILDLINK3_MK .include "../../graphics/xfce4-iconbox/buildlink3.mk" .include "../../print/xfce4-print/buildlink3.mk" @@ -31,6 +32,4 @@ BUILDLINK_PKGSRCDIR.xfce4?= ../../meta-pkgs/xfce4 .include "../../x11/xfce4-trigger-launcher/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/mk/bdb.buildlink3.mk b/mk/bdb.buildlink3.mk index 066cf9dd064..24d3a9a4936 100644 --- a/mk/bdb.buildlink3.mk +++ b/mk/bdb.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bdb.buildlink3.mk,v 1.2 2004/03/11 08:33:52 jlam Exp $ +# $NetBSD: bdb.buildlink3.mk,v 1.3 2004/03/18 09:12:13 jlam Exp $ # # This Makefile fragment is meant to be included by packages that # require a Berkeley DB implementation. db.buildlink3.mk will: @@ -19,7 +19,7 @@ BDB_BUILDLINK3_MK:= ${BDB_BUILDLINK3_MK}+ .include "../../mk/bsd.prefs.mk" -.if !empty(BDB_BUILDLINK3_MK) +.if !empty(BDB_BUILDLINK3_MK:M+) BDB_DEFAULT?= # empty BDB_ACCEPTED?= ${_BDB_PKGS} @@ -68,21 +68,21 @@ _BDB_TRANSFORM= l:db:db1 . endif . endif -. if !defined(_BDB) +. if !defined(_BDB_TYPE) # # Prefer the default one if it's accepted,... # . if !empty(_BDB_DEFAULT) && \ defined(_BDB_OK.${_BDB_DEFAULT}) && \ !empty(_BDB_OK.${_BDB_DEFAULT}:M[yY][eE][sS]) -_BDB= ${_BDB_DEFAULT} +_BDB_TYPE= ${_BDB_DEFAULT} . endif # # ...otherwise, use one of the installed Berkeley DB packages,... # . for _bdb_ in ${_BDB_ACCEPTED} . if !empty(_BDB_INSTALLED.${_bdb_}:M[yY][eE][sS]) -_BDB?= ${_bdb_} +_BDB_TYPE?= ${_bdb_} . else _BDB_FIRSTACCEPTED?= ${_bdb_} . endif @@ -91,19 +91,21 @@ _BDB_FIRSTACCEPTED?= ${_bdb_} # ...otherwise, just use the first accepted Berkeley DB package. # . if defined(_BDB_FIRSTACCEPTED) -_BDB?= ${_BDB_FIRSTACCEPTED} +_BDB_TYPE?= ${_BDB_FIRSTACCEPTED} . endif -_BDB?= none -MAKEFLAGS+= _BDB=${_BDB} +_BDB_TYPE?= none +MAKEFLAGS+= _BDB_TYPE=${_BDB_TYPE} . endif -BDB_TYPE= ${_BDB} +BDB_TYPE= ${_BDB_TYPE} BUILD_DEFS+= BDB_TYPE -. if ${BDB_TYPE} == "none" +.endif # BDB_BUILDLINK3_MK + +.if ${BDB_TYPE} == "none" PKG_FAIL_REASON= "No acceptable Berkeley DB implementation found." -. else -. if ${BDB_TYPE} == "native" +.else +. if ${BDB_TYPE} == "native" IS_BUILTIN.db-native= yes USE_BUILTIN.db-native= yes BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndb-native} @@ -111,17 +113,15 @@ BUILDLINK_PACKAGES+= db-native BUILDLINK_INCDIRS.db-native?= ${_BDB_INCDIRS} BUILDLINK_TRANSFORM?= ${_BDB_TRANSFORM} BDBBASE= ${BUILDLINK_PREFIX.db-native} -. elif ${BDB_TYPE} == "db4" +. elif ${BDB_TYPE} == "db4" BDBBASE= ${BUILDLINK_PREFIX.db4} -. include "../../databases/db4/buildlink3.mk" -. elif ${BDB_TYPE} == "db3" +. include "../../databases/db4/buildlink3.mk" +. elif ${BDB_TYPE} == "db3" BDBBASE= ${BUILDLINK_PREFIX.db3} -. include "../../databases/db3/buildlink3.mk" -. elif ${BDB_TYPE} == "db" +. include "../../databases/db3/buildlink3.mk" +. elif ${BDB_TYPE} == "db" BDBBASE= ${BUILDLINK_PREFIX.db2} -. include "../../databases/db/buildlink3.mk" -. endif +. include "../../databases/db/buildlink3.mk" . endif +.endif BUILD_DEFS+= BDBBASE - -.endif # BDB_BUILDLINK3_MK diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index cb8ed37c396..4ed01da8cb3 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.123 2004/03/16 18:23:26 jlam Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.124 2004/03/18 09:12:13 jlam Exp $ # # An example package buildlink3.mk file: # @@ -21,11 +21,10 @@ # # # 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/+$//} # -------------8<-------------8<-------------8<-------------8<------------- # @@ -79,6 +78,103 @@ PKG_FAIL_REASON+= \ . endif .endif +.for _pkg_ in ${BUILDLINK_PACKAGES} +BUILDLINK_PKGBASE.${_pkg_}?= ${_pkg_} +.endfor + +_BLNK_PKGVAR?= ${PKGBASE:S/++$/xx/:S/+$//} + +# Try to include buildlink3.mk files for any dependencies that are already +# installed on the system. This tries to handle the situation where the +# installed package and the package as it exists in pkgsrc have differing +# lists of dependencies. If the package directory has moved or been +# removed from pkgsrc, then set BUILDLINK_INSTALLED_PKGSRCDIR.<pkg> to the +# correct PKGPATH for that package or to the empty value if it has been +# removed. +# +.if !defined(_BLNK_INSTALLED_DEPDIRS.${_BLNK_PKGVAR}) +_BLNK_INSTALLED_DEPS= # empty +. for _pkg_ in ${BUILDLINK_PACKAGES} +BUILDLINK_DEPMETHOD.${_pkg_}?= full +. if !empty(BUILDLINK_DEPMETHOD.${_pkg_}:Mfull) +BUILDLINK_PKGBASE.${_pkg_}?= ${_pkg_} +# +# XXX This should really recursively walk through the dependency list. +# +_BLNK_TMP!= \ + pkg="${BUILDLINK_PKGBASE.${_pkg_}}-[0-9]*"; \ + found=`${PKG_BEST_EXISTS} "$$pkg"`; \ + pkgdep=; \ + if [ -n "$$found" ]; then \ + pkgdep=`${PKG_INFO} -qf "$$found" | ${SED} -n "s/^@pkgdep[ ]*//p"`; \ + fi; \ + ${ECHO} "$$pkgdep" +_BLNK_INSTALLED_DEPS:= ${_BLNK_INSTALLED_DEPS} ${_BLNK_TMP} +. undef _BLNK_TMP +. endif +. endfor +_BLNK_INSTALLED_DEPPKGS= # empty +. for _dep_ in ${_BLNK_INSTALLED_DEPS} +_BLNK_TMP!= found=`${PKG_BEST_EXISTS} "${_dep_}"`; ${ECHO} "$$found" +_BLNK_TMP_PKGBASE:= ${_BLNK_TMP:C/-[^-]*$//} +_BLNK_TMP_PKGVAR:= ${_BLNK_TMP_PKGBASE} +# +# Map package names into buildlink package variable equivalents when it +# differs from the PKGBASE for that package. +# +_BLNK_TMP_PKGVAR:= ${_BLNK_TMP_PKGVAR:S/++$/xx/:S/+$//} +_BLNK_TMP_PKGVAR:= ${_BLNK_TMP_PKGVAR:S/^PAM$/pam/} +_BLNK_TMP_PKGVAR:= ${_BLNK_TMP_PKGVAR:S/^freetype-lib$/freetype/} +_BLNK_TMP_PKGVAR:= ${_BLNK_TMP_PKGVAR:S/^gettext-lib$/gettext/} +_BLNK_TMP_PKGVAR:= ${_BLNK_TMP_PKGVAR:S/^libaudiofile$/audiofile/} +_BLNK_TMP_PKGVAR:= ${_BLNK_TMP_PKGVAR:S/^libgetopt$/getopt/} +_BLNK_TMP_PKGVAR:= ${_BLNK_TMP_PKGVAR:S/^libiconv$/iconv/} +_BLNK_TMP_PKGVAR:= ${_BLNK_TMP_PKGVAR:S/^libtool-base$/libtool/} +_BLNK_TMP_PKGVAR:= ${_BLNK_TMP_PKGVAR:C/^py[0-9][0-9][^-]*-/py-/} +_BLNK_INSTALLED_PKGBASE.${_BLNK_TMP_PKGVAR}:= ${_BLNK_TMP_PKGBASE} +_BLNK_INSTALLED_DEPPKGS:= \ + ${_BLNK_INSTALLED_DEPPKGS:N${_BLNK_TMP_PKGVAR}} \ + ${_BLNK_TMP_PKGVAR} +. undef _BLNK_TMP +. undef _BLNK_TMP_PKGVAR +. undef _BLNK_TMP_PKGBASE +. endfor +_BLNK_INSTALLED_DEPDIRS= # empty +. for _pkg_ in ${_BLNK_INSTALLED_DEPPKGS} +# +# We are using the pkgsrc-installed dependency, so clearly we must not be +# using any built-in version of the same software. +# +USE_BUILTIN.${_pkg_}= no +# +# If BUILDLINK_PKGSRCDIR.<pkg> is already defined (by a previous inclusion +# of <pkg>'s buildlink2.mk file), then make that the default value for +# BUILDLINK_INSTALLED_PKGSRCDIR.<pkg>. Otherwise, try to dig it out of +# the +BUILD_INFO file of the installed package. +# +. if defined(BUILDLINK_PKGSRCDIR.${_pkg_}) +BUILDLINK_INSTALLED_PKGSRCDIR.${_pkg_}?= ${BUILDLINK_PKGSRCDIR.${_pkg_}} +. endif +. if !defined(BUILDLINK_INSTALLED_PKGSRCDIR.${_pkg_}) +BUILDLINK_INSTALLED_PKGSRCDIR.${_pkg_}!= \ + dir=`${PKG_INFO} -qB "${_BLNK_INSTALLED_PKGBASE.${_pkg_}}" | ${SED} -n "s/^PKGPATH=//p"`; ${ECHO} "../../$$dir" +. endif +. if exists(${BUILDLINK_INSTALLED_PKGSRCDIR.${_pkg_}}/buildlink3.mk) +_BLNK_INSTALLED_DEPDIRS:= \ + ${_BLNK_INSTALLED_DEPDIRS} \ + ${BUILDLINK_INSTALLED_PKGSRCDIR.${_pkg_}} +. endif +. endfor +_BLNK_INSTALLED_DEPDIRS.${_BLNK_PKGVAR}:= ${_BLNK_INSTALLED_DEPDIRS} +. undef _BLNK_INSTALLED_DEPDIRS +MAKEFLAGS+= _BLNK_INSTALLED_DEPDIRS.${_BLNK_PKGVAR}=${_BLNK_INSTALLED_DEPDIRS.${_BLNK_PKGVAR}:Q} +.endif +.for _dir_ in ${_BLNK_INSTALLED_DEPDIRS.${_BLNK_PKGVAR}} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +. include "${_dir_}/buildlink3.mk" +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +.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. The # necessary logic is encapsulated in a package's builtin.mk file, which @@ -110,7 +206,7 @@ USE_BUILTIN.${_pkg_}?= no # . if defined(BUILDLINK_PKGSRCDIR.${_pkg_}) . if exists(${BUILDLINK_PKGSRCDIR.${_pkg_}}/builtin.mk) -. include "${BUILDLINK_PKGSRCDIR.${_pkg_}}/builtin.mk" +. include "${BUILDLINK_PKGSRCDIR.${_pkg_}}/builtin.mk" . endif . endif .endfor @@ -120,6 +216,14 @@ USE_BUILTIN.${_pkg_}?= no USE_BUILTIN.${_pkg_}?= no .endfor +# Default value for BUILDLINK_PKGBASE.<pkg>. This is here to set the +# default for any package added to BUILDLINK_PACKAGES by any of the +# above code. +# +.for _pkg_ in ${BUILDLINK_PACKAGES} +BUILDLINK_PKGBASE.${_pkg_}?= ${_pkg_} +.endfor + # Set IGNORE_PKG.<pkg> if <pkg> is the current package we're building. # We can then check for this value to avoid build loops. # diff --git a/mk/curses.buildlink3.mk b/mk/curses.buildlink3.mk index 2924bfdf74e..fcd4cd91f6c 100644 --- a/mk/curses.buildlink3.mk +++ b/mk/curses.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: curses.buildlink3.mk,v 1.1 2004/02/13 01:02:06 jlam Exp $ +# $NetBSD: curses.buildlink3.mk,v 1.2 2004/03/18 09:12:13 jlam Exp $ # # This file should be included by Makefiles for packages that use curses. # If a system curses isn't available, then add a dependency on ncurses. @@ -6,11 +6,7 @@ # If a package genuinely requires ncurses, then it should directly include # ncurses/buildlink3.mk instead of this file in the package Makefile. -.if !defined(CURSES_BUILDLINK3_MK) -CURSES_BUILDLINK3_MK= # defined - -. if !exists(/usr/include/curses.h) && \ - !exists(/usr/include/ncurses.h) -. include "../../devel/ncurses/buildlink3.mk" -. endif -.endif # CURSES_BUILDLINK3_MK +.if !exists(/usr/include/curses.h) && \ + !exists(/usr/include/ncurses.h) +. include "../../devel/ncurses/buildlink3.mk" +.endif diff --git a/mk/krb5.buildlink3.mk b/mk/krb5.buildlink3.mk index 993fa87ea26..4f2ed7cc0d1 100644 --- a/mk/krb5.buildlink3.mk +++ b/mk/krb5.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: krb5.buildlink3.mk,v 1.5 2004/02/06 18:45:03 jlam Exp $ +# $NetBSD: krb5.buildlink3.mk,v 1.6 2004/03/18 09:12:13 jlam Exp $ # # This Makefile fragment is meant to be included by packages that # require a Kerberos 5 implementation. krb5.buildlink3.mk will: @@ -19,7 +19,7 @@ KRB5_BUILDLINK3_MK:= ${KRB5_BUILDLINK3_MK}+ .include "../../mk/bsd.prefs.mk" -.if !empty(KRB5_BUILDLINK3_MK) +.if !empty(KRB5_BUILDLINK3_MK:M+) KRB5_DEFAULT?= # empty KRB5_ACCEPTED?= ${_KRB5_PKGS} @@ -47,21 +47,21 @@ MAKEFLAGS+= _KRB5_INSTALLED.${_krb5_}=${_KRB5_INSTALLED.${_krb5_}} . endif . endfor -. if !defined(_KRB5) +. if !defined(_KRB5_TYPE) # # Prefer the default one if it's accepted,... # . if !empty(_KRB5_DEFAULT) && \ defined(_KRB5_OK.${_KRB5_DEFAULT}) && \ !empty(_KRB5_OK.${_KRB5_DEFAULT}:M[yY][eE][sS]) -_KRB5= ${_KRB5_DEFAULT} +_KRB5_TYPE= ${_KRB5_DEFAULT} . endif # # ...otherwise, use one of the installed Kerberos 5 packages,... # . for _krb5_ in ${_KRB5_ACCEPTED} . if !empty(_KRB5_INSTALLED.${_krb5_}:M[yY][eE][sS]) -_KRB5?= ${_krb5_} +_KRB5_TYPE?= ${_krb5_} . else _KRB5_FIRSTACCEPTED?= ${_krb5_} . endif @@ -70,31 +70,31 @@ _KRB5_FIRSTACCEPTED?= ${_krb5_} # ...otherwise, just use the first accepted Kerberos 5 package. # . if defined(_KRB5_FIRSTACCEPTED) -_KRB5?= ${_KRB5_FIRSTACCEPTED} +_KRB5_TYPE?= ${_KRB5_FIRSTACCEPTED} . endif -_KRB5?= none -MAKEFLAGS+= _KRB5=${_KRB5} +_KRB5_TYPE?= none +MAKEFLAGS+= _KRB5_TYPE=${_KRB5_TYPE} . endif -KRB5_TYPE= ${_KRB5} +KRB5_TYPE= ${_KRB5_TYPE} BUILD_DEFS+= KRB5_TYPE -. if ${KRB5_TYPE} == "none" +.endif # KRB5_BUILDLINK3_MK + +.if ${KRB5_TYPE} == "none" PKG_FAIL_REASON= "No acceptable Kerberos 5 implementation found." -. else +.else # # Packages that use Kerberos are automatically categorized as restricted # packages. # CRYPTO+= uses Kerberos encryption code -. if ${KRB5_TYPE} == "heimdal" +. if ${KRB5_TYPE} == "heimdal" KRB5BASE= ${BUILDLINK_PREFIX.heimdal} -. include "../../security/heimdal/buildlink3.mk" -. elif ${KRB5_TYPE} == "mit-krb5" +. include "../../security/heimdal/buildlink3.mk" +. elif ${KRB5_TYPE} == "mit-krb5" KRB5BASE= ${BUILDLINK_PREFIX.mit-krb5} -. include "../../security/mit-krb5/buildlink3.mk" -. endif +. include "../../security/mit-krb5/buildlink3.mk" . endif +.endif BUILD_DEFS+= KRB5BASE - -.endif # KRB5_BUILDLINK3_MK diff --git a/mk/ossaudio.buildlink3.mk b/mk/ossaudio.buildlink3.mk index 48985b1dae9..02237fe540b 100644 --- a/mk/ossaudio.buildlink3.mk +++ b/mk/ossaudio.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: ossaudio.buildlink3.mk,v 1.1 2004/01/03 23:06:44 jlam Exp $ +# $NetBSD: ossaudio.buildlink3.mk,v 1.2 2004/03/18 09:12:13 jlam Exp $ # # This file should be included by Makefiles for packages that use OSS. # By checking the value of HAVE_OSS after including this file, it's possible @@ -11,50 +11,50 @@ # CONFIGURE_ENV+= ac_cv_libossaudio__oss_ioctl=no # .endif # -.if !defined(OSSAUDIO_BUILDLINK3_MK) -OSSAUDIO_BUILDLINK3_MK= # defined +OSSAUDIO_BUILDLINK3_MK:= ${OSSAUDIO_BUILDLINK3_MK}+ .include "../../mk/bsd.prefs.mk" -.if defined(USE_OSS) +.if !empty(OSSAUDIO_BUILDLINK3_MK:M+) +. if defined(USE_OSS) BUILD_DEFS+= USE_OSS -.endif - -.if !defined(_HAVE_OSS) +. endif +. if !defined(_HAVE_OSS) _HAVE_OSS!= if ${PKG_INFO} -qe oss; then ${ECHO} YES; else ${ECHO} NO; fi MAKEFLAGS+= _HAVE_OSS=${_HAVE_OSS} -.endif - +. endif HAVE_OSS?= ${_HAVE_OSS} +.endif # OSSAUDIO_BUILDLINK3_MK .if defined(HAVE_OSS) && (${HAVE_OSS} == "YES") . include "../../audio/oss/buildlink3.mk" .else -BUILDLINK_PREFIX.oss= /usr +BUILDLINK_PREFIX.oss= /usr . if ${OPSYS} == "NetBSD" -LIBOSSAUDIO?= -lossaudio -DEVOSSAUDIO?= /dev/audio -DEVOSSSOUND?= /dev/sound +LIBOSSAUDIO?= -lossaudio +DEVOSSAUDIO?= /dev/audio +DEVOSSSOUND?= /dev/sound . elif ${OPSYS} == "Linux" -LIBOSSAUDIO?= # empty -DEVOSSAUDIO?= /dev/dsp -DEVOSSSOUND?= /dev/dsp +LIBOSSAUDIO?= # empty +DEVOSSAUDIO?= /dev/dsp +DEVOSSSOUND?= /dev/dsp . else -LIBOSSAUDIO?= # empty -DEVOSSAUDIO?= /dev/audio -DEVOSSSOUND?= /dev/sound +LIBOSSAUDIO?= # empty +DEVOSSAUDIO?= /dev/audio +DEVOSSSOUND?= /dev/sound . endif .endif -CONFIGURE_ENV+= LIBOSSAUDIO="${LIBOSSAUDIO}" -CONFIGURE_ENV+= DEVOSSAUDIO="${DEVOSSAUDIO}" -CONFIGURE_ENV+= DEVOSSSOUND="${DEVOSSSOUND}" +.if !empty(OSSAUDIO_BUILDLINK3_MK:M+) +CONFIGURE_ENV+= LIBOSSAUDIO="${LIBOSSAUDIO}" +CONFIGURE_ENV+= DEVOSSAUDIO="${DEVOSSAUDIO}" +CONFIGURE_ENV+= DEVOSSSOUND="${DEVOSSSOUND}" -MAKE_ENV+= LIBOSSAUDIO="${LIBOSSAUDIO}" -MAKE_ENV+= DEVOSSAUDIO="${DEVOSSAUDIO}" -MAKE_ENV+= DEVOSSSOUND="${DEVOSSSOUND}" +MAKE_ENV+= LIBOSSAUDIO="${LIBOSSAUDIO}" +MAKE_ENV+= DEVOSSAUDIO="${DEVOSSAUDIO}" +MAKE_ENV+= DEVOSSSOUND="${DEVOSSSOUND}" -BUILDLINK_TARGETS+= buildlink-ossaudio-soundcard-h +BUILDLINK_TARGETS+= buildlink-ossaudio-soundcard-h # Many programs expect <soundcard.h> to be found as <sys/soundcard.h>. # Also include <sys/ioctl.h> prior to include <soundcard.h> since we need @@ -81,5 +81,4 @@ buildlink-ossaudio-soundcard-h: ${MKDIR} `${DIRNAME} $${mach_soundcard_h}`; \ ${LN} -s $${sys_soundcard_h} $${mach_soundcard_h}; \ fi - .endif # OSSAUDIO_BUILDLINK3_MK diff --git a/mk/pthread.buildlink3.mk b/mk/pthread.buildlink3.mk index 83b08f4be55..449e8ae9c75 100644 --- a/mk/pthread.buildlink3.mk +++ b/mk/pthread.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: pthread.buildlink3.mk,v 1.2 2004/01/25 16:17:37 jlam Exp $ +# $NetBSD: pthread.buildlink3.mk,v 1.3 2004/03/18 09:12:13 jlam Exp $ # # The pthreads strategy for pkgsrc is to "bless" a particular pthread # package as the Official Pthread Replacement (OPR). A package that uses @@ -101,6 +101,8 @@ # Makefile for ${_PKG_PTHREAD}. It's used to see if ${_PKG_PTHREADS} # can actually be used to replace a native pthreads. # +PTHREAD_BUILDLINK3_MK:= ${PTHREAD_BUILDLINK3_MK}+ + _PKG_PTHREAD?= pth _PKG_PTHREAD_DEPENDS?= pth>=2.0.0 _PKG_PTHREAD_PKGSRCDIR?= ../../devel/${_PKG_PTHREAD} @@ -138,9 +140,6 @@ PKG_SKIP_REASON= "${PKGNAME} requires a working pthreads implementation." . endif .endif -.if !defined(PTHREAD_BUILDLINK3_MK) -PTHREAD_BUILDLINK3_MK= # defined - .if ${PTHREAD_TYPE} == "native" # # Link the native pthread libraries and headers into ${BUILDLINK_DIR}. @@ -175,6 +174,8 @@ PKG_SKIP_REASON= "${PKGNAME} needs pthreads, but ${_PKG_PTHREAD_BUILDLINK3_MK} i . endif .endif +.if !empty(PTHREAD_BUILDLINK3_MK:M+) +# # Define user-visible PTHREAD_CFLAGS and PTHREAD_LDFLAGS as compiler # options used to compile/link pthreaded code. # @@ -184,5 +185,4 @@ PTHREAD_LDFLAGS= ${BUILDLINK_LDFLAGS.pthread} ${BUILDLINK_LDADD.pthread} PTHREADBASE= ${BUILDLINK_PREFIX.pthread} CONFIGURE_ENV+= PTHREADBASE=${PTHREADBASE} MAKE_ENV+= PTHREADBASE=${PTHREADBASE} - .endif # PTHREAD_BUILDLINK3_MK diff --git a/multimedia/gstreamer/buildlink3.mk b/multimedia/gstreamer/buildlink3.mk index 409c0224e9f..f7a9a8a40a2 100644 --- a/multimedia/gstreamer/buildlink3.mk +++ b/multimedia/gstreamer/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:13 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GSTREAMER_BUILDLINK3_MK:= ${GSTREAMER_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= gstreamer .if !empty(GSTREAMER_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gstreamer+= gstreamer>=0.6.4 BUILDLINK_PKGSRCDIR.gstreamer?= ../../multimedia/gstreamer +.endif # GSTREAMER_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" @@ -20,6 +21,4 @@ BUILDLINK_PKGSRCDIR.gstreamer?= ../../multimedia/gstreamer .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" -.endif # GSTREAMER_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/multimedia/mjpegtools/buildlink3.mk b/multimedia/mjpegtools/buildlink3.mk index 905dc54d744..d50bcb95d99 100644 --- a/multimedia/mjpegtools/buildlink3.mk +++ b/multimedia/mjpegtools/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:13 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ MJPEGTOOLS_BUILDLINK3_MK:= ${MJPEGTOOLS_BUILDLINK3_MK}+ @@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+= mjpegtools .if !empty(MJPEGTOOLS_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.mjpegtools+= mjpegtools>=1.6.1.90nb3 BUILDLINK_PKGSRCDIR.mjpegtools?= ../../multimedia/mjpegtools +.endif # MJPEGTOOLS_BUILDLINK3_MK .include "../../audio/lame/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" .include "../../graphics/ImageMagick/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" -.endif # MJPEGTOOLS_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/multimedia/openquicktime/buildlink3.mk b/multimedia/openquicktime/buildlink3.mk index 918fbd3746f..977f9fc35f8 100644 --- a/multimedia/openquicktime/buildlink3.mk +++ b/multimedia/openquicktime/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/03/06 11:09:44 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:13 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OPENQUICKTIME_BUILDLINK3_MK:= ${OPENQUICKTIME_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= openquicktime .if !empty(OPENQUICKTIME_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.openquicktime+= openquicktime>=1.0nb2 BUILDLINK_PKGSRCDIR.openquicktime?= ../../multimedia/openquicktime +.endif # OPENQUICKTIME_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" -.endif # OPENQUICKTIME_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/multimedia/xine-lib/buildlink3.mk b/multimedia/xine-lib/buildlink3.mk index b06fb5f06a4..9e95b1b3af7 100644 --- a/multimedia/xine-lib/buildlink3.mk +++ b/multimedia/xine-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/11 17:26:02 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:13 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XINE_LIB_BUILDLINK3_MK:= ${XINE_LIB_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= xine-lib .if !empty(XINE_LIB_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xine-lib+= xine-lib>=1rc3a BUILDLINK_PKGSRCDIR.xine-lib?= ../../multimedia/xine-lib +.endif # XINE_LIB_BUILDLINK3_MK .include "../../audio/flac/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" @@ -26,6 +27,4 @@ BUILDLINK_PKGSRCDIR.xine-lib?= ../../multimedia/xine-lib .include "../../graphics/png/buildlink3.mk" .include "../../multimedia/xvidcore/buildlink3.mk" -.endif # XINE_LIB_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/net/ORBit/buildlink3.mk b/net/ORBit/buildlink3.mk index b92e3d33512..9406429c902 100644 --- a/net/ORBit/buildlink3.mk +++ b/net/ORBit/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:13 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ORBIT_BUILDLINK3_MK:= ${ORBIT_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= ORBit .if !empty(ORBIT_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.ORBit+= ORBit>=0.5.15nb5 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/+$//} diff --git a/net/ORBit2/buildlink3.mk b/net/ORBit2/buildlink3.mk index fb964e39e3b..b80feb63f7a 100644 --- a/net/ORBit2/buildlink3.mk +++ b/net/ORBit2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:13 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ORBIT2_BUILDLINK3_MK:= ${ORBIT2_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= ORBit2 .if !empty(ORBIT2_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.ORBit2+= ORBit2>=2.8.2 BUILDLINK_PKGSRCDIR.ORBit2?= ../../net/ORBit2 +.endif # ORBIT2_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../net/libIDL/buildlink3.mk" -.endif # ORBIT2_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/net/SDL_net/buildlink3.mk b/net/SDL_net/buildlink3.mk index 9803723e92b..6331ac11523 100644 --- a/net/SDL_net/buildlink3.mk +++ b/net/SDL_net/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/06 17:28:59 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:13 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SDL_NET_BUILDLINK3_MK:= ${SDL_NET_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= SDL_net .if !empty(SDL_NET_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.SDL_net+= SDL_net>=1.2.5nb1 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/+$//} diff --git a/net/gnet/buildlink3.mk b/net/gnet/buildlink3.mk index 86d0e16da8b..2fac4f3c97d 100644 --- a/net/gnet/buildlink3.mk +++ b/net/gnet/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GNET_BUILDLINK3_MK:= ${GNET_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= gnet .if !empty(GNET_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gnet+= gnet>=2.0.3nb1 BUILDLINK_PKGSRCDIR.gnet?= ../../net/gnet +.endif # GNET_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" -.endif # GNET_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/net/gnet1/buildlink3.mk b/net/gnet1/buildlink3.mk index 503519f7731..35a8896ba1d 100644 --- a/net/gnet1/buildlink3.mk +++ b/net/gnet1/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GNET1_BUILDLINK3_MK:= ${GNET1_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= gnet1 .if !empty(GNET1_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gnet1+= gnet1>=1.1.8nb2 BUILDLINK_PKGSRCDIR.gnet1?= ../../net/gnet1 +.endif # GNET1_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" -.endif # GNET1_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/net/libIDL/buildlink3.mk b/net/libIDL/buildlink3.mk index 69ce8b1a0f2..3b39ccd7191 100644 --- a/net/libIDL/buildlink3.mk +++ b/net/libIDL/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBIDL_BUILDLINK3_MK:= ${LIBIDL_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= libIDL .if !empty(LIBIDL_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libIDL+= libIDL>=0.8.2 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/+$//} diff --git a/net/libsoup/buildlink3.mk b/net/libsoup/buildlink3.mk index c45e3c0b482..6e37d043471 100644 --- a/net/libsoup/buildlink3.mk +++ b/net/libsoup/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBSOUP_BUILDLINK3_MK:= ${LIBSOUP_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= libsoup .if !empty(LIBSOUP_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libsoup+= libsoup>=1.99.26 BUILDLINK_PKGSRCDIR.libsoup?= ../../net/libsoup +.endif # LIBSOUP_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" -.endif # LIBSOUP_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/net/netatalk/buildlink3.mk b/net/netatalk/buildlink3.mk index 97bb87568ca..f3024f6ab54 100644 --- a/net/netatalk/buildlink3.mk +++ b/net/netatalk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ NETATALK_BUILDLINK3_MK:= ${NETATALK_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= netatalk .if !empty(NETATALK_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.netatalk+= netatalk>=1.6.2 BUILDLINK_PKGSRCDIR.netatalk?= ../../net/netatalk +.endif # NETATALK_BUILDLINK3_MK .include "../../devel/rx/buildlink3.mk" -.endif # NETATALK_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/net/py-ORBit/buildlink3.mk b/net/py-ORBit/buildlink3.mk index fd064643c49..0f372bc4540 100644 --- a/net/py-ORBit/buildlink3.mk +++ b/net/py-ORBit/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/03/16 18:23:27 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PY_ORBIT_BUILDLINK3_MK:= ${PY_ORBIT_BUILDLINK3_MK}+ @@ -16,9 +16,8 @@ BUILDLINK_PACKAGES+= pyorbit BUILDLINK_PKGBASE.pyorbit?= ${PYPKGPREFIX}-ORBit BUILDLINK_DEPENDS.pyorbit+= ${PYPKGPREFIX}-ORBit>=2.0.0nb1 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/+$//} diff --git a/print/cups/buildlink3.mk b/print/cups/buildlink3.mk index 68458847098..4a1dab3c2a3 100644 --- a/print/cups/buildlink3.mk +++ b/print/cups/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:39 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2004/03/18 09:12:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ CUPS_BUILDLINK3_MK:= ${CUPS_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= cups .if !empty(CUPS_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.cups+= cups>=1.1.19nb3 BUILDLINK_PKGSRCDIR.cups?= ../../print/cups +.endif # CUPS_BUILDLINK3_MK .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" -.endif # CUPS_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/print/gimp-print-lib/buildlink3.mk b/print/gimp-print-lib/buildlink3.mk index 141c566644d..c16bf6e6432 100644 --- a/print/gimp-print-lib/buildlink3.mk +++ b/print/gimp-print-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/06 23:46:06 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GIMP_PRINT_LIB_BUILDLINK3_MK:= ${GIMP_PRINT_LIB_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= gimp-print-lib .if !empty(GIMP_PRINT_LIB_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gimp-print-lib+= gimp-print-lib>=4.2.5nb1 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/+$//} diff --git a/print/libgnomeprint/buildlink3.mk b/print/libgnomeprint/buildlink3.mk index 41fdcc30d13..afe1cf843de 100644 --- a/print/libgnomeprint/buildlink3.mk +++ b/print/libgnomeprint/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:39 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGNOMEPRINT_BUILDLINK3_MK:= ${LIBGNOMEPRINT_BUILDLINK3_MK}+ @@ -15,6 +15,7 @@ BUILDLINK_PACKAGES+= libgnomeprint .if !empty(LIBGNOMEPRINT_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libgnomeprint+= libgnomeprint>=2.4.2nb1 BUILDLINK_PKGSRCDIR.libgnomeprint?= ../../print/libgnomeprint +.endif # LIBGNOMEPRINT_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" @@ -27,6 +28,4 @@ BUILDLINK_PKGSRCDIR.libgnomeprint?= ../../print/libgnomeprint . include "../../print/cups/buildlink3.mk" .endif -.endif # LIBGNOMEPRINT_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/print/libgnomeprintui/buildlink3.mk b/print/libgnomeprintui/buildlink3.mk index 676643f7948..277a42f8d69 100644 --- a/print/libgnomeprintui/buildlink3.mk +++ b/print/libgnomeprintui/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:39 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGNOMEPRINTUI_BUILDLINK3_MK:= ${LIBGNOMEPRINTUI_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= libgnomeprintui .if !empty(LIBGNOMEPRINTUI_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libgnomeprintui+= libgnomeprintui>=2.4.2nb1 BUILDLINK_PKGSRCDIR.libgnomeprintui?= ../../print/libgnomeprintui +.endif # LIBGNOMEPRINTUI_BUILDLINK3_MK .include "../../devel/GConf2/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -24,6 +25,4 @@ BUILDLINK_PKGSRCDIR.libgnomeprintui?= ../../print/libgnomeprintui .include "../../print/libgnomeprint/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" -.endif # LIBGNOMEPRINTUI_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/print/pdflib/buildlink3.mk b/print/pdflib/buildlink3.mk index 5ff869df492..9163d577bae 100644 --- a/print/pdflib/buildlink3.mk +++ b/print/pdflib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:39 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PDFLIB_BUILDLINK3_MK:= ${PDFLIB_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= pdflib .if !empty(PDFLIB_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.pdflib+= pdflib>=4.0.3nb2 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/+$//} diff --git a/print/xfce4-print/buildlink3.mk b/print/xfce4-print/buildlink3.mk index d70f82be0ba..6ecb3868fcc 100644 --- a/print/xfce4-print/buildlink3.mk +++ b/print/xfce4-print/buildlink3.mk @@ -1,9 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $ -# XXX -# XXX This file was created automatically using createbuildlink-3.3. -# XXX After this file as been verified as correct, the comment lines -# XXX beginning with "XXX" should be removed. Please do not commit -# XXX unverified buildlink[23].mk files. +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_PRINT_BUILDLINK3_MK:= ${XFCE4_PRINT_BUILDLINK3_MK}+ @@ -18,10 +13,9 @@ BUILDLINK_PACKAGES+= xfce4-print .if !empty(XFCE4_PRINT_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xfce4-print+= xfce4-print>=4.0.4nb1 BUILDLINK_PKGSRCDIR.xfce4-print?= ../../print/xfce4-print +.endif # XFCE4_PRINT_BUILDLINK3_MK .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_PRINT_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/security/gnutls/buildlink3.mk b/security/gnutls/buildlink3.mk index 999ab77d92d..2a7f06111fc 100644 --- a/security/gnutls/buildlink3.mk +++ b/security/gnutls/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/03/16 17:58:01 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GNUTLS_BUILDLINK3_MK:= ${GNUTLS_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= gnutls .if !empty(GNUTLS_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gnutls+= gnutls>=1.0.8 BUILDLINK_PKGSRCDIR.gnutls?= ../../security/gnutls +.endif # GNUTLS_BUILDLINK3_MK .include "../../archivers/liblzo/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -21,6 +22,4 @@ BUILDLINK_PKGSRCDIR.gnutls?= ../../security/gnutls .include "../../security/libtasn1/buildlink3.mk" .include "../../security/opencdk/buildlink3.mk" -.endif # GNUTLS_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/security/gpgme/buildlink3.mk b/security/gpgme/buildlink3.mk index c5b0d2a2d40..21f27b4df54 100644 --- a/security/gpgme/buildlink3.mk +++ b/security/gpgme/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:39 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GPGME_BUILDLINK3_MK:= ${GPGME_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= gpgme .if !empty(GPGME_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gpgme+= gpgme>=0.4.3 BUILDLINK_PKGSRCDIR.gpgme?= ../../security/gpgme +.endif # GPGME_BUILDLINK3_MK .include "../../security/libgpg-error/buildlink3.mk" -.endif # GPGME_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/security/gsasl/buildlink3.mk b/security/gsasl/buildlink3.mk index 484aa12af0c..c967c2092f2 100644 --- a/security/gsasl/buildlink3.mk +++ b/security/gsasl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:39 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GSASL_BUILDLINK3_MK:= ${GSASL_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= gsasl .if !empty(GSASL_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gsasl+= gsasl>=0.0.8 BUILDLINK_PKGSRCDIR.gsasl?= ../../security/gsasl +.endif # GSASL_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libidn/buildlink3.mk" @@ -20,6 +21,4 @@ BUILDLINK_PKGSRCDIR.gsasl?= ../../security/gsasl .include "../../security/gss/buildlink3.mk" .include "../../security/libgcrypt/buildlink3.mk" -.endif # GSASL_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/security/libgcrypt/buildlink3.mk b/security/libgcrypt/buildlink3.mk index 9bdbd56efcc..86e3da5fc8c 100644 --- a/security/libgcrypt/buildlink3.mk +++ b/security/libgcrypt/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:39 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGCRYPT_BUILDLINK3_MK:= ${LIBGCRYPT_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= libgcrypt .if !empty(LIBGCRYPT_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libgcrypt+= libgcrypt>=1.1.92 BUILDLINK_PKGSRCDIR.libgcrypt?= ../../security/libgcrypt +.endif # LIBGCRYPT_BUILDLINK3_MK .include "../../security/libgpg-error/buildlink3.mk" -.endif # LIBGCRYPT_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/security/libgpg-error/buildlink3.mk b/security/libgpg-error/buildlink3.mk index c46f2bf2c6d..71da79d7caa 100644 --- a/security/libgpg-error/buildlink3.mk +++ b/security/libgpg-error/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:39 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGPG_ERROR_BUILDLINK3_MK:= ${LIBGPG_ERROR_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= libgpg-error .if !empty(LIBGPG_ERROR_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libgpg-error+= libgpg-error>=0.6 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/+$//} diff --git a/security/libksba/buildlink3.mk b/security/libksba/buildlink3.mk index a8bbf83d17d..42b35cafa53 100644 --- a/security/libksba/buildlink3.mk +++ b/security/libksba/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:39 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBKSBA_BUILDLINK3_MK:= ${LIBKSBA_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= libksba .if !empty(LIBKSBA_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libksba+= libksba>=0.9.4 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/+$//} diff --git a/security/libtcpa/buildlink3.mk b/security/libtcpa/buildlink3.mk index 286b4b1564a..20e8ce8df85 100644 --- a/security/libtcpa/buildlink3.mk +++ b/security/libtcpa/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:39 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBTCPA_BUILDLINK3_MK:= ${LIBTCPA_BUILDLINK3_MK}+ @@ -14,9 +14,8 @@ BUILDLINK_PACKAGES+= libtcpa BUILDLINK_DEPENDS.libtcpa+= libtcpa>=1.1b 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/+$//} diff --git a/security/opencdk/buildlink3.mk b/security/opencdk/buildlink3.mk index 2c3f836e1b6..f651d0cc604 100644 --- a/security/opencdk/buildlink3.mk +++ b/security/opencdk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OPENCDK_BUILDLINK3_MK:= ${OPENCDK_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= opencdk .if !empty(OPENCDK_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.opencdk+= opencdk>=0.5.3 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/+$//} diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk index 5002ed30884..5a600e1b50a 100644 --- a/security/openssl/buildlink3.mk +++ b/security/openssl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2004/03/10 17:57:15 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2004/03/18 09:12:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OPENSSL_BUILDLINK3_MK:= ${OPENSSL_BUILDLINK3_MK}+ @@ -23,11 +23,10 @@ BUILDLINK_TRANSFORM+= reorder:l:crypt:crypto SSLBASE= ${BUILDLINK_PREFIX.openssl} BUILD_DEFS+= SSLBASE +.endif # OPENSSL_BUILDLINK3_MK .if defined(USE_RSAREF2) && !empty(USE_RSAREF2:M[yY][eE][sS]) . include "../../security/rsaref/buildlink3.mk" .endif -.endif # OPENSSL_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/gkrellm/buildlink3.mk b/sysutils/gkrellm/buildlink3.mk index f93f7db3398..d361d52c1de 100644 --- a/sysutils/gkrellm/buildlink3.mk +++ b/sysutils/gkrellm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GKRELLM_BUILDLINK3_MK:= ${GKRELLM_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= gkrellm .if !empty(GKRELLM_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gkrellm+= gkrellm>=2.1.22 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/+$//} diff --git a/sysutils/gkrellm1/buildlink3.mk b/sysutils/gkrellm1/buildlink3.mk index 69c330271d2..5a276c8a0e6 100644 --- a/sysutils/gkrellm1/buildlink3.mk +++ b/sysutils/gkrellm1/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/12 04:56:49 snj Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GKRELLM_BUILDLINK3_MK:= ${GKRELLM_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= gkrellm .if !empty(GKRELLM_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gkrellm+= gkrellm>=1.2.13nb3 BUILDLINK_PKGSRCDIR.gkrellm?= ../../sysutils/gkrellm1 +.endif # GKRELLM_BUILDLINK3_MK .include "../../graphics/imlib/buildlink3.mk" -.endif # GKRELLM_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/gnome-vfs/buildlink3.mk b/sysutils/gnome-vfs/buildlink3.mk index 7218898575a..e662a21b601 100644 --- a/sysutils/gnome-vfs/buildlink3.mk +++ b/sysutils/gnome-vfs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/03/16 14:04:44 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GNOME_VFS_BUILDLINK3_MK:= ${GNOME_VFS_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= gnome-vfs .if !empty(GNOME_VFS_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gnome-vfs+= gnome-vfs>=1.0.5nb5 BUILDLINK_PKGSRCDIR.gnome-vfs?= ../../sysutils/gnome-vfs +.endif # GNOME_VFS_BUILDLINK3_MK .include "../../archivers/bzip2/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" @@ -20,6 +21,4 @@ BUILDLINK_PKGSRCDIR.gnome-vfs?= ../../sysutils/gnome-vfs .include "../../devel/GConf/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.endif # GNOME_VFS_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/gnome-vfs2/buildlink3.mk b/sysutils/gnome-vfs2/buildlink3.mk index 6159b546ecf..6bb1054442a 100644 --- a/sysutils/gnome-vfs2/buildlink3.mk +++ b/sysutils/gnome-vfs2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:40 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GNOME_VFS2_BUILDLINK3_MK:= ${GNOME_VFS2_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= gnome-vfs2 .if !empty(GNOME_VFS2_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.4.2nb2 BUILDLINK_PKGSRCDIR.gnome-vfs2?= ../../sysutils/gnome-vfs2 +.endif # GNOME_VFS2_BUILDLINK3_MK .include "../../archivers/bzip2/buildlink3.mk" .include "../../audio/cdparanoia/buildlink3.mk" @@ -27,6 +28,4 @@ BUILDLINK_PKGSRCDIR.gnome-vfs2?= ../../sysutils/gnome-vfs2 .include "../../sysutils/fam/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" -.endif # GNOME_VFS2_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/nautilus/buildlink3.mk b/sysutils/nautilus/buildlink3.mk index f5c1e816aa8..6d4b531ee15 100644 --- a/sysutils/nautilus/buildlink3.mk +++ b/sysutils/nautilus/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:40 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ NAUTILUS_BUILDLINK3_MK:= ${NAUTILUS_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= nautilus .if !empty(NAUTILUS_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.nautilus+= nautilus>=2.4.2nb4 BUILDLINK_PKGSRCDIR.nautilus?= ../../sysutils/nautilus +.endif # NAUTILUS_BUILDLINK3_MK .include "../../audio/esound/buildlink3.mk" .include "../../devel/GConf2/schemas.mk" @@ -33,6 +34,4 @@ BUILDLINK_PKGSRCDIR.nautilus?= ../../sysutils/nautilus .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" -.endif # NAUTILUS_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/xfce4-diskperf-plugin/buildlink3.mk b/sysutils/xfce4-diskperf-plugin/buildlink3.mk index ead6ecbd4f1..ffb761343c6 100644 --- a/sysutils/xfce4-diskperf-plugin/buildlink3.mk +++ b/sysutils/xfce4-diskperf-plugin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:59:31 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK:= ${XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= xfce4-diskperf-plugin .if !empty(XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xfce4-diskperf-plugin+= xfce4-diskperf-plugin>=1.4nb4 BUILDLINK_PKGSRCDIR.xfce4-diskperf-plugin?= ../../sysutils/xfce4-diskperf-plugin +.endif # XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/xfce4-fm-icons/buildlink3.mk b/sysutils/xfce4-fm-icons/buildlink3.mk index 18c0aabf2b8..af5f47e0543 100644 --- a/sysutils/xfce4-fm-icons/buildlink3.mk +++ b/sysutils/xfce4-fm-icons/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_FM_ICONS_BUILDLINK3_MK:= ${XFCE4_FM_ICONS_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= xfce4-fm-icons .if !empty(XFCE4_FM_ICONS_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xfce4-fm-icons+= xfce4-fm-icons>=4.0.4nb1 BUILDLINK_PKGSRCDIR.xfce4-fm-icons?= ../../sysutils/xfce4-fm-icons +.endif # XFCE4_FM_ICONS_BUILDLINK3_MK .include "../../sysutils/xfce4-fm/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_FM_ICONS_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/xfce4-fm/buildlink3.mk b/sysutils/xfce4-fm/buildlink3.mk index 81edcf5414f..46f16bd55f0 100644 --- a/sysutils/xfce4-fm/buildlink3.mk +++ b/sysutils/xfce4-fm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_FM_BUILDLINK3_MK:= ${XFCE4_FM_BUILDLINK3_MK}+ @@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+= xfce4-fm .if !empty(XFCE4_FM_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xfce4-fm+= xfce4-fm>=4.0.4nb1 BUILDLINK_PKGSRCDIR.xfce4-fm?= ../../sysutils/xfce4-fm +.endif # XFCE4_FM_BUILDLINK3_MK .include "../../databases/dbh/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_FM_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/xfce4-minicmd-plugin/buildlink3.mk b/sysutils/xfce4-minicmd-plugin/buildlink3.mk index 3cf1d8770e3..9b7fe9a6763 100644 --- a/sysutils/xfce4-minicmd-plugin/buildlink3.mk +++ b/sysutils/xfce4-minicmd-plugin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:59:31 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_MINICMD_PLUGIN_BUILDLINK3_MK:= ${XFCE4_MINICMD_PLUGIN_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= xfce4-minicmd-plugin .if !empty(XFCE4_MINICMD_PLUGIN_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xfce4-minicmd-plugin+= xfce4-minicmd-plugin>=0.2.0nb4 BUILDLINK_PKGSRCDIR.xfce4-minicmd-plugin?= ../../sysutils/xfce4-minicmd-plugin +.endif # XFCE4_MINICMD_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_MINICMD_PLUGIN_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/xfce4-netload-plugin/buildlink3.mk b/sysutils/xfce4-netload-plugin/buildlink3.mk index b0190a3b962..9f33eaaa791 100644 --- a/sysutils/xfce4-netload-plugin/buildlink3.mk +++ b/sysutils/xfce4-netload-plugin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:59:31 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK:= ${XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= xfce4-netload-plugin .if !empty(XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xfce4-netload-plugin+= xfce4-netload-plugin>=0.2.2nb4 BUILDLINK_PKGSRCDIR.xfce4-netload-plugin?= ../../sysutils/xfce4-netload-plugin +.endif # XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/xfce4-showdesktop-plugin/buildlink3.mk b/sysutils/xfce4-showdesktop-plugin/buildlink3.mk index 8f79a17d7a3..64bb6ed8256 100644 --- a/sysutils/xfce4-showdesktop-plugin/buildlink3.mk +++ b/sysutils/xfce4-showdesktop-plugin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:59:31 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_SHOWDESKTOP_PLUGIN_BUILDLINK3_MK:= ${XFCE4_SHOWDESKTOP_PLUGIN_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= xfce4-showdesktop-plugin .if !empty(XFCE4_SHOWDESKTOP_PLUGIN_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xfce4-showdesktop-plugin+= xfce4-showdesktop-plugin>=0.1.1nb4 BUILDLINK_PKGSRCDIR.xfce4-showdesktop-plugin?= ../../sysutils/xfce4-showdesktop-plugin +.endif # XFCE4_SHOWDESKTOP_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_SHOWDESKTOP_PLUGIN_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/xfce4-systemload-plugin/buildlink3.mk b/sysutils/xfce4-systemload-plugin/buildlink3.mk index bc9cce271ce..56707f178a5 100644 --- a/sysutils/xfce4-systemload-plugin/buildlink3.mk +++ b/sysutils/xfce4-systemload-plugin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:59:31 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK:= ${XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= xfce4-systemload-plugin .if !empty(XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xfce4-systemload-plugin+= xfce4-systemload-plugin>=0.3.4nb4 BUILDLINK_PKGSRCDIR.xfce4-systemload-plugin?= ../../sysutils/xfce4-systemload-plugin +.endif # XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/xfce4-systray/buildlink3.mk b/sysutils/xfce4-systray/buildlink3.mk index 30b6c9ce048..e044aacc0d0 100644 --- a/sysutils/xfce4-systray/buildlink3.mk +++ b/sysutils/xfce4-systray/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_SYSTRAY_BUILDLINK3_MK:= ${XFCE4_SYSTRAY_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= xfce4-systray .if !empty(XFCE4_SYSTRAY_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xfce4-systray+= xfce4-systray>=4.0.4nb1 BUILDLINK_PKGSRCDIR.xfce4-systray?= ../../sysutils/xfce4-systray +.endif # XFCE4_SYSTRAY_BUILDLINK3_MK .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_SYSTRAY_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/textproc/enchant/buildlink3.mk b/textproc/enchant/buildlink3.mk index 0b50abb2414..8a663636705 100644 --- a/textproc/enchant/buildlink3.mk +++ b/textproc/enchant/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ENCHANT_BUILDLINK3_MK:= ${ENCHANT_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= enchant .if !empty(ENCHANT_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.enchant+= enchant>=1.1.3 BUILDLINK_PKGSRCDIR.enchant?= ../../textproc/enchant +.endif # ENCHANT_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../textproc/aspell/buildlink3.mk" -.endif # ENCHANT_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/textproc/gnome-spell/buildlink3.mk b/textproc/gnome-spell/buildlink3.mk index 0e911007a04..f863cd07f49 100644 --- a/textproc/gnome-spell/buildlink3.mk +++ b/textproc/gnome-spell/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:40 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GNOME_SPELL_BUILDLINK3_MK:= ${GNOME_SPELL_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= gnome-spell .if !empty(GNOME_SPELL_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gnome-spell+= gnome-spell>=1.0.5 BUILDLINK_PKGSRCDIR.gnome-spell?= ../../textproc/gnome-spell +.endif # GNOME_SPELL_BUILDLINK3_MK .include "../../devel/libbonobo/buildlink3.mk" .include "../../devel/libbonoboui/buildlink3.mk" @@ -22,6 +23,4 @@ BUILDLINK_PKGSRCDIR.gnome-spell?= ../../textproc/gnome-spell .include "../../textproc/aspell/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.endif # GNOME_SPELL_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/textproc/gtkspell/buildlink3.mk b/textproc/gtkspell/buildlink3.mk index 28f0244ef12..34f2d18955d 100644 --- a/textproc/gtkspell/buildlink3.mk +++ b/textproc/gtkspell/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GTKSPELL_BUILDLINK3_MK:= ${GTKSPELL_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= gtkspell .if !empty(GTKSPELL_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gtkspell+= gtkspell>=2.0.2nb6 BUILDLINK_PKGSRCDIR.gtkspell?= ../../textproc/gtkspell +.endif # GTKSPELL_BUILDLINK3_MK .include "../../textproc/aspell/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.endif # GTKSPELL_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/textproc/intltool/buildlink3.mk b/textproc/intltool/buildlink3.mk index ae5b435a2b0..0c4e85fffe1 100644 --- a/textproc/intltool/buildlink3.mk +++ b/textproc/intltool/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ INTLTOOL_BUILDLINK3_MK:= ${INTLTOOL_BUILDLINK3_MK}+ @@ -14,11 +14,13 @@ BUILDLINK_PACKAGES+= intltool BUILDLINK_DEPENDS.intltool+= intltool>=0.30 BUILDLINK_PKGSRCDIR.intltool?= ../../textproc/intltool BUILDLINK_DEPMETHOD.intltool?= build +.endif # INTLTOOL_BUILDLINK3_MK USE_PERL5?= build .include "../../lang/perl5/buildlink3.mk" +.if !empty(INTLTOOL_BUILDLINK3_MK:M+) CONFIGURE_ENV+= INTLTOOL_PERL="${PERL5}" INTLTOOLIZE= ${BUILDLINK_PREFIX.intltool}/bin/intltoolize @@ -29,7 +31,6 @@ intltoolize: ${_PKG_SILENT}${_PKG_DEBUG} \ ${ECHO} "=> Overriding intltool." @cd ${WRKSRC} && ${INTLTOOLIZE} --force >/dev/null 2>&1 - .endif # INTLTOOL_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/textproc/libcroco/buildlink3.mk b/textproc/libcroco/buildlink3.mk index 2981bbc2814..151bf569448 100644 --- a/textproc/libcroco/buildlink3.mk +++ b/textproc/libcroco/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBCROCO_BUILDLINK3_MK:= ${LIBCROCO_BUILDLINK3_MK}+ @@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+= libcroco .if !empty(LIBCROCO_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libcroco+= libcroco>=0.4.0 BUILDLINK_PKGSRCDIR.libcroco?= ../../textproc/libcroco +.endif # LIBCROCO_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" -.endif # LIBCROCO_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/textproc/libpathan/buildlink3.mk b/textproc/libpathan/buildlink3.mk index 58de2f30f91..9dd5a0a1ae7 100644 --- a/textproc/libpathan/buildlink3.mk +++ b/textproc/libpathan/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:40 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBPATHAN_BUILDLINK3_MK:= ${LIBPATHAN_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= libpathan .if !empty(LIBPATHAN_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libpathan+= libpathan>=1.2.2 BUILDLINK_PKGSRCDIR.libpathan?= ../../textproc/libpathan +.endif # LIBPATHAN_BUILDLINK3_MK .include "../../textproc/xerces-c/buildlink3.mk" -.endif # LIBPATHAN_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/textproc/libxml/buildlink3.mk b/textproc/libxml/buildlink3.mk index 628e7296a92..ec7bfaa69c4 100644 --- a/textproc/libxml/buildlink3.mk +++ b/textproc/libxml/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBXML_BUILDLINK3_MK:= ${LIBXML_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= libxml .if !empty(LIBXML_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libxml+= libxml>=1.8.11 BUILDLINK_PKGSRCDIR.libxml?= ../../textproc/libxml +.endif # LIBXML_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" -.endif # LIBXML_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/textproc/libxml2/buildlink3.mk b/textproc/libxml2/buildlink3.mk index 0eb1270b840..92d7415537c 100644 --- a/textproc/libxml2/buildlink3.mk +++ b/textproc/libxml2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:40 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBXML2_BUILDLINK3_MK:= ${LIBXML2_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= libxml2 .if !empty(LIBXML2_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libxml2+= libxml2>=2.6.2 BUILDLINK_PKGSRCDIR.libxml2?= ../../textproc/libxml2 +.endif # LIBXML2_BUILDLINK3_MK .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.endif # LIBXML2_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/textproc/libxslt/buildlink3.mk b/textproc/libxslt/buildlink3.mk index 927f025ecba..cc9d2b2175e 100644 --- a/textproc/libxslt/buildlink3.mk +++ b/textproc/libxslt/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:40 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBXSLT_BUILDLINK3_MK:= ${LIBXSLT_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= libxslt .if !empty(LIBXSLT_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libxslt+= libxslt>=1.1.0 BUILDLINK_PKGSRCDIR.libxslt?= ../../textproc/libxslt +.endif # LIBXSLT_BUILDLINK3_MK .include "../../lang/perl5/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" -.endif # LIBXSLT_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/textproc/opensp/buildlink3.mk b/textproc/opensp/buildlink3.mk index 29456094231..9de2ac4d76d 100644 --- a/textproc/opensp/buildlink3.mk +++ b/textproc/opensp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OPENSP_BUILDLINK3_MK:= ${OPENSP_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= opensp .if !empty(OPENSP_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.opensp+= opensp>=1.5nb1 BUILDLINK_PKGSRCDIR.opensp?= ../../textproc/opensp +.endif # OPENSP_BUILDLINK3_MK PTHREAD_OPTS+= native @@ -23,6 +24,4 @@ PTHREAD_OPTS+= native . include "../../devel/unproven-pthreads/buildlink3.mk" .endif -.endif # OPENSP_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/textproc/py-xml/buildlink3.mk b/textproc/py-xml/buildlink3.mk index 819fd2c3e85..3eb88c9c868 100644 --- a/textproc/py-xml/buildlink3.mk +++ b/textproc/py-xml/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/16 18:23:27 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PYXML_BUILDLINK3_MK:= ${PYXML_BUILDLINK3_MK}+ @@ -16,9 +16,8 @@ BUILDLINK_PACKAGES+= pyxml BUILDLINK_PKGBASE.pyxml?= ${PYPKGPREFIX}-xml BUILDLINK_DEPENDS.pyxml+= ${PYPKGPREFIX}-xml>=0.8.3nb1 BUILDLINK_PKGSRCDIR.pyxml?= ../../textproc/py-xml +.endif # PYXML_BUILDLINK3_MK .include "../../textproc/expat/buildlink3.mk" -.endif # PYXML_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/textproc/scrollkeeper/buildlink3.mk b/textproc/scrollkeeper/buildlink3.mk index 77a65f2c6d0..d455259f720 100644 --- a/textproc/scrollkeeper/buildlink3.mk +++ b/textproc/scrollkeeper/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:41 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SCROLLKEEPER_BUILDLINK3_MK:= ${SCROLLKEEPER_BUILDLINK3_MK}+ @@ -13,12 +13,14 @@ BUILDLINK_PACKAGES+= scrollkeeper .if !empty(SCROLLKEEPER_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.scrollkeeper+= scrollkeeper>=0.3.12nb2 BUILDLINK_PKGSRCDIR.scrollkeeper?= ../../textproc/scrollkeeper +.endif # SCROLLKEEPER_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" .include "../../textproc/xmlcatmgr/buildlink3.mk" +.if !empty(SCROLLKEEPER_BUILDLINK3_MK:M+) BUILDLINK_TARGETS+= scrollkeeper-buildlink-fake _SK_FAKE_UPDATE= ${BUILDLINK_DIR}/bin/scrollkeeper-update @@ -41,7 +43,6 @@ scrollkeeper-buildlink-fake: ${ECHO} "echo '[pkgsrc] Doing nothing for scrollkeeper-rebuilddb' \$$*" >> ${_SK_FAKE_REBUILDDB}; \ ${CHMOD} +x ${_SK_FAKE_REBUILDDB}; \ fi - .endif # SCROLLKEEPER_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/textproc/xalan-c/buildlink3.mk b/textproc/xalan-c/buildlink3.mk index 0a2ac62a402..166d2ec7fea 100644 --- a/textproc/xalan-c/buildlink3.mk +++ b/textproc/xalan-c/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XALAN_C_BUILDLINK3_MK:= ${XALAN_C_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= xalan-c .if !empty(XALAN_C_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xalan-c+= xalan-c>=1.6 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/+$//} diff --git a/textproc/xerces-c/buildlink3.mk b/textproc/xerces-c/buildlink3.mk index 3fe141e76f2..8e72d8ccdf5 100644 --- a/textproc/xerces-c/buildlink3.mk +++ b/textproc/xerces-c/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XERCES_C_BUILDLINK3_MK:= ${XERCES_C_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= xerces-c .if !empty(XERCES_C_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xerces-c+= xerces-c>=2.3.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/+$//} diff --git a/time/py-mxDateTime/buildlink3.mk b/time/py-mxDateTime/buildlink3.mk index 3b3e9512d90..20d16bc5c46 100644 --- a/time/py-mxDateTime/buildlink3.mk +++ b/time/py-mxDateTime/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2004/03/16 18:23:27 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PY_MXDATETIME_BUILDLINK3_MK:= ${PY_MXDATETIME_BUILDLINK3_MK}+ @@ -16,9 +16,7 @@ BUILDLINK_PACKAGES+= py-mxDateTime BUILDLINK_PKGBASE.py-mxDateTime?= ${PYPKGPREFIX}-mxDateTime BUILDLINK_DEPENDS.py-mxDateTime+= ${PYPKGPREFIX}-mxDateTime>=2.0.5 BUILDLINK_PKGSRCDIR.py-mxDateTime?= ../../time/py-mxDateTime - BUILDLINK_INCDIRS.py-mxDateTime+= ${PYSITELIB}/mx/DateTime/mxDateTime - .endif # PY_MXDATETIME_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/time/xfce4-datetime-plugin/buildlink3.mk b/time/xfce4-datetime-plugin/buildlink3.mk index 4466977146e..6257b8b98be 100644 --- a/time/xfce4-datetime-plugin/buildlink3.mk +++ b/time/xfce4-datetime-plugin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:59:31 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK:= ${XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= xfce4-datetime-plugin .if !empty(XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xfce4-datetime-plugin+= xfce4-datetime-plugin>=0.2nb4 BUILDLINK_PKGSRCDIR.xfce4-datetime-plugin?= ../../time/xfce4-datetime-plugin +.endif # XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/wm/metacity/buildlink3.mk b/wm/metacity/buildlink3.mk index 1d9949882d6..b57fe67583e 100644 --- a/wm/metacity/buildlink3.mk +++ b/wm/metacity/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:41 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ METACITY_BUILDLINK3_MK:= ${METACITY_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= metacity .if !empty(METACITY_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.metacity+= metacity>=2.6.3nb1 BUILDLINK_PKGSRCDIR.metacity?= ../../wm/metacity +.endif # METACITY_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" @@ -21,6 +22,4 @@ BUILDLINK_PKGSRCDIR.metacity?= ../../wm/metacity .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" -.endif # METACITY_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/wm/openbox/buildlink3.mk b/wm/openbox/buildlink3.mk index 1e753b5cce8..f20a80d7231 100644 --- a/wm/openbox/buildlink3.mk +++ b/wm/openbox/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OPENBOX_BUILDLINK3_MK:= ${OPENBOX_BUILDLINK3_MK}+ @@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+= openbox .if !empty(OPENBOX_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.openbox+= openbox>=3.1 BUILDLINK_PKGSRCDIR.openbox?= ../../wm/openbox +.endif # OPENBOX_BUILDLINK3_MK .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../fonts/Xft2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" -.endif # OPENBOX_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/wm/windowmaker/buildlink3.mk b/wm/windowmaker/buildlink3.mk index 8a29f2e33a9..e56f1188738 100644 --- a/wm/windowmaker/buildlink3.mk +++ b/wm/windowmaker/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ WINDOWMAKER_BUILDLINK3_MK:= ${WINDOWMAKER_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= windowmaker .if !empty(WINDOWMAKER_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.windowmaker+= windowmaker>=0.80.2nb3 BUILDLINK_PKGSRCDIR.windowmaker?= ../../wm/windowmaker +.endif # WINDOWMAKER_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/hermes/buildlink3.mk" @@ -22,6 +23,4 @@ BUILDLINK_PKGSRCDIR.windowmaker?= ../../wm/windowmaker .include "../../graphics/tiff/buildlink3.mk" .include "../../graphics/xpm/buildlink3.mk" -.endif # WINDOWMAKER_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/wm/xfce4-wm-themes/buildlink3.mk b/wm/xfce4-wm-themes/buildlink3.mk index 24750671bc3..f5aa94780ea 100644 --- a/wm/xfce4-wm-themes/buildlink3.mk +++ b/wm/xfce4-wm-themes/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_WM_THEMES_BUILDLINK3_MK:= ${XFCE4_WM_THEMES_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= xfce4-wm-themes .if !empty(XFCE4_WM_THEMES_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xfce4-wm-themes+= xfce4-wm-themes>=4.0.4nb1 BUILDLINK_PKGSRCDIR.xfce4-wm-themes?= ../../wm/xfce4-wm-themes +.endif # XFCE4_WM_THEMES_BUILDLINK3_MK .include "../../wm/xfce4-wm/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_WM_THEMES_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/wm/xfce4-wm/buildlink3.mk b/wm/xfce4-wm/buildlink3.mk index 3804c520bb0..448b338efb9 100644 --- a/wm/xfce4-wm/buildlink3.mk +++ b/wm/xfce4-wm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_WM_BUILDLINK3_MK:= ${XFCE4_WM_BUILDLINK3_MK}+ @@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+= xfce4-wm .if !empty(XFCE4_WM_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xfce4-wm+= xfce4-wm>=4.0.4nb1 BUILDLINK_PKGSRCDIR.xfce4-wm?= ../../wm/xfce4-wm +.endif # XFCE4_WM_BUILDLINK3_MK .include "../../graphics/xpm/buildlink3.mk" .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_WM_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/www/ap-perl/buildlink3.mk b/www/ap-perl/buildlink3.mk index 36ed0058231..caaaec124a5 100644 --- a/www/ap-perl/buildlink3.mk +++ b/www/ap-perl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ AP_PERL_BUILDLINK3_MK:= ${AP_PERL_BUILDLINK3_MK}+ @@ -19,9 +19,8 @@ BUILDLINK_FILES.ap-perl+= \ ${PERL5_SITEARCH:S/^${BUILDLINK_PREFIX.perl}\///}/auto/Apache/include/* BUILDLINK_FILES.ap-perl+= \ ${PERL5_SITEARCH:S/^${BUILDLINK_PREFIX.perl}\///}/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/+$//} diff --git a/www/apache2/buildlink3.mk b/www/apache2/buildlink3.mk index 2e8cc2831aa..1daad9d5fab 100644 --- a/www/apache2/buildlink3.mk +++ b/www/apache2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/08 00:15:53 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ APACHE_BUILDLINK3_MK:= ${APACHE_BUILDLINK3_MK}+ @@ -14,20 +14,20 @@ BUILDLINK_PACKAGES+= apache BUILDLINK_DEPENDS.apache+= apache>=2.0.48nb3 BUILDLINK_PKGSRCDIR.apache?= ../../www/apache2 BUILDLINK_DEPMETHOD.apache?= build - -USE_PERL5?= build # for "apxs" - -.if defined(APACHE_MODULE) +. if defined(APACHE_MODULE) BUILDLINK_DEPMETHOD.apache+= full -.endif +. endif +.endif # APACHE_BUILDLINK3_MK + +USE_PERL5?= build # for "apxs" +APXS?= ${BUILDLINK_PREFIX.apache}/sbin/apxs .include "../../devel/apr/buildlink3.mk" -APXS?= ${BUILDLINK_PREFIX.apache}/sbin/apxs -.if defined(GNU_CONFIGURE) +.if !empty(APACHE_BUILDLINK3_MK:M+) +. if defined(GNU_CONFIGURE) CONFIGURE_ARGS+= --with-apxs2="${APXS}" -.endif - +. endif .endif # APACHE_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/www/curl/buildlink3.mk b/www/curl/buildlink3.mk index d2daffb4b68..9b6ce8eca96 100644 --- a/www/curl/buildlink3.mk +++ b/www/curl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ CURL_BUILDLINK3_MK:= ${CURL_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= curl .if !empty(CURL_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.curl+= curl>=7.9.1 BUILDLINK_PKGSRCDIR.curl?= ../../www/curl +.endif # CURL_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" -.endif # CURL_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/www/gtkhtml3/buildlink3.mk b/www/gtkhtml3/buildlink3.mk index 496ba52ddde..62e3447813f 100644 --- a/www/gtkhtml3/buildlink3.mk +++ b/www/gtkhtml3/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:16 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GTKHTML3_BUILDLINK3_MK:= ${GTKHTML3_BUILDLINK3_MK}+ @@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+= gtkhtml3 .if !empty(GTKHTML3_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gtkhtml3+= gtkhtml3>=3.0.9nb5 BUILDLINK_PKGSRCDIR.gtkhtml3?= ../../www/gtkhtml3 +.endif # GTKHTML3_BUILDLINK3_MK .include "../../devel/gail/buildlink3.mk" .include "../../devel/gal2/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" .include "../../net/libsoup/buildlink3.mk" -.endif # GTKHTML3_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/www/libgtkhtml/buildlink3.mk b/www/libgtkhtml/buildlink3.mk index fb56ae59e10..25715a8aa67 100644 --- a/www/libgtkhtml/buildlink3.mk +++ b/www/libgtkhtml/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:41 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:16 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGTKHTML_BUILDLINK3_MK:= ${LIBGTKHTML_BUILDLINK3_MK}+ @@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+= libgtkhtml .if !empty(LIBGTKHTML_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libgtkhtml+= libgtkhtml>=2.4.1nb5 BUILDLINK_PKGSRCDIR.libgtkhtml?= ../../www/libgtkhtml +.endif # LIBGTKHTML_BUILDLINK3_MK .include "../../devel/gail/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.endif # LIBGTKHTML_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/www/libwww/buildlink3.mk b/www/libwww/buildlink3.mk index 8aaaee452f1..10c8207f654 100644 --- a/www/libwww/buildlink3.mk +++ b/www/libwww/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:16 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBWWW_BUILDLINK3_MK:= ${LIBWWW_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= libwww .if !empty(LIBWWW_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libwww+= libwww>=5.3.2nb2 BUILDLINK_PKGSRCDIR.libwww?= ../../www/libwww +.endif # LIBWWW_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" -.endif # LIBWWW_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/www/mozilla-gtk2/buildlink3.mk b/www/mozilla-gtk2/buildlink3.mk index aac132d836c..c4cd5ad761e 100644 --- a/www/mozilla-gtk2/buildlink3.mk +++ b/www/mozilla-gtk2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:16 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ MOZILLA_GTK2_BUILDLINK3_MK:= ${MOZILLA_GTK2_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= mozilla-gtk2 .if !empty(MOZILLA_GTK2_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.mozilla-gtk2+= mozilla-gtk2>=1.6nb1 BUILDLINK_PKGSRCDIR.mozilla-gtk2?= ../../www/mozilla-gtk2 +.endif # MOZILLA_GTK2_BUILDLINK3_MK .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" @@ -20,6 +21,4 @@ BUILDLINK_PKGSRCDIR.mozilla-gtk2?= ../../www/mozilla-gtk2 .include "../../net/libIDL/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.endif # MOZILLA_GTK2_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/www/mozilla-stable/buildlink3.mk b/www/mozilla-stable/buildlink3.mk index 0e5d285d06e..f8bd9266d64 100644 --- a/www/mozilla-stable/buildlink3.mk +++ b/www/mozilla-stable/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:16 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ MOZILLA_STABLE_BUILDLINK3_MK:= ${MOZILLA_STABLE_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= mozilla-stable .if !empty(MOZILLA_STABLE_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.mozilla-stable+= mozilla-stable>=1.4.1nb2 BUILDLINK_PKGSRCDIR.mozilla-stable?= ../../www/mozilla-stable +.endif # MOZILLA_STABLE_BUILDLINK3_MK .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/gdk-pixbuf/buildlink3.mk" @@ -21,6 +22,4 @@ BUILDLINK_PKGSRCDIR.mozilla-stable?= ../../www/mozilla-stable .include "../../net/ORBit/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" -.endif # MOZILLA_STABLE_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/www/mozilla/buildlink3.mk b/www/mozilla/buildlink3.mk index bbbe8efdcd8..7e2ac102ea1 100644 --- a/www/mozilla/buildlink3.mk +++ b/www/mozilla/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:16 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ MOZILLA_BUILDLINK3_MK:= ${MOZILLA_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= mozilla .if !empty(MOZILLA_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.mozilla+= mozilla>=1.6 BUILDLINK_PKGSRCDIR.mozilla?= ../../www/mozilla +.endif # MOZILLA_BUILDLINK3_MK .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/gdk-pixbuf/buildlink3.mk" @@ -20,7 +21,5 @@ BUILDLINK_PKGSRCDIR.mozilla?= ../../www/mozilla .include "../../graphics/png/buildlink3.mk" .include "../../net/ORBit/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" - -.endif # MOZILLA_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/www/neon/buildlink3.mk b/www/neon/buildlink3.mk index 81a5b4f34c9..ca3652afea2 100644 --- a/www/neon/buildlink3.mk +++ b/www/neon/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/07 22:30:33 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:16 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ NEON_BUILDLINK3_MK:= ${NEON_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= neon .if !empty(NEON_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.neon+= neon>=0.24.4 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/+$//} diff --git a/x11/Xfixes/buildlink3.mk b/x11/Xfixes/buildlink3.mk index cb3f355407c..85536f4506d 100644 --- a/x11/Xfixes/buildlink3.mk +++ b/x11/Xfixes/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:16 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFIXES_BUILDLINK3_MK:= ${XFIXES_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= Xfixes .if !empty(XFIXES_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.Xfixes+= Xfixes>=2.0.0 BUILDLINK_PKGSRCDIR.Xfixes?= ../../x11/Xfixes +.endif # XFIXES_BUILDLINK3_MK .include "../../x11/fixesext/buildlink3.mk" -.endif # XFIXES_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/Xrandr-mixedcase/buildlink3.mk b/x11/Xrandr-mixedcase/buildlink3.mk index 571c9671547..6d444f3c63e 100644 --- a/x11/Xrandr-mixedcase/buildlink3.mk +++ b/x11/Xrandr-mixedcase/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2004/03/10 17:57:15 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2004/03/18 09:12:16 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XRANDR_BUILDLINK3_MK:= ${XRANDR_BUILDLINK3_MK}+ @@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+= Xrandr .if !empty(XRANDR_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.Xrandr+= Xrandr>=1.0 BUILDLINK_PKGSRCDIR.Xrandr?= ../../x11/Xrandr +.endif # XRANDR_BUILDLINK3_MK USE_X11= yes .include "../../x11/randrext/buildlink3.mk" .include "../../x11/Xrender/buildlink3.mk" -.endif # XRANDR_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk index 80e93c5e097..c28704985ab 100644 --- a/x11/Xrender/buildlink3.mk +++ b/x11/Xrender/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.30 2004/03/10 17:57:15 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.31 2004/03/18 09:12:16 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XRENDER_BUILDLINK3_MK:= ${XRENDER_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= Xrender .if !empty(XRENDER_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.Xrender+= Xrender>=0.2 BUILDLINK_PKGSRCDIR.Xrender?= ../../x11/Xrender +.endif # XRENDER_BUILDLINK3_MK USE_X11= yes .include "../../x11/render/buildlink3.mk" -.endif # XRENDER_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/blt/buildlink3.mk b/x11/blt/buildlink3.mk index 9171ab09873..cf6652e7759 100644 --- a/x11/blt/buildlink3.mk +++ b/x11/blt/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/03/08 20:27:17 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:16 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ BLT_BUILDLINK3_MK:= ${BLT_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= blt .if !empty(BLT_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.blt+= blt>=2.4o BUILDLINK_PKGSRCDIR.blt?= ../../x11/blt +.endif # BLT_BUILDLINK3_MK .include "../../lang/tcl83/buildlink3.mk" .include "../../x11/tk83/buildlink3.mk" -.endif # BLT_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/controlcenter/buildlink3.mk b/x11/controlcenter/buildlink3.mk index df114cd0b15..fcc5700714c 100644 --- a/x11/controlcenter/buildlink3.mk +++ b/x11/controlcenter/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:16 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ CONTROL_CENTER_BUILDLINK3_MK:= ${CONTROL_CENTER_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= control-center .if !empty(CONTROL_CENTER_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.control-center+= control-center>=1.4.0.4nb5 BUILDLINK_PKGSRCDIR.control-center?= ../../x11/controlcenter +.endif # CONTROL_CENTER_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" @@ -20,6 +21,4 @@ BUILDLINK_PKGSRCDIR.control-center?= ../../x11/controlcenter .include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../x11/gnome-libs/buildlink3.mk" -.endif # CONTROL_CENTER_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/fltk/buildlink3.mk b/x11/fltk/buildlink3.mk index 7c34c584034..69a1c331dab 100644 --- a/x11/fltk/buildlink3.mk +++ b/x11/fltk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:16 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ FLTK_BUILDLINK3_MK:= ${FLTK_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= fltk .if !empty(FLTK_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.fltk+= fltk>=1.0.9 BUILDLINK_PKGSRCDIR.fltk?= ../../x11/fltk +.endif # FLTK_BUILDLINK3_MK .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" -.endif # FLTK_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/fox/buildlink3.mk b/x11/fox/buildlink3.mk index f11020e5419..f04ba0ab8e7 100644 --- a/x11/fox/buildlink3.mk +++ b/x11/fox/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/11 17:22:55 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:16 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ FOX_BUILDLINK3_MK:= ${FOX_BUILDLINK3_MK}+ @@ -13,6 +13,8 @@ BUILDLINK_PACKAGES+= fox .if !empty(FOX_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.fox+= fox>=1.0.43nb2 BUILDLINK_PKGSRCDIR.fox?= ../../x11/fox +BUILDLINK_INCDIRS.fox?= include/fox +.endif # FOX_BUILDLINK3_MK .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" @@ -20,9 +22,4 @@ BUILDLINK_PKGSRCDIR.fox?= ../../x11/fox .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" -BUILDLINK_CPPFLAGS.fox+= -I${BUILDLINK_PREFIX.fox}/include/fox -CPPFLAGS+= ${BUILDLINK_CPPFLAGS.fox} - -.endif # FOX_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/gnome-desktop/buildlink3.mk b/x11/gnome-desktop/buildlink3.mk index 1c77c364ec5..60901e0cad0 100644 --- a/x11/gnome-desktop/buildlink3.mk +++ b/x11/gnome-desktop/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:16 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GNOME_DESKTOP_BUILDLINK3_MK:= ${GNOME_DESKTOP_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= gnome-desktop .if !empty(GNOME_DESKTOP_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gnome-desktop+= gnome-desktop>=2.4.1.1nb2 BUILDLINK_PKGSRCDIR.gnome-desktop?= ../../x11/gnome-desktop +.endif # GNOME_DESKTOP_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" @@ -22,6 +23,4 @@ BUILDLINK_PKGSRCDIR.gnome-desktop?= ../../x11/gnome-desktop .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" -.endif # GNOME_DESKTOP_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/gnome-libs/buildlink3.mk b/x11/gnome-libs/buildlink3.mk index b38db5f9b41..676a402c2f1 100644 --- a/x11/gnome-libs/buildlink3.mk +++ b/x11/gnome-libs/buildlink3.mk @@ -1,10 +1,8 @@ -# $NetBSD: buildlink3.mk,v 1.5 2004/03/12 21:20:16 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:16 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GNOME_LIBS_BUILDLINK3_MK:= ${GNOME_LIBS_BUILDLINK3_MK}+ -.include "../../mk/bsd.prefs.mk" - .if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= gnome-libs .endif @@ -15,6 +13,7 @@ BUILDLINK_PACKAGES+= gnome-libs .if !empty(GNOME_LIBS_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gnome-libs+= gnome-libs>=1.4.2nb1 BUILDLINK_PKGSRCDIR.gnome-libs?= ../../x11/gnome-libs +.endif # GNOME_LIBS_BUILDLINK3_MK .include "../../audio/esound/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -24,6 +23,4 @@ BUILDLINK_PKGSRCDIR.gnome-libs?= ../../x11/gnome-libs .include "../../x11/gtk/buildlink3.mk" .include "../../mk/bdb.buildlink3.mk" -.endif # GNOME_LIBS_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/gnome-mag/buildlink3.mk b/x11/gnome-mag/buildlink3.mk index b196e9efbf9..c317c39c161 100644 --- a/x11/gnome-mag/buildlink3.mk +++ b/x11/gnome-mag/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:42 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:16 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GNOME_MAG_BUILDLINK3_MK:= ${GNOME_MAG_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= gnome-mag .if !empty(GNOME_MAG_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gnome-mag+= gnome-mag>=0.10.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/+$//} diff --git a/x11/gnome-panel/buildlink3.mk b/x11/gnome-panel/buildlink3.mk index b99ac58621c..c18f807ee12 100644 --- a/x11/gnome-panel/buildlink3.mk +++ b/x11/gnome-panel/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:16 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GNOME_PANEL_BUILDLINK3_MK:= ${GNOME_PANEL_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= gnome-panel .if !empty(GNOME_PANEL_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gnome-panel+= gnome-panel>=2.4.1nb3 BUILDLINK_PKGSRCDIR.gnome-panel?= ../../x11/gnome-panel +.endif # GNOME_PANEL_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" @@ -24,6 +25,4 @@ BUILDLINK_PKGSRCDIR.gnome-panel?= ../../x11/gnome-panel .include "../../x11/gnome2-control-center/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" -.endif # GNOME_PANEL_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/gnome2-control-center/buildlink3.mk b/x11/gnome2-control-center/buildlink3.mk index 091878d06df..d55bb6a0426 100644 --- a/x11/gnome2-control-center/buildlink3.mk +++ b/x11/gnome2-control-center/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:42 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:16 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GNOME2_CONTROL_CENTER_BUILDLINK3_MK:= ${GNOME2_CONTROL_CENTER_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= gnome2-control-center .if !empty(GNOME2_CONTROL_CENTER_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gnome2-control-center+= gnome2-control-center>=2.4.0nb2 BUILDLINK_PKGSRCDIR.gnome2-control-center?= ../../x11/gnome2-control-center +.endif # GNOME2_CONTROL_CENTER_BUILDLINK3_MK .include "../../audio/esound/buildlink3.mk" .include "../../devel/GConf2/buildlink3.mk" @@ -31,6 +32,4 @@ BUILDLINK_PKGSRCDIR.gnome2-control-center?= ../../x11/gnome2-control-center .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" -.endif # GNOME2_CONTROL_CENTER_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/gtk/buildlink3.mk b/x11/gtk/buildlink3.mk index e75d6d371ab..804c5ecff91 100644 --- a/x11/gtk/buildlink3.mk +++ b/x11/gtk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2004/03/16 18:23:27 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2004/03/18 09:12:16 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GTK_BUILDLINK3_MK:= ${GTK_BUILDLINK3_MK}+ @@ -15,12 +15,11 @@ BUILDLINK_PKGBASE.gtk?= gtk+ BUILDLINK_DEPENDS.gtk+= gtk+>=1.2.10 BUILDLINK_RECOMMENDED.gtk?= gtk+>=1.2.10nb6 BUILDLINK_PKGSRCDIR.gtk?= ../../x11/gtk +.endif # GTK_BUILDLINK3_MK USE_X11= yes .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib/buildlink3.mk" -.endif # GTK_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/gtk2-engines/buildlink3.mk b/x11/gtk2-engines/buildlink3.mk index d9270cd4c63..80091635960 100644 --- a/x11/gtk2-engines/buildlink3.mk +++ b/x11/gtk2-engines/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:16 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GTK2_ENGINES_BUILDLINK3_MK:= ${GTK2_ENGINES_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= gtk2-engines .if !empty(GTK2_ENGINES_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gtk2-engines+= gtk2-engines>=2.2.0nb4 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/+$//} diff --git a/x11/gtk2/buildlink3.mk b/x11/gtk2/buildlink3.mk index 9f824d0f401..9b38c2b57c8 100644 --- a/x11/gtk2/buildlink3.mk +++ b/x11/gtk2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2004/03/16 18:23:28 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 09:12:17 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GTK2_BUILDLINK3_MK:= ${GTK2_BUILDLINK3_MK}+ @@ -14,6 +14,7 @@ BUILDLINK_PACKAGES+= gtk2 BUILDLINK_PKGBASE.gtk2?= gtk2+ BUILDLINK_DEPENDS.gtk2+= gtk2+>=2.2.4nb2 BUILDLINK_PKGSRCDIR.gtk2?= ../../x11/gtk2 +.endif # GTK2_BUILDLINK3_MK USE_X11= yes @@ -27,6 +28,4 @@ USE_X11= yes .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/Xrandr/buildlink3.mk" -.endif # GTK2_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/gtkglarea/buildlink3.mk b/x11/gtkglarea/buildlink3.mk index 665cb8ce491..40745dd78bd 100644 --- a/x11/gtkglarea/buildlink3.mk +++ b/x11/gtkglarea/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/08 02:36:23 snj Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:17 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GTKGLAREA_BUILDLINK3_MK:= ${GTKGLAREA_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= gtkglarea .if !empty(GTKGLAREA_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gtkglarea+= gtkglarea>=1.2.2nb3 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/+$//} diff --git a/x11/gtkglarea2/buildlink3.mk b/x11/gtkglarea2/buildlink3.mk index 61b241a425e..ba38b45cdf5 100644 --- a/x11/gtkglarea2/buildlink3.mk +++ b/x11/gtkglarea2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:17 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GTKGLAREA2_BUILDLINK3_MK:= ${GTKGLAREA2_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= gtkglarea2 .if !empty(GTKGLAREA2_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gtkglarea2+= gtkglarea2>=1.99.0nb3 BUILDLINK_PKGSRCDIR.gtkglarea2?= ../../x11/gtkglarea2 +.endif # GTKGLAREA2_BUILDLINK3_MK .include "../../graphics/Mesa/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.endif # GTKGLAREA2_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/gtkmm/buildlink3.mk b/x11/gtkmm/buildlink3.mk index 8bfbc3d2c19..0358782f9c0 100644 --- a/x11/gtkmm/buildlink3.mk +++ b/x11/gtkmm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/09 20:56:35 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:17 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GTKMM_BUILDLINK3_MK:= ${GTKMM_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= gtkmm .if !empty(GTKMM_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gtkmm+= gtkmm>=2.2.8nb2 BUILDLINK_PKGSRCDIR.gtkmm?= ../../x11/gtkmm +.endif # GTKMM_BUILDLINK3_MK .include "../../devel/libsigc++/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.endif # GTKMM_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/gtksourceview/buildlink3.mk b/x11/gtksourceview/buildlink3.mk index 82f4ac41ee2..8396d7bd63c 100644 --- a/x11/gtksourceview/buildlink3.mk +++ b/x11/gtksourceview/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:17 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GTKSOURCEVIEW_BUILDLINK3_MK:= ${GTKSOURCEVIEW_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= gtksourceview .if !empty(GTKSOURCEVIEW_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.gtksourceview+= gtksourceview>=0.7.0nb8 BUILDLINK_PKGSRCDIR.gtksourceview?= ../../x11/gtksourceview +.endif # GTKSOURCEVIEW_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" @@ -20,6 +21,4 @@ BUILDLINK_PKGSRCDIR.gtksourceview?= ../../x11/gtksourceview .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.endif # GTKSOURCEVIEW_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/lablgtk/buildlink3.mk b/x11/lablgtk/buildlink3.mk index 7444c2bdd2d..312005414ff 100644 --- a/x11/lablgtk/buildlink3.mk +++ b/x11/lablgtk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/06 23:46:06 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:17 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LABLGTK_BUILDLINK3_MK:= ${LABLGTK_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= lablgtk .if !empty(LABLGTK_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.lablgtk+= lablgtk>=1.2.5nb3 BUILDLINK_PKGSRCDIR.lablgtk?= ../../x11/lablgtk +.endif # LABLGTK_BUILDLINK3_MK .include "../../x11/gtk/buildlink3.mk" .include "../../lang/ocaml/buildlink3.mk" -.endif # LABLGTK_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/libxfce4gui/buildlink3.mk b/x11/libxfce4gui/buildlink3.mk index 6cc95b9e755..dfcdb4e0b7c 100644 --- a/x11/libxfce4gui/buildlink3.mk +++ b/x11/libxfce4gui/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:17 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBXFCE4GUI_BUILDLINK3_MK:= ${LIBXFCE4GUI_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= libxfce4gui .if !empty(LIBXFCE4GUI_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libxfce4gui+= libxfce4gui>=4.0.4nb1 BUILDLINK_PKGSRCDIR.libxfce4gui?= ../../x11/libxfce4gui +.endif # LIBXFCE4GUI_BUILDLINK3_MK .include "../../x11/libxfce4util/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # LIBXFCE4GUI_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/libxfce4mcs/buildlink3.mk b/x11/libxfce4mcs/buildlink3.mk index 1e231efe885..284e6e299e4 100644 --- a/x11/libxfce4mcs/buildlink3.mk +++ b/x11/libxfce4mcs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:17 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBXFCE4MCS_BUILDLINK3_MK:= ${LIBXFCE4MCS_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= libxfce4mcs .if !empty(LIBXFCE4MCS_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libxfce4mcs+= libxfce4mcs>=4.0.4nb1 BUILDLINK_PKGSRCDIR.libxfce4mcs?= ../../x11/libxfce4mcs +.endif # LIBXFCE4MCS_BUILDLINK3_MK .include "../../x11/libxfce4util/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # LIBXFCE4MCS_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/libxfce4util/buildlink3.mk b/x11/libxfce4util/buildlink3.mk index e2c17c818e2..148db34c7a1 100644 --- a/x11/libxfce4util/buildlink3.mk +++ b/x11/libxfce4util/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:17 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBXFCE4UTIL_BUILDLINK3_MK:= ${LIBXFCE4UTIL_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= libxfce4util .if !empty(LIBXFCE4UTIL_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libxfce4util+= libxfce4util>=4.0.4nb1 BUILDLINK_PKGSRCDIR.libxfce4util?= ../../x11/libxfce4util +.endif # LIBXFCE4UTIL_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" -.endif # LIBXFCE4UTIL_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/libxklavier/buildlink3.mk b/x11/libxklavier/buildlink3.mk index e8af37e6c0f..d6bcd37801f 100644 --- a/x11/libxklavier/buildlink3.mk +++ b/x11/libxklavier/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/16 17:55:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:17 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBXKLAVIER_BUILDLINK3_MK:= ${LIBXKLAVIER_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= libxklavier .if !empty(LIBXKLAVIER_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libxklavier+= libxklavier>=0.97 BUILDLINK_PKGSRCDIR.libxklavier?= ../../x11/libxklavier +.endif # LIBXKLAVIER_BUILDLINK3_MK .include "../../textproc/libxml2/buildlink3.mk" -.endif # LIBXKLAVIER_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/libzvt/buildlink3.mk b/x11/libzvt/buildlink3.mk index f71916f54ab..df9ee7673fc 100644 --- a/x11/libzvt/buildlink3.mk +++ b/x11/libzvt/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:17 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBZVT_BUILDLINK3_MK:= ${LIBZVT_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= libzvt .if !empty(LIBZVT_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libzvt+= libzvt>=2.0.1nb5 BUILDLINK_PKGSRCDIR.libzvt?= ../../x11/libzvt +.endif # LIBZVT_BUILDLINK3_MK .include "../../graphics/libart2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.endif # LIBZVT_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/paragui/buildlink3.mk b/x11/paragui/buildlink3.mk index 18363ea43df..6d0d04d62c7 100644 --- a/x11/paragui/buildlink3.mk +++ b/x11/paragui/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/12 19:44:59 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:17 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PARAGUI_BUILDLINK3_MK:= ${PARAGUI_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= paragui .if !empty(PARAGUI_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.paragui+= paragui>=1.0.4nb3 BUILDLINK_PKGSRCDIR.paragui?= ../../x11/paragui +.endif # PARAGUI_BUILDLINK3_MK .include "../../devel/SDL/buildlink3.mk" .include "../../devel/physfs/buildlink3.mk" @@ -20,6 +21,4 @@ BUILDLINK_PKGSRCDIR.paragui?= ../../x11/paragui .include "../../graphics/freetype2/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" -.endif # PARAGUI_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/py-gnome2/buildlink3.mk b/x11/py-gnome2/buildlink3.mk index 03db647181d..2798c6d29bb 100644 --- a/x11/py-gnome2/buildlink3.mk +++ b/x11/py-gnome2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/03/16 18:23:28 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:17 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PY_GNOME2_BUILDLINK3_MK:= ${PY_GNOME2_BUILDLINK3_MK}+ @@ -16,6 +16,7 @@ BUILDLINK_PACKAGES+= pygnome2 BUILDLINK_PKGBASE.pygnome2?= ${PYPKGPREFIX}-gnome2 BUILDLINK_DEPENDS.pygnome2+= ${PYPKGPREFIX}-gnome2>=2.0.0nb4 BUILDLINK_PKGSRCDIR.pygnome2?= ../../x11/py-gnome2 +.endif # PY_GNOME2_BUILDLINK3_MK .include "../../net/py-ORBit/buildlink3.mk" .include "../../print/libgnomeprintui/buildlink3.mk" @@ -25,6 +26,4 @@ BUILDLINK_PKGSRCDIR.pygnome2?= ../../x11/py-gnome2 .include "../../x11/libzvt/buildlink3.mk" .include "../../x11/py-gtk2/buildlink3.mk" -.endif # PY_GNOME2_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/py-gtk2/buildlink3.mk b/x11/py-gtk2/buildlink3.mk index 8181c3a0b63..e552d501806 100644 --- a/x11/py-gtk2/buildlink3.mk +++ b/x11/py-gtk2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2004/03/16 18:23:28 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:17 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PY_GTK2_BUILDLINK3_MK:= ${PY_GTK2_BUILDLINK3_MK}+ @@ -16,11 +16,10 @@ BUILDLINK_PACKAGES+= pygtk2 BUILDLINK_PKGBASE.pygtk2?= ${PYPKGPREFIX}-gtk2 BUILDLINK_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.0.0nb2 BUILDLINK_PKGSRCDIR.pygtk2?= ../../x11/py-gtk2 +.endif # PY_GTK2_BUILDLINK3_MK .include "../../devel/libglade2/buildlink3.mk" .include "../../math/py-Numeric/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.endif # PY_GTK2_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk index a760f2b4f11..97b6e511321 100644 --- a/x11/tk/buildlink3.mk +++ b/x11/tk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2004/03/08 20:29:43 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 09:12:17 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ TK_BUILDLINK3_MK:= ${TK_BUILDLINK3_MK}+ @@ -21,11 +21,11 @@ BUILDLINK_FILES.tk= bin/wish* # BUILDLINK_TRANSFORM+= l:tk:tk84 +.endif # TK_BUILDLINK3_MK + USE_X11= yes TKCONFIG_SH?= ${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh .include "../../lang/tcl/buildlink3.mk" -.endif # TK_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/tk83/buildlink3.mk b/x11/tk83/buildlink3.mk index 1f9cc4014b4..172ac16c60e 100644 --- a/x11/tk83/buildlink3.mk +++ b/x11/tk83/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/03/08 20:07:40 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:17 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ TK_BUILDLINK3_MK:= ${TK_BUILDLINK3_MK}+ @@ -21,11 +21,11 @@ BUILDLINK_FILES.tk= bin/wish* # BUILDLINK_TRANSFORM+= l:tk:tk83 +.endif # TK_BUILDLINK3_MK + USE_X11= yes TKCONFIG_SH?= ${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh .include "../../lang/tcl83/buildlink3.mk" -.endif # TK_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/vte/buildlink3.mk b/x11/vte/buildlink3.mk index 1fef385a58f..26b2ef83fcf 100644 --- a/x11/vte/buildlink3.mk +++ b/x11/vte/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:17 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ VTE_BUILDLINK3_MK:= ${VTE_BUILDLINK3_MK}+ @@ -24,10 +24,9 @@ BUILDLINK_FILES.vte+= lib/vte/utf8echo BUILDLINK_FILES.vte+= lib/vte/utf8mode BUILDLINK_FILES.vte+= lib/vte/vterdb BUILDLINK_FILES.vte+= lib/vte/window +.endif # VTE_BUILDLINK3_MK .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libzvt/buildlink3.mk" -.endif # VTE_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/wxGTK/buildlink3.mk b/x11/wxGTK/buildlink3.mk index 0ecb00f6fdc..3d8d526c2a1 100644 --- a/x11/wxGTK/buildlink3.mk +++ b/x11/wxGTK/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:43 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:17 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ WXGTK_BUILDLINK3_MK:= ${WXGTK_BUILDLINK3_MK}+ @@ -15,6 +15,7 @@ BUILDLINK_PACKAGES+= wxGTK .if !empty(WXGTK_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.wxGTK+= wxGTK>=2.4.2 BUILDLINK_PKGSRCDIR.wxGTK?= ../../x11/wxGTK +.endif # WXGTK_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" @@ -28,6 +29,4 @@ BUILDLINK_PKGSRCDIR.wxGTK?= ../../x11/wxGTK . include "../../x11/gtk2/buildlink3.mk" .endif -.endif # WXGTK_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xcursor/buildlink3.mk b/x11/xcursor/buildlink3.mk index aa7d3027cfd..5ef8156487d 100644 --- a/x11/xcursor/buildlink3.mk +++ b/x11/xcursor/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2004/03/10 17:57:15 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2004/03/18 09:12:17 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XCURSOR_BUILDLINK3_MK:= ${XCURSOR_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+= xcursor .if !empty(XCURSOR_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xcursor+= xcursor>=1.0 BUILDLINK_PKGSRCDIR.xcursor?= ../../x11/xcursor +.endif # XCURSOR_BUILDLINK3_MK USE_X11= yes @@ -21,6 +22,4 @@ USE_X11= yes .include "../../x11/Xrender/buildlink3.mk" -.endif # XCURSOR_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-clipman-plugin/buildlink3.mk b/x11/xfce4-clipman-plugin/buildlink3.mk index 697844074d5..511c4df5a91 100644 --- a/x11/xfce4-clipman-plugin/buildlink3.mk +++ b/x11/xfce4-clipman-plugin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:59:31 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:17 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK:= ${XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= xfce4-clipman-plugin .if !empty(XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xfce4-clipman-plugin+= xfce4-clipman-plugin>=0.4.0nb3 BUILDLINK_PKGSRCDIR.xfce4-clipman-plugin?= ../../x11/xfce4-clipman-plugin +.endif # XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-desktop/buildlink3.mk b/x11/xfce4-desktop/buildlink3.mk index 9d85ed39b55..d55e216a4a4 100644 --- a/x11/xfce4-desktop/buildlink3.mk +++ b/x11/xfce4-desktop/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:17 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_DESKTOP_BUILDLINK3_MK:= ${XFCE4_DESKTOP_BUILDLINK3_MK}+ @@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+= xfce4-desktop .if !empty(XFCE4_DESKTOP_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xfce4-desktop+= xfce4-desktop>=4.0.4nb1 BUILDLINK_PKGSRCDIR.xfce4-desktop?= ../../x11/xfce4-desktop +.endif # XFCE4_DESKTOP_BUILDLINK3_MK .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_DESKTOP_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-gtk2-engines/buildlink3.mk b/x11/xfce4-gtk2-engines/buildlink3.mk index ac1f5557bd0..9319443bdcd 100644 --- a/x11/xfce4-gtk2-engines/buildlink3.mk +++ b/x11/xfce4-gtk2-engines/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:17 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_GTK2_ENGINE_BUILDLINK3_MK:= ${XFCE4_GTK2_ENGINE_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= xfce4-gtk2-engine .if !empty(XFCE4_GTK2_ENGINE_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xfce4-gtk2-engine+= xfce4-gtk2-engine>=2.1.9nb1 BUILDLINK_PKGSRCDIR.xfce4-gtk2-engine?= ../../x11/xfce4-gtk2-engines +.endif # XFCE4_GTK2_ENGINE_BUILDLINK3_MK .include "../../x11/gtk2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_GTK2_ENGINE_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-mcs-manager/buildlink3.mk b/x11/xfce4-mcs-manager/buildlink3.mk index 28b907c8188..bb04f96361b 100644 --- a/x11/xfce4-mcs-manager/buildlink3.mk +++ b/x11/xfce4-mcs-manager/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:17 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_MCS_MANAGER_BUILDLINK3_MK:= ${XFCE4_MCS_MANAGER_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= xfce4-mcs-manager .if !empty(XFCE4_MCS_MANAGER_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xfce4-mcs-manager+= xfce4-mcs-manager>=4.0.4nb1 BUILDLINK_PKGSRCDIR.xfce4-mcs-manager?= ../../x11/xfce4-mcs-manager +.endif # XFCE4_MCS_MANAGER_BUILDLINK3_MK .include "../../x11/libxfce4gui/buildlink3.mk" .include "../../x11/libxfce4mcs/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_MCS_MANAGER_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-mcs-plugins/buildlink3.mk b/x11/xfce4-mcs-plugins/buildlink3.mk index 64a88d6cedb..d769f3b63c3 100644 --- a/x11/xfce4-mcs-plugins/buildlink3.mk +++ b/x11/xfce4-mcs-plugins/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:17 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_MCS_PLUGINS_BUILDLINK3_MK:= ${XFCE4_MCS_PLUGINS_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= xfce4-mcs-plugins .if !empty(XFCE4_MCS_PLUGINS_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xfce4-mcs-plugins+= xfce4-mcs-plugins>=4.0.4nb1 BUILDLINK_PKGSRCDIR.xfce4-mcs-plugins?= ../../x11/xfce4-mcs-plugins +.endif # XFCE4_MCS_PLUGINS_BUILDLINK3_MK .include "../../x11/xfce4-mcs-manager/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_MCS_PLUGINS_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-menueditor/buildlink3.mk b/x11/xfce4-menueditor/buildlink3.mk index 24fdfb2a97a..ff7b10a6a22 100644 --- a/x11/xfce4-menueditor/buildlink3.mk +++ b/x11/xfce4-menueditor/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:59:31 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:17 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_MENUEDITOR_BUILDLINK3_MK:= ${XFCE4_MENUEDITOR_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= xfce4-menueditor .if !empty(XFCE4_MENUEDITOR_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xfce4-menueditor+= xfce4-menueditor>=1.0rc3nb2 BUILDLINK_PKGSRCDIR.xfce4-menueditor?= ../../x11/xfce4-menueditor +.endif # XFCE4_MENUEDITOR_BUILDLINK3_MK .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/libxfce4gui/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_MENUEDITOR_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-notes-plugin/buildlink3.mk b/x11/xfce4-notes-plugin/buildlink3.mk index 4e2a203a4ab..cf8c4e3a4d9 100644 --- a/x11/xfce4-notes-plugin/buildlink3.mk +++ b/x11/xfce4-notes-plugin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:59:31 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:18 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_NOTES_PLUGIN_BUILDLINK3_MK:= ${XFCE4_NOTES_PLUGIN_BUILDLINK3_MK}+ @@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+= xfce4-notes-plugin .if !empty(XFCE4_NOTES_PLUGIN_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xfce4-notes-plugin+= xfce4-notes-plugin>=0.9.7nb3 BUILDLINK_PKGSRCDIR.xfce4-notes-plugin?= ../../x11/xfce4-notes-plugin +.endif # XFCE4_NOTES_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_NOTES_PLUGIN_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-panel/buildlink3.mk b/x11/xfce4-panel/buildlink3.mk index 5ddbb1395ea..82b6f87f2fb 100644 --- a/x11/xfce4-panel/buildlink3.mk +++ b/x11/xfce4-panel/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:18 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_PANEL_BUILDLINK3_MK:= ${XFCE4_PANEL_BUILDLINK3_MK}+ @@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+= xfce4-panel .if !empty(XFCE4_PANEL_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xfce4-panel+= xfce4-panel>=4.0.4nb1 BUILDLINK_PKGSRCDIR.xfce4-panel?= ../../x11/xfce4-panel +.endif # XFCE4_PANEL_BUILDLINK3_MK .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_PANEL_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-themes/buildlink3.mk b/x11/xfce4-themes/buildlink3.mk index d0c8951a3ff..eaf6392ee4f 100644 --- a/x11/xfce4-themes/buildlink3.mk +++ b/x11/xfce4-themes/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:38 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:18 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_THEMES_BUILDLINK3_MK:= ${XFCE4_THEMES_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= xfce4-themes .if !empty(XFCE4_THEMES_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xfce4-themes+= xfce4-themes>=4.0.4nb1 BUILDLINK_PKGSRCDIR.xfce4-themes?= ../../x11/xfce4-themes +.endif # XFCE4_THEMES_BUILDLINK3_MK .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_THEMES_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-toys/buildlink3.mk b/x11/xfce4-toys/buildlink3.mk index 09094f7e577..1fad27c3c42 100644 --- a/x11/xfce4-toys/buildlink3.mk +++ b/x11/xfce4-toys/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:38 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:18 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_TOYS_BUILDLINK3_MK:= ${XFCE4_TOYS_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= xfce4-toys .if !empty(XFCE4_TOYS_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xfce4-toys+= xfce4-toys>=4.0.4nb1 BUILDLINK_PKGSRCDIR.xfce4-toys?= ../../x11/xfce4-toys +.endif # XFCE4_TOYS_BUILDLINK3_MK .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_TOYS_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-trigger-launcher/buildlink3.mk b/x11/xfce4-trigger-launcher/buildlink3.mk index 26572bae7d2..a5b3dfb82d6 100644 --- a/x11/xfce4-trigger-launcher/buildlink3.mk +++ b/x11/xfce4-trigger-launcher/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:38 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:18 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK:= ${XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= xfce4-trigger-launcher .if !empty(XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xfce4-trigger-launcher+= xfce4-trigger-launcher>=4.0.4nb1 BUILDLINK_PKGSRCDIR.xfce4-trigger-launcher?= ../../x11/xfce4-trigger-launcher +.endif # XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-utils/buildlink3.mk b/x11/xfce4-utils/buildlink3.mk index 2ae04657e1d..07247942817 100644 --- a/x11/xfce4-utils/buildlink3.mk +++ b/x11/xfce4-utils/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:38 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:18 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_UTILS_BUILDLINK3_MK:= ${XFCE4_UTILS_BUILDLINK3_MK}+ @@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+= xfce4-utils .if !empty(XFCE4_UTILS_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xfce4-utils+= xfce4-utils>=4.0.4nb1 BUILDLINK_PKGSRCDIR.xfce4-utils?= ../../x11/xfce4-utils +.endif # XFCE4_UTILS_BUILDLINK3_MK .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../x11/xscreensaver/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_UTILS_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xscreensaver/buildlink3.mk b/x11/xscreensaver/buildlink3.mk index f55fb72f422..23530ca307e 100644 --- a/x11/xscreensaver/buildlink3.mk +++ b/x11/xscreensaver/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:43 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:18 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XSCREENSAVER_BUILDLINK3_MK:= ${XSCREENSAVER_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= xscreensaver .if !empty(XSCREENSAVER_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xscreensaver+= xscreensaver>=4.14 BUILDLINK_PKGSRCDIR.xscreensaver?= ../../x11/xscreensaver +.endif # XSCREENSAVER_BUILDLINK3_MK .include "../../textproc/libxml2/buildlink3.mk" -.endif # XSCREENSAVER_BUILDLINK3_MK - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |