Ignore the enclosed Pod-Parser in favour of textproc/p5-Pod-Parser,

avoiding pointless conflicts with p5 packages

See also <oetiker/mrtg#105>

While here, rename the patches.

net/mrtg/Makefile

@@ -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}

net/mrtg/PLIST

@@ -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

net/mrtg/distinfo

@@ -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

net/mrtg/patches/patch-ac → net/mrtg/patches/patch-Makefile.in

@@ -1,8 +1,17 @@
-$NetBSD: patch-ac,v 1.9 2010/07/09 08:45:34 adam Exp $
+$NetBSD: patch-Makefile.in,v 1.1 2023/06/02 14:16:54 hauke Exp $
 
---- Makefile.in.orig	2010-05-17 12:07:01.000000000 +0000
+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
-@@ -36,7 +36,7 @@ bin/rateup.o: $(top_srcdir)/src/rateup.c
+@@ -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:
@@ -11,20 +20,19 @@ $NetBSD: patch-ac,v 1.9 2010/07/09 08:45:34 adam Exp $
  	$(PERL) -0777 -p -i~ -e 's@GRAPHFMT="...";@GRAPHFMT="$(GDFORM_EXT)";@' $(top_srcdir)/bin/mrtg $(top_srcdir)/bin/indexmaker
 
  clean:
-@@ -49,12 +49,12 @@ install: all
+@@ -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}/Pod
++	$(MKINSTALLDIRS) $(DESTDIR)${PERL5_INSTALLVENDORLIB}
  	for x in $(top_srcdir)/lib/mrtg2/*.pm; do \
 -	  $(INSTALL) -m 644 $$x $(DESTDIR)$(libdir)/mrtg2; done
-+	  $(INSTALL) -m 644 $$x $(DESTDIR)${PERL5_INSTALLVENDORLIB}; done
- 	for x in $(top_srcdir)/lib/mrtg2/Pod/*.pm; do \
+-	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}/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

net/mrtg/patches/patch-ab → net/mrtg/patches/patch-contrib_NSI_Mrtg_nsi

@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2000/10/20 16:06:17 bouyer Exp $
+$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

net/mrtg/patches/patch-aa → net/mrtg/patches/patch-src_rateup.c

@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.18 2007/08/08 20:22:16 joerg Exp $
+$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