head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.54 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.52 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.50 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.48 pkgsrc-2011Q2-base:1.4 pkgsrc-2009Q4:1.4.0.46 pkgsrc-2009Q4-base:1.4 pkgsrc-2008Q4:1.4.0.44 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.42 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.40 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.38 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.36 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.34 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.32 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.30 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.28 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.26 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.24 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.22 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.20 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.18 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.16 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.14 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.12 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.10 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.8 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.6 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.4.0.4 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.4.0.2 pkgsrc-2003Q4-base:1.4 buildlink2-base:1.4 Makefile:1.1.1.1 FreeBSD-current-1997-09-25:1.1.1.1 FREEBSD:1.1.1; locks; strict; comment @# @; 1.4 date 98.05.07.17.06.30; author agc; state dead; branches; next 1.3; 1.3 date 97.10.15.16.58.17; author agc; state Exp; branches; next 1.2; 1.2 date 97.10.13.14.05.22; author agc; state Exp; branches; next 1.1; 1.1 date 97.10.11.21.54.00; author hubertf; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 97.10.11.21.54.00; author hubertf; state Exp; branches; next ; desc @@ 1.4 log @Remove unnecessary patches. @ text @--- 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/local/etc/amanda" +#define LIBEXEC_DIR "/usr/local/libexec/amanda" +#define BIN_DIR "/usr/local/sbin" +#define MAN_DIR "/usr/local/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 /* @ 1.3 log @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}. @ text @@ 1.2 log @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. @ text @d11 4 a14 4 +#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" @ 1.1 log @Initial revision @ text @d1 47 a47 75 *** 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 @ 1.1.1.1 log @Import as of 09/25/97 @ text @@