Convert to use PLIST_VARS instead of manually passing "@comment "

through PLIST_SUBST to the plist module.

3 files changed, 19 insertions, 24 deletions

diff --git a/lang/elk/Makefile b/lang/elk/Makefile
index 311638dcc88..8610f31a0dd 100644
--- a/lang/elk/Makefile
+++ b/lang/elk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2007/08/17 22:27:15 joerg Exp $
+# $NetBSD: Makefile,v 1.37 2008/04/12 22:43:02 jlam Exp $
 
 DISTNAME=	elk-3.99.7
 CATEGORIES=	lang
@@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=		WITH_XAW=${ELK_AWK:Q}
 
 .include "options.mk"
 
diff --git a/lang/elk/PLIST b/lang/elk/PLIST
index 6a2c3700fe2..eff7d35fad3 100644
--- a/lang/elk/PLIST
+++ b/lang/elk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/10/15 23:07:21 tonio Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:43:02 jlam Exp $
 bin/elk
 bin/scheme-elk
 include/elk/compat.h
@@ -28,12 +28,12 @@ lib/elk/record.la
 lib/elk/regexp.la
 lib/elk/struct.la
 lib/elk/unix.la
-${WITHMOTIF}lib/elk/motif.la
-${WITHXAW}lib/elk/xaw.la
-${WITHX11}lib/elk/xlib.la
+${PLIST.motif}lib/elk/motif.la
+${PLIST.xaw}lib/elk/xaw.la
+${PLIST.x11}lib/elk/xlib.la
 lib/libelk.la
-${WITHX11}lib/libelk-xlib.la
-${WITHX11}lib/libelk-xt.la
+${PLIST.x11}lib/libelk-xlib.la
+${PLIST.x11}lib/libelk-xt.la
 man/man1/elk.1
 man/man1/scheme-elk.1
 share/doc/elk/examples/c++/class.cpp
@@ -139,10 +139,10 @@ share/elk/struct.scm
 share/elk/toplevel.scm
 share/elk/trace.scm
 share/elk/unix.scm
-${WITHXAW}share/elk/xaw.scm
-${WITHX11}share/elk/xlib.scm
-${WITHX11}share/elk/xwidgets.scm
-${WITHMOTIF}share/elk/motif.scm
+${PLIST.xaw}share/elk/xaw.scm
+${PLIST.x11}share/elk/xlib.scm
+${PLIST.x11}share/elk/xwidgets.scm
+${PLIST.motif}share/elk/motif.scm
 @dirrm share/elk
 @dirrm share/doc/elk/ps
 @dirrm share/doc/elk/examples/xlib
diff --git a/lang/elk/options.mk b/lang/elk/options.mk
index a0f155fe8de..9da6e4d7724 100644
--- a/lang/elk/options.mk
+++ b/lang/elk/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2007/08/17 22:27:15 joerg Exp $
+# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:02 jlam Exp $
 
 # Global and legacy options
 
@@ -8,28 +8,24 @@ PKG_SUGGESTED_OPTIONS=
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		x11 xaw motif
+
 ###
 ### x11 support
 ###
 .if !empty(PKG_OPTIONS:Mxaw) || !empty(PKG_OPTIONS:Mmotif)
-PLIST_SUBST+= WITHX11=""
+PLIST.x11=		yes
 .  if !empty(PKG_OPTIONS:Mxaw)
-PLIST_SUBST+= WITHXAW=""
-ELK_AWK="yes"
+PLIST.xaw=		yes
+CONFIGURE_ENV+=		WITH_XAW="yes"
 .    include "../../mk/xaw.buildlink3.mk"
 .  else
-PLIST_SUBST+= WITHXAW="@comment "
-ELK_AWK="no"
+CONFIGURE_ENV+=		WITH_XAW="no"
 .  endif
 .  if !empty(PKG_OPTIONS:Mmotif)
 .  include "../../mk/motif.buildlink3.mk"
-PLIST_SUBST+= WITHMOTIF=""
-.  else
-PLIST_SUBST+= WITHMOTIF="@comment "
+PLIST.motif=		yes
 .  endif
 .else
 CONFIGURE_ARGS+=	--without-x
-PLIST_SUBST+= WITHMOTIF="@comment "
-PLIST_SUBST+= WITHX11="@comment "
-PLIST_SUBST+= WITHXAW="@comment "
 .endif