diff options
author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2001-12-30 22:12:02 +0000 |
---|---|---|
committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2001-12-30 22:12:02 +0000 |
commit | 22f826c536a3dc7c122f5554c8bbd003015ac80a (patch) | |
tree | 94dd03a808f008e6e4a5f2edd19cb0e9eab5ee93 /www/apache13-fp | |
parent | o Fix deinstall problem: do not use variables before defining them (diff) |
Remove files no longer necessary after Makefile rev 1.29
PR: 33319
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=52427
Diffstat (limited to 'www/apache13-fp')
-rw-r--r-- | www/apache13-fp/files/change_server.alpha | 11 | ||||
-rw-r--r-- | www/apache13-fp/files/change_server.bsdi | 11 | ||||
-rw-r--r-- | www/apache13-fp/files/fp_install.alpha | 10 | ||||
-rw-r--r-- | www/apache13-fp/files/fp_install.bsdi | 11 | ||||
-rw-r--r-- | www/apache13-fp/files/patch-fa | 52 | ||||
-rw-r--r-- | www/apache13-fp/files/patch-fb | 293 | ||||
-rw-r--r-- | www/apache13-fp/files/patch-fk | 15 | ||||
-rw-r--r-- | www/apache13-fp/files/patch-fn | 15 | ||||
-rw-r--r-- | www/apache13-fp/pkg-message.bsdi | 4 | ||||
-rw-r--r-- | www/apache13-fp/pkg-message.freebsd | 4 |
10 files changed, 0 insertions, 426 deletions
diff --git a/www/apache13-fp/files/change_server.alpha b/www/apache13-fp/files/change_server.alpha deleted file mode 100644 index e8ba077216d1..000000000000 --- a/www/apache13-fp/files/change_server.alpha +++ /dev/null @@ -1,11 +0,0 @@ ---- frontpage/version4.0/change_server.sh.orig Wed Mar 7 22:12:02 2001 -+++ frontpage/version4.0/change_server.sh Wed Mar 7 22:13:11 2001 -@@ -62,7 +62,7 @@ - SunOS*5.*i386*) machine="solarisx86" ;; - BSD/OS*) machine="bsdi" ;; - SCO_SV*) machine="sco5" ;; -- FreeBSD*) machine="freebsd" ;; -+ FreeBSD*) machine="alpha" ;; - UnixWare\ *\ *\ 7*\ i*) machine="uware7" ;; - *) echo "ERROR: Unsupported platform! Uname is $system." - return 1 diff --git a/www/apache13-fp/files/change_server.bsdi b/www/apache13-fp/files/change_server.bsdi deleted file mode 100644 index fb8c549a8130..000000000000 --- a/www/apache13-fp/files/change_server.bsdi +++ /dev/null @@ -1,11 +0,0 @@ ---- frontpage/version4.0/change_server.sh.bsdi Wed Mar 7 22:12:02 2001 -+++ frontpage/version4.0/change_server.sh Wed Mar 7 22:10:59 2001 -@@ -62,7 +62,7 @@ - SunOS*5.*i386*) machine="solarisx86" ;; - BSD/OS*) machine="bsdi" ;; - SCO_SV*) machine="sco5" ;; -- FreeBSD*) machine="freebsd" ;; -+ FreeBSD*) machine="bsdi" ;; - UnixWare\ *\ *\ 7*\ i*) machine="uware7" ;; - *) echo "ERROR: Unsupported platform! Uname is $system." - return 1 diff --git a/www/apache13-fp/files/fp_install.alpha b/www/apache13-fp/files/fp_install.alpha deleted file mode 100644 index 670c9ebae4ef..000000000000 --- a/www/apache13-fp/files/fp_install.alpha +++ /dev/null @@ -1,10 +0,0 @@ ---- frontpage/version4.0/fp_install.sh.orig Mon Aug 14 12:31:46 2000 -+++ frontpage/version4.0/fp_install.sh Tue Apr 17 19:54:23 2001 -@@ -70,6 +70,7 @@ - SunOS*5.*i386*) machine="solarisx86" ;; - BSD/OS*) machine="bsdi" ;; - SCO_SV*) machine="sco5" ;; -+ FreeBSD*) machine="alpha" ;; - UnixWare\ *\ *\ 7*\ i*) machine="uware7" ;; - *) echo "ERROR: Unsupported platform! Uname is $system." - return 1 diff --git a/www/apache13-fp/files/fp_install.bsdi b/www/apache13-fp/files/fp_install.bsdi deleted file mode 100644 index 6b7a79cfca57..000000000000 --- a/www/apache13-fp/files/fp_install.bsdi +++ /dev/null @@ -1,11 +0,0 @@ ---- frontpage/version4.0/fp_install.sh.bsdi Wed Mar 7 22:16:28 2001 -+++ frontpage/version4.0/fp_install.sh Wed Mar 7 22:16:00 2001 -@@ -70,7 +70,7 @@ - SunOS*5.*i386*) machine="solarisx86" ;; - BSD/OS*) machine="bsdi" ;; - SCO_SV*) machine="sco5" ;; -- FreeBSD*) machine="freebsd" ;; -+ FreeBSD*) machine="bsdi" ;; - UnixWare\ *\ *\ 7*\ i*) machine="uware7" ;; - *) echo "ERROR: Unsupported platform! Uname is $system." - return 1 diff --git a/www/apache13-fp/files/patch-fa b/www/apache13-fp/files/patch-fa deleted file mode 100644 index 88797383aafe..000000000000 --- a/www/apache13-fp/files/patch-fa +++ /dev/null @@ -1,52 +0,0 @@ ---- frontpage/version4.0/change_server.sh.orig Mon Aug 14 11:51:36 2000 -+++ frontpage/version4.0/change_server.sh Wed Mar 7 22:12:02 2001 -@@ -38,9 +38,12 @@ - { - VERSION="4.0" - PATH=".:/bin:/usr/bin:/sbin:/usr/sbin:/usr/ucb:/etc:/usr/bsd" -- NEWHTTPDNEW="/usr/local/frontpage/version${VERSION}/apache-fp/httpd" -- NEWHTTPDCOMPAT="/usr/local/frontpage/version${VERSION}/apache-fp/httpd.Compat" -- DEFAULTHTTPD="/usr/local/apache/sbin/httpd" -+ AP_TARGET=`PREFIX/sbin/apxs -q TARGET` -+ NEWHTTPDNEW="PREFIX/sbin/${AP_TARGET}" -+ NEWMODFPNEW="PREFIX/libexec/apache/mod_frontpage.so" -+ NEWHTTPDCOMPAT="${NEWHTTPDNEW}" -+ NEWMODFPCOMAPT="${NEWMODFPNEW}" -+ DEFAULTHTTPD="PREFIX/sbin/${AP_TARGET}" - - case "`echo 'x\c'`" in - 'x\c') echo="echo -n" nnl= ;; #BSD -@@ -217,8 +220,22 @@ - - clear - -+ if ($strings $httpdfile | $fgrep "etc/apache/${AP_TARGET}.conf" > /dev/null) -+ then -+ NEWHTTPD=$NEWHTTPDNEW -+ NEWMODFP=$NEWMODFPNEW -+ echo "Selected server uses FreeBSD directory structure:" -+ -+ targetVersionNumber=`$httpdfile -v | sed 's%^.*Apache/\([0-9\.]*\).*%\1%' | head -1` -+ targetFPVersionNumber=`$strings \`dirname \\\`dirname $httpdfile\\\`\`/libexec/apache/mod_frontpage.so | \ -+ $fgrep "FrontPage/" 2> /dev/null | sed -e 's%^.*FrontPage/\([0-9\.]*\).*%\1%' | tail -1` -+ -+ sourceVersionNumber=`$NEWHTTPD -v | sed 's%^.*Apache/\([0-9\.]*\).*%\1%' | head -1` -+ sourceFPVersionNumber=`$strings $NEWMODFP | $fgrep "FrontPage/" 2> /dev/null | \ -+ sed -e 's%^.*FrontPage/\([0-9\.]*\).*%\1%' | tail -1` -+ else - -- if ($strings $httpdfile | $fgrep "etc/httpd.conf" > /dev/null) -+ if ($strings $httpdfile | $fgrep "etc/${AP_TARGET}.conf" > /dev/null) - then - NEWHTTPD=$NEWHTTPDNEW - echo "Selected server uses NEW directory structure:" -@@ -235,7 +252,8 @@ - sourceVersionNumber=`$NEWHTTPD -v | sed 's%^.*Apache/\([0-9\.]*\).*%\1%' | head -1` - sourceFPVersionNumber=`$strings $NEWHTTPD | $fgrep "FrontPage/" 2> /dev/null | sed -e ' - s%^.*FrontPage/\([0-9\.]*\).*%\1%' | tail -1` -- -+ fi -+ - echo - echo "Currently running Apache/${targetVersionNumber} FrontPage/${nnl}" - if [ "${targetFPVersionNumber}" = "" ] diff --git a/www/apache13-fp/files/patch-fb b/www/apache13-fp/files/patch-fb deleted file mode 100644 index 1c7e4c0ac7f0..000000000000 --- a/www/apache13-fp/files/patch-fb +++ /dev/null @@ -1,293 +0,0 @@ ---- frontpage/version4.0/fp_install.sh.orig Mon Aug 14 11:51:36 2000 -+++ frontpage/version4.0/fp_install.sh Wed Mar 7 22:16:28 2001 -@@ -48,7 +48,8 @@ - { - VERSION="4.0" - PATH=".:/bin:/usr/bin:/sbin:/usr/sbin:/usr/ucb:/etc:/usr/bsd" -- INSTALLDIRDEFAULT="/usr/local/frontpage" -+ AP_TARGET=`PREFIX/sbin/apxs -q TARGET` -+ INSTALLDIRDEFAULT="PREFIX/frontpage" - - case "`echo 'x\c'`" in - 'x\c') echo="echo -n" nnl= ;; #BSD -@@ -129,7 +130,7 @@ - checkuser() - { - # -- # Make sure we are not running as root. -+ # Make sure we are running as root. - # - - whoami=`whoami 2>/dev/null` || whoami=`/usr/bin/id | sed -e ' s/).*//; s/^.*(//;'` -@@ -322,27 +323,27 @@ - - retval=0 - -- echo -- echo "Where would you like to install the FrontPage Extensions. If you" -- echo "select a location other than /usr/local/frontpage/ then a symbolic" -- echo "link will be created from /usr/local/frontpage/ to the location that" -- echo "is chosen." -- echo -- $echo "FrontPage Extensions directory [/usr/local/frontpage/]: ${nnl}" -- read installdir -+# echo -+# echo "Where would you like to install the FrontPage Extensions. If you" -+# echo "select a location other than /usr/local/frontpage/ then a symbolic" -+# echo "link will be created from /usr/local/frontpage/ to the location that" -+# echo "is chosen." -+# echo -+# $echo "FrontPage Extensions directory [${INSTALLDIRDEFAULT}]: ${nnl}" -+# read installdir - -- if [ "$installdir" = "" ] -- then -+# if [ "$installdir" = "" ] -+# then - installdir=$INSTALLDIRDEFAULT -- fi -+# fi - installdir=`dirname $installdir`/`basename $installdir` - -- if [ ! -d "$installdir" ] -- then -- echo "Creating $installdir" -- if mkdir "$installdir" -- then -- echo "Directory $installdir has been created." -+# if [ ! -d "$installdir" ] -+# then -+# echo "Creating $installdir" -+# if mkdir "$installdir" -+# then -+# echo "Directory $installdir has been created." - if chmod "$prot" "$installdir" - then - echo "Directory $installdir chmoded to $prot." -@@ -350,22 +351,22 @@ - echo "ERROR: Unable to chmod $installdir to $prot." - retval=1 - fi -- else -- echo "ERROR: Unable to create $installdir!" -- retval=1 -- fi -- else -- echo "WARNING: Directory $installdir already exists." -- echo "Installation will overwrite existing files." -- echo -- -- myprompt 'yYnN' "Continue the installation (y/n)" "N" -- echo -- if [ $answer = n ] || [ $answer = N ] -- then -- exit 0 -- fi -- fi -+# else -+# echo "ERROR: Unable to create $installdir!" -+# retval=1 -+# fi -+# else -+# echo "WARNING: Directory $installdir already exists." -+# echo "Installation will overwrite existing files." -+# echo -+ -+# myprompt 'yYnN' "Continue the installation (y/n)" "N" -+# echo -+# if [ $answer = n ] || [ $answer = N ] -+# then -+# exit 0 -+# fi -+# fi - - if [ "$installdir" != "/usr/local/frontpage" ] - then -@@ -415,7 +416,7 @@ - vtfile="fp40.$machine.tar" - echo "Platform is $machine." - -- vtfilelocation="`pwd`/" -+ vtfilelocation="/usr/ports/distfiles/" - - getextfilename $vtfilelocation $vtfile || return 1 - -@@ -539,7 +540,7 @@ - upgrade="no" - echo "For details on how to upgrade servers manually, please see" - echo "the Server Extension Resource Kit (SERK), located in" -- echo "/usr/local/frontpage/version${VERSION}/serk" -+ echo "MOD_FPDOCDIR/serk" - echo - return $retval - else -@@ -656,10 +657,15 @@ - *pache*) getHttpDirective $configfile AccessConfig $port - if [ "$param" != "" ] - then -- file=`basename $param` -- accessconffile="${configfiledir}${file}" -+ if [ "${param}" = "/dev/null" ] -+ then -+ accessconffile="${configfile}" -+ else -+ file=`basename $param` -+ accessconffile="${configfiledir}${file}" -+ fi - else -- accessconffile="${configfiledir}access.conf" -+ accessconffile="${configfiledir}conf/access.conf" - fi - - if [ ! -f "$accessconffile" ] -@@ -1106,18 +1112,29 @@ - - webname="/" - -+ defconfigfile="PREFIX/etc/apache/${AP_TARGET}.conf" -+ - configfile="" - while ( [ "$configfile" = "" ] || [ ! -f $configfile ] ) - do -- $echo "Server config filename: ${nnl}" -+ $echo "Server config filename: [$defconfigfile] ${nnl}" - read configfile -- done -+ if [ "$configfile" = "" ] -+ then -+ configfile=$defconfigfile -+ fi -+done - -+ defadmin="fpadmin" - admin="" - until [ "$admin" != "" ] - do -- $echo "FrontPage Administrator's user name: ${nnl}" -+ $echo "FrontPage Administrator's user name: [$defadmin] ${nnl}" - read admin -+ if [ "$admin" = "" ] -+ then -+ admin=$defadmin -+ fi - done - - getparam Port $configfile -@@ -1132,6 +1149,39 @@ - getparam User $configfile - defwebowner=$param - -+ if [ "$defwebowner" = "" ] -+ then -+ getHttpDirective $configfile ResourceConfig $port -+ if [ "$param" != "" ] -+ then -+ if [ "${param}" = "/dev/null" ] -+ then -+ resconffile="${configfile}" -+ else -+ file=`basename $param` -+ resconffile="${configfiledir}${file}" -+ fi -+ else -+ resconffile="${configfiledir}srm.conf" -+ fi -+ -+ if [ ! -f "$resconffile" ] -+ then -+ echo "ERROR: $resconffile does not exist!" -+ return 1 -+ fi -+ -+ getparam DocumentRoot $resconffile -+ docroot=$param -+ if [ ! -d "$docroot" ] -+ then -+ echo "ERROR: $docroot does not exist!" -+ return 1 -+ fi -+ -+ defwebowner=`$lsg ${docroot}${service} | $awk ' { print $3}'` -+ fi -+ - weconfigfile="${installdir}/we${port}.cnf" - - webowner="" -@@ -1147,6 +1197,12 @@ - - getparam Group $configfile - defgroup=$param -+ -+ if [ "$defgroup" = "" ] -+ then -+ defgroup=`$lsg ${docroot}${service} | $awk ' { print $4}'` -+ fi -+ - webgroup="" - until [ "$webgroup" != "" ] - do -@@ -1158,6 +1214,8 @@ - webgroup=$defgroup - fi - done -+ -+defservertypenum="3" - - until [ "$servertype" != "" ] - do -@@ -1168,9 +1226,13 @@ - echo " 4. netscape-fasttrack" - echo " 5. netscape-enterprise" - echo " 6. stronghold" -- $echo "What type of Server is this: ${nnl}" -+ $echo "What type of Server is this: [$defservertypenum] ${nnl}" - read servertypenum - echo -+ if [ "$servertypenum" = "" ] -+ then -+ servertypenum=$defservertypenum -+ fi - - case $servertypenum in - "1") servertype="ncsa" ;; -@@ -1546,6 +1608,8 @@ - read admin - done - -+ defservertypenum="3" -+ - until [ "$servertype" != "" ] - do - echo -@@ -1555,9 +1619,13 @@ - echo " 4. netscape-fasttrack" - echo " 5. netscape-enterprise" - echo " 6. stronghold" -- $echo "What type of Server is this: ${nnl}" -+ $echo "What type of Server is this: [$defservertypenum] ${nnl}" - read servertypenum - echo -+ if [ "$servertypenum" = "" ] -+ then -+ servertypenum=$defservertypenum -+ fi - - case $servertypenum in - "1") servertype="ncsa" ;; -@@ -2024,7 +2092,6 @@ - then - getHttpRootDirective $configfile $directive - fi -- - } - - getnetscapedocroot() -@@ -2217,7 +2284,7 @@ - - initialize - step1 --step2 -+#step2 - step3 - # - # Run the external permissions script. diff --git a/www/apache13-fp/files/patch-fk b/www/apache13-fp/files/patch-fk deleted file mode 100644 index 2dcb95f76da3..000000000000 --- a/www/apache13-fp/files/patch-fk +++ /dev/null @@ -1,15 +0,0 @@ ---- frontpage/version4.0/readme.htm.orig Mon May 24 12:45:14 1999 -+++ frontpage/version4.0/readme.htm Thu Jun 10 21:03:28 1999 -@@ -124,10 +124,8 @@ - - <h3><a name="serk">Server Extensions Resource Kit</a></h3> - --<p>The FrontPage 2000 Server Extensions include a full set of documentation: the Server --Extensions Resource Kit. This is an HTML document installed on the server machine (by --default) in /usr/local/frontpage/version4.0/serk. To view the Server Extensions Resource --Kit, open /usr/local/frontpage/version4.0/serk/default.htm in your Web browser.</p> -+<p>The FrontPage 2000 Server Extensions include a full set of documentation: the -+<a href="serk/default.htm">Server Extensions Resource Kit</a>. This is an HTML document installed on the server machine (by default).</p> - - <p>The Server Extensions Resource Kit contains detailed information about installing and - administering the FrontPage Server Extensions along with an overview of the Server diff --git a/www/apache13-fp/files/patch-fn b/www/apache13-fp/files/patch-fn deleted file mode 100644 index ed2572945fbf..000000000000 --- a/www/apache13-fp/files/patch-fn +++ /dev/null @@ -1,15 +0,0 @@ ---- frontpage/version4.0/set_default_perms.sh.orig Mon May 24 12:45:14 1999 -+++ frontpage/version4.0/set_default_perms.sh Thu Feb 24 01:47:01 2000 -@@ -81,10 +81,10 @@ - chmod 4755 $FPDIR/apache-fp/_vti_bin/fpexe || die set fpexe to be suid - - # Set httpd --chmod 555 $FPDIR/apache-fp/httpd || die make httpd executable -+#chmod 555 $FPDIR/apache-fp/httpd || die make httpd executable - - # Set httpd.Compat --chmod 555 $FPDIR/apache-fp/httpd.Compat || die make httpd.Compat executable -+#chmod 555 $FPDIR/apache-fp/httpd.Compat || die make httpd.Compat executable - - # The apache-fp directory should not be writable to protect the stub program. - chmod 555 $FPDIR/apache-fp/_vti_bin || die restrict the apache-fp directory diff --git a/www/apache13-fp/pkg-message.bsdi b/www/apache13-fp/pkg-message.bsdi deleted file mode 100644 index 0a8ee6ee5660..000000000000 --- a/www/apache13-fp/pkg-message.bsdi +++ /dev/null @@ -1,4 +0,0 @@ -The BSDI FrontPage Extentions require that libcrypt.* be linked to the -libdescrypt.* libraries. The fpsrvadm.exe program can only create DES -passwords, but the Apache server is unable to use them when libcrypt.* -are linked to the libscrypt.* libraries. diff --git a/www/apache13-fp/pkg-message.freebsd b/www/apache13-fp/pkg-message.freebsd deleted file mode 100644 index c405d048e9d2..000000000000 --- a/www/apache13-fp/pkg-message.freebsd +++ /dev/null @@ -1,4 +0,0 @@ -The FreeBSD FrontPage Extentions require that libcrypt.* be linked to the -libdescrypt.* libraries. This is due to a problem with the fpsrvadm.exe -program will create invaild MD5 passwords when libcrypt.* are linked to -the libscrypt.* libraries. |