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
(Generate patch)

Comparing:
freebsd/sysutils/psmisc.patch (file contents), Revision 281 by douglas, 2010-05-18T08:40:42-07:00 vs.
freebsd/diff/sysutils/psmisc/psmisc.2010-08-12T070419Z.diff (file contents), Revision 497 by douglas, 2012-02-19T17:36:49-08:00

# Line 1 | Line 1
1   diff -Nrux .svn -x work /usr/ports/sysutils/psmisc/Makefile psmisc/Makefile
2 < --- /usr/ports/sysutils/psmisc/Makefile 2010-01-02 08:40:09.000000000 -0800
3 < +++ psmisc/Makefile     2010-05-18 08:37:45.668699414 -0700
4 < @@ -6,12 +6,12 @@
5 < #
2 > --- /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  
6   PORTNAME=      psmisc
7 < -PORTVERSION=   22.9
8 < +PORTVERSION=   22.11
7 > PORTVERSION=   22.12
8 > +PORTREVISION=  1
9   CATEGORIES=    sysutils
10 < MASTER_SITES=  SF
12 < MASTER_SITE_SUBDIR=    ${PORTNAME}/${PORTNAME}
10 > MASTER_SITES=  SF/${PORTNAME}/${PORTNAME}
11  
12 < -MAINTAINER=    ports@FreeBSD.org
15 < +MAINTAINER=    douglas@douglasthrift.net
12 > MAINTAINER=    sunpoet@sunpoet.net
13   COMMENT=       A port of the Linux pstree, killall and pidof commands
14  
15 + +BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed
16 + +
17 + CONFLICTS=     pidof-[0-9]* pstree-2.[0-9]*
18 +
19 + -CONFIGURE_ARGS=        --disable-nls
20 + +LICENSE=       GPLv2
21 + +
22   GNU_CONFIGURE= yes
19 – @@ -19,7 +19,7 @@
23   USE_GMAKE=     yes
24  
25 < CONFLICTS=     pstree-2.* \
26 < -               pidof-*
27 < +               pidof-[0-9]*
28 <
29 < PLIST_FILES=   bin/killall \
30 <                bin/pidof \
31 < diff -Nrux .svn -x work /usr/ports/sysutils/psmisc/distinfo psmisc/distinfo
32 < --- /usr/ports/sysutils/psmisc/distinfo 2010-01-02 08:40:09.000000000 -0800
33 < +++ psmisc/distinfo     2010-05-18 04:02:47.141686600 -0700
34 < @@ -1,3 +1,3 @@
35 < -MD5 (psmisc-22.9.tar.gz) = c242530de46b951ab10a2237a6048a9c
36 < -SHA256 (psmisc-22.9.tar.gz) = c98aef4bc379790229c54c8e7d97b1d1ab898346bfffcde54fcf585a3e353edd
37 < -SIZE (psmisc-22.9.tar.gz) = 316530
38 < +MD5 (psmisc-22.11.tar.gz) = b5d32aa285b75c59dee96d3ea26a4881
39 < +SHA256 (psmisc-22.11.tar.gz) = 8fff37557f5150d89ef9afc03133731da3eaa2bad1a94f64355218a68b884536
40 < +SIZE (psmisc-22.11.tar.gz) = 375038
25 > +OPTIONS=       NLS "Native Language Support via gettext utilities" On
26 > +
27 > +.include <bsd.port.pre.mk>
28 > +
29 > MAN1=          killall.1 pstree.1
30 > -PLIST_FILES=   bin/killall bin/pidof bin/pstree bin/pstree.x11
31 > +
32 > +.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 > post-patch:
45 >        @${REINPLACE_CMD} -e '/^#define COMM_LEN / s|16|254|' ${WRKSRC}/src/comm.h
46 > @@ -28,4 +47,4 @@
47 > post-install:
48 >        @${LN} -fs killall ${PREFIX}/bin/pidof
49 >
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 > --- /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 > @@ -1,5 +1,5 @@
56 > ---- 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 > @@ -34,8 +34,8 @@
61 >  POST_UNINSTALL = :
62 >  build_triplet = @build@
63 > @@ -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 > +       -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 > +@@ -547,7 +545,7 @@
95 >  signames.h: signames.c Makefile
96 > --              export LC_ALL=C ; \
97 > --              @CPP@ -dM $< |\
98 > +               export LC_ALL=C ; \
99 > +               @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   diff -Nrux .svn -x work /usr/ports/sysutils/psmisc/files/patch-src-pstree.c psmisc/files/patch-src-pstree.c
128 < --- /usr/ports/sysutils/psmisc/files/patch-src-pstree.c 2010-01-02 08:40:10.000000000 -0800
129 < +++ psmisc/files/patch-src-pstree.c     2010-05-18 07:21:54.752390269 -0700
130 < @@ -1,14 +1,17 @@
131 < ---- src/pstree.c.orig  2009-12-27 15:46:47.000000000 +0900
132 < -+++ src/pstree.c       2010-01-03 00:52:21.437862505 +0900
128 > --- /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 > @@ -1,14 +1,16 @@
131 > --- 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   -@@ -37,6 +37,7 @@
134 < +--- src/pstree.c.orig  2010-04-08 05:20:10.000000000 -0700
46 < ++++ src/pstree.c       2010-05-18 07:20:57.583839746 -0700
47 < +@@ -37,6 +37,10 @@
134 > +@@ -37,6 +37,9 @@
135    #include <term.h>
136    #include <termios.h>
137    #include <langinfo.h>
138   ++#ifdef __FreeBSD__
52 – ++#include <locale.h>
139   +#include <limits.h>
140   ++#endif
141    #include <assert.h>
# Line 60 | Line 146 | diff -Nrux .svn -x work /usr/ports/sysut
146      struct dirent *de;
147      FILE *file;
148      struct stat st;
149 < @@ -20,31 +23,64 @@
149 > @@ -20,31 +22,53 @@
150      char *buffer;
151      size_t buffer_size;
152      char readbuf[BUFSIZ + 1];
# Line 70 | Line 156 | diff -Nrux .svn -x work /usr/ports/sysut
156          if (! (path = malloc(strlen(PROC_BASE) + strlen(de->d_name) + 10)))
157            exit(2);
158   --      sprintf(path, "%s/%d/stat", PROC_BASE, pid);
73 – -+      sprintf (path, "%s/%d/status", PROC_BASE, pid);
159   ++#ifdef __FreeBSD__
160 < ++      sprintf(path, "%s/%d/status", PROC_BASE, pid);
160 > +      sprintf(path, "%s/%d/status", PROC_BASE, pid);
161   ++#else
162   +       sprintf(path, "%s/%d/stat", PROC_BASE, pid);
163   ++#endif
# Line 127 | Line 212 | diff -Nrux .svn -x work /usr/ports/sysut
212   +               if (!print_args)
213   + #ifdef WITH_SELINUX
214   +                 add_proc(comm, pid, ppid, st.st_uid, NULL, 0, 0, scontext);
215 < +@@ -860,6 +896,10 @@
216 < +      * command-line options, if given.
217 < +      */
218 < +
219 < ++#ifdef __FreeBSD__
220 < ++    /* Actually set the locale because nl_langinfo won't do it. */
221 < ++    setlocale(LC_CTYPE, "");
222 < ++#endif
223 < +     if (isatty(1) && !strcmp(nl_langinfo(CODESET), "UTF-8")) {
224 < +         /* Use UTF-8 symbols if the locale's character set is UTF-8. */
225 < +         sym = &sym_utf;
226 < diff -Nrux .svn -x work /usr/ports/sysutils/psmisc/pkg-descr psmisc/pkg-descr
227 < --- /usr/ports/sysutils/psmisc/pkg-descr        2005-10-05 00:49:45.000000000 -0700
228 < +++ psmisc/pkg-descr    2010-05-18 07:57:55.280442813 -0700
229 < @@ -1,4 +1,4 @@
230 < A port of the Linux pstree, killall and pidof commands.
231 < Does not include the 'fuser' command.
232 <
233 < -WWW: http://psmisc.sourceforge.net
234 < +WWW: http://psmisc.sourceforge.net/
215 > 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 > +++ psmisc/pkg-plist    2010-05-18 22:50:42.730462413 -0700
218 > @@ -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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines