Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 27 Oct 1999 22:38:10 -0500 (CDT)
From:      hetzels@westbend.net
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/14571: Apache13-FP: FP2K Ext Upgrade
Message-ID:  <199910280338.WAA42676@spare.westbend.net>

next in thread | raw e-mail | index | archive | help

>Number:         14571
>Category:       ports
>Synopsis:       Upgrade FP Exts to FrontPage 2000 Exts.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 27 20:40:01 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator:     Scot W. Hetzel
>Release:        FreeBSD 3.2-RELEASE i386
>Organization:
West Bend Internet
>Environment:


>Description:

The attached patch upgrades the FrontPage Extentions fromn FP98 to FP2000.

The Apache Documents are now available thru a Virtual Host on port 8080.
This was done so that the fpsrvadm.exe program doesn't create the  _vti*
directories in the Apache Documents tree under www/data[.default].  This
also makes so that the contents of the www/data tree doesn't need to be
removed on a new installation.

The only file that is placed in www/data is a index.html file that points
to the documentation on the Virtual Host (port 8080) [New Install Only].

I have also added logos for Apache, FreeBSD, and FrontPage 2000.
The FreeBSD logo is being fetched from:

	http://www.freebsd.org/gifs/powerlogo.gif

and is currently the 4th site listed in MASTER_SITES.

Also, the suexec patches (patch-fe & patch-ff) have been  corrected.
login_cap was incorrectly misspelled as login_cab and the util library
was not specified for suexec when trying to compile (Apparently, needed
by login_cap).

NOTE:

Remove:
	 patch-au 

This patch was used to overcome a limitation in FP98.  No longer required
for FP2K, as FP2K understands the use of "/dev/null" for the AccessConfig
and ResourceConfig directives.

New:
	 patch-ap

Patch for htdocs/index.html - Adds a link to the FP2K documentation on the
virtual host (port 8080).

PS. Could someone advise me on how to change the PLIST so that when version5.0
of the Frontpage Extentions comes out we don't have to replace the entire
frontpage/* list in the PLIST.

>How-To-Repeat:


>Fix:

Apply the patch:

diff -ruN apache13-fp.orig/Makefile apache13-fp/Makefile
--- apache13-fp.orig/Makefile	Sun Sep 26 21:52:21 1999
+++ apache13-fp/Makefile	Wed Oct 20 20:56:45 1999
@@ -11,6 +11,8 @@
 CATEGORIES=	www
 MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://ftp.microsoft.com/products/frontpage/ \
+		http://officeupdate.microsoft.com/frontpage/wpp/serk/ \
+		http://www.freebsd.org/gifs/ \
 		ftp://sunsite.doc.ic.ac.uk/Mirrors/ftp.microsoft.com/Products/frontpage/ \
 		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
 		ftp://ftp.rge.com/pub/infosystems/apache/dist/ \
@@ -26,7 +28,7 @@
 		ftp://ftp.mtnranch.net/pub/apache/dist/ \
 		ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \
 		ftp://apache.nextpath.com/pub/apache/dist/
-DISTFILES=	${APACHE} ${FRONTPAGE}
+DISTFILES=	${APACHE} ${FRONTPAGE} powerlogo.gif fplogo.gif
 
 MAINTAINER=	hetzels@westbend.net
 
@@ -41,7 +43,7 @@
 
 AP_VERS=	1.3.9
 APACHE=		${DISTNAME}${EXTRACT_SUFX}
-FRONTPAGE=	fp30.bsdi3.tar.Z
+FRONTPAGE=	fp40.bsdi.tar.Z
 
 EXTRACT_ONLY=	${APACHE}
 
@@ -49,13 +51,16 @@
 NO_PACKAGE=	\
    "The FrontPage Installer needs to create FrontPage Admin user and password"
 
-FPINSTALL=	frontpage/version3.0/fp_install.sh
-CHANGESERVER=	frontpage/version3.0/change_server.sh
+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
 MOD_FP=		${FILESDIR}/mod_frontpage.c
 
 INSTALL_FILE=${INSTALL} -c -m 555 -o bin -g bin
 
-Y2K=		http://www.apache.org/docs/misc/FAQ.html#year2000
+Y2K=		http://www.apache.org/foundation/Y2K.html
 Y2K+=           http://computingcentral.msn.com/guide/year2000/msy2k/productinfo/frontpage.asp
 
 PLIST=  ${WRKDIR}/PLIST
@@ -101,7 +106,8 @@
 .endif
 
 CONFIGURE_ENV=	 CFLAGS='${CFLAGS}' \
-		 OPTIM='${OPTIM}'
+		 OPTIM='${OPTIM}' \
+		PATH="${PREFIX}/bin:${PATH}"
 
 MAN1=   dbmmanage.1 htdigest.1 htpasswd.1
 MAN8=   ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8
@@ -131,7 +137,8 @@
 	@${ECHO} "===>  Extracting FrontPage install scripts"
 	@cd ${WRKSRC} && \
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${FRONTPAGE} \
-		${EXTRACT_AFTER_ARGS} ${FPINSTALL} ${CHANGESERVER}
+		${EXTRACT_AFTER_ARGS} ${FPINSTALL} ${CHANGESERVER} \
+		${README}
 
 .if !defined(PATCH_DEBUG)
 post-patch:
@@ -158,14 +165,21 @@
 				> ${PREFIX}/etc/rc.d/apache.sh; \
 		${CHMOD} 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
+	@${INSTALL} -c -m 644 ${DISTDIR}/powerlogo.gif ${PREFIX}/www/icons
+	@${INSTALL} -c -m 644 ${DISTDIR}/fplogo.gif ${PREFIX}/www/icons
 
 fp-install:
 	@${CAT} ${WRKSRC}/${FPINSTALL} | \
-		${SED} -e 's;PREFIX;${PREFIX};' > ${WRKDIR}/tmp.fpinstall
+		${SED}  -e 's;PREFIX;${PREFIX};' \
+			-e 's;MOD_FPDOCDIR;${PREFIX}/${MOD_FPDOCDIR};' \
+			> ${WRKDIR}/tmp.fpinstall
 	@${SH} ${WRKDIR}/tmp.fpinstall
 	@${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} -p ${PREFIX}/${MOD_FPDOCDIR}
+	@${MV} ${PREFIX}/${README} ${PREFIX}/${MOD_FPDOCDIR}/index.html
+	@${LN} -s ${PREFIX}/${SERK} ${PREFIX}/${MOD_FPDOCDIR}/serk
 
 .include <bsd.port.mk>
diff -ruN apache13-fp.orig/files/apache.sh.tmpl apache13-fp/files/apache.sh.tmpl
--- apache13-fp.orig/files/apache.sh.tmpl	Mon Jan 25 20:27:30 1999
+++ apache13-fp/files/apache.sh.tmpl	Sat Oct 16 20:33:26 1999
@@ -7,7 +7,7 @@
 
 new_key() {
 
-	skdir=PREFIX/frontpage/currentversion/apache-fp
+	skdir=PREFIX/frontpage/version4.0/apache-fp
 	PERL=PERL5
 
 	#NOTE: We need Perl 5, to generate a new key
diff -ruN apache13-fp.orig/files/md5 apache13-fp/files/md5
--- apache13-fp.orig/files/md5	Sun Sep 26 21:52:24 1999
+++ apache13-fp/files/md5	Wed Oct 20 21:20:40 1999
@@ -1,2 +1,4 @@
 MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32
-MD5 (fp30.bsdi3.tar.Z) = 344b956cca8f367099d7c33e8c7ba174
+MD5 (fp40.bsdi.tar.Z) = 2fb460f64fe1853eb791654851be208b
+MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
+MD5 (fplogo.gif) = db0fd186b50fde14ff2ec638382a85e6
diff -ruN apache13-fp.orig/files/mod_frontpage.c apache13-fp/files/mod_frontpage.c
--- apache13-fp.orig/files/mod_frontpage.c	Mon Nov  9 19:55:59 1998
+++ apache13-fp/files/mod_frontpage.c	Sat Oct 16 17:00:11 1999
@@ -21,8 +21,8 @@
  * allow the exclusion or limitation of liability for consequential or
  * incidental damages, the above limitation may not apply to you.
  *
- * $Revision: 1.3 $
- * $Date: 1997/10/15 17:23:46 $
+ * $Revision: 5 $
+ * $Date: 6/19/98 5:25p $
  *
  */
 
@@ -69,6 +69,7 @@
 #define Vlstat lstat
 #endif 
 
+
 #ifndef TRUE
 #define TRUE 1
 #endif
@@ -92,21 +93,21 @@
 static int  gbKeyPipeActive = FALSE;/* Pipe to fpexe stub CGI is active */
 static int  gbEnabled = FALSE;      /* TRUE when SUID scheme is enabled */
 #if !defined(SHARED_MODULE)
-static int  giInitializeCount = 0;  /* FrontPageInit called previously */
+static int  giInitializeCount =0    /* FrontPageInit called previously */
 #endif
 
 static const char* FP         =
-          "/usr/local/frontpage/currentversion";
+          "/usr/local/frontpage/version4.0";
 static const char* FPKEYDIR   =
-          "/usr/local/frontpage/currentversion/apache-fp";
+          "/usr/local/frontpage/version4.0/apache-fp";
 static const char* KEYFILEXOR =
-          "/usr/local/frontpage/currentversion/apache-fp/suidkey";
+          "/usr/local/frontpage/version4.0/apache-fp/suidkey";
 static const char* KEYFILE    =
-          "/usr/local/frontpage/currentversion/apache-fp/suidkey.%d";
+          "/usr/local/frontpage/version4.0/apache-fp/suidkey.%d";
 static const char* FPSTUBDIR  =
-          "/usr/local/frontpage/currentversion/apache-fp/_vti_bin";
+          "/usr/local/frontpage/version4.0/apache-fp/_vti_bin";
 static const char* FPSTUB     =
-          "/usr/local/frontpage/currentversion/apache-fp/_vti_bin/fpexe";
+          "/usr/local/frontpage/version4.0/apache-fp/_vti_bin/fpexe";
 static const char* SHTML      =
           "/_vti_bin/shtml.exe";
 static const char* SHTML2     =
@@ -234,7 +235,7 @@
         return (FALSE);
     }
 
