5 files changed, 85 insertions, 26 deletions

diff --git a/sysutils/psmisc/Makefile b/sysutils/psmisc/Makefile
index e514f1413286..193a27dd8540 100644
--- a/sysutils/psmisc/Makefile
+++ b/sysutils/psmisc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	psmisc
-PORTVERSION=	21.5
+PORTVERSION=	21.6
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	psmisc
@@ -15,6 +15,7 @@ MAINTAINER=	pav@FreeBSD.org
 COMMENT=	A port of the Linux pstree, killall and pidof commands
 
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--disable-nls
 USE_GMAKE=	yes
 USE_GETOPT_LONG=yes
diff --git a/sysutils/psmisc/distinfo b/sysutils/psmisc/distinfo
index 749d7bc227d9..22ce508d306d 100644
--- a/sysutils/psmisc/distinfo
+++ b/sysutils/psmisc/distinfo
@@ -1,2 +1,2 @@
-MD5 (psmisc-21.5.tar.gz) = c62b09ad5129e2f7e4611019d1d3d4b8
-SIZE (psmisc-21.5.tar.gz) = 382603
+MD5 (psmisc-21.6.tar.gz) = 6994f227b38b09cb3f3bdd3bc5fc65fe
+SIZE (psmisc-21.6.tar.gz) = 222454
diff --git a/sysutils/psmisc/files/patch-src-Makefile.in b/sysutils/psmisc/files/patch-src-Makefile.in
index 935bb744b9ee..49c7113575a5 100644
--- a/sysutils/psmisc/files/patch-src-Makefile.in
+++ b/sysutils/psmisc/files/patch-src-Makefile.in
@@ -1,8 +1,8 @@
---- src/Makefile.in.orig	Tue May 25 02:55:10 2004
-+++ src/Makefile.in	Sat Sep 10 02:45:34 2005
-@@ -15,7 +15,7 @@
- @SET_MAKE@
+--- src/Makefile.in.orig	Wed Oct  5 08:53:13 2005
++++ src/Makefile.in	Wed Oct  5 08:59:34 2005
+@@ -14,7 +14,7 @@
  
+ @SET_MAKE@
  
 -SOURCES = $(fuser_SOURCES) $(killall_SOURCES) $(pstree_SOURCES)
 +SOURCES = $(killall_SOURCES) $(pstree_SOURCES)
@@ -10,18 +10,18 @@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
 @@ -38,7 +38,7 @@
- PRE_UNINSTALL = :
  POST_UNINSTALL = :
+ build_triplet = @build@
  host_triplet = @host@
 -bin_PROGRAMS = fuser$(EXEEXT) killall$(EXEEXT) pstree$(EXEEXT)
 +bin_PROGRAMS = killall$(EXEEXT) pstree$(EXEEXT)
  subdir = src
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -75,8 +75,8 @@
+@@ -71,8 +71,8 @@
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 -SOURCES = $(fuser_SOURCES) $(killall_SOURCES) $(pstree_SOURCES)
 -DIST_SOURCES = $(fuser_SOURCES) $(killall_SOURCES) $(pstree_SOURCES)
 +SOURCES = $(killall_SOURCES) $(pstree_SOURCES)
@@ -29,19 +29,19 @@
  ETAGS = etags
  CTAGS = ctags
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -193,9 +193,9 @@
- bin_SCRIPTS = pstree.x11
- fuser_SOURCES = fuser.c comm.h signals.c signals.h loop.h
- killall_SOURCES = killall.c comm.h signals.c signals.h 
+@@ -174,9 +174,9 @@
+ AM_CFLAGS = -Wall -DLOCALEDIR=\"/usr/share/locale\"
+ fuser_SOURCES = fuser.c comm.h signals.c signals.h loop.h i18n.h
+ killall_SOURCES = killall.c comm.h signals.c signals.h i18n.h
 -killall_LDADD = @FLASK_LIB@
 +killall_LDADD = @FLASK_LIB@ $(LIBINTL)
- pstree_SOURCES = pstree.c comm.h
+ pstree_SOURCES = pstree.c comm.h i18n.h
 -pstree_LDADD = @TERMCAP_LIB@ @FLASK_LIB@
 +pstree_LDADD = @TERMCAP_LIB@ @FLASK_LIB@ $(LIBINTL)
  BUILT_SOURCES = signames.h
  EXTRA_DIST = signames.c 
