ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/pack/freebsd/diff/sysutils/psmisc/psmisc.2010-08-12T070419Z.diff
Revision: 497
Committed: 2012-02-19T17:36:49-08:00 (13 years, 4 months ago) by douglas
File size: 8419 byte(s)
Log Message: 
Use ISO 8601 basic format instead of extended format since Windows is unhappy when I try to select a file with ':'s to attach in Thunderbird.

File Contents

# User Rev Content
1 douglas 281 diff -Nrux .svn -x work /usr/ports/sysutils/psmisc/Makefile psmisc/Makefile
2 douglas 339 --- /usr/ports/sysutils/psmisc/Makefile 2010-08-01 00:13:14.000000000 -0700
3     +++ psmisc/Makefile 2010-08-12 00:02:19.087759857 -0700
4     @@ -7,20 +7,39 @@
5 douglas 281
6     PORTNAME= psmisc
7 douglas 339 PORTVERSION= 22.12
8 douglas 290 +PORTREVISION= 1
9 douglas 281 CATEGORIES= sysutils
10 douglas 290 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}
11 douglas 281
12 douglas 290 MAINTAINER= sunpoet@sunpoet.net
13 douglas 281 COMMENT= A port of the Linux pstree, killall and pidof commands
14    
15 douglas 282 +BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed
16     +
17 douglas 339 CONFLICTS= pidof-[0-9]* pstree-2.[0-9]*
18 douglas 290
19     -CONFIGURE_ARGS= --disable-nls
20     +LICENSE= GPLv2
21     +
22 douglas 281 GNU_CONFIGURE= yes
23     USE_GMAKE= yes
24    
25 douglas 282 +OPTIONS= NLS "Native Language Support via gettext utilities" On
26     +
27     +.include <bsd.port.pre.mk>
28 douglas 290 +
29 douglas 339 MAN1= killall.1 pstree.1
30     -PLIST_FILES= bin/killall bin/pidof bin/pstree bin/pstree.x11
31     +
32 douglas 282 +.if defined(WITHOUT_NLS)
33     +CONFIGURE_ARGS+=--disable-nls
34     +PLIST_SUB+= NLS="@comment "
35     +.else
36     +USE_GETTEXT= yes
37     +CONFIGURE_ARGS+=--enable-nls
38     +CPPFLAGS+= -I${LOCALBASE}/include
39     +LDFLAGS+= -L${LOCALBASE}/lib
40     +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
41     +PLIST_SUB+= NLS=""
42     +.endif
43    
44 douglas 339 post-patch:
45     @${REINPLACE_CMD} -e '/^#define COMM_LEN / s|16|254|' ${WRKSRC}/src/comm.h
46     @@ -28,4 +47,4 @@
47 douglas 282 post-install:
48 douglas 290 @${LN} -fs killall ${PREFIX}/bin/pidof
49 douglas 282
50     -.include <bsd.port.mk>
51     +.include <bsd.port.post.mk>
52     diff -Nrux .svn -x work /usr/ports/sysutils/psmisc/files/patch-src-Makefile.in psmisc/files/patch-src-Makefile.in
53 douglas 339 --- /usr/ports/sysutils/psmisc/files/patch-src-Makefile.in 2010-08-01 00:13:14.000000000 -0700
54     +++ psmisc/files/patch-src-Makefile.in 2010-08-11 23:40:24.404739181 -0700
55 douglas 282 @@ -1,5 +1,5 @@
56 douglas 339 ---- src/Makefile.in.orig 2010-07-12 19:38:08.000000000 +0800
57     -+++ src/Makefile.in 2010-07-31 18:58:38.000000000 +0800
58     +--- src/Makefile.in.orig 2010-07-12 04:38:08.000000000 -0700
59     ++++ src/Makefile.in 2010-08-11 23:39:30.652095791 -0700
60 douglas 282 @@ -34,8 +34,8 @@
61     POST_UNINSTALL = :
62     build_triplet = @build@
63 douglas 339 @@ -37,32 +37,37 @@
64     prtstat_SOURCES = prtstat.c prtstat.h
65     BUILT_SOURCES = signames.h
66     EXTRA_DIST = signames.c
67     -@@ -545,14 +543,20 @@
68     -
69     +@@ -299,19 +297,19 @@
70 douglas 282 + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
71     + fuser$(EXEEXT): $(fuser_OBJECTS) $(fuser_DEPENDENCIES)
72     + @rm -f fuser$(EXEEXT)
73     +- $(LINK) $(fuser_OBJECTS) $(fuser_LDADD) $(LIBS)
74     ++ $(LINK) $(fuser_OBJECTS) $(fuser_LDADD) $(LIBS) $(INTLLIBS)
75     + killall$(EXEEXT): $(killall_OBJECTS) $(killall_DEPENDENCIES)
76     + @rm -f killall$(EXEEXT)
77     +- $(LINK) $(killall_OBJECTS) $(killall_LDADD) $(LIBS)
78     ++ $(LINK) $(killall_OBJECTS) $(killall_LDADD) $(LIBS) $(INTLLIBS)
79     + peekfd$(EXEEXT): $(peekfd_OBJECTS) $(peekfd_DEPENDENCIES)
80     + @rm -f peekfd$(EXEEXT)
81     +- $(LINK) $(peekfd_OBJECTS) $(peekfd_LDADD) $(LIBS)
82     ++ $(LINK) $(peekfd_OBJECTS) $(peekfd_LDADD) $(LIBS) $(INTLLIBS)
83     + prtstat$(EXEEXT): $(prtstat_OBJECTS) $(prtstat_DEPENDENCIES)
84     + @rm -f prtstat$(EXEEXT)
85     +- $(LINK) $(prtstat_OBJECTS) $(prtstat_LDADD) $(LIBS)
86     ++ $(LINK) $(prtstat_OBJECTS) $(prtstat_LDADD) $(LIBS) $(INTLLIBS)
87     + pstree$(EXEEXT): $(pstree_OBJECTS) $(pstree_DEPENDENCIES)
88     + @rm -f pstree$(EXEEXT)
89     +- $(LINK) $(pstree_OBJECTS) $(pstree_LDADD) $(LIBS)
90     ++ $(LINK) $(pstree_OBJECTS) $(pstree_LDADD) $(LIBS) $(INTLLIBS)
91    
92     + mostlyclean-compile:
93     + -rm -f *.$(OBJEXT)
94 douglas 339 +@@ -547,7 +545,7 @@
95 douglas 282 signames.h: signames.c Makefile
96 douglas 339 -- export LC_ALL=C ; \
97 douglas 282 -- @CPP@ -dM $< |\
98 douglas 339 + export LC_ALL=C ; \
99 douglas 282 + @CPP@ -dM $< |\
100     - tr -s '\t ' ' ' | sort -n -k 3 | sed \
101     -- 's:#define SIG\([A-Z]\+[0-9]*\) \([0-9]\+\) *\(\|/\*.*\)$$:{\ \2,"\1" },:p;d' | \
102     -- grep -v '[0-9][0-9][0-9]' >signames.h || \
103     -- { rm -f signames.h; exit 1; }
104     -- grep '^{ 1,"HUP" },$$' signames.h >/dev/null || \
105     -- { rm -f signames.h; exit 1; }
106     -+ @CPP@ -dM $< | {\
107     -+ signames=`kill -l | tr a-z A-Z`; \
108     -+ while read define name value; do \
109     -+ [ "$$define" = '#define' ] || continue; \
110     -+ case "$$value" in \
111     -+ *[!0-9]*) continue; \
112     -+ esac; \
113     -+ for signame in $$signames; do \
114     -+ if [ "$$name" = "SIG$$signame" ]; then \
115     -+ echo "{ $$value, \"$$signame\" },"; \
116     -+ fi; \
117     -+ done; \
118     -+ done; \
119     -+ } | sort -n -k 2 > signames.h
120     -
121     - install-exec-hook:
122     - cd $(DESTDIR)$(bindir) && \
123     ++ tr -s '\t ' ' ' | sort -n -k 3 | gsed \
124     + 's:#define SIG\([A-Z]\+[0-9]*\) \([0-9]\+\) *\(\|/\*.*\)$$:{\ \2,"\1" },:p;d' | \
125     + grep -v '[0-9][0-9][0-9]' >signames.h || \
126     + { rm -f signames.h; exit 1; }
127 douglas 281 diff -Nrux .svn -x work /usr/ports/sysutils/psmisc/files/patch-src-pstree.c psmisc/files/patch-src-pstree.c
128 douglas 339 --- /usr/ports/sysutils/psmisc/files/patch-src-pstree.c 2010-08-01 00:13:14.000000000 -0700
129     +++ psmisc/files/patch-src-pstree.c 2010-08-11 23:28:33.395505589 -0700
130 douglas 282 @@ -1,14 +1,16 @@
131 douglas 339 --- src/pstree.c.orig 2009-12-27 15:46:47.000000000 +0900
132     +++ src/pstree.c 2010-01-03 00:52:21.437862505 +0900
133 douglas 281 -@@ -37,6 +37,7 @@
134 douglas 282 +@@ -37,6 +37,9 @@
135 douglas 281 #include <term.h>
136     #include <termios.h>
137     #include <langinfo.h>
138     ++#ifdef __FreeBSD__
139     +#include <limits.h>
140     ++#endif
141     #include <assert.h>
142     #include <sys/types.h>
143     #include <sys/stat.h>
144     -@@ -590,7 +591,11 @@
145     +@@ -590,7 +594,11 @@
146     struct dirent *de;
147     FILE *file;
148     struct stat st;
149 douglas 282 @@ -20,31 +22,53 @@
150 douglas 281 char *buffer;
151     size_t buffer_size;
152     char readbuf[BUFSIZ + 1];
153     -@@ -623,7 +628,7 @@
154     +@@ -623,7 +631,11 @@
155     if ((pid = (pid_t) atoi(de->d_name)) != 0) {
156     if (! (path = malloc(strlen(PROC_BASE) + strlen(de->d_name) + 10)))
157     exit(2);
158     -- sprintf(path, "%s/%d/stat", PROC_BASE, pid);
159     ++#ifdef __FreeBSD__
160 douglas 339 + sprintf(path, "%s/%d/status", PROC_BASE, pid);
161 douglas 281 ++#else
162     + sprintf(path, "%s/%d/stat", PROC_BASE, pid);
163     ++#endif
164     if ((file = fopen(path, "r")) != NULL) {
165     empty = 0;
166     sprintf(path, "%s/%d", PROC_BASE, pid);
167     -@@ -638,6 +643,10 @@
168     +@@ -638,6 +650,29 @@
169     perror(path);
170     exit(1);
171     }
172     +#ifdef __FreeBSD__
173     -+ if (fscanf(file, "%s %*d %d", comm, &ppid) == 2)
174     -+ add_proc(comm, pid, ppid, st.st_uid, NULL, 0, 0);
175     ++ /* Read comm and ppid */
176     ++ if (fscanf(file, "%s %*d %d", readbuf, &ppid) == 2) {
177     ++ tmpptr = readbuf;
178     ++ size = 0;
179     ++ /* Unescape comm */
180     ++ do {
181     ++ if (*tmpptr == '\\')
182     ++ {
183     ++ char tmp = tmpptr[4];
184     ++ tmpptr[4] = 0;
185     ++ comm[size++] = strtol(++tmpptr, NULL, 8);
186     ++ tmpptr += 2;
187     ++ tmpptr[1] = tmp;
188     ++ }
189     ++ else
190     ++ comm[size++] = *tmpptr;
191     ++ } while (*++tmpptr);
192     ++ comm[size] = 0;
193     ++ /* Balance braces */
194     ++ {
195     ++ {
196     +#else
197     size = fread(readbuf, 1, BUFSIZ, file);
198     if (ferror(file) == 0) {
199     readbuf[size] = 0;
200     -@@ -725,6 +734,7 @@
201     - }
202     - }
203     - }
204     +@@ -692,6 +727,7 @@
205     + (void) closedir(taskdir);
206     + }
207     + free(taskpath);
208     +#endif /*__FreeBSD__*/
209     - (void) fclose(file);
210     - }
211     - free(path);
212     + if (!print_args)
213     + #ifdef WITH_SELINUX
214     + add_proc(comm, pid, ppid, st.st_uid, NULL, 0, 0, scontext);
215 douglas 282 diff -Nrux .svn -x work /usr/ports/sysutils/psmisc/pkg-plist psmisc/pkg-plist
216     --- /usr/ports/sysutils/psmisc/pkg-plist 1969-12-31 16:00:00.000000000 -0800
217 douglas 339 +++ psmisc/pkg-plist 2010-05-18 22:50:42.730462413 -0700
218 douglas 282 @@ -0,0 +1,26 @@
219     +bin/killall
220     +bin/pidof
221     +bin/pstree
222     +bin/pstree.x11
223     +%%NLS%%share/locale/bg/LC_MESSAGES/psmisc.mo
224     +%%NLS%%share/locale/ca/LC_MESSAGES/psmisc.mo
225     +%%NLS%%share/locale/cs/LC_MESSAGES/psmisc.mo
226     +%%NLS%%share/locale/de/LC_MESSAGES/psmisc.mo
227     +%%NLS%%share/locale/el/LC_MESSAGES/psmisc.mo
228     +%%NLS%%share/locale/eu/LC_MESSAGES/psmisc.mo
229     +%%NLS%%share/locale/fi/LC_MESSAGES/psmisc.mo
230     +%%NLS%%share/locale/fr/LC_MESSAGES/psmisc.mo
231     +%%NLS%%share/locale/hu/LC_MESSAGES/psmisc.mo
232     +%%NLS%%share/locale/id/LC_MESSAGES/psmisc.mo
233     +%%NLS%%share/locale/it/LC_MESSAGES/psmisc.mo
234     +%%NLS%%share/locale/ja/LC_MESSAGES/psmisc.mo
235     +%%NLS%%share/locale/nb/LC_MESSAGES/psmisc.mo
236     +%%NLS%%share/locale/nl/LC_MESSAGES/psmisc.mo
237     +%%NLS%%share/locale/pl/LC_MESSAGES/psmisc.mo
238     +%%NLS%%share/locale/pt/LC_MESSAGES/psmisc.mo
239     +%%NLS%%share/locale/ro/LC_MESSAGES/psmisc.mo
240     +%%NLS%%share/locale/ru/LC_MESSAGES/psmisc.mo
241     +%%NLS%%share/locale/sv/LC_MESSAGES/psmisc.mo
242     +%%NLS%%share/locale/vi/LC_MESSAGES/psmisc.mo
243     +%%NLS%%share/locale/zh_CN/LC_MESSAGES/psmisc.mo
244     +%%NLS%%share/locale/zh_TW/LC_MESSAGES/psmisc.mo