From 905df754320aad40e79dae94b1b67185483496ab Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Thu, 5 Jan 2006 21:57:36 +0000
Subject: Use SUBST framework.

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

(limited to 'www')

diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index d0bfd082624..728b27f431d 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -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 @@ OWN_DIRS_PERMS+=	/var/log/privoxy ${USER_GROUP} 0775
 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 --git a/www/tinyproxy/Makefile b/www/tinyproxy/Makefile
index 5989fa32574..c8bf107478f 100644
--- a/www/tinyproxy/Makefile
+++ b/www/tinyproxy/Makefile
@@ -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 @@ EGDIR=		${PREFIX}/share/examples/tinyproxy
 
 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}
-- 
cgit v1.2.3