8 files changed, 60 insertions, 20 deletions

diff --git a/www/xshttpd-devel/Makefile b/www/xshttpd-devel/Makefile
index 63b7cd9e178a..fa5b9290b99a 100644
--- a/www/xshttpd-devel/Makefile
+++ b/www/xshttpd-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xshttpd
-DISTVERSION=	3.3b29
+DISTVERSION=	3.3b30
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.stack.nl/pub/xs-httpd/release/ \
 	ftp://mud.stack.nl/pub/xs-httpd/release/
@@ -15,15 +15,16 @@ DISTNAME=	${PORTNAME}-${DISTVERSION:S/.//}
 MAINTAINER=	johans@stack.nl
 COMMENT=	A webserver with CGI as own user and SSL suport
 
-CONFLICTS+=	apache-[0-9]*
+RUN_DEPENDS=	run-mailcap:${PORTSDIR}/misc/mime-support
 
-GNU_CONFIGURE=	yes
+CONFLICTS+=	apache-[0-9]*
 
 MAN1=		clearxs.1 gfxcount.1 httpd.1 httpdc.1 imagemap.1 \
 		readxs.1 xsindex.1 xspasswd.1
 MAN5=		httpd.conf.5 xsauth.5 xsscripts.5
 USE_RC_SUBR=	xshttpd.sh
 
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
 OPTIONS=	SSL "Enable https support" On \
@@ -33,13 +34,14 @@ OPTIONS=	SSL "Enable https support" On \
 
 # By default XS-HTTPD stores its data in ${PREFIX}/lib/httpd
 DATADIR=	${PREFIX}/www
+PLIST_SUB=	WWWDIR=${DATADIR}
 CONFIGURE_ARGS+=--with-rootdir=${DATADIR}
 
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_SSL)
 .include <${PORTSDIR}/Mk/bsd.openssl.mk>
-USE_OPENSSL=	yes
+#USE_OPENSSL=	yes
 CONFIGURE_ARGS+=--with-ssl
 .else
 CONFIGURE_ARGS+=--without-ssl
@@ -77,4 +79,11 @@ post-patch:
 		${WRKSRC}/$i
 .endfor
 
+	@${REINPLACE_CMD} \
+		-e 's|@LOCALBASE@|${LOCALBASE}|g' \
+		${WRKSRC}/src/confuser.h
+
+post-install:
+	@${RM} ${DATADIR}/mime.types
+
 .include <bsd.port.post.mk>
diff --git a/www/xshttpd-devel/distinfo b/www/xshttpd-devel/distinfo
index 730ab8a50769..de1e7b8c577f 100644
--- a/www/xshttpd-devel/distinfo
+++ b/www/xshttpd-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (xshttpd-33b29.tar.gz) = 551b2935f44a16b12a25920139eb6d8f
-SIZE (xshttpd-33b29.tar.gz) = 208300
+MD5 (xshttpd-33b30.tar.gz) = be1edef265dd16c4f7790788dc13e914
+SIZE (xshttpd-33b30.tar.gz) = 208568
diff --git a/www/xshttpd-devel/files/patch-src_confuser.h b/www/xshttpd-devel/files/patch-src_confuser.h
new file mode 100644
index 000000000000..c62a537f9a9f
--- /dev/null
+++ b/www/xshttpd-devel/files/patch-src_confuser.h
@@ -0,0 +1,11 @@
+--- src/confuser.h	Thu Dec  2 14:26:32 2004
++++ src/confuser.h	Fri Sep 23 17:09:20 2005
+@@ -78,7 +78,7 @@
+ mime.types file are NOT standard. Read the comments in the default
+ mime.types for details. */
+ 
+-#define MIMETYPESFILE "mime.types"
++#define MIMETYPESFILE "@LOCALBASE@/etc/mime.types"
+ 
+ /* What is the bit bucket on your system? */
+ 
diff --git a/www/xshttpd-devel/pkg-plist b/www/xshttpd-devel/pkg-plist
index ef8fc5a67bab..587a3c2b6b75 100644
--- a/www/xshttpd-devel/pkg-plist
+++ b/www/xshttpd-devel/pkg-plist
@@ -61,11 +61,11 @@ bin/xspasswd
 %%DATADIR%%/icons/xs-video.gif
 %%DATADIR%%/icons/xs-zip.gif
 %%DATADIR%%/mime.index
-%%DATADIR%%/mime.types
 %%DATADIR%%/script.methods.sample
-@dirrm %%DATADIR%%/cgi-bin
-@dirrm %%DATADIR%%/htdocs
-@dirrm %%DATADIR%%/logs
 @dirrm %%DATADIR%%/contrib
 @dirrm %%DATADIR%%/gfxcount
 @dirrm %%DATADIR%%/icons
