aboutsummaryrefslogtreecommitdiff
path: root/www/apache13-fp
diff options
context:
space:
mode:
authorBill Fumerola <billf@FreeBSD.org>2000-03-01 06:25:15 +0000
committerBill Fumerola <billf@FreeBSD.org>2000-03-01 06:25:15 +0000
commite6503fb81a27bb578af6a8d0591748b0d84cbf3d (patch)
tree80c45281ac7798887074895f840282856e9b3bab /www/apache13-fp
parentb76013263978673668c7f2ce2bf12f2d8cce1b43 (diff)
downloadports-e6503fb81a27bb578af6a8d0591748b0d84cbf3d.tar.gz
ports-e6503fb81a27bb578af6a8d0591748b0d84cbf3d.zip
Notes
Diffstat (limited to 'www/apache13-fp')
-rw-r--r--www/apache13-fp/Makefile136
-rw-r--r--www/apache13-fp/distinfo3
-rw-r--r--www/apache13-fp/files/FreeBSD.layout19
-rw-r--r--www/apache13-fp/files/apache.sh.tmpl16
-rw-r--r--www/apache13-fp/files/patch-aa23
-rw-r--r--www/apache13-fp/files/patch-ab55
-rw-r--r--www/apache13-fp/files/patch-ag6
-rw-r--r--www/apache13-fp/files/patch-ak127
-rw-r--r--www/apache13-fp/files/patch-at10
-rw-r--r--www/apache13-fp/files/patch-fa395
-rw-r--r--www/apache13-fp/files/patch-fb109
-rw-r--r--www/apache13-fp/files/patch-fe31
-rw-r--r--www/apache13-fp/files/patch-ff8
-rw-r--r--www/apache13-fp/files/patch-fi20
-rw-r--r--www/apache13-fp/files/patch-fn15
-rw-r--r--www/apache13-fp/files/patch-lang.ca29
-rw-r--r--www/apache13-fp/files/patch-lang.cz30
-rw-r--r--www/apache13-fp/files/patch-lang.de32
-rw-r--r--www/apache13-fp/files/patch-lang.dk29
-rw-r--r--www/apache13-fp/files/patch-lang.ee28
-rw-r--r--www/apache13-fp/files/patch-lang.en27
-rw-r--r--www/apache13-fp/files/patch-lang.es30
-rw-r--r--www/apache13-fp/files/patch-lang.fr29
-rw-r--r--www/apache13-fp/files/patch-lang.it27
-rw-r--r--www/apache13-fp/files/patch-lang.ja27
-rw-r--r--www/apache13-fp/files/patch-lang.lu27
-rw-r--r--www/apache13-fp/files/patch-lang.nl29
-rw-r--r--www/apache13-fp/files/patch-lang.pt25
-rw-r--r--www/apache13-fp/files/patch-lang.pt-br27
-rw-r--r--www/apache13-fp/files/patch-lang.se30
-rw-r--r--www/apache13-fp/pkg-install90
-rw-r--r--www/apache13-fp/pkg-plist68
32 files changed, 1136 insertions, 421 deletions
diff --git a/www/apache13-fp/Makefile b/www/apache13-fp/Makefile
index 502ff2ee9eff..fb3493f01e47 100644
--- a/www/apache13-fp/Makefile
+++ b/www/apache13-fp/Makefile
@@ -35,65 +35,52 @@ MAINTAINER= hetzels@westbend.net
#PATCH_SITES= http://www.apache.org/dist/patches/apply_to_${AP_VERS}/
#PATCHFILES=
-.if defined(PATCH_DEBUG)
-PATCH_DIST_ARGS= -d ${WRKSRC}/src -E ${PATCH_DIST_STRIP}
-.else
-PATCH_DIST_ARGS= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP}
-.endif
-
-AP_VERS= 1.3.9
+AP_VERS= 1.3.12
APACHE= ${DISTNAME}${EXTRACT_SUFX}
FRONTPAGE= fp40.bsdi.tar.Z
EXTRACT_ONLY= ${APACHE}
-IS_INTERACTIVE= YES
-NO_PACKAGE= \
- "The FrontPage Installer needs to create FrontPage Admin user and password"
-
-FPINSTALL= frontpage/version4.0/fp_install.sh
-CHANGESERVER= frontpage/version4.0/change_server.sh
-README= frontpage/version4.0/readme.htm
-SERK= frontpage/version4.0/serk
-MOD_FPDOCDIR= share/doc/apache/manual/mod/mod_frontpage
+BATCH?= NO
+CHMOD?= /bin/chmod
+FP_REV= version4.0
+FPINSTALL= frontpage/${FP_REV}/fp_install.sh
+CHANGESERVER= frontpage/${FP_REV}/change_server.sh
+FPSETPERM= frontpage/${FP_REV}/set_default_perms.sh
+README= frontpage/${FP_REV}/readme.htm
+SERK= frontpage/${FP_REV}/serk
+FPHTTPD= ${PREFIX}/frontpage/${FP_REV}/apache-fp
+AP_SHARE= ${PREFIX}/share/doc/apache
+MOD_FPDOCDIR= ${AP_SHARE}/manual/mod/mod_frontpage
MOD_FP= ${FILESDIR}/mod_frontpage.c
-IMAGES_DIR= share/doc/apache/manual/images
+IMAGES_DIR= ${AP_SHARE}/manual/images
IMAGES_VTI= ${PREFIX}/www/data/images/_vti_cnf
-INSTALL_FILE=${INSTALL} -c -m 555 -o bin -g bin
+INSTALL_FILE= ${INSTALL} -c -m 555 -o bin -g bin
Y2K= http://www.apache.org/foundation/Y2K.html
Y2K+= http://computingcentral.msn.com/guide/year2000/msy2k/productinfo/frontpage.asp
PLIST= ${WRKDIR}/PLIST
-PLIST_SUB= FP_REV=version4.0
+PLIST_SUB= FP_REV=${FP_REV}
#
# Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
#
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= --prefix=${PREFIX} \
- --with-layout=GNU \
- --with-perl=${PERL} \
- --bindir=${PREFIX}/bin \
- --sbindir=${PREFIX}/sbin \
- --libexecdir=${PREFIX}/libexec/apache \
- --mandir=${PREFIX}/man \
- --sysconfdir=${PREFIX}/etc/apache \
- --datadir=${PREFIX}/www \
- --includedir=${PREFIX}/include/apache \
- --localstatedir=/var \
- --runtimedir=/var/run \
- --logfiledir=/var/log \
- --proxycachedir=/var/spool/proxy \
- --without-confadjust \
- --enable-module=most \
- --enable-module=auth_db \
- --disable-module=auth_dbm \
- --add-module=${MOD_FP} \
- --enable-shared=frontpage \
- --enable-shared=max
+CONFIGURE_ARGS= \
+ --prefix=${PREFIX} \
+ --server-gid=nogroup \
+ --with-perl=${PERL} \
+ --with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \
+ --without-confadjust \
+ --enable-shared=max \
+ --enable-module=most \
+ --enable-module=auth_db \
+ --disable-module=auth_dbm \
+ --add-module=${MOD_FP} \
+ --enable-shared=frontpage
# Currently perl version doesn't matter
USE_PERL5= YES
@@ -102,7 +89,12 @@ OPTIM= -DHARD_SERVER_LIMIT=512 \
-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
-.if defined(APACHE_PERF_TUNING)
+#By default create an Optimized package.
+.if ${BATCH} == YES
+APACHE_PERF_TUNING= YES
+.endif
+
+.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
OPTIM+= -DBUFFERED_LOGS -DFD_SETSIZE=1024
CFLAGS+= -O6 -funroll-loops -fstrength-reduce -fomit-frame-pointer \
-fexpensive-optimizations -ffast-math
@@ -131,17 +123,22 @@ pre-extract:
@if ! ${LDCONFIG} -r | ${GREP} -q -e "-ldescrypt"; then \
${ECHO} ; \
${ECHO} "WARNING: MS FrontPage Extentions require the DES Library"; \
- ${ECHO} "WARNING: Install the DES Library, then build apache-fp"; \
+ ${ECHO} " Install the DES Library, then build apache-fp"; \
+ ${ECHO} ; \
+ ${ECHO} " FreeBSD Handbook - Security (chapter 6)"; \
+ ${ECHO} " http://www.freebsd.org/handbook/security.html#CRYPT"; \
+ ${ECHO} " FAQ - I live outside the US. Can I use DES encryption?"; \
+ ${ECHO} " http://www.freebsd.org/FAQ/install.html#AEN629"; \
${ECHO} ; \
${FALSE} ; \
fi
post-extract:
@${ECHO} "===> Extracting FrontPage install scripts"
- @cd ${WRKSRC} && \
+ cd ${WRKSRC} && \
${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${FRONTPAGE} \
${EXTRACT_AFTER_ARGS} ${FPINSTALL} ${CHANGESERVER} \
- ${README}
+ ${README} ${FPSETPERM}
.if !defined(PATCH_DEBUG)
post-patch:
@@ -153,7 +150,7 @@ post-configure:
.if defined(SUEXEC)
${CP} ${PKGDIR}/PLIST ${PLIST}
.else
- ${CAT} ${PKGDIR}/PLIST | ${GREP} -v sbin/suexec >${PLIST}
+ ${CAT} ${PKGDIR}/PLIST | ${GREP} -v sbin/suexec > ${PLIST}
.endif
IMAGES= apache_pb.gif fplogo.gif powerlogo.gif
@@ -161,45 +158,30 @@ IMAGES= apache_pb.gif fplogo.gif powerlogo.gif
post-install:
@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh file."; \
- ${CAT} ${FILESDIR}/apache.sh.tmpl | \
- ${SED} -e 's;PREFIX;${PREFIX};' \
- -e 's;PERL5;${PERL};' \
- > ${PREFIX}/etc/rc.d/apache.sh; \
+ ${SED} -e 's;PREFIX;${PREFIX};' \
+ -e 's;PERL5;${PERL};' \
+ < ${FILESDIR}/apache.sh.tmpl > ${PREFIX}/etc/rc.d/apache.sh; \
${CHMOD} 751 ${PREFIX}/etc/rc.d/apache.sh; \
fi
- @${INSTALL} -c -m 644 ${DISTDIR}/powerlogo.gif ${PREFIX}/${IMAGES_DIR}
- @${INSTALL} -c -m 644 ${DISTDIR}/fplogo.gif ${PREFIX}/${IMAGES_DIR}
- @${INSTALL} -c -m 644 ${PREFIX}/share/doc/apache/apache_pb.gif ${PREFIX}/${IMAGES_DIR}
+ @${INSTALL} -c -m 644 ${DISTDIR}/powerlogo.gif ${IMAGES_DIR}
+ @${INSTALL} -c -m 644 ${DISTDIR}/fplogo.gif ${IMAGES_DIR}
+ @${INSTALL} -c -m 644 ${AP_SHARE}/apache_pb.gif ${IMAGES_DIR}
@mkdir -p ${PREFIX}/www/data/images
@( cd ${PREFIX}/share/doc/apache ; if [ -h images ] ; then ${RM} -f images ; fi ; ln -fs manual/images images)
.for file in ${IMAGES}
@if [ ! -f ${PREFIX}/www/data/images/${file} ]; then \
- ${CP} -rp ${PREFIX}/${IMAGES_DIR}/${file} ${PREFIX}/www/data/images ; \
+ ${CP} -rp ${IMAGES_DIR}/${file} ${PREFIX}/www/data/images ; \
fi
.endfor
- @${CAT} ${WRKSRC}/${FPINSTALL} | \
- ${SED} -e 's;PREFIX;${PREFIX};' \
- -e 's;MOD_FPDOCDIR;${PREFIX}/${MOD_FPDOCDIR};' \
- > ${WRKDIR}/tmp.fpinstall
- @${SH} ${WRKDIR}/tmp.fpinstall
-#Add the appropriate comment to the images/_vti_cnf file.
- @if [ -d ${IMAGES_VTI} ]; then \
- if [ ! "`grep description ${IMAGES_VTI}/apache_pb.gif`" ] ; then \
- ${ECHO} "vti_description:SW|Apache Webserver" >> ${IMAGES_VTI}/apache_pb.gif ;\
- fi ; \
- if [ ! "`grep description ${IMAGES_VTI}/fplogo.gif`" ] ; then \
- ${ECHO} "vti_description:SW|Created with Microsoft FrontPage 2000" >> ${IMAGES_VTI}/fplogo.gif ; \
- fi ; \
- if [ ! "`grep description ${IMAGES_VTI}/powerlogo.gif`" ] ; then \
- ${ECHO} "vti_description:SW|Powered by FreeBSD" >> ${IMAGES_VTI}/powerlogo.gif ; \
- fi ; \
- fi
- @${INSTALL_FILE} ${WRKDIR}/tmp.fpinstall ${PREFIX}/${FPINSTALL}
- @${CAT} ${WRKSRC}/${CHANGESERVER} | \
- ${SED} -e 's;PREFIX;${PREFIX};' > ${WRKDIR}/tmp.changeserver
- @${INSTALL_FILE} ${WRKDIR}/tmp.changeserver ${PREFIX}/${CHANGESERVER}
- @${MKDIR} ${PREFIX}/${MOD_FPDOCDIR}
- @${CP} ${PREFIX}/${README} ${PREFIX}/${MOD_FPDOCDIR}/index.html
- @${LN} -s ${PREFIX}/${SERK} ${PREFIX}/${MOD_FPDOCDIR}/serk
+ # Untar frontpage extentions
+ @(cd ${PREFIX} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${FRONTPAGE} ${EXTRACT_AFTER_ARGS})
+ @${RM} ${FPHTTPD}/httpd ${FPHTTPD}/httpd.Compat
+ @${MKDIR} ${MOD_FPDOCDIR}
+ @${CP} ${PREFIX}/${README} ${MOD_FPDOCDIR}/index.html
+ @${LN} -fs ${PREFIX}/${SERK} ${MOD_FPDOCDIR}/serk
+ @${INSTALL_FILE} ${WRKSRC}/${FPINSTALL} ${PREFIX}/${FPINSTALL}-dist
+ @${INSTALL_FILE} ${WRKSRC}/${CHANGESERVER} ${PREFIX}/${CHANGESERVER}-dist
+ @${INSTALL_FILE} ${WRKSRC}/${FPSETPERM} ${PREFIX}/${FPSETPERM}
+ @PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
diff --git a/www/apache13-fp/distinfo b/www/apache13-fp/distinfo
index 3924c7d10f9a..afe303352391 100644
--- a/www/apache13-fp/distinfo
+++ b/www/apache13-fp/distinfo
@@ -1,4 +1,5 @@
-MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32
+MD5 (apache_1.3.12.tar.gz) = de3ccff384b0d4ab94c3251cb85d49d2
MD5 (fp40.bsdi.tar.Z) = 2fb460f64fe1853eb791654851be208b
MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
MD5 (fplogo.gif) = db0fd186b50fde14ff2ec638382a85e6
+MD5 (apache_1.3.11_css_patch.txt) = 71e31be23012752ffd898f6345c344be
diff --git a/www/apache13-fp/files/FreeBSD.layout b/www/apache13-fp/files/FreeBSD.layout
new file mode 100644
index 000000000000..5524e186e9c0
--- /dev/null
+++ b/www/apache13-fp/files/FreeBSD.layout
@@ -0,0 +1,19 @@
+# FreeBSD layout...
+<Layout FreeBSD>
+ prefix: /usr/local
+ exec_prefix: $prefix
+ bindir: $exec_prefix/bin
+ sbindir: $exec_prefix/sbin
+ libexecdir: $exec_prefix/libexec/apache
+ mandir: $prefix/man
+ sysconfdir: $prefix/etc/apache
+ datadir: $prefix/www
+ iconsdir: $datadir/icons
+ htdocsdir: $datadir/data
+ cgidir: $datadir/cgi-bin
+ includedir: $prefix/include/apache
+ localstatedir: /var
+ runtimedir: $localstatedir/run
+ logfiledir: $localstatedir/log
+ proxycachedir: $datadir/proxy
+</Layout>
diff --git a/www/apache13-fp/files/apache.sh.tmpl b/www/apache13-fp/files/apache.sh.tmpl
index bb1995de54cd..fce517839604 100644
--- a/www/apache13-fp/files/apache.sh.tmpl
+++ b/www/apache13-fp/files/apache.sh.tmpl
@@ -11,12 +11,16 @@ new_key() {
skdir=PREFIX/frontpage/version4.0/apache-fp
PERL=PERL5
- #NOTE: We need Perl 5, to generate a new key
- if [ -x ${PERL} ]
+ if [ -x PREFIX/libexec/apache/mod_frontpage.so ]
then
- umask 077
- ${PERL} -e '@a=(split(//, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*-=_+")); print((map {$a[rand(scalar @a)]} (1..128)), "\n");' > $skdir/suidkey
- umask ${CUR_UMASK}
+
+ #NOTE: We need Perl 5, to generate a new key
+ if [ -x ${PERL} ]
+ then
+ umask 077
+ ${PERL} -e '@a=(split(//, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*-=_+")); print((map {$a[rand(scalar @a)]} (1..128)), "\n");' > $skdir/suidkey
+ umask ${CUR_UMASK}
+ fi
fi
}
@@ -27,7 +31,7 @@ new_key() {
if [ -x PREFIX/libexec/apache/mod_frontpage.so ]
then
- MODULES="fp"
+ MODULES="_FP"
fi
case "$1" in
diff --git a/www/apache13-fp/files/patch-aa b/www/apache13-fp/files/patch-aa
index 093d8391c0e8..5ee49c1d65d5 100644
--- a/www/apache13-fp/files/patch-aa
+++ b/www/apache13-fp/files/patch-aa
@@ -1,19 +1,16 @@
---- configure.orig Sat Aug 14 03:29:05 1999
-+++ configure Sat Oct 16 20:49:14 1999
-@@ -1084,10 +1084,10 @@
- ## UID/GID as production oriented as a web server in NIS anyway.
- ##
- conf_user="nobody"
--conf_group="#-1"
-+conf_group="nogroup"
- conf_port="80"
+--- configure.orig Mon Jan 17 16:53:17 2000
++++ configure Sun Feb 20 15:43:26 2000
+@@ -1151,7 +1151,8 @@
+ conf_port="80"
+ fi
conf_serveradmin="you@your.address"
-conf_servername="new.host.name"
+conf_servername="`$aux/buildinfo.sh -n %h%d`"
++#conf_servername="new.host.name"
if [ "x$confadjust" = "x1" ]; then
if [ -f /etc/passwd ]; then
- for uid in nobody www daemon demon http httpd; do
-@@ -1107,7 +1107,10 @@
+ if [ "x$conf_user" = "x" ]; then
+@@ -1175,7 +1176,10 @@
conf_port="8080"
fi
conf_serveradmin="`$aux/buildinfo.sh -n %u@%h%d`"
@@ -25,7 +22,7 @@
fi
##
-@@ -1153,8 +1156,8 @@
+@@ -1232,8 +1236,8 @@
echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
@@ -36,7 +33,7 @@
echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
-@@ -1244,8 +1247,8 @@
+@@ -1330,8 +1334,8 @@
echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci
echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci
diff --git a/www/apache13-fp/files/patch-ab b/www/apache13-fp/files/patch-ab
index 8897ad91e96d..c45e9fe7b6e6 100644
--- a/www/apache13-fp/files/patch-ab
+++ b/www/apache13-fp/files/patch-ab
@@ -1,6 +1,6 @@
---- Makefile.tmpl.orig Fri Aug 13 01:58:18 1999
-+++ Makefile.tmpl Sat Nov 13 19:33:44 1999
-@@ -120,6 +120,7 @@
+--- Makefile.tmpl.orig Tue Jan 11 13:47:41 2000
++++ Makefile.tmpl Thu Feb 24 20:58:51 2000
+@@ -123,6 +123,7 @@
runtimedir = @runtimedir@
logfiledir = @logfiledir@
proxycachedir = @proxycachedir@
@@ -8,7 +8,7 @@
libexecdir_relative = @libexecdir_relative@
-@@ -255,9 +256,9 @@
+@@ -266,9 +267,9 @@
$(MKDIR) $(root)$(mandir)/man1
$(MKDIR) $(root)$(mandir)/man8
$(MKDIR) $(root)$(sysconfdir)
@@ -20,12 +20,12 @@
$(MKDIR) $(root)$(includedir)
$(MKDIR) $(root)$(includedir)/xml
$(MKDIR) $(root)$(runtimedir)
-@@ -313,19 +314,34 @@
+@@ -324,19 +325,34 @@
echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \
$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}; \
name=`$(TOP)/$(AUX)/fmn.sh $(TOP)/$(SRC)/$${mod}`; \
+ if [ ".$$name" = .frontpage_module ]; then \
-+ echo "<IfDefine FRONTPAGE>" >>$(SRC)/.apaci.install.conf; \
++ echo "<IfDefine MOD_FP>" >>$(SRC)/.apaci.install.conf; \
+ fi; \
echo dummy | awk '{ printf("LoadModule %-18s %s\n", modname, modpath); }' \
modname="$${name}" modpath="$(libexecdir_relative)$${file}" >>$(SRC)/.apaci.install.conf; \
@@ -50,7 +50,7 @@
+ -e 's:[ ]lib: mod_:' \
+ -e 's:\.[soam].*$$:.c:'`; do \
+ if [ ".$$mod" = .mod_frontpage.c ]; then \
-+ echo "<IfDefine FRONTPAGE>" >>$(SRC)/.apaci.install.conf; \
++ echo "<IfDefine MOD_FP>" >>$(SRC)/.apaci.install.conf; \
+ fi; \
+ echo "AddModule $$mod" >>$(SRC)/.apaci.install.conf; \
+ if [ ".$$mod" = .mod_frontpage.c ]; then \
@@ -60,7 +60,7 @@
fi
@echo "<=== [programs]"
-@@ -394,6 +410,7 @@
+@@ -405,6 +421,7 @@
echo "$(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl[*] $(root)$(sbindir)/$${apachectl}"; \
sed -e 's;PIDFILE=.*;PIDFILE=$(runtimedir)/$(TARGET).pid;' \
-e 's;HTTPD=.*;HTTPD=$(sbindir)/$(TARGET);' \
@@ -68,15 +68,15 @@
< $(TOP)/$(SRC)/support/apachectl > $(TOP)/$(SRC)/.apaci.install.tmp && \
$(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sbindir)/$${apachectl}; \
echo "$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.8 $(root)$(mandir)/man8/$${apachectl}.8"; \
-@@ -441,25 +458,36 @@
+@@ -452,25 +469,31 @@
# icons and distributed CGI scripts.
install-data:
@echo "===> [data: Installing initial data files]"
-- -@if [ -f $(root)$(htdocsdir)/index.html ]; then \
+- -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \
- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
- else \
- echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
-+# -@if [ -f $(root)$(htdocsdir)/index.html ]; then \
++# -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \
+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
+# else \
+ echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \
@@ -84,21 +84,18 @@
- (cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
- find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
- find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
+- fi
+- -@if [ -f $(root)$(cgidir)/printenv ]; then \
+- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
+- else \
+ (cd $(root)$(doc_prefix)/ && $(TAR) -xf -); \
-+ cat $(TOP)/htdocs/index.html | \
-+ sed -e 's;@@HOSTNAME@@;$(conf_servername);' \
-+ > $(root)$(doc_prefix)/index.html ; \
-+ $(LN) -f $(root)$(doc_prefix)/apache_pb.gif $(root)$(doc_prefix)/manual/images; \
++ for lang in ca cz de dk ee en es fr it ja.jis lu nl po.iso-pl pt pt-br se; do \
++ mv $(root)$(doc_prefix)/index.html.$${lang} \
++ $(root)$(doc_prefix)/index.html.$${lang}-dist ; \
++ done; \
+ find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \
+ find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \
+# fi
-+ if [ ! -d $(root)$(htdocsdir) ]; then \
-+ $(MKDIR) $(root)$(htdocsdir); \
-+ $(CP) -rp $(root)$(doc_prefix)/index.html $(root)$(htdocsdir); \
- fi
-- -@if [ -f $(root)$(cgidir)/printenv ]; then \
-- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
-- else \
+# -@if [ -f $(root)$(cgidir)/printenv ]; then \
+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
+# else \
@@ -111,13 +108,12 @@
+ echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir).default/$${script}"; \
+ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir).default/$${script}; \
done; \
-+# fi
+ if [ ! -d $(root)$(cgidir) ]; then \
+ $(CP) -rp $(root)$(cgidir).default $(root)$(cgidir); \
fi
@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
-@@ -493,20 +521,24 @@
+@@ -504,28 +527,33 @@
-e 's;@@ServerRoot@@/icons;$(iconsdir);' \
-e 's;@@ServerRoot@@/cgi-bin;$(cgidir);' \
-e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
@@ -142,7 +138,16 @@
-e 's;Group #-1;Group $(conf_group);' \
-e 's;Port 80;Port $(conf_port);' \
+ -e 's;@@MANUAL@@;$(doc_prefix);' \
-+ -e 's;@@HOSTNAME@@;$(conf_servername);' \
-e 's;ServerAdmin you@your.address;ServerAdmin $(conf_serveradmin);' \
-e 's;ServerName new.host.name;ServerName $(conf_servername);' \
> $(TOP)/$(SRC)/.apaci.install.tmp && \
+ echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}.default"; \
+ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}.default; \
+ if [ ! -f "$(root)$(sysconfdir)/$${target_conf}" ]; then \
++ if [ .$${target_conf} != .httpd.conf ] ; then \
+ echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}"; \
+ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}; \
++ fi; \
+ else \
+ echo "[PRESERVING EXISTING CONFIG FILE: $(root)$(sysconfdir)/$${target_conf}]"; \
+ fi; \
diff --git a/www/apache13-fp/files/patch-ag b/www/apache13-fp/files/patch-ag
index 6377a6a55c22..333ef6a30786 100644
--- a/www/apache13-fp/files/patch-ag
+++ b/www/apache13-fp/files/patch-ag
@@ -35,14 +35,14 @@
# "AuthConfig", and "Limit"
#
- AllowOverride None
-+<IfDefine FRONTPAGE>
++<IfDefine MOD_FP>
+### These are the Minimum options need by the FrontPage Module.
+### With out these options set the FrontPage Client will not be
+### able to access the server.
+ AllowOverride AuthConfig Limit Indexes Options
+</IfDefine>
+
-+<IfDefine !FRONTPAGE>
++<IfDefine !MOD_FP>
+# AllowOverride None
+</IfDefine>
@@ -54,7 +54,7 @@
+### In Order for FrontPage to work in User and Virtual ###
+### Web Directories, they need to be set up as shown: ###
-+<IfDefine FRONTPAGE>
++<IfDefine MOD_FP>
+ <Directory /*/public_html>
+ AllowOverride AuthConfig Limit Indexes Options
+ Options ExecCGI
diff --git a/www/apache13-fp/files/patch-ak b/www/apache13-fp/files/patch-ak
index 905ae48ce8d1..a976cce63aa7 100644
--- a/www/apache13-fp/files/patch-ak
+++ b/www/apache13-fp/files/patch-ak
@@ -1,5 +1,5 @@
--- src/support/apachectl.orig Tue Apr 6 15:36:33 1999
-+++ src/support/apachectl Mon Sep 6 13:01:08 1999
++++ src/support/apachectl Thu Feb 24 22:20:05 2000
@@ -27,6 +27,10 @@
# the path to your httpd binary, including options if necessary
HTTPD='/usr/local/apache/src/httpd'
@@ -20,38 +20,32 @@
ERROR=0
ARGV="$@"
if [ "x$ARGV" = "x" ] ; then
-@@ -75,6 +81,30 @@
- ERROR=3
+@@ -47,6 +53,9 @@
+
+ for ARG in $@ $ARGS
+ do
++
++ MODULES=`echo $ARG | awk 'BEGIN { RS="_"}!($1 == "start" || $1 == "stop" || $1 == "restart" || $1 == "fullstatus" || $1 == "status" || $1 == "graceful" || $1 == "configtest"){ s = sprintf("%s -DMOD_%s", s, $1)}END{ printf s}'`
++
+ # check for pidfile
+ if [ -f $PIDFILE ] ; then
+ PID=`cat $PIDFILE`
+@@ -63,12 +72,12 @@
+ fi
+
+ case $ARG in
+- start)
++ start*)
+ if [ $RUNNING -eq 1 ]; then
+ echo "$0 $ARG: httpd (pid $PID) already running"
+ continue
fi
- ;;
-+ startfp|fpstart|start-FP)
-+ if [ $RUNNING -eq 1 ]; then
-+ echo "$0 $ARG: httpd (pid $PID) already running"
-+ continue
-+ fi
-+ if $HTTPD -DFRONTPAGE; then
-+ echo "$0 $ARG: httpd started"
-+ else
-+ echo "$0 $ARG: httpd could not be started"
-+ ERROR=3
-+ fi
-+ ;;
-+ startfpssl|start-FP-SSL)
-+ if [ $RUNNING -eq 1 ]; then
-+ echo "$0 $ARG: httpd (pid $PID) already running"
-+ continue
-+ fi
-+ if $HTTPD -DFRONTPAGE -DSSL; then
-+ echo "$0 $ARG: httpd started"
-+ else
-+ echo "$0 $ARG: httpd could not be started"
-+ ERROR=3
-+ fi
-+ ;;
- stop)
- if [ $RUNNING -eq 0 ]; then
- echo "$0 $ARG: $STATUS"
-@@ -82,6 +112,7 @@
+- if $HTTPD ; then
++ if $HTTPD $MODULES; then
+ echo "$0 $ARG: httpd started"
+ else
+ echo "$0 $ARG: httpd could not be started"
+@@ -82,22 +91,23 @@
fi
if kill $PID ; then
echo "$0 $ARG: httpd stopped"
@@ -59,12 +53,65 @@
else
echo "$0 $ARG: httpd could not be stopped"
ERROR=4
-@@ -153,6 +184,8 @@
- cat <<EOF
+ fi
+ ;;
+- restart)
++ restart*)
+ if [ $RUNNING -eq 0 ]; then
+ echo "$0 $ARG: httpd not running, trying to start"
+- if $HTTPD ; then
++ if $HTTPD $MODULES; then
+ echo "$0 $ARG: httpd started"
+ else
+ echo "$0 $ARG: httpd could not be started"
+ ERROR=5
+ fi
+ else
+- if $HTTPD -t >/dev/null 2>&1; then
++ if $HTTPD -t ${MODULES} >/dev/null 2>&1; then
+ if kill -HUP $PID ; then
+ echo "$0 $ARG: httpd restarted"
+ else
+@@ -111,17 +121,17 @@
+ fi
+ fi
+ ;;
+- graceful)
++ graceful*)
+ if [ $RUNNING -eq 0 ]; then
+ echo "$0 $ARG: httpd not running, trying to start"
+- if $HTTPD ; then
++ if $HTTPD $MODULES; then
+ echo "$0 $ARG: httpd started"
+ else
+ echo "$0 $ARG: httpd could not be started"
+ ERROR=5
+ fi
+ else
+- if $HTTPD -t >/dev/null 2>&1; then
++ if $HTTPD -t ${MODULES} >/dev/null 2>&1; then
+ if kill -USR1 $PID ; then
+ echo "$0 $ARG: httpd gracefully restarted"
+ else
+@@ -141,8 +151,8 @@
+ fullstatus)
+ $LYNX $STATUSURL
+ ;;
+- configtest)
+- if $HTTPD -t; then
++ configtest*)
++ if $HTTPD -t ${MODULES}; then
+ :
+ else
+ ERROR=8
+@@ -161,6 +171,10 @@
+ graceful - do a graceful restart by sending a SIGUSR1 or start if not running
+ configtest - do a configuration syntax test
+ help - this screen
++
++
++ NOTE: You may also use (start|restart|graceful|configtest)_MODULE1[_MODULE2[..]]
++ to start the server with -DMOD_MODULE1[ -DMOD_MODULE2[..]].
- start - start httpd
-+startfp - start httpd with Frontpage enabled
-+startfpssl - start httpd with Frontpage and SSL enabled
- stop - stop httpd
- restart - restart httpd if running by sending a SIGHUP or start if
- not running
+ EOF
+ ERROR=2
diff --git a/www/apache13-fp/files/patch-at b/www/apache13-fp/files/patch-at
index 8a672c89feea..12fc013b93a6 100644
--- a/www/apache13-fp/files/patch-at
+++ b/www/apache13-fp/files/patch-at
@@ -1,11 +1,11 @@
---- src/support/apxs.pl.orig Thu Aug 19 22:57:08 1999
-+++ src/support/apxs.pl Thu Aug 19 23:02:17 1999
-@@ -426,8 +426,7 @@
+--- src/support/apxs.pl.orig Thu Dec 16 10:10:30 1999
++++ src/support/apxs.pl Sun Feb 20 17:33:18 2000
+@@ -424,8 +424,7 @@
my $t = $f;
$t =~ s|^.+/([^/]+)$|$1|;
if ($opt_i) {
-- push(@cmds, "cp $f $CFG_LIBEXECDIR/$t");
-- push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
+- push(@cmds, "cp $f $CFG_LIBEXECDIR/$t");
+- push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
+ push(@cmds, "install -c -m 555 -o root -g wheel $f $CFG_LIBEXECDIR/$t");
}
diff --git a/www/apache13-fp/files/patch-fa b/www/apache13-fp/files/patch-fa
index ff1bde08799f..352a2f74baf8 100644
--- a/www/apache13-fp/files/patch-fa
+++ b/www/apache13-fp/files/patch-fa
@@ -1,205 +1,190 @@
-*** frontpage/version4.0/change_server.sh.orig Mon May 24 13:27:07 1999
---- frontpage/version4.0/change_server.sh Thu Jun 10 19:43:09 1999
-***************
-*** 38,46 ****
- {
- 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"
-
- case "`echo 'x\c'`" in
- 'x\c') echo="echo -n" nnl= ;; #BSD
---- 38,46 ----
- {
- VERSION="4.0"
- PATH=".:/bin:/usr/bin:/sbin:/usr/sbin:/usr/ucb:/etc:/usr/bsd"
-! NEWHTTPDNEW="PREFIX/sbin/httpd"
-! NEWHTTPDCOMPAT="${NEWHTTPDNEW}"
-! DEFAULTHTTPD="PREFIX/sbin/httpd"
-
- case "`echo 'x\c'`" in
- 'x\c') echo="echo -n" nnl= ;; #BSD
-***************
-*** 60,65 ****
---- 60,68 ----
- IRIX*) machine="sgi" ;;
- SunOS*5.*sun4*) machine="solaris" ;;
- SunOS*5.*i386*) machine="solarisx86" ;;
-+ FreeBSD* | \
-+ NetBSD* | \
-+ OpenBSD* | \
- BSD/OS*) machine="bsdi" ;;
- SCO_SV*) machine="sco5" ;;
- UnixWare\ *\ *\ 7*\ i*) machine="uware7" ;;
-***************
-*** 496,505 ****
- *pache*) getHttpDirective $configfile AccessConfig $port
- if [ "$param" != "" ]
- then
-! file=`basename $param`
-! accessconffile="${configfiledir}${file}"
- else
-! accessconffile="${configfiledir}access.conf"
- fi
-
- if [ ! -f "$accessconffile" ]
---- 499,517 ----
- *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" ]
-***************
-*** 1061,1070 ****
- 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
---- 1073,1091 ----
- 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
-***************
-*** 1081,1090 ****
- 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
---- 1102,1120 ----
- 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
-***************
-*** 1108,1117 ****
- *) getHttpDirective $configfile ResourceConfig $port
- if [ "$param" != "" ]
- then
-! file=`basename $param`
-! resconffile="${configfiledir}${file}"
- else
-! resconffile="${configfiledir}srm.conf"
- fi
-
- if [ ! -f "$resconffile" ]
---- 1138,1156 ----
- *) 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" ]
-***************
-*** 1253,1258 ****
---- 1292,1330 ----
- 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()
+--- 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 @@
+ {
+ 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"
++ NEWMODFPNEW="PREFIX/libexec/apache/mod_frontpage.so"
++ NEWHTTPDCOMPAT="${NEWHTTPDNEW}"
++ NEWMODFPCOMAPT="${NEWMODFPNEW}"
++ DEFAULTHTTPD="PREFIX/sbin/httpd"
+
+ case "`echo 'x\c'`" in
+ 'x\c') echo="echo -n" nnl= ;; #BSD
+@@ -60,6 +62,9 @@
+ IRIX*) machine="sgi" ;;
+ SunOS*5.*sun4*) machine="solaris" ;;
+ SunOS*5.*i386*) machine="solarisx86" ;;
++ FreeBSD* | \
++ NetBSD* | \
++ OpenBSD* | \
+ BSD/OS*) machine="bsdi" ;;
+ SCO_SV*) machine="sco5" ;;
+ UnixWare\ *\ *\ 7*\ i*) machine="uware7" ;;
+@@ -214,6 +219,20 @@
+
+ clear
+
++ if ($strings $httpdfile | $fgrep "etc/apache/httpd.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)
+ then
+@@ -232,7 +251,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}" = "" ]
+@@ -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 5e86d31a1721..c45dc5d26b15 100644
--- a/www/apache13-fp/files/patch-fb
+++ b/www/apache13-fp/files/patch-fb
@@ -1,5 +1,5 @@
--- frontpage/version4.0/fp_install.sh.orig Mon May 24 12:45:14 1999
-+++ frontpage/version4.0/fp_install.sh Sat Jun 12 13:56:45 1999
++++ frontpage/version4.0/fp_install.sh Thu Feb 24 20:22:48 2000
@@ -48,7 +48,7 @@
{
VERSION="4.0"
@@ -19,15 +19,99 @@
BSD/OS*) machine="bsdi" ;;
SCO_SV*) machine="sco5" ;;
UnixWare\ *\ *\ 7*\ i*) machine="uware7" ;;
-@@ -327,7 +330,7 @@
- echo "link will be created from /usr/local/frontpage/ to the location that"
- echo "is chosen."
- echo
+@@ -128,7 +131,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/^.*(//;'`
+@@ -321,27 +324,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}"
-+ $echo "FrontPage Extensions directory [${INSTALLDIRDEFAULT}]: ${nnl}"
- read installdir
+- 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."
+@@ -349,22 +352,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" = "" ]
+ if [ "$installdir" != "/usr/local/frontpage" ]
+ then
@@ -414,7 +417,7 @@
vtfile="fp40.$machine.tar"
echo "Platform is $machine."
@@ -207,3 +291,12 @@
}
getnetscapedocroot()
+@@ -2216,7 +2285,7 @@
+
+ initialize
+ step1
+-step2
++#step2
+ step3
+ #
+ # Run the external permissions script.
diff --git a/www/apache13-fp/files/patch-fe b/www/apache13-fp/files/patch-fe
index dc08ba40b41f..2e4fd965c3b6 100644
--- a/www/apache13-fp/files/patch-fe
+++ b/www/apache13-fp/files/patch-fe
@@ -1,8 +1,8 @@
---- src/support/suexec.c.orig Mon Jun 21 19:51:41 1999
-+++ src/support/suexec.c Thu Sep 9 18:58:04 1999
-@@ -70,11 +70,35 @@
- *
- *
+--- src/support/suexec.c.orig Tue Jan 11 13:47:59 2000
++++ src/support/suexec.c Sun Feb 20 17:38:47 2000
+@@ -82,11 +82,35 @@
+ * info: Normal activity message
+ * debug: Self-explanatory
*/
+/*
+ * "System" CGI modification 97.05.10 by Rick Franchuk (rickf@netnation.com)
@@ -36,7 +36,7 @@
#include <stdarg.h>
-@@ -250,6 +274,7 @@
+@@ -262,6 +286,7 @@
char *cmd; /* command to be executed */
char cwd[AP_MAXPATH]; /* current working directory */
char dwd[AP_MAXPATH]; /* docroot working directory */
@@ -44,7 +44,7 @@
struct passwd *pw; /* password entry holder */
struct group *gr; /* group entry holder */
struct stat dir_info; /* directory info holder */
-@@ -404,6 +429,19 @@
+@@ -420,6 +445,19 @@
}
/*
@@ -64,7 +64,7 @@
* Change UID/GID here so that the following tests work over NFS.
*
* Initialize the group access list for the target user,
-@@ -423,6 +461,14 @@
+@@ -439,6 +477,14 @@
}
/*
@@ -79,7 +79,7 @@
* Get the current working directory, as well as the proper
* document root (dependant upon whether or not it is a
* ~userdir request). Error out if we cannot get either one,
-@@ -453,10 +499,15 @@
+@@ -470,10 +516,16 @@
}
}
@@ -87,15 +87,16 @@
+ * This section must be commented out to work properly with
+ * VirtualHosts running CGI in thier own directories.
+ *
++
if ((strncmp(cwd, dwd, strlen(dwd))) != 0) {
- log_err("command not in docroot (%s/%s)\n", cwd, cmd);
+ log_err("error: command not in docroot (%s/%s)\n", cwd, cmd);
exit(114);
}
+ */
/*
* Stat the cwd and verify it is a directory, or error out.
-@@ -502,6 +553,9 @@
+@@ -519,6 +571,9 @@
* Error out if the target name/group is different from
* the name/group of the cwd or the program.
*/
@@ -105,7 +106,7 @@
if ((uid != dir_info.st_uid) ||
(gid != dir_info.st_gid) ||
(uid != prg_info.st_uid) ||
-@@ -513,6 +567,10 @@
+@@ -530,6 +585,10 @@
prg_info.st_uid, prg_info.st_gid);
exit(120);
}
@@ -116,9 +117,9 @@
/*
* Error out if the program is not executable for the user.
* Otherwise, she won't find any error in the logs except for
-@@ -524,6 +582,49 @@
- }
-
+@@ -551,6 +610,49 @@
+ umask(SUEXEC_UMASK);
+ #endif /* SUEXEC_UMASK */
clean_env();
+
+#ifdef FPEXE
diff --git a/www/apache13-fp/files/patch-ff b/www/apache13-fp/files/patch-ff
index 54cbebd71409..dbb076f676a5 100644
--- a/www/apache13-fp/files/patch-ff
+++ b/www/apache13-fp/files/patch-ff
@@ -1,11 +1,11 @@
---- src/support/Makefile.tmpl.orig Tue Aug 10 09:37:18 1999
-+++ src/support/Makefile.tmpl Sat Oct 16 18:41:00 1999
+--- src/support/Makefile.tmpl.orig Thu Dec 9 11:19:48 1999
++++ src/support/Makefile.tmpl Sun Feb 20 17:43:34 2000
@@ -39,7 +39,7 @@
-e 's%@LIBS_SHLIB@%$(LIBS_SHLIB)%g' && chmod a+x apxs
suexec: suexec.o
-- $(CC) $(CFLAGS) suexec.o -o suexec $(LDFLAGS) $(LIBS)
-+ $(CC) $(CFLAGS) suexec.o -o suexec $(LDFLAGS) $(LIBS) -lutil
+- $(CC) $(CFLAGS) -o suexec $(LDFLAGS) suexec.o $(LIBS)
++ $(CC) $(CFLAGS) -o suexec $(LDFLAGS) suexec.o $(LIBS) -lutil
clean:
rm -f $(TARGETS) *.o
diff --git a/www/apache13-fp/files/patch-fi b/www/apache13-fp/files/patch-fi
index d4f19a6140a8..f07c130ca42c 100644
--- a/www/apache13-fp/files/patch-fi
+++ b/www/apache13-fp/files/patch-fi
@@ -1,15 +1,25 @@
---- src/main/http_request.c.orig Fri May 21 07:16:21 1999
-+++ src/main/http_request.c Sat Oct 16 18:47:04 1999
-@@ -187,6 +187,8 @@
+--- src/main/http_request.c.orig Tue Jan 11 08:13:41 2000
++++ src/main/http_request.c Sun Feb 20 18:44:49 2000
+@@ -175,7 +175,7 @@
+ {
+ char *cp;
+ char *path = r->filename;
+- char *end = &path[strlen(path)];
++ char *end;
+ char *last_cp = NULL;
+ int rv;
+ #ifdef HAVE_DRIVE_LETTERS
+@@ -187,6 +187,9 @@
return OK;
}
+ if (r->execfilename) path = r->execfilename;
++ end = path + strlen(path);
+
#ifdef HAVE_DRIVE_LETTERS
/* If the directory is x:\, then we don't want to strip
* the trailing slash since x: is not a valid directory.
-@@ -511,6 +513,7 @@
+@@ -511,6 +514,7 @@
res = ap_parse_htaccess(&htaccess_conf, r, overrides_here,
ap_pstrdup(r->pool, test_dirname),
sconf->access_name);
@@ -17,7 +27,7 @@
if (res)
return res;
-@@ -521,6 +524,7 @@
+@@ -521,6 +525,7 @@
r->per_dir_config = per_dir_defaults;
}
}
diff --git a/www/apache13-fp/files/patch-fn b/www/apache13-fp/files/patch-fn
new file mode 100644
index 000000000000..ed2572945fbf
--- /dev/null
+++ b/www/apache13-fp/files/patch-fn
@@ -0,0 +1,15 @@
+--- 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/files/patch-lang.ca b/www/apache13-fp/files/patch-lang.ca
new file mode 100644
index 000000000000..15745b97525a
--- /dev/null
+++ b/www/apache13-fp/files/patch-lang.ca
@@ -0,0 +1,29 @@
+--- htdocs/index.html.ca.orig Thu Sep 2 06:03:37 1999
++++ htdocs/index.html.ca Sun Feb 20 16:58:53 2000
+@@ -36,16 +36,23 @@
+ <HR>
+ <P>
+ La
+- <A HREF="manual/index.html">documentaci&oacute;</A>
++ <A HREF="http://@@HOSTNAME@@:8080/manual/index.html">documentaci&oacute;</A>
+ d'Apache ha estat inclosa en aquesta distribuci&oacute;.
+ </P>
++<P>The <STRONG>FrontPage 2000 Extentions (mod_frontpage)</STRONG> has been installed, read the
++<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000 documentation</A> carefully.</P>
++<P>Information on the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org/">FreeBSD Home Page</A>.</P>
+ <P>
+ L'administrador de web pot utilitzar lliurement la imatge d'aqu&iacute; sota
+ en el servidor web equipat amb el programari Apache.
+- Gr&agrave;cies per utilitzar Apache&nbsp;!
++ Gr&agrave;cies per utilitzar Apache and FreeBSD!
+ </P>
+ <DIV ALIGN="CENTER">
+- <IMG SRC="apache_pb.gif" ALT="">
++ <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Powered by Apache"></A>
++ <A HREF="http://www.freebsd.org/">
++ <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
++ <A HREF="http://www.microsoft.com/frontpage/default.htm">
++ <IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
+ </DIV>
+ </BODY>
+ </HTML>
diff --git a/www/apache13-fp/files/patch-lang.cz b/www/apache13-fp/files/patch-lang.cz
new file mode 100644
index 000000000000..6e97befafcca
--- /dev/null
+++ b/www/apache13-fp/files/patch-lang.cz
@@ -0,0 +1,30 @@
+--- htdocs/index.html.cz.orig Thu Dec 9 09:56:34 1999
++++ htdocs/index.html.cz Sun Feb 20 16:57:23 2000
+@@ -36,16 +36,23 @@
+ <P>
+ Zde najdete
+ <A
+- HREF="manual/index.html"
++ HREF="http://@@HOSTNAME@@:8080/manual/index.html"
+ >dokumentaci</A>
+ Apache (anglicky) obsaženou v této distribuci.
+ </P>
++<P>The <STRONG>FrontPage 2000 Extentions (mod_frontpage)</STRONG> has been installed, read the
++<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000 documentation</A> carefully.</P>
++<P>Information on the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org/">FreeBSD Home Page</A>.</P>
+ <P>
+ Následující logo může být použito bez omezení na web serveru s
+- programem Apache. Děkujeme za použití Apache!
++ programem Apache. Děkujeme za použití Apache and FreeBSD!
+ </P>
+ <DIV ALIGN="CENTER">
+- <IMG SRC="apache_pb.gif" ALT="">
+- </DIV>
++ <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Powered by Apache"></A>
++ <A HREF="http://www.freebsd.org/">
++ <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
++ <A HREF="http://www.microsoft.com/frontpage/default.htm">
++ <IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
++</DIV>
+ </BODY>
+ </HTML>
diff --git a/www/apache13-fp/files/patch-lang.de b/www/apache13-fp/files/patch-lang.de
new file mode 100644
index 000000000000..a14dca78a5ab
--- /dev/null
+++ b/www/apache13-fp/files/patch-lang.de
@@ -0,0 +1,32 @@
+--- htdocs/index.html.de.orig Wed Aug 18 07:00:56 1999
++++ htdocs/index.html.de Sun Feb 20 17:10:32 2000
+@@ -44,10 +44,15 @@
+ <HR>
+ <P>
+ Die englische <A
+- HREF="manual/index.html">Online-Dokumentation</A> f&uuml;r die
++ HREF="http://@@HOSTNAME@@:8080/manual/index.html">Online-Dokumentation</A> f&uuml;r die
+ Apache Web-Server Software ist Bestandteil dieser
+ Software-Distribution.
+ </P>
++<!-- translated by bablefish.altavista.com -->
++<P>Das <STRONG>FrontPage 2000 Extentions (mod_frontpage)<STRONG> ist installiert worden, die Unterlagen
++<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000</A> sorgfältig las.</P>
++<P>Informationen über das Betriebssystem FreeBSD können auf dem <A HREF="http://www.freebsd.org/"FreeBSD-Home Page</A> gefunden werden.</P>
++<!-- translated by bablefish.altavista.com -->
+ <P>
+ Dem <I>WebMaster</I> dieser Web-Site steht es frei, das
+ untenstehende "Powered by Apache"-Logo auf einem Apache-basierten
+@@ -55,7 +60,11 @@
+ Vielen Dank, dass Sie Apache gew&auml;hlt haben!
+ </P>
+ <DIV ALIGN="CENTER">
+- <IMG SRC="apache_pb.gif" ALT="Powered by Apache!">
++ <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Powered by Apache"></A>
++ <A HREF="http://www.freebsd.org/">
++ <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
++ <A HREF="http://www.microsoft.com/frontpage/default.htm">
++ <IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
+ </DIV>
+ </BODY>
+ </HTML>
diff --git a/www/apache13-fp/files/patch-lang.dk b/www/apache13-fp/files/patch-lang.dk
new file mode 100644
index 000000000000..fc5ec80e6be6
--- /dev/null
+++ b/www/apache13-fp/files/patch-lang.dk
@@ -0,0 +1,29 @@
+--- htdocs/index.html.dk.orig Thu Aug 19 04:19:27 1999
++++ htdocs/index.html.dk Sun Feb 20 17:12:04 2000
+@@ -32,16 +32,23 @@
+ <P>
+ Apache-
+ <A
+- HREF="manual/index.html"
++ HREF="http://@@HOSTNAME@@:8080/manual/index.html"
+ >documentationen</A>
+ er inkluderet med denne distribution.
+ </P>
++<P>The <STRONG>FrontPage 2000 Extentions (mod_frontpage)</STRONG> has been installed, read the
++<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000 documentation</A> carefully.</P>
++<P>Information on the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org/">FreeBSD Home Page</A>.</P>
+ <P>
+ Webmasteren af denne site m&aring; gerne bruge den f&oslash;lgende grafik
+- p&aring; en Apache-drevet webserver. Mange tak for at bruge Apache!
++ p&aring; en Apache-drevet webserver. Mange tak for at bruge Apache and FreeBSD!
+ </P>
+ <DIV ALIGN="CENTER">
+- <IMG SRC="apache_pb.gif" ALT="">
++ <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Powered by Apache"></A>
++ <A HREF="http://www.freebsd.org/">
++ <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
++ <A HREF="http://www.microsoft.com/frontpage/default.htm">
++ <IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
+ </DIV>
+ </BODY>
+ </HTML>
diff --git a/www/apache13-fp/files/patch-lang.ee b/www/apache13-fp/files/patch-lang.ee
new file mode 100644
index 000000000000..5653fb9c955c
--- /dev/null
+++ b/www/apache13-fp/files/patch-lang.ee
@@ -0,0 +1,28 @@
+--- htdocs/index.html.ee.orig Fri Aug 20 15:28:46 1999
++++ htdocs/index.html.ee Sun Feb 20 17:13:15 2000
+@@ -38,16 +38,23 @@
+ <P>
+ Ka Apache
+ <A
+- HREF="manual/index.html"
++ HREF="http://@@HOSTNAME@@:8080/manual/index.html"
+ >dokumentatsioon</A>
+ on selles distributsioonis olemas.
+ </P>
++<P>The <STRONG>FrontPage 2000 Extentions (mod_frontpage)</STRONG> has been installed, read the
++<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000 documentation</A> carefully.</P>
++<P>Information on the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org/">FreeBSD Home Page</A>.</P>
+ <P>
+ Kohalik veebmeister v&otilde;ib vabalt kasutada allpool olevat
+ pilti oma Apache veebiserveril. Ait&auml;h Apachet kasutamast!
+ </P>
+ <DIV ALIGN="CENTER">
+- <IMG SRC="apache_pb.gif" ALT="">
++ <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Powered by Apache"></A>
++ <A HREF="http://www.freebsd.org/">
++ <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
++ <A HREF="http://www.microsoft.com/frontpage/default.htm">
++ <IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
+ </DIV>
+ </BODY>
+ </HTML>
diff --git a/www/apache13-fp/files/patch-lang.en b/www/apache13-fp/files/patch-lang.en
new file mode 100644
index 000000000000..061f39f6a191
--- /dev/null
+++ b/www/apache13-fp/files/patch-lang.en
@@ -0,0 +1,27 @@
+--- htdocs/index.html.en.orig Sat Nov 20 15:29:40 1999
++++ htdocs/index.html.en Sun Feb 20 16:57:41 2000
+@@ -27,12 +27,18 @@
+ <P><HR WIDTH="50%" SIZE="8">
+
+
+-<P>
+-The Apache <A HREF="manual/index.html">documentation</A> has been included with this distribution.
++<P>The Apache <A HREF="http://@@HOSTNAME@@:8080/manual/index.html">documentation</A> has been included with this distribution.</P>
++<P>The <STRONG>FrontPage 2000 Extentions (mod_frontpage)</STRONG> has been installed, read the
++<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000 documentation</A> carefully.</P>
++<P>Information on the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org/">FreeBSD Home Page</A>.</P>
++<P>You are free to use the images below on an Apache-powered web server. Thanks for using Apache and FreeBSD!
+
+-<P>
+-You are free to use the image below on an Apache-powered web server. Thanks for using Apache!
+-
+-<DIV ALIGN="CENTER"><IMG SRC="apache_pb.gif" ALT=""></DIV>
++<DIV ALIGN="CENTER">
++ <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Powered by Apache"></A>
++ <A HREF="http://www.freebsd.org/">
++ <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
++ <A HREF="http://www.microsoft.com/frontpage/default.htm">
++ <IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
++</DIV>
+ </BODY>
+ </HTML>
diff --git a/www/apache13-fp/files/patch-lang.es b/www/apache13-fp/files/patch-lang.es
new file mode 100644
index 000000000000..79178c10c0fd
--- /dev/null
+++ b/www/apache13-fp/files/patch-lang.es
@@ -0,0 +1,30 @@
+--- htdocs/index.html.es.orig Fri Aug 27 06:08:59 1999
++++ htdocs/index.html.es Sun Feb 20 17:15:30 2000
+@@ -35,17 +35,24 @@
+ <P>
+ La
+ <A
+- HREF="manual/index.html"
++ HREF="http://@@HOSTNAME@@:8080/manual/index.html"
+ >documentaci&oacute;n</A>
+ de Apache ha sido incluida en esta distribuci&oacute;n.
+ </P>
++<P>The <STRONG>FrontPage 2000 Extentions (mod_frontpage)</STRONG> has been installed, read the
++<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000 documentation</A> carefully.</P>
++<P>Information on the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org/">FreeBSD Home Page</A>.</P>
+ <P>
+ El administrador del sitio esta invitado a usar la siguiente
+ imagen para indicar que su sitio es servido por Apache.
+- &iexcl;Gracias por usar Apache!
++ &iexcl;Gracias por usar Apachei and FreeBSD!
+ </P>
+ <DIV ALIGN="CENTER">
+- <IMG SRC="apache_pb.gif" ALT="">
++ <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Powered by Apache"></A>
++ <A HREF="http://www.freebsd.org/">
++ <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
++ <A HREF="http://www.microsoft.com/frontpage/default.htm">
++ <IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
+ </DIV>
+ </BODY>
+ </HTML>
diff --git a/www/apache13-fp/files/patch-lang.fr b/www/apache13-fp/files/patch-lang.fr
new file mode 100644
index 000000000000..1b90b5fd624e
--- /dev/null
+++ b/www/apache13-fp/files/patch-lang.fr
@@ -0,0 +1,29 @@
+--- htdocs/index.html.fr.orig Wed Aug 18 09:46:23 1999
++++ htdocs/index.html.fr Sun Feb 20 17:16:43 2000
+@@ -38,16 +38,23 @@
+ <HR>
+ <P>
+ La
+- <A HREF="manual/index.html">documentation</A>
++ <A HREF="http://@@HOSTNAME@@:8080/manual/index.html">documentation</A>
+ Apache est incluse dans cette distribution.
+ </P>
++<P>The <STRONG>FrontPage 2000 Extentions (mod_frontpage)</STRONG> has been installed, read the
++<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000 documentation</A> carefully.</P>
++<P>Information on the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org/">FreeBSD Home Page</A>.</P>
+ <P>
+ Le webmaster de ce site peut librement utiliser l'image ci-dessous
+ sur un site web utilisant le logiciel Apache. Merci d'avoir choisi
+- Apache&nbsp;!
++ Apache and FreeBSD!
+ </P>
+ <DIV ALIGN="CENTER">
+- <IMG SRC="apache_pb.gif" ALT="">
++ <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Powered by Apache"></A>
++ <A HREF="http://www.freebsd.org/">
++ <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
++ <A HREF="http://www.microsoft.com/frontpage/default.htm">
++ <IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
+ </DIV>
+ </BODY>
+ </HTML>
diff --git a/www/apache13-fp/files/patch-lang.it b/www/apache13-fp/files/patch-lang.it
new file mode 100644
index 000000000000..9e19bd73434c
--- /dev/null
+++ b/www/apache13-fp/files/patch-lang.it
@@ -0,0 +1,27 @@
+--- htdocs/index.html.it.orig Fri Aug 20 04:35:43 1999
++++ htdocs/index.html.it Sun Feb 20 17:18:41 2000
+@@ -27,12 +27,20 @@
+ <b><font size=+1>ignorato</font></b>.</blockquote>
+
+ <hr>
+-<br>La <a href="manual/index.html">documentazione</a> relativa di Apache
++<br>La <a href="http://@@HOSTNAME@@/manual/index.html">documentazione</a> relativa di Apache
+ e' inclusa nella distribuzione.
++<P>The <STRONG>FrontPage 2000 Extentions (mod_frontpage)</STRONG> has been installed, read the
++<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000 documentation</A> carefully.</P>
++<P>Information on the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org/">FreeBSD Home Page</A>.</P>
+ <p>Il Webmaster di questo sito e' libero di utilizzare l'immagine qui sotto
+-su qualsiasi Web server potenziato con Apache. Grazie per aver scelto Apache!
+-<center>
+-<p><img SRC="apache_pb.gif" ALT="" ></center>
++su qualsiasi Web server potenziato con Apache. Grazie per aver scelto Apache and FreeBSD!
+
++<DIV ALIGN="CENTER">
++ <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Powered by Apache"></A>
++ <A HREF="http://www.freebsd.org/">
++ <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
++ <A HREF="http://www.microsoft.com/frontpage/default.htm">
++ <IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
++</DIV>
+ </body>
+ </html>
diff --git a/www/apache13-fp/files/patch-lang.ja b/www/apache13-fp/files/patch-lang.ja
new file mode 100644
index 000000000000..2fb3fd820fb2
--- /dev/null
+++ b/www/apache13-fp/files/patch-lang.ja
@@ -0,0 +1,27 @@
+--- htdocs/index.html.ja.jis.orig Sun Jan 30 10:18:35 2000
++++ htdocs/index.html.ja.jis Fri Feb 25 19:46:09 2000
+@@ -30,13 +30,20 @@
+
+
+ <p>
+-Apache $B$K4X$9$k(B<A HREF="manual/index.html">$BJ8=q(B</A> $B$O!"$3$N(B web $B%5!<%PG[I[J*$NCf$K4^$^$l$F$$$^$9!#(B
++Apache $B$K4X$9$k(B<A HREF="http://@@HOSTNAME@@:8080/manual/index.html">$BJ8=q(B</A> $B$O!"$3$N(B web $B%5!<%PG[I[J*$NCf$K4^$^$l$F$$$^$9!#(B
+ </p>
++<P>The <STRONG>FrontPage 2000 Extentions (mod_frontpage)</STRONG> has been installed, read the
++<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000 documentation</A> carefully.</P>
++<P>Information on the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org/">FreeBSD Home Page</A>.</P>
+ <p>
+ $B0J2<$N2hA|$O!"(BApache $B$rMxMQ$7$F$$$k(B web $B%5!<%P$G<+M3$K;H$&$3$H$,$G$-$^$9!#(BApache $B$r$4MxMQ$$$?$@$-!"$"$j$,$H$&$4$6$$$^$9(B!
+ </p>
+- <div align="center">
+- <img src="apache_pb.gif" alt="">
+- </div>
++<DIV ALIGN="CENTER">
++ <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Powered by Apache"></A>
++ <A HREF="http://www.freebsd.org/">
++ <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
++ <A HREF="http://www.microsoft.com/frontpage/default.htm">
++ <IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
++ </DIV>
+ </body>
+ </html>
diff --git a/www/apache13-fp/files/patch-lang.lu b/www/apache13-fp/files/patch-lang.lu
new file mode 100644
index 000000000000..d18e42e9aa16
--- /dev/null
+++ b/www/apache13-fp/files/patch-lang.lu
@@ -0,0 +1,27 @@
+--- htdocs/index.html.lu.orig Fri Aug 20 15:28:47 1999
++++ htdocs/index.html.lu Sun Feb 20 17:20:24 2000
+@@ -27,11 +27,21 @@
+ Autoren. Falls Dir d&euml;st awer macht, get &auml;ren message&nbsp; <b><font size=+2>ignoreiert.</font></b></blockquote>
+
+ <hr>
+-<p>D'Apache <a href="manual/index.html">documentation</a> ass d&euml;ser Ausgab
++<p>D'Apache <a href="http://@@HOSTNAME@@/manual/index.html">documentation</a> ass d&euml;ser Ausgab
+ beigef&uuml;cht.
++<P>The <STRONG>FrontPage 2000 Extentions (mod_frontpage)</STRONG> has been installed, read the
++<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000 documentation</A> carefully.</P>
++<P>Information on the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org/">FreeBSD Home Page</A>.</P>
+ <p>Dem Webmaster vun dem heitenen site steht et zou dest Bild ob engem
+-Apache-powered Web server ze presenteieren. Merci dat Dir Apache benotzt!
+-<center><img SRC="apache_pb.gif" ALT="" ></center>
++Apache-powered Web server ze presenteieren. Merci dat Dir Apache and FreeBSD benotzt!
++
++<DIV ALIGN="CENTER">
++ <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Powered by Apache"></A>
++ <A HREF="http://www.freebsd.org/">
++ <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
++ <A HREF="http://www.microsoft.com/frontpage/default.htm">
++ <IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
++</DIV>
+
+ </body>
+ </html>
diff --git a/www/apache13-fp/files/patch-lang.nl b/www/apache13-fp/files/patch-lang.nl
new file mode 100644
index 000000000000..53abe28a062c
--- /dev/null
+++ b/www/apache13-fp/files/patch-lang.nl
@@ -0,0 +1,29 @@
+--- htdocs/index.html.nl.orig Wed Aug 18 09:46:23 1999
++++ htdocs/index.html.nl Sun Feb 20 17:21:43 2000
+@@ -39,16 +39,23 @@
+ <HR>
+ <P>
+ De
+- <A HREF="manual/index.html" >handleiding</A> voor de apache web
++ <A HREF="http://@@HOSTNAME@@:8080/manual/index.html" >handleiding</A> voor de apache web
+ server software maakt deel uit van deze distributie.
+ </P>
++<P>The <STRONG>FrontPage 2000 Extentions (mod_frontpage)</STRONG> has been installed, read the
++<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000 documentation</A> carefully.</P>
++<P>Information on the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org/">FreeBSD Home Page</A>.</P>
+ <P>
+ Als beheerder of <I>webmaster</I> is het u toegestaan het onderstaande
+ plaatje vrijelijk te gebruiken op uw 'Apache Powered' web site. Bedankt
+- voor het kiezen voor, en gebruiken van, Apache!
++ voor het kiezen voor, en gebruiken van, Apache and FreeBSD!
+ </P>
+ <DIV ALIGN="CENTER">
+- <IMG SRC="apache_pb.gif" ALT="Klein 'Powered by Apache' Logotje">
++ <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Klein 'Powered by Apache' Logotje"></A>
++ <A HREF="http://www.freebsd.org/">
++ <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
++ <A HREF="http://www.microsoft.com/frontpage/default.htm">
++ <IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
+ </DIV>
+ </BODY>
+ </HTML>
diff --git a/www/apache13-fp/files/patch-lang.pt b/www/apache13-fp/files/patch-lang.pt
new file mode 100644
index 000000000000..330cca627047
--- /dev/null
+++ b/www/apache13-fp/files/patch-lang.pt
@@ -0,0 +1,25 @@
+--- htdocs/index.html.pt.orig Mon Jan 31 17:23:27 2000
++++ htdocs/index.html.pt Fri Feb 25 19:39:00 2000
+@@ -33,10 +33,19 @@
+ <P><HR WIDTH="50%" SIZE="8">
+
+
+-<P> A <A HREF="manual/index.html">documenta&ccedil;&atilde;o</A> foi inclu&iacute;da
++<P> A <A HREF="http://@@HOSTNAME@@:8080/manual/index.html">documenta&ccedil;&atilde;o</A> foi inclu&iacute;da
+ juntamente com esta distribui&ccedil;&atilde;o.
++<P>The <STRONG>FrontPage 2000 Extentions (mod_frontpage)</STRONG> has been installed, read the
++<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000 documentation</A> carefully.</P>
++<P>Information on the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org/">FreeBSD Home Page</A>.</P>
+ <P> A imagem abaixo pode ser usada livremente em qualquer site presente num servidor
+- com o Apache Web Server instalado. Obrigado por usar o Apache Web Server!
+-<DIV ALIGN="CENTER"><IMG SRC="apache_pb.gif" ALT=""></DIV>
++ com o Apache Web Server instalado. Obrigado por usar o Apache Web Server and FreeBSD!
++<DIV ALIGN="CENTER">
++ <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Powered by Apache"></A>
++ <A HREF="http://www.freebsd.org/">
++ <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
++ <A HREF="http://www.microsoft.com/frontpage/default.htm">
++ <IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
++/DIV>
+ </BODY>
+ </HTML>
diff --git a/www/apache13-fp/files/patch-lang.pt-br b/www/apache13-fp/files/patch-lang.pt-br
new file mode 100644
index 000000000000..22cc9fb4f93a
--- /dev/null
+++ b/www/apache13-fp/files/patch-lang.pt-br
@@ -0,0 +1,27 @@
+--- htdocs/index.html.pt-br.orig Sun Jan 30 13:59:38 2000
++++ htdocs/index.html.pt-br Fri Feb 25 19:49:10 2000
+@@ -41,15 +41,22 @@
+ </BLOCKQUOTE>
+ <HR>
+ <P>
+- O Apache <A HREF="manual/index.html" >documentation</A>
++ O Apache <A HREF="http://@@HOSTNAME@@:8080/manual/index.html" >documentation</A>
+ foi incluido com esta distribuicao.
+ </P>
++<P>The <STRONG>FrontPage 2000 Extentions (mod_frontpage)</STRONG> has been installed, read the
++<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000 documentation</A> carefully.</P>
++<P>Information on the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org/">FreeBSD Home Page</A>.</P>
+ <P>
+ O Webmaster deste site e livre para utilizar a imagem abaixo num
+ Web server instalado com o Apache. Obrigado por utilizar o Apache!
+ </P>
+ <DIV ALIGN="CENTER">
+- <IMG SRC="apache_pb.gif" ALT="">
++ <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Powered by Apache"></A>
++ <A HREF="http://www.freebsd.org/">
++ <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
++ <A HREF="http://www.microsoft.com/frontpage/default.htm">
++ <IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
+ </DIV>
+ </BODY>
+ </HTML>
diff --git a/www/apache13-fp/files/patch-lang.se b/www/apache13-fp/files/patch-lang.se
new file mode 100644
index 000000000000..4e254f746c6f
--- /dev/null
+++ b/www/apache13-fp/files/patch-lang.se
@@ -0,0 +1,30 @@
+--- htdocs/index.html.se.orig Wed Aug 18 09:44:57 1999
++++ htdocs/index.html.se Sun Feb 20 17:24:31 2000
+@@ -30,14 +30,21 @@
+ </blockquote>
+ <hr>
+ <p>
+- Apache-<a href="manual/index.html">dokumentationen</a> &auml;r inkluderad i denna distribution.
++ Apache-<a href="http://@@HOSTNAME@@:8080/manual/index.html">dokumentationen</a> &auml;r inkluderad i denna distribution.
+ </p>
++<P>The <STRONG>FrontPage 2000 Extentions (mod_frontpage)</STRONG> has been installed, read the
++<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000 documentation</A> carefully.</P>
++<P>Information on the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org/">FreeBSD Home Page</A>.</P>
+ <p>
+ Administrat&ouml;ren av denna webbplats f&aring;r g&auml;rna anv&auml;nda f&ouml;ljande bild till en webbplats som anv&auml;nder Apache.<br>
+- Tack f&ouml;r att ni anv&auml;nder Apache!
++ Tack f&ouml;r att ni anv&auml;nder Apache and FreeBSD!
+ </p>
+- <div align="CENTER">
+- <img src="apache_pb.gif" alt="">
+- </div>
+- </body>
++<DIV ALIGN="CENTER">
++ <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Powered by Apache"></A>
++ <A HREF="http://www.freebsd.org/">
++ <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
++ <A HREF="http://www.microsoft.com/frontpage/default.htm">
++ <IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
++</DIV>
++</body>
+ </html>
diff --git a/www/apache13-fp/pkg-install b/www/apache13-fp/pkg-install
new file mode 100644
index 000000000000..d2b43b878d20
--- /dev/null
+++ b/www/apache13-fp/pkg-install
@@ -0,0 +1,90 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Created by: hetzels@westbend.net
+
+PKG_BATCH=${BATCH:=NO}
+
+PKG_PREFIX=${PKG_PREFIX}
+AP_SHARE=${PKG_PREFIX}/share/doc/apache
+HOST_NAME=`/bin/hostname`
+AP_DATA=${PKG_PREFIX}/www/data
+FPINSTALL=${PKG_PREFIX}/frontpage/version4.0/fp_install.sh
+CHANGESERVER=${PKG_PREFIX}/frontpage/version4.0/change_server.sh
+FPDOCDIR=${AP_SHARE}/manual/mod/mod_frontpage
+IMAGES_VTI=${PKG_PREFIX}/www/data/images/_vti_cnf
+HTTPD_CONF=${PKG_PREFIX}/etc/apache/httpd.conf
+
+create_apache_lang_doc ()
+{
+ if [ ! -d ${AP_DATA} ]; then
+ /bin/mkdir -p ${AP_DATA}
+ fi
+
+ for lang in ca cz de dk ee en es fr it ja.jis lu nl po.iso-pl pt pt-br se
+ {
+ /bin/cat ${AP_SHARE}/index.html.${lang}-dist | \
+ /usr/bin/sed -e 's;@@HOSTNAME@@;'${HOST_NAME}';' \
+ > ${AP_SHARE}/index.html.${lang}
+ if [ ! -f ${AP_DATA}/index.html ] ; then
+ if [ ! -f ${AP_DATA}/index.html.${lang} ]; then
+ /bin/cp -rp ${AP_SHARE}/index.html.${lang} \
+ ${AP_DATA}/index.html.${lang}
+ fi
+ fi
+ }
+}
+
+fix_frontpage_scripts ()
+{
+ /bin/cat ${FPINSTALL}-dist | \
+ /usr/bin/sed -e 's;PREFIX;'${PKG_PREFIX}';' \
+ -e 's;MOD_FPDOCDIR;'${FPDOCDIR}';' \
+ > ${FPINSTALL}
+ /bin/cat ${CHANGESERVER}-dist | \
+ /usr/bin/sed -e 's;PREFIX;'${PKG_PREFIX}';' \
+ > ${CHANGESERVER}
+ /bin/chmod 555 ${CHANGESERVER} ${FPINSTALL}
+ /usr/sbin/chown bin ${CHANGESERVER} ${FPINSTALL}
+}
+
+fix_httpd_conf ()
+{
+ if [ ! -f ${HTTPD_CONF} ] ; then
+ /bin/cat ${HTTPD_CONF}.default | \
+ /usr/bin/sed -e 's;@@HOSTNAME@@;'${HOST_NAME}';' \
+ > ${HTTPD_CONF}
+ fi
+}
+#Add the appropriate comment to the images/_vti_cnf file.
+comment_files ()
+{
+ if [ -d ${IMAGES_VTI} ]; then \
+ if [ ! "`grep description ${IMAGES_VTI}/apache_pb.gif`" ] ; then \
+ /bin/echo "vti_description:SW|Apache Webserver" >> ${IMAGES_VTI}/apache_pb.gif ;\
+ fi
+ if [ ! "`grep description ${IMAGES_VTI}/fplogo.gif`" ] ; then \
+ /bin/echo "vti_description:SW|Created with Microsoft FrontPage 2000" >> ${IMAGES_VTI}/fplogo.gif ; \
+ fi
+ if [ ! "`grep description ${IMAGES_VTI}/powerlogo.gif`" ] ; then \
+ /bin/echo "vti_description:SW|Powered by FreeBSD" >> ${IMAGES_VTI}/powerlogo.gif ; \
+ fi
+ fi
+}
+
+case $2 in
+ PRE-INSTALL)
+ ;;
+ POST-INSTALL)
+ # If we are not in batch mode then run the FP install script.
+ if [ "${PKG_BATCH}" = "NO" ]; then
+ create_apache_lang_doc
+ fix_frontpage_scripts
+ fix_httpd_conf
+ ${FPINSTALL}
+ comment_files
+ fi
+ ;;
+
+esac
diff --git a/www/apache13-fp/pkg-plist b/www/apache13-fp/pkg-plist
index 47870ef4de11..3c669b51cfea 100644
--- a/www/apache13-fp/pkg-plist
+++ b/www/apache13-fp/pkg-plist
@@ -2,15 +2,14 @@ bin/dbmmanage
bin/htdigest
bin/htpasswd
etc/apache/access.conf.default
-@exec if [ ! -f %B/access.conf ]; then cp %D/%F %B/access.conf ; fi
+@exec if [ ! -f %B/access.conf ]; then cp %B/%f %B/access.conf ; fi
etc/apache/httpd.conf.default
-@exec if [ ! -f %B/httpd.conf ]; then cp %D/%F %B/httpd.conf ; fi
etc/apache/magic.default
-@exec if [ ! -f %B/magic ]; then cp %D/%F %B/magic ; fi
+@exec if [ ! -f %B/magic ]; then cp %B/%f %B/magic ; fi
etc/apache/mime.types.default
-@exec if [ ! -f %B/mime.types ]; then cp %D/%F %B/mime.types ; fi
+@exec if [ ! -f %B/mime.types ]; then cp %B/%f %B/mime.types ; fi
etc/apache/srm.conf.default
-@exec if [ ! -f %B/srm.conf ]; then cp %D/%F %B/srm.conf ; fi
+@exec if [ ! -f %B/srm.conf ]; then cp %B/%f %B/srm.conf ; fi
etc/rc.d/apache.sh
include/apache/alloc.h
include/apache/ap.h
@@ -98,10 +97,28 @@ sbin/rotatelogs
sbin/suexec
share/doc/apache/apache_pb.gif
@exec if [ ! -d %D/www/data/images ] ; then mkdir -p %D/www/data/images ; fi
-share/doc/apache/index.html
-@exec if [ ! -f %D/www/data/%f ]; then cp %D/%F %D/www/data/%f; fi
@exec if [ ! -h %B/images ]; then (cd %B ; ln -s manual/images images); fi
@unexec if [ -h %B/images ]; then rm -f %B/images; fi
+share/doc/apache/index.html.ca-dist
+share/doc/apache/index.html.cz-dist
+share/doc/apache/index.html.de-dist
+share/doc/apache/index.html.dk-dist
+share/doc/apache/index.html.ee-dist
+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.ja.jis
+share/doc/apache/index.html.lu-dist
+share/doc/apache/index.html.nl-dist
+share/doc/apache/index.html.po.iso-pl
+share/doc/apache/index.html.po.iso-pl-dist
+share/doc/apache/index.html.pt-br
+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.??
share/doc/apache/manual/LICENSE
share/doc/apache/manual/bind.html
share/doc/apache/manual/cgi_path.html
@@ -154,6 +171,7 @@ share/doc/apache/manual/misc/perf-dec.html
share/doc/apache/manual/misc/perf-hp.html
share/doc/apache/manual/misc/perf-tuning.html
share/doc/apache/manual/misc/perf.html
+share/doc/apache/manual/misc/rewriteguide.html
share/doc/apache/manual/misc/security_tips.html
share/doc/apache/manual/misc/vif-info.html
share/doc/apache/manual/misc/windoz_keepalive.html
@@ -211,6 +229,7 @@ share/doc/apache/manual/mod/mod_userdir.html
share/doc/apache/manual/mod/mod_usertrack.html
share/doc/apache/manual/mod/mod_vhost_alias.html
share/doc/apache/manual/multilogs.html
+share/doc/apache/manual/netware.html
share/doc/apache/manual/new_features_1_0.html
share/doc/apache/manual/new_features_1_1.html
share/doc/apache/manual/new_features_1_2.html
@@ -353,8 +372,7 @@ www/icons/uu.gif
www/icons/uuencoded.gif
www/icons/world1.gif
www/icons/world2.gif
-@exec if [ ! -d /var/spool/apache ] ; then mkdir -p /var/spool/apache ; echo " change owner & group of /var/spool/apache to the owner & group the Apache Server uses in httpd.conf" ; fi
-@unexec rm -rf /var/spool/apache
+@exec mkdir -p %D/www/proxy
@dirrm etc/apache
@dirrm include/apache/xml
@dirrm include/apache
@@ -370,10 +388,14 @@ www/icons/world2.gif
@dirrm www/cgi-bin.default
@dirrm www/icons/small
@dirrm www/icons
+@dirrm www/proxy
@dirrm www
frontpage/%%FP_REV%%/LICENSE.TXT
-frontpage/%%FP_REV%%/change_server.sh
-frontpage/%%FP_REV%%/fp_install.sh
+frontpage/%%FP_REV%%/change_server.sh-dist
+@unexec rm -f %B/change_server.sh
+@unexec rm -f %B/change_server_results.txt
+frontpage/%%FP_REV%%/fp_install.sh-dist
+@unexec rm -f %B/fp_install.sh
frontpage/%%FP_REV%%/frontpage.cnf
@unexec if [ -f %B/%f.orig ] ; then rm -f %B/%f.orig ; fi
frontpage/%%FP_REV%%/set_default_perms.sh
@@ -407,9 +429,6 @@ 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/fpexe.c
-frontpage/%%FP_REV%%/apache-fp/httpd
-frontpage/%%FP_REV%%/apache-fp/httpd.Compat
-@unexec rm %D/frontpage/%%FP_REV%%/apache-fp/suidkey*
frontpage/%%FP_REV%%/bin/_vti_inf.htm
frontpage/%%FP_REV%%/bin/fpsrvadm.exe
frontpage/%%FP_REV%%/bin/postinfo.htm
@@ -560,3 +579,24 @@ frontpage/%%FP_REV%%/srcs/fp.suid.c
@dirrm frontpage/%%FP_REV%%/srcs
@dirrm frontpage/%%FP_REV%%
@dirrm frontpage
+/usr/local/www/data
+/usr/local/www/data/images
+/usr/local/www/data/images/apache_pb.gif
+/usr/local/www/data/images/fplogo.gif
+/usr/local/www/data/images/powerlogo.gif
+/usr/local/www/data/index.html.ca
+/usr/local/www/data/index.html.cz
+/usr/local/www/data/index.html.de
+/usr/local/www/data/index.html.dk
+/usr/local/www/data/index.html.ee
+/usr/local/www/data/index.html.en
+/usr/local/www/data/index.html.es
+/usr/local/www/data/index.html.fr
+/usr/local/www/data/index.html.it
+/usr/local/www/data/index.html.ja.jis
+/usr/local/www/data/index.html.lu
+/usr/local/www/data/index.html.nl
+/usr/local/www/data/index.html.po.iso-pl
+/usr/local/www/data/index.html.pt
+/usr/local/www/data/index.html.pt-br
+/usr/local/www/data/index.html.se