diff options
| author | rillig <rillig@pkgsrc.org> | 2006-10-17 05:46:09 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-10-17 05:46:09 +0000 |
| commit | cc0e291e8f797fdb553d136ffd933e0ed38084b2 (patch) | |
| tree | 445988a3602214ce8aaabc0fbe32420e399d5d9d /net/samba/patches | |
| parent | ec84d0263927b1c7e157304af716a444ea05a9c7 (diff) | |
| download | pkgsrc-cc0e291e8f797fdb553d136ffd933e0ed38084b2.tar.gz | |
Fixed the install stage so that it is more likely to pass the
files-check: No backup copies of the Samba binaries are made.
Before using ln -s, the destination file is removed. This is necessary
for installing the package over an already-installed version.
Diffstat (limited to 'net/samba/patches')
| -rw-r--r-- | net/samba/patches/patch-ab | 14 | ||||
| -rw-r--r-- | net/samba/patches/patch-ax | 16 |
2 files changed, 23 insertions, 7 deletions
diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab index c7551e3dc02..53084d9b651 100644 --- a/net/samba/patches/patch-ab +++ b/net/samba/patches/patch-ab @@ -1,8 +1,14 @@ -$NetBSD: patch-ab,v 1.24 2005/11/14 08:05:27 jlam Exp $ +$NetBSD: patch-ab,v 1.25 2006/10/17 05:46:09 rillig Exp $ ---- script/installbin.sh.orig 2005-10-12 13:03:44.000000000 -0400 -+++ script/installbin.sh -@@ -22,11 +22,12 @@ for p in $*; do +--- script/installbin.sh.orig 2005-02-25 18:59:43.000000000 +0100 ++++ script/installbin.sh 2006-10-17 07:11:30.000000000 +0200 +@@ -17,16 +17,16 @@ for p in $*; do + p2=`basename $p` + echo Installing $p as $BINDIR/$p2 + if [ -f $BINDIR/$p2 ]; then +- rm -f $BINDIR/$p2.old +- mv $BINDIR/$p2 $BINDIR/$p2.old ++ rm -f $BINDIR/$p2 fi cp $p $BINDIR/ chmod $INSTALLPERMS $BINDIR/$p2 diff --git a/net/samba/patches/patch-ax b/net/samba/patches/patch-ax index b330fc609ef..49ffbc37e97 100644 --- a/net/samba/patches/patch-ax +++ b/net/samba/patches/patch-ax @@ -1,7 +1,7 @@ -$NetBSD: patch-ax,v 1.1 2005/11/14 08:05:27 jlam Exp $ +$NetBSD: patch-ax,v 1.2 2006/10/17 05:46:10 rillig Exp $ ---- script/installscripts.sh.orig 2005-10-12 13:03:44.000000000 -0400 -+++ script/installscripts.sh +--- script/installscripts.sh.orig 2005-02-25 18:59:43.000000000 +0100 ++++ script/installscripts.sh 2006-10-17 07:12:12.000000000 +0200 @@ -12,7 +12,7 @@ echo Installing scripts in $BINDIR for d in $BINDIR; do @@ -11,3 +11,13 @@ $NetBSD: patch-ax,v 1.1 2005/11/14 08:05:27 jlam Exp $ if [ ! -d $d ]; then echo Failed to make directory $d echo Have you run installbin first? +@@ -25,8 +25,7 @@ for p in $*; do + p2=`basename $p` + echo Installing $BINDIR/$p2 + if [ -f $BINDIR/$p2 ]; then +- rm -f $BINDIR/$p2.old +- mv $BINDIR/$p2 $BINDIR/$p2.old ++ rm -f $BINDIR/$p2 + fi + cp $p $BINDIR/ + chmod $INSTALLPERMS $BINDIR/$p2 |