head 1.7; access; symbols pkgsrc-2013Q2:1.7.0.54 pkgsrc-2013Q2-base:1.7 pkgsrc-2012Q4:1.7.0.52 pkgsrc-2012Q4-base:1.7 pkgsrc-2011Q4:1.7.0.50 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q2:1.7.0.48 pkgsrc-2011Q2-base:1.7 pkgsrc-2009Q4:1.7.0.46 pkgsrc-2009Q4-base:1.7 pkgsrc-2008Q4:1.7.0.44 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.42 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.40 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.38 pkgsrc-2008Q2-base:1.7 pkgsrc-2008Q1:1.7.0.36 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.34 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.32 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.30 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.28 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.26 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.24 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.22 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.20 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.18 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.7.0.16 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.14 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.7.0.12 pkgsrc-2005Q1-base:1.7 pkgsrc-2004Q4:1.7.0.10 pkgsrc-2004Q4-base:1.7 pkgsrc-2004Q3:1.7.0.8 pkgsrc-2004Q3-base:1.7 pkgsrc-2004Q2:1.7.0.6 pkgsrc-2004Q2-base:1.7 pkgsrc-2004Q1:1.7.0.4 pkgsrc-2004Q1-base:1.7 pkgsrc-2003Q4:1.7.0.2 pkgsrc-2003Q4-base:1.7 buildlink2-base:1.7 netbsd-1-3-PATCH003:1.6 Makefile:1.1.1.1 FreeBSD-current-1997-09-25:1.1.1.1 FREEBSD:1.1.1; locks; strict; comment @# @; 1.7 date 99.02.23.17.05.18; author bouyer; state dead; branches; next 1.6; 1.6 date 98.08.07.11.10.08; author agc; state Exp; branches; next 1.5; 1.5 date 98.07.18.14.39.41; author tv; state Exp; branches; next 1.4; 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.10; author agc; state Exp; branches; next 1.2; 1.2 date 97.10.13.14.05.21; 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.7 log @Now in amanda-common, amanda-server, amanda-client @ text @$NetBSD: patch-ab,v 1.6 1998/08/07 11:10:08 agc Exp $ --- configure.orig Sat Jul 18 10:34:33 1998 +++ configure Sat Jul 18 10:35:03 1998 @@@@ -4204,6 +4204,7 @@@@ echo "$ac_t""no" 1>&6 fi +if false; then # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@@@ -4249,6 +4250,7 @@@@ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } +fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 @ 1.6 log @Add NetBSD RCS Ids. @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @Adapt to use pkg version of libtool rather than amanda's private copy. @ text @d1 2 @ 1.4 log @Remove unnecessary patches. @ text @d1 5 a5 3 --- 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 @@@@ d7 3 a9 14 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 one configuration; these configurations are named by the directories that their config files are in. For example, a site might have a .I normal configuration for every-day backups, and a .I archive 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. d11 5 a15 5 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/log/amanda. In our example, the logs would go +in /var/log/amanda/normal and /var/log/amanda/archive. d17 2 a18 33 .SH CONFIG FILE PARAMETERS --- 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 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.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 .I label can be any string that does not contain whitespace, and that matches the .I amanda.conf @@@@ -26,7 +26,7 @@@@ .TP % 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 written on the /dev/tape/1n device. .SH AUTHOR @ 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 @d8 1 a8 1 +directory under /usr/pkg/etc/amanda. Often a single site will have more than d17 2 a18 2 +these two would be stored under /usr/pkg/etc/amanda/normal and +/usr/pkg/etc/amanda/archive, respectively. a27 14 --- 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 d35 1 a35 1 +file in /usr/pkg/etc/amanda/\fIconfig\fR d46 1 a46 1 +file in /usr/pkg/etc/amanda/\fIconfig\fR. The d55 1 a55 1 +/usr/pkg/etc/amanda/csd/amanda.conf, an Amanda label with the name "VOL1" is @ 1.1 log @Initial revision @ text @d1 2 a2 2 --- man/amanda.8~ Sun May 19 22:11:25 1996 +++ man/amanda.8 Fri Mar 7 22:24:28 1997 d8 1 a8 1 +directory under /usr/local/etc/amanda. Often a single site will have more than d17 2 a18 2 +these two would be stored under /usr/local/etc/amanda/normal and +/usr/local/etc/amanda/archive, respectively. d23 1 a23 1 +directories under /var/lov/amanda. In our example, the logs would go d28 3 a30 3 --- man/amcleanup.8~ Sun May 19 22:11:25 1996 +++ man/amcleanup.8 Fri Mar 7 22:23:07 1997 @@@@ -31,13 +31,13 @@@@ d37 2 a38 1 /usr/local/sbin/amcleanup csd d42 2 a43 7 -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 d49 1 a49 1 +file in /usr/local/etc/amanda/\fIconfig\fR d53 2 a54 2 --- man/amlabel.8~ Sun May 19 22:11:25 1996 +++ man/amlabel.8 Fri Mar 7 22:22:22 1997 d60 1 a60 1 +file in /usr/local/etc/amanda/\fIconfig\fR. The d69 1 a69 1 +/usr/local/etc/amanda/csd/amanda.conf, an Amanda label with the name "VOL1" is @ 1.1.1.1 log @Import as of 09/25/97 @ text @@