-    if (Vlstat(FPKEYDIR, &fs) == -1         || /* We can't stat the key dir */
+    if (Vlstat(FPKEYDIR, &fs) == -1          || /* We can't stat the key dir */
         fs.st_uid                           || /* key dir not owned by root */
         (fs.st_mode & (S_IRGRP | S_IROTH))  || /* key dir is readable */
         (fs.st_mode & (S_IWGRP | S_IWOTH))  || /* key dir is writable */
@@ -247,12 +248,12 @@
          * that non-root programs can run apache-fp/_vti_bin/fpexe (even though
          * non-root cannot list the directory).
          */
-        LogFrontPageError(s, "Incorrect permissions on key directory \"%-.1024s\", needs root ownership and perms rwx--x--x",
+        LogFrontPageError(s, "Incorrect permissions on key directory \"%-.1024s\", needs root ownership and permissions rwx--x--x",
                           FPKEYDIR, "FrontPageCheckup()", TRUE);
         return (FALSE);
     }
 
-    if (Vlstat(FPSTUBDIR, &fs) == -1        || /* We can't stat the stub dir */
+    if (Vlstat(FPSTUBDIR, &fs) == -1         || /* We can't stat the stub dir */
         fs.st_uid                           || /* stub dir not owned by root */
         (fs.st_mode & (S_IWGRP | S_IWOTH))  || /* stub dir is writable */
         (!S_ISDIR(fs.st_mode)))
@@ -261,12 +262,12 @@
          * User recovery: set directory to be owned by by root with permissions
          * r*x*-x*-x.
          */
-        LogFrontPageError(s, "Incorrect permissions on stub directory \"%-.1024s\", needs root ownership and perms r*x*-x*-x",
+        LogFrontPageError(s, "Incorrect permissions on stub directory \"%-.1024s\", needs root ownership and permissions r*x*-x*-x",
                           FPSTUBDIR, "FrontPageCheckup()", TRUE);
         return (FALSE);
     }
 
-    if (Vstat(FPSTUB, &fs) == -1            || /* We can't stat the stub */
+    if (Vstat(FPSTUB, &fs) == -1             || /* We can't stat the stub */
         fs.st_uid                           || /* stub not owned by root */
         !(fs.st_mode & S_ISUID)             || /* stub is not set-uid */
         (fs.st_mode & S_ISGID)              || /* stub is set-gid */
@@ -277,7 +278,7 @@
          * User recovery: set stub to be owned by by root with permissions
          * r*s*-x*-x.
          */
-        LogFrontPageError(s, "Incorrect permissions on stub \"%-.1024s\", needs root ownership and perms r*s*-x*-x",
+        LogFrontPageError(s, "Incorrect permissions on stub \"%-.1024s\", needs root ownership and permissions r*s*-x*-x",
                           FPSTUB, "FrontPageCheckup()", TRUE);
         return (FALSE);
     }
@@ -428,7 +429,7 @@
 #ifdef LINUX
 #define RAND_CMD "/bin/ps laxww | /usr/bin/sum ; /bin/ps laxww | /usr/bin/sum"
 #else
-#if defined ( bsdi ) || ( defined ( BSD ) && ( BSD >=199103 ))
+#if defined ( bsdi ) || ( defined ( BSD ) && ( BSD >= 199103 ))
 #define RAND_CMD "/bin/ps laxww | /usr/bin/cksum -o 1 ; /bin/ps laxww | /usr/bin/cksum -o 1"
 #else
 #define RAND_CMD "/bin/ps -ea | /bin/sum ; /bin/ps -ea | /bin/sum"
@@ -497,6 +498,7 @@
              */
             LogFrontPageError(s, "Key file \"%-.1024s\" is unreadable or is too short (must be at least 8 bytes)",
                               KEYFILEXOR, "FrontPageInit()", TRUE);
+            close(fd);
             return;
         }
 
@@ -513,6 +515,10 @@
          */
         for (i = 0;  i < KEYLEN;  i++)
             gszKeyVal[i] = szBuf[i % iCount] ^ szRandom[i % sizeof(iRandom)];
+
+        /*
+         * Thanks to A.Mayrhofer@Austria.EU.net 980130
+         */
         close(fd);
     }
 
@@ -560,7 +566,7 @@
     /*
      * Thanks to Scot Hetzel (hetzels@westbend.net)
      */
-    ap_add_version_component("FrontPage/3.0.4.3");
+    ap_add_version_component("FrontPage/4.0.4.3");
 }
 
 
@@ -675,7 +681,7 @@
     sprintf(szBuf, "%d", gfdKeyPipe[0]);
     ap_table_set(r->subprocess_env, "FPFD", ap_pstrdup(r->pool, szBuf));
 
-    r->execfilename = ap_pstrcat(r->pool, FPSTUB, szCgi + strlen(szFpexe), NULL);
+    r->execfilename = ap_pstrcat(r->pool, FPSTUB, szCgi+strlen(szFpexe), NULL);
     r->filename = ap_pstrcat(r->pool, r->filename, szCgi, NULL);
 
     if (write(gfdKeyPipe[1], gszKeyVal, 128) != 128)
diff -ruN apache13-fp.orig/patches/patch-aa apache13-fp/patches/patch-aa
--- apache13-fp.orig/patches/patch-aa	Sun Sep 26 21:52:25 1999
+++ apache13-fp/patches/patch-aa	Sat Oct 16 20:53:59 1999
@@ -1,6 +1,6 @@
 --- configure.orig	Sat Aug 14 03:29:05 1999
-+++ configure	Mon Sep  6 12:36:24 1999
-@@ -1084,7 +1084,7 @@
++++ 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"
@@ -8,17 +8,23 @@
 +conf_group="nogroup"
  conf_port="80"
  conf_serveradmin="you@your.address"
- conf_servername="new.host.name"
-@@ -1109,6 +1109,9 @@
+-conf_servername="new.host.name"
++conf_servername="`$aux/buildinfo.sh -n %h%d`"
+ if [ "x$confadjust" = "x1" ]; then
+     if [ -f /etc/passwd ]; then
+         for uid in nobody www daemon demon http httpd; do 
+@@ -1107,7 +1107,10 @@
+         conf_port="8080"
+     fi
      conf_serveradmin="`$aux/buildinfo.sh -n %u@%h%d`"
-     conf_servername="`$aux/buildinfo.sh -n %h%d`"
- fi
+-    conf_servername="`$aux/buildinfo.sh -n %h%d`"
++#    conf_servername="`$aux/buildinfo.sh -n %h%d`"
++fi
 +if [ ".$suexec" = .1 ]; then
 +    conf_user="$suexec_caller"
-+fi
+ fi
   
  ##
- ##  determine prefix-relative paths for directories
 @@ -1153,8 +1156,8 @@
      echo "       DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
      echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
diff -ruN apache13-fp.orig/patches/patch-ab apache13-fp/patches/patch-ab
--- apache13-fp.orig/patches/patch-ab	Sun Sep 26 21:52:25 1999
+++ apache13-fp/patches/patch-ab	Wed Oct 27 19:30:39 1999
@@ -1,5 +1,5 @@
 --- Makefile.tmpl.orig	Fri Aug 13 01:58:18 1999
-+++ Makefile.tmpl	Mon Sep  6 12:58:17 1999
++++ Makefile.tmpl	Wed Oct 20 21:50:25 1999
 @@ -120,6 +120,7 @@
  runtimedir      = @runtimedir@
  logfiledir      = @logfiledir@
@@ -68,7 +68,7 @@
  		< $(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,33 @@
+@@ -441,29 +458,40 @@
  #   icons and distributed CGI scripts.
  install-data:
  	@echo "===> [data: Installing initial data files]"
@@ -85,17 +85,19 @@
 -		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
 -		find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
 +		(cd $(root)$(doc_prefix)/ && $(TAR) -xf -); \
++		cat $(TOP)/htdocs/index.html | \
++		sed -e 's;@@HOSTNAME@@;$(conf_servername);' \
++		    > $(root)$(doc_prefix)/index.html ; \
 +		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 \
-+		$(CP) -rp $(root)$(doc_prefix) $(root)$(htdocsdir); \
++		$(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 \
-+	$(RM) $(root)$(htdocsdir).default
-+	$(LN) -s $(root)$(doc_prefix) $(root)$(htdocsdir).default
 +#	-@if [ -f $(root)$(cgidir)/printenv ]; then \
 +#		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
 +#	else \
@@ -114,12 +116,17 @@
  	fi
  	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
  	(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
-@@ -493,15 +517,17 @@
+ 	(cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
++	$(CP) $(root)$(doc_prefix)/apache_pb.gif $(root)$(iconsdir); \
+ 	find $(root)$(iconsdir)/ -type d -exec chmod a+rx {} \; ;\
+ 	find $(root)$(iconsdir)/ -type f -exec chmod a+r {} \;
+ 	@echo "<=== [data]"
+@@ -493,20 +521,24 @@
  			-e 's;@@ServerRoot@@/icons;$(iconsdir);' \
  			-e 's;@@ServerRoot@@/cgi-bin;$(cgidir);' \
  			-e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
-+			-e 's;@@ServerRoot@@/srm.conf;$(sysconfdir)/$(TARGET).conf;' \
-+			-e 's;@@ServerRoot@@/access.conf;$(sysconfdir)/$(TARGET).conf;' \
++			-e 's;@@ServerRoot@@/srm.conf;/dev/null;' \
++			-e 's;@@ServerRoot@@/access.conf;/dev/null;' \
  			-e 's;@@ServerRoot@@;$(prefix);g' \
  			-e 's;httpd\.conf;$(TARGET).conf;' \
  			-e 's;logs/accept\.lock;$(runtimedir)/$(TARGET).lock;' \
@@ -136,3 +143,10 @@
  			-e 's;conf/magic;$(sysconfdir)/magic;' \
  			-e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
  			-e 's;User nobody;User $(conf_user);' \
+ 			-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 && \
diff -ruN apache13-fp.orig/patches/patch-ag apache13-fp/patches/patch-ag
--- apache13-fp.orig/patches/patch-ag	Sun Sep 26 21:52:25 1999
+++ apache13-fp/patches/patch-ag	Wed Oct 27 21:38:06 1999
@@ -1,28 +1,26 @@
 --- conf/httpd.conf-dist.orig	Wed May  5 15:17:59 1999
-+++ conf/httpd.conf-dist	Mon Sep  6 13:01:08 1999
-@@ -97,6 +97,13 @@
++++ conf/httpd.conf-dist	Wed Oct 27 21:37:07 1999
+@@ -97,6 +97,9 @@
  #ResourceConfig conf/srm.conf
  #AccessConfig conf/access.conf
  
-+<IfDefine FRONTPAGE>
-+### FrontPage needs these two directives defined, otherwise	###
-+### the fpadmsrv.exe program will cause errors.		###
 +ResourceConfig @@ServerRoot@@/srm.conf
 +AccessConfig @@ServerRoot@@/access.conf
-+</IfDefine>
 +
  #
  # Timeout: The number of seconds before receives and sends time out.
  #
-@@ -246,7 +253,7 @@
- #  don't use Group #-1 on these systems!
- #
- User nobody
--Group #-1
-+Group nogroup
- 
+@@ -176,6 +179,10 @@
+ #Listen 3000
+ #Listen 12.34.56.78:80
+ 
++Listen 80
++# We need to Listen to port 8080, as that is were the Apache Docs can be accessed from.
++Listen 8080
++
  #
- # ServerAdmin: Your address, where problems with the server should be
+ # BindAddress: You can support virtual hosts with this option. This directive
+ # is used to tell the server which IP address to listen to. It can either
 @@ -274,7 +281,7 @@
  # documents. By default, all requests are taken from this directory, but
  # symbolic links and aliases may be used to point to other locations.
@@ -36,6 +34,7 @@
  # override. Can also be "All", or any combination of "Options", "FileInfo", 
  # "AuthConfig", and "Limit"
  #
+-    AllowOverride None
 +<IfDefine FRONTPAGE>
 +### These are the Minimum options need by the FrontPage Module.
 +### With out these options set the FrontPage Client will not be
@@ -44,7 +43,7 @@
 +</IfDefine>
 +
 +<IfDefine !FRONTPAGE>
-     AllowOverride None
++#    AllowOverride None
 +</IfDefine>
  
  #
@@ -83,3 +82,52 @@
  
  #
  # Optionally add a line containing the server version and virtual host
+@@ -852,3 +877,48 @@
+ 
+ #<VirtualHost _default_:*>
+ #</VirtualHost>
++
++# This virtual Host allows access to the Apache & Frontpage Docs on port 8080
++<VirtualHost _default_:8080>
++    ServerAdmin webmaster@@@HOSTNAME@@
++    DocumentRoot @@MANUAL@@
++    ServerName @@HOSTNAME@@
++
++    <Directory "@@MANUAL@@">
++
++	#
++	# This may also be "None", "All", or any combination of "Indexes",
++	# "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
++	#
++	# Note that "MultiViews" must be named *explicitly* --- "Options All"
++	# doesn't give it to you.
++	#
++	Options Indexes FollowSymLinks
++
++	#
++	# This controls which options the .htaccess files in directories can
++	# override. Can also be "All", or any combination of "Options", "FileInfo",
++	# "AuthConfig", and "Limit"
++	#
++	AllowOverride None
++
++	#
++	# Controls who can get stuff from this server.
++	#
++	Order allow,deny
++	Allow from all
++    </Directory>
++
++</VirtualHost>
++
++# This Virtual Host makes it so FrontPage will display pages from the
++# root web.  Without this virtual host, Frontpage accesses the pages
++# on the default virtual host (port 8080) instead.
++#
++#NOTE: This Virtual Host Entry must be kept as the last _default_
++#      virtual host entry.
++<VirtualHost _default_:80>
++    ServerAdmin webmaster@@@HOSTNAME@@
++    ServerName @@HOSTNAME@@
++</VirtualHost>
++
diff -ruN apache13-fp.orig/patches/patch-ai apache13-fp/patches/patch-ai
--- apache13-fp.orig/patches/patch-ai	Wed Dec 31 18:00:00 1969
+++ apache13-fp/patches/patch-ai	Fri Jun 11 22:15:18 1999
@@ -0,0 +1,11 @@
+--- htdocs/manual/mod/index.html.orig	Mon Mar 22 18:17:36 1999
++++ htdocs/manual/mod/index.html	Fri Jun 11 22:12:43 1999
+@@ -74,6 +74,8 @@
+ <DD>Demonstrates Apache API
+ <DT><A HREF="mod_expires.html">mod_expires</A> Apache 1.2 and up
+ <DD>Apply Expires: headers to resources
++<DT><A HREF="mod_frontpage/index.html">mod_frontpage</A> Apache 1.2 and up
++<DD>Apache mod_frontpage interface for FrontPage 2000
+ <DT><A HREF="mod_headers.html">mod_headers</A> Apache 1.2 and up
+ <DD>Add arbitrary HTTP headers to resources
+ <DT><A HREF="mod_imap.html">mod_imap</A>
diff -ruN apache13-fp.orig/patches/patch-ap apache13-fp/patches/patch-ap
--- apache13-fp.orig/patches/patch-ap	Wed Dec 31 18:00:00 1969
+++ apache13-fp/patches/patch-ap	Wed Oct 27 22:00:01 1999
@@ -0,0 +1,37 @@
+--- htdocs/index.html.orig	Wed May 20 09:59:42 1998
++++ htdocs/index.html	Wed Oct 27 21:58:13 1999
+@@ -36,16 +36,29 @@
+   <P>
+   The Apache
+   <A
+-   HREF="manual/index.html"
++   HREF="http://@@HOSTNAME@@:8080/manual/index.html"
+   >documentation</A>
+-  has been included with this distribution.
++  has been included with this distribution.<BR>
++  The <STRONG>FrontPage 20000 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>
+-  The Webmaster of this site is free to use the image below on
+-  an Apache-powered Web server.  Thanks for using Apache!
++  Information on the FreeBSD operating system can be found
++  on the <A HREF="http://www.freebsd.org/">FreeBSD Home Page</A>.
++  </P>
++  <P>
++  The Webmaster of this site is free to use the images below on
++  an Apache-powered Web server.  Thanks for using <A HREF="http://www.apache.org/">Apache</A>; on <A HREF="http://www.freebsd.org/">FreeBSD</A>!
+   </P>
+   <DIV ALIGN="CENTER">
+-   <IMG SRC="apache_pb.gif" ALT="">
++   <A HREF="http://www.apache.org/">;
++   <IMG SRC="/icons/apache_pb.gif" BORDER=0 ALT="Powered by Apache"></A>
++   <A HREF="http://www.freebsd.org/">;
++   <IMG SRC="/icons/powerlogo.gif" BORDER=0 ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
++   <A HREF="http://www.microsoft.com/frontpage/default.htm">;
++   <IMG SRC="/icons/fplogo.gif" BORDER=0 ALT="Created with Microsoft FrontPage 2000"></A>
+   </DIV>
+  </BODY>
+ </HTML>
diff -ruN apache13-fp.orig/patches/patch-au apache13-fp/patches/patch-au
--- apache13-fp.orig/patches/patch-au	Sun Sep 26 21:52:25 1999
+++ apache13-fp/patches/patch-au	Wed Dec 31 18:00:00 1969
@@ -1,48 +0,0 @@
---- src/main/http_core.c.orig	Mon Aug  9 02:29:29 1999
-+++ src/main/http_core.c	Sun Aug 22 16:09:12 1999
-@@ -1832,6 +1832,32 @@
-     return NULL;
- }
- 
-+static const char *set_resource_access_config(cmd_parms *cmd, void *dummy,
-+					      char *arg)
-+{
-+    int offset = (int)(long)cmd->info;
-+    char *struct_ptr = (char *)cmd->server;
-+
-+    const char *err = ap_check_cmd_context(cmd,
-+					   NOT_IN_DIR_LOC_FILE|NOT_IN_LIMIT);
-+
-+    if (err != NULL) {
-+	return err;
-+    }
-+
-+   /* Prevent recursive read of SERVER_CONFIG_FILE
-+    * If ResourceConfig/AccessConfig is equal to SERVER_CONFIG_FILE
-+    * then set it to /dev/null 
-+    */
-+    if (strcmp(arg,SERVER_CONFIG_FILE)) {
-+	*(char **)(struct_ptr + offset) = "/dev/null";
-+    }
-+    else {
-+	*(char **)(struct_ptr + offset) = arg;
-+    }
-+    return NULL;
-+}
-+
- static const char *server_type(cmd_parms *cmd, void *dummy, char *arg)
- {
-     const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
-@@ -2820,10 +2846,10 @@
-     "A file for Apache to maintain runtime process management information"},
- { "LockFile", set_lockfile, NULL, RSRC_CONF, TAKE1,
-     "The lockfile used when Apache needs to lock the accept() call"},
--{ "AccessConfig", set_server_string_slot,
-+{ "AccessConfig", set_resource_access_config,
-   (void *)XtOffsetOf (server_rec, access_confname), RSRC_CONF, TAKE1,
-   "The filename of the access config file" },
--{ "ResourceConfig", set_server_string_slot,
-+{ "ResourceConfig", set_resource_access_config,
-   (void *)XtOffsetOf (server_rec, srm_confname), RSRC_CONF, TAKE1,
-   "The filename of the resource config file" },
- { "ServerAlias", set_server_alias, NULL, RSRC_CONF, RAW_ARGS,
diff -ruN apache13-fp.orig/patches/patch-fa apache13-fp/patches/patch-fa
--- apache13-fp.orig/patches/patch-fa	Mon Jan 25 20:27:30 1999
+++ apache13-fp/patches/patch-fa	Thu Jun 10 19:45:16 1999
@@ -1,156 +1,205 @@
---- frontpage/version3.0/change_server.sh.orig	Thu Mar  5 06:00:22 1998
-+++ frontpage/version3.0/change_server.sh	Fri Jan 22 23:03:20 1999
-@@ -38,9 +38,9 @@
- {
-   VERSION="3.0"
-   PATH=".:/bin:/usr/bin:/sbin:/usr/sbin:/usr/ucb:/etc"
--  NEWHTTPD="/usr/local/frontpage/currentversion/apache-fp/httpd"
-+  NEWHTTPD="PREFIX/sbin/httpd"
-   UPGRADEVERSION=`$NEWHTTPD -v`
--  DEFAULTHTTPD="/usr/local/etc/httpd/httpd"
-+  DEFAULTHTTPD="PREFIX/sbin/httpd"
- 
- case "`echo 'x\c'`" in
-    'x\c')   echo="echo -n"    nnl= ;;      #BSD
-@@ -59,6 +59,9 @@
-      IRIX*)           machine="sgi" ;;
-      SunOS*5.*sun4*)  machine="solaris" ;;
-      SunOS*4.*sun4*)  machine="sunos";;
-+     FreeBSD* | \
-+     NetBSD* | \
-+     OpenBSD* | \
-      *BSD/OS?3.0*)    machine="bsdi3" ;;
-      BSD/OS*)         machine="bsdi" ;;
-      SCO_SV*)         machine="sco5" ;;
-@@ -366,10 +369,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" ]
-@@ -932,10 +944,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
-@@ -952,10 +973,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
-@@ -979,10 +1009,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" ]
-@@ -1124,6 +1163,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()
+*** 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()
diff -ruN apache13-fp.orig/patches/patch-fb apache13-fp/patches/patch-fb
--- apache13-fp.orig/patches/patch-fb	Mon Jan 25 20:27:30 1999
+++ apache13-fp/patches/patch-fb	Sat Jun 12 13:59:06 1999
@@ -1,25 +1,25 @@
---- frontpage/version3.0/fp_install.sh.orig	Thu Mar  5 06:00:21 1998
-+++ frontpage/version3.0/fp_install.sh	Fri Jan 22 22:58:40 1999
-@@ -50,7 +50,7 @@
+--- 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
+@@ -48,7 +48,7 @@
  {
-   VERSION="3.0"
+   VERSION="4.0"
    PATH=".:/bin:/usr/bin:/sbin:/usr/sbin:/usr/ucb:/etc:/usr/bsd"
 -  INSTALLDIRDEFAULT="/usr/local/frontpage"
 +  INSTALLDIRDEFAULT="PREFIX/frontpage"
  
  case "`echo 'x\c'`" in
     'x\c')   echo="echo -n"    nnl= ;;      #BSD
-@@ -69,6 +69,9 @@
-      IRIX*)           machine="sgi" ;;
-      SunOS*5.*sun4*)  machine="solaris" ;;
-      SunOS*4.*sun4*)  machine="sunos";;
-+     FreeBSD* | \
-+     NetBSD* | \
-+     OpenBSD* | \
-      *BSD/OS?3.0*)    machine="bsdi3" ;;
-      BSD/OS*)         machine="bsdi" ;;
-      SCO_SV*)         machine="sco5" ;;
-@@ -325,7 +328,7 @@
+@@ -68,6 +68,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" ;;
+@@ -327,7 +330,7 @@
   echo "link will be created from /usr/local/frontpage/ to the location that" 
   echo "is chosen." 
   echo 
