svn commit: r432828 - in head/misc/gnu-watch: . files
Emanuel Haupt
ehaupt at FreeBSD.org
Mon Jan 30 10:49:05 UTC 2017
Author: ehaupt
Date: Mon Jan 30 10:49:03 2017
New Revision: 432828
URL: https://svnweb.freebsd.org/changeset/ports/432828
Log:
Update to 3.3.12
Added:
head/misc/gnu-watch/files/patch-Makefile.am (contents, props changed)
head/misc/gnu-watch/files/patch-proc_sig.c (contents, props changed)
head/misc/gnu-watch/files/patch-ps_display.c (contents, props changed)
head/misc/gnu-watch/files/patch-ps_global.c (contents, props changed)
head/misc/gnu-watch/files/patch-watch.c (contents, props changed)
Deleted:
head/misc/gnu-watch/files/extrapatch-watch.c
head/misc/gnu-watch/files/patch-gnu-watch.1
Modified:
head/misc/gnu-watch/Makefile
head/misc/gnu-watch/distinfo
head/misc/gnu-watch/pkg-descr
Modified: head/misc/gnu-watch/Makefile
==============================================================================
--- head/misc/gnu-watch/Makefile Mon Jan 30 10:22:17 2017 (r432827)
+++ head/misc/gnu-watch/Makefile Mon Jan 30 10:49:03 2017 (r432828)
@@ -2,29 +2,33 @@
# $FreeBSD$
PORTNAME= watch
-DISTVERSION= 3.2.8
+DISTVERSION= 3.3.12
CATEGORIES= misc
-MASTER_SITES= http://procps.sourceforge.net/ \
+MASTER_SITES= SF/procps-ng/Production \
LOCAL/ehaupt
PKGNAMEPREFIX= gnu-
-DISTNAME= procps-${DISTVERSION}
+DISTNAME= procps-ng-${DISTVERSION}
MAINTAINER= ehaupt at FreeBSD.org
COMMENT= GNU watch command
LICENSE= GPLv2
-USES= ncurses
-LDFLAGS+= -lncurses
+GNU_CONFIGURE= yes
+USES= autoreconf gettext gmake libtool localbase:ldflags ncurses \
+ pkgconfig tar:xz
+USE_CSTD= gnu99
-PLIST_FILES= bin/${PKGBASE} man/man1/gnu-watch.1.gz
+OPTIONS_DEFINE= UNICODE
+OPTIONS_DEFAULT=UNICODE
+
+UNICODE_CONFIGURE_ENABLE= watch8bit
-do-build:
- ${CC} ${CFLAGS} ${LDFLAGS} ${WRKSRC}/${PORTNAME}.c \
- -o ${WRKSRC}/${PKGBASE}
+PLIST_FILES= bin/${PKGBASE} man/man1/gnu-watch.1.gz
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/${PKGBASE} ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} \
+ ${STAGEDIR}${PREFIX}/bin/${PKGBASE}
${INSTALL_MAN} ${WRKSRC}/watch.1 \
${STAGEDIR}${MANPREFIX}/man/man1/${PKGBASE}.1
Modified: head/misc/gnu-watch/distinfo
==============================================================================
--- head/misc/gnu-watch/distinfo Mon Jan 30 10:22:17 2017 (r432827)
+++ head/misc/gnu-watch/distinfo Mon Jan 30 10:49:03 2017 (r432828)
@@ -1,2 +1,3 @@
-SHA256 (procps-3.2.8.tar.gz) = 11ed68d8a4433b91cd833deb714a3aa849c02aea738c42e6b4557982419c1535
-SIZE (procps-3.2.8.tar.gz) = 285758
+TIMESTAMP = 1485505846
+SHA256 (procps-ng-3.3.12.tar.xz) = 6ed65ab86318f37904e8f9014415a098bec5bc53653e5d9ab404f95ca5e1a7d4
+SIZE (procps-ng-3.3.12.tar.xz) = 845484
Added: head/misc/gnu-watch/files/patch-Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/misc/gnu-watch/files/patch-Makefile.am Mon Jan 30 10:49:03 2017 (r432828)
@@ -0,0 +1,97 @@
+--- Makefile.am.orig 2016-07-09 22:40:44 UTC
++++ Makefile.am
+@@ -1,7 +1,4 @@
+-CYGWINFLAGS =
+-if CYGWIN
+- CYGWINFLAGS += -lintl
+-endif
++CYGWINFLAGS = -lintl
+
+ AM_CPPFLAGS = \
+ -include $(top_builddir)/config.h \
+@@ -24,19 +21,9 @@ LDADD = ./proc/libprocps.la $(CYGWINFLAG
+ transform = s/pscommand/ps/; $(program_transform_name)
+
+ bin_PROGRAMS = \
+- ps/pscommand \
+- free \
+- pgrep \
+- pkill \
+- pmap \
+- pwdx \
+- tload \
+- uptime \
+- vmstat \
+- w
++ ps/pscommand
+
+-sbin_PROGRAMS = \
+- sysctl
++sbin_PROGRAMS = #
+
+ lib_LTLIBRARIES = \
+ proc/libprocps.la
+@@ -73,29 +60,10 @@ dist_procpsng_DATA = \
+ Documentation/bugs.md \
+ Documentation/FAQ
+
+-if BUILD_PIDOF
+-bin_PROGRAMS += pidof
+-dist_man_MANS += pidof.1
+-pidof_SOURCES = pidof.c lib/fileutils.c
+-else
+- EXTRA_DIST += pidof.1
+-endif
+-
+-if BUILD_KILL
+-bin_PROGRAMS += kill
+-dist_man_MANS += kill.1
+-kill_SOURCES = skill.c lib/strutils.c lib/fileutils.c lib/nsutils.c
+-else
+- EXTRA_DIST += kill.1
+-endif
+-
+ if WITH_NCURSES
+ bin_PROGRAMS += \
+- slabtop \
+- watch \
+- top/top
++ watch
+ 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
+ top_top_LDADD = $(LDADD) @NCURSES_LIBS@ $(DL_LIB)
+ endif
+
+-if BUILD_SKILL
+-bin_PROGRAMS += \
+- skill \
+- snice
+-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 += \
+- skill.1 \
+- snice.1
+-else
+- EXTRA_DIST += \
+- skill.1 \
+- snice.1
+-endif
+-
+ 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 = \
+ proc/version.c \
+ proc/version.h \
+ proc/wchan.c \
+- proc/wchan.h \
+- proc/whattime.c \
+- proc/whattime.h
++ proc/wchan.h
+
+ proc_libprocps_la_includedir = $(includedir)/proc/
+ proc_libprocps_la_include_HEADERS = \
Added: head/misc/gnu-watch/files/patch-proc_sig.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/misc/gnu-watch/files/patch-proc_sig.c Mon Jan 30 10:49:03 2017 (r432828)
@@ -0,0 +1,26 @@
+--- proc/sig.c.orig 2016-07-09 21:49:25 UTC
++++ proc/sig.c
+@@ -82,7 +82,11 @@ static const mapstruct sigtable[] = {
+ {"INT", SIGINT},
+ {"KILL", SIGKILL},
+ {"PIPE", SIGPIPE},
++#ifdef __FreeBSD__
++ {"POLL", SIGIO},
++#else
+ {"POLL", SIGPOLL}, /* IO */
++#endif
+ {"PROF", SIGPROF},
+ {"PWR", SIGPWR},
+ {"QUIT", SIGQUIT},
+@@ -121,7 +125,11 @@ int signal_name_to_number(const char *re
+ if(!strncasecmp(name,"SIG",3)) name += 3;
+
+ if(!strcasecmp(name,"CLD")) return SIGCHLD;
++#ifdef __FreeBSD__
++ if(!strcasecmp(name,"IO")) return SIGIO;
++#else
+ if(!strcasecmp(name,"IO")) return SIGPOLL;
++#endif
+ if(!strcasecmp(name,"IOT")) return SIGABRT;
+
+ /* search the table */
Added: head/misc/gnu-watch/files/patch-ps_display.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/misc/gnu-watch/files/patch-ps_display.c Mon Jan 30 10:49:03 2017 (r432828)
@@ -0,0 +1,13 @@
+--- ps/display.c.orig 2016-07-09 21:49:25 UTC
++++ ps/display.c
+@@ -26,7 +26,10 @@
+ #include <string.h>
+ #include <unistd.h>
+
++
++#ifndef __FreeBSD__
+ #include <sys/sysmacros.h>
++#endif
+ #include <sys/types.h>
+
+ #include "../proc/alloc.h"
Added: head/misc/gnu-watch/files/patch-ps_global.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/misc/gnu-watch/files/patch-ps_global.c Mon Jan 30 10:49:03 2017 (r432828)
@@ -0,0 +1,12 @@
+--- ps/global.c.orig 2016-07-09 21:49:25 UTC
++++ ps/global.c
+@@ -28,7 +28,9 @@
+
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
++#ifndef __FreeBSD__
+ #include <sys/sysmacros.h>
++#endif
+ #include <sys/types.h>
+
+ #include "../proc/wchan.h"
Added: head/misc/gnu-watch/files/patch-watch.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/misc/gnu-watch/files/patch-watch.c Mon Jan 30 10:49:03 2017 (r432828)
@@ -0,0 +1,25 @@
+--- watch.c.orig 2016-07-09 21:49:25 UTC
++++ watch.c
+@@ -52,7 +52,11 @@
+ # define _XOPEN_SOURCE_EXTENDED 1
+ # include <wchar.h>
+ # include <wctype.h>
++#ifdef __FreeBSD__
++# include <ncurses.h>
++#else
+ # include <ncursesw/ncurses.h>
++#endif
+ #else
+ # include <ncurses.h>
+ #endif /* WITH_WATCH8BIT */
+@@ -72,6 +76,10 @@ static int flags;
+ #define WATCH_ERREXIT (1 << 6)
+ #define WATCH_CHGEXIT (1 << 7)
+
++#ifdef __FreeBSD__
++#define HOST_NAME_MAX 1024
++#endif
++
+ static int curses_started = 0;
+ static long height = 24, width = 80;
+ static int screen_size_changed = 0;
Modified: head/misc/gnu-watch/pkg-descr
==============================================================================
--- head/misc/gnu-watch/pkg-descr Mon Jan 30 10:22:17 2017 (r432827)
+++ head/misc/gnu-watch/pkg-descr Mon Jan 30 10:49:03 2017 (r432828)
@@ -1,4 +1,4 @@
GNU watch runs a command repeatedly, displaying its output (the first
screenfull). This allows you to watch the program output change over time.
-WWW: http://procps.sourceforge.net/
+WWW: https://gitlab.com/procps-ng/procps/
More information about the svn-ports-head
mailing list