15 files changed, 914 insertions, 380 deletions

diff --git a/www/frontpage/Makefile b/www/frontpage/Makefile
index 984c20f4dedf..295a4fc6ed71 100644
--- a/www/frontpage/Makefile
+++ b/www/frontpage/Makefile
@@ -6,127 +6,88 @@
 #
 
 PORTNAME=	frontpage
-PORTVERSION=	5.0.2.2623
-PORTREVISION=	1
+PORTVERSION=	5.0.2.2635
+PORTREVISION=	0
 CATEGORIES=	www
-MASTER_SITES=	ftp://ftp.microsoft.com/products/frontpage/ \
-		ftp://www.westbend.net/pub/microsoft/frontpage/
+MASTER_SITES=	# Needs to be manually fetched from http://www.rtr.com
+
 DISTFILES=	${FRONTPAGE}
+DIST_SUBDIR=	fp${PORTVERSION:S/.//g}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	swhetzel@gmail.com
 COMMENT=	Microsoft Frontpage 2002 Extensions
 
-.include <bsd.port.pre.mk>
-
-USE_REINPLACE=	yes
+ONLY_FOR_ARCHS=	i386 ia64 amd64 alpha sparc
 
-ONLY_FOR_ARCHS=	i386 alpha
+EXTRACT_ONLY=
+NO_WRKSUBDIR=	yes
+NO_BUILD=	yes
+BATCH?=		NO
 
-FP_VER=		${PORTVERSION:C|^([0-9]+)\.([0-9]+).*|\1.\2|}
+USE_REINPLACE=	yes
+USE_PERL5_RUN=	yes
 
-.if ${ARCH} == i386
-.ifdef WANT_BSDI_EXT
-FRONTPAGE=	fp${FP_VER:S/.//}.bsdi.tar.Z
-EXTRA_PATCHES=	${FILESDIR}/fp_install.bsdi
-.if ${OSVERSION} < 4300001 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500014 )
-PKGMESSAGE=	pkg-message.bsdi
-.endif
-.else
-.if (defined(BATCH) && ${BATCH} == YES ) || !exists(/usr/lib/compat/libc.so.3)
-LIB_DEPENDS+=	c.3:${PORTSDIR}/misc/compat3x
-.endif
-FRONTPAGE=	fp${FP_VER:S/.//}.freebsd.tar.Z
-.if ${OSVERSION} < 4300001 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500014 )
-PKGMESSAGE=	pkg-message.freebsd
-.endif
-.endif
-.elif ${ARCH} == alpha
-FRONTPAGE=	fp${FP_VER:S/.//}.alpha.tar.Z
-EXTRA_PATCHES=	${FILESDIR}/fp_install.alpha
-.endif
+USE_RC_SUBR=	yes
+RC_SCRIPTS=	frontpage:0010
+RC_SCRIPT_PREFIX=	${RC_SCRIPTS:S/${RC_SCRIPTS:C/:[^:]+$//}//:S/://}
+RC_SCRIPT=	${RC_SCRIPTS:C/:[^:]+$//}.sh
 
-.ifdef ALL_FP
-FRONTPAGE=	fp${FP_VER:S/.//}.freebsd.tar.Z \
-		fp${FP_VER:S/.//}.bsdi.tar.Z \
-		fp${FP_VER:S/.//}.alpha.tar.Z
-.endif
+SUB_FILES=	${RC_SCRIPT}
+SUB_LIST+=	RC_SUBR=${RC_SUBR} PERL5=${PERL} FP_VER=${FP_VER}
 
-EXTRACT_ONLY=
-NO_WRKSUBDIR=	yes
-NO_BUILD=	yes
+.include <bsd.port.pre.mk>
+.include "${.CURDIR}/Makefile.fp.common"
 
-BATCH?=		NO
-CHMOD?=		/bin/chmod
-NM=		/usr/bin/nm
-CRYPT_DES!=	${NM} /usr/lib/libcrypt.a | ${GREP} -q -e "crypt_des" ; echo $$?
 FP_DIR=		frontpage/version${FP_VER}
-FPINSTALL=	${FP_DIR}/fp_install.sh
-FPEXEC=		${FP_DIR}/apache-fp/fpexe.c
-FPSETPERM=	${FP_DIR}/set_default_perms.sh
-README=		${FP_DIR}/readme.htm
-FPHTTPD=	${FP_DIR}/apache-fp
-FPCSS=		${FP_DIR}/admin/1033/webadmin.css
-
-MOD_FPDOCDIR=	${PREFIX}/share/doc/apache/manual/frontpage
-
-PLIST_SUB=	FP_VER=${FP_VER}
-
-pre-extract:
-.if ${OSVERSION} < 430001 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500014 )
-	@if ! ${LDCONFIG} -r | ${GREP} -q -e "-ldescrypt"; then \
-	   ${ECHO} ; \
-	   ${ECHO} "WARNING: MS FrontPage Extensions requires the libdescrypt library"; \
-	   ${ECHO} "  Install the libdescrypt Library, then build apache-fp"; \
-	   ${ECHO} ; \
-	   ${ECHO} "  FreeBSD Handbook - Security (chapter 10)"; \
-	   ${ECHO} "    http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/crypt.html"; \
-	   ${ECHO} ; \
-	   ${FALSE} ; \
-	fi
-.else
-.if ${CRYPT_DES} == 1
-	@${ECHO}
-	@${ECHO} "WARNING: MS FrontPage Extensions requires crypt_des in"
-	@${ECHO} "   the /usr/lib/libcrypt library.  You will need to"
-	@${ECHO} "   rebuild the libcrypt library with DES support."
-.if defined(NOSECURE) || defined(NOCRYPT)
-	@${ECHO}
-	@${ECHO} "   You need to comment out both NOSECURE and NOCRYPT"
-	@${ECHO} "   in the /etc/make.conf file before rebuilding the"
-	@${ECHO} "   libcrypt library."
-.endif
-	@${ECHO}
-	@${FALSE}
-.endif
+FP_INSTALL=	${FP_DIR}/fp_install.sh
+FP_SETPERM=	${FP_DIR}/set_default_perms.sh
+FP_DOCS=	readme.htm readme_apache_dso.txt LICENSE.TXT
+
+EXTRACT_FILES=	${FP_INSTALL} ${FP_SETPERM}
+
+.if ${ARCH} == alpha
+EXTRA_PATCHES=	fp_install.alpha
+.elif ${ARCH} == sparc64
+EXTRA_PATCHES=	fp_install.sparc
+.elif defined(WANT_BSDI_EXTENSIONS)
+EXTRA_PATCHES=	fp_install.bsdi
 .endif
 
-post-extract:
-	@${ECHO} "===>  Extracting FrontPage install scripts"
-	cd ${WRKDIR} && \
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${FRONTPAGE} \
-		${EXTRACT_AFTER_ARGS} ${FPINSTALL} ${FPEXEC} \
-		${README} ${FPSETPERM}
+do-extract:
+	@${RM} -rf ${WRKDIR}
+	@${MKDIR} ${WRKDIR}
+	@if ! (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
+		${_DISTDIR}/${FRONTPAGE} ${EXTRACT_AFTER_ARGS} ${EXTRACT_FILES}); \
+	then \
+		exit 1; \
+	fi
 
 post-patch:
 .if !defined(PATCH_DEBUG)
-	@${REINPLACE_CMD} -e 's:PREFIX:${PREFIX}:g' ${WRKDIR}/${FPINSTALL}
+	@${REINPLACE_CMD} -e 's:PREFIX:${PREFIX}:g' \
+			  -e 's:DOCSDIR:${DOCSDIR}:g' ${WRKDIR}/${FP_INSTALL}
 .endif
 
 do-install:
 	@${ECHO_MSG} "===> Untaring FrontPage Extensions to ${PREFIX}"
-	@(cd ${PREFIX} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${FRONTPAGE} ${EXTRACT_AFTER_ARGS})
-	@${REINPLACE_CMD} -e 's:IMAGESDIR:../images/:g' ${PREFIX}/${FPCSS}
-	@if [ -f ${PREFIX}/${FPCSS} ]; then \
-		${RM} ${PREFIX}/${FPCSS}.bak ; \
-	fi
-	@${RM} ${PREFIX}/${FPHTTPD}/httpd
-	@${MKDIR} ${MOD_FPDOCDIR}
-	@${CP} ${PREFIX}/${README} ${MOD_FPDOCDIR}/index.html
-	@${INSTALL_SCRIPT} ${WRKDIR}/${FPINSTALL} ${PREFIX}/${FPINSTALL}
-	@${INSTALL_SCRIPT} ${WRKDIR}/${FPSETPERM} ${PREFIX}/${FPSETPERM}
-	@${PREFIX}/${FPSETPERM}
+	@(cd ${PREFIX} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
+		${_DISTDIR}/${FRONTPAGE} ${EXTRACT_AFTER_ARGS})
+	@${INSTALL_SCRIPT} ${WRKDIR}/${FP_INSTALL} ${PREFIX}/${FP_INSTALL}
+	@${INSTALL_SCRIPT} ${WRKDIR}/${FP_SETPERM} ${PREFIX}/${FP_SETPERM}
+	@${PREFIX}/${FP_SETPERM}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for DOC in ${FP_DOCS}
+	@${INSTALL_DATA} ${PREFIX}/${FP_DIR}/${DOC} ${DOCSDIR}
+.endfor
+.endif
+.for RMFILE in ${FP_DOCS} apache-fp/httpd
+	@${RM}	${PREFIX}/${FP_DIR}/${RMFILE}
+.endfor
 
 post-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/${RC_SCRIPT} \
+		${PREFIX}/etc/rc.d/${RC_SCRIPT_PREFIX}.${RC_SCRIPT}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/frontpage/Makefile.fp.common b/www/frontpage/Makefile.fp.common
new file mode 100644
index 000000000000..5bc1b7e137c6
--- /dev/null
+++ b/www/frontpage/Makefile.fp.common
@@ -0,0 +1,52 @@
+# Microsoft FrontPage Extensions common Makefile
+# Date created:		Sun Feb  6 13:53:50 CST 2005
+# Whom:                 swhetzel@gmail.com
+#
+# $FreeBSD$
+#
+
+FP_VER=		${PORTVERSION:C|^([0-9]+)\.([0-9]+).*|\1.\2|}
+PLIST_SUB+=	FP_VER=${FP_VER}
+
+.if defined(ALL_FP)
+FRONTPAGE=	fp${FP_VER:S/.//}.alpha${EXTRACT_SUFX} \
+		fp${FP_VER:S/.//}.bsdi${EXTRACT_SUFX} \
+		fp${FP_VER:S/.//}.freebsd${EXTRACT_SUFX} \
+		fp${FP_VER:S/.//}.solaris${EXTRACT_SUFX}
+
+.elif ${ARCH} == i386
+.if ${OSVERSION} < 440000
+WANT_BSDI_EXTENSIONS=	yes
+.endif
+.if defined(WANT_BSDI_EXTENSIONS)
+FRONTPAGE=	fp${FP_VER:S/.//}.bsdi${EXTRACT_SUFX}
+.else
+FRONTPAGE=	fp${FP_VER:S/.//}.freebsd${EXTRACT_SUFX}
+.endif
+
+.elif ${ARCH}== ia64 || ${ARCH} == amd64
+.if ${OSVERSION} < 500000
+IGNORE=	"The Frontpage Extensions require FreeBSD-${ARCH} 5.0 or better"
+.endif
+WANT_BSDI_EXTENSIONS=	yes
+FRONTPAGE=	fp${FP_VER:S/.//}.bsdi${EXTRACT_SUFX}
+
+.elif ${ARCH} == alpha
+FRONTPAGE=	fp${FP_VER:S/.//}.alpha${EXTRACT_SUFX}
+
+.elif ${ARCH} == sparc64
+FRONTPAGE=	fp${FP_VER:S/.//}.solaris${EXTRACT_SUFX}
+.endif
+
+.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64
+IGNORE=	"The Frontpage Extensions haven't been tested on this ${ARCH}.  If the Frontpage Extensions work on your ${ARCH}, please submit a pr to remove this warning from ${PORTSDIR}/www/frontpage/Makefile.fp.common for your ${ARCH}"
+.endif
+
+.for fpdist in ${FRONTPAGE}
+.if !exists(${DISTDIR}/${DIST_SUBDIR}/${fpdist})
+IGNORE="You must manualy fetch ${fpdist} from http://www.rtr.com.  Place the file in ${DISTDIR}/${DIST_SUBDIR}"
+.endif
+.endfor
+
+NO_CDROM=	"Redistribution is not permitted"
+RESTRICTED=	${NO_CDROM}
diff --git a/www/frontpage/distinfo b/www/frontpage/distinfo
index d12772c3c30b..0377a8a7e4a4 100644
--- a/www/frontpage/distinfo
+++ b/www/frontpage/distinfo
@@ -1,6 +1,8 @@
-MD5 (fp50.freebsd.tar.Z) = 70de3f2d87868e93474ab28995147a58
-SIZE (fp50.freebsd.tar.Z) = 15449019
-MD5 (fp50.bsdi.tar.Z) = ab199f0881605ebf12d7ec7b6a687a12
-SIZE (fp50.bsdi.tar.Z) = 18001487
-MD5 (fp50.alpha.tar.Z) = 67712d5f7de2d45a71d62adce57528aa
-SIZE (fp50.alpha.tar.Z) = 21958011
+MD5 (fp5022635/fp50.alpha.tar.gz) = 63c26a9ff0b97b44692fd5717b892dc0
+SIZE (fp5022635/fp50.alpha.tar.gz) = 13245239
+MD5 (fp5022635/fp50.bsdi.tar.gz) = e1640a3d5eb06fbfe77827c68c387f64
+SIZE (fp5022635/fp50.bsdi.tar.gz) = 10484068
+MD5 (fp5022635/fp50.freebsd.tar.gz) = 15bb2e119f1c2c91a5f4855a0b8ca836
+SIZE (fp5022635/fp50.freebsd.tar.gz) = 10205076
+MD5 (fp5022635/fp50.solaris.tar.gz) = 98ef852e1db27ced23e7f5971146a4dd
+SIZE (fp5022635/fp50.solaris.tar.gz) = 11510762
diff --git a/www/frontpage/files/fp_install.alpha b/www/frontpage/files/fp_install.alpha
index 3154ec39c686..bedbbca2841f 100644
--- a/www/frontpage/files/fp_install.alpha
+++ b/www/frontpage/files/fp_install.alpha
@@ -1,11 +1,11 @@
---- frontpage/version5.0/fp_install.sh.orig	Fri Apr 20 09:00:59 2001
-+++ frontpage/version5.0/fp_install.sh	Tue May  1 23:14:53 2001
-@@ -155,7 +155,7 @@
+--- frontpage/version5.0/fp_install.sh.orig	Tue Jul 15 16:58:01 2003
++++ frontpage/version5.0/fp_install.sh	Tue Jul 15 17:20:23 2003
+@@ -171,7 +171,7 @@
          SunOS*5.*sun4*)     machine="solaris" ;;
          SunOS*5.*i386*)     machine="solarisx86" ;;
          BSD/OS*)            machine="bsdi" ;;
--        FreeBSD*)           machine="freebsd" ;;
-+        FreeBSD*)           machine="alpha" ;;
+-        FreeBSD*)           machine="freebsd"
++        FreeBSD*)           machine="alpha"
+                             DEFAULTAPXS="PREFIX/sbin/apxs"
+                             ;;
          *)              echo "ERROR:  Unsupported platform!  Uname is $system."
-                         return 1
-                          ;;
diff --git a/www/frontpage/files/fp_install.bsdi b/www/frontpage/files/fp_install.bsdi
index 286303fa9d7c..2970c462c439 100644
--- a/www/frontpage/files/fp_install.bsdi
+++ b/www/frontpage/files/fp_install.bsdi
@@ -1,11 +1,11 @@
---- frontpage/version5.0/fp_install.sh.orig	Fri Apr 20 09:00:59 2001
-+++ frontpage/version5.0/fp_install.sh	Tue May  1 23:14:53 2001
-@@ -155,7 +155,7 @@
+--- frontpage/version5.0/fp_install.sh.orig	Tue Jul 15 16:58:01 2003
++++ frontpage/version5.0/fp_install.sh	Tue Jul 15 17:20:23 2003
+@@ -171,7 +171,7 @@
          SunOS*5.*sun4*)     machine="solaris" ;;
          SunOS*5.*i386*)     machine="solarisx86" ;;
          BSD/OS*)            machine="bsdi" ;;
--        FreeBSD*)           machine="freebsd" ;;
-+        FreeBSD*)           machine="bsdi" ;;
+-        FreeBSD*)           machine="freebsd"
++        FreeBSD*)           machine="bsdi"
+                             DEFAULTAPXS="PREFIX/sbin/apxs"
+                             ;;
          *)              echo "ERROR:  Unsupported platform!  Uname is $system."
