Remove references to /usr/adm, as nobody has shipped a /usr/adm

directory in their OS for probably some twenty years. Use /var
instead. In particular, fix the defaults for CNF_INFOFILE, CNF_LOGDIR,
and CNF_INDEXDIR to use the configured LOCALSTATEDIR, which in pkgsrc
will be ${VARBASE}/amanda, instead of hardwiring /usr/adm/amanda.

PR 38958.

PKGREVISION -> 9.

7 files changed, 132 insertions, 3 deletions

diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile
index 2f60b762b16..cfc28f28167 100644
--- a/sysutils/amanda-common/Makefile
+++ b/sysutils/amanda-common/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.71 2015/06/12 10:51:11 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2015/08/09 22:50:09 dholland Exp $
 
 PKGNAME=		amanda-common-${AMANDA_VERSION}
-PKGREVISION=		8
+PKGREVISION=		9
 
 COMMENT=		Common libraries and binaries for Amanda
 
diff --git a/sysutils/amanda-common/distinfo b/sysutils/amanda-common/distinfo
index de817dd3438..fbf0bde7657 100644
--- a/sysutils/amanda-common/distinfo
+++ b/sysutils/amanda-common/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2015/03/30 01:14:22 gdt Exp $
+$NetBSD: distinfo,v 1.18 2015/08/09 22:50:09 dholland Exp $
 
 SHA1 (amanda-3.3.1.tar.gz) = 22273381f61319e46e1da9d7029ca2b3991eee98
 RMD160 (amanda-3.3.1.tar.gz) = 0d66ad25fd905901a1afd3651bd6c1e00db9af8d
@@ -10,6 +10,7 @@ SHA1 (patch-client-src_Makefile.am) = 641ef76fd1ea413b416704e1e52e25a93a596442
 SHA1 (patch-client-src_sendbackup-dump.c) = aea1aca0bbcdab0c393b012a592cbc5ca458acec
 SHA1 (patch-client-src_sendsize.c) = 32a1627c250b6413e4695a610bba59796c6e7ed6
 SHA1 (patch-common-src_Makefile.in) = 422e4d519d8797e686d62cfeca8cda2e8a4a8bb3
+SHA1 (patch-common-src_conffile.c) = b25e6a7e7f7c6841e28aa93587996b017bfefc2c
 SHA1 (patch-common-src_glib-util.c) = 8b62499f6730843fbf9e872adc80978b77b5573f
 SHA1 (patch-common-src_glib-util.h) = 6d5b14acd7a44b17a52ebc697f5354db2a4b04f9
 SHA1 (patch-common-src_security-util.h) = c628cc19a624da2cfabdb7d488bc2cd2d4b955a4
@@ -20,6 +21,10 @@ SHA1 (patch-config_macro-archive_xsltproc.m4) = 20324db1ce3db016fa89fe39df5a8133
 SHA1 (patch-device-src_Makefile.am) = 29fd554033ff0ff7b1d98a08306f157ced7324c5
 SHA1 (patch-device-src_device.c) = 31cb823dcce0f7f3d9de8f9def1a0f025ab10876
 SHA1 (patch-example_Makefile.am) = 8d2dac1abdc473fbf94489bcb620a42a665fd27a
+SHA1 (patch-example_amanda.conf.in) = 4be9bd71f9965d9dd351ae2666ee1cb99e8aea94
+SHA1 (patch-example_chg-multi-conf) = 2a586e02e5766d89c71061a5b344dc13d98ed56a
+SHA1 (patch-example_template.d_advanced.conf.in) = 654d896c321b81f5db15fddd8a1c08a528921d8a
+SHA1 (patch-man_xml-source_amanda.conf.5.xml) = a5a40433fc011c43524076f6c4164e51b2639836
 SHA1 (patch-ndmp-src_ndmp2__xdr.c) = 9ae6d78c2192ece83a1aa141cb04c9761969ca5b
 SHA1 (patch-ndmp-src_ndmp3__xdr.c) = a080c7337ede4fe75f9735fb3355d0aa16b0af6c
 SHA1 (patch-ndmp-src_ndmp4__xdr.c) = 339b0d539754127446acf6456fb385f00b1fbcc3
