Update rdist-6.1.0 -> rdist-6.1.2

Among other things, it has pretty much got native FreeBSD support, does not
core dump on ^C, some sync problems, uid/gid caching fixes, symlink detection
problems, portability to new platforms..

6 files changed, 58 insertions, 47 deletions

diff --git a/net/rdist6/Makefile b/net/rdist6/Makefile
index 076bb13fb516..c61533695bd8 100644
--- a/net/rdist6/Makefile
+++ b/net/rdist6/Makefile
@@ -1,25 +1,17 @@
 # New ports collection makefile for:	rdist
-# Version required:	rdist-6.1.0
+# Version required:	rdist-6.1.2
 # Date created:		19 August 1995
 # Whom:			peter
-# Based on patches by:  Deborah Bennett <deborah@microunity.com>
 #
-# $Id: Makefile,v 1.4 1995/10/06 07:00:40 asami Exp $
+# $Id: Makefile,v 1.5 1995/11/27 04:05:25 asami Exp $
 #
 
-DISTNAME=	rdist-6.1.0
+DISTNAME=	rdist-6.1.2
 CATEGORIES+=	net
 MASTER_SITES=	ftp://usc.edu/pub/rdist/
 
 MAINTAINER=	peter@FreeBSD.org
 
-NO_WRKSUBDIR=	yes
-
-# Copy the list of FreeBSD sites
-pre-patch:
-	cp ${FILESDIR}/mf.freebsd2 ${WRKSRC}/config
-	cp ${FILESDIR}/os-freebsd2.h ${WRKSRC}/config
-
 post-install:
 	strip ${PREFIX}/bin/rdist6
 	strip ${PREFIX}/bin/rdistd
diff --git a/net/rdist6/distinfo b/net/rdist6/distinfo
index 94a5901be197..b0b0bb05d2ee 100644
--- a/net/rdist6/distinfo
+++ b/net/rdist6/distinfo
@@ -1 +1 @@
-MD5 (rdist-6.1.0.tar.gz) = 37dfa8a056579db5c50d3b2d312b8909
+MD5 (rdist-6.1.2.tar.gz) = e3311c4f3d9e9de1bfcb04862563c683
diff --git a/net/rdist6/files/patch-ad b/net/rdist6/files/patch-ad
index cf74a90e20d2..565f3d8a3113 100644
--- a/net/rdist6/files/patch-ad
+++ b/net/rdist6/files/patch-ad
@@ -1,25 +1,40 @@
-*** Makefile.local.orig	Fri Feb 18 08:43:55 1994
---- Makefile.local	Mon Aug 21 02:38:50 1995
+*** Makefile.local.dist	Tue Feb  6 02:50:27 1996
+--- Makefile.local	Fri May 17 16:45:19 1996
 ***************
-*** 9,16 ****
+*** 8,14 ****
+  # BIN_DIR variable, you would uncomment the following line
   # or add your own line.
   #
 ! #BIN_DIR	= /usr/bin
   
   #
-! # Add any local definetions you want pass to the compiler to DEFS_LOCAL
-  # below.  This includes those items found in "config/config.h".
-  #
---- 9,20 ----
+  # Add any local definitions you want pass to the compiler to DEFS_LOCAL
+--- 8,16 ----
+  # BIN_DIR variable, you would uncomment the following line
   # or add your own line.
   #
-! BIN_DIR	=	/usr/local/bin
-! OPT =		-O -s
-! MAN_1_DIR =	/usr/local/man/man1
-! MAN_8_DIR =	/usr/local/man/man8
-! CLIENT =	rdist6
+! BIN_DIR       =       /usr/local/bin
+! OPT =         -O -s
+! CLIENT =      rdist6
   
   #
-! # Add any local definitions you want pass to the compiler to DEFS_LOCAL
-  # below.  This includes those items found in "config/config.h".
+  # Add any local definitions you want pass to the compiler to DEFS_LOCAL
+***************
+*** 45,52 ****
+  #
+  # Site specific Man Page configuration.
+  #
+! #MAN_1_DIR	= /usr/local/man/man1
+! #MAN_8_DIR	= /usr/local/man/man8
+! #MAN_OWNER	= bin
+! #MAN_GROUP	= bin
+  #MAN_MODE	= 644
+--- 47,54 ----
+  #
+  # Site specific Man Page configuration.
   #
