Replaced explicit call to ${SED} with PLIST_SUBST, which makes the bogus

lines starting with "@" disappear from the PLIST file.

2 files changed, 54 insertions, 57 deletions

diff --git a/misc/jitterbug/Makefile b/misc/jitterbug/Makefile
index 9932f9f2a4b..0b9bd463271 100644
--- a/misc/jitterbug/Makefile
+++ b/misc/jitterbug/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:39 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2006/01/10 18:50:09 rillig Exp $
 
 DISTNAME=	jitterbug-1.6.2
 PKGREVISION=	1
@@ -19,7 +19,6 @@ ADDGROUP=		${LOCALBASE}/sbin/groupadd
 .endif
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}/source
-PLIST_SRC=	${WRKDIR}/PLIST-src
 INSTALL_FILE=	${WRKDIR}/INSTALL
 DEINSTALL_FILE=	${WRKDIR}/DEINSTALL
 CONFIGDIR=	${WRKDIR}/${PKGNAME_NOREV}/config
@@ -55,6 +54,12 @@ MESSAGE_SUBST+=	JB_USER=${JB_USER:Q}		\
 		JB_PACKAGE=${JB_PACKAGE:Q}	\
 		JB_LOCALMAIL=${JB_LOCALMAIL:Q}
 
+PLIST_SUBST+=	JB_DATADIR=${JB_DATADIR:Q}
+PLIST_SUBST+=	CGIBINDIR=${CGIBINDIR:Q}
+PLIST_SUBST+=	JB_PACKAGE=${JB_PACKAGE:Q}
+PLIST_SUBST+=	JB_USER=${JB_USER:Q}
+PLIST_SUBST+=	JB_GROUP=${JB_GROUP:Q}
+
 pre-extract:
 	@(if [ "X${JB_HOSTNAME}" = "X${JB_LONGNAME}" ]; then                  \
 	${ECHO};                                                              \
@@ -137,14 +142,6 @@ pre-install:
 			<${PKGDIR}/INSTALL                                    \
 			>${INSTALL_FILE}
 	@${SED}                                                               \
-		-e 's|@JB_DATADIR@|${JB_DATADIR}|g'                           \
-		-e 's|@CGIBINDIR@|${CGIBINDIR}|g'                             \
-		-e 's|@JB_PACKAGE@|${JB_PACKAGE}|g'                           \
-		-e 's|@JB_USER@|${JB_USER}|g'                                 \
-		-e 's|@JB_GROUP@|${JB_GROUP}|g'                               \
-			<${PKGDIR}/PLIST                                      \
-			>${PLIST_SRC}
-	@${SED}                                                               \
 		-e 's|@JB_USER@|${JB_USER}|g'                                 \
 			<${FILESDIR}/jitterbug.auth                           \
 			>${WRKDIR}/jitterbug.auth
diff --git a/misc/jitterbug/PLIST b/misc/jitterbug/PLIST
index a96c3976241..de9a9bd8b1f 100644
--- a/misc/jitterbug/PLIST
+++ b/misc/jitterbug/PLIST
@@ -1,49 +1,49 @@
-@comment $NetBSD: PLIST,v 1.4 2002/06/26 10:29:50 seb Exp $
-@JB_USER@/config/footer.html
-@exec if [ ! -d %D/@JB_DATADIR@ ]; then ${MKDIR} %D/@JB_DATADIR@; fi
-@exec if [ ! -f %D/@JB_DATADIR@/footer.html ]; then /bin/cp -p %D/%F %D/@JB_DATADIR@/footer.html; fi
-@JB_USER@/config/guest.prefs
-@exec if [ ! -f %D/@JB_DATADIR@/guest.prefs ]; then /bin/cp -p %D/%F %D/@JB_DATADIR@/guest.prefs; fi
-@JB_USER@/config/guestintro.html
-@exec if [ ! -f %D/@JB_DATADIR@/guestintro.html ]; then /bin/cp -p %D/%F %D/@JB_DATADIR@/guestintro.html; fi
-@JB_USER@/config/intro.html
-@exec if [ ! -f %D/@JB_DATADIR@/intro.html ]; then /bin/cp -p %D/%F %D/@JB_DATADIR@/intro.html; fi
-@JB_USER@/config/reportform.html
-@exec if [ ! -f %D/@JB_DATADIR@/reportform.html ]; then /bin/cp -p %D/%F %D/@JB_DATADIR@/reportform.html; fi
-@JB_USER@/config/users
-@exec if [ ! -f %D/@JB_DATADIR@/users ]; then /bin/cp -p %D/%F %D/@JB_DATADIR@/users; fi
-@JB_USER@/config/jitterbug.config
-@exec if [ ! -d %D/etc/jitterbug/@JB_PACKAGE@ ]; then ${MKDIR} %D/etc/jitterbug/@JB_PACKAGE@; fi
-@exec if [ ! -f %D/etc/jitterbug/@JB_PACKAGE@ ]; then /bin/cp -p %D/%F %D/etc/jitterbug/@JB_PACKAGE@; fi
-etc/jitterbug/@JB_PACKAGE@
-@exec if [ ! -f %D/etc/jitterbug/@JB_PACKAGE@.private ]; then /bin/cp -p %D/%F %D/etc/jitterbug/@JB_PACKAGE@.private; fi
-etc/jitterbug/@JB_PACKAGE@.private
+@comment $NetBSD: PLIST,v 1.5 2006/01/10 18:50:09 rillig Exp $
+${JB_USER}/config/footer.html
+@exec if [ ! -d %D/${JB_DATADIR} ]; then ${MKDIR} %D/${JB_DATADIR}; fi
+@exec if [ ! -f %D/${JB_DATADIR}/footer.html ]; then /bin/cp -p %D/%F %D/${JB_DATADIR}/footer.html; fi
+${JB_USER}/config/guest.prefs
+@exec if [ ! -f %D/${JB_DATADIR}/guest.prefs ]; then /bin/cp -p %D/%F %D/${JB_DATADIR}/guest.prefs; fi
+${JB_USER}/config/guestintro.html
+@exec if [ ! -f %D/${JB_DATADIR}/guestintro.html ]; then /bin/cp -p %D/%F %D/${JB_DATADIR}/guestintro.html; fi
+${JB_USER}/config/intro.html
+@exec if [ ! -f %D/${JB_DATADIR}/intro.html ]; then /bin/cp -p %D/%F %D/${JB_DATADIR}/intro.html; fi
+${JB_USER}/config/reportform.html
+@exec if [ ! -f %D/${JB_DATADIR}/reportform.html ]; then /bin/cp -p %D/%F %D/${JB_DATADIR}/reportform.html; fi
+${JB_USER}/config/users
+@exec if [ ! -f %D/${JB_DATADIR}/users ]; then /bin/cp -p %D/%F %D/${JB_DATADIR}/users; fi
+${JB_USER}/config/jitterbug.config
+@exec if [ ! -d %D/etc/jitterbug/${JB_PACKAGE} ]; then ${MKDIR} %D/etc/jitterbug/${JB_PACKAGE}; fi
+@exec if [ ! -f %D/etc/jitterbug/${JB_PACKAGE} ]; then /bin/cp -p %D/%F %D/etc/jitterbug/${JB_PACKAGE}; fi
+etc/jitterbug/${JB_PACKAGE}
+@exec if [ ! -f %D/etc/jitterbug/${JB_PACKAGE}.private ]; then /bin/cp -p %D/%F %D/etc/jitterbug/${JB_PACKAGE}.private; fi
+etc/jitterbug/${JB_PACKAGE}.private
 etc/jitterbug/httpd.conf.add
 @dirrm etc/jitterbug
-@exec if [ ! -d %D/@JB_USER@/etc ]; then ${MKDIR} %D/@JB_USER@/etc; fi
-@exec [ -f %D/@JB_USER@/etc/jitterbug.auth ] || /bin/echo "@JB_USER@:*************" > %D/@JB_USER@/etc/jitterbug.auth
-@JB_USER@/bin/new_message
-@JB_USER@/bin/jitterbug
-@dirrm @JB_USER@/bin
-@JB_USER@/doc/POSTINSTALL
-@JB_USER@/doc/NEWPACKAGE
-@JB_USER@/doc/CONFIG.txt
-@JB_USER@/doc/INSTALL
-@JB_USER@/doc/JitterBug.txt
-@dirrm @JB_USER@/doc
-@JB_USER@/@JB_PACKAGE@/bug_tracking/footer.html
-@JB_USER@/@JB_PACKAGE@/bug_tracking/guest.prefs
-@JB_USER@/@JB_PACKAGE@/bug_tracking/guestintro.html
-@JB_USER@/@JB_PACKAGE@/bug_tracking/intro.html
-@JB_USER@/@JB_PACKAGE@/bug_tracking/reportform.html
-@JB_USER@/@JB_PACKAGE@/bug_tracking/users
-@dirrm @JB_USER@/@JB_PACKAGE@/bug_tracking
-@dirrm @JB_USER@/@JB_PACKAGE@
-@JB_USER@/etc/jitterbug.auth
-@exec ${CHOWN} -R @JB_USER@ %D/@JB_USER@
-@exec /usr/bin/chgrp -R @JB_GROUP@ %D/@JB_USER@
-@dirrm @JB_USER@/config
-@dirrm @JB_USER@/etc
-@dirrm @JB_USER@
-@CGIBINDIR@/@JB_PACKAGE@
-@CGIBINDIR@/@JB_PACKAGE@.private
+@exec if [ ! -d %D/${JB_USER}/etc ]; then ${MKDIR} %D/${JB_USER}/etc; fi
+@exec [ -f %D/${JB_USER}/etc/jitterbug.auth ] || /bin/echo "${JB_USER}:*************" > %D/${JB_USER}/etc/jitterbug.auth
+${JB_USER}/bin/new_message
+${JB_USER}/bin/jitterbug
+@dirrm ${JB_USER}/bin
+${JB_USER}/doc/POSTINSTALL
+${JB_USER}/doc/NEWPACKAGE
+${JB_USER}/doc/CONFIG.txt
+${JB_USER}/doc/INSTALL
+${JB_USER}/doc/JitterBug.txt
+@dirrm ${JB_USER}/doc
+${JB_USER}/${JB_PACKAGE}/bug_tracking/footer.html
+${JB_USER}/${JB_PACKAGE}/bug_tracking/guest.prefs
+${JB_USER}/${JB_PACKAGE}/bug_tracking/guestintro.html
+${JB_USER}/${JB_PACKAGE}/bug_tracking/intro.html
+${JB_USER}/${JB_PACKAGE}/bug_tracking/reportform.html
+${JB_USER}/${JB_PACKAGE}/bug_tracking/users
+@dirrm ${JB_USER}/${JB_PACKAGE}/bug_tracking
+@dirrm ${JB_USER}/${JB_PACKAGE}
+${JB_USER}/etc/jitterbug.auth
+@exec ${CHOWN} -R ${JB_USER} %D/${JB_USER}
+@exec /usr/bin/chgrp -R ${JB_GROUP} %D/${JB_USER}
+@dirrm ${JB_USER}/config
+@dirrm ${JB_USER}/etc
+@dirrm ${JB_USER}
+${CGIBINDIR}/${JB_PACKAGE}
+${CGIBINDIR}/${JB_PACKAGE}.private