- Update to 3.7 beta 11

- Simplify custom patches
- Rename pidfile to avoid conflict/confusion

4 files changed, 10 insertions, 15 deletions

diff --git a/www/xshttpd-devel/Makefile b/www/xshttpd-devel/Makefile
index 863d0a719856..ac0f7588708c 100644
--- a/www/xshttpd-devel/Makefile
+++ b/www/xshttpd-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xshttpd
-DISTVERSION=	3.7b09
+DISTVERSION=	3.7b11
 CATEGORIES=	www ipv6
 MASTER_SITES=	ftp://ftp.stack.nl/pub/xs-httpd/release/ \
 		ftp://mud.stack.nl/pub/xs-httpd/release/
@@ -42,6 +42,7 @@ PORTDOCS=	README COPYING ChangeLog
 .include <bsd.port.pre.mk>
 # By default XS-HTTPD stores its data in ${PREFIX}/lib/httpd
 WWWDIR?=	${PREFIX}/www/${PORTNAME}
+CONFIGURE_ARGS+=--with-rootdir=${WWWDIR}
 
 .if defined(WITH_LDAP)
 USE_OPENLDAP=	yes
@@ -75,18 +76,11 @@ CONFIGURE_ARGS+=--without-curl
 .endif
 
 post-patch:
-.for i in man/httpd.1.in man/httpd.conf.5 config/httpd.conf.sample dirs.conf\
-	contrib/SSL-Makefile contrib/logrotate.sh
-	@${REINPLACE_CMD} \
-		-e 's|/wwwsys|${WWWDIR}|g' \
-		-e 's|/usr/local/lib/httpd|${WWWDIR}|g' \
-		-e 's|.(prefix)/lib/httpd|${WWWDIR}|g' \
-		-e 's|nobody|${WWWOWN}|g' \
-		-e 's|nogroup|${WWWGRP}|g' \
-		${WRKSRC}/$i
-.endfor
 	@${REINPLACE_CMD} \
 		-e 's|\(MIME_TYPES\).*|\1 "${LOCALBASE}/etc/mime.types"|' \
+		-e 's|nobody|${WWWOWN}|' \
+		-e 's|nogroup|${WWWGRP}|' \
+		-e 's|httpd\.pid|xs&|' \
 		${WRKSRC}/src/constants.h
 	@${REINPLACE_CMD} -e 's|mime.types ||g' \
 		${WRKSRC}/config/Makefile.in
diff --git a/www/xshttpd-devel/distinfo b/www/xshttpd-devel/distinfo
index af5d863bf3dc..837030ca1787 100644
--- a/www/xshttpd-devel/distinfo
+++ b/www/xshttpd-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (xshttpd-37b09.tar.bz2) = 0f083253b3c25c562c93db143cc153b2
-SHA256 (xshttpd-37b09.tar.bz2) = 0543fed8e01c8e1a441c7a9e7b7f537f457d23dd441805555105757aa578bc53
-SIZE (xshttpd-37b09.tar.bz2) = 279461
+MD5 (xshttpd-37b11.tar.bz2) = 3c9a9974c73765664fa8ef96a74594f4
+SHA256 (xshttpd-37b11.tar.bz2) = a2ac2a7ae342909ffd6d5d19dfb597fcd3716b68f3ef958ac1fbfcfea1077a5e
+SIZE (xshttpd-37b11.tar.bz2) = 284737
diff --git a/www/xshttpd-devel/files/xshttpd.sh.in b/www/xshttpd-devel/files/xshttpd.sh.in
index 8380f36caef0..65822c737ec2 100644
--- a/www/xshttpd-devel/files/xshttpd.sh.in
+++ b/www/xshttpd-devel/files/xshttpd.sh.in
@@ -23,7 +23,7 @@ load_rc_config $name
 
 : ${xshttpd_enable="NO"}
 
-pidfile="/var/run/httpd.pid"
+pidfile="/var/run/xshttpd.pid"
 command="%%PREFIX%%/bin/httpd"
 stop_cmd="%%PREFIX%%/bin/httpdc kill"
 restart_cmd="%%PREFIX%%/bin/httpdc restart"
diff --git a/www/xshttpd-devel/pkg-plist b/www/xshttpd-devel/pkg-plist
index f8257607f45a..fb5f639697c8 100644
--- a/www/xshttpd-devel/pkg-plist
+++ b/www/xshttpd-devel/pkg-plist
@@ -69,6 +69,7 @@ bin/xspasswd
 %%WWWDIR%%/module/mod_compress.so
 %%WWWDIR%%/module/mod_gzip.so
 %%WWWDIR%%/module/mod_bzip2.so
+%%WWWDIR%%/module/mod_magic.so
 @exec mkdir -p %%WWWDIR%%/htdocs
 @dirrm %%WWWDIR%%/contrib
 @dirrm %%WWWDIR%%/gfxcount