head	1.31;
access;
symbols
	RELEASE_8_3_0:1.25
	RELEASE_9_0_0:1.24
	RELEASE_7_4_0:1.24
	RELEASE_8_2_0:1.24
	RELEASE_6_EOL:1.24
	RELEASE_8_1_0:1.24
	RELEASE_7_3_0:1.22
	RELEASE_8_0_0:1.20
	RELEASE_7_2_0:1.20
	RELEASE_7_1_0:1.18
	RELEASE_6_4_0:1.18
	RELEASE_5_EOL:1.14
	RELEASE_7_0_0:1.11
	RELEASE_6_3_0:1.11
	PRE_XORG_7:1.10
	RELEASE_4_EOL:1.8
	RELEASE_6_2_0:1.8
	RELEASE_6_1_0:1.6
	RELEASE_5_5_0:1.6;
locks; strict;
comment	@# @;


1.31
date	2012.12.10.19.24.06;	author svnexp;	state Exp;
branches;
next	1.30;

1.30
date	2012.11.17.06.03.13;	author svnexp;	state Exp;
branches;
next	1.29;

1.29
date	2012.08.05.23.19.36;	author dougb;	state Exp;
branches;
next	1.28;

1.28
date	2012.08.03.15.54.35;	author cs;	state Exp;
branches;
next	1.27;

1.27
date	2012.06.15.10.59.17;	author johans;	state Exp;
branches;
next	1.26;

1.26
date	2012.06.01.05.25.04;	author dinoex;	state Exp;
branches;
next	1.25;

1.25
date	2012.02.14.12.45.35;	author mm;	state Exp;
branches;
next	1.24;

1.24
date	2010.04.03.10.44.36;	author roam;	state Exp;
branches;
next	1.23;

1.23
date	2010.03.28.06.45.11;	author dinoex;	state Exp;
branches;
next	1.22;

1.22
date	2010.02.23.18.07.13;	author johans;	state Exp;
branches;
next	1.21;

1.21
date	2010.02.05.11.45.12;	author dinoex;	state Exp;
branches;
next	1.20;

1.20
date	2009.01.24.11.08.43;	author johans;	state Exp;
branches;
next	1.19;

1.19
date	2009.01.23.15.43.12;	author roam;	state Exp;
branches;
next	1.18;

1.18
date	2008.08.21.06.18.38;	author rafan;	state Exp;
branches;
next	1.17;

1.17
date	2008.08.10.09.14.38;	author johans;	state Exp;
branches;
next	1.16;

1.16
date	2008.07.20.12.35.32;	author johans;	state Exp;
branches;
next	1.15;

1.15
date	2008.07.13.10.49.29;	author johans;	state Exp;
branches;
next	1.14;

1.14
date	2008.05.08.22.07.47;	author johans;	state Exp;
branches;
next	1.13;

1.13
date	2008.02.04.22.25.39;	author johans;	state Exp;
branches;
next	1.12;

1.12
date	2008.02.03.08.24.41;	author johans;	state Exp;
branches;
next	1.11;

1.11
date	2007.07.23.09.36.45;	author rafan;	state Exp;
branches;
next	1.10;

1.10
date	2007.03.24.16.34.07;	author pav;	state Exp;
branches;
next	1.9;

1.9
date	2007.03.22.16.27.08;	author johans;	state Exp;
branches;
next	1.8;

1.8
date	2006.03.21.13.47.09;	author garga;	state Exp;
branches;
next	1.7;

1.7
date	2006.03.21.11.56.38;	author garga;	state Exp;
branches;
next	1.6;

1.6
date	2005.11.08.22.33.04;	author mnag;	state Exp;
branches;
next	1.5;

1.5
date	2005.10.23.14.14.02;	author ehaupt;	state Exp;
branches;
next	1.4;

1.4
date	2005.09.28.13.52.36;	author garga;	state Exp;
branches;
next	1.3;

1.3
date	2005.09.23.08.15.54;	author pav;	state Exp;
branches;
next	1.2;

1.2
date	2005.09.20.21.07.10;	author pav;	state Exp;
branches;
next	1.1;

1.1
date	2005.09.15.23.04.31;	author pav;	state Exp;
branches;
next	;


desc
@@


1.31
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/308630
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r308630 | mm | 2012-12-10 19:11:11 +0000 (Mon, 10 Dec 2012) | 4 lines
## SVN ##
## SVN ## Update PCRE to 8.32
## SVN ## Introduces the UTF-32 library pcre32
## SVN ## Bump PORTREVISION in dependent ports
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@# New ports collection makefile for:	xshttpd
# Date created:				29 June 2005
# Whom:					Ed Schouten <ed@@fxq.nl>
#
# $FreeBSD: head/www/xshttpd/Makefile 308630 2012-12-10 19:11:11Z mm $
#

PORTNAME=	xshttpd
DISTVERSION=	3.6g01
PORTREVISION=	6
CATEGORIES=	www ipv6
MASTER_SITES=	ftp://ftp.stack.nl/pub/xs-httpd/release/ \
		ftp://mud.stack.nl/pub/xs-httpd/release/
DISTNAME=	${PORTNAME}-${DISTVERSION:S/.//}

MAINTAINER=	johans@@FreeBSD.org
COMMENT=	Webserver with CGI as own user and SSL support

RUN_DEPENDS=	run-mailcap:${PORTSDIR}/misc/mime-support \
		ppmtogif:${PORTSDIR}/graphics/netpbm

CONFLICTS_INSTALL+=	xshttpd-devel-[0-9]* publicfile-[0-9]*

MAN1=		clearxs.1 gfxcount.1 httpd.1 httpdc.1 imagemap.1 \
		readxs.1 xschpass.1 xsindex.1 xspasswd.1
MAN5=		httpd.conf.5 xsauth.5 xsconf.5 xsscripts.5 xsredir.5
MAN7=		httpd_cgi.7 httpd_ssi.7
USE_BZIP2=	yes
USE_RC_SUBR=	xshttpd

GNU_CONFIGURE=	yes

OPTIONS_DEFINE=	SSL PCRE LDAP CURL M4_CONFIG PERSISTENT_PERL
OPTIONS_DEFAULT=SSL PCRE
M4_CONFIG_DESC=	Enable m4 configuration preprocessor
PERSISTENT_PERL_DESC=	Enable persistent perl interpreter

PORTDOCS=	README COPYING ChangeLog

.include <bsd.port.options.mk>
# By default XS-HTTPD stores its data in ${PREFIX}/lib/httpd
WWWDIR?=	${PREFIX}/www/${PORTNAME}
CONFIGURE_ARGS+=--with-rootdir=${WWWDIR}

.if ${PORT_OPTIONS:MSSL}
.include <${PORTSDIR}/Mk/bsd.openssl.mk>
#USE_OPENSSL=	yes
CONFIGURE_ARGS+=--with-ssl
.else
CONFIGURE_ARGS+=--without-ssl
.endif

.if ${PORT_OPTIONS:MLDAP}
USE_OPENLDAP=	yes
CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
.else
CONFIGURE_ARGS+=--without-ldap
.endif

.if ${PORT_OPTIONS:MM4_CONFIG}
CONFIGURE_ARGS+=--with-preprocessor
.else
CONFIGURE_ARGS+=--without-preprocessor
.endif

.if ${PORT_OPTIONS:MPERSISTENT_PERL}
USE_PERL5=	yes
CONFIGURE_ARGS+=--with-perl
.else
CONFIGURE_ARGS+=--without-perl
.endif

.if ${PORT_OPTIONS:MPCRE}
LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre
CONFIGURE_ARGS+=--with-pcre=yes
.else
CONFIGURE_ARGS+=--with-pcre=no
.endif

.if ${PORT_OPTIONS:MCURL}
LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
CONFIGURE_ARGS+=--with-curl=yes
.else
CONFIGURE_ARGS+=--with-curl=no
.endif

post-patch:
.for i in man/httpd.1.in man/httpd.conf.5 config/httpd.conf.sample \
	contrib/SSL-Makefile contrib/logrotate.sh
	@@${REINPLACE_CMD} \
		-e 's|/wwwsys|${WWWDIR}|g' \
		-e 's|/usr/local/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"|' \
		${WRKSRC}/src/constants.h
	@@${REINPLACE_CMD} -e 's|mime.types ||g' \
		${WRKSRC}/config/Makefile.in

post-install:
.if !defined(NOPORTDOCS)
	@@${MKDIR} ${DOCSDIR}
. for f in ${PORTDOCS}
	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
. endfor
.endif

.include <bsd.port.mk>
@


1.30
log
@Switch exporter over
@
text
@d5 1
a5 1
# $FreeBSD: head/www/xshttpd/Makefile 302141 2012-08-05 23:19:36Z dougb $
d10 1
a10 1
PORTREVISION=	5
@


1.29
log
@SVN rev 302141 on 2012-08-05 23:19:36Z by dougb

Move the rc.d scripts of the form *.sh.in to *.in

Where necessary add $FreeBSD$ to the file

No PORTREVISION bump necessary because this is a no-op
@
text
@d5 1
a5 1
# $FreeBSD$
@


1.28
log
@SVN rev 301960 on 2012-08-03 15:54:35Z by cs

Fix typos and make small modifications in COMMENT (according to Porter's
Handbook)

Approved by:	portmgr@@ (implicit)
@
text
@d29 1
a29 1
USE_RC_SUBR=	xshttpd.sh
@


1.27
log
@- Register install conflict with publicfile httpd
- Convert to new options framework
- Remove unneeded library version numbers
- Pet portlint
- No functional changes
@
text
@d17 1
a17 1
COMMENT=	A webserver with CGI as own user and SSL suport
@


1.26
log
@- update png to 1.5.10
@
text
@d22 1
a22 1
CONFLICTS+=	xshttpd-devel-[0-9]*
d33 4
a36 6
OPTIONS=	SSL "Enable https support" On \
		PCRE "Enable pcre rewriting support" On \
		LDAP "Enable ldap support" Off \
		CURL "Enable curl (proxy) support" Off \
		M4_CONFIG "Enable m4 configuration preprocessor" Off \
		PERSISTENT_PERL "Enable persistent perl interpreter" Off
d40 1
a40 1
.include <bsd.port.pre.mk>
d45 1
a45 1
.if !defined(WITHOUT_SSL)
d53 1
a53 1
.if defined(WITH_LDAP)
d60 1
a60 1
.if defined(WITH_M4_CONFIG)
d66 1
a66 1
.if defined(WITH_PERSISTENT_PERL)
d73 2
a74 2
.if defined(WITH_PCRE)
LIB_DEPENDS+=	pcre.1:${PORTSDIR}/devel/pcre
d80 1
a80 1
.if defined(WITH_CURL)
d111 1
a111 1
.include <bsd.port.post.mk>
@


1.25
log
@Bump pcre library dependency due to 8.30 update
@
text
@d10 1
a10 1
PORTREVISION=	4
@


1.24
log
@Chase the ftp/curl shlib version bump.
@
text
@d10 1
a10 1
PORTREVISION=	3
d76 1
a76 1
LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
@


1.23
log
@- update to 1.4.1
Reviewed by:	exp8 run on pointyhat
Supported by:	miwi
@
text
@d10 1
a10 1
PORTREVISION=	2
@


1.22
log
@Update my mail address to @@FreeBSD.org

Feature safe:   yes
@
text
@d10 1
a10 1
PORTREVISION=	1
@


1.21
log
@- update to jpeg-8
@
text
@d16 1
a16 1
MAINTAINER=	johans@@stack.nl
@


1.20
log
@Update to 3.6g01
@
text
@d10 1
@


1.19
log
@Bump the version of the curl shared library after the ftp/curl update
to 7.19.2.
Bump PORTREVISION, even on the ports that do not have a versioned
dependency, since the binaries will most probably still stop working.
@
text
@d9 1
a9 2
DISTVERSION=	3.5g05
PORTREVISION=	1
d89 1
a89 1
.for i in man/httpd.1 man/httpd.conf.5 config/httpd.conf.sample \
d100 1
a100 1
		${WRKSRC}/src/confuser.h
a102 2
	@@${REINPLACE_CMD} -e '/^install-data-am/s|install-docDATA||' \
		${WRKSRC}/Makefile.in
@


1.18
log
@Update CONFIGURE_ARGS for how we pass CONFIGURE_TARGET to configure script.
Specifically, newer autoconf (> 2.13) has different semantic of the
configure target. In short, one should use --build=CONFIGURE_TARGET
instead of CONFIGURE_TARGET directly. Otherwise, you will get a warning
and the old semantic may be removed in later autoconf releases.

To workaround this issue, many ports hack the CONFIGURE_TARGET variable
so that it contains the ``--build='' prefix.

To solve this issue, under the fact that some ports still have
configure script generated by the old autoconf, we use runtime detection
in the do-configure target so that the proper argument can be used.

Changes to Mk/*:
 - Add runtime detection magic in bsd.port.mk
 - Remove CONFIGURE_TARGET hack in various bsd.*.mk
 - USE_GNOME=gnometarget is now an no-op

Changes to individual ports, other than removing the CONFIGURE_TARGET hack:

= pkg-plist changed (due to the ugly CONFIGURE_TARGET prefix in * executables)
  - comms/gnuradio
  - science/abinit
  - science/elmer-fem
  - science/elmer-matc
  - science/elmer-meshgen2d
  - science/elmerfront
  - science/elmerpost

= use x86_64 as ARCH
  - devel/g-wrap

= other changes
  - print/magicfilter
    GNU_CONFIGURE -> HAS_CONFIGURE since it's not generated by autoconf

Total # of ports modified:  1,027
Total # of ports affected: ~7,000 (set GNU_CONFIGURE to yes)

PR:		126524 (obsoletes 52917)
Submitted by:	rafan
Tested on:	two pointyhat 7-amd64 exp runs (by pav)
Approved by:	portmgr (pav)
@
text
@d10 1
@


1.17
log
@Update to 3.5 gamma 5
@
text
@a30 1
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@


1.16
log
@Don't create DOCSDIR when NOPORTDOCS is set

Reported by:	itetcu (QA Tindy)
@
text
@d9 1
a9 2
DISTVERSION=	3.5g04
PORTREVISION=	1
@


1.15
log
@Update to 3.5 gamma 4
@
text
@d10 1
d105 2
@


1.14
log
@Update to 3.5 gamma 3
@
text
@d9 1
a9 1
DISTVERSION=	3.5g03
@


1.13
log
@- Update to 3.5 gamma 2
@
text
@d9 1
a9 1
DISTVERSION=	3.5g02
@


1.12
log
@- Update to 3.5 g1
- Use standard $WWWDIR
- Remove conflict with Apache
@
text
@d9 1
a9 1
DISTVERSION=	3.5g01
@


1.11
log
@- Set --mandir and --infodir in CONFIGURE_ARGS if the configure script
  supports them.  This is determined by running ``configure --help'' in
  do-configure target and set the shell variable _LATE_CONFIGURE_ARGS
  which is then passed to CONFIGURE_ARGS.
- Remove --mandir and --infodir in ports' Makefile where applicable
  Few ports use REINPLACE_CMD to achieve the same effect, remove them too.
- Correct some manual pages location from PREFIX/man to MANPREFIX/man
- Define INFO_PATH where necessary
- Document that .info files are installed in a subdirectory relative to
  PREFIX/INFO_PATH and slightly change add-plist-info to use INFO_PATH and
  subdirectory detection.

PR:		ports/111470
Approved by:	portmgr
Discussed with:	stas (Mk/*), gerald (info related stuffs)
Tested by:	pointyhat exp run
@
text
@d9 1
a9 1
DISTVERSION=	3.4g01
d18 2
a19 1
RUN_DEPENDS=	run-mailcap:${PORTSDIR}/misc/mime-support
d21 1
a21 1
CONFLICTS+=	apache-[0-9]* xshttpd-devel-[0-9]*
d24 1
a24 1
		readxs.1 xsindex.1 xspasswd.1
d26 1
d34 1
a35 1
		PCRE "Enable pcre rewriting support" Off \
d40 1
a40 1
PORTDOCS=	README BUGS COPYING ChangeLog
d42 1
d44 1
a44 1
WWWDIR?=	${PREFIX}/www
a46 2
.include <bsd.port.pre.mk>

d99 2
a100 1
	@@${REINPLACE_CMD} -e 's|\(MIMETYPESFILE\ "\).*|\1${LOCALBASE}/etc/mime.types"|' \
@


1.10
log
@- Use new WWWDIR infrastructure
@
text
@d42 1
a42 1
CONFIGURE_ARGS+=--with-rootdir=${WWWDIR} --mandir=${MANPREFIX}/man
@


1.9
log
@Update to new stable release 34g01
@
text
@a41 1
PLIST_SUB=	WWWDIR=${WWWDIR:S,^${PREFIX}/,,}
@


1.8
log
@- Rename DATADIR -> WWWDIR to prevent confusion
- Use a REINPLACE_CMD to don't install mime.types instead remove it after
  installed
- Drop obsolete USE_REINPLACE
- Bump PORTREVISION since it changes PLIST

Approved by:	maintainer at IIRC
@
text
@d9 2
a10 3
DISTVERSION=	3.3g01
PORTREVISION=	1
CATEGORIES=	www
d24 2
a25 1
MAN5=		httpd.conf.5 xsauth.5 xsscripts.5
d34 2
d38 2
d43 1
a43 1
CONFIGURE_ARGS+=--with-rootdir=${WWWDIR}
d62 6
d82 7
d104 8
@


1.7
log
@- Add www/xshttpd-devel
- Register CONFLICTS on www/xshttpd

PR:		ports/94268
Submitted by:	Johan van Selst <johans@@stack.nl>
Repocopied by:	marcus
@
text
@d10 1
d13 1
a13 1
	ftp://mud.stack.nl/pub/xs-httpd/release/
a28 1
USE_REINPLACE=	yes
d37 3
a39 3
DATADIR=	${PREFIX}/www
PLIST_SUB=	WWWDIR=${DATADIR}
CONFIGURE_ARGS+=--with-rootdir=${DATADIR}
d76 2
a77 2
		-e 's|/wwwsys|${DATADIR}|g' \
		-e 's|/usr/local/lib/httpd|${DATADIR}|g' \
d84 2
a85 3

post-install:
	@@${RM} ${DATADIR}/mime.types
@


1.6
log
@Update to 3.3g01
Add SHA256

PR:		88675
Submitted by:	maintainer
@
text
@d20 1
a20 1
CONFLICTS+=	apache-[0-9]*
@


1.5
log
@- Update to 3.3b34
- Nuke files/patch-src_confuser.h

PR:		87868
Submitted by:	Johan van Selst <johans@@stack.nl>
@
text
@d9 1
a9 1
DISTVERSION=	3.3b34
d29 1
@


1.4
log
@- Update to 3.3.b30

PR:		ports/86653
Submitted by:	maintainer
@
text
@d9 1
a9 1
DISTVERSION=	3.3b30
d81 1
a81 3

	@@${REINPLACE_CMD} \
		-e 's|@@LOCALBASE@@|${LOCALBASE}|g' \
@


1.3
log
@- Update to 3.3b29

PR:		ports/86489
Submitted by:	Johan van Selst <johans@@stack.nl> (maintainer)
@
text
@d9 1
a9 1
DISTVERSION=	3.3b29
d18 2
a21 2
GNU_CONFIGURE=	yes

d27 1
d37 1
d44 1
a44 1
USE_OPENSSL=	yes
d82 7
@


1.2
log
@- Update to 33b27

PR:		ports/86376
Submitted by:	Johan van Selst <johans@@stack.nl> (maintainer)
@
text
@d9 1
a9 1
DISTVERSION=	3.3b27
@


1.1
log
@XS-HTTPD is a WWW server that has the following features:

- It is pronounced as "access-HTTP-daemon"
- It is SMALL (very small in fact: a factor two to three smaller than
  normal servers on disk and in memory)
- It is FAST (because it is so small and does not do unnecessary things)
- Uses very little CPU time
- Configurable (configuration compiled in to make it small, but largely
  overridable on the command line)
- Runs user CGI binaries under their own user ID
- Gets users' pages under their own user ID, allowing them to really
  have protected pages (using the built-in authentication mechanism)
- Does not fork for every connection (has a fixed number of servers),
  only to replace a lost server (in case of timeouts).
- Comes with some other useful programs
- Offers Server-Side Includes for many common tasks, including built-in
  page counters (text or graphical)
- Supports PHP and other interpreted file formats
- Supports automatic decompression to save diskspace and bandwidth
- Serves SSL (https) and http connections through the same daemon
- Full support for IPv6

PR:		ports/84314
Submitted by:	Ed Schouten <ed@@fxq.nl>
@
text
@d9 1
a9 1
DISTVERSION=	3.3b26
d11 2
a12 1
MASTER_SITES=	ftp://ftp.stack.nl/pub/xs-httpd/release/
d27 7
d38 2
d41 1
d70 3
a72 3
.for i in "man/httpd.1" "man/httpd.conf.5" "config/httpd.conf.sample" \
	"contrib/SSL-Makefile" "contrib/logrotate.sh"
	@@${SED} \
d75 3
a77 2
		${WRKSRC}/$i > ${WRKSRC}/$i.tmp
	@@${MV} ${WRKSRC}/$i.tmp ${WRKSRC}/$i
d80 1
a80 1
.include <bsd.port.mk>
@

