upgrade to V2.8

6 files changed, 108 insertions, 106 deletions

diff --git a/ftp/mirror/Makefile b/ftp/mirror/Makefile
index 4e2d0841802d..540f88e0c9c8 100644
--- a/ftp/mirror/Makefile
+++ b/ftp/mirror/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	mirror
-# Version required:	2.3
+# Version required:	2.8
 # Date created:		15 May 1995
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.1.1.1 1995/05/19 07:23:13 asami Exp $
+# $Id: Makefile,v 1.2 1995/11/27 04:05:15 asami Exp $
 #
 
-DISTNAME=	mirror-2.3
+DISTNAME=	mirror-2.8
 CATEGORIES+=	net
 MASTER_SITES=	ftp://src.doc.ic.ac.uk/computing/archiving/mirror/
 
diff --git a/ftp/mirror/distinfo b/ftp/mirror/distinfo
index c80011d8c1c8..382496c7f2c5 100644
--- a/ftp/mirror/distinfo
+++ b/ftp/mirror/distinfo
@@ -1 +1 @@
-MD5 (mirror-2.3.tar.gz) = d90c5d40bab60ce96459daed1785189c
+MD5 (mirror-2.8.tar.gz) = a0a3ffec4b8e0fd71034cab8a0b1b010
diff --git a/ftp/mirror/files/patch-aa b/ftp/mirror/files/patch-aa
index a897a53e9b05..da43444ff3dd 100644
--- a/ftp/mirror/files/patch-aa
+++ b/ftp/mirror/files/patch-aa
@@ -1,5 +1,5 @@
-*** makefile.orig	Tue Jan 18 22:58:21 1994
---- makefile	Mon May 15 17:50:25 1995
+*** makefile.orig	Thu Jun  1 21:26:26 1995
+--- makefile	Sat Mar 16 16:19:59 1996
 ***************
 *** 6,12 ****
   	support/cyber-patches support/lstest.pl new-patches-by
@@ -18,20 +18,58 @@
   mirror.tar: $(FILES)
   	rev=`./mirror -v | perl -ane 'print "$$F[2]\n";'`; echo $rev; \
 ***************
