mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-26 05:02:18 +00:00
Code Issues Releases Activity

- Move apache21 to Attic.

Browse Source 
Will be back soon ;-)

Suggested by:		kris
This commit is contained in:
Clement Laforet 2004-03-17 08:41:58 +00:00
parent 35e7921e09
commit 203ad8c8b9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=104264
36 changed files with 0 additions and 4898 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

219
www/apache21/Makefile
View File

@ -1,219 +0,0 @@
# New ports collection makefile for: apache2
# Date created: 7 April 2001
# Whom: Hye-Shik Chang <perky@fallin.lv>
#
# $FreeBSD$
#
PORTNAME= apache
PORTVERSION= 2.0.48
CATEGORIES= www ipv6
MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \
http://sheepkiller.nerim.net/ports/${PORTNAME}/:powerlogo
DISTNAME= httpd-${PORTVERSION}
DISTFILES= ${DISTNAME}.tar.gz powerlogo.gif:powerlogo
DIST_SUBDIR= apache2
EXTRACT_ONLY= ${DISTNAME}.tar.gz
MAINTAINER?= sheepkiller@cultdeadsheep.org
COMMENT?= Version 2 of the extremely popular Apache http server
FORBIDDEN= Please use www/apache2
LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2
LATEST_LINK= apache2
CONFLICTS= apache+ipv6-1.* apache+modssl-1.* apache+ssl-1.* apache-1.* apache_fp-1.* \
caudium-devel-1.* caudium10-1.* caudium12-* \
ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.*
## Available knobs:
## By default, modules are compiled as dynamically loadable (DSO) modules.
##
## Apache-related
## WITH_MPM: prefork (default)
## worker
## perchild
## HTTP_PORT: default: 80
## WITH_LDAP: Enable LDAP support (mod_auth_ldap)
## WITHOUT_PROXY: Disable proxy support
## WITH_CUSTOM_PROXY: Let you choose which proxy modules you wish
## WITHOUT_AUTH: Disable auth modules
## WITH_CUSTOM_AUTH: Let you choose which auth modules you wish
## WITHOUT_DAV: Disable DAV support
## IPV6_V6ONLY: Disable IPv4 support
## WITHOUT_SSL: Disable SSL support
## WITH_THREADS: Enable threads support !! USE IT WITH CARE !!
## WITH_CUSTOM_THREADS: Let you choose which threaded modules you want
## WITH_EXPERIMENTAL: Enable Experimental modules
## WITH_DBM: Choose your DBM: bdb (Berkeley DB), gdbm or ndbm (default)
## WITH_BERKELEYDB: Choose your BerkeleyDB version: db2, db3 or db4 (default)
## WITH_STATIC_SUPPORT: Build statically linked support binaries
## WITH_STATIC_APACHE: Build a static version of httpd (implies WITH_STATIC_MODULES)
## WITH_ALL_STATIC_APACHE: All modules statically linked.
## WITH_STATIC_MODULES: List of modules to build modules statics (usefull for slave ports)
## (They must be already enabled (i.e. WITH_MODULES or with default configuration
## use 'make show-modules', to check if they are enabled)
## WITH_EXPERIMENTAL: Build and install experimental modules
## WITH_EXTRA_MODULES: To add addtionnal modules
## WITH_MODULES: List of your own modules
## WITHOUT_MODULES: Disable listed modules
##
##
## Port-related:
## NOPORTDOCS: Do not install documentation
## NO_CGI: Do not instal www/cgi-bin*
## NO_ERROR: Do not instal www/error
## NO_WWWDATA: Do not instal www/data*
## NO_ICONS: Do not instal www/icons*
## NO_WWW: Implies NO_CGI, NO_WWWDATA, NO_ICONS and NO_ERROR
##
## Available make targets:
## show-options: prints this message
## show-modules: prints list of available modules
##
## Examples:
## make WITHOUT_SSL=yes WITH_EXTRA_MODULES="bucketeer case_filter case_filter_in" WITHOUT_PROXY=yes
## make WITH_STATIC_MODULES="ssl rewrite include" WITH_EXPERIMENTAL=yes WITH_CUSTOM_AUTH="auth auth_dbm"
## make WITH_EXPERIMENTAL=yes WITHOUT_MODULES="access speling status"
## make WITH_MODULES="include rewrite auth"
##
WITH_MPM?= prefork # or worker, perchild
HTTP_PORT?= 80
GNU_CONFIGURE= yes
USE_LIBTOOL_VER=13
USE_PERL5= yes
USE_REINPLACE= yes
CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \
--enable-layout=FreeBSD \
--with-perl=${PERL5} \
--with-port=${HTTP_PORT} \
--with-expat=${LOCALBASE} \
--libdir=${PREFIX_RELDEST}/lib/apache2 \
--includedir=${PREFIX_RELDEST}/include/apache2
CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}"
DOCSDIR= share/doc/apache2
PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,}
RC_SUB= -e 's,@@PREFIX@@,${PREFIX_RELDEST},g'
MAKE_ENV+= DESTDIR=${DESTDIR} EXPR_COMPAT=yes
.if defined(NOPORTDOCS)
MAKE_ENV+= NOPORTDOCS=yes
.endif
MAN1= dbmmanage.1 htdigest.1 htpasswd.1
MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 suexec.8
.if !defined(IPV6_V6ONLY)
CONFIGURE_ARGS+= --enable-v4-mapped
.endif
.if !defined(WITHOUT_SSL)
USE_OPENSSL= yes
.endif
.if defined(WITH_LDAP)
USE_LDAP= YES
CONFIGURE_ARGS+= --with-ldap \
--with-ldap-lib="${LOCALBASE}/lib" \
--with-ldap-include="${LOCALBASE}/include"
.endif
.if defined(NO_WWW)
NO_CGI= YES
NO_WWWDATA= YES
NO_ICONS= YES
NO_ERROR= YES
.endif
.if defined(NO_CGI)
MAKE_ENV+= NO_CGI=yes
PLIST_SUB+= CGI="@comment "
.else
PLIST_SUB+= CGI=""
.endif
.if defined(NO_ICONS)
MAKE_ENV+= NO_ICONS=yes
PLIST_SUB+= ICONS="@comment "
.else
PLIST_SUB+= ICONS=""
.endif
.if defined(NO_WWWDATA)
MAKE_ENV+= NO_WWWDATA=yes
PLIST_SUB+= WWWDATA="@comment "
.else
PLIST_SUB+= WWWDATA=""
.endif
.if defined(NO_ERROR)
MAKE_ENV+= NO_ERROR=yes
PLIST_SUB+= ERROR="@comment "
.else
PLIST_SUB+= ERROR=""
.endif
.if defined(WITH_STATIC_SUPPORT)
CONFIGURE_ARGS+= --enable-static-support
.endif
.include <bsd.port.pre.mk>
.include "${.CURDIR}/Makefile.modules"
CONFIGURE_ARGS+= --with-mpm=${WITH_MPM:L} ${CONFIGURE_TARGET}
show-options:
@${EGREP} '^##' ${.CURDIR}/Makefile | ${SED} 's/##//'
show-modules:
@for module in $(AVAILABLE_MODULES) ; do \
${ECHO_MSG} -n "$${module}: ";\
if ${ECHO_CMD} ${APACHE_MODULES} | ${GREP} -wq $${module} 2> /dev/null ; then \
${ECHO_CMD} -n "enabled "; \
if ${ECHO_CMD} ${WITH_STATIC_MODULES} | ${GREP} -wq $${module} 2> /dev/null ; then \
${ECHO_CMD} "(static)" ; \
else \
${ECHO_CMD} "(shared)" ;\
fi;\
else\
${ECHO_CMD} disabled ;\
fi;\
done
pre-everything::
@${ECHO_MSG} ""
@${ECHO_MSG} " To see all available knobs, type make show-options"
@${ECHO_MSG} ""
post-extract:
@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/powerlogo.gif ${WRKSRC}/docs/icons/freebsd.gif
post-patch:
@cd ${WRKSRC}/docs/docroot && \
for f in index.html.*; do (\
${REINPLACE_CMD} -e 's,apache_pb,icons/freebsd.gif"\
ALT="[Powered by FreeBSD]"><IMG SRC="apache_pb2_ani,g' $$f \
); done
@${RM} -f ${WRKSRC}/docs/docroot/*.bak
@${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh
@${SED} ${RC_SUB} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout
@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
pre-install:
PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
@if [ ! -f ${PREFIX}/etc/rc.d/apache2.sh ]; then \
${ECHO} "Installing ${PREFIX}/etc/rc.d/apache2.sh startup file."; \
${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh; \
fi
.include <bsd.port.post.mk>

241
www/apache21/Makefile.modules
View File

@ -1,241 +0,0 @@
# Makefile.modules
# Author: Clement Laforet <sheepkiller@cultdeadsheep.org>
#
# This file is used to build modules list, DBM dependencies and MPM selection.
# I hope it can easily handle external modules (such as mod_perl) or MPMs, like
# muxmpm.
#
# Note to myself: (to generate PLIST_SUB entries for modules)
# gsed 's/^\(.*\)mod\(.*\)\.so/%%\MOD\U\2%%\L\1mod\2\.so/' pkg-plist > tmp
# mv tmp pkg-plist
#
# $FreeBSD$
#
# MPM section:
# << TO BE WRITTEN >>
.if defined (SLAVE_PORT_MPM)
PLIST_SUB+= PREFORK="@comment " WORKER="@comment "
PKGNAMESUFFIX= -${SLAVE_PORT_MPM}
.else
. if ${WITH_MPM} != "prefork"
PKGNAMESUFFIX= -${WITH_MPM:L}
WITH_THREADS= yes
. if ${WITH_MPM:L} == "worker"
PLIST_SUB+= PREFORK="@comment " WORKER=""
. elif ${WITH_MPM:L} == "perchild"
PLIST_SUB+= PREFORK="@comment " WORKER="@comment "
. else
BROKEN= "Unknown MPM: ${WITH_MPM}"
. endif
. else
PLIST_SUB+= PREFORK="@comment " WORKER="@comment "
. endif
.else
PLIST_SUB+= PREFORK="@comment " WORKER="@comment "
.endif
# xDBM section
#
.if !defined(WITH_DBM) && defined(WITH_BERKELEYDB)
WITH_DBM=db
.endif
.if defined(WITH_DBM)
. if ${WITH_DBM:L} == "sdbm"
CONFIGURE_ARGS+= --with-dbm=sdbm
. elif ${WITH_DBM:L} == "gdbm"
LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm
CONFIGURE_ARGS+= --with-gdbm=${LOCALBASE}
. elif ${WITH_DBM:L} == "db" || defined(WITH_BERKELEYDB)
. if !defined(WITH_BERKELEYDB)
LIB_DEPENDS= db4:${PORTSDIR}/databases/db4
CONFIGURE_ARGS+= --with-dbm=db4 \
--with-berkeley-db=${LOCALBASE}
. elif ${WITH_BERKELEYDB} == "db2"
LIB_DEPENDS= db2:${PORTSDIR}/databases/db2
CONFIGURE_ARGS+= --with-dbm=db2 \
--with-berkeley-db=${LOCALBASE}
. elif ${WITH_BERKELEYDB} == "db3"
LIB_DEPENDS= db2:${PORTSDIR}/databases/db3
CONFIGURE_ARGS+= --with-dbm=db3 \
--with-berkeley-db=${LOCALBASE}
. elif ${WITH_BERKELEYDB} == "db4"
LIB_DEPENDS= db4:${PORTSDIR}/databases/db4
CONFIGURE_ARGS+= --with-dbm=db4 \
--with-berkeley-db=${LOCALBASE}
. else
BROKEN= "Unknown Berkeley DB version"
. endif
. else
BROKEN= "Unknown DBM"
. endif
.else
CONFIGURE_ARGS+= --with-dbm=sdbm
.endif
# Modules section:
# How does it works ?
# << TO BE WRITTEN >>
# All supported modules
AUTH_MODULES= auth auth_anon auth_dbm auth_digest
DAV_MODULES= dav dav_fs
EXPERIMENTAL_MODULES= bucketeer case_filter case_filter_in ext_filter charset_lite \
optional_hook_export optional_hook_import \
optional_fn_import optional_fn_export
LDAP_MODULES= ldap auth_ldap
MISC_MODULES= access actions alias asis autoindex cache cern_meta \
cgi cgid charset_lite deflate dir disk_cache env expires \
file_cache headers imap include info log_config logio mime \
mime_magic negotiation rewrite setenvif speling status \
unique_id userdir usertrack vhost_alias
PROXY_MODULES= proxy proxy_connect proxy_ftp proxy_http
SSL_MODULE= ssl
SUEXEC_MODULES= suexec
THREADS_MODULES= cache file_cache disk_cache mem_cache
# Work in progress
SLAVE_PORT_MODULES?= # If you are porting a slave port for apache2 please define SLAVE_PORT_MODULES
DEFAULT_MODULES= ${AUTH_MODULES} ${DAV_MODULES} ${MISC_MODULES} \
${PROXY_MODULES} ${SLAVE_PORT_MODULES}
AVAILABLE_MODULES= ${DEFAULT_MODULES} ${EXPERIMENTAL_MODULES} ${LDAP_MODULES} ${THREADS_MODULES} \
${SSL_MODULE} ${SUEXEC_MODULES}
# Setting "@comment " as default.
.for module in ${AVAILABLE_MODULES}
${module}_PLIST_SUB= "@comment "
.endfor
# Configure
.if defined(WITH_MODULES) && ( defined(WITHOUT_MODULES) || defined(WITH_EXTRA_MODULES))
BROKEN= "WITH_MODULES and WITHOUT_MODULES are mutually exclusive"
.endif
.if defined(WITHOUT_AUTH) || defined(WITH_CUSTOM_AUTH) || \
defined(WITHOUT_PROXY) || defined(WITH_CUSTOM_PROXY) || \
defined(WITHOUT_DAV)
CUSTOM= YES
.endif
.if !defined(WITH_STATIC_APACHE)
# FYI
#DYNAMIC_MODULES= so
CONFIGURE_ARGS+= --enable-so
.else
CONFIGURE_ARGS+= --disable-so
WITH_ALL_STATIC_MODULES= YES
.endif
### This part is not processed if WITH_MODULES is defined
.if defined(WITH_MODULES)
_APACHE_MODULES+= ${WITH_MODULES}
.elif !defined(CUSTOM)
_APACHE_MODULES+= ${DEFAULT_MODULES}
.else
. if defined(WITH_CUSTOM_AUTH)
_APACHE_MODULES+= ${WITH_CUSTOM_AUTH}
. elif !defined(WITHOUT_AUTH)
_APACHE_MODULES+= ${AUTH_MODULE}
. endif
. if defined(WITH_CUSTOM_PROXY)
_APACHE_MODULES+= ${WITH_CUSTOM_PROXY}
. elif !defined(WITHOUT_PROXY)
_APACHE_MODULES+= ${PROXY_MODULES}
. endif
. if !defined(WITHOUT_DAV)
_APACHE_MODULES+= dav dav_fs
. endif
_APACHE_MODULES+= ${MISC_MODULES} ${SLAVE_PORT_MODULES}
.endif # end of module selection
.if defined (WITH_LDAP)
_APACHE_MODULES+= ${LDAP_MODULES}
.endif
.if defined(WITH_THREADS)
CONFIGURE_ARGS+= --enable-threads
CFLAGS+= -DFREEBSD_THREAD_HACK
. if !defined(WITH_CUSTOM_THREADS)
_APACHE_MODULES+= ${THREAD_MODULES}
. else
_APACHE_MODULES+= ${WITH_CUSTOM_THREADS}
. endif
.endif # endif of module selection
.if !defined(WITHOUT_SSL)
_APACHE_MODULES+= ${SSL_MODULE}
CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE}
RC_SUB+= -e 's,@@SSL@@,ssl,g'
.else
RC_SUB+= -e 's,@@SSL@@,,g'
.endif
.if defined(WITH_SUEXEC)
SUEXEC_DOCROOT?= ${PREFIX_RELDEST}/www/data
SUEXEC_USERDIR?= public_html
SUEXEC_SAFEPATH?= ${PREFIX_RELDEST}/bin:${LOCALBASE}/bin:/usr/bin:/bin
_APACHE_MODULES+= ${SUEXEC_MODULES}
CONFIGURE_ARGS+= --with-suexec-caller=www \
--with-suexec-uidmin=1000 --with-suexec-gidmin=1000 \
--with-suexec-userdir="${SUEXEC_USERDIR}" \
--with-suexec-docroot="${SUEXEC_DOCROOT}" \
--with-suexec-safepath="${SUEXEC_SAFEPATH}" \
--with-suexec-logfile="/var/log/httpd-suexec.log" \
--with-suexec-bin="${PREFIX_RELDEST}/sbin/suexec"
.endif
.if defined(WITH_EXTRA_MODULES)
_APACHE_MODULES+= ${WITH_EXTRA_MODULES}
.endif
.if defined(WITH_EXPERIMENTAL)
_APACHE_MODULES+= ${EXPERIMENTAL_MODULES}
.endif
.if !defined(WITHOUT_MODULES)
APACHE_MODULES= ${_APACHE_MODULES}
.else
APACHE_MODULES!= \
for module in ${_APACHE_MODULES}; do \
${ECHO_CMD} ${WITHOUT_MODULES} | ${GREP} -wq $${module} 2> /dev/null || \
${ECHO_CMD} $${module}; \
done
.endif
.if defined(WITH_STATIC_MODULES)
_CONFIGURE_ARGS!= \
for module in ${APACHE_MODULES} ; do \
${ECHO_CMD} ${WITH_STATIC_MODULES} | \
${GREP} -wq $${module} 2> /dev/null ; \
if [ "$${?}" = "0" ] ; then \
${ECHO_CMD} "--enable-$${module}"; \
else \
${ECHO_CMD} "--enable-$${module}=shared"; \
fi; done
CONFIGURE_ARGS+= ${_CONFIGURE_ARGS}
.elif defined(WITH_STATIC_APACHE) || defined(WITH_ALL_STATIC_MODULES)
CONFIGURE_ARGS+= --enable-modules="${APACHE_MODULES}"
.else
CONFIGURE_ARGS+= --enable-mods-shared="${APACHE_MODULES}"
.endif
.if defined(WITH_STATIC_MODULES)
_SHARED_MODULES!= \
for module in ${APACHE_MODULES} ; do \
${ECHO_CMD} ${WITH_STATIC_MODULES} | ${GREP} -wq $${module} 2> /dev/null || \
${ECHO_CMD} $${module}; \
done
SHARED_MODULES= ${_SHARED_MODULES}
.elif !defined(WITH_ALL_STATIC_MODULES)
SHARED_MODULES= ${APACHE_MODULES}
.endif
. for module in ${SHARED_MODULES}
${module}_PLIST_SUB= ""
. endfor
.for module in ${AVAILABLE_MODULES}
PLIST_SUB+= MOD_${module:U}=${${module}_PLIST_SUB}
.endfor

2
www/apache21/distinfo
View File

@ -1,2 +0,0 @@
MD5 (apache2/httpd-2.0.48.tar.gz) = 466c63bb71b710d20a5c353df8c1a19c
MD5 (apache2/powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62

17
www/apache21/files/apache.sh
View File

@ -1,17 +0,0 @@
#!/bin/sh
PREFIX=@@PREFIX@@
case "$1" in
start)
[ "@@SSL@@" = "ssl" -a -f "$PREFIX/etc/apache2/ssl.crt/server.crt" ] && SSL=ssl
[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start${SSL} > /dev/null && echo -n ' apache2'
;;
stop)
[ -r /var/run/httpd.pid ] && ${PREFIX}/sbin/apachectl stop > /dev/null && echo -n ' apache2'
;;
*)
echo "Usage: `basename $0` {start|stop}" >&2
;;
esac
exit 0

22
www/apache21/files/config.layout
View File

@ -1,22 +0,0 @@
<Layout FreeBSD>
prefix: /usr/local
exec_prefix: ${prefix}
bindir: ${exec_prefix}/bin
sbindir: ${exec_prefix}/sbin
libexecdir: ${exec_prefix}/libexec/apache2
mandir: ${prefix}/man
sysconfdir: ${prefix}/etc/apache2
datadir: ${prefix}/www
installbuilddir: ${prefix}/share/apache2/build
errordir: ${datadir}/error
iconsdir: ${datadir}/icons
htdocsdir: ${datadir}/data
manualdir: ${prefix}/share/doc/apache2
cgidir: ${datadir}/cgi-bin
includedir: ${prefix}/include/apache2
localstatedir: /var
runtimedir: ${localstatedir}/run
logfiledir: ${localstatedir}/log
proxycachedir: ${datadir}/proxy
infodir: ${exec_prefix}/share/info
</Layout>

116
www/apache21/files/patch-Makefile.in
View File

@ -1,116 +0,0 @@
--- Makefile.in.orig Tue Jul 29 15:40:09 2003
+++ Makefile.in Tue Sep 30 00:31:14 2003
@@ -37,10 +37,13 @@
if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
$(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
fi; \
+ cp -f $$i $$i-dist; \
+ $(INSTALL_DATA) $$i-dist $(DESTDIR)$(sysconfdir); \
done; \
for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
cd $$j ; \
for i in *-std*.conf; do \
+ [ -f `echo "$$i"|sed 's,\.in$$,_nonex,g'` ] || continue; \
( \
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 \
@@ -58,6 +61,9 @@
if test "x$$j" = "xssl"; then \
echo "<IfDefine SSL>"; \
fi; \
+ if [ `echo "$$j" | egrep 'cgid|cache|dav|digest|proxy'` ]; then \
+ echo -n "#"; \
+ fi; \
if test $$j != "^EOL^"; then \
echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
fi; \
@@ -109,45 +115,41 @@
doxygen $(top_srcdir)/docs/doxygen.conf
install-htdocs:
- -@if [ -d $(DESTDIR)$(htdocsdir) ]; then \
- echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \
- else \
- echo Installing HTML documents ; \
- $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \
- test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
- cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \
- fi
+.if !defined(NO_WWWDATA)
+ @echo Installing HTML documents
+ @test -d $(DESTDIR)$(htdocsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)-dist
+ @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)-dist)
+ @test -e $(DESTDIR)$(htdocsdir) || ln -sf $(DESTDIR)$(htdocsdir)-dist $(DESTDIR)$(htdocsdir)
+ -@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir)-dist && find . -name "CVS" -print | xargs rm -rf
+.endif
install-error:
- -@if [ -d $(DESTDIR)$(errordir) ]; then \
- echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
- else \
- echo Installing error documents ; \
- $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \
- cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \
- test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \
- fi
+.if !defined(NO_ERROR)
+ @echo Installing error documents
+ @test -d $(DESTDIR)$(errordir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(errordir)-dist
+ cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir)-dist
+ -@test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir)-dist && find . -name "CVS" -print | xargs rm -rf
+ @test -e $(DESTDIR)$(errordir) || ln -sf $(DESTDIR)$(errordir)-dist $(DESTDIR)$(errordir)
+.endif
install-icons:
- -@if [ -d $(DESTDIR)$(iconsdir) ]; then \
- echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
- else \
- echo Installing icons ; \
- $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \
- cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \
- test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \
- fi
+.if !defined(NO_ICONS)
+ @echo Installing icons
+ @test -d $(DESTDIR)$(iconsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir)-dist
+ cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir)-dist
+ -@test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir)-dist && find . -name "CVS" -print | xargs rm -rf
+ @test -e $(DESTDIR)$(iconsdir) || ln -sf $(DESTDIR)$(iconsdir)-dist $(DESTDIR)$(iconsdir)
+.endif
install-cgi:
- -@if [ -d $(DESTDIR)$(cgidir) ];then \
- echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \
- else \
- echo Installing CGIs ; \
- $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \
- cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \
- test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \
- fi
-
+.if !defined(NO_CGI)
+ @echo Installing CGIs
+ @test -d $(DESTDIR)$(cgidir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)-dist
+ cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)-dist
+ -@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir)-dist && find . -name "CVS" -print | xargs rm -rf
+ @test -e $(DESTDIR)$(cgidir) || ln -sf $(DESTDIR)$(cgidir)-dist $(DESTDIR)$(cgidir)
+.endif
+
install-other:
@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
@test -d $(DESTDIR)$(runtimedir) || $(MKINSTALLDIRS) $(DESTDIR)$(runtimedir)
@@ -190,11 +192,13 @@
@test -d $(DESTDIR)$(mandir) || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)
@test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
@test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8
- @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
@cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
@cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
+.if !defined(NOPORTDOCS)
+ @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
@(cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
@(cd $(DESTDIR)$(manualdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null ) || true
+.endif
install-suexec:
@if test -f $(builddir)/support/suexec; then \

39
www/apache21/files/patch-configure
View File

@ -1,39 +0,0 @@
--- configure.orig Wed May 28 14:11:27 2003
+++ configure Fri May 30 07:47:42 2003
@@ -1513,7 +1513,7 @@
$srcdir/config.layout > $pldconf
layout_name=$LAYOUT
. $pldconf
- rm $pldconf
+ rm -f $pldconf
for var in prefix exec_prefix bindir sbindir libexecdir mandir \
sysconfdir datadir errordir iconsdir htdocsdir cgidir \
includedir localstatedir runtimedir logfiledir libdir \
@@ -2627,7 +2627,7 @@
done
- if eval $SHELL $ac_abs_srcdir/configure $apr_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir $apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir
+ if eval $SHELL $ac_abs_srcdir/configure $apr_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir $apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir --datadir=$datadir --with-installbuilddir=$installbuilddir
then :
echo "srclib/apr configured properly"
else
@@ -2928,7 +2928,7 @@
done
- if eval $SHELL $ac_abs_srcdir/configure $apr_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir --with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir
+ if eval $SHELL $ac_abs_srcdir/configure $apr_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir --with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir
then :
echo "srclib/apr-util configured properly"
else
@@ -15719,6 +15719,9 @@
cat >>confdefs.h <<_ACEOF
#define SERVER_CONFIG_FILE "${rel_sysconfdir}/${progname}.conf"
+#define DEFAULT_ERRORLOG "${rel_logfiledir}/httpd-error.log"
+#define AP_TYPES_CONFIG_FILE "${rel_sysconfdir}/mime.types"
+#define DOCUMENT_LOCATION "${rel_htdocsdir}"
_ACEOF

56
www/apache21/files/patch-docs:conf:httpd-std.conf.in
View File

@ -1,56 +0,0 @@
--- docs/conf/httpd-std.conf.in.orig Wed Apr 24 07:24:35 2002
+++ docs/conf/httpd-std.conf.in Tue May 7 19:29:28 2002
@@ -68,7 +68,7 @@
#
<IfModule !mpm_netware.c>
<IfModule !perchild.c>
-#ScoreBoardFile @rel_logfiledir@/apache_runtime_status
+#ScoreBoardFile @rel_runtimedir@/apache_runtime_status
</IfModule>
</IfModule>
@@ -263,8 +263,8 @@
# when the value of (unsigned)Group is above 60000;
# don't use Group #-1 on these systems!
#
-User nobody
-Group #-1
+User www
+Group www
</IfModule>
</IfModule>
@@ -450,7 +450,7 @@
# logged here. If you *do* define an error logfile for a <VirtualHost>
# container, that host's errors will be logged there and not here.
#
-ErrorLog @rel_logfiledir@/error_log
+ErrorLog @rel_logfiledir@/httpd-error.log
#
# LogLevel: Control the number of messages logged to the error_log.
@@ -475,20 +475,20 @@
# define per-<VirtualHost> access logfiles, transactions will be
# logged therein and *not* in this file.
#
-CustomLog @rel_logfiledir@/access_log common
+#CustomLog @rel_logfiledir@/httpd-access.log common
#
# If you would like to have agent and referer logfiles, uncomment the
# following directives.
#
-#CustomLog @rel_logfiledir@/referer_log referer
-#CustomLog @rel_logfiledir@/agent_log agent
+#CustomLog @rel_logfiledir@/httpd-referer.log referer
+#CustomLog @rel_logfiledir@/httpd-agent.log agent
#
# If you prefer a single logfile with access, agent, and referer information
# (Combined Logfile Format) you can use the following directive.
#
-#CustomLog @rel_logfiledir@/access_log combined
+CustomLog @rel_logfiledir@/httpd-access.log combined
#
# Optionally add a line containing the server version and virtual host

24
www/apache21/files/patch-docs:conf:ssl-std.conf.in
View File

@ -1,24 +0,0 @@
$FreeBSD$
--- docs/conf/ssl-std.conf.in.orig Mon Oct 13 16:14:10 2003
+++ docs/conf/ssl-std.conf.in Mon Oct 13 16:15:17 2003
@@ -88,8 +88,8 @@
DocumentRoot "@exp_htdocsdir@"
ServerName www.example.com:443
ServerAdmin you@example.com
-ErrorLog @exp_logfiledir@/error_log
-TransferLog @exp_logfiledir@/access_log
+ErrorLog @exp_logfiledir@/httpd-error.log
+TransferLog @exp_logfiledir@/httpd-access.log
# SSL Engine Switch:
# Enable/Disable SSL for this virtual host.
@@ -240,7 +240,7 @@
# Per-Server Logging:
# The home of a custom SSL log file. Use this when you want a
# compact non-error SSL logfile on a virtual host basis.
-CustomLog @exp_logfiledir@/ssl_request_log \
+CustomLog @exp_logfiledir@/httpd-ssl_request.log \
"%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
</VirtualHost>

36
www/apache21/files/patch-server:main.c
View File

@ -1,36 +0,0 @@
--- server/main.c.orig Thu Jun 13 04:34:56 2002
+++ server/main.c Sun Jul 21 08:54:09 2002
@@ -78,6 +78,11 @@
#include "ap_mpm.h"
#include "mpm_common.h"
+#ifdef FREEBSD_THREAD_HACK
+#include <unistd.h>
+AP_DECLARE(int) ap_exists_config_define(const char *name);
+#endif
+
/* WARNING: Win32 binds http_main.c dynamically to the server. Please place
* extern functions and global data in another appropriate module.
*
@@ -558,6 +563,21 @@
destroy_and_exit_process(process, 1);
}
+#ifdef FREEBSD_THREAD_HACK
+ {
+ int r;
+
+ if (! ap_exists_config_define("NO_DETACH")) {
+ if ((r = fork()) > 0)
+ return 0;
+ if (r == -1) {
+ perror("fork");
+ return 0;
+ }
+ setsid();
+ }
+ }
+#endif
ap_process_config_tree(server_conf, ap_conftree, process->pconf, ptemp);
ap_fixup_virtual_hosts(pconf, server_conf);
ap_fini_vhost_config(pconf, server_conf);

10
www/apache21/files/patch-srclib:apr-util:config.layout
View File

@ -1,10 +0,0 @@
--- srclib/apr-util/config.layout.orig Tue Jan 7 13:13:09 2003
+++ srclib/apr-util/config.layout Tue Apr 1 18:36:16 2003
@@ -229,3 +229,7 @@
infodir: ${exec_prefix}/share/info
libsuffix -${APRUTIL_MAJOR_VERSION}
</Layout>
+
+<Layout FreeBSD>
+ libsuffix:
+</Layout>

10
www/apache21/files/patch-srclib:apr:config.layout
View File

@ -1,10 +0,0 @@
--- srclib/apr/config.layout.orig Tue Jan 7 13:06:50 2003
+++ srclib/apr/config.layout Tue Apr 1 18:36:51 2003
@@ -229,3 +229,7 @@
infodir: ${exec_prefix}/share/info
libsuffix: -${APR_MAJOR_VERSION}
</Layout>
+
+<Layout FreeBSD>
+ libsuffix:
+</Layout>

18
www/apache21/files/patch-srclib:apr:threadproc:unix:procsup.c
View File

@ -1,18 +0,0 @@
--- srclib/apr/threadproc/unix/procsup.c.orig Mon Apr 8 22:08:18 2002
+++ srclib/apr/threadproc/unix/procsup.c Sun Jul 21 08:45:44 2002
@@ -59,6 +59,7 @@
int x;
chdir("/");
+#ifndef FREEBSD_THREAD_HACK
#if !defined(MPE) && !defined(OS2) && !defined(TPF) && !defined(BEOS)
/* Don't detach for MPE because child processes can't survive the death of
* the parent. */
@@ -89,6 +90,7 @@
if (setpgid(0, 0) == -1) {
return errno;
}
+#endif
#endif
/* close out the standard file descriptors */

