[pkgsrc/trunk]: pkgsrc/www Use SUBST framework.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/868237b0ab4a
branches:  trunk
changeset: 505649:868237b0ab4a
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Jan 05 21:57:36 2006 +0000

description:
Use SUBST framework.

diffstat:

 www/privoxy/Makefile   |  15 +++++++--------
 www/tinyproxy/Makefile |  14 +++++++-------
 2 files changed, 14 insertions(+), 15 deletions(-)

diffs (60 lines):

diff -r 82bf9bf1579d -r 868237b0ab4a www/privoxy/Makefile
--- a/www/privoxy/Makefile      Thu Jan 05 21:34:39 2006 +0000
+++ b/www/privoxy/Makefile      Thu Jan 05 21:57:36 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/12/29 06:22:24 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2006/01/05 22:16:40 joerg Exp $
 #
 
 DISTNAME=      ${PKGNAME_NOREV}-stable-src
@@ -55,16 +55,15 @@
 DEINSTALL_EXTRA_TMPL=  ${.CURDIR}/INSTALL
 INSTALL_EXTRA_TMPL=    ${.CURDIR}/INSTALL
 
-FILES_SUBST+=          EGDIR=${EGDIR:Q}
 FILES_SUBST+=          PRIVOXY_USER=${PRIVOXY_USER:Q}
 
+SUBST_CLASSES+=                paths
+SUBST_FILES.paths=     config
+SUBST_SED.paths+=      -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
+SUBST_STAGE.paths=     post-patch
+
 pre-configure:
-       @cd ${WRKSRC} &&                                        \
-       (   autoheader && autoconf ;                            \
-           ${MV} config config.bak &&                          \
-           ${SED} ${FILES_SUBST_SED} <config.bak >config &&    \
-           ${RM} -f config.bak                                 \
-       )
+       @cd ${WRKSRC} && autoheader && autoconf
 
 post-install:
        ${CHOWN} -R ${ROOT_USER}:${ROOT_GROUP} ${EGDIR}
diff -r 82bf9bf1579d -r 868237b0ab4a www/tinyproxy/Makefile
--- a/www/tinyproxy/Makefile    Thu Jan 05 21:34:39 2006 +0000
+++ b/www/tinyproxy/Makefile    Thu Jan 05 21:57:36 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/12/29 06:22:24 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/01/05 21:57:36 joerg Exp $
 #
 
 DISTNAME=      tinyproxy-1.6.2
@@ -34,12 +34,12 @@
 
 CONF_FILES=    ${EGDIR}/tinyproxy.conf.default ${PKG_SYSCONFDIR}/tinyproxy.conf
 
-post-patch:
-       @cd ${WRKSRC}/doc && \
-       for f in tinyproxy.8 tinyproxy.conf; do \
-               ${MV} $${f} $${f}.orig; \
-               ${SED} ${FILES_SUBST_SED} $${f}.orig > $${f}; \
-       done
+SUBST_CLASSES+=                docs
+SUBST_FILES.docs=      doc/tinyproxy.8 doc/tinyproxy.conf
+SUBST_SED.docs+=       -e 's,@TINYPROXY_USER@,${TINYPROXY_USER},g'
+SUBST_SED.docs+=       -e 's,@TINYPROXY_GROUP@,${TINYPROXY_GROUP},g'
+SUBST_SED.docs+=       -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
+SUBST_STAGE.docs=      post-patch
 
 post-install:
        ${INSTALL_DATA_DIR} ${EGDIR}