summaryrefslogtreecommitdiff
path: root/www/apache2
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2006-08-30 06:16:27 +0000
committerrillig <rillig@pkgsrc.org>2006-08-30 06:16:27 +0000
commit6a855c871d897057406fe6c34521f845844d612a (patch)
tree94ad76613e59bc9d390f92a1f242e3ace9597b6d /www/apache2
parent4ee2cb47d0372846c000210246a7eb5412d4aada (diff)
downloadpkgsrc-6a855c871d897057406fe6c34521f845844d612a.tar.gz
The directories for configuration files and log files are now set in the
config.layout file instead of CONFIGURE_ARGS, to avoid defining things twice. No actual change, since the paths are still the same. Added all necessary variables to BUILD_DEFS, as reported by pkglint.
Diffstat (limited to 'www/apache2')
-rw-r--r--www/apache2/Makefile8
-rw-r--r--www/apache2/distinfo4
-rw-r--r--www/apache2/options.mk5
-rw-r--r--www/apache2/patches/patch-ad6
4 files changed, 14 insertions, 9 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 0c7c69cd9a4..53074f386df 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.104 2006/07/28 13:35:37 tron Exp $
+# $NetBSD: Makefile,v 1.105 2006/08/30 06:16:27 rillig Exp $
.include "Makefile.common"
@@ -12,13 +12,12 @@ COMMENT= Apache HTTP (Web) server, version 2
CONFLICTS= apache-*ssl-[0-9]* apache-[0-9]* apache6-[0-9]*
BUILD_DEFS+= USE_INET6
+BUILD_DEFS+= VARBASE
USE_TOOLS+= perl perl:run pkg-config
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-layout=NetBSD
-CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ARGS+= --with-port=80
CONFIGURE_ARGS+= --enable-so
CONFIGURE_ENV+= perlbin=${PERL5:Q}
@@ -94,6 +93,7 @@ APACHE_USER?= www
APACHE_GROUP?= www
PKG_GROUPS= ${APACHE_GROUP}
PKG_USERS= ${APACHE_USER}:${APACHE_GROUP}
+BUILD_DEFS+= APACHE_USER APACHE_GROUP
PKG_SYSCONFVAR= apache
PKG_SYSCONFSUBDIR?= httpd
@@ -130,6 +130,8 @@ SUBST_CLASSES+= paths
SUBST_STAGE.paths= pre-configure
SUBST_FILES.paths= config.layout
SUBST_SED.paths= -e "s|@PREFIX@|${PREFIX}|g"
+SUBST_SED.paths+= -e "s|@VARBASE@|${VARBASE}|g"
+SUBST_SED.paths+= -e "s|@SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
SUBST_MESSAGE.paths= Fixing paths.
SUBST_CLASSES+= apr-lt
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index e075462c5c2..38778eab5f5 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.48 2006/07/28 10:38:36 tron Exp $
+$NetBSD: distinfo,v 1.49 2006/08/30 06:16:27 rillig Exp $
SHA1 (httpd-2.0.59.tar.bz2) = 908209cd6e52f700d2a841a25de36e44d469c376
RMD160 (httpd-2.0.59.tar.bz2) = 78b802354e338798a6978ece8b3568be97542174
@@ -6,7 +6,7 @@ Size (httpd-2.0.59.tar.bz2) = 4743549 bytes
SHA1 (patch-aa) = bff1ef591f5361e7169ff9005dcf86437b9dac23
SHA1 (patch-ab) = 387892276efd49fd081a187c1123de26fb6486ba
SHA1 (patch-ac) = 515043b5c215d49fe8f6d3191b502c978e2a2dad
-SHA1 (patch-ad) = 8c6f62346ffb5069de89a50516a3da2c6104e09b
+SHA1 (patch-ad) = 088d6ff0e7a8acfe70b4f85a6ce58d42c935fd13
SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01
SHA1 (patch-ai) = 4dc88c15b0525a5aabc80d5c2a0720cd260629de
SHA1 (patch-ak) = f11a86b1235d5c595fa381bbb474db4fe8448215
diff --git a/www/apache2/options.mk b/www/apache2/options.mk
index ccc93de01a5..8e01c928110 100644
--- a/www/apache2/options.mk
+++ b/www/apache2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2006/07/28 10:38:36 tron Exp $
+# $NetBSD: options.mk,v 1.5 2006/08/30 06:16:27 rillig Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.apache
PKG_SUPPORTED_OPTIONS= suexec
@@ -6,6 +6,9 @@ PKG_SUPPORTED_OPTIONS= suexec
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Msuexec)
+BUILD_DEFS+= VARBASE APACHE_USER APACHE_SUEXEC_PATH
+BUILD_DEFS+= APACHE_SUEXEC_DOCROOT APACHE_SUEXEC_LOGFILE
+
APACHE_SUEXEC_DOCROOT?= ${PREFIX}/share/httpd/htdocs
APACHE_SUEXEC_PATH= /bin:/usr/bin:${PREFIX}/bin:/usr/local/bin
APACHE_SUEXEC_LOGFILE?= ${VARBASE}/log/httpd/suexec.log
diff --git a/www/apache2/patches/patch-ad b/www/apache2/patches/patch-ad
index 13cd338ef48..a2137450ac6 100644
--- a/www/apache2/patches/patch-ad
+++ b/www/apache2/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.7 2005/04/25 09:13:14 adam Exp $
+$NetBSD: patch-ad,v 1.8 2006/08/30 06:16:27 rillig Exp $
--- config.layout.orig 2004-11-24 19:31:09.000000000 +0000
+++ config.layout
@@ -15,7 +15,7 @@ $NetBSD: patch-ad,v 1.7 2005/04/25 09:13:14 adam Exp $
+ sbindir: ${exec_prefix}/sbin
+ libexecdir: ${exec_prefix}/lib/httpd
+ mandir: ${prefix}/man
-+ sysconfdir: ${prefix}/etc/httpd
++ sysconfdir: @SYSCONFDIR@
+ datadir: ${prefix}/share/httpd
+ installbuilddir: ${datadir}/build
+ errordir: ${datadir}/error
@@ -24,7 +24,7 @@ $NetBSD: patch-ad,v 1.7 2005/04/25 09:13:14 adam Exp $
+ manualdir: ${datadir}/manual
+ cgidir: ${exec_prefix}/libexec/cgi-bin
+ includedir: ${prefix}/include/httpd
-+ localstatedir: /var
++ localstatedir: @VARBASE@
+ runtimedir: ${localstatedir}/run
+ logfiledir: ${localstatedir}/log/httpd
+ proxycachedir: ${localstatedir}/db/httpd/proxy