Attachment #57419 for bug #86653

View | Details | Raw Unified | Return to bug 86653
Collapse All | Expand All




#

PORTNAME=	xshttpd
DISTVERSION=	3.3b30
CATEGORIES=	www
MASTER_SITES=	ftp://ftp.stack.nl/pub/xs-httpd/release/ \
	ftp://mud.stack.nl/pub/xs-httpd/release/

MAINTAINER=	johans@stack.nl
COMMENT=	A webserver with CGI as own user and SSL suport

RUN_DEPENDS=	run-mailcap:${PORTSDIR}/misc/mime-support

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 \


# 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
CONFIGURE_ARGS+=--with-ssl
.else
CONFIGURE_ARGS+=--without-ssl

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

Lines 1-2 Link Here

(-)xshttpd/distinfo (-2 / +2 lines)
1	MD5 (xshttpd-33b29.tar.gz) = 551b2935f44a16b12a25920139eb6d8f	1	MD5 (xshttpd-33b30.tar.gz) = be1edef265dd16c4f7790788dc13e914
2	SIZE (xshttpd-33b29.tar.gz) = 208300	2	SIZE (xshttpd-33b30.tar.gz) = 208568

Line 0 Link Here

(-)xshttpd/files/patch-src_confuser.h (+11 lines)
	1	--- src/confuser.h Thu Dec 2 14:26:32 2004
	2	+++ src/confuser.h Fri Sep 23 17:09:20 2005
	3	@@ -78,7 +78,7 @@
	4	mime.types file are NOT standard. Read the comments in the default
	5	mime.types for details. */
	6
	7	-#define MIMETYPESFILE "mime.types"
	8	+#define MIMETYPESFILE "@LOCALBASE@/etc/mime.types"
	9
	10	/* What is the bit bucket on your system? */
	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

Return to bug 86653

Lines 6-12 Link Here

(-)xshttpd/Makefile (-4 / +13 lines)
6	#	6	#
7		7
8	PORTNAME= xshttpd	8	PORTNAME= xshttpd
9	DISTVERSION= 3.3b29	9	DISTVERSION= 3.3b30
10	CATEGORIES= www	10	CATEGORIES= www
11	MASTER_SITES= ftp://ftp.stack.nl/pub/xs-httpd/release/ \	11	MASTER_SITES= ftp://ftp.stack.nl/pub/xs-httpd/release/ \
12	ftp://mud.stack.nl/pub/xs-httpd/release/	12	ftp://mud.stack.nl/pub/xs-httpd/release/
Lines 15-29 Link Here
15	MAINTAINER= johans@stack.nl	15	MAINTAINER= johans@stack.nl
16	COMMENT= A webserver with CGI as own user and SSL suport	16	COMMENT= A webserver with CGI as own user and SSL suport
17		17
18	CONFLICTS+= apache-[0-9]*	18	RUN_DEPENDS= run-mailcap:${PORTSDIR}/misc/mime-support
19		19
20	GNU_CONFIGURE= yes	20	CONFLICTS+= apache-[0-9]*
21		21
22	MAN1= clearxs.1 gfxcount.1 httpd.1 httpdc.1 imagemap.1 \	22	MAN1= clearxs.1 gfxcount.1 httpd.1 httpdc.1 imagemap.1 \
23	readxs.1 xsindex.1 xspasswd.1	23	readxs.1 xsindex.1 xspasswd.1
24	MAN5= httpd.conf.5 xsauth.5 xsscripts.5	24	MAN5= httpd.conf.5 xsauth.5 xsscripts.5
25	USE_RC_SUBR= xshttpd.sh	25	USE_RC_SUBR= xshttpd.sh
26		26
		27	GNU_CONFIGURE= yes
27	USE_REINPLACE= yes	28	USE_REINPLACE= yes
28		29
29	OPTIONS= SSL "Enable https support" On \	30	OPTIONS= SSL "Enable https support" On \
Lines 33-45 Link Here
33		34
34	# By default XS-HTTPD stores its data in ${PREFIX}/lib/httpd	35	# By default XS-HTTPD stores its data in ${PREFIX}/lib/httpd
35	DATADIR= ${PREFIX}/www	36	DATADIR= ${PREFIX}/www
		37	PLIST_SUB= WWWDIR=${DATADIR}
36	CONFIGURE_ARGS+=--with-rootdir=${DATADIR}	38	CONFIGURE_ARGS+=--with-rootdir=${DATADIR}
37		39
38	.include <bsd.port.pre.mk>	40	.include <bsd.port.pre.mk>
39		41
40	.if !defined(WITHOUT_SSL)	42	.if !defined(WITHOUT_SSL)
41	.include <${PORTSDIR}/Mk/bsd.openssl.mk>	43	.include <${PORTSDIR}/Mk/bsd.openssl.mk>
42	USE_OPENSSL= yes	44	#USE_OPENSSL= yes
43	CONFIGURE_ARGS+=--with-ssl	45	CONFIGURE_ARGS+=--with-ssl
44	.else	46	.else
45	CONFIGURE_ARGS+=--without-ssl	47	CONFIGURE_ARGS+=--without-ssl
Lines 76-80 Link Here
76	-e 's\|nogroup\|${WWWGRP}\|g' \	78	-e 's\|nogroup\|${WWWGRP}\|g' \
77	${WRKSRC}/$i	79	${WRKSRC}/$i
78	.endfor	80	.endfor
		81
		82	@${REINPLACE_CMD} \
		83	-e 's\|@LOCALBASE@\|${LOCALBASE}\|g' \
		84	${WRKSRC}/src/confuser.h
		85
		86	post-install:
		87	@${RM} ${DATADIR}/mime.types
79		88
80	.include <bsd.port.post.mk>	89	.include <bsd.port.post.mk>

Lines 61-71 Link Here

(-)xshttpd/pkg-plist (-4 / +4 lines)
61	%%DATADIR%%/icons/xs-video.gif	61	%%DATADIR%%/icons/xs-video.gif
62	%%DATADIR%%/icons/xs-zip.gif	62	%%DATADIR%%/icons/xs-zip.gif
63	%%DATADIR%%/mime.index	63	%%DATADIR%%/mime.index
64	%%DATADIR%%/mime.types
65	%%DATADIR%%/script.methods.sample	64	%%DATADIR%%/script.methods.sample
66	@dirrm %%DATADIR%%/cgi-bin
67	@dirrm %%DATADIR%%/htdocs
68	@dirrm %%DATADIR%%/logs
69	@dirrm %%DATADIR%%/contrib	65	@dirrm %%DATADIR%%/contrib
70	@dirrm %%DATADIR%%/gfxcount	66	@dirrm %%DATADIR%%/gfxcount
71	@dirrm %%DATADIR%%/icons	67	@dirrm %%DATADIR%%/icons
		68	@cwd %%WWWDIR%%
		69	@unexec rmdir %D/cgi-bin 2>/dev/null \|\| true
		70	@unexec rmdir %D/htdocs 2>/dev/null \|\| true
		71	@unexec rmdir %D/logs 2>/dev/null \|\| true