1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-01 22:05:08 +00:00
freebsd-ports/www/apache13-fp/files/patch-fa
Matthew Hunt 4016f6e524 Import of Apache with MS FrontPage Extensions.
PR:		4878
Submitted by:	Scot W. Hetzel <hetzels@westbend.net>, w/input from phk.
1998-05-29 04:46:56 +00:00

206 lines
7.0 KiB
Plaintext

*** frontpage/version3.0/change_server.sh.orig Thu Mar 5 06:00:22 1998
--- frontpage/version3.0/change_server.sh Tue Mar 17 21:06:53 1998
***************
*** 38,46 ****
{
VERSION="3.0"
PATH=".:/bin:/usr/bin:/sbin:/usr/sbin:/usr/ucb:/etc"
! NEWHTTPD="/usr/local/frontpage/currentversion/apache-fp/httpd"
UPGRADEVERSION=`$NEWHTTPD -v`
! DEFAULTHTTPD="/usr/local/etc/httpd/httpd"
case "`echo 'x\c'`" in
'x\c') echo="echo -n" nnl= ;; #BSD
--- 38,46 ----
{
VERSION="3.0"
PATH=".:/bin:/usr/bin:/sbin:/usr/sbin:/usr/ucb:/etc"
! NEWHTTPD="/usr/local/sbin/httpd"
UPGRADEVERSION=`$NEWHTTPD -v`
! DEFAULTHTTPD="/usr/local/sbin/httpd"
case "`echo 'x\c'`" in
'x\c') echo="echo -n" nnl= ;; #BSD
***************
*** 59,64 ****
--- 59,67 ----
IRIX*) machine="sgi" ;;
SunOS*5.*sun4*) machine="solaris" ;;
SunOS*4.*sun4*) machine="sunos";;
+ FreeBSD* | \
+ NetBSD* | \
+ OpenBSD* | \
*BSD/OS?3.0*) machine="bsdi3" ;;
BSD/OS*) machine="bsdi" ;;
SCO_SV*) machine="sco5" ;;
***************
*** 366,375 ****
*pache*) getHttpDirective $configfile AccessConfig $port
if [ "$param" != "" ]
then
! file=`basename $param`
! accessconffile="${configfiledir}${file}"
else
! accessconffile="${configfiledir}access.conf"
fi
if [ ! -f "$accessconffile" ]
--- 369,387 ----
*pache*) getHttpDirective $configfile AccessConfig $port
if [ "$param" != "" ]
then
! if [ "$param" != "/dev/null" ]
! then
! file=`basename $param`
! accessconffile="${configfiledir}${file}"
! else
! configError
! fi
else
! accessconffile="${configfiledir}conf/access.conf"
! if [ ! -f "$accessconffile" ]
! then
! configError2
! fi
fi
if [ ! -f "$accessconffile" ]
***************
*** 932,941 ****
getHttpDirective $configfile ResourceConfig $port
if [ "$param" != "" ]
then
! file=`basename $param`
! resconffile="${configfiledir}${file}"
else
! resconffile="${configfiledir}srm.conf"
fi
echo "Getting DocumentRoot from $resconffile."
getparam DocumentRoot $resconffile
--- 944,962 ----
getHttpDirective $configfile ResourceConfig $port
if [ "$param" != "" ]
then
! if [ "$param" != "/dev/null" ]
! then
! file=`basename $param`
! resconffile="${configfiledir}${file}"
! else
! configError
! fi
else
! resconffile="${configfiledir}conf/srm.conf"
! if [ ! -f "$resconffile" ]
! then
! configError2
! fi
fi
echo "Getting DocumentRoot from $resconffile."
getparam DocumentRoot $resconffile
***************
*** 952,961 ****
resconffile=$param
if [ "$param" != "" ]
then
! file=`basename $param`
! resconffile="${configfiledir}${file}"
else
! resconffile="${configfiledir}srm.conf"
fi
echo "Getting UserDir from $resconffile."
getparam UserDir $resconffile
--- 973,991 ----
resconffile=$param
if [ "$param" != "" ]
then
! if [ "$param" != "/dev/null" ]
! then
! file=`basename $param`
! resconffile="${configfiledir}${file}"
! else
! configError
! fi
else
! resconffile="${configfiledir}conf/srm.conf"
! if [ ! -f "$resconffile" ]
! then
! configError2
! fi
fi
echo "Getting UserDir from $resconffile."
getparam UserDir $resconffile
***************
*** 979,988 ****
*) getHttpDirective $configfile ResourceConfig $port
if [ "$param" != "" ]
then
! file=`basename $param`
! resconffile="${configfiledir}${file}"
else
! resconffile="${configfiledir}srm.conf"
fi
if [ ! -f "$resconffile" ]
--- 1009,1027 ----
*) getHttpDirective $configfile ResourceConfig $port
if [ "$param" != "" ]
then
! if [ "$param" != "/dev/null" ]
! then
! file=`basename $param`
! resconffile="${configfiledir}${file}"
! else
! configError
! fi
else
! resconffile="${configfiledir}conf/srm.conf"
! if [ ! -f "$resconffile" ]
! then
! configError2
! fi
fi
if [ ! -f "$resconffile" ]
***************
*** 1124,1129 ****
--- 1163,1201 ----
getHttpRootDirective $configfile $directive
fi
+ }
+
+ configError()
+ {
+ echo
+ echo "ERROR: ${configfile} invalid format"
+ echo "Change ${configfile} as follows:"
+ echo
+ echo " ResourceConfig ${configfile}"
+ echo " AccessConfig ${configfile}"
+ echo
+ $echo "hit enter to continue${nnl}"
+ read continue
+ echo "Ouch!!!!!!!!!!!!! Not so hard, gently please"
+ echo
+ exit 1
+ }
+
+ configError2()
+ {
+ echo
+ echo "ERROR: ${configfile} invalid"
+ echo
+ echo "Change ${configfile} as follows:"
+ echo
+ echo " ResourceConfig ${configfiledir}srm.conf"
+ echo " AccessConfig ${configfiledir}access.conf"
+ echo
+ $echo "hit enter to continue${nnl}"
+ read continue
+ echo "Ouch!!!!!!!!!!!!! Not so hard, gently please"
+ echo
+ exit 1
}
error()