Attachment 57419 Details for Bug 86653 – file.diff

[patch] file.diff

file.diff (text/plain), 2.93 KB, created by Johan van Selst on 2005-09-27 23:20:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johan van Selst

Created: 2005-09-27 23:20:15 UTC

Size: 2.93 KB

patch

obsolete

>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@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
>-@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

Actions: View | Diff

Attachments on bug 86653: 57419