Attachment #108348 for bug #149166

View | Details | Raw Unified | Return to bug 149166
Collapse All | Expand All




#

PORTNAME=	psmisc
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.[0-9]*

CONFIGURE_ARGS=	--disable-nls
GNU_CONFIGURE=	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


Lines 1-3 Link Here

(-)/usr/ports/sunpoet/psmisc/distinfo (-3 / +3 lines)
1	MD5 (psmisc-22.11.tar.gz) = b5d32aa285b75c59dee96d3ea26a4881	1	MD5 (psmisc-22.12.tar.gz) = 16c83a351c292cfc845b27d6395e05fb
2	SHA256 (psmisc-22.11.tar.gz) = 8fff37557f5150d89ef9afc03133731da3eaa2bad1a94f64355218a68b884536	2	SHA256 (psmisc-22.12.tar.gz) = ba2f41a501da6137b2d94e54e855bea8246f65167c613d3990bd0ce49e996a7a
3	SIZE (psmisc-22.11.tar.gz) = 375038	3	SIZE (psmisc-22.12.tar.gz) = 374354

Lines 1-6 Link Here

(-)/usr/ports/sunpoet/psmisc/files/patch-doc-Makefile.in (-3 / +3 lines)
1	--- doc/Makefile.in.orig 2009-12-27 16:19:06.000000000 +0900	1	--- doc/Makefile.in.orig 2010-07-12 19:38:08.000000000 +0800
2	+++ doc/Makefile.in 2010-01-03 00:15:19.879070557 +0900	2	+++ doc/Makefile.in 2010-07-31 18:52:50.000000000 +0800
3	@@ -187,7 +187,7 @@	3	@@ -189,7 +189,7 @@
4	top_build_prefix = @top_build_prefix@	4	top_build_prefix = @top_build_prefix@
5	top_builddir = @top_builddir@	5	top_builddir = @top_builddir@
6	top_srcdir = @top_srcdir@	6	top_srcdir = @top_srcdir@




--- 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@

-	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_4) $(am__EXEEXT_5)
 @WANT_PEEKFD_I386_TRUE@am__append_1 = peekfd
 @WANT_PEEKFD_I386_TRUE@am__append_2 = -DI386
@@ -91,10 +91,8 @@
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@

