Upgrade to suPHP 0.6.2. This upgrade is quite major; it introduces

numerous features necessary for hosting, adds the use of a configuration
file (vs. compile-time settings) for configuration details, and is
presently supported by the software author.

Changes to httpd.conf are required for this to work, otherwise PHP
content is offered for download and not parsed.  pkg-message contains
full migration details, but here's the simple version:

suPHP 0.5.2                            suPHP 0.6.2
===========                            ===========
AddType application/x-httpd-php .php   AddType x-httpd-php .php
AddHandler x-httpd-php .php            suPHP_AddHandler x-httpd-php

Tested on RELENG_6 and RELENG_7, using Apache 2.0 and 2.2, with the
help of the PR submitter.

Testing for Apache 1.3 was not performed, thus the port requires the
use of 2.0 or later.  suPHP 0.6.2 does support Apache 1.3, but I'll
need someone running 1.3 to work with me on fixing the port to support
it, if desired.

PR:		ports/116281
Submitted by:	Vladimir Korkodinov <viper@perm.raid.ru>

12 files changed, 135 insertions, 240 deletions

diff --git a/www/suphp/Makefile b/www/suphp/Makefile
index 8a7a70f6ac84..441eb1afdca0 100644
--- a/www/suphp/Makefile
+++ b/www/suphp/Makefile
@@ -6,80 +6,59 @@
 #
 
 PORTNAME=	suphp
-PORTVERSION=	0.5.2
-PORTREVISION=	2
+PORTVERSION=	0.6.2
 CATEGORIES=	www
-MASTER_SITES=	http://www.suphp.org/download/
+MASTER_SITES=	http://www.suphp.org/download/ \
+		ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/koitsu/
 
 MAINTAINER=	freebsd@jdc.parodius.com
-COMMENT=	Securely execute PHP scripts
+COMMENT=	Securely execute PHP scripts under Apache
 
 GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	aclocal:19:env automake:19:env autoconf:261:env libtool:15:env
+
+# Maintainer has not tested suPHP 0.6.x on Apache 1.3.
+USE_APACHE=	2.0+
 USE_PHP=	yes
-USE_APACHE=	1.3+
 WANT_PHP_CGI=	yes
 
-WITH_LOGFILE?=	/var/log/suphp.log
-PHP_PATH?=	${LOCALBASE}/bin/php-cgi
-MIN_UID?=	80
-MIN_GID?=	80
-WITH_SETID_MODE?=	owner
-MYPORTDOCS=	apache/CONFIG apache/INSTALL apache/README apache/LICENSE LICENSE INSTALL README
-LANG=		en de
+MYPORTDOCS=	apache/CONFIG apache/INSTALL apache/README CONFIG LICENSE INSTALL README
 
-CONFIGURE_ARGS+=	--with-php=${PHP_PATH} \
-			--with-logfile=${WITH_LOGFILE} \
-			--with-apache-user=${WWWOWN} \
-			--with-min-gid=${MIN_UID} \
-			--with-min-uid=${MIN_GID} \
-			--with-apxs=${APXS}
+CONFIGURE_ARGS=	--with-apxs=${APXS}
 
-# This is the default of the PATH environment variable when scripts
-# are run under suphp.  This path is normally hard-coded into suphp.c.
-# Many people prefer to have /usr/local and other utilities available
-# to php scripts.
-# Make sure the path is colon-delimited!
-#
-SUPHP_PATH?=		/bin:/usr/bin
 
-## Available knobs:
-##   WITHOUT_CHECKPATH:    disable check if script resides in DOCUMENT_ROOT
-.if defined(WITHOUT_CHECKPATH)
-CONFIGURE_ARGS+=	--disable-checkpath
-.endif
-##   WITHOUT_CHECKUID:     accept UIDs that are not listed in /etc/passwd
-.if defined(WITHOUT_CHECKUID)
-CONFIGURE_ARGS+=	--disable-checkuid
-.endif
-##   WITHOUT_CHECKGID:     accept GIDs that are not listed in /etc/group
-.if defined(WITHOUT_CHECKGID)
-CONFIGURE_ARGS+=	--disable-checkgid
-.endif
-##   WITH_SETID_MODE:      mode to use for setting UID/GID.
+# WITH_SETID_MODE should be a value of "owner", "force", or "paranoid".
+# It's important that you understand the differences between each mode.
+# See /usr/local/share/doc/suphp/INSTALL for details.
+#
+WITH_SETID_MODE?=	owner
 CONFIGURE_ARGS+=	--with-setid-mode=${WITH_SETID_MODE}
 
-.include <bsd.port.pre.mk>
 
-show-options:
-	@${SED} -ne 's/^##//p' ${.CURDIR}/Makefile
+.include <bsd.port.pre.mk>
 
-pre-everything:: show-options
-	@${DO_NADA}
+# Apache 2.0 (www/apache2) has apr-config in LOCALBASE/lib/apache2, while
+# Apache 2.2 (www/apache22) has apr-1-config in LOCALBASE/bin.
+#
+.if ${APACHE_VERSION} == 20
+CONFIGURE_ARGS+=	--with-apr=${LOCALBASE}/lib/apache2
+.else
+CONFIGURE_ARGS+=	--with-apr=${LOCALBASE}
+.endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%SUPHP_PATH%%|${SUPHP_PATH}|g' \
-		${WRKSRC}/src/suphp.c
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for l in ${LANG}
-	@${MKDIR} ${DOCSDIR}/${l}/apache
-.       for f in ${MYPORTDOCS}
-	@${CP} -Rfp ${WRKSRC}/doc/${l}/${f} ${DOCSDIR}/${l}/${f}
-.       endfor
+	@${MKDIR} ${DOCSDIR}/apache
+.for f in ${MYPORTDOCS}
+	@${CP} -Rfp ${WRKSRC}/doc/${f} ${DOCSDIR}/${f}
 .endfor
 .endif
