Bringing this in now so that we can work on it here. Batting tarballs

back and forth in email messages doesn't make any sense when we have a
cvs tree to work in.

So, not hooked into the package builds yet.

Original work and port name from dlg.

ok robert@, dlg@

www/apache-httpd/Makefile

@@ -0,0 +1,66 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2006/12/14 07:14:20 deanna Exp $
+
+COMMENT=	"apache HTTP server"
+
+V=		2.2.3
+PKGNAME=	apache-httpd-${V}
+DISTNAME=	httpd-${V}
+
+CATEGORIES=	www net
+
+HOMEPAGE=	http://httpd.apache.org/
+
+# Apache
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+NO_REGRESS=		Yes
+
+WANTLIB=		c crypto m ssl expat db.>=4 iconv expat
+
+LIB_DEPENDS=		aprutil-1.>=2::devel/apr-util \
+			apr-1.>=2::devel/apr
+
+USE_LIBTOOL=		Yes
+
+MASTER_SITES=		http://apache.mirror.pacific.net.au/httpd/
+
+HTTPD_DIR=		/var/apache2
+SYSCONFDIR=		${HTTPD_DIR}/conf
+
+CONFIGURE_STYLE=	gnu
+CONFIGURE_ARGS+=	--enable-layout=OpenBSD \
+			--datadir=${HTTPD_DIR} \
+			--with-apr=${LOCALBASE} --with-apr-util=${LOCALBASE} \
+			--enable-ssl --with-ssl=/usr \
+			--with-mpm=prefork \
+			--libexecdir=${LOCALBASE}/lib
+
+CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
+			LDFLAGS="-L${LOCALBASE}/lib"
+
+FAKE_FLAGS+=		rel_user=_apache2 rel_group=_apache2 \
+			rel_datadir=${HTTPD_DIR} \
+			datadir=${PREFIX}/share/examples/apache2 \
+			sysconfdir=${PREFIX}/share/examples/apache2/conf
+
+pre-configure:
+	@perl -pi -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/config.layout
+
+post-install:
+	chown -R ${SHAREOWN}:${SHAREGRP} \
+	${PREFIX}/{share/doc/apache2,include/apache2,share/examples/apache2}
+
+	chown ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/httpd.exp
+
+	chown ${MANOWN}:${MANGRP} \
+	${PREFIX}/man/man1/{dbmmanage,htdbm,htdigest,htpasswd}.1 \
+	${PREFIX}/man/man8/{ab,apachectl,apxs,htcacheclean,httpd}.8 \
+	${PREFIX}/man/man8/{logresolve,rotatelogs,suexec}.8
+
+	chown ${BINOWN}:${BINGRP} \
+	${PREFIX}/sbin/{apachectl,apxs,dbmmanage,envvars,envvars-std}
+
+.include <bsd.port.mk>

www/apache-httpd/distinfo

@@ -0,0 +1,4 @@
+MD5 (httpd-2.2.3.tar.gz) = f72ffb176e2dc7b322be16508c09f63c
+RMD160 (httpd-2.2.3.tar.gz) = cf0acec7d8bdfea35ee71788cf76b48f7db92c4c
+SHA1 (httpd-2.2.3.tar.gz) = c40da586b74bd44e47d46e105d673fa5a662d00a
+SIZE (httpd-2.2.3.tar.gz) = 6342475

www/apache-httpd/patches/patch-Makefile_in

@@ -0,0 +1,36 @@
+$OpenBSD: patch-Makefile_in,v 1.1.1.1 2006/12/14 07:14:21 deanna Exp $
+--- Makefile.in.orig	Sun Nov 13 16:33:15 2005
++++ Makefile.in	Sun Oct 29 19:50:52 2006
+@@ -45,14 +45,18 @@ install-conf:
+ 	    	( \
+ 	    		n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
+ 	    		if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
+-	    			sed -e 's#@@ServerRoot@@#$(prefix)#g' \
++	    			sed -e 's#@@ServerRoot@@#$(rel_datadir)#g' \
+ 	    				-e 's#@@Port@@#$(PORT)#g' \
++	    				-e 's#@@User@@#$(rel_user)#g' \
++	    				-e 's#@@Group@@#$(rel_group)#g' \
+ 	    				-e '/@@LoadModule@@/d' \
+ 	    				< $$i; \
+ 	    		else \
+ 	    			sed -n -e '/@@LoadModule@@/q' \
+-	    				-e 's#@@ServerRoot@@#$(prefix)#g' \
++	    				-e 's#@@ServerRoot@@#$(rel_datadir)#g' \
+ 	    				-e 's#@@Port@@#$(PORT)#g' \
++	    				-e 's#@@User@@#$(rel_user)#g' \
++	    				-e 's#@@Group@@#$(rel_group)#g' \
+ 	    				-e 'p' \
+ 	    				< $$i; \
+ 	    			for j in $(DSO_MODULES) "^EOL^"; do \
+@@ -62,8 +66,10 @@ install-conf:
+ 	    			done; \
+ 	    			sed -e '1,/@@LoadModule@@/d' \
+ 	    				-e '/@@LoadModule@@/d' \
+-	    				-e 's#@@ServerRoot@@#$(prefix)#g' \
++	    				-e 's#@@ServerRoot@@#$(rel_datadir)#g' \
+ 	    				-e 's#@@Port@@#$(PORT)#g' \
++	    				-e 's#@@User@@#$(rel_user)#g' \
++	    				-e 's#@@Group@@#$(rel_group)#g' \
+ 	    				< $$i; \
+ 	    		fi \
+ 	    	) > $(DESTDIR)$(sysconfdir)/original/$$i; \