+! MAN_1_DIR	= /usr/local/man/man1
+! MAN_8_DIR	= /usr/local/man/man8
+! MAN_OWNER	= bin
+! MAN_GROUP	= bin
+  #MAN_MODE	= 644
diff --git a/net/rdist6/files/patch-ag b/net/rdist6/files/patch-ag
new file mode 100644
index 000000000000..e2a078941bdb
--- /dev/null
+++ b/net/rdist6/files/patch-ag
@@ -0,0 +1,9 @@
+*** config/os-freebsd2.h.dist	Fri Feb 16 02:53:50 1996
+--- config/os-freebsd2.h	Fri May 17 16:40:31 1996
+***************
+*** 157,159 ****
+--- 157,160 ----
+   * that which appears in "include/paths.h".
+   */
+  #define _PATH_REMSH	"/usr/bin/rsh"			/**/
++ #define _PATH_OLDRDIST	"/usr/bin/rdist"	/* Enable compat */
diff --git a/net/rdist6/pkg-comment b/net/rdist6/pkg-comment
index 4f3de99e4f9c..30189ea49a11 100644
--- a/net/rdist6/pkg-comment
+++ b/net/rdist6/pkg-comment
@@ -1 +1 @@
-rdist 6.1.0 - A network file distribution utility.
+A network file distribution/synchronisation utility.
diff --git a/net/rdist6/pkg-descr b/net/rdist6/pkg-descr
index 3960e480956f..f27d57d5f977 100644
--- a/net/rdist6/pkg-descr
+++ b/net/rdist6/pkg-descr
@@ -1,5 +1,6 @@
-			  Rdist Version 6.1
-			     May 2, 1994
+
+			 Rdist Version 6.1.2
+			  February 15, 1996
 
 			    Michael Cooper
 		    University Computing Services
@@ -17,6 +18,10 @@ This version of rdist is not directly compatible with rdist
 distributed with 4.3BSD and subsequent vendor releases, but does
 indirectly provide full backward compatibility.
 
+The current official version of rdist is available via anonymous ftp
+on usc.edu under /pub/rdist.  The current version is always
+retrievable as file "/pub/rdist/rdist.tar.gz".
+
 			   CHANGES/FEATURES
 
 This version of rdist does not need to be setuid "root" at all.  Rdist
@@ -33,27 +38,17 @@ completely configure and compile itself for a number of platforms.
 Users don't need to worry about modifying any files to compile on a
 supported platform.
 
+See the ChangeLog file for the real details.  The end of that file
+contains the major new features compared to rdist classic.
+
 A paper titled "Overhauling Rdist for the '90s" from USENIX LISA VI
 is available for anonymous ftp on usc.edu as "/pub/rdist/overhaul.ps.gz".
 
 			      PLATFORMS
 
-This version of rdist has been ported to most major and a number of
-not so major platforms.  The list below is only a partial list.
-The complete list of supported platforms can be found by looking
-at all the config/os-*.h files.
-
-	MACHINE TYPE	OPERATING SYSTEM
-	---------------	----------------------------------
-	DEC MIPS	Ultrix 4.2
-	DG AviiON	DG/UX 5.4.x
-	HP 9000/300	HP/UX 7.05 (HP cc)
-	HP 9000/400	HP/UX 7.05 (HP cc)
-	HP 9000/700	HP/UX 8.07 (HP cc, GCC 2.3.1)
-	IBM RS6000	AIX 3.2
-	NeXTStep	Mach 3.1
-	Sun-3		SunOS 4.1.1
-	Sun-4/SPARC	SunOS 4.1.3, SunOS 5.3 (Solaris 2.3)
+This version of rdist has been ported to most major, and a number of
+not so major, platforms.  The complete list of supported platforms can
+be found by looking at all the config/os-*.h files.
 
 
 			    COMPATIBILITY
@@ -77,8 +72,8 @@ running the old rdist, then it must run the old rdist program
 (/usr/old/rdist or /usr/ucb/oldrdist).
 
 [[ for FreeBSD; /usr/bin/rdist is the "old" rdist, and /usr/local/bin/
-[[ is the location of the "new" rdist and rdistd.
-
+[[ is the location of the "new" rdist6 and rdistd.
+ 
 The definition _PATH_OLDRDIST in "config/config.h" controls the
 location of the old rdist.  If this is not defined, or the defined
 program does not exist at runtime, then rdist will print an error when