CVS commit: pkgsrc/net/mrtg

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Fri Jun  2 14:16:54 UTC 2023

Modified Files:
        pkgsrc/net/mrtg: Makefile PLIST distinfo
Added Files:
        pkgsrc/net/mrtg/patches: patch-Makefile.in patch-contrib_NSI_Mrtg_nsi
            patch-src_rateup.c
Removed Files:
        pkgsrc/net/mrtg/patches: patch-aa patch-ab patch-ac

Log Message:
Ignore the enclosed Pod-Parser in favour of textproc/p5-Pod-Parser,
avoiding pointless conflicts with p5 packages

See also <https://github.com/oetiker/mrtg/issues/105>

While here, rename the patches.


To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 pkgsrc/net/mrtg/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/mrtg/PLIST
cvs rdiff -u -r1.37 -r1.38 pkgsrc/net/mrtg/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/mrtg/patches/patch-Makefile.in \
    pkgsrc/net/mrtg/patches/patch-contrib_NSI_Mrtg_nsi \
    pkgsrc/net/mrtg/patches/patch-src_rateup.c
cvs rdiff -u -r1.18 -r0 pkgsrc/net/mrtg/patches/patch-aa
cvs rdiff -u -r1.5 -r0 pkgsrc/net/mrtg/patches/patch-ab
cvs rdiff -u -r1.9 -r0 pkgsrc/net/mrtg/patches/patch-ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/mrtg/Makefile
diff -u pkgsrc/net/mrtg/Makefile:1.137 pkgsrc/net/mrtg/Makefile:1.138
--- pkgsrc/net/mrtg/Makefile:1.137      Mon May 22 11:39:03 2023
+++ pkgsrc/net/mrtg/Makefile    Fri Jun  2 14:16:54 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.137 2023/05/22 11:39:03 wiz Exp $
+# $NetBSD: Makefile,v 1.138 2023/06/02 14:16:54 hauke Exp $
 
 DISTNAME=      mrtg-2.17.7
-PKGREVISION=   9
+PKGREVISION=   10
 CATEGORIES=    net
 MASTER_SITES=  https://oss.oetiker.ch/mrtg/pub/
 MASTER_SITES+= https://oss.oetiker.ch/mrtg/pub/old/
@@ -11,8 +11,10 @@ HOMEPAGE=    https://oss.oetiker.ch/mrtg/
 COMMENT=       The Multi-Router Traffic Grapher
 LICENSE=       gnu-gpl-v2
 
-USE_TOOLS+=            perl:run
-PERL5_REQD=            5.14.1
+DEPENDS+=      p5-Pod-Parser>=1.66:../../textproc/p5-Pod-Parser
+
+USE_TOOLS+=            perl pod2man
+
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-gd=${BUILDLINK_PREFIX.gd}
 CONFIGURE_ARGS+=       --with-png=${BUILDLINK_PREFIX.png}

Index: pkgsrc/net/mrtg/PLIST
diff -u pkgsrc/net/mrtg/PLIST:1.14 pkgsrc/net/mrtg/PLIST:1.15
--- pkgsrc/net/mrtg/PLIST:1.14  Sun Apr 14 21:50:36 2019
+++ pkgsrc/net/mrtg/PLIST       Fri Jun  2 14:16:54 2023
@@ -1,23 +1,18 @@
-@comment $NetBSD: PLIST,v 1.14 2019/04/14 21:50:36 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.15 2023/06/02 14:16:54 hauke Exp $
 bin/cfgmaker
 bin/indexmaker
 bin/mrtg
 bin/mrtg-traffic-sum
 bin/rateup
-libexec/envstat2mrtg
-libexec/netstat2mrtg
-libexec/sys2mrtg
 ${PERL5_SUB_INSTALLVENDORLIB}/BER.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/MRTG_lib.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Net_SNMP_util.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/SNMP_Session.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/SNMP_util.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Net_SNMP_util.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Pod/InputObjects.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Pod/Parser.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Pod/PlainText.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Pod/Select.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Pod/Usage.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/locales_mrtg.pm
