Fix build with perl-5.18's pod2man.

14 files changed, 185 insertions, 9 deletions

diff --git a/sysutils/munin-doc/distinfo b/sysutils/munin-doc/distinfo
index 6b03fc8677d..caba501f3a9 100644
--- a/sysutils/munin-doc/distinfo
+++ b/sysutils/munin-doc/distinfo
@@ -1,7 +1,18 @@
-$NetBSD: distinfo,v 1.4 2010/12/20 08:40:19 he Exp $
+$NetBSD: distinfo,v 1.5 2013/06/17 13:28:28 wiz Exp $
 
 SHA1 (munin_1.3.2.tar.gz) = 575c1dc3373e2e001accd1920fd815d9b875c95a
 RMD160 (munin_1.3.2.tar.gz) = 7bcc16d00ad28731041015ef240144ed0c4fdeb4
 Size (munin_1.3.2.tar.gz) = 309319 bytes
-SHA1 (patch-aa) = 88e5e98f6ea901d1291c73812a92ba452fe76570
-SHA1 (patch-ad) = 8accd3875324035f2c95903fc37cee4b4a55948a
+SHA1 (patch-aa) = b98b1b1683928688fd15dbaf964d77e5daa285eb
+SHA1 (patch-ad) = d3630a400eced497b6f0ca2bfd43d57512364b1d
+SHA1 (patch-node_munin-node-configure-snmp.in) = 5bc8eb427ea12867a7d93d464fb960b0346db7b3
+SHA1 (patch-node_munin-node-configure.in) = 13077cdda2a46da0b860a7f53b5131810acbd8a2
+SHA1 (patch-node_munin-node.conf.pod) = 0b29baf932c4bc98df6d4e26ee1c2e62ed73bafa
+SHA1 (patch-node_munin-node.in) = 7752355592ad0112dcbdd40959a481dd73ae19b5
+SHA1 (patch-node_munin-run.in) = f2a18421c881e76592ad7d6d2bf1cc9607a8d544
+SHA1 (patch-server_munin-cron.pod) = d2c2af47a7e935a385e752b9686b187512087ae4
+SHA1 (patch-server_munin-graph.in) = 3bfc3be349eca97bc62a821ad6573f3d02e3fa2c
+SHA1 (patch-server_munin-html.in) = 2739d0002d60a3d9d2c731ab7a6e0e06f6974fb5
+SHA1 (patch-server_munin-limits.in) = ad30244579736ee2934667dc6e35244135f4e0ae
+SHA1 (patch-server_munin-update.in) = edfb0449fa706e368f209059e1d0d78d21b07f56
+SHA1 (patch-server_munin.conf.pod) = 6d02fe31cf22bf6e08d9f4b12f73ccf85377f01e
diff --git a/sysutils/munin-doc/patches/patch-aa b/sysutils/munin-doc/patches/patch-aa
index 5590540057a..6af7b9af46e 100644
--- a/sysutils/munin-doc/patches/patch-aa
+++ b/sysutils/munin-doc/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2010/12/20 08:40:19 he Exp $
+$NetBSD: patch-aa,v 1.4 2013/06/17 13:28:28 wiz Exp $
 
 Redefine where we install this package.
 
---- Makefile.config.orig	2005-01-10 11:38:22.000000000 +0100
+--- Makefile.config.orig	2005-04-15 20:29:18.000000000 +0000
 +++ Makefile.config
 @@ -7,32 +7,36 @@
  #
diff --git a/sysutils/munin-doc/patches/patch-ad b/sysutils/munin-doc/patches/patch-ad
index 4d45c353e49..c73dce87b01 100644
--- a/sysutils/munin-doc/patches/patch-ad
+++ b/sysutils/munin-doc/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2006/06/08 19:03:34 he Exp $
+$NetBSD: patch-ad,v 1.2 2013/06/17 13:28:28 wiz Exp $
 
---- Makefile.orig	2004-12-22 22:33:47.000000000 +0100
+--- Makefile.orig	2005-04-15 20:37:29.000000000 +0000
 +++ Makefile
-@@ -35,8 +35,6 @@ install-main: build
+@@ -37,8 +37,6 @@ install-main: build
  	$(INSTALL) -m 0644 server/style.css $(CONFDIR)/templates/
  	$(INSTALL) -m 0644 server/definitions.html $(CONFDIR)/templates/
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2006/06/08 19:03:34 he Exp $
  	$(INSTALL) -m 0755 build/server/munin-cron $(BINDIR)/
  
  	$(INSTALL) -m 0755 build/server/munin-update $(LIBDIR)/
-@@ -71,7 +69,6 @@ install-node-non-snmp: build
+@@ -73,7 +71,6 @@ install-node-non-snmp: build
  
  	$(INSTALL) -m 0755 build/node/munin-node $(SBINDIR)/
  	$(INSTALL) -m 0755 build/node/munin-node-configure $(SBINDIR)/
