From 90aae5f35775e4e194a99081d1d5d7c85f770a3b Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Sat, 24 Dec 2005 15:04:52 +0000
Subject: [PATCH] Clifford Wolf: 	Updated psmisc (21.8)

[2005121423434224179] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6881 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/base/psmisc/psmisc.desc               |  4 +--
 package/base/psmisc/reinstall-fix.patch       | 11 ++++++
 .../use-either-ncurses-or-termcap.patch       | 35 -------------------
 3 files changed, 13 insertions(+), 37 deletions(-)
 create mode 100644 package/base/psmisc/reinstall-fix.patch
 delete mode 100644 package/base/psmisc/use-either-ncurses-or-termcap.patch

diff --git a/package/base/psmisc/psmisc.desc b/package/base/psmisc/psmisc.desc
index a027f3dd5..a9b5ad0b1 100644
--- a/package/base/psmisc/psmisc.desc
+++ b/package/base/psmisc/psmisc.desc
@@ -36,8 +36,8 @@
 
 [L] OpenSource
 [S] Stable
-[V] 21.5
+[V] 21.8
 [P] X -?-3-----9 186.600
 
-[D] 3041343680 psmisc-21.5.tar.gz http://download.sourceforge.net/psmisc/
+[D] 319669380 psmisc-21.8.tar.gz http://download.sourceforge.net/psmisc/
 
diff --git a/package/base/psmisc/reinstall-fix.patch b/package/base/psmisc/reinstall-fix.patch
new file mode 100644
index 000000000..2a2005823
--- /dev/null
+++ b/package/base/psmisc/reinstall-fix.patch
@@ -0,0 +1,11 @@
+--- ./src/Makefile.in.orig	2005-12-14 23:56:18.000000000 +0100
++++ ./src/Makefile.in	2005-12-14 23:56:21.000000000 +0100
+@@ -470,7 +470,7 @@
+ 
+ install-exec-hook:
+ 		cd $(DESTDIR)$(bindir) && \
+-			$(LN_S) pstree pstree.x11
++			$(LN_S) -f pstree pstree.x11
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/package/base/psmisc/use-either-ncurses-or-termcap.patch b/package/base/psmisc/use-either-ncurses-or-termcap.patch
deleted file mode 100644
index 00d96e885..000000000
--- a/package/base/psmisc/use-either-ncurses-or-termcap.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/base/psmisc/use-either-ncurses-or-termcap.patch
-# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- ./src/pstree.c.orig	2004-08-29 17:20:07.000000000 +0200
-+++ ./src/pstree.c	2004-08-29 17:11:26.000000000 +0200
-@@ -16,9 +16,12 @@
- #include <pwd.h>
- #include <dirent.h>
- #include <curses.h>
--#include <term.h>
- #include <termios.h>
-+#ifdef HAVE_TERMCAP_H
- #include <termcap.h>
-+#else
-+#include <term.h>
-+#endif
- #include <langinfo.h>
- #include <sys/types.h>
- #include <sys/stat.h>