+libexec/envstat2mrtg
+libexec/netstat2mrtg
+libexec/sys2mrtg
 man/man1/cfgmaker.1
 man/man1/indexmaker.1
 man/man1/mrtg-contrib.1

Index: pkgsrc/net/mrtg/distinfo
diff -u pkgsrc/net/mrtg/distinfo:1.37 pkgsrc/net/mrtg/distinfo:1.38
--- pkgsrc/net/mrtg/distinfo:1.37       Tue Oct 26 11:06:02 2021
+++ pkgsrc/net/mrtg/distinfo    Fri Jun  2 14:16:54 2023
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.37 2021/10/26 11:06:02 nia Exp $
+$NetBSD: distinfo,v 1.38 2023/06/02 14:16:54 hauke Exp $
 
 BLAKE2s (mrtg-2.17.7.tar.gz) = 30a9b43237a5e5ede5134f0da9ff422f49d4230d18e1e6e2a6f35b2ac772fb3f
 SHA512 (mrtg-2.17.7.tar.gz) = b25ab38416213bc5128612724530f36f4a855bb66a65f8bbe4bdafef05d2688eed68f5c3df1e13193102507a4114e71ec226ad32dd6b4d3ae2e2291320d8e768
 Size (mrtg-2.17.7.tar.gz) = 1098650 bytes
-SHA1 (patch-aa) = 2874cd59371db10fbc4ff6c29e3a917a4b8eec55
-SHA1 (patch-ab) = bf367e6c43030a9cb64a88336b66932d7e05025c
-SHA1 (patch-ac) = 24ae08714f896ca0f1724454b8ad47c32412c018
+SHA1 (patch-Makefile.in) = f3e007068176365be23a66a30357a616580c1e17
+SHA1 (patch-contrib_NSI_Mrtg_nsi) = 7970541302137d39dc34184758456b4010eaf109
 SHA1 (patch-lib__mrtg2__SNMP_Session.pm) = 85175f077f08fa9c14c35211735ebe56641c4b5d
+SHA1 (patch-src_rateup.c) = 685f6be965e115cfd7669d332a35a440ea4075da

Added files:

