Upgrade to 2.9. Parsing of "ls" output should be improved,

although it didn't help me...

9 files changed, 117 insertions, 113 deletions

diff --git a/net/mirror/Makefile b/net/mirror/Makefile
index e4f46ad22c8..fe8ea2a60f3 100644
--- a/net/mirror/Makefile
+++ b/net/mirror/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 1999/12/28 18:15:43 itojun Exp $
+# $NetBSD: Makefile,v 1.9 2000/03/26 22:33:17 kim Exp $
 # FreeBSD Id: Makefile,v 1.6 1996/12/01 01:22:54 obrien Exp 
 #
 
-DISTNAME=	mirror-2.8
+DISTNAME=	mirror-2.9
 CATEGORIES=	net
 MASTER_SITES=	ftp://src.doc.ic.ac.uk/computing/archiving/mirror/
 
@@ -13,10 +13,8 @@ USE_PERL5=	yes
 NO_WRKSUBDIR=	yes
 MAKEFILE=	makefile
 
-post-patch:
-	${MV} ${WRKDIR}/mm ${WRKDIR}/mm-
-	${SED} -e "s#exec \./mirror#exec ${PREFIX}/bin/mirror#" \
-		< ${WRKDIR}/mm- > ${WRKDIR}/mm
+# If you are tempted to add a target that runs ${SED} (or other stuff)
+# on the files, please look at scripts/configure first.
 
 pre-install:
 	${MKDIR} ${PREFIX}/lib/mirror
diff --git a/net/mirror/files/md5 b/net/mirror/files/md5
index 376d7826f95..d5dcb2a6668 100644
--- a/net/mirror/files/md5
+++ b/net/mirror/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:25:10 agc Exp $
+$NetBSD: md5,v 1.3 2000/03/26 22:33:18 kim Exp $
 
-MD5 (mirror-2.8.tar.gz) = a0a3ffec4b8e0fd71034cab8a0b1b010
+MD5 (mirror-2.9.tar.gz) = 55178a53c7b4253c9a396a38c5a9cb94
diff --git a/net/mirror/files/patch-sum b/net/mirror/files/patch-sum
index ce56367f9ce..26957da3cf2 100644
--- a/net/mirror/files/patch-sum
+++ b/net/mirror/files/patch-sum
@@ -1,7 +1,8 @@
-$NetBSD: patch-sum,v 1.2 1999/12/28 18:15:43 itojun Exp $
+$NetBSD: patch-sum,v 1.3 2000/03/26 22:33:18 kim Exp $
 
-MD5 (patch-aa) = 34d6e30142c6f3e1e3e79f90298961be
-MD5 (patch-ab) = 35196337dca0d5761d4e96503dce3671
-MD5 (patch-ac) = 23632c3bcd65f5e0a71ccda0a636ed2e
+MD5 (patch-aa) = 586c7aeaa06dab9dfebc7e6e2f8528f3
+MD5 (patch-ab) = b7ed2b99a3e7cfa0f1f0c02664e4f70a
+MD5 (patch-ac) = 54872e85faa939e28bc6b050d39c44f7
 MD5 (patch-ad) = 02f9cc76255af7ba20ea4c379426ca78
-MD5 (patch-ae) = aa4aa1a7d91c014653f241d6dd0bcd23
+MD5 (patch-ae) = af6231899d4e90bb0cdad11cecfa1476
+MD5 (patch-af) = 6c00954622125e920728fea8177b76d4
diff --git a/net/mirror/patches/patch-aa b/net/mirror/patches/patch-aa
index e3db65397da..dfaed19383d 100644
--- a/net/mirror/patches/patch-aa
+++ b/net/mirror/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 11:10:44 agc Exp $
+$NetBSD: patch-aa,v 1.4 2000/03/26 22:33:18 kim Exp $
 