-	$(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)
+DIST_SOURCES = $(killall_SOURCES) \
+	$(pstree_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -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 =
 peekfd_SOURCES = peekfd.c
 pstree_SOURCES = pstree.c comm.h i18n.h
-pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@

 prtstat_SOURCES = prtstat.c prtstat.h
 BUILT_SOURCES = signames.h
 EXTRA_DIST = signames.c 
@@ -545,14 +543,20 @@
 
 
 signames.h: signames.c Makefile
-		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' | \

Lines 1-11 Link Here

(-)/usr/ports/sunpoet/psmisc/files/patch-src-comm.h (-11 lines)
1	--- src/comm.h.orig Thu Dec 14 00:43:10 2000
2	+++ src/comm.h Sat Sep 10 03:55:27 2005
3	@@ -11,7 +11,7 @@
4	#define COMM_LEN sizeof(dummy.comm)
5	extern struct task_struct dummy;
6	#else
7	-#define COMM_LEN 16 /* synchronize with size of comm in struct task_struct in
8	+#define COMM_LEN 254 /* synchronize with size of comm in struct task_struct in
9	/usr/include/linux/sched.h */
10	#endif
11

Lines 25-31 Link Here

(-)/usr/ports/sunpoet/psmisc/files/patch-src-pstree.c (-1 / +1 lines)
25	if (! (path = malloc(strlen(PROC_BASE) + strlen(de->d_name) + 10)))	25	if (! (path = malloc(strlen(PROC_BASE) + strlen(de->d_name) + 10)))
26	exit(2);	26	exit(2);
27	- sprintf(path, "%s/%d/stat", PROC_BASE, pid);	27	- sprintf(path, "%s/%d/stat", PROC_BASE, pid);
28	+ sprintf (path, "%s/%d/status", PROC_BASE, pid);	28	+ sprintf(path, "%s/%d/status", PROC_BASE, pid);
29	if ((file = fopen(path, "r")) != NULL) {	29	if ((file = fopen(path, "r")) != NULL) {
30	empty = 0;	30	empty = 0;
31	sprintf(path, "%s/%d", PROC_BASE, pid);	31	sprintf(path, "%s/%d", PROC_BASE, pid);

Return to bug 149166

Lines 6-19 Link Here

(-)/usr/ports/sunpoet/psmisc/Makefile (-2 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= psmisc	8	PORTNAME= psmisc
9	PORTVERSION= 22.11	9	PORTVERSION= 22.12
10	CATEGORIES= sysutils	10	CATEGORIES= sysutils
11	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}	11	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}
12		12
13	MAINTAINER= sunpoet@sunpoet.net	13	MAINTAINER= sunpoet@sunpoet.net
14	COMMENT= A port of the Linux pstree, killall and pidof commands	14	COMMENT= A port of the Linux pstree, killall and pidof commands
15		15
16	CONFLICTS= pidof-[0-9]* pstree-2.*	16	CONFLICTS= pidof-[0-9]* pstree-2.[0-9]*
17		17
18	CONFIGURE_ARGS= --disable-nls	18	CONFIGURE_ARGS= --disable-nls
19	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
Lines 22-27 Link Here
22	MAN1= killall.1 pstree.1	22	MAN1= killall.1 pstree.1
23	PLIST_FILES= bin/killall bin/pidof bin/pstree bin/pstree.x11	23	PLIST_FILES= bin/killall bin/pidof bin/pstree bin/pstree.x11
24		24
		25	post-patch:
		26	@${REINPLACE_CMD} -e '/^#define COMM_LEN / s\|16\|254\|' ${WRKSRC}/src/comm.h
		27
25	post-install:	28	post-install:
26	@${LN} -fs killall ${PREFIX}/bin/pidof	29	@${LN} -fs killall ${PREFIX}/bin/pidof
27		30

Lines 1-5 Link Here

(-)/usr/ports/sunpoet/psmisc/files/patch-src-Makefile.in (-13 / +12 lines)
1	--- src/Makefile.in.orig 2009-12-27 16:19:06.000000000 +0900	1	--- src/Makefile.in.orig 2010-07-12 19:38:08.000000000 +0800
2	+++ src/Makefile.in 2010-01-03 00:25:56.093987293 +0900	2	+++ src/Makefile.in 2010-07-31 18:58:38.000000000 +0800
3	@@ -34,8 +34,8 @@	3	@@ -34,8 +34,8 @@
4	POST_UNINSTALL = :	4	POST_UNINSTALL = :
5	build_triplet = @build@	5	build_triplet = @build@
Lines 8-17 Link Here
8	- prtstat$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \	8	- prtstat$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
9	+bin_PROGRAMS = killall$(EXEEXT) pstree$(EXEEXT) \	9	+bin_PROGRAMS = killall$(EXEEXT) pstree$(EXEEXT) \
10	+ $(am__EXEEXT_1) $(am__EXEEXT_2) \	10	+ $(am__EXEEXT_1) $(am__EXEEXT_2) \
11	$(am__EXEEXT_3)	11	$(am__EXEEXT_3) $(am__EXEEXT_4) $(am__EXEEXT_5)
12	@WANT_PEEKFD_I386_TRUE@am__append_1 = peekfd	12	@WANT_PEEKFD_I386_TRUE@am__append_1 = peekfd
13	@WANT_PEEKFD_I386_TRUE@am__append_2 = -DI386	13	@WANT_PEEKFD_I386_TRUE@am__append_2 = -DI386
14	@@ -81,10 +81,10 @@	14	@@ -91,10 +91,8 @@
15	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)	15	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
16	CCLD = $(CC)	16	CCLD = $(CC)
17	LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@	17	LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
Lines 19-37 Link Here
19	- $(prtstat_SOURCES) $(pstree_SOURCES)	19	- $(prtstat_SOURCES) $(pstree_SOURCES)
20	-DIST_SOURCES = $(fuser_SOURCES) $(killall_SOURCES) $(peekfd_SOURCES) \	20	-DIST_SOURCES = $(fuser_SOURCES) $(killall_SOURCES) $(peekfd_SOURCES) \
21	- $(prtstat_SOURCES) $(pstree_SOURCES)	21	- $(prtstat_SOURCES) $(pstree_SOURCES)
22	+SOURCES = $(killall_SOURCES) \	22	+SOURCES = $(killall_SOURCES) $(pstree_SOURCES)
23	+ $(pstree_SOURCES)	23	+DIST_SOURCES = $(killall_SOURCES) $(pstree_SOURCES)
24	+DIST_SOURCES = $(killall_SOURCES) \
25	+ $(pstree_SOURCES)
26	ETAGS = etags	24	ETAGS = etags
27	CTAGS = ctags	25	CTAGS = ctags
28	DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)	26	DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
29	@@ -208,10 +208,10 @@	27	@@ -217,10 +215,10 @@
30	$(am__append_4) $(am__append_6)	28	$(am__append_10)
31	fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h	29	fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h
32	killall_SOURCES = killall.c comm.h signals.c signals.h i18n.h	30	killall_SOURCES = killall.c comm.h signals.c signals.h i18n.h
33	-killall_LDADD = @SELINUX_LIB@	31	-killall_LDADD = @SELINUX_LIB@
34	+killall_LDADD =	32	+killall_LDADD =
35	peekfd_SOURCES = peekfd.c	33	peekfd_SOURCES = peekfd.c
36	pstree_SOURCES = pstree.c comm.h i18n.h	34	pstree_SOURCES = pstree.c comm.h i18n.h
37	-pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@	35	-pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@
Lines 39-48 Link Here
39	prtstat_SOURCES = prtstat.c prtstat.h	37	prtstat_SOURCES = prtstat.c prtstat.h
40	BUILT_SOURCES = signames.h	38	BUILT_SOURCES = signames.h
41	EXTRA_DIST = signames.c	39	EXTRA_DIST = signames.c
42	@@ -537,13 +537,20 @@	40	@@ -545,14 +543,20 @@
		41
43		42
44	signames.h: signames.c Makefile	43	signames.h: signames.c Makefile
45	export LC_ALL=C ; \	44	- export LC_ALL=C ; \
46	- @CPP@ -dM $< \|\	45	- @CPP@ -dM $< \|\
47	- tr -s '\t ' ' ' \| sort -n -k 3 \| sed \	46	- tr -s '\t ' ' ' \| sort -n -k 3 \| sed \
48	- 's:#define SIG\([A-Z]\+[0-9]\) \([0-9]\+\) \(\\|/\.\)$$:{\ \2,"\1" },:p;d' \| \	47	- 's:#define SIG\([A-Z]\+[0-9]\) \([0-9]\+\) \(\\|/\.\)$$:{\ \2,"\1" },:p;d' \| \