ports/86653: [maintainer] www/xshttpd: update to version 3.3b30

[Johan van Selst]

>Number:         86653
>Category:       ports
>Synopsis:       [maintainer] www/xshttpd: update to version 3.3b30
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 27 22:20:15 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Johan van Selst
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD mud.stack.nl 5.4-STABLE FreeBSD 5.4-STABLE #5: Wed Jul 13 12:15:37 CEST 2005 johans at mud.stack.nl:/usr/obj/usr/src/sys/mud i386


	
>Description:
	

	Current version, beta 30 is a minor bugfix release.

	While we're at it
	- Reintroduce @unexec rmdir for likely non-empty subdirs
	  but now in way that works, and without portlint comments
	- Use misc/mime-support rather than source supplied mime.types

>How-To-Repeat:
	
>Fix:

	

	This introduces files/patch-src_confuser.h

diff -uNr xshttpd/Makefile xshttpd/Makefile
--- xshttpd/Makefile	Fri Sep 23 17:39:56 2005
+++ xshttpd/Makefile	Wed Sep 28 00:09:43 2005
@@ -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 @@
 MAINTAINER=	johans at 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 @@
 
 # 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
@@ -76,5 +78,12 @@
 		-e 's|nogroup|${WWWGRP}|g' \
 		${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 -uNr xshttpd/distinfo xshttpd/distinfo
--- xshttpd/distinfo	Fri Sep 23 17:39:56 2005
+++ xshttpd/distinfo	Mon Sep 26 12:07:42 2005
@@ -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 -uNr xshttpd/files/patch-src_confuser.h xshttpd/files/patch-src_confuser.h
--- xshttpd/files/patch-src_confuser.h	Thu Jan  1 01:00:00 1970
+++ xshttpd/files/patch-src_confuser.h	Fri Sep 23 17:41:29 2005
@@ -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 -uNr xshttpd/pkg-plist xshttpd/pkg-plist
--- xshttpd/pkg-plist	Wed Sep 21 04:09:32 2005
+++ xshttpd/pkg-plist	Wed Sep 28 00:05:11 2005
@@ -61,11 +61,11 @@
 %%DATADIR%%/icons/xs-video.gif
 %%DATADIR%%/icons/xs-zip.gif
 %%DATADIR%%/mime.index
-%%DATADIR%%/mime.types
 %%DATADIR%%/script.methods.sample
- at dirrm %%DATADIR%%/cgi-bin
- at dirrm %%DATADIR%%/htdocs
- at dirrm %%DATADIR%%/logs
 @dirrm %%DATADIR%%/contrib
 @dirrm %%DATADIR%%/gfxcount
 @dirrm %%DATADIR%%/icons
+ at cwd %%WWWDIR%%
+ at unexec rmdir %D/cgi-bin 2>/dev/null || true
+ at unexec rmdir %D/htdocs 2>/dev/null || true
+ at unexec rmdir %D/logs 2>/dev/null || true
>Release-Note:
>Audit-Trail:
>Unformatted: