sysutils/psmisc/psmisc.2011-08-07T052530Z.diff

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