we do run out of the box

3 files changed, 105 insertions, 154 deletions

diff --git a/net/mirror/patches/patch-aa b/net/mirror/patches/patch-aa
index da43444ff3d..65e7ed86240 100644
--- a/net/mirror/patches/patch-aa
+++ b/net/mirror/patches/patch-aa
@@ -1,75 +1,54 @@
-*** 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
-  
-  all:
-! 	echo try make mirror.tar
-  
-  mirror.tar: $(FILES)
-  	rev=`./mirror -v | perl -ane 'print "$$F[2]\n";'`; echo $rev; \
---- 6,12 ----
-  	support/cyber-patches support/lstest.pl new-patches-by
-  
-  all:
-! #	echo try make mirror.tar
-  
-  mirror.tar: $(FILES)
-  	rev=`./mirror -v | perl -ane 'print "$$F[2]\n";'`; echo $rev; \
-***************
-*** 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
+--- 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
+ 
+ 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 @@
+ # mode to install executables
+ EXMODE = 755
+ # group to own all the files
+-GRP = gnu
++GRP = bin
+ # directory to install .pl (perl library) files
+-PLDIR = /usr/local/perl5/lib/perl5
++PLDIR = ${PREFIX}/lib/mirror
+ # directory to install public executables
+-BINDIR = /usr/local/sbin
++BINDIR = ${PREFIX}/bin
+ # directory to install man pages
+-MANDIR = /usr/local/man/man1
++MANDIR = ${PREFIX}/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
++	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
+ 
+ # directory to install .pl (perl library) files for rperl
+ RPLDIR = /usr/local/rperl5/lib/perl5
diff --git a/net/mirror/patches/patch-ab b/net/mirror/patches/patch-ab
index 5eece767c7a..366fd19c07e 100644
--- a/net/mirror/patches/patch-ab
+++ b/net/mirror/patches/patch-ab
@@ -1,76 +1,47 @@
-*** mirror.defaults.orig	Sat Mar 16 15:42:36 1996
---- mirror.defaults	Sat Mar 16 15:45:41 1996
-***************
-*** 11,37 ****
-  	# 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
-  	# Keep all local_dirs relative to here
-! 	local_dir=/public/
-! 	remote_password=ukuug-soft@doc.ic.ac.uk
-  	mail_to=
-  	# Don't mirror file modes.  Set all dirs/files to these
-  	dir_mode=0755
-  	file_mode=0444
-! 	# By defaults files are owned by root.zero
-! 	user=0
-! 	group=0
-  #	# 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.
-  	# 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 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=ukuug-soft@doc.ic.ac.uk
-  	mail_to=
-  	# Don't mirror file modes.  Set all dirs/files to these
-  	dir_mode=0755
-  	file_mode=0444
-! 	# By defaults files are owned by root.wheel
-! 	# user=0
-! 	# group=0
-  #	# 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.
-  	# 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
-  	# 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,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)$
-  	# Automatically delete local copies of files that the
---- 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)$
-  	# Automatically delete local copies of files that the
+--- mirror.defaults.orig	Fri Jul 28 22:00:31 1995
++++ mirror.defaults	Tue Oct 28 01:40:02 1997
+@@ -11,27 +11,27 @@
+ 	# 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
+ 	# 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
+ 	mail_to=
+ 	# Don't mirror file modes.  Set all dirs/files to these
+ 	dir_mode=0755
+ 	file_mode=0444
+-	# By defaults files are owned by root.zero
+-	user=0
+-	group=0
++	# By defaults files are owned by root.wheel
++	# user=0
++	# group=0
+ #	# 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=.
+-	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,7 +44,7 @@
+ 	# 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)$
++	delete_excl=(^|/)\.(mirror|notar|cache)$
+ 	# Ignore any local readme and .mirror files
+ 	local_ignore=README.doc.ic|(^|/)\.(mirror|notar)$
+ 	# Automatically delete local copies of files that the
diff --git a/net/mirror/pkg/PLIST b/net/mirror/pkg/PLIST
index 3673f7ebedf..389d6bc517b 100644
--- a/net/mirror/pkg/PLIST
+++ b/net/mirror/pkg/PLIST
@@ -2,10 +2,11 @@ bin/mirror
 bin/do_unlinks
 bin/pkgs_to_mmin
 bin/mirrormaster
+man/man1/mirror.1.gz
+man/man1/mirrormaster.1.gz
 lib/mirror/lchat.pl
 lib/mirror/dateconv.pl
 lib/mirror/ftp.pl
 lib/mirror/lsparse.pl
-lib/mirror/mirror.defaults.sample
-man/man1/mirror.1.gz
-man/man1/mirrormaster.1.gz
+lib/mirror/mirror.defaults
+@dirrm lib/mirror