- Update to 22.12

PR:		ports/149166
Submitted by:	Sunpoet Po-Chuan Hsieh <sunpoet AT sunpoet.net> (maintainer)

6 files changed, 24 insertions, 33 deletions

diff --git a/sysutils/psmisc/Makefile b/sysutils/psmisc/Makefile
index 562cd68d4082..037888eeb4a7 100644
--- a/sysutils/psmisc/Makefile
+++ b/sysutils/psmisc/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	psmisc
-PORTVERSION=	22.11
+PORTVERSION=	22.12
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
 MAINTAINER=	sunpoet@sunpoet.net
 COMMENT=	A port of the Linux pstree, killall and pidof commands
 
-CONFLICTS=	pidof-[0-9]* pstree-2.*
+CONFLICTS=	pidof-[0-9]* pstree-2.[0-9]*
 
 CONFIGURE_ARGS=	--disable-nls
 GNU_CONFIGURE=	yes
@@ -22,6 +22,9 @@ USE_GMAKE=	yes
 MAN1=		killall.1 pstree.1
 PLIST_FILES=	bin/killall bin/pidof bin/pstree bin/pstree.x11
 
+post-patch:
+	@${REINPLACE_CMD} -e '/^#define COMM_LEN / s|16|254|' ${WRKSRC}/src/comm.h
+
 post-install:
 	@${LN} -fs killall ${PREFIX}/bin/pidof
 
diff --git a/sysutils/psmisc/distinfo b/sysutils/psmisc/distinfo
index 4ba11b4764ce..d8f0adfab377 100644
--- a/sysutils/psmisc/distinfo
+++ b/sysutils/psmisc/distinfo
@@ -1,3 +1,3 @@
-MD5 (psmisc-22.11.tar.gz) = b5d32aa285b75c59dee96d3ea26a4881
-SHA256 (psmisc-22.11.tar.gz) = 8fff37557f5150d89ef9afc03133731da3eaa2bad1a94f64355218a68b884536
-SIZE (psmisc-22.11.tar.gz) = 375038
+MD5 (psmisc-22.12.tar.gz) = 16c83a351c292cfc845b27d6395e05fb
+SHA256 (psmisc-22.12.tar.gz) = ba2f41a501da6137b2d94e54e855bea8246f65167c613d3990bd0ce49e996a7a
+SIZE (psmisc-22.12.tar.gz) = 374354
diff --git a/sysutils/psmisc/files/patch-doc-Makefile.in b/sysutils/psmisc/files/patch-doc-Makefile.in
index fdee4bfa7e0f..9c5def83ebef 100644
--- a/sysutils/psmisc/files/patch-doc-Makefile.in
+++ b/sysutils/psmisc/files/patch-doc-Makefile.in
@@ -1,6 +1,6 @@
---- doc/Makefile.in.orig	2009-12-27 16:19:06.000000000 +0900
-+++ doc/Makefile.in	2010-01-03 00:15:19.879070557 +0900
-@@ -187,7 +187,7 @@
+--- doc/Makefile.in.orig	2010-07-12 19:38:08.000000000 +0800
++++ doc/Makefile.in	2010-07-31 18:52:50.000000000 +0800
+@@ -189,7 +189,7 @@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
diff --git a/sysutils/psmisc/files/patch-src-Makefile.in b/sysutils/psmisc/files/patch-src-Makefile.in
index eed0c116d9cd..a750eb1673a4 100644
--- a/sysutils/psmisc/files/patch-src-Makefile.in
+++ b/sysutils/psmisc/files/patch-src-Makefile.in
@@ -1,5 +1,5 @@
---- src/Makefile.in.orig	2009-12-27 16:19:06.000000000 +0900
-+++ src/Makefile.in	2010-01-03 00:25:56.093987293 +0900
+--- src/Makefile.in.orig	2010-07-12 19:38:08.000000000 +0800
++++ src/Makefile.in	2010-07-31 18:58:38.000000000 +0800
 @@ -34,8 +34,8 @@
  POST_UNINSTALL = :
  build_triplet = @build@
