ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/pack/freebsd/diff/sysutils/psmisc/psmisc.2011-08-07T053402Z.diff
Revision: 497
Committed: 2012-02-19T17:36:49-08:00 (13 years, 4 months ago) by douglas
File size: 4441 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 455 --- /usr/ports/sysutils/psmisc/Makefile 2010-10-05 22:58:11.000000000 -0700
3 douglas 456 +++ psmisc/Makefile 2011-08-06 22:32:59.138989182 -0700
4     @@ -6,19 +6,19 @@
5 douglas 455 #
6 douglas 281
7     PORTNAME= psmisc
8 douglas 455 -PORTVERSION= 22.13
9     +PORTVERSION= 22.14
10 douglas 281 CATEGORIES= sysutils
11 douglas 455 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/
12 douglas 281
13 douglas 455 MAINTAINER= douglas@douglasthrift.net
14 douglas 281 COMMENT= A port of the Linux pstree, killall and pidof commands
15    
16 douglas 455 +LICENSE= GPLv2
17 douglas 282 +
18 douglas 455 BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed
19    
20 douglas 339 CONFLICTS= pidof-[0-9]* pstree-2.[0-9]*
21 douglas 290
22 douglas 455 -LICENSE= GPLv2
23     -
24 douglas 281 GNU_CONFIGURE= yes
25     USE_GMAKE= yes
26    
27 douglas 456 @@ -34,9 +34,6 @@
28 douglas 455 .else
29     USE_GETTEXT= yes
30 douglas 456 CONFIGURE_ARGS= --enable-nls
31 douglas 455 -CPPFLAGS+= -I${LOCALBASE}/include
32     -LDFLAGS+= -L${LOCALBASE}/lib
33     -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
34     PLIST_SUB+= NLS=""
35     .endif
36 douglas 282
37 douglas 455 diff -Nrux .svn -x work /usr/ports/sysutils/psmisc/distinfo psmisc/distinfo
38     --- /usr/ports/sysutils/psmisc/distinfo 2011-03-19 05:33:10.000000000 -0700
39     +++ psmisc/distinfo 2011-08-06 20:48:51.620144975 -0700
40     @@ -1,2 +1,2 @@
41     -SHA256 (psmisc-22.13.tar.gz) = 06d25e8ebb4722dbcede98a787c39a9ed341f8e58fde10c0b2d6b35990b35daa
42     -SIZE (psmisc-22.13.tar.gz) = 382389
43     +SHA256 (psmisc-22.14.tar.gz) = 22bbf4561837af475c0d8d14e3b9cab453998c787212c107fac7faf2f281e26e
44     +SIZE (psmisc-22.14.tar.gz) = 382024
45     diff -Nrux .svn -x work /usr/ports/sysutils/psmisc/files/patch-src-killall.c psmisc/files/patch-src-killall.c
46     --- /usr/ports/sysutils/psmisc/files/patch-src-killall.c 2010-01-02 08:40:10.000000000 -0800
47     +++ psmisc/files/patch-src-killall.c 2011-08-06 21:51:02.097478158 -0700
48 douglas 282 @@ -1,5 +1,5 @@
49 douglas 455 ---- src/killall.c.orig 2009-12-18 21:45:36.000000000 +0900
50     -+++ src/killall.c 2010-01-03 00:37:34.818411284 +0900
51     +--- src/killall.c.orig 2011-06-20 04:43:24.000000000 -0700
52     ++++ src/killall.c 2011-08-06 21:48:35.014330713 -0700
53     @@ -36,6 +36,8 @@
54     #include <dirent.h>
55     #include <signal.h>
56     @@ -9,7 +9,7 @@
57 douglas 281 #include <sys/types.h>
58     #include <sys/stat.h>
59 douglas 455 #include <getopt.h>
60     -@@ -83,40 +85,35 @@
61     +@@ -87,40 +89,35 @@
62     ignore_case = 0, pidof;
63     static long younger_than = 0, older_than = 0;
64    
65     @@ -34,10 +34,10 @@
66     - else
67     - printf (_("Signal %s(%s%d) ? (y/N) "), name, process_group ? "pgid " : "",
68     - pid);
69     +-
70     +- fflush (stdout);
71     + int ch, c;
72    
73     -- fflush (stdout);
74     --
75     - if (getline (&line, &len, stdin) < 0)
76     - return 0;
77     - /* Check for default */
78     @@ -74,7 +74,16 @@
79     }
80    
81     static double
82     -@@ -356,7 +353,7 @@
83     +@@ -197,7 +194,7 @@
84     +
85     + while (fgets(buf, sizeof buf, f))
86     + {
87     +- if (sscanf (buf, "Uid:\t%d", &puid))
88     ++ if (sscanf (buf, "%*s %*d %*d %*d %*d %*s %*s %*s %*s %*s %*s %*s %d", &puid))
89     + {
90     + re = uid==puid;
91     + break;
92     +@@ -360,7 +357,7 @@
93 douglas 281 }
94 douglas 455 #endif /*WITH_SELINUX*/
95     /* load process name */
96     @@ -83,7 +92,7 @@
97     continue;
98     if (!(file = fopen (path, "r")))
99     {
100     -@@ -364,7 +361,7 @@
101     +@@ -368,7 +365,7 @@
102     continue;
103     }
104     free (path);
105     @@ -92,7 +101,7 @@
106     if (!okay) {
107     fclose(file);
108     continue;
109     -@@ -386,65 +383,6 @@
110     +@@ -390,65 +387,6 @@
111     got_long = 0;
112     command = NULL; /* make gcc happy */
113     length = strlen (comm);
114     @@ -158,7 +167,7 @@
115     /* mach by process name */
116     for (j = 0; j < names; j++)
117     {
118     -@@ -495,7 +433,7 @@
119     +@@ -499,7 +437,7 @@
120     {
121     int ok = 1;
122    
123     @@ -167,12 +176,12 @@
124     continue;
125    
126     if (stat (path, &st) < 0)
127     -@@ -842,7 +780,7 @@
128     - fprintf (stderr, _("Maximum number of names is %d\n"), MAX_NAMES);
129     - exit (1);
130     - }
131     -- if (stat("/proc/self/stat", &isproc)==-1) {
132     -+ if (stat("/proc/curproc/status", &isproc)==-1) {
133     - fprintf (stderr, _("%s is empty (not mounted ?)\n"), PROC_BASE);
134     - exit (1);
135     - }
136     +@@ -693,7 +631,7 @@
137     + struct stat isproc;
138     + pid_t pid = getpid();
139     +
140     +- snprintf(filename, sizeof(filename), PROC_BASE"/%d/stat", (int) pid);
141     ++ snprintf(filename, sizeof(filename), PROC_BASE"/%d/status", (int) pid);
142     + return stat(filename, &isproc) == 0;
143     + }
144     +
145     diff -Nrux .svn -x work /usr/ports/sysutils/psmisc/pkg-descr psmisc/pkg-descr
146     --- /usr/ports/sysutils/psmisc/pkg-descr 2005-10-05 00:49:45.000000000 -0700
147     +++ psmisc/pkg-descr 2010-10-05 23:40:48.818176312 -0700
148     @@ -1,4 +1,4 @@
149     A port of the Linux pstree, killall and pidof commands.
150     Does not include the 'fuser' command.
151    
152     -WWW: http://psmisc.sourceforge.net
153     +WWW: http://psmisc.sourceforge.net/