diff --git a/sysutils/munin-doc/patches/patch-node_munin-node-configure-snmp.in b/sysutils/munin-doc/patches/patch-node_munin-node-configure-snmp.in
new file mode 100644
index 00000000000..3c9fd3fbc70
--- /dev/null
+++ b/sysutils/munin-doc/patches/patch-node_munin-node-configure-snmp.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-node_munin-node-configure-snmp.in,v 1.1 2013/06/17 13:28:28 wiz Exp $
+
+Fix build with perl-5.18's pod2man.
+
+--- node/munin-node-configure-snmp.in.orig	2005-04-15 20:29:18.000000000 +0000
++++ node/munin-node-configure-snmp.in
+@@ -551,6 +551,8 @@ sub get_plugins
+ 
+ 1;
+ 
++=encoding iso-8859-1
++
+ =head1 NAME
+ 
+ munin-node-configure-snmp - A sub-program used by munin-node-configure to
diff --git a/sysutils/munin-doc/patches/patch-node_munin-node-configure.in b/sysutils/munin-doc/patches/patch-node_munin-node-configure.in
new file mode 100644
index 00000000000..5c26ddf60bc
--- /dev/null
+++ b/sysutils/munin-doc/patches/patch-node_munin-node-configure.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-node_munin-node-configure.in,v 1.1 2013/06/17 13:28:28 wiz Exp $
+
+Fix build with perl-5.18's pod2man.
+
+--- node/munin-node-configure.in.orig	2005-04-15 20:29:18.000000000 +0000
++++ node/munin-node-configure.in
+@@ -553,6 +553,8 @@ sub get_plugins
+ 
+ 1;
+ 
++=encoding iso-8859-1
++
+ =head1 NAME
+ 
+ munin-node-configure - A program to view configurations for munin-node
diff --git a/sysutils/munin-doc/patches/patch-node_munin-node.conf.pod b/sysutils/munin-doc/patches/patch-node_munin-node.conf.pod
new file mode 100644
index 00000000000..bafb7036f76
--- /dev/null
+++ b/sysutils/munin-doc/patches/patch-node_munin-node.conf.pod
@@ -0,0 +1,21 @@
+$NetBSD: patch-node_munin-node.conf.pod,v 1.1 2013/06/17 13:28:28 wiz Exp $
+
+Fix build with perl-5.18's pod2man.
+
+--- node/munin-node.conf.pod.orig	2005-04-15 20:29:18.000000000 +0000
++++ node/munin-node.conf.pod
+@@ -1,3 +1,5 @@
++=encoding iso-8859-1
++
+ =head1 NAME
+ 
+ node.conf - Munin-node configuration file
+@@ -36,6 +38,8 @@ owned by root. Default on.
+ Files matching <regex> in the node.d/ and node-conf.d/
+ directories will be overlooked.
+ 
++=back
++
+ =head1 EXAMPLE
+ 
+ A pretty normal configuration file:
diff --git a/sysutils/munin-doc/patches/patch-node_munin-node.in b/sysutils/munin-doc/patches/patch-node_munin-node.in
new file mode 100644
index 00000000000..d952ef39d4d
--- /dev/null
+++ b/sysutils/munin-doc/patches/patch-node_munin-node.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-node_munin-node.in,v 1.1 2013/06/17 13:28:28 wiz Exp $
+
+Fix build with perl-5.18's pod2man.
+
+--- node/munin-node.in.orig	2005-04-15 20:31:21.000000000 +0000
++++ node/munin-node.in
+@@ -1059,6 +1059,8 @@ sub get_var
+ 
+ 1;
+ 
++=encoding iso-8859-1
++
+ =head1 NAME
+ 
+ munin-node - A daemon to gather information in cooperation with the main
diff --git a/sysutils/munin-doc/patches/patch-node_munin-run.in b/sysutils/munin-doc/patches/patch-node_munin-run.in
new file mode 100644
index 00000000000..13470960caf
--- /dev/null
+++ b/sysutils/munin-doc/patches/patch-node_munin-run.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-node_munin-run.in,v 1.1 2013/06/17 13:28:28 wiz Exp $
+
+Fix build with perl-5.18's pod2man.
+
+--- node/munin-run.in.orig	2005-04-15 20:31:21.000000000 +0000
++++ node/munin-run.in
+@@ -625,6 +625,8 @@ sub get_var
+ 
+ 1;
+ 
++=encoding iso-8859-1
++
+ =head1 NAME
+ 
+ munin-run - A program to run munin-node plugins from the command line
diff --git a/sysutils/munin-doc/patches/patch-server_munin-cron.pod b/sysutils/munin-doc/patches/patch-server_munin-cron.pod
new file mode 100644
index 00000000000..067e3af22a9
--- /dev/null
+++ b/sysutils/munin-doc/patches/patch-server_munin-cron.pod
@@ -0,0 +1,12 @@
+$NetBSD: patch-server_munin-cron.pod,v 1.1 2013/06/17 13:28:28 wiz Exp $
+
+Fix build with perl-5.18's pod2man.
+
+--- server/munin-cron.pod.orig	2005-04-15 20:29:18.000000000 +0000
++++ server/munin-cron.pod
+@@ -1,3 +1,5 @@
++=encoding iso-8859-1
++
+ =head1 NAME
+ 
+ munin-cron - A program to batch other munin programs
diff --git a/sysutils/munin-doc/patches/patch-server_munin-graph.in b/sysutils/munin-doc/patches/patch-server_munin-graph.in
new file mode 100644
index 00000000000..766e1aeeee9
--- /dev/null
+++ b/sysutils/munin-doc/patches/patch-server_munin-graph.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-server_munin-graph.in,v 1.1 2013/06/17 13:28:28 wiz Exp $
+
+Fix build with perl-5.18's pod2man.
+
+--- server/munin-graph.in.orig	2005-04-15 20:31:22.000000000 +0000
++++ server/munin-graph.in
+@@ -1092,6 +1092,8 @@ sub escape
+ 
+ 1;
+ 
++=encoding iso-8859-1
++
+ =head1 NAME
+ 
+ munin-graph - A program to create graphs from data contained in rrd-files.
diff --git a/sysutils/munin-doc/patches/patch-server_munin-html.in b/sysutils/munin-doc/patches/patch-server_munin-html.in
new file mode 100644
index 00000000000..d1c0db47346
--- /dev/null
+++ b/sysutils/munin-doc/patches/patch-server_munin-html.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-server_munin-html.in,v 1.1 2013/06/17 13:28:28 wiz Exp $
+
+Fix build with perl-5.18's pod2man.
+
+--- server/munin-html.in.orig	2005-04-15 20:31:22.000000000 +0000
++++ server/munin-html.in
+@@ -597,6 +597,8 @@ sub get_png_size
+ logger("munin-html finished");
+ close $log;
+ 
++=encoding iso-8859-1
++
+ =head1 NAME
+ 
+ munin-html - A program to draw html-pages on an Munin installation
diff --git a/sysutils/munin-doc/patches/patch-server_munin-limits.in b/sysutils/munin-doc/patches/patch-server_munin-limits.in
new file mode 100644
index 00000000000..98a4e661b08
--- /dev/null
+++ b/sysutils/munin-doc/patches/patch-server_munin-limits.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-server_munin-limits.in,v 1.1 2013/06/17 13:28:28 wiz Exp $
+
+Fix build with perl-5.18's pod2man.
+
+--- server/munin-limits.in.orig	2005-04-15 20:29:18.000000000 +0000
++++ server/munin-limits.in
+@@ -567,6 +567,8 @@ sub logger {
+ 
+ close $log;
+ 
++=encoding iso-8859-1
++
+ =head1 NAME
+ 
+ munin-limits - A program to check for any off-limit values
diff --git a/sysutils/munin-doc/patches/patch-server_munin-update.in b/sysutils/munin-doc/patches/patch-server_munin-update.in
new file mode 100644
index 00000000000..d6614370b95
--- /dev/null
+++ b/sysutils/munin-doc/patches/patch-server_munin-update.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-server_munin-update.in,v 1.1 2013/06/17 13:28:28 wiz Exp $
+
+Fix build with perl-5.18's pod2man.
+
+--- server/munin-update.in.orig	2005-04-15 20:31:22.000000000 +0000
++++ server/munin-update.in
+@@ -1210,6 +1210,8 @@ sub sanitise_fieldname
+ 
+ 1;
+ 
++=encoding iso-8859-1
++
+ =head1 NAME
+ 
+ munin-update - A program to gather data from machines running munin-node
diff --git a/sysutils/munin-doc/patches/patch-server_munin.conf.pod b/sysutils/munin-doc/patches/patch-server_munin.conf.pod
new file mode 100644
index 00000000000..57bb2182df6
--- /dev/null
+++ b/sysutils/munin-doc/patches/patch-server_munin.conf.pod
@@ -0,0 +1,12 @@
+$NetBSD: patch-server_munin.conf.pod,v 1.1 2013/06/17 13:28:28 wiz Exp $
+
+Fix build with perl-5.18's pod2man.
+
+--- server/munin.conf.pod.orig	2005-04-15 20:29:18.000000000 +0000
++++ server/munin.conf.pod
+@@ -1,3 +1,5 @@
++=encoding iso-8859-1
++
+ =head1 NAME
+ 
+ munin.conf - Munin configuration file