- Update to 33b27

PR:		ports/86376
Submitted by:	Johan van Selst <johans@stack.nl> (maintainer)

4 files changed, 27 insertions, 14 deletions

diff --git a/www/xshttpd-devel/Makefile b/www/xshttpd-devel/Makefile
index 7215463..06476e4 100644
--- a/www/xshttpd-devel/Makefile
+++ b/www/xshttpd-devel/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	xshttpd
-DISTVERSION=	3.3b26
+DISTVERSION=	3.3b27
 CATEGORIES=	www
-MASTER_SITES=	ftp://ftp.stack.nl/pub/xs-httpd/release/
+MASTER_SITES=	ftp://ftp.stack.nl/pub/xs-httpd/release/ \
+	ftp://mud.stack.nl/pub/xs-httpd/release/
 DISTNAME=	${PORTNAME}-${DISTVERSION:S/.//}
 
 MAINTAINER=	johans@stack.nl
@@ -23,11 +24,21 @@ MAN1=		clearxs.1 gfxcount.1 httpd.1 httpdc.1 imagemap.1 \
 MAN5=		httpd.conf.5 xsauth.5 xsscripts.5
 USE_RC_SUBR=	xshttpd.sh
 
+USE_REINPLACE=	yes
+
+OPTIONS=	SSL "Enable https support" On \
+		LDAP "Enable ldap support" Off \
+		PCRE "Enable pcre rewriting support" Off \
+		PERSISTENT_PERL "Enable persistent perl interpreter" Off
+
 # By default XS-HTTPD stores its data in ${PREFIX}/lib/httpd
 DATADIR=	${PREFIX}/www
 CONFIGURE_ARGS+=--with-rootdir=${DATADIR}
 
+.include <bsd.port.pre.mk>
+
 .if !defined(WITHOUT_SSL)
+.include <${PORTSDIR}/Mk/bsd.openssl.mk>
 USE_OPENSSL=	yes
 CONFIGURE_ARGS+=--with-ssl
 .else
@@ -56,13 +67,14 @@ CONFIGURE_ARGS+=--with-pcre=no
 .endif
 
 post-patch:
-.for i in "man/httpd.1" "man/httpd.conf.5" "config/httpd.conf.sample" \
-	"contrib/SSL-Makefile" "contrib/logrotate.sh"
-	@${SED} \
+.for i in man/httpd.1 man/httpd.conf.5 config/httpd.conf.sample \
+	contrib/SSL-Makefile contrib/logrotate.sh
+	@${REINPLACE_CMD} \
 		-e 's|/wwwsys|${DATADIR}|g' \
 		-e 's|/usr/local/lib/httpd|${DATADIR}|g' \
-		${WRKSRC}/$i > ${WRKSRC}/$i.tmp
-	@${MV} ${WRKSRC}/$i.tmp ${WRKSRC}/$i
+		-e 's|nobody|${WWWOWN}|g' \
+		-e 's|nogroup|${WWWGRP}|g' \
+		${WRKSRC}/$i
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/xshttpd-devel/distinfo b/www/xshttpd-devel/distinfo
index 8e732aa..a10208c 100644
--- a/www/xshttpd-devel/distinfo
+++ b/www/xshttpd-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (xshttpd-33b26.tar.gz) = 704ed6e2be411c01207821ee94b84070
-SIZE (xshttpd-33b26.tar.gz) = 206980
+MD5 (xshttpd-33b27.tar.gz) = 74289c1caf0dbe41b8b57283848e259c
+SIZE (xshttpd-33b27.tar.gz) = 208254
diff --git a/www/xshttpd-devel/pkg-descr b/www/xshttpd-devel/pkg-descr
index 47e5bba..2ee77c0 100644
--- a/www/xshttpd-devel/pkg-descr
+++ b/www/xshttpd-devel/pkg-descr
@@ -20,4 +20,4 @@ XS-HTTPD is a WWW server that has the following features:
 - Serves SSL (https) and http connections through the same daemon
 - Full support for IPv6
 
-WWW: http://www.stack.nl/~johans/xs-httpd/
+WWW: http://www.stack.nl/xs-httpd/
diff --git a/www/xshttpd-devel/pkg-plist b/www/xshttpd-devel/pkg-plist
index 43fbea6..ef8fc5a 100644
--- a/www/xshttpd-devel/pkg-plist
+++ b/www/xshttpd-devel/pkg-plist
@@ -12,6 +12,7 @@ bin/xspasswd
 %%DATADIR%%/contrib/logrotate.sh
 %%DATADIR%%/contrib/persistent.pl
 %%DATADIR%%/contrib/wwwstats.pl
+%%DATADIR%%/contrib/agentstats.pl
 %%DATADIR%%/compress.methods.sample
 %%DATADIR%%/gfxcount/digital0.ppm
 %%DATADIR%%/gfxcount/digital1.ppm
@@ -62,9 +63,9 @@ bin/xspasswd
 %%DATADIR%%/mime.index
 %%DATADIR%%/mime.types
 %%DATADIR%%/script.methods.sample
-@unexec rmdir %%DATADIR%%/cgi-bin 2> /dev/null || true
-@unexec rmdir %%DATADIR%%/htdocs 2> /dev/null || true
-@unexec rmdir %%DATADIR%%/logs 2> /dev/null || true
+@dirrm %%DATADIR%%/cgi-bin
+@dirrm %%DATADIR%%/htdocs
+@dirrm %%DATADIR%%/logs
 @dirrm %%DATADIR%%/contrib
 @dirrm %%DATADIR%%/gfxcount
 @dirrm %%DATADIR%%/icons