summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2006-02-21 22:44:17 +0000
committerwiz <wiz@pkgsrc.org>2006-02-21 22:44:17 +0000
commit71e36d36caf935c873c21e3804fae73f74bce023 (patch)
tree7e8d91374c50e79aa1a7526a9b497da30abb6989 /www
parenta1ae32805cb1400b04520bb280ff7ff5a1344b87 (diff)
downloadpkgsrc-71e36d36caf935c873c21e3804fae73f74bce023.tar.gz
Fix config file handling; fix CHECK_PLIST build. Bump PKGREVISION.
Diffstat (limited to 'www')
-rw-r--r--www/apache/Makefile6
-rw-r--r--www/apache/distinfo4
-rw-r--r--www/apache/patches/patch-aa27
3 files changed, 30 insertions, 7 deletions
diff --git a/www/apache/Makefile b/www/apache/Makefile
index 15a6c9a9632..cb8cd65e44a 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.182 2006/02/05 23:11:18 joerg Exp $
+# $NetBSD: Makefile,v 1.183 2006/02/21 22:44:17 wiz Exp $
#
# 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.34
PKGNAME= ${DISTNAME:S/_/-/}
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \
${MASTER_SITE_APACHE:=httpd/old/}
@@ -140,7 +140,7 @@ RCD_SCRIPTS= apache
REQD_DIRS= ${PREFIX}/share/httpd
REQD_DIRS+= ${PREFIX}/share/httpd/htdocs
-OWN_DIRS+= ${PREFIX}/lib/httpd
+REQD_DIRS+= ${PREFIX}/lib/httpd
OWN_DIRS+= ${VARBASE}/httpd
OWN_DIRS+= ${VARBASE}/log/httpd
OWN_DIRS_PERMS+= ${VARBASE}/httpd/proxy ${APACHE_USER} ${APACHE_GROUP} 0755
diff --git a/www/apache/distinfo b/www/apache/distinfo
index afbbaab8df4..615b80e9c9a 100644
--- a/www/apache/distinfo
+++ b/www/apache/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.50 2006/01/09 13:40:34 joerg Exp $
+$NetBSD: distinfo,v 1.51 2006/02/21 22:44:17 wiz Exp $
SHA1 (apache_1.3.34.tar.gz) = df082b73f1220555dc416c0c5afa746e30a9e0de
RMD160 (apache_1.3.34.tar.gz) = e39dfc57b7f9164aa76641de3fa74f0314c9ec9e
@@ -9,7 +9,7 @@ Size (sitedrivenby.gif) = 8519 bytes
SHA1 (mod_ssl-2.8.25-1.3.34.tar.gz) = 150f726539d74c0d2af02e482be78bbcdb811395
RMD160 (mod_ssl-2.8.25-1.3.34.tar.gz) = 90a3913d30c7f4d194907463125c90101005837a
Size (mod_ssl-2.8.25-1.3.34.tar.gz) = 820352 bytes
-SHA1 (patch-aa) = ae280b14dc0102ecfbe3675ca0b5d2b74ee790ca
+SHA1 (patch-aa) = 28302d0f95ff345fb9c4cc3306e910bfaca82cef
SHA1 (patch-ab) = 084d52bb2afbacf18b9d0793293d8ae333c67802
SHA1 (patch-ac) = b961c90a58a94f48daff417af146df98d5ec428c
SHA1 (patch-ad) = c02cd1af3c4b5e0d49aaa7f0eff20a8d76a633aa
diff --git a/www/apache/patches/patch-aa b/www/apache/patches/patch-aa
index b76dc82312a..ef181d4c380 100644
--- a/www/apache/patches/patch-aa
+++ b/www/apache/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.24 2004/10/29 13:48:31 abs Exp $
+$NetBSD: patch-aa,v 1.25 2006/02/21 22:44:17 wiz Exp $
---- Makefile.tmpl.orig 2004-10-29 14:44:35.000000000 +0100
+--- Makefile.tmpl.orig 2006-02-21 12:27:34.000000000 +0000
+++ Makefile.tmpl
@@ -56,6 +56,8 @@ INSTALL_DATA = $(INSTALL) $(IFLAGS_DA
PERL = @PERL@
@@ -156,3 +156,26 @@ $NetBSD: patch-aa,v 1.24 2004/10/29 13:48:31 abs Exp $
if [ .$$conf = .httpd.conf ]; then \
target_conf="$(TARGET).conf"; \
else \
+@@ -583,22 +558,10 @@ install-config:
+ > $(TOP)/$(SRC)/.apaci.install.tmp && \
+ echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}.default"; \
+ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}.default; \
+- if [ ! -f "$(root)$(sysconfdir)/$${target_conf}" ]; then \
+- echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}"; \
+- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}; \
+- else \
+- echo "[PRESERVING EXISTING CONFIG FILE: $(root)$(sysconfdir)/$${target_conf}]"; \
+- fi; \
+ done
+ -@for conf in mime.types magic; do \
+ echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default"; \
+ $(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default; \
+- if [ ! -f "$(root)$(sysconfdir)/$${conf}" ]; then \
+- echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}"; \
+- $(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}; \
+- else \
+- echo "[PRESERVING EXISTING CONFIG FILE: $(root)$(sysconfdir)/$${conf}]"; \
+- fi; \
+ done
+ -@if [ ".$(ssl)" = .1 ]; then \
+ echo "chmod 755 $(root)$(sysconfdir)/ssl.crt"; \