diff options
| author | jlam <jlam@pkgsrc.org> | 2008-04-12 22:42:57 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2008-04-12 22:42:57 +0000 |
| commit | 841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a (patch) | |
| tree | fdd67c81079412bf94013749a954125434a9baca /multimedia/xine-lib | |
| parent | 6874584eae20f517f70816571f6d4ac696db16b3 (diff) | |
| download | pkgsrc-841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a.tar.gz | |
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'multimedia/xine-lib')
| -rw-r--r-- | multimedia/xine-lib/Makefile.common | 11 | ||||
| -rw-r--r-- | multimedia/xine-lib/PLIST.common | 10 |
2 files changed, 10 insertions, 11 deletions
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common index 02af9d18c5e..98ad3575c4b 100644 --- a/multimedia/xine-lib/Makefile.common +++ b/multimedia/xine-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.47 2008/04/10 11:48:58 drochner Exp $ +# $NetBSD: Makefile.common,v 1.48 2008/04/12 22:43:08 jlam Exp $ # # used by audio/xine-arts/Makefile @@ -36,12 +36,11 @@ PKGSRC_MAKE_ENV+= "mkdir_p"="mkdir -p" .include "../../mk/bsd.prefs.mk" -.if ${X11_TYPE} == "native" && !exists(${X11BASE}/lib/libXv.so) -PLIST_SUBST+= HAVE_XV="@comment " -.else -.include "../../x11/libXv/buildlink3.mk" +PLIST_VARS+= xv +.if ${X11_TYPE} != "native" +. include "../../x11/libXv/buildlink3.mk" CONFIGURE_ARGS+= --with-xv-path='${X11BASE}/lib' -PLIST_SUBST+= HAVE_XV= +PLIST.xv= yes .endif pre-configure: diff --git a/multimedia/xine-lib/PLIST.common b/multimedia/xine-lib/PLIST.common index 4f1d7566f2d..f579d6d5b35 100644 --- a/multimedia/xine-lib/PLIST.common +++ b/multimedia/xine-lib/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.23 2008/04/10 11:48:58 drochner Exp $ +@comment $NetBSD: PLIST.common,v 1.24 2008/04/12 22:43:08 jlam Exp $ bin/xine-config include/xine.h include/xine/alphablend.h @@ -51,8 +51,8 @@ lib/xine/plugins/1.20/post/xineplug_post_planar.a lib/xine/plugins/1.20/post/xineplug_post_planar.so lib/xine/plugins/1.20/post/xineplug_post_switch.a lib/xine/plugins/1.20/post/xineplug_post_switch.so -${HAVE_XV}lib/xine/plugins/1.20/post/xineplug_post_tvtime.a -${HAVE_XV}lib/xine/plugins/1.20/post/xineplug_post_tvtime.so +${PLIST.xv}lib/xine/plugins/1.20/post/xineplug_post_tvtime.a +${PLIST.xv}lib/xine/plugins/1.20/post/xineplug_post_tvtime.so lib/xine/plugins/1.20/post/xineplug_post_visualizations.a lib/xine/plugins/1.20/post/xineplug_post_visualizations.so lib/xine/plugins/1.20/xineplug_ao_out_file.a @@ -193,8 +193,8 @@ lib/xine/plugins/1.20/xineplug_vo_out_none.so @comment lib/xine/plugins/1.20/xineplug_vo_out_sdl.so lib/xine/plugins/1.20/xineplug_vo_out_xshm.a lib/xine/plugins/1.20/xineplug_vo_out_xshm.so -${HAVE_XV}lib/xine/plugins/1.20/xineplug_vo_out_xv.a -${HAVE_XV}lib/xine/plugins/1.20/xineplug_vo_out_xv.so +${PLIST.xv}lib/xine/plugins/1.20/xineplug_vo_out_xv.a +${PLIST.xv}lib/xine/plugins/1.20/xineplug_vo_out_xv.so man/man1/xine-config.1 man/man5/xine.5 share/aclocal/xine.m4 |