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 282 by douglas, 2010-05-18T22:41:26-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 22:39:22.883081611 -0700
4 < @@ -6,28 +6,41 @@
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 < GNU_CONFIGURE= yes
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
24   USE_GMAKE=     yes
25  
26 < CONFLICTS=     pstree-2.* \
27 < -               pidof-*
26 < +               pidof-[0-9]*
27 < +
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 < -PLIST_FILES=   bin/killall \
33 < -               bin/pidof \
34 < -               bin/pstree bin/pstree.x11
31 > +
32   +.if defined(WITHOUT_NLS)
33   +CONFIGURE_ARGS+=--disable-nls
34   +PLIST_SUB+=    NLS="@comment "
# Line 43 | 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 > +MAN1=          pstree.1 killall.1
45  
46   post-install:
47 <        @${LN} -sf killall ${PREFIX}/bin/pidof
47 >        @${LN} -fs killall ${PREFIX}/bin/pidof
48  
49   -.include <bsd.port.mk>
50   +.include <bsd.port.post.mk>
54 diff -Nrux .svn -x work /usr/ports/sysutils/psmisc/distinfo psmisc/distinfo
55 --- /usr/ports/sysutils/psmisc/distinfo 2010-01-02 08:40:09.000000000 -0800
56 +++ psmisc/distinfo     2010-05-18 04:02:47.141686600 -0700
57 @@ -1,3 +1,3 @@
58 -MD5 (psmisc-22.9.tar.gz) = c242530de46b951ab10a2237a6048a9c
59 -SHA256 (psmisc-22.9.tar.gz) = c98aef4bc379790229c54c8e7d97b1d1ab898346bfffcde54fcf585a3e353edd
60 -SIZE (psmisc-22.9.tar.gz) = 316530
61 +MD5 (psmisc-22.11.tar.gz) = b5d32aa285b75c59dee96d3ea26a4881
62 +SHA256 (psmisc-22.11.tar.gz) = 8fff37557f5150d89ef9afc03133731da3eaa2bad1a94f64355218a68b884536
63 +SIZE (psmisc-22.11.tar.gz) = 375038
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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines