6 files changed, 36 insertions, 37 deletions

diff --git a/www/mod_frontpage2-rtr/Makefile b/www/mod_frontpage2-rtr/Makefile
index 6a1089d43b01..72927aea8a7c 100644
--- a/www/mod_frontpage2-rtr/Makefile
+++ b/www/mod_frontpage2-rtr/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mod_frontpage
-PORTVERSION=	5.0.2.2635
-PORTREVISION=	2
+PORTVERSION=	5.0.2.4803
 CATEGORIES=	www
 MASTER_SITES=	# Requries manual fetch of files from http://www.rtr.com/
 PKGNAMESUFFIX=	${AP_VERSION:S/+//}
@@ -16,24 +15,16 @@ DISTFILES=	${FRONTPAGE}
 MAINTAINER=	swhetzel@gmail.com
 COMMENT=	Microsoft mod_frontpage (by RTR) for Apache ${FP_AP_VER}
 
-FORBIDDEN=	http://vuxml.FreeBSD.org/c0171f59-ea8a-11da-be02-000c6ec775d9.html
-
 RUN_DEPENDS=	${LOCALBASE}/${FP_SETPERM}:${PORTSDIR}/www/frontpage
 
-DIST_SUBDIR=	fp${PORTVERSION:S/.//g}
-
-ONLY_FOR_ARCHS=	i386 ia64 amd64 alpha sparc64
-
 PATCH_WRKSRC=	${WRKDIR}
 
-FPDIR=		frontpage/version${FP_VER}
-
-EXTRACT_FILES=	${FPDIR}/apache-fp/mod_frontpage.c \
-		${FPDIR}/apache2/mod_fpcgid.c \
-		${FPDIR}/apache2/mod_fpcgid.h \
-		${FPDIR}/apache2/mod_frontpage.c \
-		${FPDIR}/apache2/mod_frontpage.h \
-		${FPDIR}/apache2/mod_suexec.h
+EXTRACT_FILES=	${FP_DIR}/apache-fp/mod_frontpage.c \
+		${FP_DIR}/apache2/mod_fpcgid.c \
+		${FP_DIR}/apache2/mod_fpcgid.h \
+		${FP_DIR}/apache2/mod_frontpage.c \
+		${FP_DIR}/apache2/mod_frontpage.h \
+		${FP_DIR}/apache2/mod_suexec.h
 
 USE_APACHE?=	20+
 AP_FAST_BUILD=	yes
@@ -41,12 +32,12 @@ AP_GENPLIST=	yes
 
 AP_EXTRAS=	-Wc,-DFREEBSD
 
-FP_SETPERM=	${FPDIR}/set_default_perms.sh
+FP_SETPERM=	${FP_DIR}/set_default_perms.sh
 
 .ifdef WITH_MODFP_COMPAT
 AP_EXTRAS+=	-DIMPROVED_MODFP_COMPAT
 .endif
-.ifdef WITH_DISABLED
+.ifdef WITH_MODFP_DISABLED
 AP_EXTRAS+=	-DDEFAULT_TO_OFF
 .endif
 
@@ -55,11 +46,11 @@ AP_EXTRAS+=	-DDEFAULT_TO_OFF
 
 .if ${APACHE_VERSION} >= 20
 FP_AP_VER=	2.0
-WRKSRC=		${WRKDIR}/${FPDIR}/apache2
+WRKSRC=		${WRKDIR}/${FP_DIR}/apache2
 SRC_FILE=	mod_frontpage.c mod_fpcgid.c
 .else
 FP_AP_VER=	1.3
-WRKSRC=		${WRKDIR}/${FPDIR}/apache-fp
+WRKSRC=		${WRKDIR}/${FP_DIR}/apache-fp
 PKGMESSAGE=	${MASTERDIR}/pkg-message13
 .endif
 
diff --git a/www/mod_frontpage2-rtr/distinfo b/www/mod_frontpage2-rtr/distinfo
index 0377a8a7e4a4..69c8cab6a928 100644
--- a/www/mod_frontpage2-rtr/distinfo
+++ b/www/mod_frontpage2-rtr/distinfo
@@ -1,8 +1,12 @@
-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
+MD5 (fp5024803/fp50.alpha.tar.gz) = 14f7f18e18d36f1208524f88d53167fb
+SHA256 (fp5024803/fp50.alpha.tar.gz) = 6a9d2a1ae55a8ef260e59d98b8cf26ebf38f11123211c748647851526f1bd60b
+SIZE (fp5024803/fp50.alpha.tar.gz) = 13245946
+MD5 (fp5024803/fp50.bsdi.tar.gz) = ea789f27549835f41d7e54d7c73d98ce
+SHA256 (fp5024803/fp50.bsdi.tar.gz) = 002dd07212c060998742fe5fd781ecbd4226bab461c6704d451c378a548ad5e0
+SIZE (fp5024803/fp50.bsdi.tar.gz) = 10523532
+MD5 (fp5024803/fp50.freebsd.tar.gz) = f6754c6e25f252fe19b7dff047eecf39
+SHA256 (fp5024803/fp50.freebsd.tar.gz) = 97f8ec0368079c35a40a7f0afbe2e117bbc1c69a4774299c39490b0006015281
+SIZE (fp5024803/fp50.freebsd.tar.gz) = 10729480
+MD5 (fp5024803/fp50.solaris.tar.gz) = 7b7d8bc138459bb05185cf1f807d9f9c
+SHA256 (fp5024803/fp50.solaris.tar.gz) = f202e26434465fcec3e838b78fca40389d0d3f21b6ffa626bd533cc3f73c7b4f
+SIZE (fp5024803/fp50.solaris.tar.gz) = 11511771
diff --git a/www/mod_frontpage2-rtr/files/patch-apache-fp::mod_frontpage.c b/www/mod_frontpage2-rtr/files/patch-apache-fp::mod_frontpage.c
index 33fc9933da1a..14280d2688c6 100644
--- a/www/mod_frontpage2-rtr/files/patch-apache-fp::mod_frontpage.c
+++ b/www/mod_frontpage2-rtr/files/patch-apache-fp::mod_frontpage.c
@@ -1,5 +1,5 @@
 --- frontpage/version5.0/apache-fp/mod_frontpage.c.orig	Tue Dec  2 20:18:45 2003
-+++ frontpage/version5.0/apache-fp/mod_frontpage.c	Mon Jan 31 00:43:54 2005
++++ frontpage/version5.0/apache-fp/mod_frontpage.c	Tue Jun 20 08:51:30 2006
 @@ -52,10 +52,13 @@
  #include "httpd.h"
  #include "http_config.h"
@@ -26,10 +26,12 @@
  static char gszKeyVal[KEYLEN+1];    /* SUID key value used by this module */
  static int  gfdKeyPipe[2];          /* Pipe to fpexe stub CGI */
  static int  gbKeyPipeActive;        /* Pipe to fpexe stub CGI is active */
-@@ -584,6 +592,31 @@
+@@ -583,7 +591,32 @@
+     /*
       * Thanks to Scot Hetzel (hetzels@westbend.net)
       */
-     ap_add_version_component("FrontPage/5.0.2.2635");
+-    ap_add_version_component("FrontPage/5.0.2.2635");
++    ap_add_version_component("FrontPage/5.0.2.4803");
 +
 +    while (s != NULL) {
 +        FrontPage_conf* c = ap_get_module_config (s->module_config, &frontpage_module);
diff --git a/www/mod_frontpage2-rtr/files/patch-apache2::mod_frontpage.c b/www/mod_frontpage2-rtr/files/patch-apache2::mod_frontpage.c
index 812a64a055c8..ef3ed237e575 100644
--- a/www/mod_frontpage2-rtr/files/patch-apache2::mod_frontpage.c
+++ b/www/mod_frontpage2-rtr/files/patch-apache2::mod_frontpage.c
@@ -1,5 +1,5 @@
---- frontpage/version5.0/apache2/mod_frontpage.c-orig	Tue Dec  2 20:18:45 2003
-+++ frontpage/version5.0/apache2/mod_frontpage.c	Tue Jan 17 18:01:02 2006
+--- frontpage/version5.0/apache2/mod_frontpage.c.orig	Tue Dec  2 20:18:45 2003
++++ frontpage/version5.0/apache2/mod_frontpage.c	Tue Jun 20 08:58:54 2006
 @@ -62,7 +62,6 @@
  #include <dirent.h>  
  #include <errno.h>
@@ -8,10 +8,12 @@
  #include "apr_strings.h" 
  #include "http_log.h"
  
-@@ -590,6 +589,32 @@
+@@ -589,7 +588,33 @@
+     /*
       * Thanks to Scot Hetzel (hetzels@westbend.net)
       */
-     ap_add_version_component(p, "FrontPage/5.0.2.2635");
+-    ap_add_version_component(p, "FrontPage/5.0.2.2635");
++    ap_add_version_component(p, "FrontPage/5.0.2.4803");
 +
 +    while (s != NULL) {
 +	cgid_server_conf* c = ap_get_module_config(s->module_config, &frontpage_module);
diff --git a/www/mod_frontpage2-rtr/pkg-message b/www/mod_frontpage2-rtr/pkg-message
index 4b594c9a71e9..ab3f77f15a60 100644
--- a/www/mod_frontpage2-rtr/pkg-message
+++ b/www/mod_frontpage2-rtr/pkg-message
@@ -38,7 +38,7 @@ FrontPageAdmin On/Off	# Allows/Disallows Administration of web site
 			  with FrontPage Extensions
 
 By default FrontPage Extentions and Administration are enabled.  If
-the module has been compiled with WITH_DISABLED, then you need to
+the module has been compiled with WITH_MODFP_DISABLED, then you need to
 add one of the above directives.
 
 If the module has been compiled with WITH_MODFP_COMPAT, then the
diff --git a/www/mod_frontpage2-rtr/pkg-message13 b/www/mod_frontpage2-rtr/pkg-message13
index da70af0e46b3..9c2c096c4a85 100644
--- a/www/mod_frontpage2-rtr/pkg-message13
+++ b/www/mod_frontpage2-rtr/pkg-message13
@@ -50,7 +50,7 @@ FrontPageAdmin On/Off	# Allows/Disallows Administration of web site
 			  with FrontPage Extensions
 
 By default FrontPage Extentions and Administration are enabled.  If
-the module has been compiled with WITH_DISABLED, then you need to
+the module has been compiled with WITH_MODFP_DISABLED, then you need to
 add one of the above directives.
 
 If the module has been compiled with WITH_MODFP_COMPAT, then the