@@ -8,10 +8,10 @@
 -	prtstat$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
 +bin_PROGRAMS = killall$(EXEEXT) pstree$(EXEEXT) \
 +	$(am__EXEEXT_1) $(am__EXEEXT_2) \
- 	$(am__EXEEXT_3)
+ 	$(am__EXEEXT_3) $(am__EXEEXT_4) $(am__EXEEXT_5)
  @WANT_PEEKFD_I386_TRUE@am__append_1 = peekfd
  @WANT_PEEKFD_I386_TRUE@am__append_2 = -DI386
-@@ -81,10 +81,10 @@
+@@ -91,10 +91,8 @@
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -19,19 +19,17 @@
 -	$(prtstat_SOURCES) $(pstree_SOURCES)
 -DIST_SOURCES = $(fuser_SOURCES) $(killall_SOURCES) $(peekfd_SOURCES) \
 -	$(prtstat_SOURCES) $(pstree_SOURCES)
-+SOURCES = $(killall_SOURCES) \
-+	$(pstree_SOURCES)
-+DIST_SOURCES = $(killall_SOURCES) \
-+	$(pstree_SOURCES)
++SOURCES = $(killall_SOURCES) $(pstree_SOURCES)
++DIST_SOURCES = $(killall_SOURCES) $(pstree_SOURCES)
  ETAGS = etags
  CTAGS = ctags
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -208,10 +208,10 @@
- 	$(am__append_4) $(am__append_6)
+@@ -217,10 +215,10 @@
+ 	$(am__append_10)
  fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h
  killall_SOURCES = killall.c comm.h signals.c signals.h i18n.h
 -killall_LDADD = @SELINUX_LIB@
-+killall_LDADD = 
++killall_LDADD =
  peekfd_SOURCES = peekfd.c
  pstree_SOURCES = pstree.c comm.h i18n.h
 -pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@
@@ -39,10 +37,11 @@
  prtstat_SOURCES = prtstat.c prtstat.h
  BUILT_SOURCES = signames.h
  EXTRA_DIST = signames.c 
-@@ -537,13 +537,20 @@
+@@ -545,14 +543,20 @@
+ 
  
  signames.h: signames.c Makefile
- 		export LC_ALL=C ; \
+-		export LC_ALL=C ; \
 -		@CPP@ -dM $< |\
 -		tr -s '\t ' ' ' | sort -n -k 3 | sed \
 -	's:#define SIG\([A-Z]\+[0-9]*\) \([0-9]\+\) *\(\|/\*.*\)$$:{\ \2,"\1" },:p;d' | \
diff --git a/sysutils/psmisc/files/patch-src-comm.h b/sysutils/psmisc/files/patch-src-comm.h
deleted file mode 100644
index 4d17ba82d651..000000000000
--- a/sysutils/psmisc/files/patch-src-comm.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/comm.h.orig	Thu Dec 14 00:43:10 2000
-+++ src/comm.h	Sat Sep 10 03:55:27 2005
-@@ -11,7 +11,7 @@
- #define COMM_LEN sizeof(dummy.comm)
- extern struct task_struct dummy;
- #else
--#define COMM_LEN 16		/* synchronize with size of comm in struct task_struct in
-+#define COMM_LEN 254		/* synchronize with size of comm in struct task_struct in
- 				   /usr/include/linux/sched.h */
- #endif
- 
diff --git a/sysutils/psmisc/files/patch-src-pstree.c b/sysutils/psmisc/files/patch-src-pstree.c
index bcc6128f60e8..5759cff4a134 100644
--- a/sysutils/psmisc/files/patch-src-pstree.c
+++ b/sysutils/psmisc/files/patch-src-pstree.c
@@ -25,7 +25,7 @@
        if (! (path = malloc(strlen(PROC_BASE) + strlen(de->d_name) + 10)))
          exit(2);
 -      sprintf(path, "%s/%d/stat", PROC_BASE, pid);
-+      sprintf (path, "%s/%d/status", PROC_BASE, pid);
++      sprintf(path, "%s/%d/status", PROC_BASE, pid);
        if ((file = fopen(path, "r")) != NULL) {
          empty = 0;
          sprintf(path, "%s/%d", PROC_BASE, pid);