@@ -28,8 +28,8 @@
   read installdir
   
   if [ "$installdir" = "" ]
-@@ -412,7 +415,7 @@
-  vtfile="fp30.$machine.tar"
+@@ -414,7 +417,7 @@
+  vtfile="fp40.$machine.tar"
   echo "Platform is $machine." 
   
 - vtfilelocation="`pwd`/"
@@ -37,30 +37,35 @@
  
   getextfilename $vtfilelocation $vtfile || return 1
  
-@@ -651,10 +654,19 @@
+@@ -538,7 +541,7 @@
+         upgrade="no"
+         echo "For details on how to upgrade servers manually, please see" 
+         echo "the Server Extension Resource Kit (SERK), located in"
+-        echo "/usr/local/frontpage/version${VERSION}/serk"
++        echo "MOD_FPDOCDIR/serk"
+         echo
+         return $retval
+     else
+@@ -655,10 +658,15 @@
        *pache*) getHttpDirective $configfile AccessConfig $port
                 if [ "$param" != "" ]
                 then
 -                   file=`basename $param`
 -                   accessconffile="${configfiledir}${file}"
-+                   if [ "$param" != "/dev/null" ]
++                   if [ "${param}" = "/dev/null" ]
 +                   then
++                       accessconffile="${configfile}"
++                   else
 +                       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" ]
