From e2c3e9af2a63999f3632c7301e0f583253dc032e Mon Sep 17 00:00:00 2001 From: stu westerman Date: Sat, 10 Aug 2024 21:12:11 -0500 Subject: [PATCH 1/4] Change port watch maintainer. --- sysutils/watch/Portfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysutils/watch/Portfile b/sysutils/watch/Portfile index d9439b4b255bb..e4e8086421435 100644 --- a/sysutils/watch/Portfile +++ b/sysutils/watch/Portfile @@ -9,7 +9,7 @@ revision 1 categories sysutils license GPL-2 -maintainers nomaintainer +maintainers {gmail.com:stuartwesterman @stuartwesterman} openmaintainer description watch executes a program periodically, showing output fullscreen long_description \ From da2a499e7e1ee702ecc87184ab433fc9632abca4 Mon Sep 17 00:00:00 2001 From: stu westerman Date: Sun, 25 Aug 2024 00:38:10 -0500 Subject: [PATCH 2/4] Update watch to 4.0.4 --- sysutils/watch/Portfile | 22 ++++++++++---------- sysutils/watch/files/patch-autogen.sh.diff | 4 ++-- sysutils/watch/files/patch-configure.ac.diff | 8 +++---- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/sysutils/watch/Portfile b/sysutils/watch/Portfile index e4e8086421435..e55226bc58865 100644 --- a/sysutils/watch/Portfile +++ b/sysutils/watch/Portfile @@ -3,7 +3,7 @@ PortSystem 1.0 PortGroup gitlab 1.0 -gitlab.setup procps-ng procps 4.0.0 v +gitlab.setup procps-ng procps 4.0.4 v name watch revision 1 @@ -13,14 +13,14 @@ maintainers {gmail.com:stuartwesterman @stuartwesterman} openmaintainer description watch executes a program periodically, showing output fullscreen long_description \ - watch is like "top" for arbitrary commands. It runs command repeatedly, \ - displaying its output (the first screen full). This allows you to watch \ - the program output change over time. This is part of the linux "procps" \ - package. + watch is like "top" for arbitrary commands. It runs command repeatedly, \ + displaying its output (the first screen full). This allows you to watch \ + the program output change over time. This is part of the linux "procps" \ + package. -checksums rmd160 f4edebce660d3de3a0430e2762aac4aa59983eb6 \ - sha256 4b8b86673321c263558b39f98aafbca16eacb85adee249c44363bd370d84c798 \ - size 892004 +checksums rmd160 630e3ed123e86d2f52230780b56b0ec29c62894d \ + sha256 65d8e4eba8c1a264418f4fada87e06d59cedb96f04b7346f5c249bfeba72f410 \ + size 1423198 patchfiles patch-autogen.sh.diff \ patch-configure.ac.diff @@ -49,7 +49,7 @@ configure.args --disable-nls variant universal {} -build.target watch +build.target src/watch # LDADD is set to libprocps, which isn't needed for watch and fails to build on Darwin build.args CC="${configure.cc} [get_canonical_archflags cc]" \ LDFLAGS="${configure.ldflags}" \ @@ -57,8 +57,8 @@ build.args CC="${configure.cc} [get_canonical_archflags cc]" \ LDADD="" destroot { - xinstall -m 0755 ${worksrcpath}/watch ${destroot}${prefix}/bin - xinstall -m 0644 ${worksrcpath}/watch.1 \ + xinstall -m 0755 ${worksrcpath}/src/watch ${destroot}${prefix}/bin + xinstall -m 0644 ${worksrcpath}/man/watch.1 \ ${destroot}${prefix}/share/man/man1 } diff --git a/sysutils/watch/files/patch-autogen.sh.diff b/sysutils/watch/files/patch-autogen.sh.diff index 62d25c5d0e80d..c5f2a2a959b2d 100644 --- a/sysutils/watch/files/patch-autogen.sh.diff +++ b/sysutils/watch/files/patch-autogen.sh.diff @@ -1,5 +1,5 @@ ---- autogen.sh.orig 2022-03-22 06:40:10.000000000 -0400 -+++ autogen.sh 2022-04-05 12:18:30.000000000 -0400 +--- autogen.sh.orig 2024-08-13 02:41:43 ++++ autogen.sh 2024-08-13 02:42:06 @@ -35,7 +35,7 @@ DIE=1 } diff --git a/sysutils/watch/files/patch-configure.ac.diff b/sysutils/watch/files/patch-configure.ac.diff index f3529fd1e1f8c..5c53141640143 100644 --- a/sysutils/watch/files/patch-configure.ac.diff +++ b/sysutils/watch/files/patch-configure.ac.diff @@ -1,12 +1,10 @@ -This patch ensures that the correct version number is used. Since there is no tar-ball, -the script to extract the version number fails and returns UNKNOWN ---- configure.ac.orig 2020-03-27 10:25:00.000000000 -0400 -+++ configure.ac 2020-03-27 10:25:55.000000000 -0400 +--- configure.ac.orig 2024-08-13 02:45:05 ++++ configure.ac 2024-08-13 02:55:46 @@ -4,7 +4,7 @@ AC_PREREQ([2.69]) AC_CONFIG_MACRO_DIR([m4]) AC_INIT([procps-ng], -- m4_esyscmd([misc/git-version-gen .tarball-version]), +- m4_esyscmd([local/git-version-gen .tarball-version]), + @@VERSION@@, [procps@freelists.org],,[https://gitlab.com/procps-ng/procps]) AM_INIT_AUTOMAKE([foreign 1.11 subdir-objects -Wall -Wno-portability tar-pax no-dist-gzip dist-xz]) From 4e3a7a0bc00c40cf2bf40a36f5579b24495efbe7 Mon Sep 17 00:00:00 2001 From: stu westerman Date: Sun, 25 Aug 2024 00:40:26 -0500 Subject: [PATCH 3/4] Add back in the configure patch exposition. --- sysutils/watch/files/patch-configure.ac.diff | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sysutils/watch/files/patch-configure.ac.diff b/sysutils/watch/files/patch-configure.ac.diff index 5c53141640143..fd11dc4cb5d74 100644 --- a/sysutils/watch/files/patch-configure.ac.diff +++ b/sysutils/watch/files/patch-configure.ac.diff @@ -1,3 +1,5 @@ +This patch ensures that the correct version number is used. Since there is no tar-ball, +the script to extract the version number fails and returns UNKNOWN --- configure.ac.orig 2024-08-13 02:45:05 +++ configure.ac 2024-08-13 02:55:46 @@ -4,7 +4,7 @@ From 03340a6d1c961b6ef6d18786a592b98cb9a12587 Mon Sep 17 00:00:00 2001 From: stu westerman Date: Fri, 30 Aug 2024 01:33:43 -0500 Subject: [PATCH 4/4] Reset revision back down to 0. --- sysutils/watch/Portfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysutils/watch/Portfile b/sysutils/watch/Portfile index e55226bc58865..c75d772b581a8 100644 --- a/sysutils/watch/Portfile +++ b/sysutils/watch/Portfile @@ -5,7 +5,7 @@ PortGroup gitlab 1.0 gitlab.setup procps-ng procps 4.0.4 v name watch -revision 1 +revision 0 categories sysutils license GPL-2