From 84db467ec7c8386066718011f8d47775d5608811 Mon Sep 17 00:00:00 2001
From: jlam <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.

---
 www/apache22/PLIST      | 4 ++--
 www/apache22/options.mk | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'www/apache22')

diff --git a/www/apache22/PLIST b/www/apache22/PLIST
index 33f063e7302..d5420596657 100644
--- a/www/apache22/PLIST
+++ b/www/apache22/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2008/01/21 15:07:10 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:13 jlam Exp $
 include/httpd/ap_compat.h
 include/httpd/ap_config.h
 include/httpd/ap_config_auto.h
@@ -75,7 +75,7 @@ sbin/httxt2dbm
 sbin/logresolve
 sbin/mkcert
 sbin/rotatelogs
-${SUEXEC_COMMENT}sbin/suexec
+${PLIST.suexec}sbin/suexec
 share/examples/httpd/extra/httpd-autoindex.conf
 share/examples/httpd/extra/httpd-dav.conf
 share/examples/httpd/extra/httpd-default.conf
diff --git a/www/apache22/options.mk b/www/apache22/options.mk
index 57c12e5f48a..6933435a6ae 100644
--- a/www/apache22/options.mk
+++ b/www/apache22/options.mk
@@ -1,10 +1,11 @@
-# $NetBSD: options.mk,v 1.2 2007/07/04 20:55:04 jlam Exp $
+# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:13 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.apache
 PKG_SUPPORTED_OPTIONS=	suexec
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		suexec
 .if !empty(PKG_OPTIONS:Msuexec)
 PKG_USERS_VARS+=	APACHE_USER
 BUILD_DEFS+=		VARBASE APACHE_SUEXEC_PATH
@@ -23,7 +24,5 @@ APACHE_SUEXEC_CONFIGURE_ARGS+=						\
 APACHE_MODULES+=        suexec
 CONFIGURE_ARGS+=        ${APACHE_SUEXEC_CONFIGURE_ARGS:M--with-suexec-*}
 BUILD_DEFS+=            APACHE_SUEXEC_CONFIGURE_ARGS
-PLIST_SUBST+=           SUEXEC_COMMENT=
-.else
-PLIST_SUBST+=           SUEXEC_COMMENT="@comment "
+PLIST.suexec=		yes
 .endif
-- 
cgit v1.2.3