Update the support files from the 6.0.1 import.

2 files changed, 140 insertions, 94 deletions

diff --git a/contrib/amd/FREEBSD-Xlist b/contrib/amd/FREEBSD-Xlist
new file mode 100644
index 0000000..2cfa5ca
--- /dev/null
+++ b/contrib/amd/FREEBSD-Xlist
@@ -0,0 +1,127 @@
+$FreeBSD$
+*Makefile.*
+*README.autofs
+*aux
+*buildall
+*configure
+*amd/Makefile.*
+*amq/Makefile.*
+*conf/checkmount/checkmount_aix.c
+*conf/checkmount/checkmount_default.c
+*conf/checkmount/checkmount_osf.c
+*conf/checkmount/checkmount_svr4.c
+*conf/checkmount/checkmount_ultrix.c
+*conf/fh_dref/fh_dref_aix3.h
+*conf/fh_dref/fh_dref_aix42.h
+*conf/fh_dref/fh_dref_bsd44.h
+*conf/fh_dref/fh_dref_default.h
+*conf/fh_dref/fh_dref_hpux.h
+*conf/fh_dref/fh_dref_irix.h
+*conf/fh_dref/fh_dref_isc3.h
+*conf/fh_dref/fh_dref_linux.h
+*conf/fh_dref/fh_dref_nextstep.h
+*conf/fh_dref/fh_dref_osf2.h
+*conf/fh_dref/fh_dref_osf4.h
+*conf/fh_dref/fh_dref_sunos3.h
+*conf/fh_dref/fh_dref_sunos4.h
+*conf/fh_dref/fh_dref_svr4.h
+*conf/hn_dref/hn_dref_isc3.h
+*conf/hn_dref/hn_dref_linux.h
+*conf/mount/mount_aix.c
+*conf/mount/mount_bsdi3.c
+*conf/mount/mount_freebsd3.c
+*conf/mount/mount_hpux.c
+*conf/mount/mount_irix5.c
+*conf/mount/mount_irix6.c
+*conf/mount/mount_isc3.c
+*conf/mount/mount_linux.c
+*conf/mount/mount_mach3.c
+*conf/mount/mount_stellix.c
+*conf/mount/mount_svr4.c
+*conf/mtab/mtab_aix.c
+*conf/mtab/mtab_file.c
+*conf/mtab/mtab_isc3.c
+*conf/mtab/mtab_mach3.c
+*conf/mtab/mtab_osf.c
+*conf/mtab/mtab_svr4.c
+*conf/mtab/mtab_ultrix.c
+*conf/nfs_prot/nfs_prot_aix3.h
+*conf/nfs_prot/nfs_prot_aix4.h
+*conf/nfs_prot/nfs_prot_aix4_2.h
+*conf/nfs_prot/nfs_prot_aix4_3.h
+*conf/nfs_prot/nfs_prot_bsdi2.h
+*conf/nfs_prot/nfs_prot_bsdi3.h
+*conf/nfs_prot/nfs_prot_default.h
+*conf/nfs_prot/nfs_prot_hpux.h
+*conf/nfs_prot/nfs_prot_hpux11.h
+*conf/nfs_prot/nfs_prot_irix5.h
+*conf/nfs_prot/nfs_prot_irix6.h
+*conf/nfs_prot/nfs_prot_linux.h
+*conf/nfs_prot/nfs_prot_ncr2.h
+*conf/nfs_prot/nfs_prot_netbsd.h
+*conf/nfs_prot/nfs_prot_netbsd1_3.h
+*conf/nfs_prot/nfs_prot_netbsd1_4.h
+*conf/nfs_prot/nfs_prot_nextstep.h
+*conf/nfs_prot/nfs_prot_openbsd.h
+*conf/nfs_prot/nfs_prot_osf2.h
+*conf/nfs_prot/nfs_prot_osf4.h
+*conf/nfs_prot/nfs_prot_sunos3.h
+*conf/nfs_prot/nfs_prot_sunos4.h
+*conf/nfs_prot/nfs_prot_sunos5_3.h
+*conf/nfs_prot/nfs_prot_sunos5_4.h
+*conf/nfs_prot/nfs_prot_sunos5_5.h
+*conf/nfs_prot/nfs_prot_sunos5_6.h
+*conf/nfs_prot/nfs_prot_sunos5_7.h
+*conf/nfs_prot/nfs_prot_svr4.h
+*conf/nfs_prot/nfs_prot_ultrix.h
+*conf/sa_dref/sa_dref_386bsd.h
+*conf/sa_dref/sa_dref_aix3.h
+*conf/sa_dref/sa_dref_aoi.h
+*conf/sa_dref/sa_dref_default.h
+*conf/sa_dref/sa_dref_isc3.h
+*conf/sa_dref/sa_dref_linux.h
+*conf/sa_dref/sa_dref_svr4.h
+*conf/transp/transp_tli.c
+*conf/trap/trap_aix3.h
+*conf/trap/trap_aux.h
+*conf/trap/trap_dgux.h
+*conf/trap/trap_freebsd3.h
+*conf/trap/trap_hcx.h
+*conf/trap/trap_hpux.h
+*conf/trap/trap_hpux11.h
+*conf/trap/trap_irix.h
+*conf/trap/trap_isc3.h
+*conf/trap/trap_linux.h
+*conf/trap/trap_mach3.h
+*conf/trap/trap_news4.h
+*conf/trap/trap_rtu6.h
+*conf/trap/trap_stellix.h
+*conf/trap/trap_svr4.h
+*conf/trap/trap_ultrix.h
+*conf/umount/umount_default.c
+*conf/umount/umount_osf.c
+*doc/Makefile.am
+*doc/Makefile.in
+*doc/am-utils.dvi
+*doc/am-utils.info
+*doc/am-utils.info-1
+*doc/am-utils.info-2
+*doc/am-utils.info-3
+*doc/am-utils.info-4
+*doc/am-utils.info-5
+*doc/am-utils.info-6
+*doc/am-utils.info-7
+*doc/am-utils.ps
+*doc/hlfsd.ps
+*fixmount/Makefile.*
+*fsinfo/Makefile.*
+*hlfsd/Makefile.*
+*libamu/Makefile.*
+*libamu/clnt_sperrno.c
+*libamu/memcmp.c
+*libamu/strcasecmp.c
+*libamu/strdup.c
+*libamu/strstr.c
+*libamu/ualarm.c
+*mk-amd-map/Makefile.*
+*wire-test/Makefile.*
diff --git a/contrib/amd/FREEBSD-upgrade b/contrib/amd/FREEBSD-upgrade
index 8205e8e..31c7ac8 100644
--- a/contrib/amd/FREEBSD-upgrade
+++ b/contrib/amd/FREEBSD-upgrade
@@ -1,105 +1,24 @@
 # ex:ts=8
 $FreeBSD$
 
