[pkgsrc/trunk]: pkgsrc/multimedia/vlc07 + Use package options instead of WITH...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1691387985ba
branches:  trunk
changeset: 540917:1691387985ba
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Apr 10 19:34:34 2008 +0000

description:
+ Use package options instead of WITH_DVDCSS to select whether dvdcss
  support is built into the package.

+ Convert to use PLIST_VARS instead of manually adding "@comment" to
  PLIST_SUBST.

Bump PKGREVISION to 19 due to the addition of package options.

diffstat:

 multimedia/vlc07/Makefile   |  15 +++------------
 multimedia/vlc07/options.mk |  17 +++++++++++++++++
 2 files changed, 20 insertions(+), 12 deletions(-)

diffs (53 lines):

diff -r 55c5d3e3682c -r 1691387985ba multimedia/vlc07/Makefile
--- a/multimedia/vlc07/Makefile Thu Apr 10 18:04:51 2008 +0000
+++ b/multimedia/vlc07/Makefile Thu Apr 10 19:34:34 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2007/09/29 19:44:05 drochner Exp $
+# $NetBSD: Makefile,v 1.12 2008/04/10 19:34:34 jlam Exp $
 #
 
 DISTNAME=              vlc-${VLC_VER}
-PKGREVISION=           18
+PKGREVISION=           19
 CATEGORIES=            multimedia
 MASTER_SITES=          http://download.videolan.org/pub/videolan/vlc/${VLC_VER}/
 EXTRACT_SUFX=          .tar.bz2
@@ -35,16 +35,7 @@
 CONFIGURE_ARGS+=       --disable-gtk
 CONFIGURE_ARGS+=       --with-ffmpeg-tree=${BUILDLINK_PREFIX.ffmpeg}/lib
 
-BUILD_DEFS+=           WITH_DVDCSS
-
-.if defined(WITH_DVDCSS) && !empty(WITH_DVDCSS:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=       --with-dvdcss=${BUILDLINK_PREFIX.libdvdcss}
-.include "../../multimedia/libdvdcss/buildlink3.mk"
-PLIST_SUBST+=          DVDCSS=
-.else
-CONFIGURE_ARGS+=       --disable-dvd
-PLIST_SUBST+=          DVDCSS="@comment "
-.endif
+.include "options.mk"
 
 .if ${X11_TYPE} == "modular"
 CONFIGURE_ARGS+=       x_libraries=${PREFIX}/lib
diff -r 55c5d3e3682c -r 1691387985ba multimedia/vlc07/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/vlc07/options.mk       Thu Apr 10 19:34:34 2008 +0000
@@ -0,0 +1,17 @@
+# $NetBSD: options.mk,v 1.1 2008/04/10 19:34:34 jlam Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.vlc07
+PKG_SUPPORTED_OPTIONS=         dvdcss
+PKG_OPTIONS_LEGACY_VARS=       WITH_DVDCSS:dvdcss
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=           ${PKG_SUPPORTED_OPTIONS}
+
+.if !empty(PKG_OPTIONS:Mdvdcss)
+.  include "../../multimedia/libdvdcss/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-dvdcss=${BUILDLINK_PREFIX.libdvdcss}
+PLIST.dvdcss=          yes
+.else
+CONFIGURE_ARGS+=       --disable-dvd
+.endif