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

Comparing freebsd/sysutils/psmisc.patch (file contents):
Revision 338 by douglas, 2010-06-09T14:27:30-07:00 vs.
Revision 339 by douglas, 2010-08-12T00:04:19-07: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-05-30 16:45:09.000000000 -0700
3 < +++ psmisc/Makefile     2010-06-09 14:20:55.101608636 -0700
4 < @@ -7,22 +7,42 @@
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.11
7 > PORTVERSION=   22.12
8   +PORTREVISION=  1
9   CATEGORIES=    sysutils
10   MASTER_SITES=  SF/${PORTNAME}/${PORTNAME}
# Line 14 | Line 14 | diff -Nrux .svn -x work /usr/ports/sysut
14  
15   +BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed
16   +
17 < CONFLICTS=     pidof-[0-9]* pstree-2.*
17 > CONFLICTS=     pidof-[0-9]* pstree-2.[0-9]*
18  
19   -CONFIGURE_ARGS=        --disable-nls
20   +LICENSE=       GPLv2
21 – +LICENSE_FILE=  ${WRKSRC}/COPYING
21   +
22   GNU_CONFIGURE= yes
23   USE_GMAKE=     yes
24  
26 – -MAN1=          killall.1 pstree.1
27 – -PLIST_FILES=   bin/killall bin/pidof bin/pstree bin/pstree.x11
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 "
# Line 40 | Line 40 | diff -Nrux .svn -x work /usr/ports/sysut
40   +CONFIGURE_ENV+=        CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
41   +PLIST_SUB+=    NLS=""
42   +.endif
43 – +
44 – +MAN1=          pstree.1 killall.1
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-01-02 08:40:10.000000000 -0800
54 < +++ psmisc/files/patch-src-Makefile.in  2010-05-18 21:35:53.776313591 -0700
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       2009-12-27 16:19:06.000000000 +0900
57 < -+++ src/Makefile.in    2010-01-03 00:25:56.093987293 +0900
58 < +--- src/Makefile.in.orig       2010-04-08 05:41:34.000000000 -0700
59 < ++++ src/Makefile.in    2010-05-18 21:30:06.746914197 -0700
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 < @@ -26,44 +26,37 @@
64 <  ETAGS = etags
65 <  CTAGS = ctags
66 <  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
67 < -@@ -208,10 +208,10 @@
68 < -       $(am__append_4) $(am__append_6)
69 < - 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 @@
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)
# Line 102 | Line 91 | diff -Nrux .svn -x work /usr/ports/sysut
91    
92   + mostlyclean-compile:
93   +       -rm -f *.$(OBJEXT)
94 < +@@ -538,7 +538,7 @@
94 > +@@ -547,7 +545,7 @@
95    signames.h: signames.c Makefile
96 <                export LC_ALL=C ; \
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' | \
# Line 135 | Line 125 | diff -Nrux .svn -x work /usr/ports/sysut
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 20:03:36.709489357 -0700
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
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 @@
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
134   +@@ -37,6 +37,9 @@
135    #include <term.h>
136    #include <termios.h>
# Line 168 | 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);
171 – -+      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 225 | 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);
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/
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:11:15.201428734 -0700
217 > +++ psmisc/pkg-plist    2010-05-18 22:50:42.730462413 -0700
218   @@ -0,0 +1,26 @@
219   +bin/killall
220   +bin/pidof

Diff Legend

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