aboutsummaryrefslogtreecommitdiff
path: root/www/apache13+ipv6/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'www/apache13+ipv6/Makefile')
-rw-r--r--www/apache13+ipv6/Makefile64
1 files changed, 43 insertions, 21 deletions
diff --git a/www/apache13+ipv6/Makefile b/www/apache13+ipv6/Makefile
index 7db355dede1c..b681bd4553d1 100644
--- a/www/apache13+ipv6/Makefile
+++ b/www/apache13+ipv6/Makefile
@@ -6,35 +6,48 @@
#
PORTNAME= apache+ipv6
-PORTVERSION= 1.3.27
+PORTVERSION= 1.3.28
CATEGORIES= www ipv6
-MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
+MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
DISTNAME= apache_${PORTVERSION}
-PATCH_SITES= http://motoyuki.bsdclub.org/data/IPv6/
-PATCHFILES= apache-1.3.27-v6-20021004.diff.gz
+PATCH_SITES= http://www.tendra.org/~asmodai/ipv6/
+PATCHFILES= apache-1.3.28-v6-20030912.diff.gz
MAINTAINER= sumikawa@FreeBSD.org
COMMENT= The extremely popular Apache http server. Very fast, very clean
-USE_PERL5= yes
+USE_PERL5= yes
DATADIR=${PREFIX}/www
DOCUMENT_ROOT=${DATADIR}/data
DEFAULT_PATH=/bin:/usr/bin:${PREFIX}/bin
+.if defined(WITHOUT_APACHE_EXPAT) && ${WITHOUT_APACHE_EXPAT} == yes
+EXPAT_CONF+= --disable-rule=EXPAT
+.else
+.if !defined(WITH_APACHE_INTERNAL_EXPAT) || ${WITH_APACHE_INTERNAL_EXPAT} != yes
+LIB_DEPENDS+= expat.4:${PORTSDIR}/textproc/expat2
+.endif
+EXPAT_CONF+= --enable-rule=EXPAT
+.endif
+
.if defined(WITH_APACHE_SUEXEC) && ${WITH_APACHE_SUEXEC} == yes
APACHE_SUEXEC_DOCROOT?=${DOCUMENT_ROOT}
+APACHE_SUEXEC_LOG?=/var/log/httpd-suexec.log
APACHE_SUEXEC_USERDIR?=public_html
+APACHE_SUEXEC_UIDMIN?=1000
+APACHE_SUEXEC_GIDMIN?=1000
+APACHE_SUEXEC_CALLER?=www
SUEXEC_CONF= \
--enable-suexec \
--suexec-docroot=${APACHE_SUEXEC_DOCROOT} \
- --suexec-caller=www \
- --suexec-uidmin=1000 \
- --suexec-gidmin=1000 \
- --suexec-logfile=/var/log/httpd-suexec.log \
+ --suexec-caller=${APACHE_SUEXEC_CALLER} \
+ --suexec-uidmin=${APACHE_SUEXEC_UIDMIN} \
+ --suexec-gidmin=${APACHE_SUEXEC_GIDMIN} \
+ --suexec-logfile=${APACHE_SUEXEC_LOG} \
--suexec-userdir=${APACHE_SUEXEC_USERDIR} \
--suexec-safepath=${DEFAULT_PATH}
@@ -54,7 +67,7 @@ SUEXEC_MAN=
.endif # !SUEXEC
-HAS_CONFIGURE= yes
+HAS_CONFIGURE= yes
# += for child ports
CONFIGURE_ARGS+= \
--prefix=${PREFIX} \
@@ -69,29 +82,38 @@ CONFIGURE_ARGS+= \
--enable-module=mmap_static \
--disable-module=auth_dbm \
--enable-shared=max \
- ${SUEXEC_CONF}
+ ${SUEXEC_CONF} \
+ ${EXPAT_CONF}
-OPTIM= -DDOCUMENT_LOCATION=\\"${DOCUMENT_ROOT}\\" \
- -DDEFAULT_PATH=\\"${DEFAULT_PATH}\\"
+CFLAGS+=-DDOCUMENT_LOCATION=\\\\\"${DOCUMENT_ROOT}\\\\\" \
+ -DDEFAULT_PATH=\\\\\"${DEFAULT_PATH}\\\\\"
#
# Set APACHE_HARD_SERVER_LIMIT env. variable to desired value
#
.if defined(APACHE_HARD_SERVER_LIMIT)
-OPTIM+= -DHARD_SERVER_LIMIT=${APACHE_HARD_SERVER_LIMIT}
+CFLAGS+=-DHARD_SERVER_LIMIT=${APACHE_HARD_SERVER_LIMIT}
.else
-OPTIM+= -DHARD_SERVER_LIMIT=512
+CFLAGS+=-DHARD_SERVER_LIMIT=512
.endif
#
-# Set WITH_APACHE_PERF_TUNING env. variable to YES to get maximum performance
+# Set WITH_APACHE_PERF_TUNING env. variable to yes to get maximum performance
#
-.if defined(WITH_APACHE_PERF_TUNING) && ${WITH_APACHE_PERF_TUNING} == YES
-OPTIM+= -DBUFFERED_LOGS
-CFLAGS+= -O6 -fomit-frame-pointer
+.if defined(WITH_APACHE_PERF_TUNING) && ${WITH_APACHE_PERF_TUNING} == yes
+CFLAGS+=-DBUFFERED_LOGS
+# Don't use OPTIM below, it is inserted _before_ CFLAGS
+CFLAGS+=-O6 -fomit-frame-pointer
.endif
-CONFIGURE_ENV= OPTIM='${OPTIM}' LD_SHLIB='${CC}'
+CONFIGURE_ENV= OPTIM='${OPTIM}' LD_SHLIB='${CC}' LIBS='${LIBS}'
+
+.if (!defined(WITHOUT_APACHE_EXPAT) || ${WITHOUT_APACHE_EXPAT} != yes) && \
+ (!defined(WITH_APACHE_INTERNAL_EXPAT) || ${WITH_APACHE_INTERNAL_EXPAT} != yes)
+CONFIGURE_ENV+= \
+ INCLUDES=-I${LOCALBASE}/include \
+ LDFLAGS=-L${LOCALBASE}/lib
+.endif
MAN1= dbmmanage.1 htdigest.1 htpasswd.1
MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 \
@@ -102,7 +124,7 @@ post-extract:
> ${WRKSRC}/apache.sh
pre-install:
- PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
+ PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
${INSTALL_DATA} ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh-dist