+.if !defined(WITH_DEBUG)
+	@${STRIP_CMD} ${PREFIX}/sbin/suphp
+.endif
+	@${CP} -fp ${WRKSRC}/doc/suphp.conf-example ${PREFIX}/etc/suphp.conf-example
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/suphp/distinfo b/www/suphp/distinfo
index dfc75eef2089..eeea8d21d9b1 100644
--- a/www/suphp/distinfo
+++ b/www/suphp/distinfo
@@ -1,3 +1,3 @@
-MD5 (suphp-0.5.2.tar.gz) = 337909e87027af124052baddddbd2994
-SHA256 (suphp-0.5.2.tar.gz) = 3da1eced3bdf12caa72716f4b72f47d79eec89a1810015c5bab3705469b162c7
-SIZE (suphp-0.5.2.tar.gz) = 104699
+MD5 (suphp-0.6.2.tar.gz) = 06ca9e592a5c6dd3dcb9360c958369c1
+SHA256 (suphp-0.6.2.tar.gz) = 1bb9c6af84bb901c8a39611354e49e5bcd79185eb37b02878dc0840facf0ccfc
+SIZE (suphp-0.6.2.tar.gz) = 372228
diff --git a/www/suphp/files/patch-Makefile.in b/www/suphp/files/patch-Makefile.in
deleted file mode 100644
index d1181f75ef17..000000000000
--- a/www/suphp/files/patch-Makefile.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- Makefile.in.orig	Tue Jul 13 02:43:40 2004
-+++ Makefile.in	Wed Oct 27 23:10:27 2004
-@@ -17,5 +17,5 @@
-            srcdir='$(srcdir)'
- 
- all install clean:
--	@$(MAKE) $(MAKEDEFS) -C src $@
-+	cd src && $(MAKE) $(MAKEDEFS) $@
- 
diff --git a/www/suphp/files/patch-acinclude.m4 b/www/suphp/files/patch-acinclude.m4
new file mode 100644
index 000000000000..a78b098280fe
--- /dev/null
+++ b/www/suphp/files/patch-acinclude.m4
@@ -0,0 +1,11 @@
+--- acinclude.m4.orig	2006-10-18 13:42:07.000000000 -0700
++++ acinclude.m4	2007-11-11 02:15:56.000000000 -0800
+@@ -40,7 +40,7 @@
+ dnl value of apr_config to fetch any necessary build/link information.
+ dnl
+ 
+-AC_DEFUN(APR_FIND_APR, [
++AC_DEFUN([APR_FIND_APR], [
+   apr_found="no"
+ 
+   if test "$ac_cv_emxos2" = "yes"; then
diff --git a/www/suphp/files/patch-configure b/www/suphp/files/patch-configure
deleted file mode 100644
index a839f51e6941..000000000000
--- a/www/suphp/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Thu Mar  2 13:38:36 2006
-+++ configure	Thu Mar  2 13:39:23 2006
-@@ -2405,7 +2405,7 @@
-                     | cut -f2 -d"/" \
-                     | cut -f1 -d" "`
-     major_version=`echo $APACHE_VERSION|cut -f1,2 -d.`
--    if test "$major_version" = "2.0"; then
-+    if test "$major_version" = "2.0" -o "$major_version" = "2.2"; then
-       APACHE_VERSION_2=true
-       APACHE_VERSION_1_3=false
-     else
diff --git a/www/suphp/files/patch-doc::suphp.conf-example b/www/suphp/files/patch-doc::suphp.conf-example
new file mode 100644
index 000000000000..c1c1d46dd23c
--- /dev/null
+++ b/www/suphp/files/patch-doc::suphp.conf-example
@@ -0,0 +1,30 @@
+--- doc/suphp.conf-example.orig	2005-11-26 11:29:02.000000000 -0800
++++ doc/suphp.conf-example	2007-11-11 02:36:02.000000000 -0800
+@@ -6,7 +6,7 @@
+ loglevel=info
+ 
+ ;User Apache is running as
+-webserver_user=wwwrun
++webserver_user=www
+ 
+ ;Path all scripts have to be in
+ docroot=/
+@@ -33,15 +33,15 @@
+ umask=0077
+ 
+ ; Minimum UID
+-min_uid=100
++min_uid=80
+ 
+ ; Minimum GID
+-min_gid=100
++min_gid=80
+ 
+ 
+ [handlers]
+ ;Handler for php-scripts
+-x-httpd-php=php:/usr/bin/php
++x-httpd-php=php:/usr/local/bin/php-cgi
+ 
+ ;Handler for CGI-scripts
+ x-suphp-cgi=execute:!self
diff --git a/www/suphp/files/patch-src-suphp.c b/www/suphp/files/patch-src-suphp.c
deleted file mode 100644
index 0c245c7c5fe4..000000000000
--- a/www/suphp/files/patch-src-suphp.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/suphp.c.orig	Tue Jul 13 02:43:41 2004
-+++ src/suphp.c	Tue May  9 08:59:46 2006
-@@ -55,7 +55,7 @@
-  
-  // Set secure PATH
-  
-- suphp_setenv("PATH", "/bin:/usr/bin", 1);
-+ suphp_setenv("PATH", "%%SUPHP_PATH%%", 1);
-  
-  // Check for PHP_CONFIG environment variable
-  
diff --git a/www/suphp/files/patch-src::Makefile.in b/www/suphp/files/patch-src::Makefile.in
deleted file mode 100644
index 804eebc2e4c2..000000000000
--- a/www/suphp/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,62 +0,0 @@
---- src/Makefile.in.orig	Tue Jul 13 02:43:41 2004
-+++ src/Makefile.in	Wed Aug 11 22:02:44 2004
-@@ -28,37 +28,38 @@
- INCLUDES = -I$(top_srcdir)/src
- RM = rm -f
- 
-+SRCS=   suphp.c filesystem.c check.c error.c log.c compat.c
-+OBJS=   ${SRCS:.c=.o}
-+
- all: suphp suphp.mod
- 
--suphp: suphp.o filesystem.o check.o error.o log.o compat.o
--	$(CC) $(LDFLAGS) $(DEFS) -o suphp \
--	 suphp.o filesystem.o check.o error.o log.o compat.o
-+suphp: ${OBJS}
-+	$(CC) $(LDFLAGS) $(DEFS) -o suphp ${OBJS}
- 
- suphp.mod:
- 	@if test "$(APXS)" != "/notfound/"; then \
- 	  if test "$(APACHE_VERSION_2)" = "true"; then \
- 	    echo "*** INFO: Building mod_suphp for Apache 2.0 ***"; \
--	    $(MAKE) $(MAKEDEFS) -C apache2; \
-+	    cd apache2 && $(MAKE) $(MAKEDEFS); \
- 	  fi; \
- 	  if test "$(APACHE_VERSION_1_3)" = "true"; then \
- 	    echo "*** INFO: Building mod_suphp for Apache 1.3 ***"; \
--	    $(MAKE) $(MAKEDEFS) -C apache; \
-+	    cd apache && $(MAKE) $(MAKEDEFS); \
- 	  fi; \
- 	else \
- 	  echo "*** WARNING: No 'apxs' found. Skipping mod_suphp! ***"; \
- 	fi
- 
- install: suphp suphp.mod
--	$(INSTALL_PROGRAM) -d $(DESTDIR)$(sbindir)
- 	$(INSTALL_PROGRAM) -m 4755 suphp $(DESTDIR)$(sbindir)/suphp
- 	@if test "$(APXS)" != "/notfound/"; then \
- 	  if test "$(APACHE_VERSION_2)" = "true"; then \
- 	    echo "*** INFO: Installing mod_suphp for Apache 2.0 ***"; \
--	    $(MAKE) $(MAKEDEFS) -C apache2 install; \
-+	    cd apache2 && $(MAKE) $(MAKEDEFS) install; \
- 	  fi; \
- 	  if test "$(APACHE_VERSION_1_3)" = "true"; then \
- 	    echo "*** INFO: Installing mod_suphp for Apache 1.3 ***"; \
--	    $(MAKE) $(MAKEDEFS) -C apache install; \
-+	    cd apache && $(MAKE) $(MAKEDEFS) install; \
- 	  fi; \
- 	else \
- 	  echo "*** WARNING: No 'apxs' found. Skipping installation of mod_suphp! ***"; \
-@@ -66,9 +67,9 @@
- 
- clean:
- 	$(RM) suphp *.o
--	@$(MAKE) $(MAKEDEFS) -C apache clean
--	@$(MAKE) $(MAKEDEFS) -C apache2 clean
-+	cd apache && $(MAKE) $(MAKEDEFS) clean
-+	cd apache2 && $(MAKE) $(MAKEDEFS) clean
- 
--%.o : %.c
-+${OBJS}: ${SRCS}
- 	$(CC) -c $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $<
- 
diff --git a/www/suphp/files/patch-src::apache2::mod_suphp.c b/www/suphp/files/patch-src::apache2::mod_suphp.c
index 231d14845c97..1ee2423d7af8 100644
--- a/www/suphp/files/patch-src::apache2::mod_suphp.c
+++ b/www/suphp/files/patch-src::apache2::mod_suphp.c
@@ -1,58 +1,13 @@
---- src/apache2/mod_suphp.c.orig	Tue Jul 13 04:43:41 2004
-+++ src/apache2/mod_suphp.c	Thu Mar  2 20:14:04 2006
-@@ -56,7 +56,7 @@
-         return -1;
-        
-     rv = apr_bucket_read(b, &bucket_data, &bucket_data_len, APR_BLOCK_READ);
--    if (!APR_STATUS_IS_SUCCESS(rv) || (bucket_data_len == 0))
-+    if (!(rv == APR_SUCCESS) || (bucket_data_len == 0))
-     {
-         return 0;
-     }
-@@ -463,7 +463,13 @@
-     
-     if (((rv = apr_procattr_create(&procattr, p)) != APR_SUCCESS)
-         || ((rv = apr_procattr_io_set(procattr, APR_CHILD_BLOCK, APR_CHILD_BLOCK, APR_CHILD_BLOCK)) != APR_SUCCESS)
-+
-+/* XXX: Pending review by both the Apache APR folks, as well as the suPHP folks.  See thread:
-+ * http://lists.marsching.biz/pipermail/suphp/2004-July/000756.html
-+ */
-+/*
-         || ((rv = apr_procattr_dir_set(procattr, ap_make_dirstr_parent(r->pool, r->filename))) != APR_SUCCESS)
-+*/
-     
-     /* set resource limits */
+--- src/apache2/mod_suphp.c.orig	2006-11-05 16:57:12.000000000 -0800
++++ src/apache2/mod_suphp.c	2007-11-11 03:15:50.000000000 -0800
+@@ -321,8 +321,8 @@
+     AP_INIT_TAKE2("suPHP_UserGroup", suphp_handle_cmd_user_group, NULL, RSRC_CONF | ACCESS_CONF,
+                   "User and group scripts shall be run as"),
+ #endif
+-    AP_INIT_ITERATE("suPHP_AddHandler", suphp_handle_cmd_add_handler, NULL, ACCESS_CONF, "Tells mod_suphp to handle these MIME-types"),
+-    AP_INIT_ITERATE("suPHP_RemoveHandler", suphp_handle_cmd_remove_handler, NULL, ACCESS_CONF, "Tells mod_suphp not to handle these MIME-types"),
++    AP_INIT_ITERATE("suPHP_AddHandler", suphp_handle_cmd_add_handler, NULL, RSRC_CONF | ACCESS_CONF, "Tells mod_suphp to handle these MIME-types"),
++    AP_INIT_ITERATE("suPHP_RemoveHandler", suphp_handle_cmd_remove_handler, NULL, RSRC_CONF | ACCESS_CONF, "Tells mod_suphp not to handle these MIME-types"),
+     {NULL}
+ };
  
-@@ -524,7 +530,9 @@
-             return rv;
-         }
-         
--        APR_BRIGADE_FOREACH(bucket, bb)
-+ 	for (bucket = APR_BRIGADE_FIRST(bb);
-+ 	     bucket != APR_BRIGADE_SENTINEL(bb);
-+ 	     bucket = APR_BUCKET_NEXT(bucket))
-         {
-             const char *data;
-             apr_size_t len;
-@@ -595,7 +603,9 @@
-             
-             const char *buf;
-             apr_size_t blen;
--            APR_BRIGADE_FOREACH(b, bb)
-+ 	    for (b = APR_BRIGADE_FIRST(bb);
-+ 		 b != APR_BRIGADE_SENTINEL(bb);
-+ 		 b = APR_BUCKET_NEXT(b))
-             {
-                 if (APR_BUCKET_IS_EOS(b))
-                     break;
-@@ -616,7 +626,9 @@
-             /* empty brigade (script output) */
-             const char *buf;
-             apr_size_t blen;
--            APR_BRIGADE_FOREACH(b, bb)
-+ 	    for (b = APR_BRIGADE_FIRST(bb);
-+ 		 b != APR_BRIGADE_SENTINEL(bb);
-+ 		 b = APR_BUCKET_NEXT(b))
-             {
-                 if (APR_BUCKET_IS_EOS(b))
-                     break;
diff --git a/www/suphp/files/patch-src::apache::Makefile.in b/www/suphp/files/patch-src::apache::Makefile.in
deleted file mode 100644
index 86ba22d0e02f..000000000000
--- a/www/suphp/files/patch-src::apache::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/apache/Makefile.in.orig	Mon Aug 25 11:40:47 2003
-+++ src/apache/Makefile.in	Mon Aug 25 11:41:02 2003
-@@ -29,7 +29,9 @@
- all: suphp.mod
- 
- suphp.mod: mod_suphp.c
--	$(APXS) -c $(DEFS) $(EXTRADEFS) $(INCLUDES) -Wc,"$(CFLAGS)" mod_suphp.c
-+	@if [ ! -f mod_suphp.o ]; then \
-+	$(APXS) -c $(DEFS) $(EXTRADEFS) $(INCLUDES) -Wc,"$(CFLAGS)" mod_suphp.c ;\
-+	fi;
- 
- install: suphp.mod
- 	$(APXS) -i -a mod_suphp.so
diff --git a/www/suphp/pkg-message b/www/suphp/pkg-message
index e7187ad3eb00..45f278a74ba7 100644
--- a/www/suphp/pkg-message
+++ b/www/suphp/pkg-message
@@ -1,12 +1,47 @@
 ----------------------------------------------------------------
-You have installed mod_suphp, a module that provides a wrapper 
-for PHP for Apache.
-
 For help on using this module, please see the suPHP homepage:
 
     	http://www.suphp.org/
 
-Important hints:
 Using suPHP can break some PHP-scripts, because of Apache's CGI 
 interface.
 -----------------------------------------------------------------
+
+-----------------------------------------------------------------
+For those migrating from suPHP 0.5.x, be aware there are many
+changes in 0.6.x that can cause your current Apache environment
+to stop working or behave oddly.  Here are two migration tips:
+
+suPHP now uses a configuration file for runtime configuration.
+The file is located at:
+
+        /usr/local/etc/suphp.conf
+
+...but *has not* been created for you.  A sample configuration
+file has been installed here:
+
+	/usr/local/etc/suphp.conf-example
+
+This means that many of the make.conf(5) knobs for the
+www/suphp port are no longer used, and are modifiable in
+real-time; thus, things like WITHOUT_CHECKPATH and SUPHP_PATH
+are no longer needed.  Instead, edit the config file.
+
+Equally as important, suPHP no longer uses a static MIME type
+for determining what content get handled by suPHP.  In 0.5.x,
+you used the following Apache directives:
+
+	suPHP_Engine on
+        AddType application/x-httpd-php .php
+        AddHandler x-httpd-php .php
+
+In suPHP 0.6.x, you should use the following:
+
+	suPHP_Engine on
+        AddType x-httpd-php .php
+        suPHP_AddHandler x-httpd-php
+
+Otherwise, Apache will begin serving PHP files as downloadable
+content, rather than parse them with the PHP interpreter.
+-----------------------------------------------------------------
+
diff --git a/www/suphp/pkg-plist b/www/suphp/pkg-plist
index 67c73ff0c083..3b066d45cfa5 100644
--- a/www/suphp/pkg-plist
+++ b/www/suphp/pkg-plist
@@ -1,23 +1,14 @@
 sbin/suphp
+etc/suphp.conf-example
 %%APACHEMODDIR%%/mod_suphp.so
 @exec %D/sbin/apxs -e -a -n suphp %D/%f
 @unexec %D/sbin/apxs -e -A -n suphp %D/%f
-%%PORTDOCS%%%%DOCSDIR%%/en/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/en/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/en/README
-%%PORTDOCS%%%%DOCSDIR%%/en/apache/CONFIG
-%%PORTDOCS%%%%DOCSDIR%%/en/apache/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/en/apache/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/en/apache/README
-%%PORTDOCS%%%%DOCSDIR%%/de/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/de/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/de/README
-%%PORTDOCS%%%%DOCSDIR%%/de/apache/CONFIG
-%%PORTDOCS%%%%DOCSDIR%%/de/apache/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/de/apache/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/de/apache/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/de/apache
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/apache
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/de
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/CONFIG
+%%PORTDOCS%%%%DOCSDIR%%/apache/CONFIG
+%%PORTDOCS%%%%DOCSDIR%%/apache/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/apache/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/apache
 %%PORTDOCS%%@dirrm %%DOCSDIR%%