diff options
| author | Akinori MUSHA <knu@FreeBSD.org> | 2010-01-02 16:40:10 +0000 |
|---|---|---|
| committer | Akinori MUSHA <knu@FreeBSD.org> | 2010-01-02 16:40:10 +0000 |
| commit | 4b18243f1f45cec47bddffb80a9c26e17213619a (patch) | |
| tree | a876d7547aa1ddcc501a4ed5b6300d53bb899a96 /sysutils/psmisc/files/patch-src-Makefile.in | |
| parent | Check should be <= 900000 (diff) | |
Update to the latest version 22.9.
Notes
Notes:
svn path=/head/; revision=247006
Diffstat (limited to 'sysutils/psmisc/files/patch-src-Makefile.in')
| -rw-r--r-- | sysutils/psmisc/files/patch-src-Makefile.in | 81 |
1 files changed, 44 insertions, 37 deletions
diff --git a/sysutils/psmisc/files/patch-src-Makefile.in b/sysutils/psmisc/files/patch-src-Makefile.in index f52c0aa937a9..eed0c116d9cd 100644 --- a/sysutils/psmisc/files/patch-src-Makefile.in +++ b/sysutils/psmisc/files/patch-src-Makefile.in @@ -1,62 +1,69 @@ ---- src/Makefile.in.orig Sat Nov 5 05:18:47 2005 -+++ src/Makefile.in Wed Nov 16 17:34:55 2005 -@@ -14,7 +14,7 @@ - - @SET_MAKE@ - --SOURCES = $(fuser_SOURCES) $(killall_SOURCES) $(oldfuser_SOURCES) $(pstree_SOURCES) -+SOURCES = $(killall_SOURCES) $(pstree_SOURCES) - - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ -@@ -38,8 +38,7 @@ +--- src/Makefile.in.orig 2009-12-27 16:19:06.000000000 +0900 ++++ src/Makefile.in 2010-01-03 00:25:56.093987293 +0900 +@@ -34,8 +34,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = fuser$(EXEEXT) killall$(EXEEXT) pstree$(EXEEXT) \ -- oldfuser$(EXEEXT) -+bin_PROGRAMS = killall$(EXEEXT) pstree$(EXEEXT) - subdir = src - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -75,10 +74,8 @@ +- prtstat$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \ ++bin_PROGRAMS = killall$(EXEEXT) pstree$(EXEEXT) \ ++ $(am__EXEEXT_1) $(am__EXEEXT_2) \ + $(am__EXEEXT_3) + @WANT_PEEKFD_I386_TRUE@am__append_1 = peekfd + @WANT_PEEKFD_I386_TRUE@am__append_2 = -DI386 +@@ -81,10 +81,10 @@ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --SOURCES = $(fuser_SOURCES) $(killall_SOURCES) $(oldfuser_SOURCES) \ -- $(pstree_SOURCES) --DIST_SOURCES = $(fuser_SOURCES) $(killall_SOURCES) $(oldfuser_SOURCES) \ -- $(pstree_SOURCES) -+SOURCES = $(killall_SOURCES) $(pstree_SOURCES) -+DIST_SOURCES = $(killall_SOURCES) $(pstree_SOURCES) +-SOURCES = $(fuser_SOURCES) $(killall_SOURCES) $(peekfd_SOURCES) \ +- $(prtstat_SOURCES) $(pstree_SOURCES) +-DIST_SOURCES = $(fuser_SOURCES) $(killall_SOURCES) $(peekfd_SOURCES) \ +- $(prtstat_SOURCES) $(pstree_SOURCES) ++SOURCES = $(killall_SOURCES) \ ++ $(pstree_SOURCES) ++DIST_SOURCES = $(killall_SOURCES) \ ++ $(pstree_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -@@ -181,9 +178,8 @@ - oldfuser_SOURCES = oldfuser.c comm.h signals.c signals.h loop.h i18n.h +@@ -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 - CLEANFILES = signames.h -@@ -460,12 +456,11 @@ +@@ -537,13 +537,20 @@ signames.h: signames.c Makefile - @CPP@ -dM $< |\ + export LC_ALL=C ; \ +- @CPP@ -dM $< |\ - tr -s '\t ' ' ' | sort -n -k 3 | sed \ -- 's:#define SIG\([A-Z]\+[0-9]*\) \([0-9]\+\) *\(\|/\*.*\)$$:{\ --\2,"\1" },:p;d' | \ +- 's:#define SIG\([A-Z]\+[0-9]*\) \([0-9]\+\) *\(\|/\*.*\)$$:{\ \2,"\1" },:p;d' | \ - grep -v '[0-9][0-9][0-9]' >signames.h || \ -+ sed 's|\t | |g; s| $$||' | sort -n -k 3 |\ -+ grep '^#define SIG[A-Z0-9]* [0-9]*$$'|sed 's|#define SIG||'|\ -+ awk '{print "{" $$2 ",\"" $$1 "\" },"}' >signames.h || \ - { rm -f signames.h; exit 1; } +- { rm -f signames.h; exit 1; } - grep '^{ 1,"HUP" },$$' signames.h >/dev/null || \ -+ grep '^{1,"HUP" },$$' signames.h >/dev/null || \ - { rm -f signames.h; exit 1; } +- { 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) && \ |