[pkgsrc/trunk]: pkgsrc Update pkg_install to 20030913. Changes from version ...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3135eed81d9c
branches:  trunk
changeset: 461264:3135eed81d9c
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Sep 13 09:24:07 2003 +0000

description:
Update pkg_install to 20030913.  Changes from version 20020912 are quieting
the file removal when deleting linkfarms if the expected file doesn't
exist.  Since the symlink isn't there, the mission is already accomplished,
so why bother with the warning?

diffstat:

 doc/CHANGES                                    |  3 ++-
 pkgtools/pkg_install/files/lib/version.h       |  4 ++--
 pkgtools/pkg_install/files/view/linkfarm.sh.in |  6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r c32390dd5e14 -r 3135eed81d9c doc/CHANGES
--- a/doc/CHANGES       Sat Sep 13 08:50:37 2003 +0000
+++ b/doc/CHANGES       Sat Sep 13 09:24:07 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.3354 2003/09/13 08:42:19 jlam Exp $
+$NetBSD: CHANGES,v 1.3355 2003/09/13 09:24:07 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2003:
 
@@ -3668,3 +3668,4 @@
        Updated quagga to 0.96.2nb1 [salo 2003-09-13]
        Updated freetype2 to 2.1.5 [adam 2003-09-13]
        Updated p5-Time-HiRes to 1.50 [jlam 2003-09-13]
+       Updated pkg_install to 20030913 [jlam 2003-09-13]
diff -r c32390dd5e14 -r 3135eed81d9c pkgtools/pkg_install/files/lib/version.h
--- a/pkgtools/pkg_install/files/lib/version.h  Sat Sep 13 08:50:37 2003 +0000
+++ b/pkgtools/pkg_install/files/lib/version.h  Sat Sep 13 09:24:07 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.13 2003/09/13 05:50:26 jlam Exp $        */
+/*     $NetBSD: version.h,v 1.14 2003/09/13 09:24:22 jlam Exp $        */
 
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
@@ -33,6 +33,6 @@
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
 
-#define PKGTOOLS_VERSION "20030912"
+#define PKGTOOLS_VERSION "20030913"
 
 #endif /* _INST_LIB_VERSION_H_ */
diff -r c32390dd5e14 -r 3135eed81d9c pkgtools/pkg_install/files/view/linkfarm.sh.in
--- a/pkgtools/pkg_install/files/view/linkfarm.sh.in    Sat Sep 13 08:50:37 2003 +0000
+++ b/pkgtools/pkg_install/files/view/linkfarm.sh.in    Sat Sep 13 09:24:07 2003 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: linkfarm.sh.in,v 1.1 2003/09/08 04:49:07 jlam Exp $
+# $NetBSD: linkfarm.sh.in,v 1.2 2003/09/13 09:24:22 jlam Exp $
 
 #
 # Copyright (c) 2002 Alistair G. Crooks.  All rights reserved.
@@ -174,9 +174,9 @@
                case $ignore in
                no)     
                        if [ $verbose -gt 0 ]; then
-                               echo "$rmprog $todir/$newf"
+                               echo "$rmprog -f $todir/$newf"
                        fi
-                       $doit $rmprog $todir/$f ;;
+                       $doit $rmprog -f $todir/$f ;;
                esac
        done
        for d in `$findprog . -type d -print | $sortprog -r`; do