<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f78b47ecafb186637a1067780716149b1e4fad16">https://github.com/macports/macports-ports/commit/f78b47ecafb186637a1067780716149b1e4fad16</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f78b47e watch: update to 3.3.16, switch to GitLab
</span>f78b47e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f78b47ecafb186637a1067780716149b1e4fad16
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Fri Mar 27 08:32:15 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> watch: update to 3.3.16, switch to GitLab
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60144
</span>---
sysutils/watch/Portfile | 40 +++++++++++++++++++---------
sysutils/watch/files/patch-autogen.sh.diff | 38 ++++++++++++++++++++++++++
sysutils/watch/files/patch-configure.ac.diff | 13 +++++++++
3 files changed, 79 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/watch/Portfile b/sysutils/watch/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 86a7e76..8f925c3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/watch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/watch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,17 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup gitlab 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.setup procps-ng procps 3.3.16 v
</span> name watch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.3.15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories sysutils
platforms darwin
license GPL-2
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description watch executes a program periodically, showing output fullscreen
long_description \
watch is like "top" for arbitrary commands. It runs command repeatedly, \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,16 +19,29 @@ long_description \
</span> the program output change over time. This is part of the linux "procps" \
package.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://sourceforge.net/projects/procps-ng/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:procps-ng
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname procps-ng-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 12d3f0d9f4e35496913c6065344edda18043044b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b6f6f65d776e9c1d1ca0b1c3eb68056a967863fbe1290757601160c0a6c9277b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 943434
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-autogen.sh.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-configure.ac.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 cf1f4099d4d304eb4461a88e68d45a901464213f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 10bd744ffcb3de2d591d2f6acf1a54a7ba070fdcc432a855931a5057149f0465 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 904416
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@VERSION@@|${version}|g" ${worksrcpath}/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.args
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:ncurses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:automake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ncurses
</span>
# Disable gettext due to linking problems
# and we are not going to install any catalogs anyway
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,5 +61,3 @@ destroot {
</span> xinstall -m 0644 ${worksrcpath}/watch.1 \
${destroot}${prefix}/share/man/man1
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex procps-ng-(\[0-9.\]*)${extract.suffix}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/watch/files/patch-autogen.sh.diff b/sysutils/watch/files/patch-autogen.sh.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4af433a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/watch/files/patch-autogen.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- autogen.sh.orig 2020-03-27 09:09:54.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ autogen.sh 2020-03-27 09:10:18.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,7 +30,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "The autoheader command is part of the GNU autoconf package."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DIE=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-(libtool --version) < /dev/null > /dev/null || {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++(glibtool --version) < /dev/null > /dev/null || {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "You must have libtool-2 installed to generate procps-ng build system."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DIE=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DIE=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LTVER=$(libtoolize --version | awk '/^libtoolize/ { print $4 }')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LTVER=$(glibtoolize --version | awk '/^glibtoolize/ { print $4 }')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LTVER=${LTVER:-"none"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test ${LTVER##2.} = "${LTVER}" && {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "You must have libtoolize version >= 2.x.x, but you have ${LTVER}."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,7 +56,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo " autoconf: $(autoconf --version | head -1)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo " autoheader: $(autoheader --version | head -1)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo " automake: $(automake --version | head -1)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-echo " libtoolize: $(libtoolize --version | head -1)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++echo " libtoolize: $(glibtoolize --version | head -1)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -rf autom4te.cache
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,7 +68,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sed -i -e 's/^datadir *=\(.*\)/datarootdir = @datarootdir@\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ datadir = @datadir@/g' po/Makefile.in.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-libtoolize --force ${LT_OPTS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++glibtoolize --force ${LT_OPTS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ aclocal -I m4 ${AL_OPTS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ autoconf ${AC_OPTS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ autoheader ${AH_OPTS}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/watch/files/patch-configure.ac.diff b/sysutils/watch/files/patch-configure.ac.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f3529fd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/watch/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This patch ensures that the correct version number is used. Since there is no tar-ball,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+the script to extract the version number fails and returns UNKNOWN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2020-03-27 10:25:00.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2020-03-27 10:25:55.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,7 +4,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_PREREQ([2.69])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CONFIG_MACRO_DIR([m4])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_INIT([procps-ng],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- m4_esyscmd([misc/git-version-gen .tarball-version]),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @@VERSION@@,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [procps@freelists.org],,[https://gitlab.com/procps-ng/procps])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_INIT_AUTOMAKE([foreign 1.11 subdir-objects -Wall -Wno-portability tar-pax no-dist-gzip dist-xz])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_SILENT_RULES([yes])
</span></pre><pre style='margin:0'>
</pre>