-                         return 1
-                          ;;
diff --git a/www/frontpage/files/fp_install.sparc b/www/frontpage/files/fp_install.sparc
new file mode 100644
index 000000000000..f0160e3360fc
--- /dev/null
+++ b/www/frontpage/files/fp_install.sparc
@@ -0,0 +1,11 @@
+--- frontpage/version5.0/fp_install.sh.orig	Tue Jul 15 16:58:01 2003
++++ frontpage/version5.0/fp_install.sh	Tue Jul 15 17:20:23 2003
+@@ -171,7 +171,7 @@
+         SunOS*5.*sun4*)     machine="solaris" ;;
+         SunOS*5.*i386*)     machine="solarisx86" ;;
+         BSD/OS*)            machine="bsdi" ;;
+-        FreeBSD*)           machine="freebsd"
++        FreeBSD*)           machine="solaris"
+                             DEFAULTAPXS="PREFIX/sbin/apxs"
+                             ;;
+         *)              echo "ERROR:  Unsupported platform!  Uname is $system."
diff --git a/www/frontpage/files/frontpage.sh.in b/www/frontpage/files/frontpage.sh.in
new file mode 100644
index 000000000000..70d4eb3cbe87
--- /dev/null
+++ b/www/frontpage/files/frontpage.sh.in
@@ -0,0 +1,51 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+# PROVIDE: frontpage
+# REQUIRE: DAEMON
+# BEFORE: apache
+# KEYWORD: FreeBSD
+
+# Define the following frontpage_* variables in one of the following:
+#       /etc/rc.conf
+#       /etc/rc.conf.d/frontpage
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+: ${frontpage_enable="YES"}
+
+. %%RC_SUBR%%
+
+# Create New FrontPage suidkey
+
+frontpage_key() {
+
+	CUR_UMASK=`umask`
+	skdir=${prefix}/frontpage/version%%FP_VER%%/apache-fp
+	PERL=%%PERL5%%
+
+	# Alternate way of generating the suidkey file with out PERL
+	# taken from the OpenBSD mod_frontpage port.
+	#
+	# umask 077
+	# dd if=/dev/random of=${skdir}/suidkey bs=129 count=1
+	# 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
+
+}
+
+name="frontpage"
+rcvar=`set_rcvar`
+start_cmd="frontpage_key"
+stop_cmd=":"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/www/frontpage/files/patch-fp_install.sh b/www/frontpage/files/patch-fp_install.sh
index 3fb9a55a50eb..2c1b97be9287 100644
--- a/www/frontpage/files/patch-fp_install.sh
+++ b/www/frontpage/files/patch-fp_install.sh
@@ -1,6 +1,6 @@
---- frontpage/version5.0/fp_install.sh.orig	Mon Apr 16 07:39:25 2001
-+++ frontpage/version5.0/fp_install.sh	Sat Jun  7 21:00:21 2003
-@@ -12,7 +12,7 @@
+--- frontpage/version5.0/fp_install.sh.orig	Wed Jan 14 13:00:53 2004
++++ frontpage/version5.0/fp_install.sh	Sun Feb  6 18:34:34 2005
+@@ -13,7 +13,7 @@
  main() {
      initialize
      step1                               # setup environment
@@ -9,14 +9,7 @@
      $FPDIR/set_default_perms.sh         # Run the external permissions script.
      step3                               # upgrade/install
      
-@@ -52,12 +52,13 @@
-     echo 
-     
-     migrateoldconfig        || error   # Migrate old frontpage.cnf (if any)
--    change_server           || error   # upgrade httpd
-+#    change_server           || error   # upgrade httpd
-     upgradeexistingservers  || error   # Check to see if servers need upgrading
-     upgrade="yes"
+@@ -62,6 +62,7 @@
      chownexistingservers    || error   # Now chown the webs
      handlelanguage          || error   # configure some global settings
      installrootweb          || error   # Install the root web
@@ -24,20 +17,63 @@
      installnewsubwebs $PORT || error   # Install new servers
      installvirtualwebs      || error   # Install any virtual webs
  }