www/apache-httpd/patches/patch-config_layout

@@ -0,0 +1,47 @@
+$OpenBSD: patch-config_layout,v 1.1.1.1 2006/12/14 07:14:21 deanna Exp $
+--- config.layout.orig	Sun Nov 21 13:50:36 2004
++++ config.layout	Sun Dec 10 20:33:02 2006
+@@ -252,26 +252,26 @@
+ 
+ #   OpenBSD Layout
+ <Layout OpenBSD>
+-    prefix:        /var/www
+-    exec_prefix:   /usr
++    prefix:        %%PREFIX%%
++    exec_prefix:   ${prefix}
+     bindir:        ${exec_prefix}/bin
+     sbindir:       ${exec_prefix}/sbin
+     libdir:        ${exec_prefix}/lib
+-    libexecdir:    ${exec_prefix}/lib/apache/modules
+-    mandir:        ${exec_prefix}/share/man
+-    sysconfdir:    ${prefix}/conf
+-    datadir:       ${prefix}
+-    installbuilddir: ${prefix}/build
+-    errordir:      ${prefix}/error
+-    iconsdir:      ${prefix}/icons
+-    htdocsdir:     ${prefix}/htdocs
+-    manualdir:     ${datadir}/manual
+-    cgidir:        ${prefix}/cgi-bin
+-    includedir:    ${exec_prefix}/lib/apache/include
+-    localstatedir: ${prefix}
+-    runtimedir:    ${prefix}/logs
+-    logfiledir:    ${prefix}/logs
+-    proxycachedir: ${prefix}/proxy
++    libexecdir:    ${exec_prefix}/lib
++    mandir:        ${exec_prefix}/man
++    datadir:       /var/apache2
++    sysconfdir:    ${datadir}/conf
++    installbuilddir: ${datadir}/build
++    errordir:      ${datadir}/error
++    iconsdir:      ${datadir}/icons
++    htdocsdir:     ${datadir}/htdocs
++    manualdir:     ${exec_prefix}/share/doc/apache2
++    cgidir:        ${datadir}/cgi-bin
++    includedir:    ${exec_prefix}/include/apache2
++    localstatedir: ${datadir}
++    runtimedir:    ${datadir}/logs
++    logfiledir:    ${datadir}/logs
++    proxycachedir: ${datadir}/proxy
+ </Layout>
+ 
+ # FreeBSD Layout

www/apache-httpd/patches/patch-docs_conf_httpd_conf_in

@@ -0,0 +1,14 @@
+$OpenBSD: patch-docs_conf_httpd_conf_in,v 1.1.1.1 2006/12/14 07:14:21 deanna Exp $
+--- docs/conf/httpd.conf.in.orig	Tue Oct  3 11:28:53 2006
++++ docs/conf/httpd.conf.in	Tue Oct  3 11:29:17 2006
+@@ -62,8 +62,8 @@ Listen @@Port@@
+ # It is usually good practice to create a dedicated user and group for
+ # running httpd, as with most system services.
+ #
+-User daemon
+-Group daemon
++User @@User@@
++Group @@Group@@
+ </IfModule>
+ 
+ # 'Main' server configuration

www/apache-httpd/pkg/DESCR

@@ -0,0 +1,11 @@
+The Apache HTTP Server Project is an effort to develop and maintain an
+open-source HTTP server for modern operating systems including UNIX and
+Windows NT. The goal of this project is to provide a secure, efficient
+and extensible server that provides HTTP services in sync with the
+current HTTP standards.
+
+This package provides an unaudited version of apache.  For security
+reasons, users are STRONGLY encouraged to use the system httpd(8)
+instead, if at all possible.
+
+

www/apache-httpd/pkg/MESSAGE

@@ -0,0 +1,8 @@
+This is the official httpd distributed by the Apache Server Project,
+provided as a port for those who, for various reasons, need to run
+version 2. 
+
+OpenBSD provides a custom Apache server, httpd(8), in the base system
+which has been audited for security and may run in a chroot(2)
+environment.  Users are STRONGLY encouraged to use the system httpd
+rather than this port.