diff --git a/sysutils/amanda-common/patches/patch-common-src_conffile.c b/sysutils/amanda-common/patches/patch-common-src_conffile.c
new file mode 100644
index 00000000000..c5e0b17111d
--- /dev/null
+++ b/sysutils/amanda-common/patches/patch-common-src_conffile.c
@@ -0,0 +1,29 @@
+$NetBSD: patch-common-src_conffile.c,v 1.1 2015/08/09 22:50:10 dholland Exp $
+
+Update the defaults for a few things to use LOCALSTATEDIR (which will
+be $VARBASE/amanda) instead of compiling in /usr/adm, which no system
+has shipped in the last twenty years or so.  PR 38958.
+
+--- common-src/conffile.c.orig	2012-02-21 11:36:51.000000000 +0000
++++ common-src/conffile.c
+@@ -35,6 +35,7 @@
+ #include "util.h"
+ #include "conffile.h"
+ #include "clock.h"
++#include "configmake.h"
+ #include <glib.h>
+ 
+ /*
+@@ -5330,9 +5331,9 @@ init_defaults(
+     conf_init_str   (&conf_data[CNF_LABELSTR]             , ".*");
+     conf_init_str   (&conf_data[CNF_TAPELIST]             , "tapelist");
+     conf_init_str   (&conf_data[CNF_DISKFILE]             , "disklist");
+-    conf_init_str   (&conf_data[CNF_INFOFILE]             , "/usr/adm/amanda/curinfo");
+-    conf_init_str   (&conf_data[CNF_LOGDIR]               , "/usr/adm/amanda");
+-    conf_init_str   (&conf_data[CNF_INDEXDIR]             , "/usr/adm/amanda/index");
++    conf_init_str   (&conf_data[CNF_INFOFILE]             , LOCALSTATEDIR "/curinfo");
++    conf_init_str   (&conf_data[CNF_LOGDIR]               , LOCALSTATEDIR);
++    conf_init_str   (&conf_data[CNF_INDEXDIR]             , LOCALSTATEDIR "/index");
+     conf_init_ident    (&conf_data[CNF_TAPETYPE]             , "DEFAULT_TAPE");
+     conf_init_identlist(&conf_data[CNF_HOLDINGDISK]          , NULL);
+     conf_init_int      (&conf_data[CNF_DUMPCYCLE]            , 10);
diff --git a/sysutils/amanda-common/patches/patch-example_amanda.conf.in b/sysutils/amanda-common/patches/patch-example_amanda.conf.in
new file mode 100644
index 00000000000..3923b8f162b
--- /dev/null
+++ b/sysutils/amanda-common/patches/patch-example_amanda.conf.in
@@ -0,0 +1,17 @@
+$NetBSD: patch-example_amanda.conf.in,v 1.1 2015/08/09 22:50:10 dholland Exp $
+
+Remove references to /usr/adm as no system has shipped with such a
+directory in probably a good twenty years. Say /var or /var/local
+instead. PR 38958.
+
+--- example/amanda.conf.in~	2012-02-21 11:36:41.000000000 +0000
++++ example/amanda.conf.in
+@@ -217,7 +217,7 @@ holdingdisk hd1 {
+ 
+ # Amanda needs a few Mb of diskspace for the log and debug files,
+ # as well as a database.  This stuff can grow large, so the conf directory
+-# isn't usually appropriate.  Some sites use /usr/local/var and some /usr/adm.
++# isn't usually appropriate.  A typical place is /var or /var/local.
+ # Create an amanda directory under there.  You need a separate infofile and
+ # logdir for each configuration, so create subdirectories for each conf and
+ # put the files there.  Specify the locations below.
diff --git a/sysutils/amanda-common/patches/patch-example_chg-multi-conf b/sysutils/amanda-common/patches/patch-example_chg-multi-conf
new file mode 100644
index 00000000000..90d4d19f540
--- /dev/null
+++ b/sysutils/amanda-common/patches/patch-example_chg-multi-conf
@@ -0,0 +1,17 @@
+$NetBSD: patch-example_chg-multi-conf,v 1.1 2015/08/09 22:50:10 dholland Exp $
+
+Remove references to /usr/adm as no system has shipped with such a
+directory in probably a good twenty years. Use /var instead.
+PR 38958.
+
+--- example/chg-multi.conf~	2012-02-21 11:36:41.000000000 +0000
++++ example/chg-multi.conf
+@@ -51,7 +51,7 @@ needeject 0
+ ejectdelay 0
+ 
+ # Names a status file where the current ``changer'' state is stored.
+-statefile /usr/adm/amanda/csd/changer-status
++statefile /var/amanda/csd/changer-status
+ 
+ # What are the slot numbers used in the tape rack?
+ firstslot 1
diff --git a/sysutils/amanda-common/patches/patch-example_template.d_advanced.conf.in b/sysutils/amanda-common/patches/patch-example_template.d_advanced.conf.in
new file mode 100644
index 00000000000..178c4f4c542
--- /dev/null
+++ b/sysutils/amanda-common/patches/patch-example_template.d_advanced.conf.in
@@ -0,0 +1,17 @@
+$NetBSD: patch-example_template.d_advanced.conf.in,v 1.1 2015/08/09 22:50:10 dholland Exp $
+
+Remove references to /usr/adm as no system has shipped with such a
+directory in probably a good twenty years. Say /var or /var/local
+instead. PR 38958.
+
+--- example/template.d/advanced.conf.in~	2012-02-21 11:36:41.000000000 +0000
++++ example/template.d/advanced.conf.in
+@@ -84,7 +84,7 @@ autoflush no 
+ 
+ # Amanda needs a few Mb of diskspace for the log and debug files,
+ # as well as a database.  This stuff can grow large, so the conf directory
+-# isn't usually appropriate.  Some sites use /usr/local/var and some /usr/adm.
++# isn't usually appropriate.  A typical place is /var or /var/local.
+ # Create an amanda directory under there.  You need a separate infofile and
+ # logdir for each configuration, so create subdirectories for each conf and
+ # put the files there.  Specify the locations below.
diff --git a/sysutils/amanda-common/patches/patch-man_xml-source_amanda.conf.5.xml b/sysutils/amanda-common/patches/patch-man_xml-source_amanda.conf.5.xml
new file mode 100644
index 00000000000..acf0654ddfc
--- /dev/null
+++ b/sysutils/amanda-common/patches/patch-man_xml-source_amanda.conf.5.xml
@@ -0,0 +1,44 @@
+$NetBSD: patch-man_xml-source_amanda.conf.5.xml,v 1.1 2015/08/09 22:50:10 dholland Exp $
+
+Remove references to /usr/adm as no system has shipped with such a
+directory in probably a good twenty years. Use /var instead.
+PR 38958.
+
+--- man/xml-source/amanda.conf.5.xml~	2012-02-21 11:36:43.000000000 +0000
++++ man/xml-source/amanda.conf.5.xml
+@@ -666,7 +666,7 @@ option.</para>
+   <term><amkeyword>changerfile</amkeyword> <amtype>string</amtype></term>
+   <listitem>
+ <para>Default:
+-<amdefault>&quot;/usr/adm/amanda/log/changer-status&quot;</amdefault>.
++<amdefault>&quot;/var/amanda/log/changer-status&quot;</amdefault>.
+ A tape changer configuration parameter.
+ Usage depends on the particular changer defined with the
+ <amkeyword>tpchanger</amkeyword>
+@@ -1039,7 +1039,7 @@ file holding client hosts, disks and oth
+   <term><amkeyword>infofile</amkeyword> <amtype>string</amtype></term>
+   <listitem>
+ <para>Default:
+-<amdefault>&quot;/usr/adm/amanda/curinfo&quot;</amdefault>.
++<amdefault>&quot;/var/amanda/curinfo&quot;</amdefault>.
+ The file or directory name for the historical information database.
+ If Amanda was configured to use DBM databases, this is the base file
+ name for them.
+@@ -1052,7 +1052,7 @@ client, then a directory per disk, then 
+   <term><amkeyword>logdir</amkeyword> <amtype>string</amtype></term>
+   <listitem>
+ <para>Default:
+-<amdefault>&quot;/usr/adm/amanda&quot;</amdefault>.
++<amdefault>&quot;/var/amanda&quot;</amdefault>.
+ The directory for the
+ <command>amdump</command>
+ and
+@@ -1064,7 +1064,7 @@ files.</para>
+   <term><amkeyword>indexdir</amkeyword> <amtype>string</amtype></term>
+   <listitem>
+ <para>Default
+-<amdefault>&quot;/usr/adm/amanda/index&quot;</amdefault>.
++<amdefault>&quot;/var/amanda/index&quot;</amdefault>.
+ The directory where index files (backup image catalogues) are stored.
+ Index files are
+ only generated for filesystems whose