aboutsummaryrefslogtreecommitdiff
path: root/ftp/mirror
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2004-06-01 14:28:36 +0000
committerPav Lucistnik <pav@FreeBSD.org>2004-06-01 14:28:36 +0000
commit8d4a2cae030f41039b569c39311ff76d87275249 (patch)
treedd78d08a76eba89168b6e9aad345afd85c1cc9ed /ftp/mirror
parentf00794b9ea068f5504a39291d0f1eaa4b8bd525d (diff)
downloadports-8d4a2cae030f41039b569c39311ff76d87275249.tar.gz
ports-8d4a2cae030f41039b569c39311ff76d87275249.zip
Notes
Diffstat (limited to 'ftp/mirror')
-rw-r--r--ftp/mirror/Makefile1
-rw-r--r--ftp/mirror/files/patch-ac111
2 files changed, 51 insertions, 61 deletions
diff --git a/ftp/mirror/Makefile b/ftp/mirror/Makefile
index ecc689c81ffa..cb2d01f06255 100644
--- a/ftp/mirror/Makefile
+++ b/ftp/mirror/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mirror
PORTVERSION= 2.9
+PORTREVISION= 1
CATEGORIES= ftp
MASTER_SITES= ftp://sunsite.org.uk/packages/mirror/ \
diff --git a/ftp/mirror/files/patch-ac b/ftp/mirror/files/patch-ac
index edf9de92a9d9..d80d6656e9cc 100644
--- a/ftp/mirror/files/patch-ac
+++ b/ftp/mirror/files/patch-ac
@@ -1,61 +1,50 @@
-*** mirror.pl.orig Mon Jun 8 12:55:27 1998
---- mirror.pl Fri Sep 10 10:41:25 1999
-***************
-*** 104,110 ****
- # Try to find the default location of various programs via
- # the users PATH then using $extra_path
- 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';
- }
- if( $extra_path ne '' ){
- $ENV{ 'PATH' } .= $path_sep . $extra_path;
---- 104,110 ----
- # Try to find the default location of various programs via
- # the users PATH then using $extra_path
- if( ! $on_win ){
-! $extra_path = '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin';
- }
- if( $extra_path ne '' ){
- $ENV{ 'PATH' } .= $path_sep . $extra_path;
-***************
-*** 159,177 ****
- $rm_prog = &find_prog( 'rm' );
-
- # Generate checksums
-! $sum_prog = &find_prog( 'sum' );
-
- # SPECIAL NOTE: This is eval'd, so DONT put double-quotes (") in it.
- # You can get local variables to appear as in the second example:
-! $mail_subject = '-s \'mirror update\'';
-! # $mail_subject = ' -s \'mirror update of $package\'';
-
- # When scanning the local directory, how often to prod the remote
- # system to keep the connection alive
- $prod_interval = 60;
-
- # Put the directory that mirror is actually in at the start of PERLLIB.
-! $dir = &real_dir_from_path( $0 );
- unshift( @INC, $dir );
-
- # Debian GNU/Linux stores mirror.defaults in /etc/mirror
---- 159,178 ----
- $rm_prog = &find_prog( 'rm' );
-
- # Generate checksums
-! $sum_prog = &find_prog( 'md5' );
-
- # SPECIAL NOTE: This is eval'd, so DONT put double-quotes (") in it.
- # You can get local variables to appear as in the second example:
-! # $mail_subject = '-s \'mirror update\'';
-! $mail_subject = ' -s \'mirror update of $package\'';
-
- # When scanning the local directory, how often to prod the remote
- # system to keep the connection alive
- $prod_interval = 60;
-
- # Put the directory that mirror is actually in at the start of PERLLIB.
-! # $dir = &real_dir_from_path( $0 );
-! $dir = "/usr/local/lib/mirror";
- unshift( @INC, $dir );
-
- # Debian GNU/Linux stores mirror.defaults in /etc/mirror
+--- mirror.pl.orig Mon Jun 8 12:55:27 1998
++++ mirror.pl Tue Jun 1 16:24:17 2004
+@@ -104,7 +104,7 @@
+ # Try to find the default location of various programs via
+ # the users PATH then using $extra_path
+ 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';
+ }
+ if( $extra_path ne '' ){
+ $ENV{ 'PATH' } .= $path_sep . $extra_path;
+@@ -159,19 +159,20 @@
+ $rm_prog = &find_prog( 'rm' );
+
+ # Generate checksums
+-$sum_prog = &find_prog( 'sum' );
++$sum_prog = &find_prog( 'md5' );
+
+ # SPECIAL NOTE: This is eval'd, so DONT put double-quotes (") in it.
+ # You can get local variables to appear as in the second example:
+-$mail_subject = '-s \'mirror update\'';
+-# $mail_subject = ' -s \'mirror update of $package\'';
++# $mail_subject = '-s \'mirror update\'';
++$mail_subject = ' -s \'mirror update of $package\'';
+
+ # When scanning the local directory, how often to prod the remote
+ # system to keep the connection alive
+ $prod_interval = 60;
+
+ # Put the directory that mirror is actually in at the start of PERLLIB.
+-$dir = &real_dir_from_path( $0 );
++# $dir = &real_dir_from_path( $0 );
++$dir = "/usr/local/lib/mirror";
+ unshift( @INC, $dir );
+
+ # Debian GNU/Linux stores mirror.defaults in /etc/mirror
+@@ -1322,8 +1323,11 @@
+
+ # Create a get_patt from the contents of the local directory
+ if( $update_local && $#get_top >= 0 ){
+- $get_patt = '^' . join( '|^', @get_top );
+- $get_patt =~ s/$squished//g;
++ my ($path,$re,@re_patt);
++ #$get_patt = '^' . join( '|^', @get_top );
++ #$get_patt =~ s/$squished//g;
++ foreach $path ( @get_top ) { push @re_patt, "\^\Q$path\E\$"; }
++ $get_patt= join( '|', @re_patt );
+ &msg( "get_patt = $get_patt\n" ) if $debug;
+ }
+