21
www/apache21/files/patch-support:apachectl.in
View File

@ -1,21 +0,0 @@
--- support/apachectl.in.orig Mon May 27 20:46:01 2002
+++ support/apachectl.in Thu Jul 11 21:12:36 2002
@@ -31,8 +31,8 @@
HTTPD='@exp_sbindir@/@progname@'
#
# pick up any necessary environment variables
-if test -f @exp_bindir@/envvars; then
- . @exp_bindir@/envvars
+if test -f @exp_sbindir@/envvars; then
+ . @exp_sbindir@/envvars
fi
#
# a command that outputs a formatted text version of the HTML at the
@@ -46,6 +46,7 @@
#
# -------------------- --------------------
# |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
+eval `limits -e -C daemon` >/dev/null 2>&1
ERROR=0
if [ "x$ARGV" = "x" ] ; then

20
www/apache21/files/patch-support:log_server_status.in
View File

@ -1,20 +0,0 @@
--- support/log_server_status.in.orig Tue Jun 18 23:21:53 2002
+++ support/log_server_status.in Tue Jun 18 23:23:08 2002
@@ -63,7 +63,7 @@
#
require 'sys/socket.ph';
-$wherelog = "/var/log/graph/"; # Logs will be like "/var/log/graph/19960312"
+$wherelog = "@logfiledir@/httpd-status-"; # Logs will be like "/var/log/httpd-status-19960312.log"
$server = "localhost"; # Name of server, could be "www.foo.com"
$port = "80"; # Port on server
$request = "/status/?auto"; # Request to send
@@ -96,7 +96,7 @@
chomp($date);
($day,$time)=split(/:/,$date);
$res=&tcp_connect($server,$port);
- open(OUT,">>$wherelog$day");
+ open(OUT,">>$wherelog$day.log");
if ($res) {
print OUT "$time:-1:-1:-1:-1:$res\n";
exit 1;

6
www/apache21/pkg-descr
View File

@ -1,6 +0,0 @@
Apache is an HTTP server designed as a plug-in replacement for the NCSA
server version 1.3 (or 1.4). It fixes numerous bugs in the NCSA server and
includes many frequently requested new features, and has an API which
allows it to be extended to meet users' needs more easily.
WWW: http://www.apache.org/

35
www/apache21/pkg-install
View File

@ -1,35 +0,0 @@
#!/bin/sh
# $FreeBSD: /tmp/pcvs/ports/www/apache21/Attic/pkg-install,v 1.3 2001-10-29 20:05:37 ache Exp $
#
if [ "$2" != "PRE-INSTALL" ]; then
exit 0
fi
USER=www
GROUP=${USER}
UID=80
GID=${UID}
if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
if pw groupadd ${GROUP} -g ${GID}; then
echo "Added group \"${GROUP}\"."
else
echo "Adding group \"${GROUP}\" failed..."
exit 1
fi
fi
if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-s "/sbin/nologin" -d "/nonexistent" \
-c "World Wide Web Owner"; \
then
echo "Added user \"${USER}\"."
else
echo "Adding user \"${USER}\" failed..."
exit 1
fi
fi
exit 0

1557
www/apache21/pkg-plist
View File

File diff suppressed because it is too large Load Diff

219
www/apache22/Makefile
View File

@ -1,219 +0,0 @@
# New ports collection makefile for: apache2
# Date created: 7 April 2001
# Whom: Hye-Shik Chang <perky@fallin.lv>
#
# $FreeBSD$
#
PORTNAME= apache
PORTVERSION= 2.0.48
CATEGORIES= www ipv6
MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \
http://sheepkiller.nerim.net/ports/${PORTNAME}/:powerlogo
DISTNAME= httpd-${PORTVERSION}
DISTFILES= ${DISTNAME}.tar.gz powerlogo.gif:powerlogo
DIST_SUBDIR= apache2
EXTRACT_ONLY= ${DISTNAME}.tar.gz
MAINTAINER?= sheepkiller@cultdeadsheep.org
COMMENT?= Version 2 of the extremely popular Apache http server
FORBIDDEN= Please use www/apache2
LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2
LATEST_LINK= apache2
CONFLICTS= apache+ipv6-1.* apache+modssl-1.* apache+ssl-1.* apache-1.* apache_fp-1.* \
caudium-devel-1.* caudium10-1.* caudium12-* \
ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.*
## Available knobs:
## By default, modules are compiled as dynamically loadable (DSO) modules.
##
## Apache-related
## WITH_MPM: prefork (default)
## worker
## perchild
## HTTP_PORT: default: 80
## WITH_LDAP: Enable LDAP support (mod_auth_ldap)
## WITHOUT_PROXY: Disable proxy support
## WITH_CUSTOM_PROXY: Let you choose which proxy modules you wish
## WITHOUT_AUTH: Disable auth modules
## WITH_CUSTOM_AUTH: Let you choose which auth modules you wish
## WITHOUT_DAV: Disable DAV support
## IPV6_V6ONLY: Disable IPv4 support
## WITHOUT_SSL: Disable SSL support
## WITH_THREADS: Enable threads support !! USE IT WITH CARE !!
## WITH_CUSTOM_THREADS: Let you choose which threaded modules you want
## WITH_EXPERIMENTAL: Enable Experimental modules
## WITH_DBM: Choose your DBM: bdb (Berkeley DB), gdbm or ndbm (default)
## WITH_BERKELEYDB: Choose your BerkeleyDB version: db2, db3 or db4 (default)
## WITH_STATIC_SUPPORT: Build statically linked support binaries
## WITH_STATIC_APACHE: Build a static version of httpd (implies WITH_STATIC_MODULES)
## WITH_ALL_STATIC_APACHE: All modules statically linked.
## WITH_STATIC_MODULES: List of modules to build modules statics (usefull for slave ports)
## (They must be already enabled (i.e. WITH_MODULES or with default configuration
## use 'make show-modules', to check if they are enabled)
## WITH_EXPERIMENTAL: Build and install experimental modules
## WITH_EXTRA_MODULES: To add addtionnal modules
## WITH_MODULES: List of your own modules
## WITHOUT_MODULES: Disable listed modules
##
##
## Port-related:
## NOPORTDOCS: Do not install documentation
## NO_CGI: Do not instal www/cgi-bin*
## NO_ERROR: Do not instal www/error
## NO_WWWDATA: Do not instal www/data*
## NO_ICONS: Do not instal www/icons*
## NO_WWW: Implies NO_CGI, NO_WWWDATA, NO_ICONS and NO_ERROR
##
## Available make targets:
## show-options: prints this message
## show-modules: prints list of available modules
##
## Examples:
## make WITHOUT_SSL=yes WITH_EXTRA_MODULES="bucketeer case_filter case_filter_in" WITHOUT_PROXY=yes
## make WITH_STATIC_MODULES="ssl rewrite include" WITH_EXPERIMENTAL=yes WITH_CUSTOM_AUTH="auth auth_dbm"
## make WITH_EXPERIMENTAL=yes WITHOUT_MODULES="access speling status"
## make WITH_MODULES="include rewrite auth"
##
WITH_MPM?= prefork # or worker, perchild
HTTP_PORT?= 80
GNU_CONFIGURE= yes
USE_LIBTOOL_VER=13
USE_PERL5= yes
USE_REINPLACE= yes
CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \
--enable-layout=FreeBSD \
--with-perl=${PERL5} \
--with-port=${HTTP_PORT} \
--with-expat=${LOCALBASE} \
--libdir=${PREFIX_RELDEST}/lib/apache2 \
--includedir=${PREFIX_RELDEST}/include/apache2
CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}"
DOCSDIR= share/doc/apache2
PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,}
RC_SUB= -e 's,@@PREFIX@@,${PREFIX_RELDEST},g'
MAKE_ENV+= DESTDIR=${DESTDIR} EXPR_COMPAT=yes
.if defined(NOPORTDOCS)
MAKE_ENV+= NOPORTDOCS=yes
.endif
MAN1= dbmmanage.1 htdigest.1 htpasswd.1
MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 suexec.8
.if !defined(IPV6_V6ONLY)
CONFIGURE_ARGS+= --enable-v4-mapped
.endif
.if !defined(WITHOUT_SSL)
USE_OPENSSL= yes
.endif
.if defined(WITH_LDAP)
USE_LDAP= YES
CONFIGURE_ARGS+= --with-ldap \
--with-ldap-lib="${LOCALBASE}/lib" \
--with-ldap-include="${LOCALBASE}/include"
.endif
.if defined(NO_WWW)
NO_CGI= YES
NO_WWWDATA= YES
NO_ICONS= YES
NO_ERROR= YES
.endif
.if defined(NO_CGI)
MAKE_ENV+= NO_CGI=yes
PLIST_SUB+= CGI="@comment "
.else
PLIST_SUB+= CGI=""
.endif
.if defined(NO_ICONS)
MAKE_ENV+= NO_ICONS=yes
PLIST_SUB+= ICONS="@comment "
.else
PLIST_SUB+= ICONS=""
.endif
.if defined(NO_WWWDATA)
MAKE_ENV+= NO_WWWDATA=yes
PLIST_SUB+= WWWDATA="@comment "
.else
PLIST_SUB+= WWWDATA=""
.endif
.if defined(NO_ERROR)
MAKE_ENV+= NO_ERROR=yes
PLIST_SUB+= ERROR="@comment "
.else
PLIST_SUB+= ERROR=""
.endif
.if defined(WITH_STATIC_SUPPORT)
CONFIGURE_ARGS+= --enable-static-support
.endif
.include <bsd.port.pre.mk>
.include "${.CURDIR}/Makefile.modules"
CONFIGURE_ARGS+= --with-mpm=${WITH_MPM:L} ${CONFIGURE_TARGET}
show-options:
@${EGREP} '^##' ${.CURDIR}/Makefile | ${SED} 's/##//'
show-modules:
@for module in $(AVAILABLE_MODULES) ; do \
${ECHO_MSG} -n "$${module}: ";\
if ${ECHO_CMD} ${APACHE_MODULES} | ${GREP} -wq $${module} 2> /dev/null ; then \
${ECHO_CMD} -n "enabled "; \
if ${ECHO_CMD} ${WITH_STATIC_MODULES} | ${GREP} -wq $${module} 2> /dev/null ; then \
${ECHO_CMD} "(static)" ; \
else \
${ECHO_CMD} "(shared)" ;\
fi;\
else\
${ECHO_CMD} disabled ;\
fi;\
done
pre-everything::
@${ECHO_MSG} ""
@${ECHO_MSG} " To see all available knobs, type make show-options"
@${ECHO_MSG} ""
post-extract:
@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/powerlogo.gif ${WRKSRC}/docs/icons/freebsd.gif
post-patch:
@cd ${WRKSRC}/docs/docroot && \
for f in index.html.*; do (\
${REINPLACE_CMD} -e 's,apache_pb,icons/freebsd.gif"\
ALT="[Powered by FreeBSD]"><IMG SRC="apache_pb2_ani,g' $$f \
); done
@${RM} -f ${WRKSRC}/docs/docroot/*.bak
@${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh
@${SED} ${RC_SUB} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout
@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
pre-install:
PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
@if [ ! -f ${PREFIX}/etc/rc.d/apache2.sh ]; then \
${ECHO} "Installing ${PREFIX}/etc/rc.d/apache2.sh startup file."; \
${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh; \
fi
.include <bsd.port.post.mk>

241
www/apache22/Makefile.modules
View File

@ -1,241 +0,0 @@
# Makefile.modules
# Author: Clement Laforet <sheepkiller@cultdeadsheep.org>
#
# This file is used to build modules list, DBM dependencies and MPM selection.
# I hope it can easily handle external modules (such as mod_perl) or MPMs, like
# muxmpm.
#
# Note to myself: (to generate PLIST_SUB entries for modules)
# gsed 's/^\(.*\)mod\(.*\)\.so/%%\MOD\U\2%%\L\1mod\2\.so/' pkg-plist > tmp
# mv tmp pkg-plist
#
# $FreeBSD$
#
# MPM section:
# << TO BE WRITTEN >>
.if defined (SLAVE_PORT_MPM)
PLIST_SUB+= PREFORK="@comment " WORKER="@comment "
PKGNAMESUFFIX= -${SLAVE_PORT_MPM}
.else
. if ${WITH_MPM} != "prefork"
PKGNAMESUFFIX= -${WITH_MPM:L}
WITH_THREADS= yes
. if ${WITH_MPM:L} == "worker"
PLIST_SUB+= PREFORK="@comment " WORKER=""
. elif ${WITH_MPM:L} == "perchild"
PLIST_SUB+= PREFORK="@comment " WORKER="@comment "
. else
BROKEN= "Unknown MPM: ${WITH_MPM}"
. endif
. else
PLIST_SUB+= PREFORK="@comment " WORKER="@comment "
. endif
.else
PLIST_SUB+= PREFORK="@comment " WORKER="@comment "
.endif
# xDBM section
#
.if !defined(WITH_DBM) && defined(WITH_BERKELEYDB)
WITH_DBM=db
.endif
.if defined(WITH_DBM)
. if ${WITH_DBM:L} == "sdbm"
CONFIGURE_ARGS+= --with-dbm=sdbm
. elif ${WITH_DBM:L} == "gdbm"
LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm
CONFIGURE_ARGS+= --with-gdbm=${LOCALBASE}
. elif ${WITH_DBM:L} == "db" || defined(WITH_BERKELEYDB)
. if !defined(WITH_BERKELEYDB)
LIB_DEPENDS= db4:${PORTSDIR}/databases/db4
CONFIGURE_ARGS+= --with-dbm=db4 \
--with-berkeley-db=${LOCALBASE}
. elif ${WITH_BERKELEYDB} == "db2"
LIB_DEPENDS= db2:${PORTSDIR}/databases/db2
CONFIGURE_ARGS+= --with-dbm=db2 \
--with-berkeley-db=${LOCALBASE}
. elif ${WITH_BERKELEYDB} == "db3"
LIB_DEPENDS= db2:${PORTSDIR}/databases/db3
CONFIGURE_ARGS+= --with-dbm=db3 \
--with-berkeley-db=${LOCALBASE}
. elif ${WITH_BERKELEYDB} == "db4"
LIB_DEPENDS= db4:${PORTSDIR}/databases/db4
CONFIGURE_ARGS+= --with-dbm=db4 \
--with-berkeley-db=${LOCALBASE}
. else
BROKEN= "Unknown Berkeley DB version"
. endif
. else
BROKEN= "Unknown DBM"
. endif
.else
CONFIGURE_ARGS+= --with-dbm=sdbm
.endif
# Modules section:
# How does it works ?
# << TO BE WRITTEN >>
# All supported modules
AUTH_MODULES= auth auth_anon auth_dbm auth_digest
DAV_MODULES= dav dav_fs
EXPERIMENTAL_MODULES= bucketeer case_filter case_filter_in ext_filter charset_lite \
optional_hook_export optional_hook_import \
optional_fn_import optional_fn_export
LDAP_MODULES= ldap auth_ldap
MISC_MODULES= access actions alias asis autoindex cache cern_meta \
cgi cgid charset_lite deflate dir disk_cache env expires \
file_cache headers imap include info log_config logio mime \
mime_magic negotiation rewrite setenvif speling status \
unique_id userdir usertrack vhost_alias
PROXY_MODULES= proxy proxy_connect proxy_ftp proxy_http
SSL_MODULE= ssl
SUEXEC_MODULES= suexec
THREADS_MODULES= cache file_cache disk_cache mem_cache
# Work in progress
SLAVE_PORT_MODULES?= # If you are porting a slave port for apache2 please define SLAVE_PORT_MODULES
DEFAULT_MODULES= ${AUTH_MODULES} ${DAV_MODULES} ${MISC_MODULES} \
${PROXY_MODULES} ${SLAVE_PORT_MODULES}
AVAILABLE_MODULES= ${DEFAULT_MODULES} ${EXPERIMENTAL_MODULES} ${LDAP_MODULES} ${THREADS_MODULES} \
${SSL_MODULE} ${SUEXEC_MODULES}
# Setting "@comment " as default.
.for module in ${AVAILABLE_MODULES}
${module}_PLIST_SUB= "@comment "
.endfor
# Configure
.if defined(WITH_MODULES) && ( defined(WITHOUT_MODULES) || defined(WITH_EXTRA_MODULES))
BROKEN= "WITH_MODULES and WITHOUT_MODULES are mutually exclusive"
.endif
.if defined(WITHOUT_AUTH) || defined(WITH_CUSTOM_AUTH) || \
defined(WITHOUT_PROXY) || defined(WITH_CUSTOM_PROXY) || \
defined(WITHOUT_DAV)
CUSTOM= YES
.endif
.if !defined(WITH_STATIC_APACHE)
# FYI
#DYNAMIC_MODULES= so
CONFIGURE_ARGS+= --enable-so
.else
CONFIGURE_ARGS+= --disable-so
WITH_ALL_STATIC_MODULES= YES
.endif
### This part is not processed if WITH_MODULES is defined
.if defined(WITH_MODULES)
_APACHE_MODULES+= ${WITH_MODULES}
.elif !defined(CUSTOM)
_APACHE_MODULES+= ${DEFAULT_MODULES}
.else
. if defined(WITH_CUSTOM_AUTH)
_APACHE_MODULES+= ${WITH_CUSTOM_AUTH}
. elif !defined(WITHOUT_AUTH)
_APACHE_MODULES+= ${AUTH_MODULE}
. endif
. if defined(WITH_CUSTOM_PROXY)
_APACHE_MODULES+= ${WITH_CUSTOM_PROXY}
. elif !defined(WITHOUT_PROXY)
_APACHE_MODULES+= ${PROXY_MODULES}
. endif
. if !defined(WITHOUT_DAV)
_APACHE_MODULES+= dav dav_fs
. endif
_APACHE_MODULES+= ${MISC_MODULES} ${SLAVE_PORT_MODULES}
.endif # end of module selection
.if defined (WITH_LDAP)
_APACHE_MODULES+= ${LDAP_MODULES}
.endif
.if defined(WITH_THREADS)
CONFIGURE_ARGS+= --enable-threads
CFLAGS+= -DFREEBSD_THREAD_HACK
. if !defined(WITH_CUSTOM_THREADS)
_APACHE_MODULES+= ${THREAD_MODULES}
. else
_APACHE_MODULES+= ${WITH_CUSTOM_THREADS}
. endif
.endif # endif of module selection
.if !defined(WITHOUT_SSL)
_APACHE_MODULES+= ${SSL_MODULE}
CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE}
RC_SUB+= -e 's,@@SSL@@,ssl,g'
.else
RC_SUB+= -e 's,@@SSL@@,,g'
.endif
.if defined(WITH_SUEXEC)
SUEXEC_DOCROOT?= ${PREFIX_RELDEST}/www/data
SUEXEC_USERDIR?= public_html
SUEXEC_SAFEPATH?= ${PREFIX_RELDEST}/bin:${LOCALBASE}/bin:/usr/bin:/bin
_APACHE_MODULES+= ${SUEXEC_MODULES}
CONFIGURE_ARGS+= --with-suexec-caller=www \
--with-suexec-uidmin=1000 --with-suexec-gidmin=1000 \
--with-suexec-userdir="${SUEXEC_USERDIR}" \
--with-suexec-docroot="${SUEXEC_DOCROOT}" \
--with-suexec-safepath="${SUEXEC_SAFEPATH}" \
--with-suexec-logfile="/var/log/httpd-suexec.log" \
--with-suexec-bin="${PREFIX_RELDEST}/sbin/suexec"
.endif
.if defined(WITH_EXTRA_MODULES)
_APACHE_MODULES+= ${WITH_EXTRA_MODULES}
.endif
.if defined(WITH_EXPERIMENTAL)
_APACHE_MODULES+= ${EXPERIMENTAL_MODULES}
.endif
.if !defined(WITHOUT_MODULES)
APACHE_MODULES= ${_APACHE_MODULES}
.else
APACHE_MODULES!= \
for module in ${_APACHE_MODULES}; do \
${ECHO_CMD} ${WITHOUT_MODULES} | ${GREP} -wq $${module} 2> /dev/null || \
${ECHO_CMD} $${module}; \
done
.endif
.if defined(WITH_STATIC_MODULES)
_CONFIGURE_ARGS!= \
for module in ${APACHE_MODULES} ; do \
${ECHO_CMD} ${WITH_STATIC_MODULES} | \
${GREP} -wq $${module} 2> /dev/null ; \
if [ "$${?}" = "0" ] ; then \
${ECHO_CMD} "--enable-$${module}"; \
else \
${ECHO_CMD} "--enable-$${module}=shared"; \
fi; done
CONFIGURE_ARGS+= ${_CONFIGURE_ARGS}
.elif defined(WITH_STATIC_APACHE) || defined(WITH_ALL_STATIC_MODULES)
CONFIGURE_ARGS+= --enable-modules="${APACHE_MODULES}"
.else
CONFIGURE_ARGS+= --enable-mods-shared="${APACHE_MODULES}"
.endif
.if defined(WITH_STATIC_MODULES)
_SHARED_MODULES!= \
for module in ${APACHE_MODULES} ; do \
${ECHO_CMD} ${WITH_STATIC_MODULES} | ${GREP} -wq $${module} 2> /dev/null || \
${ECHO_CMD} $${module}; \
done
SHARED_MODULES= ${_SHARED_MODULES}
.elif !defined(WITH_ALL_STATIC_MODULES)
SHARED_MODULES= ${APACHE_MODULES}
.endif
. for module in ${SHARED_MODULES}
${module}_PLIST_SUB= ""
. endfor
.for module in ${AVAILABLE_MODULES}
PLIST_SUB+= MOD_${module:U}=${${module}_PLIST_SUB}
.endfor

2
www/apache22/distinfo
View File

@ -1,2 +0,0 @@
MD5 (apache2/httpd-2.0.48.tar.gz) = 466c63bb71b710d20a5c353df8c1a19c
MD5 (apache2/powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62

17
www/apache22/files/apache.sh
View File

@ -1,17 +0,0 @@
#!/bin/sh
PREFIX=@@PREFIX@@
case "$1" in
start)
[ "@@SSL@@" = "ssl" -a -f "$PREFIX/etc/apache2/ssl.crt/server.crt" ] && SSL=ssl
[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start${SSL} > /dev/null && echo -n ' apache2'
;;
stop)
[ -r /var/run/httpd.pid ] && ${PREFIX}/sbin/apachectl stop > /dev/null && echo -n ' apache2'
;;
*)
echo "Usage: `basename $0` {start|stop}" >&2
;;
esac
exit 0

22
www/apache22/files/config.layout
View File

@ -1,22 +0,0 @@
<Layout FreeBSD>
prefix: /usr/local
exec_prefix: ${prefix}
bindir: ${exec_prefix}/bin
sbindir: ${exec_prefix}/sbin
libexecdir: ${exec_prefix}/libexec/apache2
mandir: ${prefix}/man
sysconfdir: ${prefix}/etc/apache2
datadir: ${prefix}/www
installbuilddir: ${prefix}/share/apache2/build
errordir: ${datadir}/error
iconsdir: ${datadir}/icons
htdocsdir: ${datadir}/data
manualdir: ${prefix}/share/doc/apache2
cgidir: ${datadir}/cgi-bin
includedir: ${prefix}/include/apache2
localstatedir: /var
runtimedir: ${localstatedir}/run
logfiledir: ${localstatedir}/log
proxycachedir: ${datadir}/proxy
infodir: ${exec_prefix}/share/info
</Layout>

116
www/apache22/files/patch-Makefile.in
View File

@ -1,116 +0,0 @@
--- Makefile.in.orig Tue Jul 29 15:40:09 2003
+++ Makefile.in Tue Sep 30 00:31:14 2003
@@ -37,10 +37,13 @@
if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
$(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
fi; \
+ cp -f $$i $$i-dist; \
+ $(INSTALL_DATA) $$i-dist $(DESTDIR)$(sysconfdir); \
done; \
for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
cd $$j ; \
for i in *-std*.conf; do \
+ [ -f `echo "$$i"|sed 's,\.in$$,_nonex,g'` ] || continue; \
( \
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 \
@@ -58,6 +61,9 @@
if test "x$$j" = "xssl"; then \
echo "<IfDefine SSL>"; \
fi; \
+ if [ `echo "$$j" | egrep 'cgid|cache|dav|digest|proxy'` ]; then \
+ echo -n "#"; \
+ fi; \
if test $$j != "^EOL^"; then \
echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
fi; \
@@ -109,45 +115,41 @@
doxygen $(top_srcdir)/docs/doxygen.conf
install-htdocs:
- -@if [ -d $(DESTDIR)$(htdocsdir) ]; then \
- echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \
- else \
- echo Installing HTML documents ; \
- $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \
- test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
- cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \
- fi
+.if !defined(NO_WWWDATA)
+ @echo Installing HTML documents
+ @test -d $(DESTDIR)$(htdocsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)-dist
+ @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)-dist)
+ @test -e $(DESTDIR)$(htdocsdir) || ln -sf $(DESTDIR)$(htdocsdir)-dist $(DESTDIR)$(htdocsdir)
+ -@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir)-dist && find . -name "CVS" -print | xargs rm -rf
+.endif
install-error:
- -@if [ -d $(DESTDIR)$(errordir) ]; then \
- echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
- else \
- echo Installing error documents ; \
- $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \
- cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \
- test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \
- fi
+.if !defined(NO_ERROR)
+ @echo Installing error documents
+ @test -d $(DESTDIR)$(errordir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(errordir)-dist
+ cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir)-dist
+ -@test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir)-dist && find . -name "CVS" -print | xargs rm -rf
+ @test -e $(DESTDIR)$(errordir) || ln -sf $(DESTDIR)$(errordir)-dist $(DESTDIR)$(errordir)
+.endif
install-icons:
- -@if [ -d $(DESTDIR)$(iconsdir) ]; then \
- echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
- else \
- echo Installing icons ; \
- $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \
- cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \
- test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \
- fi
+.if !defined(NO_ICONS)
+ @echo Installing icons
+ @test -d $(DESTDIR)$(iconsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir)-dist
+ cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir)-dist
+ -@test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir)-dist && find . -name "CVS" -print | xargs rm -rf
+ @test -e $(DESTDIR)$(iconsdir) || ln -sf $(DESTDIR)$(iconsdir)-dist $(DESTDIR)$(iconsdir)
+.endif
install-cgi:
- -@if [ -d $(DESTDIR)$(cgidir) ];then \
- echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \
- else \
- echo Installing CGIs ; \
- $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \
- cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \
- test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \
- fi
-
+.if !defined(NO_CGI)
+ @echo Installing CGIs
+ @test -d $(DESTDIR)$(cgidir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)-dist
+ cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)-dist
+ -@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir)-dist && find . -name "CVS" -print | xargs rm -rf
+ @test -e $(DESTDIR)$(cgidir) || ln -sf $(DESTDIR)$(cgidir)-dist $(DESTDIR)$(cgidir)
+.endif
+
install-other:
@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
@test -d $(DESTDIR)$(runtimedir) || $(MKINSTALLDIRS) $(DESTDIR)$(runtimedir)
@@ -190,11 +192,13 @@
@test -d $(DESTDIR)$(mandir) || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)
@test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
@test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8
- @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
@cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
@cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
+.if !defined(NOPORTDOCS)
+ @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
@(cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
@(cd $(DESTDIR)$(manualdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null ) || true
+.endif
install-suexec:
@if test -f $(builddir)/support/suexec; then \

39
www/apache22/files/patch-configure
View File

@ -1,39 +0,0 @@
--- configure.orig Wed May 28 14:11:27 2003
+++ configure Fri May 30 07:47:42 2003
@@ -1513,7 +1513,7 @@
$srcdir/config.layout > $pldconf
layout_name=$LAYOUT
. $pldconf
- rm $pldconf
+ rm -f $pldconf
for var in prefix exec_prefix bindir sbindir libexecdir mandir \
sysconfdir datadir errordir iconsdir htdocsdir cgidir \
includedir localstatedir runtimedir logfiledir libdir \
@@ -2627,7 +2627,7 @@
done
- if eval $SHELL $ac_abs_srcdir/configure $apr_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir $apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir
+ if eval $SHELL $ac_abs_srcdir/configure $apr_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir $apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir --datadir=$datadir --with-installbuilddir=$installbuilddir
then :
echo "srclib/apr configured properly"
else
@@ -2928,7 +2928,7 @@
done
- if eval $SHELL $ac_abs_srcdir/configure $apr_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir --with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir
+ if eval $SHELL $ac_abs_srcdir/configure $apr_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir --with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir
then :
echo "srclib/apr-util configured properly"
else
@@ -15719,6 +15719,9 @@
cat >>confdefs.h <<_ACEOF
#define SERVER_CONFIG_FILE "${rel_sysconfdir}/${progname}.conf"
+#define DEFAULT_ERRORLOG "${rel_logfiledir}/httpd-error.log"
+#define AP_TYPES_CONFIG_FILE "${rel_sysconfdir}/mime.types"
+#define DOCUMENT_LOCATION "${rel_htdocsdir}"
_ACEOF

56
www/apache22/files/patch-docs:conf:httpd-std.conf.in
View File

@ -1,56 +0,0 @@
--- docs/conf/httpd-std.conf.in.orig Wed Apr 24 07:24:35 2002
+++ docs/conf/httpd-std.conf.in Tue May 7 19:29:28 2002
@@ -68,7 +68,7 @@
#
<IfModule !mpm_netware.c>
<IfModule !perchild.c>
-#ScoreBoardFile @rel_logfiledir@/apache_runtime_status
+#ScoreBoardFile @rel_runtimedir@/apache_runtime_status
</IfModule>
</IfModule>
@@ -263,8 +263,8 @@
# when the value of (unsigned)Group is above 60000;
# don't use Group #-1 on these systems!
#
-User nobody
-Group #-1
+User www
+Group www
</IfModule>
</IfModule>
@@ -450,7 +450,7 @@
# logged here. If you *do* define an error logfile for a <VirtualHost>
# container, that host's errors will be logged there and not here.
#
-ErrorLog @rel_logfiledir@/error_log
+ErrorLog @rel_logfiledir@/httpd-error.log
#
# LogLevel: Control the number of messages logged to the error_log.
@@ -475,20 +475,20 @@
# define per-<VirtualHost> access logfiles, transactions will be
# logged therein and *not* in this file.
#
-CustomLog @rel_logfiledir@/access_log common
+#CustomLog @rel_logfiledir@/httpd-access.log common
#
# If you would like to have agent and referer logfiles, uncomment the
# following directives.
#
-#CustomLog @rel_logfiledir@/referer_log referer
-#CustomLog @rel_logfiledir@/agent_log agent
+#CustomLog @rel_logfiledir@/httpd-referer.log referer
+#CustomLog @rel_logfiledir@/httpd-agent.log agent
#
# If you prefer a single logfile with access, agent, and referer information
# (Combined Logfile Format) you can use the following directive.
#
-#CustomLog @rel_logfiledir@/access_log combined
+CustomLog @rel_logfiledir@/httpd-access.log combined
#
# Optionally add a line containing the server version and virtual host

24
www/apache22/files/patch-docs:conf:ssl-std.conf.in
View File

@ -1,24 +0,0 @@
$FreeBSD$
--- docs/conf/ssl-std.conf.in.orig Mon Oct 13 16:14:10 2003
+++ docs/conf/ssl-std.conf.in Mon Oct 13 16:15:17 2003
@@ -88,8 +88,8 @@
DocumentRoot "@exp_htdocsdir@"
ServerName www.example.com:443
ServerAdmin you@example.com
-ErrorLog @exp_logfiledir@/error_log
-TransferLog @exp_logfiledir@/access_log
+ErrorLog @exp_logfiledir@/httpd-error.log
+TransferLog @exp_logfiledir@/httpd-access.log
# SSL Engine Switch:
# Enable/Disable SSL for this virtual host.
@@ -240,7 +240,7 @@
# Per-Server Logging:
# The home of a custom SSL log file. Use this when you want a
# compact non-error SSL logfile on a virtual host basis.
-CustomLog @exp_logfiledir@/ssl_request_log \
+CustomLog @exp_logfiledir@/httpd-ssl_request.log \
"%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
</VirtualHost>

36
www/apache22/files/patch-server:main.c
View File

@ -1,36 +0,0 @@
--- server/main.c.orig Thu Jun 13 04:34:56 2002
+++ server/main.c Sun Jul 21 08:54:09 2002
@@ -78,6 +78,11 @@
#include "ap_mpm.h"
#include "mpm_common.h"
+#ifdef FREEBSD_THREAD_HACK
+#include <unistd.h>
+AP_DECLARE(int) ap_exists_config_define(const char *name);
+#endif
+
/* WARNING: Win32 binds http_main.c dynamically to the server. Please place
* extern functions and global data in another appropriate module.
*
@@ -558,6 +563,21 @@
destroy_and_exit_process(process, 1);
}
+#ifdef FREEBSD_THREAD_HACK
+ {
+ int r;
+
+ if (! ap_exists_config_define("NO_DETACH")) {
+ if ((r = fork()) > 0)
+ return 0;
+ if (r == -1) {
+ perror("fork");
+ return 0;
+ }
+ setsid();
+ }
+ }
+#endif
ap_process_config_tree(server_conf, ap_conftree, process->pconf, ptemp);
ap_fixup_virtual_hosts(pconf, server_conf);
ap_fini_vhost_config(pconf, server_conf);

10
www/apache22/files/patch-srclib:apr-util:config.layout
View File

@ -1,10 +0,0 @@
--- srclib/apr-util/config.layout.orig Tue Jan 7 13:13:09 2003
+++ srclib/apr-util/config.layout Tue Apr 1 18:36:16 2003
@@ -229,3 +229,7 @@
infodir: ${exec_prefix}/share/info
libsuffix -${APRUTIL_MAJOR_VERSION}
</Layout>
+
+<Layout FreeBSD>
+ libsuffix:
+</Layout>

10
www/apache22/files/patch-srclib:apr:config.layout
View File

@ -1,10 +0,0 @@
--- srclib/apr/config.layout.orig Tue Jan 7 13:06:50 2003
+++ srclib/apr/config.layout Tue Apr 1 18:36:51 2003
@@ -229,3 +229,7 @@
infodir: ${exec_prefix}/share/info
libsuffix: -${APR_MAJOR_VERSION}
</Layout>
+
+<Layout FreeBSD>
+ libsuffix:
+</Layout>

18
www/apache22/files/patch-srclib:apr:threadproc:unix:procsup.c
View File

@ -1,18 +0,0 @@
--- srclib/apr/threadproc/unix/procsup.c.orig Mon Apr 8 22:08:18 2002
+++ srclib/apr/threadproc/unix/procsup.c Sun Jul 21 08:45:44 2002
@@ -59,6 +59,7 @@
int x;
chdir("/");
+#ifndef FREEBSD_THREAD_HACK
#if !defined(MPE) && !defined(OS2) && !defined(TPF) && !defined(BEOS)
/* Don't detach for MPE because child processes can't survive the death of
* the parent. */
@@ -89,6 +90,7 @@
if (setpgid(0, 0) == -1) {
return errno;
}
+#endif
#endif
/* close out the standard file descriptors */