-*** 20,22 ****
---- 20,34 ----
-  	checkin $(FILES)
-  
-  #  install, clean ...
-+ install:
-+ 	install -c ftp.pl ${PREFIX}/lib/mirror/
-+ 	install -c lsparse.pl ${PREFIX}/lib/mirror/
-+ 	install -c dateconv.pl ${PREFIX}/lib/mirror/
-+ 	install -c mirror.defaults ${PREFIX}/lib/mirror/mirror.defaults.sample
-+ 	install -c mirror.pl ${PREFIX}/bin/mirror
-+ 	install -c mirror.man ${PREFIX}/man/man1/mirror.1
-+ 	gzip -9nf ${PREFIX}/man/man1/mirror.1
-+ 	install -c mm ${PREFIX}/bin/mirrormaster
-+ 	install -c mm.man ${PREFIX}/man/man1/mirrormaster.1
-+ 	gzip -9nf ${PREFIX}/man/man1/mirrormaster.1
-+ 	install -c do_unlinks ${PREFIX}/lib/mirror/do_unlinks
+*** 25,50 ****
+  # mode to install executables
+  EXMODE = 755
+  # group to own all the files
+! GRP = gnu
+  # directory to install .pl (perl library) files
+! PLDIR = /usr/local/perl5/lib/perl5
+  # directory to install public executables
+! BINDIR = /usr/local/sbin
+  # directory to install man pages
+! MANDIR = /usr/local/man/man1
+  
+  install:
+! 	install -m $(PLMODE) -g $(GRP) lchat.pl $(PLDIR)
+! 	install -m $(PLMODE) -g $(GRP) chat2.pl $(PLDIR)
+! 	install -m $(PLMODE) -g $(GRP) dateconv.pl $(PLDIR)
+! 	install -m $(PLMODE) -g $(GRP) ftp.pl $(PLDIR)
+! 	install -m $(PLMODE) -g $(GRP) lsparse.pl $(PLDIR)
+! 	install -m $(EXMODE) -g $(GRP) mirror.pl $(PLDIR)
+! 	install -m $(EXMODE) -g $(GRP) do_unlinks $(BINDIR)
+! 	install -m $(EXMODE) -g $(GRP) pkgs_to_mmin $(BINDIR)
+! 	install -m $(EXMODE) -g $(GRP) mm $(BINDIR)/mirror-master
+! 	install -m $(PLMODE) -g $(GRP) mirror.man $(MANDIR)/mirror.1
+! 	install -m $(PLMODE) -g $(GRP) mm.man $(MANDIR)/mirror-master.1
+  
+  # directory to install .pl (perl library) files for rperl
+  RPLDIR = /usr/local/rperl5/lib/perl5
+--- 25,51 ----
+  # mode to install executables
+  EXMODE = 755
+  # group to own all the files
+! GRP = bin
+  # directory to install .pl (perl library) files
+! PLDIR = ${PREFIX}/lib/mirror
+  # directory to install public executables
+! BINDIR = ${PREFIX}/bin
+  # directory to install man pages
+! MANDIR = ${PREFIX}/man/man1
+  
+  install:
+! 	install -c -m $(PLMODE) -g $(GRP) lchat.pl $(PLDIR)
+! #	install -c -m $(PLMODE) -g $(GRP) chat2.pl $(PLDIR)
+! 	install -c -m $(PLMODE) -g $(GRP) dateconv.pl $(PLDIR)
+! 	install -c -m $(PLMODE) -g $(GRP) ftp.pl $(PLDIR)
+! 	install -c -m $(PLMODE) -g $(GRP) lsparse.pl $(PLDIR)
+! 	install -c -m $(EXMODE) -g $(GRP) mirror.pl $(BINDIR)/mirror
+! 	install -c -m $(EXMODE) -g $(GRP) do_unlinks $(BINDIR)
+! 	install -c -m $(EXMODE) -g $(GRP) pkgs_to_mmin $(BINDIR)
+! 	install -c -m $(EXMODE) -g $(GRP) mm $(BINDIR)/mirrormaster
+! 	install -c -m $(PLMODE) -g $(GRP) mirror.man $(MANDIR)/mirror.1
+! 	install -c -m $(PLMODE) -g $(GRP) mm.man $(MANDIR)/mirrormaster.1
+! 	install -c -m $(PLMODE) -g $(GRP) mirror.defaults $(PLDIR)/mirror.defaults.sample
+  
+  # directory to install .pl (perl library) files for rperl
+  RPLDIR = /usr/local/rperl5/lib/perl5
diff --git a/ftp/mirror/files/patch-ab b/ftp/mirror/files/patch-ab
index a2fe764c1e43..5eece767c7a0 100644
--- a/ftp/mirror/files/patch-ab
+++ b/ftp/mirror/files/patch-ab
@@ -1,11 +1,11 @@
-*** mirror.defaults.orig	Mon May 15 17:15:11 1995
---- mirror.defaults	Mon May 15 17:25:11 1995
+*** mirror.defaults.orig	Sat Mar 16 15:42:36 1996
+--- mirror.defaults	Sat Mar 16 15:45:41 1996
 ***************
-*** 11,30 ****
+*** 11,37 ****
   	# The LOCAL hostname - if not the same as `hostname`
-  	# (I advertise the name src.doc.ic.ac.uk but the machine is
-  	#  really puffin.doc.ic.ac.uk.)
-! 	hostname=src.doc.ic.ac.uk
+  	# (I advertise the name sunsite.doc.ic.ac.uk but the machine is
+  	#  really phoenix.doc.ic.ac.uk.)
+! 	hostname=sunsite.doc.ic.ac.uk
   	# Keep all local_dirs relative to here
 ! 	local_dir=/public/
 ! 	remote_password=ukuug-soft@doc.ic.ac.uk
@@ -16,20 +16,27 @@
 ! 	# By defaults files are owned by root.zero
 ! 	user=0
 ! 	group=0
-! #	# Keep a log file in each updated directory
-! #	update_log=.mirror
+  #	# Keep a log file in each updated directory
+  #	update_log=.mirror
 ! 	update_log=
   	# Don't overwrite my mirror log with the remote one.
   	# Don't pull back any of their mirror temporary files.
