Use SUBST framework. Be pedantic and also replace /bin/sh with ${SH}.

3 files changed, 14 insertions, 8 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 2e31ba193f9..04ae87c831e 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.156 2006/01/02 22:33:36 jlam Exp $
+# $NetBSD: Makefile,v 1.157 2006/01/06 00:15:21 joerg Exp $
 
 .include "Makefile.mirrors"
 
@@ -98,6 +98,13 @@ OWN_DIRS=		${SAMBA_ETCDIR} ${SAMBA_LOCKDIR} ${SAMBA_STATEDIR}
 OWN_DIRS_PERMS=		${SAMBA_PRIVATE} ${ROOT_USER} ${ROOT_GROUP} 0700
 RCD_SCRIPTS+=		samba nmbd smbd ${WINBINDD_RCD_SCRIPT}
 
+SUBST_CLASSES+=		paths
+SUBST_FILES.paths=	${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh
+SUBST_SED.paths+=	-e 's,@AWK@,${AWK},g' -e 's,@CAT@,${CAT},g'
+SUBST_SED.paths+=	-e 's,@MKTEMP@,${MKTEMP},g' -e 's,@RM@,${RM},g'
+SUBST_SED.paths+=	-e 's,@PWD_MKDB@,${PWD_MKDB},g' -e 's,@SH@,${SH},g'
+SUBST_STAGE.paths=	post-patch
+
 # Get the shared library major and minors for the installed shared
 # libraries.  We'll need these to create the versioned symlinks for
 # the shared libraries because samba Makefile doesn't do it on its
@@ -122,9 +129,8 @@ install-samba-lib-symlinks:
 	cd ${SAMBA_LIBDIR} && ${LN} -s libsmbclient.so			\
 		libsmbclient.so.${LIBSMBCLIENT_MAJOR}.${LIBSMBCLIENT_MINOR}
 
-post-build:
-	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/adduser.sh > ${WRKDIR}/adduser.sh
-	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/deluser.sh > ${WRKDIR}/deluser.sh
+post-extract:
+	${CP} ${FILESDIR}/adduser.sh ${FILESDIR}/deluser.sh ${WRKDIR}
 
 post-install: install-samba-lib-symlinks
 	${RMDIR} ${PREFIX}/share/samba/swat/lang/ja/include
diff --git a/net/samba/files/adduser.sh b/net/samba/files/adduser.sh
index 5120eb83c12..3875c6f9a7a 100644
--- a/net/samba/files/adduser.sh
+++ b/net/samba/files/adduser.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@SH@
 #
-# $NetBSD: adduser.sh,v 1.2 2004/01/11 02:26:31 jlam Exp $
+# $NetBSD: adduser.sh,v 1.3 2006/01/06 00:15:21 joerg Exp $
 #
 # This is an adduser script for NetBSD systems whose useradd(8) doesn't
 # accept "$" in the username.  This script may be used for the
diff --git a/net/samba/files/deluser.sh b/net/samba/files/deluser.sh
index 8bf3f613fa1..51a92d7793a 100644
--- a/net/samba/files/deluser.sh
+++ b/net/samba/files/deluser.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@SH@
 #
-# $NetBSD: deluser.sh,v 1.2 2004/01/11 02:26:31 jlam Exp $
+# $NetBSD: deluser.sh,v 1.3 2006/01/06 00:15:21 joerg Exp $
 #
 # This is a deluser script for NetBSD systems whose userdel(8) doesn't
 # accept "$" in the username.