diff options
| author | steve <steve@FreeBSD.org> | 1998-01-26 00:33:39 +0800 |
|---|---|---|
| committer | steve <steve@FreeBSD.org> | 1998-01-26 00:33:39 +0800 |
| commit | e1002144b8f03f1df1e9a2ccc5147483168e58c6 (patch) | |
| tree | b3b224834d3533123694d269b6909b553c16e332 /www/p5-Apache/files | |
| parent | 7dac00a4c240c145ba81a19948fa284345c52d78 (diff) | |
| download | freebsd-ports-graphics-e1002144b8f03f1df1e9a2ccc5147483168e58c6.tar.gz freebsd-ports-graphics-e1002144b8f03f1df1e9a2ccc5147483168e58c6.tar.zst freebsd-ports-graphics-e1002144b8f03f1df1e9a2ccc5147483168e58c6.zip | |
Update to version 1.07.
PR: 5554
Submitted by: Carl Fongheiser <cmf@netins.net>
Diffstat (limited to 'www/p5-Apache/files')
| -rw-r--r-- | www/p5-Apache/files/patch-aa | 86 |
1 files changed, 38 insertions, 48 deletions
diff --git a/www/p5-Apache/files/patch-aa b/www/p5-Apache/files/patch-aa index b20285e12dd..be5daab7feb 100644 --- a/www/p5-Apache/files/patch-aa +++ b/www/p5-Apache/files/patch-aa @@ -1,57 +1,47 @@ ---- Makefile.PL.orig Fri May 2 14:24:41 1997 -+++ Makefile.PL Sun May 4 20:31:33 1997 -@@ -18,14 +18,10 @@ - # Check if knwon config - # +--- Makefile.PL.orig Tue Dec 30 11:03:22 1997 ++++ Makefile.PL Tue Dec 30 11:08:37 1997 +@@ -32,15 +32,10 @@ + gen_script("t/net/perl/cgi.pl"); + gen_script("t/report"); +-unless ($Is_Win32) { +- readline_setup(); +-} +- -eval 'use Apache::MyConfig' ; - --if ($@ eq '') { -- $APACHE_SRC_DEFAULT = $Apache::MyConfig::Setup{Apache_Src} ; --} --else { -- $APACHE_SRC_DEFAULT = '../apache_x.x/src' ; --} +-$APACHE_SRC_DEFAULT = $@ ? +- '../apache_x.x/src' : +- $Apache::MyConfig::Setup{Apache_Src} ; +opendir( WRKDIR, "$ENV{PORTSDIR}/www/apache/work" ) || die( "Can't open $ENV{PORTSDIR}/www/apache/work: $!\n" ); +( $srcdir ) = grep( /^apache/, readdir( WRKDIR ) ); +closedir( WRKDIR ); +$APACHE_SRC_DEFAULT = "$ENV{PORTSDIR}/www/apache/work/" . $srcdir . "/src"; my $PWD = cwd; - -@@ -132,7 +128,7 @@ - print "Enter `q' to stop search\n"; - while(1) { - print "Please tell me where I can find your apache src\n" ; -- $src_dir = _prompt "", $APACHE_SRC_DEFAULT; -+ $src_dir = $APACHE_SRC_DEFAULT; - last if $src_dir eq "q"; - if(-d $src_dir) { - push(@adirs, $src_dir); -@@ -150,6 +146,7 @@ - $httpd_h = "$adir/httpd.h"; - - if (-e $httpd_h) { -+ $APACHE_SRC = $APACHE_SRC_DEFAULT; - unless($APACHE_SRC) { - $ans = _prompt "Configure mod_perl with $adir ?", "y"; - next unless $ans =~ /^y$/i; -@@ -158,7 +155,8 @@ - $IsBenSSL = -e "$adir/apache_ssl.c"; - last unless(-e $conf || -e "$conf.tmpl"); #building from 'make offsite-tar' - unless ($NO_HTTPD) { -- $ans = _prompt "Shall I build httpd in $adir for you?", "y"; -+ #$ans = _prompt "Shall I build httpd in $adir for you?", "y"; -+ $ans = "y"; - ++$NO_HTTPD unless $ans =~ /^y$/i; - } - last if $NO_HTTPD; -@@ -199,7 +197,7 @@ - system $^X, "-pi", "-e", - q{next unless /EXTRA_CFLAGS\s*=/;}. - q{next if /mod_perl/; chomp; }. -- qq{\$_ .= q: -DSERVER_SUBVERSION=\\"mod_perl/$VERSION\\"\n:;}, -+ qq{\$_ .= q: \n-DSERVER_SUBVERSION=\\"mod_perl/$VERSION\\" \\\n:;}, - $conf; - } - + my %SSL = ( +@@ -109,11 +104,11 @@ + $EVERYTHING = 0; + $PERL_STATIC_EXTS = ""; + $Port = $PORT = 8529; +-$DO_HTTPD = $ENV{DO_HTTPD} || 0; ++$DO_HTTPD = 1; + $NO_HTTPD = $ENV{NO_HTTPD} || 0; + $PERL_TRACE = 0; + $ALL_HOOKS = 0; +-$APACHE_SRC = ""; ++$APACHE_SRC = $APACHE_SRC_DEFAULT; + $PERL_SECTIONS = 0; + $PERL_SSI = 0; + $ADD_VERSION = 1; +@@ -912,8 +907,8 @@ + my $sro = 1 if $mmn >= 19970825; + my $inc; + my $ccopts = ccopts(); +- my $dssv = "-DSERVER_SUBVERSION"; +- my $ssv = qq{$dssv=\\"mod_perl/$VERSION\\" }; ++ my $dssv = "\n-DSERVER_SUBVERSION"; ++ my $ssv = qq{$dssv=\\"mod_perl/$VERSION\\" \\}; + $inc = " $ccopts -I. -I../.. -DUSE_PERL_SSI" if $PERL_SSI; + # $inc = qq{$dssv=\\"mod_perl/$VERSION\\" } if $ADD_VERSION; + # $inc .= " $ccopts -I. -I../.. -DUSE_PERL_SSI" if $PERL_SSI; |