-  	# Don't touch anything whose name begins with a space!
---- 11,30 ----
+  	# nor any FSP or gopher files...
+  	exclude_patt=(^|/)(\.mirror$|core$|\.cap|\.in\..*\.$|MIRROR\.LOG|#.*#|\.FSP|\.cache|\.zipped|\.notar|\.message|lost\+found/|Network Trash Folder)
+  	# Try to compress everything
+  	compress_patt=.
+! 	compress_prog=compress
+  	# Don't compress information files, files that don't benifit from
+  	# being compressed, files that tell ftpd, gopher, wais... to do things,
+  	# the sources for compression programs...
+--- 11,37 ----
   	# The LOCAL hostname - if not the same as `hostname`
-  	# (I advertise the name src.doc.ic.ac.uk but the machine is
-  	#  really puffin.doc.ic.ac.uk.)
-! 	# hostname=src.doc.ic.ac.uk
+  	# (I advertise the name sunsite.doc.ic.ac.uk but the machine is
+  	#  really phoenix.doc.ic.ac.uk.)
+! 	# hostname=sunsite.doc.ic.ac.uk
   	# Keep all local_dirs relative to here
 ! 	local_dir=/home/ftp/pub
-! 	# remote_password=mirror@$hostname
+! 	# remote_password=ukuug-soft@doc.ic.ac.uk
   	mail_to=
   	# Don't mirror file modes.  Set all dirs/files to these
   	dir_mode=0755
@@ -37,23 +44,13 @@
 ! 	# By defaults files are owned by root.wheel
 ! 	# user=0
 ! 	# group=0
-! 	# Keep a log file in each updated directory
-! 	update_log=.mirror
+  #	# Keep a log file in each updated directory
+  #	update_log=.mirror
 ! 	# update_log=
   	# Don't overwrite my mirror log with the remote one.
   	# Don't pull back any of their mirror temporary files.
-  	# Don't touch anything whose name begins with a space!
-***************
-*** 32,38 ****
-  	exclude_patt=(^|/)(\.mirror$|core$|\.cap|\.in\..*\.$|MIRROR.LOG|#.*#|\.FSP|\.cache|\.zipped|\.notar|\.message|lost+found/|\ )
-  	# Try to compress everything
-  	compress_patt=.
-! 	compress_prog=compress
-  	# Don't compress information files, files that don't benifit from
-  	# being compressed, files that tell ftpd, gopher, wais... to do things,
-  	# the sources for compression programs...
---- 32,38 ----
-  	exclude_patt=(^|/)(\.mirror$|core$|\.cap|\.in\..*\.$|MIRROR.LOG|#.*#|\.FSP|\.cache|\.zipped|\.notar|\.message|lost+found/|\ )
+  	# nor any FSP or gopher files...
+  	exclude_patt=(^|/)(\.mirror$|core$|\.cap|\.in\..*\.$|MIRROR\.LOG|#.*#|\.FSP|\.cache|\.zipped|\.notar|\.message|lost\+found/|Network Trash Folder)
   	# Try to compress everything
   	compress_patt=.
 ! 	compress_prog=gzip
@@ -61,27 +58,19 @@
   	# being compressed, files that tell ftpd, gopher, wais... to do things,
   	# the sources for compression programs...
 ***************
-*** 45,55 ****
+*** 44,50 ****
   	# shk is multimedia? used on apple2s.
   	compress_excl+|-z(\d+)?$|\.tgz|_tgz|\.tar\.Z|\.tar\.gz|\.taz$|\.arc$|\.zip$|\.lzh$|\.zoo$|\.exe$|\.lha$|\.zom$|\.gif$|\.jpeg$|\.jpg$|\.mpeg$|\.au$|\.shk$|read.*me|index|info|faq|gzip|compress|(^|/)\.\.?$
   	# Don't delete own mirror log, .notar or .cache files (incl in subdirs)
 ! #	delete_excl=(^|/)\.(mirror|notar|cache)$
   	# Ignore any local readme and .mirror files
-! 	local_ignore=README.doc.ic|(^|/)\.(mirror|notar)$
+  	local_ignore=README.doc.ic|(^|/)\.(mirror|notar)$
   	# Automatically delete local copies of files that the
-  	# remote site has zapped
-  	do_deletes=true
-! 	max_delete_files=50%
-! 	max_delete_dirs=50%
---- 45,55 ----
+--- 44,50 ----
   	# shk is multimedia? used on apple2s.
   	compress_excl+|-z(\d+)?$|\.tgz|_tgz|\.tar\.Z|\.tar\.gz|\.taz$|\.arc$|\.zip$|\.lzh$|\.zoo$|\.exe$|\.lha$|\.zom$|\.gif$|\.jpeg$|\.jpg$|\.mpeg$|\.au$|\.shk$|read.*me|index|info|faq|gzip|compress|(^|/)\.\.?$
   	# Don't delete own mirror log, .notar or .cache files (incl in subdirs)
 ! 	delete_excl=(^|/)\.(mirror|notar|cache)$
   	# Ignore any local readme and .mirror files
-! 	local_ignore=README.local|(^|/)\.(mirror|notar)$
+  	local_ignore=README.doc.ic|(^|/)\.(mirror|notar)$
   	# Automatically delete local copies of files that the
-  	# remote site has zapped
-  	do_deletes=true
-! 	max_delete_files=10%
-! 	max_delete_dirs=10%
diff --git a/ftp/mirror/files/patch-ac b/ftp/mirror/files/patch-ac
index 254a5a6afefe..491ce4d23acc 100644
--- a/ftp/mirror/files/patch-ac
+++ b/ftp/mirror/files/patch-ac
@@ -1,24 +1,24 @@
-*** mirror.pl.orig	Thu Jun 15 19:15:46 1995
---- mirror.pl	Thu Jun 15 19:15:26 1995
+*** mirror.pl.orig	Sat Mar 16 15:46:09 1996
+--- mirror.pl	Sat Mar 16 15:51:49 1996
 ***************
-*** 42,48 ****
+*** 75,81 ****
   
   # Try to find the default localation of various programs via
   # the users PATH then using $extra_path
-! $extra_path = '/usr/local/bin:/usr/new/bin:/usr/public/bin:/usr/ucb:/usr/bin:/bin:/etc:/usr/etc:/usr/local/etc:';
+! $extra_path = '/usr/local/bin:/usr/new/bin:/usr/public/bin:/usr/ucb:/usr/bin:/bin:/etc:/usr/etc:/usr/local/etc';
   $ENV{ 'PATH' } .= ':' . $extra_path;
   
-  # If compressing a local file to send need somewhere to store the temp
---- 42,48 ----
+  &trap_signals();
+--- 75,81 ----
   
   # Try to find the default localation of various programs via
   # the users PATH then using $extra_path
-! $extra_path = '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:';
+! $extra_path = '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin';
   $ENV{ 'PATH' } .= ':' . $extra_path;
   
-  # If compressing a local file to send need somewhere to store the temp
+  &trap_signals();
 ***************
-*** 90,108 ****
+*** 128,146 ****
   $rm_prog = &find_prog( 'rm' );
   
   # Generate checksums
@@ -38,7 +38,7 @@
   unshift( @INC, $dir );
   
   # Make sure that your PERLLIB environment variable can get you
---- 90,109 ----
+--- 128,147 ----
   $rm_prog = &find_prog( 'rm' );
   
   # Generate checksums
@@ -54,35 +54,8 @@
   $prod_interval = 60;
   
   # Put the directory that mirror is actually in at the start of PERLLIB.
-! #$dir = &real_dir_from_path( $0 );
-! $dir = "!!PREFIX!!/lib/mirror";
+! # $dir = &real_dir_from_path( $0 );
+! $dir = "!!PREFIX!!"/lib/mirror";
   unshift( @INC, $dir );
   
   # Make sure that your PERLLIB environment variable can get you
-***************
-*** 156,161 ****
---- 157,163 ----
-  $default{ 'local_dir' } = '';	# local directory to copy into
-  $default{ 'remote_user' } = 'anonymous';  # the remote guest account name
-  $default{ 'remote_password' } = "$me@$hostname";
-+ $default{ 'remote_acct' } = '';
-  $default{ 'get_patt' } = ".";	# regex of pathnames to retrieve
-  $default{ 'exclude_patt' } = ''; # regex of pathnames to ignore
-  $default{ 'update_local' } = 0;	# Don't just update local dirs
-***************
-*** 1022,1028 ****
-  	if( $con == 1 ){
-  		&msg( "login as $remote_user\n" ) if $debug > 1;
-  		$curr_remote_user = $remote_user;
-! 		if( ! &ftp'login( $remote_user, $remote_password ) ){
-  			&msg( "Cannot login, skipping package\n" );
-  			&disconnect();
-  			&msg( "\n" );
---- 1024,1030 ----
-  	if( $con == 1 ){
-  		&msg( "login as $remote_user\n" ) if $debug > 1;
-  		$curr_remote_user = $remote_user;
-! 		if( ! &ftp'login( $remote_user, $remote_password, $remote_acct ) ){
-  			&msg( "Cannot login, skipping package\n" );
-  			&disconnect();
-  			&msg( "\n" );
diff --git a/ftp/mirror/pkg-plist b/ftp/mirror/pkg-plist
index 755b0a76ddfe..ae9c9ae590bf 100644
--- a/ftp/mirror/pkg-plist
+++ b/ftp/mirror/pkg-plist
@@ -1,9 +1,11 @@
 bin/mirror
+bin/do_unlinks
+bin/pkgs_to_mmin
 bin/mirrormaster
+lib/mirror/lchat.pl
+lib/mirror/dateconv.pl
 lib/mirror/ftp.pl
 lib/mirror/lsparse.pl
-lib/mirror/dateconv.pl
 lib/mirror/mirror.defaults.sample
-lib/mirror/do_unlinks
-man/man1/mirror.1.gz
-man/man1/mirrormaster.1.gz
+man/man1/mirror.1
+man/man1/mirrormaster.1