Index: pkgsrc/net/mrtg/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/net/mrtg/patches/patch-Makefile.in:1.1
--- /dev/null   Fri Jun  2 14:16:54 2023
+++ pkgsrc/net/mrtg/patches/patch-Makefile.in   Fri Jun  2 14:16:54 2023
@@ -0,0 +1,38 @@
+$NetBSD: patch-Makefile.in,v 1.1 2023/06/02 14:16:54 hauke Exp $
+
+Ignore the enclosed Pod-Parser in favour of textproc/p5-Pod-Parser,
+avoiding pointless conflicts with p5 packages
+
+See also <https://github.com/oetiker/mrtg/issues/105>
+
+Install Perl modules to the proper versioned vendorlib directory
+
+Was: patch-ac
+
+--- Makefile.in.orig   2018-07-13 06:09:40.000000000 +0000
++++ Makefile.in
+@@ -37,7 +37,7 @@ bin/rateup.o: $(top_srcdir)/src/rateup.c
+       $(CC) $(CPPFLAGS) $(CFLAGS) -c $(top_srcdir)/src/rateup.c -o bin/rateup.o
+ 
+ subst:
+-      $(PERL) -0777 -p -i~ -e "s'^#!\s*/\S*perl'#! $(PERL)'" $(top_srcdir)/bin/cfgmaker $(top_srcdir)/bin/indexmaker $(top_srcdir)/bin/mrtg
++      $(PERL) -0777 -p -i~ -e "s@__PREFIX__@${prefix}@g" $(top_srcdir)/bin/cfgmaker $(top_srcdir)/bin/indexmaker $(top_srcdir)/bin/mrtg
+       $(PERL) -0777 -p -i~ -e 's@GRAPHFMT="...";@GRAPHFMT="$(GDFORM_EXT)";@' $(top_srcdir)/bin/mrtg $(top_srcdir)/bin/indexmaker
+ 
+ clean:
+@@ -50,12 +50,10 @@ install: all
+       for x in $(top_srcdir)/bin/mrtg $(top_srcdir)/bin/cfgmaker $(top_srcdir)/bin/indexmaker $(top_srcdir)/bin/mrtg-traffic-sum; do \
+         $(INSTALL) -m 755 $$x $(DESTDIR)$(bindir); done
+       for x in bin/rateup; do \
+-        $(INSTALL) -m 755 $$x $(DESTDIR)$(bindir); done
+-      $(MKINSTALLDIRS) $(DESTDIR)$(libdir)/mrtg2/Pod
++        $(INSTALL) -m 755 -s $$x $(DESTDIR)$(bindir); done
++      $(MKINSTALLDIRS) $(DESTDIR)${PERL5_INSTALLVENDORLIB}
+       for x in $(top_srcdir)/lib/mrtg2/*.pm; do \
+-        $(INSTALL) -m 644 $$x $(DESTDIR)$(libdir)/mrtg2; done
+-      for x in $(top_srcdir)/lib/mrtg2/Pod/*.pm; do \
+-        $(INSTALL) -m 644 $$x $(DESTDIR)$(libdir)/mrtg2/Pod; done
++        $(INSTALL) -m 644 $$x $(DESTDIR)${PERL5_INSTALLVENDORLIB}; done
+       $(MKINSTALLDIRS) $(DESTDIR)$(datadir)/mrtg2/icons
+       for x in $(top_srcdir)/images/*.gif $(top_srcdir)/images/*.png; do \
+         $(INSTALL) -m 644 $$x $(DESTDIR)$(datadir)/mrtg2/icons; done
Index: pkgsrc/net/mrtg/patches/patch-contrib_NSI_Mrtg_nsi
diff -u /dev/null pkgsrc/net/mrtg/patches/patch-contrib_NSI_Mrtg_nsi:1.1
--- /dev/null   Fri Jun  2 14:16:54 2023
+++ pkgsrc/net/mrtg/patches/patch-contrib_NSI_Mrtg_nsi  Fri Jun  2 14:16:54 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-contrib_NSI_Mrtg_nsi,v 1.1 2023/06/02 14:16:54 hauke Exp $
+
+Was: patch-ab
+
+--- contrib/NSI/Mrtg_nsi.orig  Thu Oct 19 14:20:46 2000
++++ contrib/NSI/Mrtg_nsi       Thu Oct 19 14:21:08 2000
+@@ -59,7 +59,7 @@
+       }
+       die "ERROR: Can\'t find location of mrtg executable\n" 
+         unless $main::binpath; 
+-      unshift (@INC,$main::binpath);
++      $main::binpath .= "/../libexec"
+ }
+ 
+ # There older perls tend to behave peculiar with
Index: pkgsrc/net/mrtg/patches/patch-src_rateup.c
diff -u /dev/null pkgsrc/net/mrtg/patches/patch-src_rateup.c:1.1
--- /dev/null   Fri Jun  2 14:16:54 2023
+++ pkgsrc/net/mrtg/patches/patch-src_rateup.c  Fri Jun  2 14:16:54 2023
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_rateup.c,v 1.1 2023/06/02 14:16:54 hauke Exp $
+
+Was: patch-aa
+
+--- src/rateup.c.orig  2007-08-08 20:01:48.000000000 +0000
++++ src/rateup.c
+@@ -48,11 +48,6 @@
+ #define GFORM_GD gdImagePng
+ #endif
+ 
+-/* BSD* does not have/need malloc.h */
+-#if !defined(bsdi) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__APPLE__)
+-#include <malloc.h>
+-#endif
+-
+ /* MSVCRT.DLL does not know %ll in printf */
+ #ifdef __MINGW32_VERSION
+ #define LLD "%I64d"