-@@ -132,9 +133,11 @@
- {
-     VERSION="5.0"
-     PATH=".:/bin:/usr/bin:/sbin:/usr/sbin:/usr/ucb:/etc:/usr/bsd"
-+    AP_TARGET=`PREFIX/sbin/apxs -q TARGET`
-+    AP_CONFDIR=`PREFIX/sbin/apxs -q SYSCONFDIR`
-     INSTALLDIRDEFAULT="/usr/local/frontpage"
+@@ -146,9 +147,10 @@
      NEWHTTPDNEW="/usr/local/frontpage/version${VERSION}/apache-fp/httpd"
+     NEWMODFPSO1="/usr/local/frontpage/version${VERSION}/apache-fp/mod_frontpage.c"
+     NEWMOFPSO2="/usr/local/frontpage/version${VERSION}/apache2/mod_frontpage.c"
 -    DEFAULTHTTPD="/usr/local/apache/sbin/httpd"
-+    DEFAULTHTTPD="PREFIX/sbin/httpd"
      FPDIR="/usr/local/frontpage/version${VERSION}"
+     APACHE_2_0_VERSION="2.0.40"
++    DEFAULTAPXS="/usr/local/apache/sbin/apxs"
++    DEFAULTVERSION="1.3"
+     unset MORE
  
      case "`echo 'x\c'`" in
-@@ -390,29 +393,9 @@
+@@ -171,7 +173,9 @@
+         SunOS*5.*sun4*)     machine="solaris" ;;
+         SunOS*5.*i386*)     machine="solarisx86" ;;
+         BSD/OS*)            machine="bsdi" ;;
+-        FreeBSD*)           machine="freebsd" ;;
++        FreeBSD*)           machine="freebsd"
++                            DEFAULTAPXS="PREFIX/sbin/apxs"
++                            ;;
+         *)              echo "ERROR:  Unsupported platform!  Uname is $system."
+                         return 1
+                          ;;
+@@ -239,6 +243,32 @@
+              *)
+                 ;;
+     esac
++
++    apxs_utility=""
++    while ( [ "$apxs_utility" = "" ] || [ ! -f "$apxs_utility" ] )
++    do
++        $echo "Where is the Apache apxs utility: [$DEFAULTAPXS] ${nnl}"
++        read apxs_utility
++        if [ "$apxs_utility" = "" ]
++        then
++            apxs_utility="${DEFAULTAPXS}"
++        fi
++    done
++    if [ ! -x "$apxs_utility" ]
++    then
++        echo "ERROR: Apache apxs utility not executable [$apxs_utility]"
++        return 1
++    else
++        AP_TARGET=`${apxs_utility} -q TARGET`
++        AP_CONFDIR=`${apxs_utility} -q SYSCONFDIR`
++        AP_LIBEXEC=`${apxs_utility} -q LIBEXECDIR`
++        AP_SBINDIR=`${apxs_utility} -q SBINDIR`
++    fi
++    DEFAULTCTL="${AP_SBINDIR}/apachectl"
++    DEFAULTHTTPD="${AP_SBINDIR}/${AP_TARGET}"
++    DEFAULTCFGFILE="${AP_CONFDIR}/${AP_TARGET}.conf"
++    NEWHTTPDNEW="${AP_SBINDIR}/${AP_TARGET}"
++    DEFAULTVERSION=`${NEWHTTPDNEW} -v | sed 's%^.*Apache/\([0-9]*\)\.\([0-9]*\).*%\1.\2%' | head -1`
+ }
+ 
+ # Compare two version numbers, including all sub-versions (such as 5.0.2.1234)
+@@ -408,30 +438,10 @@
  {
      retval=0
      
@@ -56,6 +92,7 @@
 -    then
          installdir=$INSTALLDIRDEFAULT
 -    fi
+     # Normalize the name
      installdir=`dirname $installdir`/`basename $installdir`
  
 -    if [ ! -d "$installdir" ]
@@ -67,7 +104,7 @@
              if chmod "$prot" "$installdir"
              then
                  echo "Directory $installdir chmoded to $prot." 
-@@ -420,22 +403,6 @@
+@@ -439,22 +449,6 @@
                  echo "ERROR:  Unable to chmod $installdir to $prot." 
                  retval=1
              fi
@@ -90,23 +127,208 @@
      
      if [ "$installdir" != "/usr/local/frontpage" ]
      then
-@@ -805,16 +772,22 @@
-                 accessconffile="${configfiledir}${file}"
-                 ;;
-         esac
-+	if [ ! -f $accessconffile ]
-+	then
-+	    echo "ERROR:  $accessconffile does not exist! Using $configfile instead."
-+	    accessconffile=$configfile
-+	fi
+@@ -478,7 +472,8 @@
+ 
+ license() 
+ {
+-    untarlicense || error
++#    untarlicense || error
++    licensefile="DOCSDIR/LICENSE.TXT"
+     echo "Please read the following license agreement (which can be found"
+     echo "in $licensefile"
+     echo
+@@ -557,28 +552,36 @@
+ #
+ getapachevers()
+ {
+-    $echo "Which version of Apache will you be using? (1.3 or 2.0) ${nnl}"
+-    read ApacheVers
++    ApacheVers=""
+     while [ "$ApacheVers" != "1.3" -a "$ApacheVers" != "2.0" ]
+     do
+-      $echo "Please enter either '1.3' or '2.0'"
+-      $echo "Which version of Apache will you be using? (1.3 or 2.0) ${nnl}"
++      $echo "Which version of Apache will you be using? (1.3 or 2.0) [${DEFAULTVERSION}] ${nnl}"
+       read ApacheVers
++      if [ "$ApacheVers" = "" ]
++      then
++        ApacheVers=${DEFAULTVERSION}
++      fi
++      if [ "$ApacheVers" != "1.3" -a "$ApacheVers" != "2.0" ]
++      then
++        echo "Please enter either '1.3' or '2.0'"
++      fi
+     done
+ 
+     if [ "$ApacheVers" = "1.3" ]
+     then
+-        promptstring="Where is the current apache daemon located: [$HttpdFile] ${nnl}"
++        promptstring="Where is the current apache daemon located:"
++        DEFAULT=${DEFAULTHTTPD}
      else
-         accessconffile="${configfiledir}access.conf"
-         if [ ! -f $accessconffile ]
+-        promptstring="Where is the current apache control file (apachectl) located: [$HttpdFile] ${nnl}"
++        promptstring="Where is the current apache control file (apachectl) located:"
++        DEFAULT=${DEFAULTCTL}
+     fi
+        
+     echo
+     HttpdFile=""
+     while ( [ "$HttpdFile" = "" ] || [ ! -x $HttpdFile ] )
+     do
+-        HttpdFile=$DEFAULTHTTPD
+-        $echo $promptstring
++        HttpdFile=${DEFAULT}
++        $echo "$promptstring [$HttpdFile] ${nnl}"
+         read location
+         if [ "$location" != "" ]
+         then
+@@ -946,6 +949,56 @@
+     return $retval
+ }
+ 
++# 
++getconfigfile()
++{
++    weconfigfile="$1"
++
++    configfile=`grep -i "^serverconfig:" $weconfigfile | sed -e '
++                    s/serverconfig://g
++                    s/fakeconf.*\///'`
++
++    servertype=`grep -i "^servertype:" $weconfigfile | sed -e 's/servertype://g'`
++
++    if [ $httpdmajor -eq 2 ]
++    then
++        if [ "${servertype}" != "apache-2.0" ]
++        then
++            echo "Changing servertype from ${servertype} to apache-2.0"
++            echo "s,servertype:.*,servertype:apache-2.0,g" > $weconfigfile.sed
++            servertype="apache-2.0"
++        fi
++        if [ "${configfile}" != "${DEFAULTCFGFILE}" ]
++        then
++            echo "$configfile does not match location for httpd.conf in Apache 2.0"
++            myprompt 'yYnN' "Do you want to change to the Apache 2.0 httpd.conf file? (y/n)" "Y"
++            if [ $answer = y ] || [ $answer = Y ]
++            then
++                echo "s,serverconfig:.*,serverconfig:${DEFAULTCFGFILE},g" >> $weconfigfile.sed
++                configfile="${DEFAULTCFGFILE}"
++            fi
++            echo "Using $configfile"
++        fi
++        if [ -f "$weconfigfile.sed" ]
++        then
++            mv $weconfigfile $weconfigfile.bak
++            sed -f $weconfigfile.sed $weconfigfile.bak > $weconfigfile
++	    rm $weconfigfile.sed
++            if [ -s $weconfigfile ]
++            then
++                rm $weconfigfile.bak
++            fi
++        fi
++    fi
++
++    if [ ! -f "$configfile" ]
++    then
++        echo "$configfile does not exist."
++        return 1
++    fi
++
++}
++
+ # examine weX.cnf file, make sure it is a patched apache server
+ verifywebserver()
+ {
+@@ -964,27 +1017,22 @@
+     port=$webport
+     
+     echo "Verifying web server configuration..."
+-    
+-    configfile=`grep -i "^serverconfig:" $weconfigfile | sed -e '
+-                    s/serverconfig://g
+-                    s/fakeconf.*\///'`
+-    if [ ! -f "$configfile" ]
+-    then
+-        echo "$configfile does not exist."
+-        return 1
+-    fi
+ 
+-    servertype=`grep -i "^servertype:" $weconfigfile | sed -e 's/servertype://g'`
++    getconfigfile $weconfigfile || return 1
++
+     configfiledir=`dirname $configfile`"/"
+ 
+     if [ $servertype != "apache-fp" ]
+     then
+-        echo "This version of FrontPage Server Extensions does not suppport"
+-        echo "$servertype servers.  We only support patched apache servers."
+-        echo "For more information about supported servers, please see" 
+-        echo "the Server Extension Resource Kit (SERK), located at"
+-        echo "http://www.microsoft.com/frontpage"
+-        return 1
++        if [ $servertype != "apache-2.0" ]
++        then
++            echo "This version of FrontPage Server Extensions does not suppport"
++            echo "$servertype servers.  We only support patched apache servers."
++            echo "For more information about supported servers, please see" 
++            echo "the Server Extension Resource Kit (SERK), located at"
++            echo "http://www.microsoft.com/frontpage"
++            return 1
++        fi
+     fi
+ 
+     getdocroot $weconfigfile ||
+@@ -993,28 +1041,41 @@
+         return 1
+     }
+ 
+-    getHttpDirective $configfile AccessConfig $port
+-    if [ "$param" != "" ]
++    # only Apache < 2.0 uses access.conf
++    if [ $httpdmajor -eq 1 ]
+     then
+-        case $param in
+-            /dev/null) accessconffile=$configfile
+-                ;;
+-            /*) accessconffile=$param  # fully qualified pathname
+-                ;;
+-            *)  file=`basename $param`
+-                accessconffile="${configfiledir}${file}"
+-                ;;
+-        esac
+-    else
+-        accessconffile="${configfiledir}access.conf"
+-        if [ ! -f $accessconffile ]
++        getHttpDirective $configfile AccessConfig $port
++        if [ "$param" != "" ]
          then
-+	    echo "ERROR: No AccessConfig directive found, add 'AccessConfig /dev/null' to $configfile"
-             accessconffile=$configfile
+-            accessconffile=$configfile
++            case $param in
++                /dev/null) accessconffile=$configfile
++                    ;;
++                /*) accessconffile=$param  # fully qualified pathname
++                    ;;
++                *)  file=`basename $param`
++                    accessconffile="${configfiledir}${file}"
++                    ;;
++            esac
++	    if [ ! -f $accessconffile ]
++	    then
++	        echo "ERROR:  $accessconffile does not exist! Using $configfile instead."
++	        accessconffile=$configfile
++	    fi
++        else
++            accessconffile="${configfiledir}access.conf"
++            if [ ! -f $accessconffile ]
++            then
++	        echo "ERROR: No AccessConfig directive found, add 'AccessConfig /dev/null' to $configfile"
++                accessconffile=$configfile
++            fi
          fi
++    else
++       accessconffile=$configfile
      fi
++
      if [ "$accessconffile" != "" -a "$accessconffile" != "/dev/null" -a ! -f "$accessconffile" ]
      then
 -        echo "$accessconffile does not exist."
@@ -114,25 +336,67 @@
          return 1
      fi
  
-@@ -1290,20 +1263,30 @@
-     echo " " 
+@@ -1088,7 +1149,7 @@
+             echo "Skipping chown..."
+         else
+             servertype=`grep -i "^servertype:" $weconfigfile|sed -e 's/servertype://g'`
+-            if [ "$servertype" != "apache-fp" ]
++            if [ "$servertype" != "apache-fp" -a "$servertype" != "apache-2.0" ]
+             then
+                 echo "Skipping non patched-apache web $weconfigfile"
+             else
+@@ -1120,10 +1181,9 @@
+     echo 
+     echo "Processing webs in port $webport..."
+     echo 
+-    
+-    configfile=`grep -i "^serverconfig:" $weconfigfile | sed -e '
+-                    s/serverconfig://g
+-                    s/fakeconf.*\///'`
++
++    getconfigfile $weconfigfile || return 1
++
+     configfiledir=`dirname $configfile`"/"
      
-     webname="/"
-+    defconfigfile="${AP_CONFDIR}/${AP_TARGET}.conf"
+     getdocroot $weconfigfile ||
+@@ -1364,10 +1424,9 @@
+     port=$webport
      
+     echo "Adding webs in port ${webport} to chown script..."
+-    servertype=`grep -i "^servertype:" $weconfigfile|sed -e 's/servertype://g'`
+-    configfile=`grep -i "^serverconfig:" $weconfigfile | sed -e '
+-                s/serverconfig://g
+-                s/fakeconf.*\///'`
++
++    getconfigfile $weconfigfile || return 1
++
+     configfiledir=`dirname $configfile`"/"
+     getdocroot $weconfigfile ||
+     {
+@@ -1474,11 +1533,16 @@
+ 	configfile=$rootconfigfile
+ 	return
+     fi
++
      configfile=""
      while ( [ "$configfile" = "" ] || [ ! -f $configfile ] )
      do
 -        $echo "Server config filename:  ${nnl}" 
-+        $echo "Server config filename:  [$defconfigfile] ${nnl}" 
++        $echo "Server config filename:  [${DEFAULTCFGFILE}] ${nnl}" 
          read configfile
-+        if [ "$configfile" = "" ]
++	if [ "$configfile" = "" ]
 +        then
-+            configfile=$defconfigfile
++            configfile="${DEFAULTCFGFILE}"
 +        fi
      done
-     httpdconfigfile=$configfile
+     rootconfigfile=$configfile
+ }
+@@ -1517,28 +1581,51 @@
      
+     getrootconfigfile
+     httpdconfigfile=$configfile
+-    
++
 +    defadmin="fpadmin"
      admin=""
      until [ "$admin" != "" ]
@@ -140,38 +404,52 @@
 -        $echo "FrontPage Administrator's user name:  ${nnl}" 
 +        $echo "FrontPage Administrator's user name:  [$defadmin] ${nnl}" 
          read admin
-+	if [ "$admin" = "" ]
-+	then
-+	    admin=$defadmin
-+	fi
++        if [ "$admin" = "" ]
++        then
++            admin=$defadmin
++        fi
      done
-     
+-    httpdconfigfile=$configfile
+-    
++
++    defport="80"
      getHttpRootDirective $configfile Port
-@@ -1316,9 +1299,23 @@
+     port=$param
+     
+     until [ "$port" != "" ]
+     do
+-        $echo "Enter the new server's port number:  ${nnl}" 
++        $echo "Enter the new server's port number:  [$defport] ${nnl}" 
+         read port
++        if [ "$port" = "" ]
++        then
++            port=$defport
++        fi
      done
      weconfigfile="${installdir}/we${port}.cnf"
-     
+-    
++ 
 +    getHttpRootDirective $configfile DocumentRoot
 +    docroot=$param
 +    if [ ! -d "$docroot" ]
 +    then
-+        echo "ERROR: $docroot does not exist!"
-+        return 1
++         echo "ERROR: $docroot does not exist!"
++         return 1
 +    fi
-+
++   
      echo 
      getparam User $configfile $port "Getting User from "
      defwebowner=$param
 +
 +    if [ "$defwebowner" = "" ]
 +    then
-+	defwebowner=`$lsg ${docroot}${service} | $awk ' { print $3}'`
++        defwebowner=`$lsg ${docroot}${service} | $awk ' { print $3}'`
 +    fi
 +
      webowner=""
      until [ "$webowner" != "" ]
      do
-@@ -1333,6 +1330,12 @@
+@@ -1553,6 +1640,12 @@
      echo 
      getparam Group $configfile $port "Getting Group from "
      defgroup=$param
@@ -184,7 +462,7 @@
      webgroup=""
      until [ "$webgroup" != "" ]
      do
-@@ -1450,6 +1453,119 @@
+@@ -1670,6 +1763,113 @@
      return $retval
  }
  
@@ -192,7 +470,7 @@
 +installadminweb()
 +{
 +    retval=0
-+    
++
 +    configfile=""
 +    admin=""
 +    port=""
@@ -203,41 +481,31 @@
 +    myprompt 'yYnN' "Do you want to install FrontPage Server Administration (y/n)" "Y"
 +    if [ $answer = n ] || [ $answer = N ]
 +    then
-+	echo "You have chosen not to install FrontPage Server Administration.  If you wish"
-+	echo "to install it later, you will need to use the following command:"
-+	echo
-+	echo "${FPDIR}/owsadm.exe -o setadminport -p 10865 \\"
-+	echo "	-s ${AP_CONFDIR}/${AP_TARGET}.conf -u <FP Admin user>"
-+	echo
-+	echo "The FrontPage Server Administration setup will require the following change"
-+	echo "in ${AP_CONFDIR}/${AP_TARGET}.conf for <VirtualHost _default_:10865>:"
-+	echo
-+	echo "	AllowOverride AuthConfig Limit Indexes Options"
-+	echo
-+	echo "otherwise, the FrontPage Server Administration web will not allow you to login."
-+	echo
-+	echo "This will then make FrontPage Server Administration available at:"
-+	echo
-+	echo "	http://`hostname`:10865/fpadmcgi.exe"
-+	echo
-+        return $retval
++       echo "You have chosen not to install FrontPage Server Administration.  If you wish"
++       echo "to install it later, you will need to use the following command:"
++       echo
++       echo "${FPDIR}/owsadm.exe -o setadminport -p 10865 \\"
++       echo "  -s ${DEFAULTCFGFILE} -u <FP Admin user> -pw <FP Admin password>"
++       echo
++       echo "The FrontPage Server Administration setup will require the following change"
++       echo "in ${DEFAULTCFGFILE} for <VirtualHost _default_:10865>:"
++       echo
++       echo "  AllowOverride AuthConfig Limit Indexes Options"
++       echo
++       echo "otherwise, the FrontPage Server Administration web will not allow you to login."
++       echo
++       echo "This will then make FrontPage Server Administration available at:"
++       echo
++       echo "  http://`hostname`:10865/fpadmcgi.exe"
++       echo
++       return $retval
 +    fi
 +
 +    echo " "
 +    echo "Installing FrontPage Server Administration..."
 +    echo " "
 +
-+    defconfigfile="${AP_CONFDIR}/${AP_TARGET}.conf"
-+
-+    while ( [ "$configfile" = "" ] || [ ! -f $configfile ] )
-+    do
-+        $echo "Server config filename:  [$defconfigfile] ${nnl}"
-+        read configfile
-+        if [ "$configfile" = "" ]
-+        then
-+            configfile=$defconfigfile
-+        fi
-+    done
++    getrootconfigfile
 +    httpdconfigfile=$configfile
 +
 +    defadmin="fpadmin"
@@ -251,6 +519,9 @@
 +        fi
 +    done
 +
++    getpassword "FrontPage Server Administration Password:"
++    password=${PASSWORD}
++
 +#   Need to determine if the FrontPage Server Administration Web was previously
 +#   installed and to which port it was installed on.
 +
@@ -262,10 +533,10 @@
 +    do
 +        $echo "Enter the FrontPage Server Administration port number:  [$defport] ${nnl}"
 +        read port
-+	if [ "$port" = "" ]
-+	then
-+	    port=$defport
-+	fi
++       if [ "$port" = "" ]
++       then
++           port=$defport
++       fi
 +    done
 +
 +#    getHttpRootDirective $configfile DocumentRoot
@@ -278,7 +549,8 @@
 +
 +    echo "Installing FrontPage Server Administration on port $port..."
 +    echo
-+    ${FPDIR}/bin/owsadm.exe -o setadminport -p $port -s $configfile -u $admin || 
++    ${FPDIR}/bin/owsadm.exe -o deleteadminport -t $fpversionoption -s $configfile
++    ${FPDIR}/bin/owsadm.exe -o setadminport -p $port -s $configfile -u $admin -pw $password -t $fpversionoption ||
 +    {
 +        echo "ERROR:  FrontPage Server Administration installation failed."
 +        $echo "Hit enter to continue${nnl}"
@@ -288,12 +560,12 @@
 +    echo
 +    echo "FrontPage Server Administration is now available at:"
 +    echo
-+    echo "	http://`hostname`:${port}/fpadmcgi.exe"
++    echo "     http://`hostname`:${port}/fpadmcgi.exe"
 +    echo
 +    echo "The FrontPage Server Administration setup requires the following change"
-+    echo "in ${AP_CONFDIR}/${AP_TARGET}.conf for <VirtualHost _default_:${port}>:"
++    echo "in ${configfile} for <VirtualHost _default_:${port}>:"
 +    echo
-+    echo "	AllowOverride AuthConfig Limit Indexes Options"
++    echo "     AllowOverride AuthConfig Limit Indexes Options"
 +    echo
 +    echo "otherwise, the FrontPage Server Administration web will not allow you to login."
 +    echo
@@ -304,42 +576,150 @@
  # Install a web on a multihosted server
  installvirtualwebs()
  {
-@@ -1464,7 +1580,7 @@
+@@ -1684,17 +1884,7 @@
          return $retval
      fi
      
 -    defaultconfigfile=$configfile
-+    defaultconfigfile="${AP_CONFDIR}/${AP_TARGET}.conf"
-     configfile=""
-     while ( [ "$configfile" = "" ] || [ ! -f $configfile ] )
+-    configfile=""
+-    while ( [ "$configfile" = "" ] || [ ! -f $configfile ] )
+-    do
+-        $echo "Server config filename [${defaultconfigfile}]:  ${nnl}" 
+-        read configfile
+-        if [ "$configfile" = "" ]
+-        then
+-            configfile=$defaultconfigfile
+-        fi
+-    done
++    getrootconfigfile
+     httpdconfigfile=$configfile
+     
+     getHttpRootDirective $configfile Port
+@@ -1792,12 +1982,17 @@
+         done
+         
+         webname="/"
+-        
++
++        defadmin="fpadmin"
+         admin=""
+         until [ "$admin" != "" ]
+         do
+-            $echo "FrontPage Administrator's user name:  ${nnl}" 
++            $echo "FrontPage Administrator's user name:  [$defadmin] ${nnl}"
+             read admin
++            if [ "$admin" = "" ]
++            then
++                admin=$defadmin
++            fi
+         done
+         
+         servertype="apache-fp"
+@@ -1880,9 +2075,9 @@
+     echo
+     
+     servertype="apache-fp"
+-    configfile=`grep -i "^serverconfig:" $weconfigfile | sed -e '
+-                s/serverconfig://g
+-                s/fakeconf.*\///'`
++
++    getconfigfile $weconfigfile || return 1
++
+     configfiledir=`dirname $configfile`"/"
+     
+     getdocroot $weconfigfile ||
+@@ -1908,11 +2103,16 @@
+     while $echo "Enter the web name (CTRL-D if no more webs): ${nnl}" 
+         read webname    
      do
-@@ -1922,10 +2038,16 @@
-                 resconffile="${configfiledir}${file}"
-                 ;;
-         esac
-+	if [ ! -f $resconffile ]
-+	then
-+	    echo "ERROR:  $resconffile does not exist! Using $configfile instead."
-+	    resconffile=$configfile
-+	fi
-     else
-         resconffile="${configfiledir}srm.conf"
-         if [ ! -f $resconffile ]
++        defadmin="fpadmin"
+         admin=""
+         until [ "$admin" != "" ]
+         do
+-            $echo "FrontPage Administrator's user name:  ${nnl}" 
++            $echo "FrontPage Administrator's user name:  [$defadmin] ${nnl}" 
+             read admin
++            if [ "$admin" = "" ]
++            then
++                admin=$defadmin
++            fi
+         done
+         
+         case "$webname" in
+@@ -2113,42 +2313,43 @@
+     weconfigfile=$1
+     
+     servertype="apache-fp"
+-    configfile=`grep -i "^serverconfig:" $weconfigfile | sed -e '
+-                s/serverconfig://g
+-                s/fakeconf.*\///'`
+-    
++
+     echo "Getting DocumentRoot and UserDir."
+     
+-    if [ ! -f "$configfile" ]
+-    then
+-        echo "$configfile does not exist."
+-        return 1
+-    fi
+-    
++    getconfigfile $weconfigfile || return 1
++ 
+     configfiledir=`dirname $configfile`"/"
+     
+     docroot=""
+-    resconffile=$configfile
+-    echo "Getting resource configuration file"
+-    getHttpDirective $configfile ResourceConfig $port
+-    if [ "$param" != "" ]
+-    then
+-        case $param in
+-            /dev/null) resconffile=$configfile
+-                ;;
+-            /*) resconffile=$param  # fully qualified pathname
+-                ;;
+-            *)  file=`basename $param`
+-                resconffile="${configfiledir}${file}"
+-                ;;
+-        esac
+-    elif [ $httpdmajor -eq 1 ]
++
++    # only Apache < 2.0 uses srm.conf
++    if [ $httpdmajor -eq 1 ]
+     then
+-    # only Apache 1 requires srm.conf
+-        resconffile="${configfiledir}srm.conf"
+-        if [ ! -f $resconffile ]
++        echo "Getting resource configuration file"
++        getHttpDirective $configfile ResourceConfig $port
++        if [ "$param" != "" ]
          then
-+	    echo "ERROR: No ResourceConfig directive found, add 'ResourceConfig /dev/null' to $configfile"
-             resconffile=$configfile
+-            resconffile=$configfile
++            case $param in
++                /dev/null) resconffile=$configfile
++                    ;;
++                /*) resconffile=$param  # fully qualified pathname
++                    ;;
++                *)  file=`basename $param`
++                    resconffile="${configfiledir}${file}"
++                    ;;
++            esac
++	    if [ ! -f $resconffile ]
++            then
++                echo "ERROR:  $resconffile does not exist! Using $configfile instead."
++                resconffile=$configfile
++            fi
++        else
++            resconffile="${configfiledir}srm.conf"
++            if [ ! -f $resconffile ]
++            then
++	        echo "ERROR: No ResourceConfig directive found, add 'ResourceConfig /dev/null' to $configfile"
++                resconffile=$configfile
++            fi
          fi
-     fi
-@@ -1999,7 +2121,7 @@
-     
-     param=`cat $configfile | $awk "
-             /^[^#]* *< *${virtualhost}/,/^[^#]* *< *\/${virtualhost}/ { next }
--            /^[^#]* *${mc_string}[ $TAB]/  { print \\\$2 }"` 
-+            /^[^#]* *${mc_string}[ $TAB]/  { print \\\$2 }" | sed -e 's/"//g'` 
-             
-     return 0
- }
-@@ -2050,7 +2172,7 @@
+     else
+        resconffile=$configfile
+@@ -2274,7 +2475,7 @@
                                      print ARRAY[i] 
                                  }
                              }
@@ -348,3 +728,157 @@
      
      if [ "$param" = "" ]
      then
+@@ -2340,22 +2541,22 @@
+         # Apache 2.0
+ 	httpdmajor=2
+         fpversionoption="apache-2.0"
+-	installfpdso2 || 
+-	{
+-	    echo "ERROR: Unable to install mod_frontpage dso"
+-	    return 1
+-	}
++#	installfpdso2 ||
++#	{
++#	    echo "ERROR: Unable to install mod_frontpage dso"
++#	    return 1
++#	}
+ 	return 0
+     elif [ $rtc -eq 4 ]
+     then
+ 	# Apache 1.3 with mod_so
+ 	httpdmajor=1
+ 	fpversionoption="apache-fp"
+-	installfpdso1 || 
+-	{
+-	    echo "ERROR: Unable to install mod_frontpage dso"
+-	    return 1
+-	}
++#	installfpdso1 || 
++#	{
++#	    echo "ERROR: Unable to install mod_frontpage dso"
++#	    return 1
++#	}
+ 	return 0
+     elif [ $rtc -ne 0 ]
+     then
+@@ -2578,23 +2779,7 @@
+ 
+ getModFpVersion1() 
+ {
+-    httpdir=`dirname $HttpdFile`
+-    # Remove the /bin
+-    httpdir=`dirname $httpdir`/libexec
+-    if [ ! -d "$httpdir" ]
+-    then
+-	httpdir="/usr/local/apache/modules"
+-    fi
+-    while ( [ ! -d "$httpdir" ] )
+-    do 
+-	$echo "Where is the current Apache modules directory: [$httpdir] ${nnl}"
+-	read location
+-	if [ "$location" != "" ]
+-	then
+-	    httpdir=$location
+-	fi
+-    done
+-    modfpso="${httpdir}/mod_frontpage.so"
++    modfpso="${AP_LIBEXEC}/mod_frontpage.so"
+ }
+ 
+ checkModFpSo1()
+@@ -2822,11 +3007,11 @@
+     echo "This version of FrontPage requires either:"
+     echo "  Apache Version $sourceVersion"
+     echo "or"
+-    echo "  Apache Version APACHE_2_0_VERSION (with mod_so)"
++    echo "  Apache Version ${APACHE_2_0_VERSION} (with mod_so)"
+     echo 
+     echo "We recommend you install one of these versions, with mod_so."
+     echo "Alternatively, we can install a prebuilt Apache $sourceVersion ."
+-    echo "This prebuilt version does not use mod_so for FronPage, but instead"
++    echo "This prebuilt version does not use mod_so for FrontPage, but instead"
+     echo "has been patched to work with FrontPage."
+     myprompt 'yYnN' "Do you want to install this prebuilt version (y/n)" "N"
+     if [ $answer = n ] || [ $answer = N ]
+@@ -2908,22 +3093,6 @@
+ 
+ installfpdso1()
+ {
+-    httpdir=`dirname $HttpdFile`
+-    while ( [ ! -d "$httpdir" ] )
+-    do 
+-	httpdir="/usr/local/apache/bin"
+-	$echo "Where is the current Apache 1.3 bin directory: [$httpdir] ${nnl}"
+-	read location
+-	if [ "$location" != "" ]
+-	then
+-	    httpdir=$location
+-	fi
+-    done
+-    if [ ! -x "$httpdir/apxs" ]
+-    then
+-	echo "Cannot find Apache apxs at $httpdir/apxs"
+-	return 1
+-    fi
+     echo "Using the Apache apxs utility to build mod_frontpage.so"
+     CURPATH=$PATH
+     PATH=$OLDPATH
+@@ -2933,7 +3102,7 @@
+        linux)   opts=-Wc,-Dlinux ;;
+        *)       opts= ;;
+     esac
+-    $httpdir/apxs -c $opts $FPDIR/apache-fp/mod_frontpage.c
++    $apxs_utility -c $opts $FPDIR/apache-fp/mod_frontpage.c
+     res=$?
+     PATH=$CURPATH
+     if [ $res -ne 0 ]
+@@ -2943,7 +3112,7 @@
+     
+     echo "Using the Apache apxs utility to install mod_frontpage.so"
+     PATH=$OLDPATH
+-    $httpdir/apxs -i -a -n frontpage $FPDIR/apache-fp/mod_frontpage.so
++    $apxs_utility -i -a -n frontpage $FPDIR/apache-fp/mod_frontpage.so
+     res=$?
+     PATH=$CURPATH
+     echo "Finished running the Apache apxs utility."
+@@ -2953,22 +3122,6 @@
+ 
+ installfpdso2()
+ {
+-    httpdir=`dirname $HttpdFile`
+-    while ( [ ! -d "$httpdir" ] )
+-    do 
+-	httpdir="/usr/local/apache/bin"
+-	$echo "Where is the current Apache 2.0 bin directory: [$httpdir] ${nnl}"
+-	read location
+-	if [ "$location" != "" ]
+-	then
+-	    httpdir=$location
+-	fi
+-    done
+-    if [ ! -x "$httpdir/apxs" ]
+-    then
+-	echo "Cannot find Apache apxs at $httpdir/apxs"
+-	return 1
+-    fi
+     echo "Using the Apache apxs utility to build mod_frontpage.so"
+     CURPATH=$PATH
+     PATH=$OLDPATH
+@@ -2978,7 +3131,7 @@
+        linux)   opts=-Wc,-Dlinux ;;
+        *)       opts= ;;
+     esac
+-    $httpdir/apxs -c $opts $FPDIR/apache2/mod_frontpage.c $FPDIR/apache2/mod_fpcgid.c
++    $apxs_utility -c $opts $FPDIR/apache2/mod_frontpage.c $FPDIR/apache2/mod_fpcgid.c
+     res=$?
+     PATH=$CURPATH
+     if [ $res -ne 0 ]
+@@ -2987,7 +3140,7 @@
+     fi
+     echo "Using the Apache apxs utility to install mod_frontpage.so"
+     PATH=$OLDPATH
+-    $httpdir/apxs -i -a -n frontpage $FPDIR/apache2/mod_frontpage.la
++    $apxs_utility -i -a -n frontpage $FPDIR/apache2/mod_frontpage.la
+     res=$?
+     PATH=$CURPATH
+     echo "Finished running the Apache apxs utility."
diff --git a/www/frontpage/files/patch-fpexe.c b/www/frontpage/files/patch-fpexe.c
deleted file mode 100644
index 721e24b6d668..000000000000
--- a/www/frontpage/files/patch-fpexe.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- frontpage/version5.0/apache-fp/fpexe.c.orig	Fri Apr 20 09:01:13 2001
-+++ frontpage/version5.0/apache-fp/fpexe.c	Wed May  2 20:26:02 2001
-@@ -134,11 +134,11 @@
- #include <time.h>
- #include <pwd.h>
- #include <grp.h>
--#if !defined(bsdi) && !defined(hpux) && !defined(sun) && !defined(linux) && !defined(SCO5) && !defined(UWARE7) && !defined(FREEBSD)
-+#if !defined(bsdi) && !defined(hpux) && !defined(sun) && !defined(linux) && !defined(SCO5) && !defined(UWARE7) && !defined(__FreeBSD__)
- #include <sys/mode.h>
- #endif
- 
--#if defined(sun) || defined(bsdi) || defined(sgi) || defined(SCO5) || defined(UWARE7) || defined(FREEBSD) || defined(linux)
-+#if defined(sun) || defined(bsdi) || defined(sgi) || defined(SCO5) || defined(UWARE7) || defined(__FreeBSD__) || defined(linux)
- extern const char ** environ;
- #endif
- extern int errno;
-@@ -162,10 +162,13 @@
- 
- #define KEYLEN 128                  /* Should be a multiple of sizeof(int) */
- 
-+#ifndef LOCALDIR
-+#define LOCALDIR "/usr/local"
-+#endif
- 
--#define FPKEYDIR "/usr/local/frontpage/version5.0/apache-fp"
--#define KEYFILE  "/usr/local/frontpage/version5.0/apache-fp/suidkey.%d"
--#define FPDIR    "/usr/local/frontpage/version5.0/exes"
-+#define FPKEYDIR LOCALDIR "/frontpage/version5.0/apache-fp"
-+#define KEYFILE  LOCALDIR "/frontpage/version5.0/apache-fp/suidkey.%d"
-+#define FPDIR    LOCALDIR "/frontpage/version5.0/exes"
- 
- /* Legal modules */
- #define SHTML    "/_vti_bin/shtml.exe"
diff --git a/www/frontpage/files/patch-readme.htm b/www/frontpage/files/patch-readme.htm
deleted file mode 100644
index 6d00bbb9406b..000000000000
--- a/www/frontpage/files/patch-readme.htm
+++ /dev/null
@@ -1,31 +0,0 @@
---- frontpage/version5.0/readme.htm.orig	Mon Apr 16 07:39:36 2001
-+++ frontpage/version5.0/readme.htm	Fri Dec 28 19:04:35 2001
-@@ -105,8 +105,7 @@
- <P>To allow FrontPage authors to upload executables, set the 

- NoExecutableCgiUpload configuration variable to zero (0). For information about 

- FrontPage Server Extensions configuration variables, see the SharePoint Team 

--Services Administrator's Guide at 

--http://www.microsoft.com/technet/sharepoint.</P>

-+Services <A href="http://www.microsoft.com/technet/sharepoint/admindoc/">Administrator's Guide</A>.</P>

- <P align=right><FONT size=1><A 

- href="#relnotes">Top 

- of Section</A></FONT></P>

-@@ -125,8 +124,7 @@
- of Page</A></FONT></P>

- <H3><A name=adminguide>SharePoint Team Services Administrator's Guide</H3>

- <P>Documentation of the FrontPage Server Extensions 2002 is included in the 

--SharePoint Team Services Administrator's Guide, at 

--http://www.microsoft.com/technet/sharepoint. This includes detailed information 

-+SharePoint Team Services <A href="http://www.microsoft.com/technet/sharepoint/admindoc/">Administrator's Guide</A>.  This includes detailed information 

- about installing and administering the FrontPage Server Extensions along with an 

- overview of the Server Extensions, a detailed discussion of server extensions 

- security on UNIX and Windows, troubleshooting information, and a full set of 

-@@ -142,7 +140,7 @@
- can also customize the site to control your search using either keywords or the 

- site's natural language search engine, which uses normal, everyday language for 

- answering inquiries, so you can write your question in your own words. To begin, 

--go to http://support.microsoft.com/support/</A>.</P>

-+go to <A href="http://support.microsoft.com/support/">Microsoft Support/</A>.</P>

- <P align=right><FONT size=1><A 

- href="#moreinfo">Top 

- of Section</A></FONT></P>

diff --git a/www/frontpage/files/patch-set_default_perms.sh b/www/frontpage/files/patch-set_default_perms.sh
index c4685b75a8a4..f27232a90503 100644
--- a/www/frontpage/files/patch-set_default_perms.sh
+++ b/www/frontpage/files/patch-set_default_perms.sh
@@ -1,11 +1,27 @@
---- frontpage/version5.0/set_default_perms.sh.orig	Fri Apr 20 09:00:58 2001
-+++ frontpage/version5.0/set_default_perms.sh	Wed May  2 19:20:58 2001
-@@ -81,7 +81,7 @@
- chmod 4755 $FPDIR/apache-fp/_vti_bin/fpexe || die set fpexe to be suid
+diff -ruN frontpage.orig/version5.0/set_default_perms.sh frontpage/version5.0/set_default_perms.sh
+--- frontpage.orig/version5.0/set_default_perms.sh	Thu Jan  9 12:19:35 2003
++++ frontpage/version5.0/set_default_perms.sh	Tue Feb  4 18:38:21 2003
+@@ -36,10 +36,9 @@
+ chown bin $FPDIR/frontpage.cnf || die chown frontpage.cnf
+ chgrp bin $FPDIR/frontpage.cnf || die chgrp frontpage.cnf
+ chmod 664 $FPDIR/frontpage.cnf || die chmod frontpage.cnf
+-chown bin $FPDIR/*.sh $FPDIR/*.TXT $FPDIR/*.htm || die chown top level files
+-chgrp bin $FPDIR/*.sh $FPDIR/*.TXT $FPDIR/*.htm || die chgrp top level files
+-chmod 555 $FPDIR/*.sh                           || die chmod top level files
+-chmod 444             $FPDIR/*.TXT $FPDIR/*.htm || die chmod top level files
++chown bin $FPDIR/*.sh || die chown top level files
++chgrp bin $FPDIR/*.sh || die chgrp top level files
++chmod 555 $FPDIR/*.sh || die chmod top level files
+ 
+ # Handle all of the non apache-fp directory trees
+ for dir in bin nls admin exes help ; do
+@@ -79,9 +78,6 @@
  
- # Set httpd
+ # The apache-fp fpexe stub needs to be suid root
+ 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
  
  # 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/frontpage/pkg-message b/www/frontpage/pkg-message
index 8eac5cd490d2..74390eed74df 100644
--- a/www/frontpage/pkg-message
+++ b/www/frontpage/pkg-message
@@ -2,12 +2,11 @@ For this port to be usefull you need to install an Apache-Frontpage
 enabled web server.  Only the following ports/packages qualifies:
 
 Ports:
-    www/apache13-fp     >=1.3.20_1
-	or
-    www/mod_frontpage	>=1.5.2		(DSO module, not from Microsoft)
+    www/mod_frontpage		(Apache 1.3 DSO module, not from Microsoft)
+    www/mod_frontpage-rtr	(Apache 1.3 DSO module from Ready-to-Run)
+    www/mod_frontpage2-rtr	(Apache 2.x DSO module from Ready-to-Run)
 
 Packages:
-    apache_fp           >=1.3.20_1
-	or
-    mod_frontpage	>=1.5.2		(DSO module, not from Microsoft)
-
+    mod_frontpage		(Apache 1.3 DSO module, not from Microsoft)
+    mod_frontpage13		(Apache 1.3 DSO module from Ready-to-Run)
+    mod_frontpage2		(Apache 2.x DSO module from Ready-to-Run)
diff --git a/www/frontpage/pkg-message.bsdi b/www/frontpage/pkg-message.bsdi
deleted file mode 100644
index 8a5ccdf37aca..000000000000
--- a/www/frontpage/pkg-message.bsdi
+++ /dev/null
@@ -1,18 +0,0 @@
-The BSDI FrontPage Extensions requires crypt_des is available in the
-libcrypt.* libraries.  The fpsrvadm.exe program can only create DES
-passwords, but the Apache server is unable to use them when crypt_des
-is not available in the libscrypt.* libraries.
-
-For this port to be usefull you need to install an Apache-Frontpage
-enabled web server.  Only the following ports/packages qualifies:
-
-Ports:
-    www/apache13-fp     >=1.3.20_1
-	or
-    www/mod_frontpage	>=1.5.2		(DSO module, not from Microsoft)
-
-Packages:
-    apache_fp           >=1.3.20_1
-	or
-    mod_frontpage	>=1.5.2		(DSO module, not from Microsoft)
-
diff --git a/www/frontpage/pkg-message.freebsd b/www/frontpage/pkg-message.freebsd
deleted file mode 100644
index d61678451840..000000000000
--- a/www/frontpage/pkg-message.freebsd
+++ /dev/null
@@ -1,18 +0,0 @@
-The FreeBSD FrontPage Extensions requires crypt_des is included in
-your libcrypt.* libraries.  Otherwise the fpsrvadm.exe program will
-create invaild MD5 passwords when libcrypt.* doesn't support DES
-passwords.  Fpsrvadm.exe can only create DES passwords.
-
-For this port to be usefull you need to install an Apache-Frontpage
-enabled web server.  Only the following ports/packages qualifies:
-
-Ports:
-    www/apache13-fp	>=1.3.20_1
-	or
-    www/mod_frontpage	>=1.5.2		(DSO module, not from Microsoft)
-
-Packages:
-    apache_fp		>=1.3.20_1
-	or
-    mod_frontpage	>=1.5.2		(DSO module, not from Microsoft)
-
diff --git a/www/frontpage/pkg-plist b/www/frontpage/pkg-plist
index 1d5b5b7c01ac..c26c15d136ff 100644
--- a/www/frontpage/pkg-plist
+++ b/www/frontpage/pkg-plist
@@ -1,4 +1,5 @@
-frontpage/version%%FP_VER%%/LICENSE.TXT
+@unexec %D/etc/rc.d/0010.frontpage.sh forcestop 2>/dev/null || true
+etc/rc.d/0010.frontpage.sh
 frontpage/version%%FP_VER%%/admin/1033/addacct.htm
 frontpage/version%%FP_VER%%/admin/1033/addrole.htm
 frontpage/version%%FP_VER%%/admin/1033/adduser.htm
@@ -21,6 +22,8 @@ frontpage/version%%FP_VER%%/admin/1033/newsbweb.htm
 frontpage/version%%FP_VER%%/admin/1033/newsrvr.htm
 frontpage/version%%FP_VER%%/admin/1033/opengl.htm
 frontpage/version%%FP_VER%%/admin/1033/openweb.htm
+frontpage/version%%FP_VER%%/admin/1033/passwa.htm
+frontpage/version%%FP_VER%%/admin/1033/passwb.htm
 frontpage/version%%FP_VER%%/admin/1033/passwd.htm
 frontpage/version%%FP_VER%%/admin/1033/password.htm
 frontpage/version%%FP_VER%%/admin/1033/perms.htm
@@ -38,33 +41,38 @@ frontpage/version%%FP_VER%%/admin/1033/webadmin.css
 frontpage/version%%FP_VER%%/admin/1033/webadmin.htm
 frontpage/version%%FP_VER%%/admin/1033/weblist.htm
 frontpage/version%%FP_VER%%/apache-fp/_vti_bin/fpexe
-frontpage/version%%FP_VER%%/apache-fp/fp-patch-apache_1.3.19
+frontpage/version%%FP_VER%%/apache-fp/mod_frontpage.c
 frontpage/version%%FP_VER%%/apache-fp/fpexe.c
 @unexec if [ -f %B/suidkey ] ; then rm -f %B/suidkey* ; fi
+frontpage/version%%FP_VER%%/apache2/mod_fpcgid.c
+frontpage/version%%FP_VER%%/apache2/mod_fpcgid.h
+frontpage/version%%FP_VER%%/apache2/mod_frontpage.c
+frontpage/version%%FP_VER%%/apache2/mod_frontpage.h
+frontpage/version%%FP_VER%%/apache2/mod_suexec.h
 frontpage/version%%FP_VER%%/bin/_vti_inf.htm
 frontpage/version%%FP_VER%%/bin/owsadm.exe
 frontpage/version%%FP_VER%%/bin/postinfo.htm
+frontpage/version%%FP_VER%%/exes/_vti_bin/images/blank.gif
+frontpage/version%%FP_VER%%/exes/_vti_bin/images/bluedot.gif
+frontpage/version%%FP_VER%%/exes/_vti_bin/images/discuss.gif
+frontpage/version%%FP_VER%%/exes/_vti_bin/images/delete.gif
+frontpage/version%%FP_VER%%/exes/_vti_bin/images/gears_an.gif
+frontpage/version%%FP_VER%%/exes/_vti_bin/images/health.gif
+frontpage/version%%FP_VER%%/exes/_vti_bin/images/navlink.gif
+frontpage/version%%FP_VER%%/exes/_vti_bin/images/newuser.gif
+frontpage/version%%FP_VER%%/exes/_vti_bin/images/offlogo.gif
+frontpage/version%%FP_VER%%/exes/_vti_bin/images/rect.gif
+frontpage/version%%FP_VER%%/exes/_vti_bin/images/settings.gif
+frontpage/version%%FP_VER%%/exes/_vti_bin/images/sortdown.gif
+frontpage/version%%FP_VER%%/exes/_vti_bin/images/sortup.gif
+frontpage/version%%FP_VER%%/exes/_vti_bin/images/subwebs.gif
+frontpage/version%%FP_VER%%/exes/_vti_bin/images/usage.gif
+frontpage/version%%FP_VER%%/exes/_vti_bin/images/users.gif
+frontpage/version%%FP_VER%%/exes/_vti_bin/images/warn_lg.gif
+frontpage/version%%FP_VER%%/exes/_vti_bin/images/webdisc.gif
+frontpage/version%%FP_VER%%/exes/_vti_bin/images/web.gif
 frontpage/version%%FP_VER%%/exes/_vti_bin/_vti_adm/admin.exe
 frontpage/version%%FP_VER%%/exes/_vti_bin/_vti_adm/fpadmcgi.exe
-frontpage/version%%FP_VER%%/exes/_vti_bin/_vti_adm/images/blank.gif
-frontpage/version%%FP_VER%%/exes/_vti_bin/_vti_adm/images/bluedot.gif
-frontpage/version%%FP_VER%%/exes/_vti_bin/_vti_adm/images/delete.gif
-frontpage/version%%FP_VER%%/exes/_vti_bin/_vti_adm/images/discuss.gif
-frontpage/version%%FP_VER%%/exes/_vti_bin/_vti_adm/images/gears_an.gif
-frontpage/version%%FP_VER%%/exes/_vti_bin/_vti_adm/images/health.gif
-frontpage/version%%FP_VER%%/exes/_vti_bin/_vti_adm/images/navlink.gif
-frontpage/version%%FP_VER%%/exes/_vti_bin/_vti_adm/images/newuser.gif
-frontpage/version%%FP_VER%%/exes/_vti_bin/_vti_adm/images/offlogo.gif
-frontpage/version%%FP_VER%%/exes/_vti_bin/_vti_adm/images/rect.gif
-frontpage/version%%FP_VER%%/exes/_vti_bin/_vti_adm/images/settings.gif
-frontpage/version%%FP_VER%%/exes/_vti_bin/_vti_adm/images/sortdown.gif
-frontpage/version%%FP_VER%%/exes/_vti_bin/_vti_adm/images/sortup.gif
-frontpage/version%%FP_VER%%/exes/_vti_bin/_vti_adm/images/subwebs.gif
-frontpage/version%%FP_VER%%/exes/_vti_bin/_vti_adm/images/usage.gif
-frontpage/version%%FP_VER%%/exes/_vti_bin/_vti_adm/images/users.gif
-frontpage/version%%FP_VER%%/exes/_vti_bin/_vti_adm/images/warn_lg.gif
-frontpage/version%%FP_VER%%/exes/_vti_bin/_vti_adm/images/web.gif
-frontpage/version%%FP_VER%%/exes/_vti_bin/_vti_adm/images/webdisc.gif
 frontpage/version%%FP_VER%%/exes/_vti_bin/_vti_aut/author.exe
 frontpage/version%%FP_VER%%/exes/_vti_bin/fpcount.exe
 frontpage/version%%FP_VER%%/exes/_vti_bin/shtml.exe
@@ -239,26 +247,26 @@ frontpage/version%%FP_VER%%/nls/cp_932.nls
 frontpage/version%%FP_VER%%/nls/cp_936.nls
 frontpage/version%%FP_VER%%/nls/cp_949.nls
 frontpage/version%%FP_VER%%/nls/cp_950.nls
-frontpage/version%%FP_VER%%/readme.htm
 frontpage/version%%FP_VER%%/set_default_perms.sh
 @unexec if [ -f %B/upgrade_results.txt ] ; then rm -f %B/upgrade_results.txt ; fi
 @unexec if [ -f %B/fp_chown.sh ] ; then rm -f %B/fp_chown.sh ; fi
-share/doc/apache/manual/frontpage/index.html
 @dirrm frontpage/version%%FP_VER%%/nls
 @dirrm frontpage/version%%FP_VER%%/help/1033
 @dirrm frontpage/version%%FP_VER%%/help
 @dirrm frontpage/version%%FP_VER%%/exes/_vti_bin/_vti_aut
-@dirrm frontpage/version%%FP_VER%%/exes/_vti_bin/_vti_adm/images
 @dirrm frontpage/version%%FP_VER%%/exes/_vti_bin/_vti_adm
+@dirrm frontpage/version%%FP_VER%%/exes/_vti_bin/images
 @dirrm frontpage/version%%FP_VER%%/exes/_vti_bin
 @dirrm frontpage/version%%FP_VER%%/exes
 @dirrm frontpage/version%%FP_VER%%/bin
 @dirrm frontpage/version%%FP_VER%%/apache-fp/_vti_bin
 @dirrm frontpage/version%%FP_VER%%/apache-fp
+@dirrm frontpage/version%%FP_VER%%/apache2
 @dirrm frontpage/version%%FP_VER%%/admin/1033
 @dirrm frontpage/version%%FP_VER%%/admin
 @unexec rmdir %D/frontpage/version%%FP_VER%% 2> /dev/null || true
 @unexec rmdir %D/frontpage 2> /dev/null || true
-@dirrm share/doc/apache/manual/frontpage
-@unexec rmdir %D/share/doc/apache/manual 2> /dev/null || true
-@unexec rmdir %D/share/doc/apache 2> /dev/null || true
+%%PORTDOCS%%%%DOCSDIR%%/readme.htm
+%%PORTDOCS%%%%DOCSDIR%%/readme_apache_dso.txt
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.TXT
+%%PORTDOCS%%@dirrm %%DOCSDIR%%