summaryrefslogtreecommitdiff
path: root/sysutils/amanda
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>1997-10-13 14:05:21 +0000
committeragc <agc@pkgsrc.org>1997-10-13 14:05:21 +0000
commite9868972bf84fd6540ea0cc98a09229a3937c287 (patch)
treeadac2d70315c7e7d58f88f57218b2aca430e6444 /sysutils/amanda
parentf501cbe43740f21ca5117121a31e2d9957eab42f (diff)
downloadpkgsrc-e9868972bf84fd6540ea0cc98a09229a3937c287.tar.gz
Update the full path names to reflect the default NetBSD location.
We really need to have a preprocess pass on the patches to make this automatic.
Diffstat (limited to 'sysutils/amanda')
-rw-r--r--sysutils/amanda/patches/patch-ab40
-rw-r--r--sysutils/amanda/patches/patch-ac122
2 files changed, 65 insertions, 97 deletions
diff --git a/sysutils/amanda/patches/patch-ab b/sysutils/amanda/patches/patch-ab
index 4421a52df5f..e67c29555e0 100644
--- a/sysutils/amanda/patches/patch-ab
+++ b/sysutils/amanda/patches/patch-ab
@@ -1,11 +1,11 @@
---- man/amanda.8~ Sun May 19 22:11:25 1996
-+++ man/amanda.8 Fri Mar 7 22:24:28 1997
+--- man/amanda.8.orig Mon May 20 03:11:25 1996
++++ man/amanda.8 Mon Oct 13 14:31:32 1997
@@ -135,19 +135,19 @@
All the files are stored in a
.I config
-directory under /etc/amanda. Often a single site will have more than
-+directory under /usr/local/etc/amanda. Often a single site will have more than
++directory under /usr/pkg/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,54 +14,50 @@
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/local/etc/amanda/normal and
-+/usr/local/etc/amanda/archive, respectively.
++these two would be stored under /usr/pkg/etc/amanda/normal and
++/usr/pkg/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
-in /usr/adm/amanda/normal and /usr/adm/amanda/archive.
-+directories under /var/lov/amanda. In our example, the logs would go
++directories under /var/log/amanda. In our example, the logs would go
+in /var/log/amanda/normal and /var/log/amanda/archive.
.SH CONFIG FILE PARAMETERS
---- man/amcleanup.8~ Sun May 19 22:11:25 1996
-+++ man/amcleanup.8 Fri Mar 7 22:23:07 1997
-@@ -31,13 +31,13 @@
+--- 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/local/sbin/amcleanup csd
++ /usr/pkg/sbin/amcleanup csd
fi
.fi
.RS .5i
--Putting the above in /etc/rc.local runs the Amanda
-+Putting the above in /usr/local/etc/rc.local runs the Amanda
- cleanup process when needed as part of the reboot, eliminating the need
- to run it by hand.
- .RE
---- man/amflush.8~ Sun May 19 22:11:25 1996
-+++ man/amflush.8 Fri Mar 7 22:22:28 1997
+--- 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 @@
.B Amflush
will look in the holding disk specified by the
.I amanda.conf
-file in /etc/amanda/\fIconfig\fR
-+file in /usr/local/etc/amanda/\fIconfig\fR
++file in /usr/pkg/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
---- man/amlabel.8~ Sun May 19 22:11:25 1996
-+++ man/amlabel.8 Fri Mar 7 22:22:22 1997
+--- man/amlabel.8.orig Mon May 20 03:11:25 1996
++++ man/amlabel.8 Mon Oct 13 14:32:58 1997
@@ -11,7 +11,7 @@
.B Amlabel
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/local/etc/amanda/\fIconfig\fR. The
++file in /usr/pkg/etc/amanda/\fIconfig\fR. The
.I label
can be any string that does not contain whitespace, and that matches the
.I amanda.conf
@@ -70,7 +66,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/local/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
written on the /dev/tape/1n device.
.SH AUTHOR
diff --git a/sysutils/amanda/patches/patch-ac b/sysutils/amanda/patches/patch-ac
index 09b7a827efa..eb2d8cffdff 100644
--- a/sysutils/amanda/patches/patch-ac
+++ b/sysutils/amanda/patches/patch-ac
@@ -1,75 +1,47 @@
-*** config/options.h-vanilla Fri Feb 10 11:21:59 1995
---- config/options.h Tue Feb 28 16:34:30 1995
-***************
-*** 42,51 ****
- * LIBEXEC_DIR - Internal support programs
- * MAN_DIR - Man pages
- */
-! #define CONFIG_DIR "/etc/amanda"
- #define LIBEXEC_DIR "/usr/local/libexec/amanda"
- #define BIN_DIR "/usr/local/sbin"
-! #define MAN_DIR "/usr/share/local/man/man8"
-
-
- /*
---- 42,51 ----
- * LIBEXEC_DIR - Internal support programs
- * MAN_DIR - Man pages
- */
-! #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"
-
-
- /*
-***************
-*** 77,83 ****
- * Since 2.2.1 is a major change, I recommend defining this for existing
- * Amanda sites.
- */
-! #define USE_VERSION_SUFFIXES
-
-
- /*
---- 77,83 ----
- * Since 2.2.1 is a major change, I recommend defining this for existing
- * Amanda sites.
- */
-! /*#define USE_VERSION_SUFFIXES*/
-
-
- /*
-***************
-*** 182,196 ****
- #define HAVE_GZIP
-
- #ifdef HAVE_GZIP
-! # define COMPRESS_PATH "/usr/imports/bin/gzip"
- # define COMPRESS_SUFFIX ".gz"
- # define COMPRESS_FAST_OPT "--fast"
- # define COMPRESS_BEST_OPT "--best"
-! # define UNCOMPRESS_CMD "gzcat"
- #else
- # define COMPRESS_PATH COMPRESS /* defined in config.h */
- # define COMPRESS_SUFFIX ".Z"
- # define COMPRESS_FAST_OPT "-f" /* -f doesn't do anything */
- # define COMPRESS_BEST_OPT "-f" /* it's just a placeholder */
-! # define UNCOMPRESS_CMD "zcat"
- #endif
---- 182,196 ----
- #define HAVE_GZIP
-
- #ifdef HAVE_GZIP
-! # define COMPRESS_PATH "/usr/bin/gzip"
- # define COMPRESS_SUFFIX ".gz"
- # define COMPRESS_FAST_OPT "--fast"
- # define COMPRESS_BEST_OPT "--best"
-! # define UNCOMPRESS_CMD "/usr/bin/gzcat"
- #else
- # define COMPRESS_PATH COMPRESS /* defined in config.h */
- # define COMPRESS_SUFFIX ".Z"
- # define COMPRESS_FAST_OPT "-f" /* -f doesn't do anything */
- # define COMPRESS_BEST_OPT "-f" /* it's just a placeholder */
-! # define UNCOMPRESS_CMD "/usr/bin/zcat"
- #endif
+--- config/options.h-vanilla.orig Mon May 20 03:11:25 1996
++++ config/options.h-vanilla Mon Oct 13 14:23:16 1997
+@@ -42,10 +42,10 @@
+ * LIBEXEC_DIR - Internal support programs
+ * MAN_DIR - Man pages
+ */
+-#define CONFIG_DIR "/etc/amanda"
+-#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"
+
+
+ /*
+@@ -77,7 +77,7 @@
+ * Since 2.2.1 is a major change, I recommend defining this for existing
+ * Amanda sites.
+ */
+-#define USE_VERSION_SUFFIXES
++/*#define USE_VERSION_SUFFIXES*/
+
+
+ /*
+@@ -182,17 +182,17 @@
+ #define HAVE_GZIP
+
+ #ifdef HAVE_GZIP
+-# define COMPRESS_PATH "/usr/imports/bin/gzip"
++# define COMPRESS_PATH "/usr/bin/gzip"
+ # define COMPRESS_SUFFIX ".gz"
+ # define COMPRESS_FAST_OPT "--fast"
+ # define COMPRESS_BEST_OPT "--best"
+-# define UNCOMPRESS_CMD "gzcat"
++# define UNCOMPRESS_CMD "/usr/bin/gzcat"
+ #else
+ # define COMPRESS_PATH COMPRESS /* defined in config.h */
+ # define COMPRESS_SUFFIX ".Z"
+ # define COMPRESS_FAST_OPT "-f" /* -f doesn't do anything */
+ # define COMPRESS_BEST_OPT "-f" /* it's just a placeholder */
+-# define UNCOMPRESS_CMD "zcat"
++# define UNCOMPRESS_CMD "/usr/bin/zcat"
+ #endif
+
+ /*