- CLEANFILES = signames.h pstree.x11
-@@ -504,12 +504,11 @@
+ CLEANFILES = signames.h
+@@ -449,12 +449,11 @@
  
  signames.h: signames.c Makefile
  		@CPP@ -dM $< |\
@@ -57,4 +57,4 @@
 +		grep '^{1,"HUP" },$$' signames.h >/dev/null || \
  		  { rm -f signames.h; exit 1; }
  
- Makefile:	signames.h
+ install-exec-hook:
diff --git a/sysutils/psmisc/files/patch-src-killall.c b/sysutils/psmisc/files/patch-src-killall.c
index 6f87e55187a7..31cf7da73519 100644
--- a/sysutils/psmisc/files/patch-src-killall.c
+++ b/sysutils/psmisc/files/patch-src-killall.c
@@ -1,6 +1,62 @@
---- src/killall.c.orig	Fri Apr 23 15:51:26 2004
-+++ src/killall.c	Sat Sep 10 03:55:48 2005
-@@ -80,7 +80,7 @@
+--- src/killall.c.orig	Fri Dec 10 13:31:29 2004
++++ src/killall.c	Wed Oct  5 09:16:10 2005
+@@ -39,35 +39,31 @@
+            quiet = 0, wait_until_dead = 0, process_group = 0,
+            ignore_case = 0, pidof;
+ 
++/*
++ * This is the implementation from 21.5, as the one in 21.6 uses
++ * Linux specific functions getline() and rpmatch()
++ */
+ static int
+ ask (char *name, pid_t pid)
+ {
+-  int res;
+-  size_t len;
+-  char *line;
++  int ch, c;
+ 
+-  line = NULL;
+-  len = 0;
+-
+-  do {
+-    printf (_("Kill %s(%s%d) ? (y/N) "), name, process_group ? "pgid " : "",
+-	    pid);
+-    fflush (stdout);
+-
+-    if (getline (&line, &len, stdin) < 0)
+-      return 0;
+-    /* Check for default */
+-    if (line[0] == '\n') {
+-      free(line);
+-      return 0;
+-    }
+-    res = rpmatch(line);
+-    if (res >= 0) {
+-      free(line);
+-      return res;
++  do
++    {
++      printf (_("Kill %s(%s%d) ? (y/n) "), name, process_group ? "pgid " : "",
++	      pid);
++      fflush (stdout);
++      do
++	if ((ch = getchar ()) == EOF)
++	  exit (0);
++      while (ch == '\n' || ch == '\t' || ch == ' ');
++      do
++	if ((c = getchar ()) == EOF)
++	  exit (0);
++      while (c != '\n');
+     }
+-  } while(1);
+-  /* Never should get here */
++  while (ch != 'y' && ch != 'n' && ch != 'Y' && ch != 'N');
++  return ch == 'y' || ch == 'Y';
+ }
+ 
+ #ifdef FLASK_LINUX
+@@ -82,7 +78,7 @@
    struct dirent *de;
    FILE *file;
    struct stat st, sts[MAX_NAMES];
@@ -9,7 +65,7 @@
    char *path, comm[COMM_LEN];
    char *command_buf;
    char *command;
-@@ -171,7 +171,7 @@
+@@ -173,7 +169,7 @@
      }
    for (i = 0; i < pids; i++)
      {
@@ -18,7 +74,7 @@
  	continue;
        if (!(file = fopen (path, "r"))) 
  	{
-@@ -180,72 +180,13 @@
+@@ -182,72 +178,13 @@
  	}
        free (path);
        empty = 0;
@@ -92,7 +148,7 @@
        for (j = 0; j < names; j++)
  	{
  	  pid_t id;
-@@ -279,7 +220,7 @@
+@@ -281,7 +218,7 @@
  	    }
  	  else
  	    {
@@ -101,7 +157,7 @@
  		continue;
  #ifdef FLASK_LINUX
            if (stat_secure(path,&st,&lsid) < 0) {
-@@ -355,6 +296,7 @@
+@@ -357,6 +294,7 @@
  	fprintf (stderr, _("%s: no process killed\n"), namelist[i]);
    if (pidof)
      putchar ('\n');
diff --git a/sysutils/psmisc/pkg-descr b/sysutils/psmisc/pkg-descr
index 0e1f582a3fcf..c68de871fdca 100644
--- a/sysutils/psmisc/pkg-descr
+++ b/sysutils/psmisc/pkg-descr
@@ -1,2 +1,4 @@
 A port of the Linux pstree, killall and pidof commands.
 Does not include the 'fuser' command.
+
+WWW: http://psmisc.sourceforge.net