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

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