1 files changed, 47 insertions, 75 deletions
diff --git a/misc/amanda/patches/patch-ac b/misc/amanda/patches/patch-ac
index 09b7a827efa..eb2d8cffdff 100644
--- a/misc/amanda/patches/patch-ac
+++ b/misc/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
+ 
+ /*