mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 01:39:16 -04:00
- Update to 22.12
PR: ports/149166 Submitted by: Sunpoet Po-Chuan Hsieh <sunpoet AT sunpoet.net> (maintainer)
This commit is contained in:
parent
a1e2f7666e
commit
ff48a9d5cd
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=258563
6 changed files with 24 additions and 33 deletions
|
@ -6,14 +6,14 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
PORTNAME= psmisc
|
PORTNAME= psmisc
|
||||||
PORTVERSION= 22.11
|
PORTVERSION= 22.12
|
||||||
CATEGORIES= sysutils
|
CATEGORIES= sysutils
|
||||||
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}
|
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}
|
||||||
|
|
||||||
MAINTAINER= sunpoet@sunpoet.net
|
MAINTAINER= sunpoet@sunpoet.net
|
||||||
COMMENT= A port of the Linux pstree, killall and pidof commands
|
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
|
CONFIGURE_ARGS= --disable-nls
|
||||||
GNU_CONFIGURE= yes
|
GNU_CONFIGURE= yes
|
||||||
|
@ -22,6 +22,9 @@ USE_GMAKE= yes
|
||||||
MAN1= killall.1 pstree.1
|
MAN1= killall.1 pstree.1
|
||||||
PLIST_FILES= bin/killall bin/pidof bin/pstree bin/pstree.x11
|
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:
|
post-install:
|
||||||
@${LN} -fs killall ${PREFIX}/bin/pidof
|
@${LN} -fs killall ${PREFIX}/bin/pidof
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
MD5 (psmisc-22.11.tar.gz) = b5d32aa285b75c59dee96d3ea26a4881
|
MD5 (psmisc-22.12.tar.gz) = 16c83a351c292cfc845b27d6395e05fb
|
||||||
SHA256 (psmisc-22.11.tar.gz) = 8fff37557f5150d89ef9afc03133731da3eaa2bad1a94f64355218a68b884536
|
SHA256 (psmisc-22.12.tar.gz) = ba2f41a501da6137b2d94e54e855bea8246f65167c613d3990bd0ce49e996a7a
|
||||||
SIZE (psmisc-22.11.tar.gz) = 375038
|
SIZE (psmisc-22.12.tar.gz) = 374354
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- doc/Makefile.in.orig 2009-12-27 16:19:06.000000000 +0900
|
--- doc/Makefile.in.orig 2010-07-12 19:38:08.000000000 +0800
|
||||||
+++ doc/Makefile.in 2010-01-03 00:15:19.879070557 +0900
|
+++ doc/Makefile.in 2010-07-31 18:52:50.000000000 +0800
|
||||||
@@ -187,7 +187,7 @@
|
@@ -189,7 +189,7 @@
|
||||||
top_build_prefix = @top_build_prefix@
|
top_build_prefix = @top_build_prefix@
|
||||||
top_builddir = @top_builddir@
|
top_builddir = @top_builddir@
|
||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
--- src/Makefile.in.orig 2009-12-27 16:19:06.000000000 +0900
|
--- src/Makefile.in.orig 2010-07-12 19:38:08.000000000 +0800
|
||||||
+++ src/Makefile.in 2010-01-03 00:25:56.093987293 +0900
|
+++ src/Makefile.in 2010-07-31 18:58:38.000000000 +0800
|
||||||
@@ -34,8 +34,8 @@
|
@@ -34,8 +34,8 @@
|
||||||
POST_UNINSTALL = :
|
POST_UNINSTALL = :
|
||||||
build_triplet = @build@
|
build_triplet = @build@
|
||||||
|
@ -8,10 +8,10 @@
|
||||||
- prtstat$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
|
- prtstat$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
|
||||||
+bin_PROGRAMS = killall$(EXEEXT) pstree$(EXEEXT) \
|
+bin_PROGRAMS = killall$(EXEEXT) pstree$(EXEEXT) \
|
||||||
+ $(am__EXEEXT_1) $(am__EXEEXT_2) \
|
+ $(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_1 = peekfd
|
||||||
@WANT_PEEKFD_I386_TRUE@am__append_2 = -DI386
|
@WANT_PEEKFD_I386_TRUE@am__append_2 = -DI386
|
||||||
@@ -81,10 +81,10 @@
|
@@ -91,10 +91,8 @@
|
||||||
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||||
CCLD = $(CC)
|
CCLD = $(CC)
|
||||||
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
|
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
|
||||||
|
@ -19,19 +19,17 @@
|
||||||
- $(prtstat_SOURCES) $(pstree_SOURCES)
|
- $(prtstat_SOURCES) $(pstree_SOURCES)
|
||||||
-DIST_SOURCES = $(fuser_SOURCES) $(killall_SOURCES) $(peekfd_SOURCES) \
|
-DIST_SOURCES = $(fuser_SOURCES) $(killall_SOURCES) $(peekfd_SOURCES) \
|
||||||
- $(prtstat_SOURCES) $(pstree_SOURCES)
|
- $(prtstat_SOURCES) $(pstree_SOURCES)
|
||||||
+SOURCES = $(killall_SOURCES) \
|
+SOURCES = $(killall_SOURCES) $(pstree_SOURCES)
|
||||||
+ $(pstree_SOURCES)
|
+DIST_SOURCES = $(killall_SOURCES) $(pstree_SOURCES)
|
||||||
+DIST_SOURCES = $(killall_SOURCES) \
|
|
||||||
+ $(pstree_SOURCES)
|
|
||||||
ETAGS = etags
|
ETAGS = etags
|
||||||
CTAGS = ctags
|
CTAGS = ctags
|
||||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||||
@@ -208,10 +208,10 @@
|
@@ -217,10 +215,10 @@
|
||||||
$(am__append_4) $(am__append_6)
|
$(am__append_10)
|
||||||
fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h
|
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_SOURCES = killall.c comm.h signals.c signals.h i18n.h
|
||||||
-killall_LDADD = @SELINUX_LIB@
|
-killall_LDADD = @SELINUX_LIB@
|
||||||
+killall_LDADD =
|
+killall_LDADD =
|
||||||
peekfd_SOURCES = peekfd.c
|
peekfd_SOURCES = peekfd.c
|
||||||
pstree_SOURCES = pstree.c comm.h i18n.h
|
pstree_SOURCES = pstree.c comm.h i18n.h
|
||||||
-pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@
|
-pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@
|
||||||
|
@ -39,10 +37,11 @@
|
||||||
prtstat_SOURCES = prtstat.c prtstat.h
|
prtstat_SOURCES = prtstat.c prtstat.h
|
||||||
BUILT_SOURCES = signames.h
|
BUILT_SOURCES = signames.h
|
||||||
EXTRA_DIST = signames.c
|
EXTRA_DIST = signames.c
|
||||||
@@ -537,13 +537,20 @@
|
@@ -545,14 +543,20 @@
|
||||||
|
|
||||||
|
|
||||||
signames.h: signames.c Makefile
|
signames.h: signames.c Makefile
|
||||||
export LC_ALL=C ; \
|
- export LC_ALL=C ; \
|
||||||
- @CPP@ -dM $< |\
|
- @CPP@ -dM $< |\
|
||||||
- tr -s '\t ' ' ' | sort -n -k 3 | sed \
|
- tr -s '\t ' ' ' | sort -n -k 3 | sed \
|
||||||
- 's:#define SIG\([A-Z]\+[0-9]*\) \([0-9]\+\) *\(\|/\*.*\)$$:{\ \2,"\1" },:p;d' | \
|
- 's:#define SIG\([A-Z]\+[0-9]*\) \([0-9]\+\) *\(\|/\*.*\)$$:{\ \2,"\1" },:p;d' | \
|
||||||
|
|
|
@ -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
|
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
if (! (path = malloc(strlen(PROC_BASE) + strlen(de->d_name) + 10)))
|
if (! (path = malloc(strlen(PROC_BASE) + strlen(de->d_name) + 10)))
|
||||||
exit(2);
|
exit(2);
|
||||||
- sprintf(path, "%s/%d/stat", PROC_BASE, pid);
|
- 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) {
|
if ((file = fopen(path, "r")) != NULL) {
|
||||||
empty = 0;
|
empty = 0;
|
||||||
sprintf(path, "%s/%d", PROC_BASE, pid);
|
sprintf(path, "%s/%d", PROC_BASE, pid);
|
||||||
|
|
Loading…
Add table
Reference in a new issue