+@cwd %%WWWDIR%%
+@unexec rmdir %D/cgi-bin 2>/dev/null || true
+@unexec rmdir %D/htdocs 2>/dev/null || true
+@unexec rmdir %D/logs 2>/dev/null || true
diff --git a/www/xshttpd/Makefile b/www/xshttpd/Makefile
index 63b7cd9e178a..fa5b9290b99a 100644
--- a/www/xshttpd/Makefile
+++ b/www/xshttpd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xshttpd
-DISTVERSION=	3.3b29
+DISTVERSION=	3.3b30
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.stack.nl/pub/xs-httpd/release/ \
 	ftp://mud.stack.nl/pub/xs-httpd/release/
@@ -15,15 +15,16 @@ DISTNAME=	${PORTNAME}-${DISTVERSION:S/.//}
 MAINTAINER=	johans@stack.nl
 COMMENT=	A webserver with CGI as own user and SSL suport
 
-CONFLICTS+=	apache-[0-9]*
+RUN_DEPENDS=	run-mailcap:${PORTSDIR}/misc/mime-support
 
-GNU_CONFIGURE=	yes
+CONFLICTS+=	apache-[0-9]*
 
 MAN1=		clearxs.1 gfxcount.1 httpd.1 httpdc.1 imagemap.1 \
 		readxs.1 xsindex.1 xspasswd.1
 MAN5=		httpd.conf.5 xsauth.5 xsscripts.5
 USE_RC_SUBR=	xshttpd.sh
 
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
 OPTIONS=	SSL "Enable https support" On \
@@ -33,13 +34,14 @@ OPTIONS=	SSL "Enable https support" On \
 
 # By default XS-HTTPD stores its data in ${PREFIX}/lib/httpd
 DATADIR=	${PREFIX}/www
+PLIST_SUB=	WWWDIR=${DATADIR}
 CONFIGURE_ARGS+=--with-rootdir=${DATADIR}
 
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_SSL)
 .include <${PORTSDIR}/Mk/bsd.openssl.mk>
-USE_OPENSSL=	yes
+#USE_OPENSSL=	yes
 CONFIGURE_ARGS+=--with-ssl
 .else
 CONFIGURE_ARGS+=--without-ssl
@@ -77,4 +79,11 @@ post-patch:
 		${WRKSRC}/$i
 .endfor
 
+	@${REINPLACE_CMD} \
+		-e 's|@LOCALBASE@|${LOCALBASE}|g' \
+		${WRKSRC}/src/confuser.h
+
+post-install:
+	@${RM} ${DATADIR}/mime.types
+
 .include <bsd.port.post.mk>
diff --git a/www/xshttpd/distinfo b/www/xshttpd/distinfo
index 730ab8a50769..de1e7b8c577f 100644
--- a/www/xshttpd/distinfo
+++ b/www/xshttpd/distinfo
@@ -1,2 +1,2 @@
-MD5 (xshttpd-33b29.tar.gz) = 551b2935f44a16b12a25920139eb6d8f
-SIZE (xshttpd-33b29.tar.gz) = 208300
+MD5 (xshttpd-33b30.tar.gz) = be1edef265dd16c4f7790788dc13e914
+SIZE (xshttpd-33b30.tar.gz) = 208568
diff --git a/www/xshttpd/files/patch-src_confuser.h b/www/xshttpd/files/patch-src_confuser.h
new file mode 100644
index 000000000000..c62a537f9a9f
--- /dev/null
+++ b/www/xshttpd/files/patch-src_confuser.h
@@ -0,0 +1,11 @@
+--- src/confuser.h	Thu Dec  2 14:26:32 2004
++++ src/confuser.h	Fri Sep 23 17:09:20 2005
+@@ -78,7 +78,7 @@
+ mime.types file are NOT standard. Read the comments in the default
+ mime.types for details. */
+ 
+-#define MIMETYPESFILE "mime.types"
++#define MIMETYPESFILE "@LOCALBASE@/etc/mime.types"
+ 
+ /* What is the bit bucket on your system? */
+ 
diff --git a/www/xshttpd/pkg-plist b/www/xshttpd/pkg-plist
index ef8fc5a67bab..587a3c2b6b75 100644
--- a/www/xshttpd/pkg-plist
+++ b/www/xshttpd/pkg-plist
@@ -61,11 +61,11 @@ bin/xspasswd
 %%DATADIR%%/icons/xs-video.gif
 %%DATADIR%%/icons/xs-zip.gif
 %%DATADIR%%/mime.index
-%%DATADIR%%/mime.types
 %%DATADIR%%/script.methods.sample
-@dirrm %%DATADIR%%/cgi-bin
-@dirrm %%DATADIR%%/htdocs
-@dirrm %%DATADIR%%/logs
 @dirrm %%DATADIR%%/contrib
 @dirrm %%DATADIR%%/gfxcount
 @dirrm %%DATADIR%%/icons
+@cwd %%WWWDIR%%
+@unexec rmdir %D/cgi-bin 2>/dev/null || true
+@unexec rmdir %D/htdocs 2>/dev/null || true
+@unexec rmdir %D/logs 2>/dev/null || true