From 00c9cf874dfab2b3d7ba6652204776c3973a5a37 Mon Sep 17 00:00:00 2001
From: snj <snj>
Date: Sun, 20 Feb 2005 06:46:07 +0000
Subject: Kill some hardcoded UID, GID, and mode settings that were being
 passed to ${INSTALL}.  This should fix the problem seen in minskim's Linux
 bulk build.

---
 shells/scponly/distinfo         |  4 ++--
 shells/scponly/patches/patch-aa | 16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'shells')

diff --git a/shells/scponly/distinfo b/shells/scponly/distinfo
index e05f89df68b..0e44791f668 100644
--- a/shells/scponly/distinfo
+++ b/shells/scponly/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/01/28 02:27:29 snj Exp $
+$NetBSD: distinfo,v 1.2 2005/02/20 06:46:07 snj Exp $
 
 SHA1 (scponly-4.0.tgz) = 418486395896dc2a528295a4b508c8b408bfb33c
 Size (scponly-4.0.tgz) = 85053 bytes
-SHA1 (patch-aa) = 1bb06b4a1892450cafb55d1dea0ffdb8b706306f
+SHA1 (patch-aa) = 0dd9c9daebe6ed5bdadbdf28695f7539c1bd21d4
diff --git a/shells/scponly/patches/patch-aa b/shells/scponly/patches/patch-aa
index b1cbb8b2592..0cf1229c998 100644
--- a/shells/scponly/patches/patch-aa
+++ b/shells/scponly/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/01/28 02:27:29 snj Exp $
+$NetBSD: patch-aa,v 1.2 2005/02/20 06:46:07 snj Exp $
 
---- Makefile.in.orig	2003-11-19 22:04:53.000000000 -0800
-+++ Makefile.in	2005-01-27 18:02:16.000000000 -0800
+--- Makefile.in.orig	Wed Nov 19 22:04:53 2003
++++ Makefile.in	Sat Feb 19 22:30:44 2005
 @@ -9,7 +9,7 @@ CFLAGS		 = @CFLAGS@ -I$(srcdir) -I.
  INSTALL		 = @INSTALL@
  CC		 = @CC@
@@ -15,11 +15,13 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/01/28 02:27:29 snj Exp $
  	${INSTALL} -d ${bindir}
  	${INSTALL} -d ${mandir}/man8
  	${INSTALL} -d ${CONFDIR}
-+	${INSTALL} -d ${prefix}/share/examples/scponly
- 	${INSTALL} -o 0 -g 0 scponly ${bindir}/scponly
- 	${INSTALL} -o 0 -g 0 -m 0644 scponly.8 ${mandir}/man8/scponly.8
+-	${INSTALL} -o 0 -g 0 scponly ${bindir}/scponly
+-	${INSTALL} -o 0 -g 0 -m 0644 scponly.8 ${mandir}/man8/scponly.8
 -	${INSTALL} -o 0 -g 0 -m 0644 debuglevel ${DEBUGFILE}
-+	${INSTALL} -o 0 -g 0 -m 0644 debuglevel ${prefix}/share/examples/scponly
++	${INSTALL} -d ${prefix}/share/examples/scponly
++	${BSD_INSTALL_PROGRAM} scponly ${bindir}/scponly
++	${BSD_INSTALL_DATA} scponly.8 ${mandir}/man8/scponly.8
++	${BSD_INSTALL_DATA} debuglevel ${prefix}/share/examples/scponly
  	if test "x${CHROOTED_NAME}" != "x"; then			\
  		${INSTALL} -d ${sbindir};				\
  		rm -f ${sbindir}/${CHROOTED_NAME};			\
-- 
cgit v1.2.3