ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/pack/freebsd/diff/sysutils/psmisc/psmisc.2010-06-09T212730Z.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-06-09T212730Z.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-05-30 16:45:09.000000000 -0700
3 > +++ psmisc/Makefile     2010-06-09 14:20:55.101608636 -0700
4 > @@ -7,22 +7,42 @@
5  
6   PORTNAME=      psmisc
7 < -PORTVERSION=   22.9
8 < +PORTVERSION=   22.11
7 > PORTVERSION=   22.11
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.*
18 +
19 + -CONFIGURE_ARGS=        --disable-nls
20 + +LICENSE=       GPLv2
21 + +LICENSE_FILE=  ${WRKSRC}/COPYING
22 + +
23   GNU_CONFIGURE= yes
19 – @@ -19,7 +19,7 @@
24   USE_GMAKE=     yes
25  
26 < CONFLICTS=     pstree-2.* \
27 < -               pidof-*
28 < +               pidof-[0-9]*
29 <
30 < PLIST_FILES=   bin/killall \
31 <                bin/pidof \
32 < diff -Nrux .svn -x work /usr/ports/sysutils/psmisc/distinfo psmisc/distinfo
33 < --- /usr/ports/sysutils/psmisc/distinfo 2010-01-02 08:40:09.000000000 -0800
34 < +++ psmisc/distinfo     2010-05-18 04:02:47.141686600 -0700
35 < @@ -1,3 +1,3 @@
36 < -MD5 (psmisc-22.9.tar.gz) = c242530de46b951ab10a2237a6048a9c
37 < -SHA256 (psmisc-22.9.tar.gz) = c98aef4bc379790229c54c8e7d97b1d1ab898346bfffcde54fcf585a3e353edd
38 < -SIZE (psmisc-22.9.tar.gz) = 316530
39 < +MD5 (psmisc-22.11.tar.gz) = b5d32aa285b75c59dee96d3ea26a4881
40 < +SHA256 (psmisc-22.11.tar.gz) = 8fff37557f5150d89ef9afc03133731da3eaa2bad1a94f64355218a68b884536
41 < +SIZE (psmisc-22.11.tar.gz) = 375038
26 > -MAN1=          killall.1 pstree.1
27 > -PLIST_FILES=   bin/killall bin/pidof bin/pstree bin/pstree.x11
28 > +OPTIONS=       NLS "Native Language Support via gettext utilities" On
29 > +
30 > +.include <bsd.port.pre.mk>
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 > +MAN1=          pstree.1 killall.1
45 >
46 > post-install:
47 >        @${LN} -fs killall ${PREFIX}/bin/pidof
48 >
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   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 < +++ psmisc/files/patch-src-pstree.c     2010-05-18 07:21:54.752390269 -0700
140 < @@ -1,14 +1,17 @@
139 > +++ psmisc/files/patch-src-pstree.c     2010-05-18 20:03:36.709489357 -0700
140 > @@ -1,14 +1,16 @@
141   ---- 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 < +@@ -37,6 +37,10 @@
146 > +@@ -37,6 +37,9 @@
147    #include <term.h>
148    #include <termios.h>
149    #include <langinfo.h>
150   ++#ifdef __FreeBSD__
52 – ++#include <locale.h>
151   +#include <limits.h>
152   ++#endif
153    #include <assert.h>
# Line 60 | Line 158 | diff -Nrux .svn -x work /usr/ports/sysut
158      struct dirent *de;
159      FILE *file;
160      struct stat st;
161 < @@ -20,31 +23,64 @@
161 > @@ -20,31 +22,53 @@
162      char *buffer;
163      size_t buffer_size;
164      char readbuf[BUFSIZ + 1];
# Line 127 | Line 225 | diff -Nrux .svn -x work /usr/ports/sysut
225   +               if (!print_args)
226   + #ifdef WITH_SELINUX
227   +                 add_proc(comm, pid, ppid, st.st_uid, NULL, 0, 0, scontext);
130 – +@@ -860,6 +896,10 @@
131 – +      * command-line options, if given.
132 – +      */
133 – +
134 – ++#ifdef __FreeBSD__
135 – ++    /* Actually set the locale because nl_langinfo won't do it. */
136 – ++    setlocale(LC_CTYPE, "");
137 – ++#endif
138 – +     if (isatty(1) && !strcmp(nl_langinfo(CODESET), "UTF-8")) {
139 – +         /* Use UTF-8 symbols if the locale's character set is UTF-8. */
140 – +         sym = &sym_utf;
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
# Line 147 | Line 234 | diff -Nrux .svn -x work /usr/ports/sysut
234  
235   -WWW: http://psmisc.sourceforge.net
236   +WWW: http://psmisc.sourceforge.net/
237 + 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

Diff Legend

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