21
www/apache22/files/patch-support:apachectl.in
View File

@ -1,21 +0,0 @@
--- support/apachectl.in.orig Mon May 27 20:46:01 2002
+++ support/apachectl.in Thu Jul 11 21:12:36 2002
@@ -31,8 +31,8 @@
HTTPD='@exp_sbindir@/@progname@'
#
# pick up any necessary environment variables
-if test -f @exp_bindir@/envvars; then
- . @exp_bindir@/envvars
+if test -f @exp_sbindir@/envvars; then
+ . @exp_sbindir@/envvars
fi
#
# a command that outputs a formatted text version of the HTML at the
@@ -46,6 +46,7 @@
#
# -------------------- --------------------
# |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
+eval `limits -e -C daemon` >/dev/null 2>&1
ERROR=0
if [ "x$ARGV" = "x" ] ; then

20
www/apache22/files/patch-support:log_server_status.in
View File

@ -1,20 +0,0 @@
--- support/log_server_status.in.orig Tue Jun 18 23:21:53 2002
+++ support/log_server_status.in Tue Jun 18 23:23:08 2002
@@ -63,7 +63,7 @@
#
require 'sys/socket.ph';
-$wherelog = "/var/log/graph/"; # Logs will be like "/var/log/graph/19960312"
+$wherelog = "@logfiledir@/httpd-status-"; # Logs will be like "/var/log/httpd-status-19960312.log"
$server = "localhost"; # Name of server, could be "www.foo.com"
$port = "80"; # Port on server
$request = "/status/?auto"; # Request to send
@@ -96,7 +96,7 @@
chomp($date);
($day,$time)=split(/:/,$date);
$res=&tcp_connect($server,$port);
- open(OUT,">>$wherelog$day");
+ open(OUT,">>$wherelog$day.log");
if ($res) {
print OUT "$time:-1:-1:-1:-1:$res\n";
exit 1;

6
www/apache22/pkg-descr
View File

@ -1,6 +0,0 @@
Apache is an HTTP server designed as a plug-in replacement for the NCSA
server version 1.3 (or 1.4). It fixes numerous bugs in the NCSA server and
includes many frequently requested new features, and has an API which
allows it to be extended to meet users' needs more easily.
WWW: http://www.apache.org/

35
www/apache22/pkg-install
View File

@ -1,35 +0,0 @@
#!/bin/sh
# $FreeBSD$
#
if [ "$2" != "PRE-INSTALL" ]; then
exit 0
fi
USER=www
GROUP=${USER}
UID=80
GID=${UID}
if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
if pw groupadd ${GROUP} -g ${GID}; then
echo "Added group \"${GROUP}\"."
else
echo "Adding group \"${GROUP}\" failed..."
exit 1
fi
fi
if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-s "/sbin/nologin" -d "/nonexistent" \
-c "World Wide Web Owner"; \
then
echo "Added user \"${USER}\"."
else
echo "Adding user \"${USER}\" failed..."
exit 1
fi
fi
exit 0

1557
www/apache22/pkg-plist
View File

File diff suppressed because it is too large Load Diff