-@@ -1101,18 +1113,29 @@
+@@ -1105,18 +1113,29 @@
  
   webname="/"
  
@@ -93,49 +98,47 @@
   done
  
   getparam Port $configfile
-@@ -1124,12 +1147,37 @@
-     read port
-  done
+@@ -1131,6 +1150,39 @@
+  getparam User $configfile
+  defwebowner=$param
  
-- getparam User $configfile
-- webowner=$param
--
-  weconfigfile="${installdir}/we${port}.cnf"
-+ getHttpDirective ${configfile} ResourceConfig ${port}
-+ if [ "$param" = "/dev/null" ]
-+ then
-+     configError
-+ fi
-+ configfiledir=`dirname $configfile`"/"
-+ if [ "$param" != "" ]
++ if [ "$defwebowner" = "" ]
 + then
-+     file=`basename $param`
-+     resconffile="${configfiledir}${file}"
-+ else
-+     resconffile="${configfiledir}conf/srm.conf"
-+     if [ ! -f "$resconffile" ]
++     getHttpDirective $configfile ResourceConfig $port
++     if [ "$param" != "" ]
 +     then
-+         configError2
++         if [ "${param}" = "/dev/null" ]
++         then
++             resconffile="${configfile}"
++         else
++             file=`basename $param`
++             resconffile="${configfiledir}${file}"
++         fi
++     else
++         resconffile="${configfiledir}srm.conf"
 +     fi
-+ fi
- 
-- defwebowner=`$lsg ${docroot}${service} | $awk ' { print $3}'`
-+ getparam DocumentRoot $resconffile
-+ docroot=$param
 +
-+ getparam User $configfile
-+ defwebowner=$param
++     if [ ! -f "$resconffile" ]
++     then
++         echo "ERROR: $resconffile does not exist!"
++         return 1
++     fi
 +
-+ if [ "$defwebowner" = "" ]
-+ then
 +     getparam DocumentRoot $resconffile
 +     docroot=$param
++     if [ ! -d "$docroot" ]
++     then
++         echo "ERROR: $docroot does not exist!"
++         return 1
++     fi
++
 +     defwebowner=`$lsg ${docroot}${service} | $awk ' { print $3}'`
 + fi
++
+  weconfigfile="${installdir}/we${port}.cnf"
  
   webowner=""
-  until [ "$webowner" != "" ]
-@@ -1144,6 +1192,12 @@
+@@ -1146,6 +1198,12 @@
  
   getparam Group $configfile
   defgroup=$param
@@ -148,7 +151,7 @@
   webgroup=""
   until [ "$webgroup" != "" ]
   do
-@@ -1155,6 +1209,8 @@
+@@ -1157,6 +1215,8 @@
          webgroup=$defgroup
       fi
   done
@@ -157,10 +160,10 @@
   
   until [ "$servertype" != "" ]
   do
-@@ -1168,9 +1224,13 @@
-      echo "    7.  netscape-commerce" 
-      echo "    8.  netscape-fasttrack" 
-      echo "    9.  netscape-enterprise" 
+@@ -1167,9 +1227,13 @@
+      echo "    4.  netscape-fasttrack" 
+      echo "    5.  netscape-enterprise"
+      echo "    6.  stronghold"
 -     $echo "What type of Server is this:  ${nnl}" 
 +     $echo "What type of Server is this: [$defservertypenum] ${nnl}" 
       read servertypenum
@@ -172,17 +175,7 @@
  
       case $servertypenum in
            "1") servertype="ncsa" ;;
-@@ -1185,7 +1245,8 @@
-           "7") servertype="netscape-commerce" ;;
-           "8") servertype="netscape-fasttrack" ;;
-           "9") servertype="netscape-enterprise" ;;
--            *) echo "Invalid option!  Please try again."   ;;
-+            *) servertypenum=""
-+               echo "Invalid option!  Please try again."   ;;
-      esac 
-  done
- 
-@@ -1510,6 +1571,8 @@
+@@ -1545,6 +1609,8 @@
          read admin
      done
  
@@ -191,10 +184,10 @@
      until [ "$servertype" != "" ]
      do
       echo 
-@@ -1522,9 +1585,13 @@
-      echo "    7.  netscape-commerce" 
-      echo "    8.  netscape-fasttrack" 
-      echo "    9.  netscape-enterprise" 
+@@ -1554,9 +1620,13 @@
+      echo "    4.  netscape-fasttrack" 
+      echo "    5.  netscape-enterprise" 
+      echo "    6.  stronghold"
 -     $echo "What type of Server is this:  ${nnl}" 
 +     $echo "What type of Server is this: [$defservertypenum] ${nnl}" 
       read servertypenum
@@ -206,40 +199,7 @@
  
       case $servertypenum in
            "1") servertype="ncsa" ;;
-@@ -1539,7 +1606,8 @@
-           "7") servertype="netscape-commerce" ;;
-           "8") servertype="netscape-fasttrack" ;;
-           "9") servertype="netscape-enterprise" ;;
--            *) echo "Invalid option!  Please try again."   ;;
-+            *) servertypenum=""
-+               echo "Invalid option!  Please try again."   ;;
-        esac 
-     done
- 
-@@ -1825,10 +1893,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" ]
-@@ -1964,7 +2041,6 @@
+@@ -2023,7 +2093,6 @@
   then
      getHttpRootDirective $configfile $directive
   fi 
@@ -247,90 +207,3 @@
  }
  
  getnetscapedocroot()
-@@ -2080,10 +2156,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
-@@ -2099,10 +2184,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 UserDir from $resconffile."
-                     getparam UserDir $resconffile
-@@ -2111,6 +2205,40 @@
-                 ;; 
-  esac
-  
-+}
-+
-+configError()
-+{
-+     echo
-+     echo "ERROR: ${configfile} invalid"
-+     echo
-+     echo "Change ${configfile} as follows:"
-+     echo
-+     echo "    ResourceConfig ${configfile}"
-+     echo "    AccessConfig ${configfile}"
-+     echo
-+     $echo "hit enter to continue${nnl}"
-+     read continue
-+     echo "Ouch!!!!!!!!!!!!!"
-+     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!!!!!!!!!!!!!"
-+     echo
-+     exit 1
- }
- 
- error()
diff -ruN apache13-fp.orig/patches/patch-fe apache13-fp/patches/patch-fe
--- apache13-fp.orig/patches/patch-fe	Sun Sep 26 21:52:25 1999
+++ apache13-fp/patches/patch-fe	Sat Oct 16 17:05:07 1999
@@ -32,7 +32,7 @@
  #include <sys/param.h>
  #include <sys/stat.h>
  #include <sys/types.h>
