Date: Sat, 2 Jun 2018 14:55:55 +0000 (UTC) From: Emanuel Haupt <ehaupt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r471372 - in head/misc/gnu-watch: . files Message-ID: <201806021455.w52EttQ4000969@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ehaupt Date: Sat Jun 2 14:55:55 2018 New Revision: 471372 URL: https://svnweb.freebsd.org/changeset/ports/471372 Log: Update to 3.3.15 Added: head/misc/gnu-watch/files/patch-proc_sysinfo.c (contents, props changed) Deleted: head/misc/gnu-watch/files/patch-ps_display.c head/misc/gnu-watch/files/patch-ps_global.c head/misc/gnu-watch/files/patch-watch.c Modified: head/misc/gnu-watch/Makefile head/misc/gnu-watch/distinfo head/misc/gnu-watch/files/patch-Makefile.am head/misc/gnu-watch/files/patch-proc_sig.c Modified: head/misc/gnu-watch/Makefile ============================================================================== --- head/misc/gnu-watch/Makefile Sat Jun 2 14:52:48 2018 (r471371) +++ head/misc/gnu-watch/Makefile Sat Jun 2 14:55:55 2018 (r471372) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= watch -DISTVERSION= 3.3.12 +DISTVERSION= 3.3.15 CATEGORIES= misc MASTER_SITES= SF/procps-ng/Production \ LOCAL/ehaupt Modified: head/misc/gnu-watch/distinfo ============================================================================== --- head/misc/gnu-watch/distinfo Sat Jun 2 14:52:48 2018 (r471371) +++ head/misc/gnu-watch/distinfo Sat Jun 2 14:55:55 2018 (r471372) @@ -1,3 +1,3 @@ -TIMESTAMP = 1485505846 -SHA256 (procps-ng-3.3.12.tar.xz) = 6ed65ab86318f37904e8f9014415a098bec5bc53653e5d9ab404f95ca5e1a7d4 -SIZE (procps-ng-3.3.12.tar.xz) = 845484 +TIMESTAMP = 1527948968 +SHA256 (procps-ng-3.3.15.tar.xz) = 10bd744ffcb3de2d591d2f6acf1a54a7ba070fdcc432a855931a5057149f0465 +SIZE (procps-ng-3.3.15.tar.xz) = 904416 Modified: head/misc/gnu-watch/files/patch-Makefile.am ============================================================================== --- head/misc/gnu-watch/files/patch-Makefile.am Sat Jun 2 14:52:48 2018 (r471371) +++ head/misc/gnu-watch/files/patch-Makefile.am Sat Jun 2 14:55:55 2018 (r471372) @@ -1,18 +1,28 @@ ---- Makefile.am.orig 2016-07-09 22:40:44 UTC +--- Makefile.am.orig 2018-05-19 21:35:23 UTC +++ Makefile.am -@@ -1,7 +1,4 @@ +@@ -1,8 +1,6 @@ -CYGWINFLAGS = -if CYGWIN -- CYGWINFLAGS += -lintl --endif +-CYGWINFLAGS += -lintl +CYGWINFLAGS = -lintl ++ + usrbin_exec_PROGRAMS = +-endif AM_CPPFLAGS = \ -include $(top_builddir)/config.h \ -@@ -24,19 +21,9 @@ LDADD = ./proc/libprocps.la $(CYGWINFLAG - transform = s/pscommand/ps/; $(program_transform_name) +@@ -30,24 +28,7 @@ transform = - bin_PROGRAMS = \ + if !CYGWIN + transform += s/pscommand/ps/; $(program_transform_name) +-sbin_PROGRAMS = \ +- sysctl +-else +-transform += s/pscommand/procps/; $(program_transform_name) +-endif +- +-if !CYGWIN +-bin_PROGRAMS = \ - ps/pscommand \ - free \ - pgrep \ @@ -23,20 +33,20 @@ - uptime \ - vmstat \ - w -+ ps/pscommand - --sbin_PROGRAMS = \ -- sysctl +sbin_PROGRAMS = # + else + usrbin_exec_PROGRAMS += \ + ps/pscommand \ +@@ -104,38 +85,10 @@ EXTRA_DIST += \ + sysctl.conf + endif - lib_LTLIBRARIES = \ - proc/libprocps.la -@@ -73,29 +60,10 @@ dist_procpsng_DATA = \ - Documentation/bugs.md \ - Documentation/FAQ - -if BUILD_PIDOF +-if !CYGWIN -bin_PROGRAMS += pidof +-else +-usrbin_exec_PROGRAMS += pidof +-endif -dist_man_MANS += pidof.1 -pidof_SOURCES = pidof.c lib/fileutils.c -else @@ -44,7 +54,13 @@ -endif - -if BUILD_KILL +-if CYGWIN +-transform += ;s/^kill/prockill/; $(program_transform_name) +-usrbin_exec_PROGRAMS += kill +-else -bin_PROGRAMS += kill +-endif +- -dist_man_MANS += kill.1 -kill_SOURCES = skill.c lib/strutils.c lib/fileutils.c lib/nsutils.c -else @@ -52,24 +68,40 @@ -endif - if WITH_NCURSES - bin_PROGRAMS += \ + if !CYGWIN +-bin_PROGRAMS += \ - slabtop \ - watch \ - top/top ++bin_PROGRAMS = \ + watch + else + usrbin_exec_PROGRAMS += \ + watch \ +@@ -143,8 +96,7 @@ usrbin_exec_PROGRAMS += \ + endif + dist_man_MANS += \ -- slabtop.1 \ - watch.1 \ - top/top.1 - slabtop_SOURCES = slabtop.c lib/strutils.c lib/fileutils.c -@@ -115,21 +83,6 @@ endif +- watch.1 \ +- top/top.1 ++ watch.1 + watch_SOURCES = watch.c lib/strutils.c lib/fileutils.c + watch_LDADD = @WATCH_NCURSES_LIBS@ $(CYGWINFLAGS) + watch_CFLAGS = @WATCH_NCURSES_CFLAGS@ +@@ -167,27 +119,6 @@ endif top_top_LDADD = $(LDADD) @NCURSES_LIBS@ $(DL_LIB) endif -if BUILD_SKILL +-if !CYGWIN -bin_PROGRAMS += \ - skill \ - snice +-else +-usrbin_exec_PROGRAMS += \ +- skill \ +- snice +-endif -skill_SOURCES = skill.c lib/strutils.c lib/fileutils.c lib/nsutils.c -snice_SOURCES = skill.c lib/strutils.c lib/fileutils.c lib/nsutils.c -dist_man_MANS += \ @@ -84,10 +116,11 @@ free_SOURCES = free.c lib/strutils.c lib/fileutils.c pgrep_SOURCES = pgrep.c lib/fileutils.c lib/nsutils.c pkill_SOURCES = pgrep.c lib/fileutils.c lib/nsutils.c -@@ -182,9 +135,7 @@ proc_libprocps_la_SOURCES = \ +@@ -250,10 +181,7 @@ proc_libprocps_la_SOURCES = \ + proc/sysinfo.h \ proc/version.c \ proc/version.h \ - proc/wchan.c \ +- proc/wchan.c \ - proc/wchan.h \ - proc/whattime.c \ - proc/whattime.h Modified: head/misc/gnu-watch/files/patch-proc_sig.c ============================================================================== --- head/misc/gnu-watch/files/patch-proc_sig.c Sat Jun 2 14:52:48 2018 (r471371) +++ head/misc/gnu-watch/files/patch-proc_sig.c Sat Jun 2 14:55:55 2018 (r471372) @@ -1,8 +1,8 @@ ---- proc/sig.c.orig 2016-07-09 21:49:25 UTC +--- proc/sig.c.orig 2018-05-18 21:32:21 UTC +++ proc/sig.c -@@ -82,7 +82,11 @@ static const mapstruct sigtable[] = { - {"INT", SIGINT}, - {"KILL", SIGKILL}, +@@ -87,7 +87,11 @@ static const mapstruct sigtable[] = { + {"LOST", SIGLOST}, /* Hurd-specific */ + #endif {"PIPE", SIGPIPE}, +#ifdef __FreeBSD__ + {"POLL", SIGIO}, @@ -10,9 +10,9 @@ {"POLL", SIGPOLL}, /* IO */ +#endif {"PROF", SIGPROF}, + #ifdef SIGPWR {"PWR", SIGPWR}, - {"QUIT", SIGQUIT}, -@@ -121,7 +125,11 @@ int signal_name_to_number(const char *re +@@ -145,7 +149,11 @@ int signal_name_to_number(const char *re if(!strncasecmp(name,"SIG",3)) name += 3; if(!strcasecmp(name,"CLD")) return SIGCHLD; Added: head/misc/gnu-watch/files/patch-proc_sysinfo.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/gnu-watch/files/patch-proc_sysinfo.c Sat Jun 2 14:55:55 2018 (r471372) @@ -0,0 +1,38 @@ +--- proc/sysinfo.c.orig 2018-05-18 21:32:22 UTC ++++ proc/sysinfo.c +@@ -30,7 +30,7 @@ + + #include <unistd.h> + #include <fcntl.h> +-#ifdef __CYGWIN__ ++#ifdef __FreeBSD__ + #include <sys/param.h> + #endif + #include "alloc.h" +@@ -41,7 +41,7 @@ + #include <netinet/in.h> /* htons */ + #endif + +-#ifndef __CYGWIN__ ++#ifndef __FreeBSD__ + #include <link.h> + #endif + #include <elf.h> +@@ -98,7 +98,7 @@ static char buf[8192]; + #define SET_IF_DESIRED(x,y) do{ if(x) *(x) = (y); }while(0) + + /* return minimum of two values */ +-#ifndef __CYGWIN__ ++#ifndef __FreeBSD__ + #define MIN(x,y) ((x) < (y) ? (x) : (y)) + #endif + +@@ -264,7 +264,7 @@ extern char** environ; + + static unsigned long find_elf_note(unsigned long type) + { +-#ifdef __CYGWIN__ ++#ifdef __FreeBSD__ + return NOTE_NOT_FOUND; + #else + ElfW(auxv_t) auxv_struct;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806021455.w52EttQ4000969>