---- makefile.orig	Thu Jun  1 21:26:26 1995
-+++ makefile	Tue Oct 28 01:42:42 1997
-@@ -6,7 +6,7 @@
- 	support/cyber-patches support/lstest.pl new-patches-by
+--- makefile.orig	Mon Jun  1 14:28:47 1998
++++ makefile	Sat Mar 25 02:45:05 2000
+@@ -41,7 +41,7 @@
+ 	$(WEBFILES)
  
  all:
 -	echo try make mirror.tar
 +#	echo try make mirror.tar
  
  mirror.tar: $(FILES)
- 	rev=`./mirror -v | perl -ane 'print "$$F[2]\n";'`; echo $rev; \
-@@ -25,26 +25,27 @@
+ 	rev=`./mirror.pl -v | perl -ane 'print "$$F[2]\n";'`; echo $rev; \
+@@ -65,25 +65,26 @@
  # mode to install executables
  EXMODE = 755
  # group to own all the files
@@ -29,25 +29,23 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 11:10:44 agc Exp $
  
  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 $(EXMODE) -g $(GRP) mirror.pl $(BINDIR)/mirror
+-	install -m $(EXMODE) -g $(GRP) do_unlinks.pl $(BINDIR)/do_unlinks
+-	install -m $(EXMODE) -g $(GRP) pkgs_to_mmin.pl $(BINDIR)/pkgs_to_mmin
+-	install -m $(EXMODE) -g $(GRP) mm.pl $(BINDIR)/mirror-master
 -	install -m $(PLMODE) -g $(GRP) mirror.man $(MANDIR)/mirror.1
 -	install -m $(PLMODE) -g $(GRP) mm.man $(MANDIR)/mirror-master.1
 +	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 $(EXMODE) -g $(GRP) do_unlinks.pl $(BINDIR)/do_unlinks