-AMD (am-utils) 6.0
-	originals can be found at: ftp://shekel.mcl.cs.columbia.edu/pub/am-utils
-	(http://www.cs.columbia.edu/~ezk/am-utils/index.html)
+AMD (am-utils) 6.0.1
+    originals can be found at: ftp://shekel.mcl.cs.columbia.edu/pub/am-utils/
+    (http://www.cs.columbia.edu/~ezk/am-utils/index.html)
 
 
-For the import of AMD the following files were removed:
-	Makefile.am     README.autofs   buildall
-	Makefile.in     aux/*           configure
+For the import of AMD many files were pruned by:
 
-	amd/
-	Makefile.am     Makefile.in
+	tar -X FREEBSD-Xlist -xf am-utils-6.0.1.tar.gz
 
-	amq/
-	Makefile.am     Makefile.in
+Then imported by:
 
-	conf/checkmount/
-	checkmount_aix.c	checkmount_osf.c	checkmount_ultrix.c
-	checkmount_default.c	checkmount_svr4.c
-
-	conf/fh_dref/
-	fh_dref_aix3.h		fh_dref_irix.h		fh_dref_osf4.h
-	fh_dref_aix42.h		fh_dref_isc3.h		fh_dref_sunos3.h
-	fh_dref_bsd44.h		fh_dref_linux.h		fh_dref_sunos4.h
-	fh_dref_default.h	fh_dref_nextstep.h	fh_dref_svr4.h
-	fh_dref_hpux.h		fh_dref_osf2.h
-
-	conf/hn_dref/
-	hn_dref_isc3.h		hn_dref_linux.h
-
-	conf/mount/
-	mount_aix.c		mount_irix6.c		mount_stellix.c
-	mount_bsdi3.c		mount_isc3.c		mount_svr4.c
-	mount_hpux.c		mount_linux.c		mount_freebsd3.c
-	mount_irix5.c		mount_mach3.c		(was for pre-3.0-R)
-
-	conf/mtab/
-	mtab_aix.c	mtab_isc3.c	mtab_osf.c	mtab_ultrix.c
-	mtab_file.c	mtab_mach3.c	mtab_svr4.c
-
-	conf/nfs_prot/
-	nfs_prot_aix3.h		nfs_prot_irix6.h	nfs_prot_sunos3.h
-	nfs_prot_aix4.h		nfs_prot_linux.h	nfs_prot_sunos4.h
-	nfs_prot_aix4_2.h	nfs_prot_ncr2.h		nfs_prot_sunos5_3.h
-	nfs_prot_bsdi2.h	nfs_prot_netbsd.h	nfs_prot_sunos5_4.h
-	nfs_prot_bsdi3.h	nfs_prot_netbsd1_3.h	nfs_prot_sunos5_5.h
-	nfs_prot_default.h	nfs_prot_nextstep.h	nfs_prot_sunos5_6.h
-	nfs_prot_hpux.h		nfs_prot_openbsd.h	nfs_prot_svr4.h
-	nfs_prot_hpux11.h	nfs_prot_osf2.h		nfs_prot_ultrix.h
-	nfs_prot_irix5.h	nfs_prot_osf4.h
-
-	conf/sa_dref/
-	sa_dref_386bsd.h	sa_dref_default.h	sa_dref_svr4.h
-	sa_dref_aix3.h		sa_dref_isc3.h
-	sa_dref_aoi.h		sa_dref_linux.h
-
-	conf/transp/
-	transp_tli.c
-
-	conf/trap/
-	trap_aix3.h     trap_hpux.h     trap_linux.h    trap_stellix.h
-	trap_aux.h      trap_hpux11.h   trap_mach3.h    trap_svr4.h
-	trap_dgux.h     trap_irix.h     trap_news4.h    trap_ultrix.h
-	trap_hcx.h      trap_isc3.h     trap_rtu6.h	trap_freebsd3.h
-							(was for pre-3.0-R)
-
-	conf/umount/
-	umount_default.c	umount_osf.c
-
-	doc/
-	Makefile.am             am-utils.info-1         am-utils.info-5
-	Makefile.in             am-utils.info-2         am-utils.info-6
-	am-utils.dvi            am-utils.info-3         am-utils.ps
-	am-utils.info           am-utils.info-4         hlfsd.ps
-
-	fixmount/
-	Makefile.am     Makefile.in
-
-	fsinfo/
-	Makefile.am     Makefile.in
-
-	hlfsd/
-	Makefile.am     Makefile.in
-
-	libamu/
-	Makefile.am     Makefile.in     clnt_sperrno.c  memcmp.c
-	strcasecmp.c    strdup.c        strstr.c        ualarm.c
-
-	mk-amd-map/
-	Makefile.am     Makefile.in
-
-	wire-test/
-	Makefile.am     Makefile.in
-	
-
-Imported by:
-
-	cvs import -m 'Virgin import of AMD (am-utils) v6.0' \
-		src/contrib/amd COLUMBIA amd_6_0
+	cvs import -m 'Virgin import of AMD (am-utils) v6.0.1' \
+		src/contrib/amd COLUMBIA amd_6_0_1
 
+After the import, a separate extraction of am-utils was GNU configured in
+the "normal" way.  The resulting config.h file should be compared with
+src/usr.sbin/amd/include/config.h, and src/usr.sbin/amd/include/config.h
+updated as needed.
 
 To make local changes to amd, simply patch and commit to the main
 branch (aka HEAD).  Never make local changes on the vendor (COLUMBIA) branch.
@@ -108,4 +27,4 @@ All local changes should be submitted to "amd-dev@majordomo.cs.columbia.edu"
 for inclusion in the next vendor release.
 
 obrien@NUXI.com
-13-January-1999
+14-September-1999