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.

4 files changed, 37 insertions, 19 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 9d17be07a98..5875b98003f 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.165 2006/10/01 14:58:38 rillig Exp $
+# $NetBSD: Makefile,v 1.166 2006/10/17 05:46:09 rillig Exp $
 
 .include "Makefile.mirrors"
 
@@ -130,16 +130,18 @@ PLIST_SUBST+=		${LIB}_${NUM}=${${LIB}_${NUM}}
 .  endfor
 .endfor
 
+SMBLIBS=		msrpc smbclient
+SMBVERSION.msrpc=	${LIBMSRPC_MAJOR} ${LIBMSRPC_MAJOR}.${LIBMSRPC_MINOR}
+SMBVERSION.smbclient=	${LIBSMBCLIENT_MAJOR} ${LIBSMBCLIENT_MAJOR}.${LIBSMBCLIENT_MINOR}
+
 .PHONY: install-samba-lib-symlinks
 install-samba-lib-symlinks:
-	cd ${SAMBA_LIBDIR} && ${LN} -s libmsrpc.so			\
-		libmsrpc.so.${LIBMSRPC_MAJOR}
-	cd ${SAMBA_LIBDIR} && ${LN} -s libmsrpc.so			\
-		libmsrpc.so.${LIBMSRPC_MAJOR}.${LIBMSRPC_MINOR}
-	cd ${SAMBA_LIBDIR} && ${LN} -s libsmbclient.so			\
-		libsmbclient.so.${LIBSMBCLIENT_MAJOR}
-	cd ${SAMBA_LIBDIR} && ${LN} -s libsmbclient.so			\
-		libsmbclient.so.${LIBSMBCLIENT_MAJOR}.${LIBSMBCLIENT_MINOR}
+.for l in ${SMBLIBS}
+.  for v in ${SMBVERSION.${l}}
+	cd ${SAMBA_LIBDIR} && rm -f lib${l}.so.${v}			\
+	&& ln -s lib${l}.so lib${l}.so.${v}
+.  endfor
+.endfor
 
 post-extract:
 	${CP} ${FILESDIR}/adduser.sh ${FILESDIR}/deluser.sh ${WRKDIR}
diff --git a/net/samba/distinfo b/net/samba/distinfo
index d49fcbe3ebf..8aa820b7831 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.50 2006/07/11 07:42:31 ghen Exp $
+$NetBSD: distinfo,v 1.51 2006/10/17 05:46:09 rillig Exp $
 
 SHA1 (samba-3.0.22/samba-3.0.22.tar.gz) = 76eba872b3e8f647e16d0d8d129e02848a7989d7
 RMD160 (samba-3.0.22/samba-3.0.22.tar.gz) = b41cffc999c524c1650d2dd3fbd063dc79741091
 Size (samba-3.0.22/samba-3.0.22.tar.gz) = 17542657 bytes
-SHA1 (patch-ab) = 43e97366a460b0aa19667719f7235c9eb2a58022
+SHA1 (patch-ab) = abe35e71d1bfd37b4fa1260eb8b945f949af2713
 SHA1 (patch-ac) = 47529dfe904768e6a3076131978c89fe2d1e3619
 SHA1 (patch-ad) = dd1f36ce1ccabaf3b4efb1d61a8af1f4d3d1857a
 SHA1 (patch-ae) = a220568afcb6ae97e1000296795f852f8e92f624
@@ -19,7 +19,7 @@ SHA1 (patch-at) = bff50b53aedffbd352cc52ba49059b5c8010c140
 SHA1 (patch-au) = a061330dece8a9c49a02cf312b0fd39596b4baf2
 SHA1 (patch-av) = cb1c699eecce8aea8454308be6a4ab3f6b767b06
 SHA1 (patch-aw) = 374b1660d31ed54b85e68b49e25d80c2c54961be
-SHA1 (patch-ax) = 778ff50316524d06d0c609b0aa8c6dfb48914a8e
+SHA1 (patch-ax) = 73c182fc30dd9b1b36d77e8ba6cfec7b022a993c
 SHA1 (patch-ay) = 054ba0c228a546af7f020a79b707e5fff0b21ff7
 SHA1 (patch-ba) = e3695b8a9adad853528a69c2566af0384e01c015
 SHA1 (patch-bb) = 7a51028a9b5d81e4491b09b62851378e16425a99
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