summaryrefslogtreecommitdiff
path: root/www/apache/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'www/apache/Makefile')
-rw-r--r--www/apache/Makefile98
1 files changed, 58 insertions, 40 deletions
diff --git a/www/apache/Makefile b/www/apache/Makefile
index 9cf596d24e9..aaef885333e 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,65 +1,83 @@
-# $NetBSD: Makefile,v 1.24 1998/11/12 23:54:33 frueauf Exp $
+# $NetBSD: Makefile,v 1.25 1998/12/03 17:23:52 tv Exp $
#
-# The apache-modssl pkg .include's us, so that pkg tuning rules work for
-# both without a major duplication of Makefiles. So we use ?= and += in
-# many of the constructs up here at top.
+# The fourth number in the PKGNAME version indicates a NetBSD pkg revision
+# (to indicate changes in the shipped third party patches such as the mod_ssl
+# EAPI when there has been no change to the Apache version number).
#
+# This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
+# code hooks that allow mod_ssl to be compiled separately later, if desired).
+#
+
+DISTNAME= apache_1.3.3
+PKGNAME= apache-1.3.3.0
+CATEGORIES= www
+MASTER_SITES= http://www.apache.org/dist/ \
+ http://www.engelschall.com/sw/mod_ssl/distrib/ \
+ http://www.netbsd.org/images/logos/
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
+ ${SSL_DISTNAME}${EXTRACT_SUFX} \
+ sitedrivenby.gif
-DISTNAME= apache_1.3.2
-PKGNAME= apache-1.3.2
-CATEGORIES= www
-MASTER_SITES+= http://www.apache.org/dist/ \
- http://www.netbsd.org/images/logos/
-DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} \
- sitedrivenby.gif
+MAINTAINER= cjs@netbsd.org
+HOMEPAGE= http://www.apache.org/
-MAINTAINER= cjs@netbsd.org
-HOMEPAGE= http://www.apache.org/
+CONFLICTS= apache-1.3.[012] apache-*modssl-*
-EXTRACT_ONLY+= ${DISTNAME}${EXTRACT_SUFX}
-CONFLICTS?= apache-1.3.0 apache-1.3.1 apache-modssl-1.3.1 apache-modssl-1.3.2.2012
-HAS_CONFIGURE= YES
-CONFIGURE_ARGS+=--compat --prefix=${PREFIX}/http --exec-prefix=${PREFIX} \
- --mandir=${PREFIX}/man --libexecdir=${PREFIX}/lib/apache \
- --sbindir=${PREFIX}/sbin --runtimedir=/var/run \
- --enable-module=most --enable-module=auth_db \
- --disable-module=auth_dbm --with-perl=${PREFIX}/bin/perl
-CONFIGURE_ENV+= OPTIM='${OPTIM}'
-OPTIM= -DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin:/usr/local/bin\\"
+SSL_DISTNAME= mod_ssl-2.1.2-1.3.3
+
+EXTRACT_ONLY= ${DISTFILES:N*.gif}
+HAS_CONFIGURE= YES
+CONFIGURE_ARGS+= --prefix=${PREFIX} --libexecdir=${PREFIX}/lib/httpd \
+ --runtimedir=/var/run --datadir=${PREFIX}/share/httpd \
+ --logfiledir=/var/log/httpd --sysconfdir=${PREFIX}/etc/httpd \
+ --proxycachedir=/var/spool/httpd/proxy \
+ --includedir=${PREFIX}/include/httpd \
+ --enable-rule=EAPI --enable-module=most \
+ --disable-module=ssl --enable-module=auth_db \
+ --disable-module=auth_dbm \
+ --with-perl=${PREFIX}/bin/perl
+CONFIGURE_ENV+= OPTIM="${OPTIM}"
.if defined(APACHE_SUEXEC)
-CONFIGURE_ARGS+=--enable-suexec --suexec-caller=www \
- --suexec-userdir=WWW \
- --suexec-safepath='${PREFIX}/bin:/usr/local/bin:/usr/bin:/bin'
+CONFIGURE_ARGS+= --enable-suexec --suexec-caller=www \
+ --suexec-userdir=WWW \
+ --suexec-safepath='/bin:/usr/bin:${PREFIX}/bin:/usr/local/bin'
.endif
.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
-CONFIGURE_ARGS+=--disable-rule=STATUS
-OPTIM+= -DBUFFERED_LOGS
-CFLAGS+= -O6 -fomit-frame-pointer -fexpensive-optimizations
+CONFIGURE_ARGS+= --disable-rule=STATUS
+OPTIM+= -DBUFFERED_LOGS
+CFLAGS+= -O6 -fomit-frame-pointer -fexpensive-optimizations
.endif
# Note that there is NO static compile module hook here. This is intentional.
# Under Apache 1.3, modules can be compiled to link dynamically to the server
# using the "apxs" program. See apxs(8).
+post-extract:
+ @${CP} ${FILESDIR}/ap_include_extern.h ${WRKSRC}/src/include/
+ @${CP} ${WRKDIR}/${SSL_DISTNAME}/pkg.eapi/*.c ${WRKSRC}/src/ap/
+ @${CP} ${WRKDIR}/${SSL_DISTNAME}/pkg.eapi/*.h ${WRKSRC}/src/include/
+
+pre-patch:
+ @cd ${WRKSRC} && ${CAT} \
+ ../${SSL_DISTNAME}/pkg.eapi/eapi.patch \
+ ../${SSL_DISTNAME}/pkg.sslcfg/sslcfg.patch \
+ ../${SSL_DISTNAME}/pkg.sslmod/sslmod.patch \
+ ../${SSL_DISTNAME}/pkg.sslsup/sslsup.patch \
+ | ${PATCH} ${PATCH_ARGS}
post-patch:
+ @cd ${WRKSRC}/src/include && \
+ ${SED} -e s,@@PREFIX@@,${PREFIX}, ap_config.h >tmp && \
+ ${MV} -f tmp ap_config.h
@find ${WRKSRC}/htdocs -name '*.orig' | xargs ${RM}
post-install:
- ${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/http/htdocs
+ ${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs
+ ${INSTALL_DATA_DIR} ${PREFIX}/lib/httpd
.include "../../mk/bsd.pkg.mk"
-# Define some modules that are often replaced as shared modules that can be
-# changed at runtime. This allows an apxs-compiled .so to be "dropped in"
-# without even changing httpd.conf.
-# Only those defined here should be in PLIST-mi.shared.
-
.if !defined(NOPIC)
-CONFIGURE_ARGS+=--enable-module=so --enable-shared=include
-.endif
-
-.if (${SHLIB_TYPE} == "ELF")
-CONFIGURE_ENV+= LDFLAGS_SHLIB_EXPORT=-Wl,--export-dynamic
+CONFIGURE_ARGS+= --enable-module=so
.endif