-+#include <login_cab.h>
++#include <login_cap.h>
  
  #include <stdarg.h>
  
diff -ruN apache13-fp.orig/patches/patch-ff apache13-fp/patches/patch-ff
--- apache13-fp.orig/patches/patch-ff	Wed Dec 31 18:00:00 1969
+++ apache13-fp/patches/patch-ff	Sat Oct 16 18:41:50 1999
@@ -0,0 +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
+@@ -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
+ 
+ clean:
+ 	rm -f $(TARGETS) *.o
diff -ruN apache13-fp.orig/patches/patch-fi apache13-fp/patches/patch-fi
--- apache13-fp.orig/patches/patch-fi	Sun Sep 26 21:52:25 1999
+++ apache13-fp/patches/patch-fi	Sat Oct 16 18:48:23 1999
@@ -1,5 +1,5 @@
 --- src/main/http_request.c.orig	Fri May 21 07:16:21 1999
-+++ src/main/http_request.c	Mon Sep  6 13:12:55 1999
++++ src/main/http_request.c	Sat Oct 16 18:47:04 1999
 @@ -187,6 +187,8 @@
  	return OK;
      }
@@ -17,3 +17,11 @@
              if (res)
                  return res;
  
+@@ -521,6 +524,7 @@
+ 		r->per_dir_config = per_dir_defaults;
+ 	    }
+         }
++	if (r->execfilename) r->filename = r->execfilename;
+     }
+ 
+     /*
diff -ruN apache13-fp.orig/patches/patch-fk apache13-fp/patches/patch-fk
--- apache13-fp.orig/patches/patch-fk	Wed Dec 31 18:00:00 1969
+++ apache13-fp/patches/patch-fk	Thu Jul  1 18:44:02 1999
@@ -0,0 +1,15 @@
+--- frontpage/version4.0/readme.htm.orig	Mon May 24 12:45:14 1999
++++ frontpage/version4.0/readme.htm	Thu Jun 10 21:03:28 1999
+@@ -124,10 +124,8 @@
+ 
+ <h3><a name="serk">Server Extensions Resource Kit</a></h3>
+ 
+-<p>The FrontPage 2000 Server Extensions include a full set of documentation: the Server
+-Extensions Resource Kit. This is an HTML document installed on the server machine (by
+-default) in /usr/local/frontpage/version4.0/serk. To view the Server Extensions Resource
+-Kit, open /usr/local/frontpage/version4.0/serk/default.htm in your Web browser.</p>
++<p>The FrontPage 2000 Server Extensions include a full set of documentation: the
++<a href="serk/default.htm">Server Extensions Resource Kit</a>. This is an HTML document installed on the server machine (by default).</p>
+ 
+ <p>The Server Extensions Resource Kit contains detailed information about installing and
+ administering the FrontPage Server Extensions along with an overview of the Server
diff -ruN apache13-fp.orig/pkg/COMMENT apache13-fp/pkg/COMMENT
--- apache13-fp.orig/pkg/COMMENT	Sat Jun 26 14:03:49 1999
+++ apache13-fp/pkg/COMMENT	Sat Oct 16 19:12:02 1999
@@ -1 +1 @@
-The extremely popular Apache http server w/MS FrontPage Extentions
+The Apache webserver with w/MS Frontpage 2000 Extentions.
diff -ruN apache13-fp.orig/pkg/DESCR apache13-fp/pkg/DESCR
--- apache13-fp.orig/pkg/DESCR	Mon Nov  9 19:56:01 1998
+++ apache13-fp/pkg/DESCR	Sat Oct 16 19:14:11 1999
@@ -11,12 +11,12 @@
 
 Microsoft Frontpage Extentions allows web administrators and authors to
 remotely manage, create, modify, or delete web pages on the Apache server
-using Microsoft FrontPage 98.
+using Microsoft FrontPage 2000.
 
 Documentation
 -------------
 
 All the documentation is on-line on the WWW, via the URL's:
 
-   Apache    - http://www.apache.org
-   FrontPage - http://www.microsoft.com/frontpage/wpp/SERK
+   Apache    - http://www.apache.org/httpd.html
+   FrontPage - http://officeupdate.microsoft.com/frontpage/wpp/serk/
diff -ruN apache13-fp.orig/pkg/PLIST apache13-fp/pkg/PLIST
--- apache13-fp.orig/pkg/PLIST	Sun Sep 26 21:52:26 1999
+++ apache13-fp/pkg/PLIST	Wed Oct 20 20:57:02 1999
@@ -97,10 +97,11 @@
 sbin/rotatelogs
 sbin/suexec
 share/doc/apache/apache_pb.gif
-@exec mkdir -p %D/www
-@exec ln -fs %B %D/www/data.default
-@unexec rm -f %D/www/data.default
+@exec mkdir -p %D/www/data
 share/doc/apache/index.html
+@exec if [ ! -f %D/www/data/%f ]; then cp %D/%F %D/www/data/%f; fi
+@exec if [ ! -e %D/www/data.default ]; then ln -s %B %D/www/data.default; fi
+@unexec if [ -h %D/www/data.default ]; then rm -f %D/www/data.default; fi
 share/doc/apache/manual/LICENSE
 share/doc/apache/manual/bind.html
 share/doc/apache/manual/cgi_path.html
@@ -177,6 +178,9 @@
 share/doc/apache/manual/mod/mod_env.html
 share/doc/apache/manual/mod/mod_example.html
 share/doc/apache/manual/mod/mod_expires.html
+share/doc/apache/manual/mod/mod_frontpage/index.html
+@exec ln -fs %D/frontpage/version4.0/serk %B/serk
+@unexec rm -f %B/serk
 share/doc/apache/manual/mod/mod_headers.html
 share/doc/apache/manual/mod/mod_imap.html
 share/doc/apache/manual/mod/mod_include.html
@@ -231,6 +235,8 @@
 share/doc/apache/manual/windows.html
 www/cgi-bin.default/printenv
 www/cgi-bin.default/test-cgi
+www/cgi-bin/printenv
+www/cgi-bin/test-cgi
 www/icons/README
 www/icons/a.gif
 www/icons/alert.black.gif
@@ -287,6 +293,8 @@
 www/icons/pie7.gif
 www/icons/pie8.gif
 www/icons/portal.gif
+www/icons/powerlogo.gif
+www/icons/fplogo.gif
 www/icons/ps.gif
 www/icons/quill.gif
 www/icons/right.gif
@@ -348,138 +356,200 @@
 @dirrm libexec/apache
 @dirrm share/doc/apache/manual/images
 @dirrm share/doc/apache/manual/misc
+@dirrm share/doc/apache/manual/mod/mod_frontpage
 @dirrm share/doc/apache/manual/mod
 @dirrm share/doc/apache/manual/search
 @dirrm share/doc/apache/manual/vhosts
 @dirrm share/doc/apache/manual
 @dirrm share/doc/apache
 @dirrm www/cgi-bin.default
+@dirrm www/cgi-bin
 @dirrm www/icons/small
 @dirrm www/icons
 @dirrm www
-frontpage/version3.0/LICENSE.TXT
-frontpage/version3.0/change_server.sh
-frontpage/version3.0/fp_install.sh
-frontpage/version3.0/frontpage.cnf
-frontpage/version3.0/frontpage.cnf.orig
-frontpage/version3.0/readme.htm
-frontpage/version3.0/set_default_perms.sh
-frontpage/version3.0/_vti_bin/_vti_adm/admin.exe
-frontpage/version3.0/_vti_bin/_vti_aut/author.exe
-frontpage/version3.0/_vti_bin/fpcount.exe
-frontpage/version3.0/_vti_bin/shtml.exe
-frontpage/version3.0/admin/check.htm
-frontpage/version3.0/admin/contents.htm
-frontpage/version3.0/admin/deletesubweb.htm
-frontpage/version3.0/admin/disable.htm
-frontpage/version3.0/admin/enable.htm
-frontpage/version3.0/admin/footer.htm
-frontpage/version3.0/admin/fpadmin.htm
-frontpage/version3.0/admin/fpbanner.htm
-frontpage/version3.0/admin/fpcreated.gif
-frontpage/version3.0/admin/ipaddress.htm
-frontpage/version3.0/admin/newserver.htm
-frontpage/version3.0/admin/newsubweb.htm
-frontpage/version3.0/admin/perms.htm
-frontpage/version3.0/admin/recalc.htm
-frontpage/version3.0/admin/renamesubweb.htm
-frontpage/version3.0/admin/scripts/fpadmcgi.exe
-frontpage/version3.0/admin/setdirexec.htm
-frontpage/version3.0/admin/setdirnoexec.htm
-frontpage/version3.0/admin/topleft.gif
-frontpage/version3.0/admin/topright.gif
-frontpage/version3.0/admin/uninstall.htm
-frontpage/version3.0/apache-fp/_vti_bin/fpexe
-frontpage/version3.0/apache-fp/fp-patch-apache_1.2.5
-frontpage/version3.0/apache-fp/fpexe.c
-frontpage/version3.0/apache-fp/httpd
-@unexec rm %D/frontpage/version3.0/apache-fp/suidkey*
-frontpage/version3.0/bin/_vti_inf.html
-frontpage/version3.0/bin/fpextde.msg
-frontpage/version3.0/bin/fpextes.msg
-frontpage/version3.0/bin/fpextfr.msg
-frontpage/version3.0/bin/fpextit.msg
-frontpage/version3.0/bin/fpextja.msg
-frontpage/version3.0/bin/fpsrvadm.exe
-frontpage/version3.0/bin/postinfo.html
-frontpage/version3.0/exes/_vti_bin/_vti_adm/admin.exe
-frontpage/version3.0/exes/_vti_bin/_vti_aut/author.exe
-frontpage/version3.0/exes/_vti_bin/fpcount.exe
-frontpage/version3.0/exes/_vti_bin/shtml.exe
-frontpage/version3.0/nls/cp_1250.nls
-frontpage/version3.0/nls/cp_1251.nls
-frontpage/version3.0/nls/cp_1252.nls
-frontpage/version3.0/nls/cp_1253.nls
-frontpage/version3.0/nls/cp_1254.nls
-frontpage/version3.0/nls/cp_1255.nls
-frontpage/version3.0/nls/cp_1256.nls
-frontpage/version3.0/nls/cp_1257.nls
-frontpage/version3.0/nls/cp_1258.nls
-frontpage/version3.0/nls/cp_28592.nls
-frontpage/version3.0/nls/cp_28605.nls
-frontpage/version3.0/nls/cp_437.nls
-frontpage/version3.0/nls/cp_850.nls
-frontpage/version3.0/nls/cp_874.nls
-frontpage/version3.0/nls/cp_932.nls
-frontpage/version3.0/nls/cp_936.nls
-frontpage/version3.0/nls/cp_949.nls
-frontpage/version3.0/nls/cp_950.nls
-frontpage/version3.0/serk/images/admin.gif
-frontpage/version3.0/serk/images/appendix.gif
-frontpage/version3.0/serk/images/architec.gif
-frontpage/version3.0/serk/images/editor.gif
-frontpage/version3.0/serk/images/explorer.gif
-frontpage/version3.0/serk/images/filler25.gif
-frontpage/version3.0/serk/images/home.gif
-frontpage/version3.0/serk/images/i_conten.gif
-frontpage/version3.0/serk/images/i_fpacls.gif
-frontpage/version3.0/serk/images/install.gif
-frontpage/version3.0/serk/images/intro.gif
-frontpage/version3.0/serk/images/mslogo.gif
-frontpage/version3.0/serk/images/publish1.gif
-frontpage/version3.0/serk/images/publish2.gif
-frontpage/version3.0/serk/images/security.gif
-frontpage/version3.0/serk/images/serkl.gif
-frontpage/version3.0/serk/images/serkr.gif
-frontpage/version3.0/serk/images/trouble.gif
-frontpage/version3.0/serk/images/u_conten.gif
-frontpage/version3.0/serk/images/u_fpaccs.gif
-frontpage/version3.0/serk/a_bots.htm
-frontpage/version3.0/serk/a_fpexe.htm
-frontpage/version3.0/serk/a_fpini.htm
-frontpage/version3.0/serk/a_iisprm.htm
-frontpage/version3.0/serk/a_modfp.htm
-frontpage/version3.0/serk/a_source.htm
-frontpage/version3.0/serk/a_spfile.htm
-frontpage/version3.0/serk/a_uncnf.htm
-frontpage/version3.0/serk/a_unperm.htm
-frontpage/version3.0/serk/a_vers.htm
-frontpage/version3.0/serk/admin.htm
-frontpage/version3.0/serk/appendix.htm
-frontpage/version3.0/serk/banner.htm
-frontpage/version3.0/serk/default.htm
-frontpage/version3.0/serk/home.htm
-frontpage/version3.0/serk/install.htm
-frontpage/version3.0/serk/intro.htm
-frontpage/version3.0/serk/nav.htm
-frontpage/version3.0/serk/security.htm
-frontpage/version3.0/serk/trouble.htm
-frontpage/version3.0/srcs/fp.suid.c
-@dirrm frontpage/version3.0/_vti_bin/_vti_adm
-@dirrm frontpage/version3.0/_vti_bin/_vti_aut
-@dirrm frontpage/version3.0/_vti_bin
-@dirrm frontpage/version3.0/admin/scripts
-@dirrm frontpage/version3.0/admin
-@dirrm frontpage/version3.0/apache-fp/_vti_bin
-@dirrm frontpage/version3.0/apache-fp
-@dirrm frontpage/version3.0/bin
-@dirrm frontpage/version3.0/exes/_vti_bin/_vti_adm
-@dirrm frontpage/version3.0/exes/_vti_bin/_vti_aut
-@dirrm frontpage/version3.0/exes/_vti_bin
-@dirrm frontpage/version3.0/exes
-@dirrm frontpage/version3.0/nls
-@dirrm frontpage/version3.0/serk/images
-@dirrm frontpage/version3.0/serk
-@dirrm frontpage/version3.0/srcs
-@dirrm frontpage/version3.0
-@unexec rm %D/frontpage/currentversion
+frontpage/version4.0/LICENSE.TXT
+frontpage/version4.0/change_server.sh
+frontpage/version4.0/fp_install.sh
+frontpage/version4.0/frontpage.cnf
+frontpage/version4.0/frontpage.cnf.orig
+frontpage/version4.0/set_default_perms.sh
+frontpage/version4.0/_vti_bin/_vti_adm/admin.exe
+frontpage/version4.0/_vti_bin/_vti_aut/author.exe
+frontpage/version4.0/_vti_bin/fpcount.exe
+frontpage/version4.0/_vti_bin/shtml.exe
+frontpage/version4.0/admin/check.htm
+frontpage/version4.0/admin/contents.htm
+frontpage/version4.0/admin/delsbweb.htm
+frontpage/version4.0/admin/direxe.htm
+frontpage/version4.0/admin/dirnoexe.htm
+frontpage/version4.0/admin/disable.htm
+frontpage/version4.0/admin/enable.htm
+frontpage/version4.0/admin/footer.htm
+frontpage/version4.0/admin/fpadmin.htm
+frontpage/version4.0/admin/fpbanner.htm
+frontpage/version4.0/admin/fpcreate.gif
+frontpage/version4.0/admin/ipaddr.htm
+frontpage/version4.0/admin/newsbweb.htm
+frontpage/version4.0/admin/newsrvr.htm
+frontpage/version4.0/admin/perms.htm
+frontpage/version4.0/admin/recalc.htm
+frontpage/version4.0/admin/rensbweb.htm
+frontpage/version4.0/admin/scripts/fpadmcgi.exe
+frontpage/version4.0/admin/topleft.gif
+frontpage/version4.0/admin/topright.gif
+frontpage/version4.0/admin/uninstal.htm
+frontpage/version4.0/apache-fp/_vti_bin/fpexe
+frontpage/version4.0/apache-fp/fp-patch-apache_1.3.3
+frontpage/version4.0/apache-fp/fpexe.c
+frontpage/version4.0/apache-fp/httpd
+frontpage/version4.0/apache-fp/httpd.Compat
+@unexec rm %D/frontpage/version4.0/apache-fp/suidkey*
+frontpage/version4.0/bin/_vti_inf.htm
+frontpage/version4.0/bin/fpsrvadm.exe
+frontpage/version4.0/bin/postinfo.htm
+frontpage/version4.0/exes/_vti_bin/_vti_adm/admin.exe
+frontpage/version4.0/exes/_vti_bin/_vti_aut/author.exe
+frontpage/version4.0/exes/_vti_bin/fpcount.exe
+frontpage/version4.0/exes/_vti_bin/shtml.exe
+frontpage/version4.0/nls/cp_1250.nls
+frontpage/version4.0/nls/cp_1251.nls
+frontpage/version4.0/nls/cp_1252.nls
+frontpage/version4.0/nls/cp_1253.nls
+frontpage/version4.0/nls/cp_1254.nls
+frontpage/version4.0/nls/cp_1255.nls
+frontpage/version4.0/nls/cp_1256.nls
+frontpage/version4.0/nls/cp_1257.nls
+frontpage/version4.0/nls/cp_1258.nls
+frontpage/version4.0/nls/cp_28592.nls
+frontpage/version4.0/nls/cp_28605.nls
+frontpage/version4.0/nls/cp_437.nls
+frontpage/version4.0/nls/cp_850.nls
+frontpage/version4.0/nls/cp_874.nls
+frontpage/version4.0/nls/cp_932.nls
+frontpage/version4.0/nls/cp_936.nls
+frontpage/version4.0/nls/cp_949.nls
+frontpage/version4.0/nls/cp_950.nls
+frontpage/version4.0/serk/001.gif
+frontpage/version4.0/serk/1ptrans.gif
+frontpage/version4.0/serk/SERK.css
+frontpage/version4.0/serk/adadv.htm
+frontpage/version4.0/serk/adadv_1.htm
+frontpage/version4.0/serk/adadv_2.htm
+frontpage/version4.0/serk/adadv_3.htm
+frontpage/version4.0/serk/adadv_4.htm
+frontpage/version4.0/serk/adadv_5.htm
+frontpage/version4.0/serk/adadv_6.htm
+frontpage/version4.0/serk/adadv_7.htm
+frontpage/version4.0/serk/adadv_8.htm
+frontpage/version4.0/serk/adadv_9.htm
+frontpage/version4.0/serk/adfpre.htm
+frontpage/version4.0/serk/adfpre01.gif
+frontpage/version4.0/serk/adfpre02.gif
+frontpage/version4.0/serk/adfpre_1.htm
+frontpage/version4.0/serk/adfpre_2.htm
+frontpage/version4.0/serk/adfpre_3.htm
+frontpage/version4.0/serk/adfpre_4.htm
+frontpage/version4.0/serk/adfpre_5.htm
+frontpage/version4.0/serk/adfpre_6.htm
+frontpage/version4.0/serk/adfpre_7.htm
+frontpage/version4.0/serk/adfpsr.htm
+frontpage/version4.0/serk/adfpsr_1.htm
+frontpage/version4.0/serk/adfpsr_2.htm
+frontpage/version4.0/serk/adfpsr_3.htm
+frontpage/version4.0/serk/adhtm.htm
+frontpage/version4.0/serk/adhtm_1.htm
+frontpage/version4.0/serk/adhtm_2.htm
+frontpage/version4.0/serk/admart.gif
+frontpage/version4.0/serk/admmc.htm
+frontpage/version4.0/serk/admmc_1.htm
+frontpage/version4.0/serk/admmc_2.htm
+frontpage/version4.0/serk/admmc_3.htm
+frontpage/version4.0/serk/admmc_4.htm
+frontpage/version4.0/serk/admmc_5.htm
+frontpage/version4.0/serk/admmc_6.htm
+frontpage/version4.0/serk/adoview.htm
+frontpage/version4.0/serk/apndx00.htm
+frontpage/version4.0/serk/apndx01.htm
+frontpage/version4.0/serk/apndx02.htm
+frontpage/version4.0/serk/apndx03.htm
+frontpage/version4.0/serk/apndx04.htm
+frontpage/version4.0/serk/apndx05.htm
+frontpage/version4.0/serk/apndxtoc.htm
+frontpage/version4.0/serk/axrpc.htm
+frontpage/version4.0/serk/back.gif
+frontpage/version4.0/serk/bullet.gif
+frontpage/version4.0/serk/cnrat_1.gif
+frontpage/version4.0/serk/cnrat_2.gif
+frontpage/version4.0/serk/cpyright.htm
+frontpage/version4.0/serk/default.htm
+frontpage/version4.0/serk/dwnarrow.gif
+frontpage/version4.0/serk/home.gif
+frontpage/version4.0/serk/incompat.htm
+frontpage/version4.0/serk/inintro.htm
+frontpage/version4.0/serk/inunix.htm
+frontpage/version4.0/serk/inwindow.htm
+frontpage/version4.0/serk/msft.gif
+frontpage/version4.0/serk/next.gif
+frontpage/version4.0/serk/noterule.gif
+frontpage/version4.0/serk/ovarchit.htm
+frontpage/version4.0/serk/ovart.gif
+frontpage/version4.0/serk/ovfeat01.gif
+frontpage/version4.0/serk/ovfeat02.gif
+frontpage/version4.0/serk/ovfeat03.gif
+frontpage/version4.0/serk/ovfeatur.htm
+frontpage/version4.0/serk/ovpublis.htm
+frontpage/version4.0/serk/ovscenar.htm
+frontpage/version4.0/serk/ovwhatar.htm
+frontpage/version4.0/serk/ovwhatis.htm
+frontpage/version4.0/serk/previous.gif
+frontpage/version4.0/serk/r_ydot.gif
+frontpage/version4.0/serk/scintro.htm
+frontpage/version4.0/serk/scuni.htm
+frontpage/version4.0/serk/scuni_1.htm
+frontpage/version4.0/serk/scuni_10.htm
+frontpage/version4.0/serk/scuni_2.htm
+frontpage/version4.0/serk/scuni_3.htm
+frontpage/version4.0/serk/scuni_4.htm
+frontpage/version4.0/serk/scuni_5.htm
+frontpage/version4.0/serk/scuni_6.htm
+frontpage/version4.0/serk/scuni_7.htm
+frontpage/version4.0/serk/scuni_8.htm
+frontpage/version4.0/serk/scuni_9.htm
+frontpage/version4.0/serk/scunix01.gif
+frontpage/version4.0/serk/scwin.htm
+frontpage/version4.0/serk/scwin_1.htm
+frontpage/version4.0/serk/scwin_2.htm
+frontpage/version4.0/serk/scwin_3.htm
+frontpage/version4.0/serk/scwin_4.htm
+frontpage/version4.0/serk/scwin_5.htm
+frontpage/version4.0/serk/scwin_6.htm
+frontpage/version4.0/serk/scwin_7.htm
+frontpage/version4.0/serk/scwin_8.htm
+frontpage/version4.0/serk/scwin_9.htm
+frontpage/version4.0/serk/secart.gif
+frontpage/version4.0/serk/serkindx.htm
+frontpage/version4.0/serk/serktop.gif
+frontpage/version4.0/serk/serktop.htm
+frontpage/version4.0/serk/serkxtra.gif
+frontpage/version4.0/serk/serkxtra.htm
+frontpage/version4.0/serk/setart.gif
+frontpage/version4.0/serk/splash.gif
+frontpage/version4.0/serk/termofus.gif
+frontpage/version4.0/serk/top.gif
+frontpage/version4.0/srcs/fp.suid.c
+@dirrm frontpage/version4.0/_vti_bin/_vti_adm
+@dirrm frontpage/version4.0/_vti_bin/_vti_aut
+@dirrm frontpage/version4.0/_vti_bin
+@dirrm frontpage/version4.0/admin/scripts
+@dirrm frontpage/version4.0/admin
+@dirrm frontpage/version4.0/apache-fp/_vti_bin
+@dirrm frontpage/version4.0/apache-fp
+@dirrm frontpage/version4.0/bin
+@dirrm frontpage/version4.0/exes/_vti_bin/_vti_adm
+@dirrm frontpage/version4.0/exes/_vti_bin/_vti_aut
+@dirrm frontpage/version4.0/exes/_vti_bin
+@dirrm frontpage/version4.0/exes
+@dirrm frontpage/version4.0/nls
+@dirrm frontpage/version4.0/serk
+@dirrm frontpage/version4.0/srcs
+@dirrm frontpage/version4.0

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199910280338.WAA42676>