From 841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a Mon Sep 17 00:00:00 2001 From: jlam Date: Sat, 12 Apr 2008 22:42:57 +0000 Subject: Convert to use PLIST_VARS instead of manually passing "@comment " through PLIST_SUBST to the plist module. --- multimedia/transcode/PLIST | 34 +++++++++++++++++----------------- multimedia/transcode/options.mk | 28 +++++++++++----------------- 2 files changed, 28 insertions(+), 34 deletions(-) (limited to 'multimedia/transcode') diff --git a/multimedia/transcode/PLIST b/multimedia/transcode/PLIST index eeaae51f7e5..4746aa43ba2 100644 --- a/multimedia/transcode/PLIST +++ b/multimedia/transcode/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2008/02/20 12:06:16 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.11 2008/04/12 22:43:08 jlam Exp $ bin/avifix bin/aviindex bin/avimerge @@ -16,7 +16,7 @@ bin/tcscan bin/tcxmlcheck bin/tcxpm2rgb bin/transcode -${A52}lib/transcode/a52_decore.la +${PLIST.a52}lib/transcode/a52_decore.la lib/transcode/af6_decore.la lib/transcode/export_ac3.la lib/transcode/export_af6.conf @@ -25,17 +25,17 @@ lib/transcode/export_divx4.la lib/transcode/export_divx4raw.la lib/transcode/export_divx5.la lib/transcode/export_divx5raw.la -${DV}lib/transcode/export_dv.la -${DV}lib/transcode/export_dvraw.la +${PLIST.dv}lib/transcode/export_dv.la +${PLIST.dv}lib/transcode/export_dvraw.la lib/transcode/export_ffmpeg.la -${IMAGEMAGICK}lib/transcode/export_im.la +${PLIST.imagemagick}lib/transcode/export_im.la lib/transcode/export_jpg.la lib/transcode/export_lame.la lib/transcode/export_mjpeg.la lib/transcode/export_mp1e.la lib/transcode/export_mp2.la -${MJPEGTOOLS}lib/transcode/export_mp2enc.la -${MJPEGTOOLS}lib/transcode/export_mpeg2enc.la +${PLIST.mjpegtools}lib/transcode/export_mp2enc.la +${PLIST.mjpegtools}lib/transcode/export_mpeg2enc.la lib/transcode/export_null.la lib/transcode/export_ogg.la lib/transcode/export_pcm.la @@ -48,7 +48,7 @@ lib/transcode/export_xvid.so lib/transcode/export_xvid2.la lib/transcode/export_xvid3.la lib/transcode/export_xvid4.la -${MJPEGTOOLS}lib/transcode/export_yuv4mpeg.la +${PLIST.mjpegtools}lib/transcode/export_yuv4mpeg.la lib/transcode/filter_29to23.la lib/transcode/filter_32detect.la lib/transcode/filter_32drop.la @@ -56,7 +56,7 @@ lib/transcode/filter_aclip.la lib/transcode/filter_ascii.la lib/transcode/filter_astat.la lib/transcode/filter_clone.la -${IMAGEMAGICK}lib/transcode/filter_compare.la +${PLIST.imagemagick}lib/transcode/filter_compare.la lib/transcode/filter_control.la lib/transcode/filter_cpaudio.la lib/transcode/filter_cshift.la @@ -80,8 +80,8 @@ lib/transcode/filter_invert.la lib/transcode/filter_ivtc.la lib/transcode/filter_levels.la lib/transcode/filter_list.awk -${IMAGEMAGICK}lib/transcode/filter_logo.la -${IMAGEMAGICK}lib/transcode/filter_logoaway.la +${PLIST.imagemagick}lib/transcode/filter_logo.la +${PLIST.imagemagick}lib/transcode/filter_logoaway.la lib/transcode/filter_lowpass.la lib/transcode/filter_mask.la lib/transcode/filter_modfps.la @@ -89,7 +89,7 @@ lib/transcode/filter_msharpen.la lib/transcode/filter_nored.la lib/transcode/filter_normalize.la lib/transcode/filter_null.la -${DV}lib/transcode/filter_preview.la +${PLIST.dv}lib/transcode/filter_preview.la lib/transcode/filter_pp.la lib/transcode/filter_pv.la lib/transcode/filter_resample.la @@ -99,12 +99,12 @@ lib/transcode/filter_smartbob.la lib/transcode/filter_smartdeinter.la lib/transcode/filter_smartyuv.la lib/transcode/filter_smooth.la -${MPEG3}lib/transcode/filter_subtitler.la +${PLIST.mpeg3}lib/transcode/filter_subtitler.la lib/transcode/filter_tc_audio.la lib/transcode/filter_tc_video.la lib/transcode/filter_test.la lib/transcode/filter_testframe.la -${FREETYPE2}lib/transcode/filter_text.la +${PLIST.freetype2}lib/transcode/filter_text.la lib/transcode/filter_tomsmocomp.la lib/transcode/filter_unsharp.la lib/transcode/filter_videocore.la @@ -122,12 +122,12 @@ lib/transcode/import_dvd.la lib/transcode/import_ffbin.la lib/transcode/import_ffmpeg.la lib/transcode/import_fraps.la -${IMAGEMAGICK}lib/transcode/import_im.la -${IMAGEMAGICK}lib/transcode/import_imlist.la +${PLIST.imagemagick}lib/transcode/import_im.la +${PLIST.imagemagick}lib/transcode/import_imlist.la lib/transcode/import_lav.la lib/transcode/import_mp3.la lib/transcode/import_mpeg2.la -${MPEG3}lib/transcode/import_mpeg3.la +${PLIST.mpeg3}lib/transcode/import_mpeg3.la lib/transcode/import_mplayer.la lib/transcode/import_null.la lib/transcode/import_nuv.la diff --git a/multimedia/transcode/options.mk b/multimedia/transcode/options.mk index be27e70d6e7..9f812c48cc6 100644 --- a/multimedia/transcode/options.mk +++ b/multimedia/transcode/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2008/02/20 12:14:53 xtraeme Exp $ +# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:08 jlam Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.transcode @@ -10,78 +10,72 @@ PKG_SUGGESTED_OPTIONS+= imagemagick .include "../../mk/bsd.options.mk" +PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} + .if !empty(PKG_OPTIONS:Ma52) . include "../../audio/liba52/buildlink3.mk" CONFIGURE_ARGS+= --enable-a52 CONFIGURE_ARGS+= --enable-a52-default-decoder -PLIST_SUBST+= A52= +PLIST.a52= yes .else -PLIST_SUBST+= A52='@comment ' CONFIGURE_ARGS+= --disable-a52 .endif .if !empty(PKG_OPTIONS:Mfreetype2) . include "../../graphics/freetype2/buildlink3.mk" CONFIGURE_ARGS+= --enable-freetype2 -PLIST_SUBST+= FREETYPE2= +PLIST.freetype2= yes .else -PLIST_SUBST+= FREETYPE2='@comment ' CONFIGURE_ARGS+= --disable-freetype2 .endif .if !empty(PKG_OPTIONS:Mmjpegtools) . include "../../multimedia/mjpegtools/buildlink3.mk" -PLIST_SUBST+= MJPEGTOOLS= +PLIST.mjpegtools= yes CONFIGURE_ARGS+= --enable-mjpegtools .else -PLIST_SUBST+= MJPEGTOOLS='@comment ' CONFIGURE_ARGS+= --disable-mjpegtools .endif .if !empty(PKG_OPTIONS:Mmpeg3) BUILDLINK_API_DEPENDS.libmpeg3+= libmpeg3>=1.7 -PLIST_SUBST+= MPEG3= . include "../../multimedia/libmpeg3/buildlink3.mk" +PLIST.mpeg3= yes CONFIGURE_ARGS+= --with-libmpeg3-prefix=${BUILDLINK_PREFIX.libmpeg3} CONFIGURE_ARGS+= --enable-libmpeg3 .else -PLIST_SUBST+= MPEG3='@comment ' CONFIGURE_ARGS+= --disable-libmpeg3 .endif .if !empty(PKG_OPTIONS:Mlzo) -PLIST_SUBST+= LZO= . include "../../archivers/lzo/buildlink3.mk" +PLIST.lzo= yes CONFIGURE_ARGS+= --enable-lzo CONFIGURE_ARGS+= --with-lzo-prefix=${BUILDLINK_PREFIX.lzo} .else -PLIST_SUBST+= LZO='@comment ' CONFIGURE_ARGS+= --disable-lzo .endif .if !empty(PKG_OPTIONS:Mlibxml2) -PLIST_SUBST+= LIBXML2= . include "../../textproc/libxml2/buildlink3.mk" +PLIST.libxml2= yes CONFIGURE_ARGS+= --enable-libxml2 .else -PLIST_SUBST+= LIBXML2='@comment ' CONFIGURE_ARGS+= --disable-libxml2 .endif .if !empty(PKG_OPTIONS:Mdv) -PLIST_SUBST+= DV= . include "../../multimedia/libdv/buildlink3.mk" +PLIST.dv= yes CONFIGURE_ARGS+= --enable-libdv .else -PLIST_SUBST+= DV='@comment ' CONFIGURE_ARGS+= --disable-libdv .endif .if !empty(PKG_OPTIONS:Mimagemagick) -PLIST_SUBST+= IMAGEMAGICK= . include "../../graphics/ImageMagick/buildlink3.mk" +PLIST.imagemagick= yes CONFIGURE_ARGS+= --enable-imagemagick .else -PLIST_SUBST+= IMAGEMAGICK='@comment ' CONFIGURE_ARGS+= --disable-imagemagick .endif -- cgit v1.2.3