pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/hf6to4 Replace FILES_SUBST_SED with SUBST framewor...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4d9fd752592a
branches:  trunk
changeset: 506565:4d9fd752592a
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Jan 19 01:46:56 2006 +0000

description:
Replace FILES_SUBST_SED with SUBST framework and actually do something:
SH and PKG_SYSCONFDIR are now properly written into the script.

diffstat:

 net/hf6to4/Makefile     |  13 ++++++++++---
 net/hf6to4/files/hf6to4 |   6 +++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diffs (53 lines):

diff -r 9b557041f1be -r 4d9fd752592a net/hf6to4/Makefile
--- a/net/hf6to4/Makefile       Thu Jan 19 01:40:55 2006 +0000
+++ b/net/hf6to4/Makefile       Thu Jan 19 01:46:56 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/12/29 06:21:59 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2006/01/19 01:46:56 joerg Exp $
 #
 
 DISTNAME=              hf6to4-1.3
@@ -18,13 +18,20 @@
 EXTRACT_ONLY=  # empty
 NO_CHECKSUM=   yes
 NO_CONFIGURE=  yes
+NO_BUILD=      yes
 
 CONF_FILES+=   ${PREFIX}/share/examples/hf6to4/hf6to4.conf ${PKG_SYSCONFDIR}/hf6to4.conf
 
 INSTALLATION_DIRS=     man/man8 sbin
 
-do-build:
-       @${SED} ${FILES_SUBST_SED} ${FILESDIR}/hf6to4 > ${WRKSRC}/hf6to4
+SUBST_CLASSES+=                paths
+SUBST_FILES.paths=     hf6to4
+SUBST_SED.paths+=      -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
+SUBST_SED.paths+=      -e 's,@SH@,${SH},g'
+SUBST_STAGE.paths=     post-patch
+
+post-extract:
+       ${CP} ${FILESDIR}/hf6to4 ${WRKSRC}/hf6to4
 
 do-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/hf6to4
diff -r 9b557041f1be -r 4d9fd752592a net/hf6to4/files/hf6to4
--- a/net/hf6to4/files/hf6to4   Thu Jan 19 01:40:55 2006 +0000
+++ b/net/hf6to4/files/hf6to4   Thu Jan 19 01:46:56 2006 +0000
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@SH@
 #
-# $NetBSD: hf6to4,v 1.4 2005/05/30 22:49:43 hubertf Exp $
+# $NetBSD: hf6to4,v 1.5 2006/01/19 01:46:56 joerg Exp $
 #
 # Copyright (c) 2000-2005 Hubert Feyrer <hubert%feyrer.de@localhost>
 # All rights reserved.
@@ -36,7 +36,7 @@
 # hf6to4 - Setup 6to4 IPv6, for NetBSD (and others)
 #
 
-etcdir="/usr/pkg/etc";
+etcdir="@PKG_SYSCONFDIR@";
 
 not=false
 verbose=false



Home | Main Index | Thread Index | Old Index