++	install -c -m $(EXMODE) -g $(GRP) pkgs_to_mmin.pl $(BINDIR)/pkgs_to_mmin
++	install -c -m $(EXMODE) -g $(GRP) mm.pl $(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
diff --git a/net/mirror/patches/patch-ab b/net/mirror/patches/patch-ab
index d605dc9b7bd..84bd85cc96f 100644
--- a/net/mirror/patches/patch-ab
+++ b/net/mirror/patches/patch-ab
@@ -1,18 +1,21 @@
-$NetBSD: patch-ab,v 1.5 1998/08/29 18:28:06 kim Exp $
+$NetBSD: patch-ab,v 1.6 2000/03/26 22:33:18 kim Exp $
 
---- mirror.defaults.orig	Fri Jul 28 16:00:31 1995
-+++ mirror.defaults	Sat Aug 29 14:17:57 1998
-@@ -11,27 +11,27 @@
+--- mirror.defaults.orig	Fri May 29 14:57:46 1998
++++ mirror.defaults	Sat Mar 25 02:49:44 2000
+@@ -11,29 +11,29 @@
  	# The LOCAL hostname - if not the same as `hostname`
- 	# (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
-+	# hostname=sunsite.doc.ic.ac.uk
+ 	# (I advertise the name sunsite.org.uk but the machine is
+ 	#  really swallow.sunsite.org.uk.)
+-	hostname=sunsite.org.uk
++	# hostname=sunsite.org.uk
  	# Keep all local_dirs relative to here
 -	local_dir=/public/
--	remote_password=ukuug-soft@doc.ic.ac.uk
-+	# local_dir=/home/ftp/pub
-+	# remote_password=ukuug-soft@doc.ic.ac.uk
++	# local_dir=/home/ftp/pub/
+ 	# The local_dir must exist FIRST
+-	#local_dir_check=true
+-	remote_password=wizards@sunsite.org.uk
++	# local_dir_check=true
++	# remote_password=wizards@sunsite.org.uk
  	mail_to=
  	# Don't mirror file modes.  Set all dirs/files to these
  	dir_mode=0755
@@ -23,26 +26,26 @@ $NetBSD: patch-ab,v 1.5 1998/08/29 18:28:06 kim Exp $
 +	# 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=
 +	# update_log=
  	# Don't overwrite my mirror log with the remote one.
  	# Don't pull back any of their mirror temporary files.
  	# 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=.
+ 	exclude_patt=(^|/)(\.mirror$|\.mirror\.log|core$|\.cap|\.in\..*\.$|MIRROR\.LOG|#.*#|\.FSP|\.cache|\.zipped|\.notar|\.message|lost\+found/|Network Trash Folder)|suky.mpe?g
+ 	# Do not to compress anything
+ 	compress_patt=
 -	compress_prog=compress
 +	compress_prog=gzip
  	# 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...
-@@ -44,9 +44,9 @@
- 	# 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|(^|/)\.\.?$
+@@ -47,9 +47,9 @@
+ 	# rpm and deb are package formats used on RedHat and Debian Linux
+ 	compress_excl+|-z(\d+)?$|\.tgz|_tgz|\.tar\.Z|\.tar\.gz|\.taz$|\.arc$|\.zip$|\.lzh$|\.zoo$|\.exe$|\.lha$|\.zom$|\.gif$|\.jpeg$|\.jpg$|\.mpeg$|\.au$|\.shk$|rpm$|deb$|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)$
+-#       delete_excl=(^|/)\.(mirror|notar|cache)$
 +	delete_excl=(^|/)\.(mirror|notar|cache)$
  	# Ignore any local readme and .mirror files
 -	local_ignore=README.doc.ic|(^|/)\.(mirror|notar)$
diff --git a/net/mirror/patches/patch-ac b/net/mirror/patches/patch-ac
index a5cebcd10b9..cc5a959f610 100644
--- a/net/mirror/patches/patch-ac
+++ b/net/mirror/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.3 1998/08/29 18:05:56 kim Exp $
+$NetBSD: patch-ac,v 1.4 2000/03/26 22:33:18 kim Exp $
 
---- mirror.pl.orig	Mon Sep 18 13:55:25 1995
-+++ mirror.pl	Sat Aug 29 12:06:10 1998
-@@ -75,7 +75,7 @@
- 
- # Try to find the default localation of various programs via
+--- mirror.pl.orig	Mon Jun  8 06:55:27 1998
++++ mirror.pl	Sat Mar 25 02:55:39 2000
+@@ -104,7 +104,7 @@
+ # Try to find the default location 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 = '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:!!PREFIX!!/bin:!!PREFIX!!/sbin';
- $ENV{ 'PATH' } .= ':' . $extra_path;
- 
- &trap_signals();
-@@ -128,19 +128,20 @@
+ if( ! $on_win ){
+-	$extra_path = '/usr/local/bin:/usr/new/bin:/usr/public/bin:/usr/ucb:/usr/bin:/bin:/etc:/usr/etc:/usr/local/etc';
++	$extra_path = '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:!!PREFIX!!/bin:!!PREFIX!!/sbin';
+ }
+ if( $extra_path ne '' ){
+ 	$ENV{ 'PATH' } .= $path_sep . $extra_path;
+@@ -159,19 +159,20 @@
  $rm_prog = &find_prog( 'rm' );
  
  # Generate checksums
@@ -35,17 +35,26 @@ $NetBSD: patch-ac,v 1.3 1998/08/29 18:05:56 kim Exp $
 +$dir = "!!PREFIX!!/lib/mirror";
  unshift( @INC, $dir );
  
- # Make sure that your PERLLIB environment variable can get you
-@@ -1695,7 +1696,7 @@
+ # Debian GNU/Linux stores mirror.defaults in /etc/mirror
+@@ -1807,7 +1808,7 @@
+   			local( $f );
    			$f = $dirtmp;
-   			$dirtmp =~ s/\.($sys_compress_suffix|$gzip_suffix|$old_gzip_suffix)$//;
-   			$udirtmp =~ s/\.($sys_compress_suffix|$gzip_suffix|$old_gzip_suffix)$//;
--			&sys( "$unsquish -d < \"$f\" > \"$dirtmp\"" );
-+			&sys( "$unsquish -f -d < \"$f\" > \"$dirtmp\"" );
-   			unlink( $uf );
+ 			$f =~ s/($shell_metachars)/\\$1/g;
+-			$dirtmp = "$unsquish -d < \"$f\" |";
++			$dirtmp = "$unsquish -f -d < \"$f\" |";
    		}
- 		else {
-@@ -2542,7 +2543,7 @@
+ 		if( ! open( DIRTMP, $dirtmp ) ){
+ 			&msg( "Cannot open $dirtmp\n" );
+@@ -1845,7 +1846,7 @@
+   			$f = $dirtmp;
+   			$dirtmp =~ s/\.($sys_compress_suffix|$gzip_suffix|$old_gzip_suffix)$//;
+   			$udirtmp =~ s/\.($sys_compress_suffix|$gzip_suffix|$ol_gzip_suffix)$//;
+-			if( &sys( "$unsquish -d < \"$f\" > \"$dirtmp\"" ) != 0 ){
++			if( &sys( "$unsquish -f -d < \"$f\" > \"$dirtmp\"" ) != 0 ){
+ 				&msg( "Cannot uncompress directory listing\n" );
+ 				return 0;
+ 			}
+@@ -2760,7 +2761,7 @@
    			local( $f ) = $src_file;
  			$f =~ s/($shell_metachars)/\\$1/g;
    			$comptemp = "$big_temp/.out$$";
@@ -54,9 +63,9 @@ $NetBSD: patch-ac,v 1.3 1998/08/29 18:05:56 kim Exp $
    			$src_file = $comptemp;
  		}
  		
-@@ -2613,10 +2614,10 @@
+@@ -2840,10 +2841,10 @@
    		# Am I doing compress to gzip conversion?
-    		if( $src_path =~ /$compress_conv_patt/ &&
+    		if( $compress_conv_patt && $src_path =~ /$compress_conv_patt/ &&
    		    $compress_suffix eq $gzip_suffix ){
 -			$comp = "$sys_compress_prog -d < \"$f\" | $gzip_prog > \"$temp\"";
 +			$comp = "$sys_compress_prog -f -d < \"$f\" | $gzip_prog > \"$temp\"";
@@ -67,21 +76,3 @@ $NetBSD: patch-ac,v 1.3 1998/08/29 18:05:56 kim Exp $
    		}
    		&sys( $comp );
  		$temp =~ s/\\($shell_metachars)/$1/g;
-@@ -3227,7 +3228,7 @@
- 
- 	&msg( "creating assocs ...\n" ) if $debug > 2;
- 	foreach $map ( @assocs ){
--		eval "\$$map = \"\$big_tmp/$map.$$\"";
-+		eval "\$$map = \"\$big_temp/$map.$$\"";
- 		eval "dbmopen( $map, \$$map, 0644 )";
- 	}
- 	&msg( "creating assocs done\n" ) if $debug > 2;
-@@ -3239,7 +3240,7 @@
- 
- 	&msg( "deleting assocs ...\n" ) if $debug > 2;
- 	foreach $map ( @assocs ){
--		eval "\$$map = \"\$big_tmp/$map.$$\"";
-+		eval "\$$map = \"\$big_temp/$map.$$\"";
- 		eval "dbmclose( $map )";
- 		&unlink_dbm( eval "\$$map" );
- 		eval "\%$map = ()";
diff --git a/net/mirror/patches/patch-ae b/net/mirror/patches/patch-ae
index fdde88e1fec..c0dd8abb3c5 100644
--- a/net/mirror/patches/patch-ae
+++ b/net/mirror/patches/patch-ae
@@ -1,30 +1,30 @@
-$NetBSD: patch-ae,v 1.4 1999/12/28 18:15:43 itojun Exp $
+$NetBSD: patch-ae,v 1.5 2000/03/26 22:33:18 kim Exp $
 
---- ftp.pl.orig	Tue May 23 23:53:25 1995
-+++ ftp.pl	Wed May 12 18:10:21 1999
-@@ -430,7 +430,7 @@
+--- ftp.pl.orig	Fri Jun  5 05:10:27 1998
++++ ftp.pl	Sat Mar 25 03:00:20 2000
+@@ -233,7 +233,7 @@
+ 			}
+ 			else {
+ 				print $showfd "proxy connection failed " if $proxy;
+-				print $showfd "Cannot open ftp to $connect_site\n" if $ftp_show;
++				print $showfd "Cannot open ftp to $newhost:$newport\n" if $ftp_show;
+ 				return 0;
+ 			}
+ 		}
+@@ -486,7 +486,7 @@
  		return 0;
  	}
  	if( $ret == 1 ) {
--		$response =~ m/^227 Entering Passive Mode \((\d+),(\d+),(\d+),(\d+),(\d+),(\d+)\)$/;
-+		$response =~ m/^227 .*\((\d+),(\d+),(\d+),(\d+),(\d+),(\d+)\)/;
- 		$newhost = sprintf( "%d.%d.%d.%d", $1, $2, $3, $4 );
- 		$newport = $5 * 256 + $6;
- 	}
-@@ -443,7 +443,7 @@
- 		}
- 		else {
- 			print $showfd "proxy connection failed " if $proxy;
--			print $showfd "Cannot open ftp to $connect_site\n" if $ftp_show;
-+			print $showfd "Cannot open ftp to $newhost:$newport\n" if $ftp_show;
- 			return 0;
+-		if( $response =~ m/^227 Entering Passive Mode \((\d+),(\d+),(\d+),(\d+),(\d+),(\d+)\)/ ){
++		if($response =~ m/^227 .*\((\d+),(\d+),(\d+),(\d+),(\d+),(\d+)\)/){
+ 			$newhost = sprintf( "%d.%d.%d.%d", $1, $2, $3, $4 );
+ 			$newport = $5 * 256 + $6;
  		}
- 	}
-@@ -700,6 +700,7 @@
- 
+@@ -708,6 +708,7 @@
+ 	if( ! $service_open ){
  		return 0;
  	}
 +	chmod 0600, $loc_fname;
  
- 	local( $start_time ) = time;
- 	local( $bytes, $lasthash, $hashes ) = (0, 0, 0);
+ 	if( $loc_fname eq "" ){
+ 		$loc_fname = $rem_fname;
diff --git a/net/mirror/patches/patch-af b/net/mirror/patches/patch-af
new file mode 100644
index 00000000000..562f282abf8
--- /dev/null
+++ b/net/mirror/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2000/03/26 22:33:18 kim Exp $
+
+--- mm.pl.orig	Fri May 29 15:09:54 1998
++++ mm.pl	Sat Mar 25 03:09:36 2000
+@@ -63,7 +63,7 @@
+ # $pkg is the package number fixed up to replace characters likely to give
+ # grief under unix.
+ # This expects the directory logs to already exist.
+-$mirror = "exec ./mirror \$args -p'\$package' packages/\$site > logs/\$site:\$pkg 2>&1";
++$mirror = "exec !!PREFIX!!/bin/mirror \$args -p'\$package' packages/\$site > logs/\$site:\$pkg 2>&1";
+ 
+ $status_file = 'mm.status';
+ 
diff --git a/net/mirror/scripts/configure b/net/mirror/scripts/configure
index 3a2a1efb99e..534d7cea982 100644
--- a/net/mirror/scripts/configure
+++ b/net/mirror/scripts/configure
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-# $NetBSD: configure,v 1.3 1998/08/29 18:05:57 kim Exp $
+# $NetBSD: configure,v 1.4 2000/03/26 22:33:18 kim Exp $
 #
 # Id: configure,v 1.1.1.1 1997/10/27 05:01:31 hubertf Exp
 #
 cd ${WRKSRC}
-for i in do_unlinks mirror.pl mm pkgs_to_mmin
+for i in do_unlinks.pl mirror.pl mm.pl pkgs_to_mmin.pl
 do
     sed \
 	-e s:!!PREFIX!!:$PREFIX:g \