<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/70658e4fbe2c0a19a70dbf27c40b6508c1cd90ce">https://github.com/macports/macports-ports/commit/70658e4fbe2c0a19a70dbf27c40b6508c1cd90ce</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 70658e4fbe2 arpwatch: update to 3.7, portfile overhaul
</span>70658e4fbe2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 70658e4fbe2c0a19a70dbf27c40b6508c1cd90ce
</span>Author: i0ntempest <i0ntempest@i0ntempest.com>
AuthorDate: Sat Mar 1 05:07:26 2025 +1100
<span style='display:block; white-space:pre;color:#404040;'> arpwatch: update to 3.7, portfile overhaul
</span>---
net/arpwatch/Portfile | 98 +++++++++++++++++++++++----------------
net/arpwatch/files/implicit.patch | 13 ------
2 files changed, 58 insertions(+), 53 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/arpwatch/Portfile b/net/arpwatch/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 02aa34dfc1b..d799fd989a2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/arpwatch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/arpwatch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,65 +1,83 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- 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>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name arpwatch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.1a15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories net
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license BSD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {wohner.eu:normen @Gminfly} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description Monitor ARP & RARP requests
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description Arpwatch monitors ethernet activity and maintains a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- database of ethernet/ip address pairings. It also \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reports certain changes via email.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name arpwatch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license BSD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {wohner.eu:normen @Gminfly} openmaintainer
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://online.securityfocus.com/tools/142
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ftp://ftp.ee.lbl.gov
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Monitor ARP & RARP requests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description Arpwatch monitors ethernet activity and maintains a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ database of ethernet/ip address pairings. It also \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reports certain changes via email.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha1 9dffaec0f132e5bb7aedfc840c5c67068bfbce69 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 a27ee53275dcec3cafb85eb3df2451d42ec32b0c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://ee.lbl.gov
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${homepage}/downloads/arpwatch/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url "http://www.freebsd.org/cgi/ports.cgi?query=${name}&stype=all"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex ">${name}-(.*?)<"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.version 2.1.a15_4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e2a961a16690e91f10aa546e41128e8627252445 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3eb63ea79fbafc8174653e557e28899873c4c3908c66fc81f6f29ced3a10987e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 117274
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:libpcap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url "http://www.freebsd.org/cgi/ports.cgi?query=${name}&stype=all"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex ">${name}-(.*?)<"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles implicit.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_branch 3.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_version [string map {. ""} ${python_branch}]
</span>
# Update config.guess and config.sub to be able to build on arm64.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append port:automake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set automake_dirs [glob -directory ${prefix}/share automake-*]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set automake_dir [lindex [lsort -command vercmp $automake_dirs] end]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy -force ${automake_dir}/config.guess ${automake_dir}/config.sub \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:automake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:wget
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append port:net-snmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Python is need for helper scripts only but we need it in post-destroot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:libpcap \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${python_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See ${worksrcpath}/update-ethercodes.sh.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "wget https://standards-oui.ieee.org/oui/oui.csv"
</span> }
set sharedir ${prefix}/share/${name}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set ethercodes ${sharedir}/ethercodes.dat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|-DARPDIR|-DETHERCODES=\\\\\"${ethercodes}\\\\\" -DARPDIR|" ${worksrcpath}/Makefile.in
</span> reinplace "s|INCLS = -I.|INCLS = -I. -I${prefix}/include|" ${worksrcpath}/Makefile.in
reinplace "s|LIBS = @LIBS@|LIBS = -L${prefix}/lib @LIBS@|" ${worksrcpath}/Makefile.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|ARPDIR = .*|ARPDIR = ${prefix}/var/arpwatch|" ${worksrcpath}/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set ethercodes ${sharedir}/ethercodes.dat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|-DARPDIR|-DETHERCODES=\\\\\"${ethercodes}\\\\\" -DARPDIR|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|ARPDIR ?= .*|ARPDIR ?= ${prefix}/var/arpwatch|" ${worksrcpath}/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/usr/local/arpwatch|${prefix}/var/arpwatch|" {*}[glob -directory ${worksrcpath} *.8.in]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "/.*\\/etc\\/rc.d.*/D" ${worksrcpath}/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/usr/local|${prefix}|" ${worksrcpath}/arpfetch ${worksrcpath}/bihourly.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|sort +2rn arp.dat|(\[ -f arp.dat \] \\&\\& sort +2rn arp.dat \\|\\| sort +2rn \$1)|" ${worksrcpath}/arp2ethers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s%(.\\.awk)%${sharedir}/\\1%g" ${worksrcpath}/arp2ethers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set automake_dirs [glob -directory ${prefix}/share automake-*]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set automake_dir [lindex [lsort -command vercmp $automake_dirs] end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy -force ${automake_dir}/config.guess ${automake_dir}/config.sub \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-append "-DBIND_8_COMPAT=1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --mandir=${prefix}/share/man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-DBIND_8_COMPAT=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON=${prefix}/bin/python${python_branch}
</span>
post-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|-o bin -g bin||g" ${worksrcpath}/Makefile
</span> reinplace "/#define ETHERCODES .*/D" ${worksrcpath}/arpwatch.h
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.target install install-man
</span> post-destroot {
set destsharedir ${destroot}${sharedir}
file mkdir ${destsharedir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -W ${build.dir} CHANGES FILES INSTALL README arp2ethers arpfetch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bihourly.sh ethercodes.dat d.awk duplicates.awk e.awk euppertolower.awk \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- massagevendor p.awk ${destsharedir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -W ${build.dir} massagevendor-old massagevendor.py ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -W ${build.dir} arp2ethers arpfetch bihourly.sh ${destroot}${prefix}/sbin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 -W ${build.dir} CHANGES FILES INSTALL README d.awk duplicates.awk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e.awk euppertolower.awk p.awk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destsharedir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "${prefix}/bin/python${python_branch} ${destroot}${prefix}/bin/massagevendor.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ./oui.csv > ${destroot}${ethercodes}"
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/arpwatch/files/implicit.patch b/net/arpwatch/files/implicit.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 31b4483ef01..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/arpwatch/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2006-06-22 06:32:38
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2023-03-06 02:25:36
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3004,8 +3004,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (i = 0; i < 256; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (XOR (islower (i), ISLOWER (i))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || toupper (i) != TOUPPER (i))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit(2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit (0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return (2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return (0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f conftest$ac_exeext
</span></pre><pre style='margin:0'>
</pre>