diff options
-rw-r--r-- | multimedia/vlc/buildlink3.mk | 31 | ||||
-rw-r--r-- | multimedia/vlc07/buildlink3.mk | 23 |
2 files changed, 23 insertions, 31 deletions
diff --git a/multimedia/vlc/buildlink3.mk b/multimedia/vlc/buildlink3.mk index b3ced9ab969..d923b50f5fa 100644 --- a/multimedia/vlc/buildlink3.mk +++ b/multimedia/vlc/buildlink3.mk @@ -1,27 +1,22 @@ -# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 23:11:02 jlam Exp $ -# -# This Makefile fragment is included by packages that use vlc. -# -# This file was created automatically using createbuildlink-3.0. -# +# $NetBSD: buildlink3.mk,v 1.15 2006/09/27 06:02:00 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ VLC_BUILDLINK3_MK:= ${VLC_BUILDLINK3_MK}+ -.if !empty(BUILDLINK_DEPTH:M+) +.if ${BUILDLINK_DEPTH} == "+" BUILDLINK_DEPENDS+= vlc .endif -.if !empty(VLC_BUILDLINK3_MK:M+) -BUILDLINK_PACKAGES+= vlc -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}vlc -BUILDLINK_API_DEPENDS.vlc?= vlc>=0.7.1 -BUILDLINK_ABI_DEPENDS.vlc?= vlc>=0.7.2nb15 +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nvlc} +BUILDLINK_PACKAGES+= vlc +BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}vlc + +.if ${VLC_BUILDLINK3_MK} == "+" +BUILDLINK_API_DEPENDS.vlc+= vlc>=0.8.5nb4 BUILDLINK_PKGSRCDIR.vlc?= ../../multimedia/vlc -.endif # VLC_BUILDLINK3_MK +.endif # VLC_BUILDLINK3_MK -.include "../../multimedia/libdvdcss/buildlink3.mk" -.include "../../audio/flac/buildlink3.mk" +.include "../../audio/faad2/buildlink3.mk" .include "../../audio/lame/buildlink3.mk" .include "../../audio/liba52/buildlink3.mk" .include "../../audio/libcddb/buildlink3.mk" @@ -31,17 +26,17 @@ BUILDLINK_PKGSRCDIR.vlc?= ../../multimedia/vlc .include "../../converters/fribidi/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" +.include "../../graphics/SDL_image/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../misc/libcdio/buildlink3.mk" .include "../../multimedia/ffmpeg/buildlink3.mk" .include "../../multimedia/libdvdplay/buildlink3.mk" -.include "../../multimedia/libdvbpsi/buildlink3.mk" +.include "../../multimedia/libdvdnav/buildlink3.mk" .include "../../multimedia/libdvdread/buildlink3.mk" .include "../../multimedia/libmatroska/buildlink3.mk" .include "../../multimedia/libmpeg2/buildlink3.mk" .include "../../multimedia/libogg/buildlink3.mk" -.include "../../net/openslp/buildlink3.mk" -.include "../../sysutils/vcdimager-devel/buildlink3.mk" +.include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/wxGTK/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/multimedia/vlc07/buildlink3.mk b/multimedia/vlc07/buildlink3.mk index aba835f860d..c88942ff95a 100644 --- a/multimedia/vlc07/buildlink3.mk +++ b/multimedia/vlc07/buildlink3.mk @@ -1,24 +1,20 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/09/26 07:19:41 martti Exp $ -# -# This Makefile fragment is included by packages that use vlc. -# -# This file was created automatically using createbuildlink-3.0. -# +# $NetBSD: buildlink3.mk,v 1.2 2006/09/27 06:02:00 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ VLC_BUILDLINK3_MK:= ${VLC_BUILDLINK3_MK}+ -.if !empty(BUILDLINK_DEPTH:M+) +.if ${BUILDLINK_DEPTH} == "+" BUILDLINK_DEPENDS+= vlc .endif -.if !empty(VLC_BUILDLINK3_MK:M+) -BUILDLINK_PACKAGES+= vlc -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}vlc -BUILDLINK_API_DEPENDS.vlc?= vlc>=0.7.1 -BUILDLINK_ABI_DEPENDS.vlc?= vlc>=0.7.2nb15 +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nvlc} +BUILDLINK_PACKAGES+= vlc +BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}vlc + +.if ${VLC_BUILDLINK3_MK} == "+" +BUILDLINK_API_DEPENDS.vlc+= vlc>=0.7.2nb15 BUILDLINK_PKGSRCDIR.vlc?= ../../multimedia/vlc07 -.endif # VLC_BUILDLINK3_MK +.endif # VLC_BUILDLINK3_MK .include "../../multimedia/libdvdcss/buildlink3.mk" .include "../../audio/flac/buildlink3.mk" @@ -35,6 +31,7 @@ BUILDLINK_PKGSRCDIR.vlc?= ../../multimedia/vlc07 .include "../../misc/libcdio/buildlink3.mk" .include "../../multimedia/ffmpeg/buildlink3.mk" .include "../../multimedia/libdvdplay/buildlink3.mk" +.include "../../multimedia/libdvdnav/buildlink3.mk" .include "../../multimedia/libdvbpsi/buildlink3.mk" .include "../../multimedia/libdvdread/buildlink3.mk" .include "../../multimedia/libmatroska/buildlink3.mk" |