- Add htcacheclean startup script [1]

- Add support for PCRE from ports (WITH_PCRE_FROM_PORTS) [2]
- Install split-logfile [3]

Submitted by:	Christopher Shumway <cshumway at titan-project dot org> [1]
Requested by:	Gergely CZUCZY <phoemix at harmless dot hu>, [2]
		many [3]

www/apache22/Makefile

@@ -50,7 +50,7 @@ USE_BZIP2=		yes
 USE_ICONV=		yes
 USE_AUTOTOOLS=	autoconf:259 libtool:15
 USE_PERL5=		yes
-USE_RC_SUBR=		apache22.sh
+USE_RC_SUBR=		apache22.sh htcacheclean.sh
 SUB_LIST+=		RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
 LIBTOOLFILES=		configure
 
@@ -110,6 +110,11 @@ WITH_EXCEPTION_HOOK=	YES
 CONFIGURE_ARGS+=	--enable-exception-hook
 .endif
 
+.if defined(WITH_PCRE_FROM_PORTS)
+CONFIGURE_ARGS+=	--with-pcre=${LOCALBASE}
+LIB_DEPENDS+=		pcre.0:${PORTSDIR}/devel/pcre
+.endif
+
 # for slave ports
 .if !defined(MASTERDIR)
 APACHEDIR=	${.CURDIR}

www/apache22/files/htcacheclean.sh.in

@@ -0,0 +1,64 @@
+#!/bin/sh
+#
+#
+#
+
+# PROVIDE: htcacheclean
+
+#
+# Configuration settings for htcacheclean in /etc/rc.conf
+#
+# htcacheclean_enable (bool) 
+# Set to "NO" by default 
+# Set it to "YES" to enable htcacheclean
+#
+# htcacheclean_cache (str) Set to "%%PREFIX%%/www/proxy" by default Set the
+# location of the mod_disk_cache CacheRoot This should be the same as whats in
+# your httpd.conf
+#
+# htcacheclean_cachelimit (str) Set to "512M" by default Sets the size
+# htcacheclean should prune the disk cache to expressed in bytes by default, K
+# for kilobytes, M for megabytes.
+#
+# htcacheclean_interval (num) 
+# Set to "10" by default
+# Sets how frequently in munutes htcacheclean wakes up and prunes the cache
+#
+# htcacheclean_args (str)
+# Set to "-t -n -i" by default
+# Sets extra command-line arguments to htcacheclean
+# -t Delete all empty directories
+# -n Be nice by sleeping occasionally to not saturate the I/O bandwith of the disk
+# -i Run only when there was a modification of the disk cache
+
+. %%RC_SUBR%%
+
+htcacheclean_enable="${htcacheclean_enable:-"NO"}"
+htcacheclean_cache="${htcacheclean_cache:-"%%PREFIX%%/www/proxy"}"
+htcacheclean_cachelimit="${htcacheclean_cachelimit:-"512M"}"
+htcacheclean_interval="${htcacheclean_interval:-"60"}"
+htcacheclean_args="${htcacheclean_args:-"-t -n -i"}"
+
+
+name="htcacheclean"
+rcvar=`set_rcvar`
+
+start_precmd="htc_check"
+restart_precmd="htc_check"
+restart_reload="htc_check"
+load_rc_config "${name}"
+
+command="%%PREFIX%%/sbin/htcacheclean"
+flags="-p${htcacheclean_cache} -d${htcacheclean_interval} -l${htcacheclean_cachelimit} ${htcacheclean_args}"
+required_dirs="${htcacheclean_cache}"
+
+htc_check()
+{
+	[ ! -d ${htcacheclean_cache} ] && {
+		echo ""
+		return 1
+	}
+	return 0
+}
+
+run_rc_command "$1"

www/apache22/files/patch-support:Makefile.in

@@ -1,6 +1,14 @@
---- support/Makefile.in.orig	Tue Dec 21 09:31:12 2004
-+++ support/Makefile.in	Tue Dec 21 09:31:39 2004
-@@ -23,10 +23,7 @@
+--- support/Makefile.in.orig	2005-07-06 23:15:34.000000000 +0000
++++ support/Makefile.in	2007-07-22 09:41:16.000000000 +0000
+@@ -16,17 +16,14 @@
+ 	@test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
+ 	@test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
+ 	@cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir)
+-	@for i in apxs apachectl dbmmanage; do \
++	@for i in apxs apachectl dbmmanage split-logfile; do \
+ 	    if test -f "$(builddir)/$$i"; then \
+ 	        cp -p $$i $(DESTDIR)$(sbindir); \
+ 	        chmod 755 $(DESTDIR)$(sbindir)/$$i; \
  	    fi ; \
  	done
  	@if test -f "$(builddir)/envvars-std"; then \

www/apache22/pkg-plist

@@ -258,6 +258,7 @@ sbin/httpd
 sbin/httxt2dbm
 sbin/logresolve
 sbin/rotatelogs
+sbin/split-logfile
 %%MOD_SUEXEC%%sbin/suexec
 %%APR_PORTS%%build-1/apr_rules.mk
 %%APR_PORTS%%build-1/libtool