summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/apache13-fp/Makefile2
-rw-r--r--www/apache13-fp/files/patch-fa165
-rw-r--r--www/apache13-fp/files/patch-fb50
-rw-r--r--www/apache13-fp/pkg-plist8
4 files changed, 49 insertions, 176 deletions
diff --git a/www/apache13-fp/Makefile b/www/apache13-fp/Makefile
index 003fa629082f..4c102203af50 100644
--- a/www/apache13-fp/Makefile
+++ b/www/apache13-fp/Makefile
@@ -36,7 +36,7 @@ MAINTAINER= hetzels@westbend.net
#PATCHFILES=
APACHE= ${DISTNAME}${EXTRACT_SUFX}
-FRONTPAGE= fp40.bsdi.tar.Z
+FRONTPAGE= fp40.bsdi.tar.z
EXTRACT_ONLY= ${APACHE}
diff --git a/www/apache13-fp/files/patch-fa b/www/apache13-fp/files/patch-fa
index 352a2f74baf8..1dc8ca2ce217 100644
--- a/www/apache13-fp/files/patch-fa
+++ b/www/apache13-fp/files/patch-fa
@@ -1,35 +1,35 @@
---- frontpage/version4.0/change_server.sh.orig Mon May 24 13:27:07 1999
-+++ frontpage/version4.0/change_server.sh Thu Feb 24 20:39:30 2000
-@@ -38,9 +38,11 @@
+--- frontpage/version4.0/change_server.sh.orig Tue May 2 15:41:43 2000
++++ frontpage/version4.0/change_server.sh Thu Jul 6 21:45:52 2000
+@@ -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"
-+ NEWHTTPDNEW="PREFIX/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/httpd"
++ DEFAULTHTTPD="PREFIX/sbin/${AP_TARGET}"
case "`echo 'x\c'`" in
'x\c') echo="echo -n" nnl= ;; #BSD
-@@ -60,6 +62,9 @@
- IRIX*) machine="sgi" ;;
- SunOS*5.*sun4*) machine="solaris" ;;
+@@ -62,7 +65,7 @@
SunOS*5.*i386*) machine="solarisx86" ;;
-+ FreeBSD* | \
-+ NetBSD* | \
-+ OpenBSD* | \
BSD/OS*) machine="bsdi" ;;
SCO_SV*) machine="sco5" ;;
+- FreeBSD*) machine="freebsd" ;;
++ FreeBSD*) machine="bsdi" ;;
UnixWare\ *\ *\ 7*\ i*) machine="uware7" ;;
-@@ -214,6 +219,20 @@
+ *) echo "ERROR: Unsupported platform! Uname is $system."
+ return 1
+@@ -217,8 +220,22 @@
clear
-+ if ($strings $httpdfile | $fgrep "etc/apache/httpd.conf" > /dev/null)
++ if ($strings $httpdfile | $fgrep "etc/apache/${AP_TARGET}.conf" > /dev/null)
+ then
+ NEWHTTPD=$NEWHTTPDNEW
+ NEWMODFP=$NEWMODFPNEW
@@ -44,9 +44,12 @@
+ sed -e 's%^.*FrontPage/\([0-9\.]*\).*%\1%' | tail -1`
+ else
- if ($strings $httpdfile | $fgrep "etc/httpd.conf" > /dev/null)
+- if ($strings $httpdfile | $fgrep "etc/httpd.conf" > /dev/null)
++ if ($strings $httpdfile | $fgrep "etc/${AP_TARGET}.conf" > /dev/null)
then
-@@ -232,7 +251,8 @@
+ 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`
@@ -56,135 +59,3 @@
echo
echo "Currently running Apache/${targetVersionNumber} FrontPage/${nnl}"
if [ "${targetFPVersionNumber}" = "" ]
-@@ -496,10 +516,19 @@
- *pache*) getHttpDirective $configfile AccessConfig $port
- if [ "$param" != "" ]
- then
-- file=`basename $param`
-- accessconffile="${configfiledir}${file}"
-+ if [ "$param" != "/dev/null" ]
-+ then
-+ file=`basename $param`
-+ accessconffile="${configfiledir}${file}"
-+ else
-+ configError
-+ fi
- else
-- accessconffile="${configfiledir}access.conf"
-+ accessconffile="${configfiledir}conf/access.conf"
-+ if [ ! -f "$accessconffile" ]
-+ then
-+ configError2
-+ fi
- fi
-
- if [ ! -f "$accessconffile" ]
-@@ -1061,10 +1090,19 @@
- getHttpDirective $configfile ResourceConfig $port
- if [ "$param" != "" ]
- then
-- file=`basename $param`
-- resconffile="${configfiledir}${file}"
-+ if [ "$param" != "/dev/null" ]
-+ then
-+ file=`basename $param`
-+ resconffile="${configfiledir}${file}"
-+ else
-+ configError
-+ fi
- else
-- resconffile="${configfiledir}srm.conf"
-+ resconffile="${configfiledir}conf/srm.conf"
-+ if [ ! -f "$resconffile" ]
-+ then
-+ configError2
-+ fi
- fi
- echo "Getting DocumentRoot from $resconffile."
- getparam DocumentRoot $resconffile
-@@ -1081,10 +1119,19 @@
- resconffile=$param
- if [ "$param" != "" ]
- then
-- file=`basename $param`
-- resconffile="${configfiledir}${file}"
-+ if [ "$param" != "/dev/null" ]
-+ then
-+ file=`basename $param`
-+ resconffile="${configfiledir}${file}"
-+ else
-+ configError
-+ fi
- else
-- resconffile="${configfiledir}srm.conf"
-+ resconffile="${configfiledir}conf/srm.conf"
-+ if [ ! -f "$resconffile" ]
-+ then
-+ configError2
-+ fi
- fi
- echo "Getting UserDir from $resconffile."
- getparam UserDir $resconffile
-@@ -1108,10 +1155,19 @@
- *) getHttpDirective $configfile ResourceConfig $port
- if [ "$param" != "" ]
- then
-- file=`basename $param`
-- resconffile="${configfiledir}${file}"
-+ if [ "$param" != "/dev/null" ]
-+ then
-+ file=`basename $param`
-+ resconffile="${configfiledir}${file}"
-+ else
-+ configError
-+ fi
- else
-- resconffile="${configfiledir}srm.conf"
-+ resconffile="${configfiledir}conf/srm.conf"
-+ if [ ! -f "$resconffile" ]
-+ then
-+ configError2
-+ fi
- fi
-
- if [ ! -f "$resconffile" ]
-@@ -1253,6 +1309,39 @@
- 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()
diff --git a/www/apache13-fp/files/patch-fb b/www/apache13-fp/files/patch-fb
index c45dc5d26b15..29bea50d7e62 100644
--- a/www/apache13-fp/files/patch-fb
+++ b/www/apache13-fp/files/patch-fb
@@ -1,25 +1,25 @@
---- frontpage/version4.0/fp_install.sh.orig Mon May 24 12:45:14 1999
-+++ frontpage/version4.0/fp_install.sh Thu Feb 24 20:22:48 2000
-@@ -48,7 +48,7 @@
+--- frontpage/version4.0/fp_install.sh.orig Tue May 2 15:41:43 2000
++++ frontpage/version4.0/fp_install.sh Thu Jul 6 21:46:15 2000
+@@ -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
-@@ -68,6 +68,9 @@
- IRIX*) machine="sgi" ;;
- SunOS*5.*sun4*) machine="solaris" ;;
+@@ -70,7 +71,7 @@
SunOS*5.*i386*) machine="solarisx86" ;;
-+ FreeBSD* | \
-+ NetBSD* | \
-+ OpenBSD* | \
BSD/OS*) machine="bsdi" ;;
SCO_SV*) machine="sco5" ;;
+- FreeBSD*) machine="freebsd" ;;
++ FreeBSD*) machine="bsdi" ;;
UnixWare\ *\ *\ 7*\ i*) machine="uware7" ;;
-@@ -128,7 +131,7 @@
+ *) echo "ERROR: Unsupported platform! Uname is $system."
+ return 1
+@@ -129,7 +130,7 @@
checkuser()
{
#
@@ -28,7 +28,7 @@
#
whoami=`whoami 2>/dev/null` || whoami=`/usr/bin/id | sed -e ' s/).*//; s/^.*(//;'`
-@@ -321,27 +324,27 @@
+@@ -322,27 +323,27 @@
retval=0
@@ -73,7 +73,7 @@
if chmod "$prot" "$installdir"
then
echo "Directory $installdir chmoded to $prot."
-@@ -349,22 +352,22 @@
+@@ -350,22 +351,22 @@
echo "ERROR: Unable to chmod $installdir to $prot."
retval=1
fi
@@ -112,7 +112,7 @@
if [ "$installdir" != "/usr/local/frontpage" ]
then
-@@ -414,7 +417,7 @@
+@@ -415,7 +416,7 @@
vtfile="fp40.$machine.tar"
echo "Platform is $machine."
@@ -121,7 +121,7 @@
getextfilename $vtfilelocation $vtfile || return 1
-@@ -538,7 +541,7 @@
+@@ -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"
@@ -130,7 +130,7 @@
echo
return $retval
else
-@@ -655,10 +658,15 @@
+@@ -656,10 +657,15 @@
*pache*) getHttpDirective $configfile AccessConfig $port
if [ "$param" != "" ]
then
@@ -149,11 +149,11 @@
fi
if [ ! -f "$accessconffile" ]
-@@ -1105,18 +1113,29 @@
+@@ -1106,18 +1112,29 @@
webname="/"
-+ defconfigfile="PREFIX/etc/apache/httpd.conf"
++ defconfigfile="PREFIX/etc/apache/${AP_TARGET}.conf"
+
configfile=""
while ( [ "$configfile" = "" ] || [ ! -f $configfile ] )
@@ -182,7 +182,7 @@
done
getparam Port $configfile
-@@ -1131,6 +1150,39 @@
+@@ -1132,6 +1149,39 @@
getparam User $configfile
defwebowner=$param
@@ -222,7 +222,7 @@
weconfigfile="${installdir}/we${port}.cnf"
webowner=""
-@@ -1146,6 +1198,12 @@
+@@ -1147,6 +1197,12 @@
getparam Group $configfile
defgroup=$param
@@ -235,7 +235,7 @@
webgroup=""
until [ "$webgroup" != "" ]
do
-@@ -1157,6 +1215,8 @@
+@@ -1158,6 +1214,8 @@
webgroup=$defgroup
fi
done
@@ -244,7 +244,7 @@
until [ "$servertype" != "" ]
do
-@@ -1167,9 +1227,13 @@
+@@ -1168,9 +1226,13 @@
echo " 4. netscape-fasttrack"
echo " 5. netscape-enterprise"
echo " 6. stronghold"
@@ -259,7 +259,7 @@
case $servertypenum in
"1") servertype="ncsa" ;;
-@@ -1545,6 +1609,8 @@
+@@ -1546,6 +1608,8 @@
read admin
done
@@ -268,7 +268,7 @@
until [ "$servertype" != "" ]
do
echo
-@@ -1554,9 +1620,13 @@
+@@ -1555,9 +1619,13 @@
echo " 4. netscape-fasttrack"
echo " 5. netscape-enterprise"
echo " 6. stronghold"
@@ -283,7 +283,7 @@
case $servertypenum in
"1") servertype="ncsa" ;;
-@@ -2023,7 +2093,6 @@
+@@ -2024,7 +2092,6 @@
then
getHttpRootDirective $configfile $directive
fi
@@ -291,7 +291,7 @@
}
getnetscapedocroot()
-@@ -2216,7 +2285,7 @@
+@@ -2217,7 +2284,7 @@
initialize
step1
diff --git a/www/apache13-fp/pkg-plist b/www/apache13-fp/pkg-plist
index a4db5334e257..5bca7c609211 100644
--- a/www/apache13-fp/pkg-plist
+++ b/www/apache13-fp/pkg-plist
@@ -103,14 +103,16 @@ share/doc/apache/index.html.en-dist
share/doc/apache/index.html.es-dist
share/doc/apache/index.html.fr-dist
share/doc/apache/index.html.it-dist
+share/doc/apache/index.html.ja.jis-dist
share/doc/apache/index.html.lu-dist
share/doc/apache/index.html.nl-dist
+share/doc/apache/index.html.po.iso-pl-dist
share/doc/apache/index.html.pt-dist
share/doc/apache/index.html.pt-br-dist
share/doc/apache/index.html.se-dist
@unexec rm -rf %B/index.html.??
-@unexec rm -rf %B/index.html.po.iso-pl-dist
-@unexec rm -rf %B/index.html.ja.jis-dist
+@unexec rm -rf %B/index.html.po.iso-pl
+@unexec rm -rf %B/index.html.ja.jis
@unexec rm -rf %B/index.html.pt-br
share/doc/apache/manual/LICENSE
share/doc/apache/manual/bind.html
@@ -414,7 +416,7 @@ frontpage/%%FP_REV%%/admin/topleft.gif
frontpage/%%FP_REV%%/admin/topright.gif
frontpage/%%FP_REV%%/admin/uninstal.htm
frontpage/%%FP_REV%%/apache-fp/_vti_bin/fpexe
-frontpage/%%FP_REV%%/apache-fp/fp-patch-apache_1.3.3
+frontpage/%%FP_REV%%/apache-fp/fp-patch-apache_1.3.12
frontpage/%%FP_REV%%/apache-fp/fpexe.c
@unexec if [ -f %B/suidkey ] ; then rm -f %B/suidkey* ; fi
frontpage/%%FP_REV%%/bin/_vti_inf.htm
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 12:13:06 +0000