Revert the default location to be /usr/local, so that we can use

the pre-processing stage in the pre-configure Makefile target to
modify /usr/local to ${PREFIX}.

2 files changed, 10 insertions, 24 deletions

diff --git a/misc/amanda/patches/patch-ab b/misc/amanda/patches/patch-ab
index e67c29555e0..372967845d3 100644
--- a/misc/amanda/patches/patch-ab
+++ b/misc/amanda/patches/patch-ab
@@ -5,7 +5,7 @@
  All the files are stored in a
  .I config
 -directory under /etc/amanda.  Often a single site will have more than
-+directory under /usr/pkg/etc/amanda.  Often a single site will have more than
++directory under /usr/local/etc/amanda.  Often a single site will have more than
  one configuration; these configurations are named by the directories
  that their config files are in.  For example, a site might have a
  .I normal
@@ -14,8 +14,8 @@
  configuration for 6-month full archival backups.  The config files for
 -these two would be stored under /etc/amanda/normal and
 -/etc/amanda/archive, respectively.
-+these two would be stored under /usr/pkg/etc/amanda/normal and
-+/usr/pkg/etc/amanda/archive, respectively.
++these two would be stored under /usr/local/etc/amanda/normal and
++/usr/local/etc/amanda/archive, respectively.
  
  All log and database files generated by Amanda go in corresponding
 -directories under /usr/adm/amanda.  In our example, the logs would go
@@ -25,20 +25,6 @@
  
  .SH CONFIG FILE PARAMETERS
  
---- man/amcleanup.8.orig	Mon May 20 03:11:25 1996
-+++ man/amcleanup.8	Mon Oct 13 14:32:08 1997
-@@ -31,9 +31,9 @@
- 
- .PP
- .nf
--if [ -s /usr/adm/amanda/csd/amanda.log ]
-+if [ -s /var/log/amanda/csd/amanda.log ]
- then
--	/usr/local/sbin/amcleanup csd
-+	/usr/pkg/sbin/amcleanup csd
- fi
- .fi
- .RS .5i
 --- man/amflush.8.orig	Mon May 20 03:11:25 1996
 +++ man/amflush.8	Mon Oct 13 14:32:31 1997
 @@ -22,7 +22,7 @@
@@ -46,7 +32,7 @@
  will look in the holding disk specified by the
  .I amanda.conf
 -file in /etc/amanda/\fIconfig\fR
-+file in /usr/pkg/etc/amanda/\fIconfig\fR
++file in /usr/local/etc/amanda/\fIconfig\fR
  for any non-empty Amanda work directories.  It then prompts the
  operator to select the correct directory.  The work directories on the
  holding disk are named by the date at the time
@@ -57,7 +43,7 @@
  writes an Amanda label on the tape in the tape drive specified by the
  .I amanda.conf
 -file in /etc/amanda/\fIconfig\fR.  The
-+file in /usr/pkg/etc/amanda/\fIconfig\fR.  The
++file in /usr/local/etc/amanda/\fIconfig\fR.  The
  .I label
  can be any string that does not contain whitespace, and that matches the
  .I amanda.conf 
@@ -66,7 +52,7 @@
  % amlabel csd VOL1
  If the line "tapedev /dev/tape/1n" is in
 -/etc/amanda/csd/amanda.conf, an Amanda label with the name "VOL1" is
-+/usr/pkg/etc/amanda/csd/amanda.conf, an Amanda label with the name "VOL1" is
++/usr/local/etc/amanda/csd/amanda.conf, an Amanda label with the name "VOL1" is
  written on the /dev/tape/1n device.
  
  .SH AUTHOR
diff --git a/misc/amanda/patches/patch-ac b/misc/amanda/patches/patch-ac
index eb2d8cffdff..9a2ab413212 100644
--- a/misc/amanda/patches/patch-ac
+++ b/misc/amanda/patches/patch-ac
@@ -8,10 +8,10 @@
 -#define LIBEXEC_DIR "/usr/local/libexec/amanda"
 -#define BIN_DIR	"/usr/local/sbin"
 -#define MAN_DIR	"/usr/share/local/man/man8"
-+#define CONFIG_DIR "/usr/pkg/etc/amanda"
-+#define LIBEXEC_DIR "/usr/pkg/libexec/amanda"
-+#define BIN_DIR	"/usr/pkg/sbin"
-+#define MAN_DIR	"/usr/pkg/man/man8"
++#define CONFIG_DIR "/usr/local/etc/amanda"
++#define LIBEXEC_DIR "/usr/local/libexec/amanda"
++#define BIN_DIR	"/usr/local/sbin"
++#define MAN_DIR	"/usr/local/man/man8"
  
  
  /*