summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/apache24/Makefile6
-rw-r--r--www/apache24/PLIST7
-rw-r--r--www/apache24/buildlink3.mk6
-rw-r--r--www/apache24/distinfo8
4 files changed, 17 insertions, 10 deletions
diff --git a/www/apache24/Makefile b/www/apache24/Makefile
index 6dd1244e85d..c23d7b45b59 100644
--- a/www/apache24/Makefile
+++ b/www/apache24/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2013/07/30 12:51:29 ryoon Exp $
+# $NetBSD: Makefile,v 1.22 2013/12/01 10:02:34 ryoon Exp $
-DISTNAME= httpd-2.4.6
+DISTNAME= httpd-2.4.7
PKGNAME= ${DISTNAME:S/httpd/apache/}
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \
@@ -33,7 +33,9 @@ CONFIGURE_ENV+= CFLAGS=${APACHE_CUSTOM_CFLAGS:M*:Q}
CFLAGS.SunOS+= -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__
.include "../../mk/bsd.prefs.mk"
+BUILDLINK_API_DEPENDS.apr+= apr>=1.5.0
.include "../../devel/apr/buildlink3.mk"
+BUILDLINK_API_DEPENDS.apr-util+= apr-util>=1.5.3
.include "../../devel/apr-util/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
diff --git a/www/apache24/PLIST b/www/apache24/PLIST
index 3574f44dfbb..e230a6b86eb 100644
--- a/www/apache24/PLIST
+++ b/www/apache24/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2013/07/30 12:51:29 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.12 2013/12/01 10:02:34 ryoon Exp $
bin/ab
bin/apxs
bin/dbmmanage
@@ -62,6 +62,7 @@ include/httpd/util_charset.h
include/httpd/util_cookies.h
include/httpd/util_ebcdic.h
include/httpd/util_filter.h
+include/httpd/util_fcgi.h
include/httpd/util_ldap.h
include/httpd/util_md5.h
include/httpd/util_mutex.h
@@ -875,6 +876,9 @@ share/httpd/manual/filter.html.fr
share/httpd/manual/filter.html.ja.utf8
share/httpd/manual/filter.html.ko.euc-kr
share/httpd/manual/filter.html.tr.utf8
+share/httpd/manual/getting-started.html
+share/httpd/manual/getting-started.html.en
+share/httpd/manual/getting-started.html.fr
share/httpd/manual/glossary.html
share/httpd/manual/glossary.html.de
share/httpd/manual/glossary.html.en
@@ -1172,6 +1176,7 @@ share/httpd/manual/mod/mod_cache_disk.html.ja.utf8
share/httpd/manual/mod/mod_cache_disk.html.ko.euc-kr
share/httpd/manual/mod/mod_cache_socache.html
share/httpd/manual/mod/mod_cache_socache.html.en
+share/httpd/manual/mod/mod_cache_socache.html.fr
share/httpd/manual/mod/mod_cern_meta.html
share/httpd/manual/mod/mod_cern_meta.html.en
share/httpd/manual/mod/mod_cern_meta.html.fr
diff --git a/www/apache24/buildlink3.mk b/www/apache24/buildlink3.mk
index 336e38a9b0f..6f59196e2cf 100644
--- a/www/apache24/buildlink3.mk
+++ b/www/apache24/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.5 2013/02/20 12:14:43 fhajny Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2013/12/01 10:02:34 ryoon Exp $
BUILDLINK_TREE+= apache
.if !defined(APACHE_BUILDLINK3_MK)
APACHE_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.apache+= apache>=2.4.1<2.5
-BUILDLINK_ABI_DEPENDS.apache+= apache>=2.4.3nb3
+BUILDLINK_API_DEPENDS.apache+= apache>=2.4.7<2.5
+BUILDLINK_ABI_DEPENDS.apache+= apache>=2.4.7
BUILDLINK_PKGSRCDIR.apache?= ../../www/apache24
BUILDLINK_DEPMETHOD.apache?= build
.if defined(APACHE_MODULE)
diff --git a/www/apache24/distinfo b/www/apache24/distinfo
index f1564a55784..f7aabfb11ce 100644
--- a/www/apache24/distinfo
+++ b/www/apache24/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2013/07/30 12:51:29 ryoon Exp $
+$NetBSD: distinfo,v 1.11 2013/12/01 10:02:34 ryoon Exp $
-SHA1 (httpd-2.4.6.tar.bz2) = 16d8ec72535ded65d035122b0d944b0e64eaa2a2
-RMD160 (httpd-2.4.6.tar.bz2) = 27baf9cdfc60f578c1f692137cd2d4b608e3361d
-Size (httpd-2.4.6.tar.bz2) = 4949897 bytes
+SHA1 (httpd-2.4.7.tar.bz2) = 19ed9ee56462e44d61a093ea57e964cf0af05c0e
+RMD160 (httpd-2.4.7.tar.bz2) = b51a895f0fda53e72f860911b81974422bc34ecc
+Size (httpd-2.4.7.tar.bz2) = 5004719 bytes
SHA1 (patch-aa) = 2d92b1340aaae40289421f164346348c6d7fe839
SHA1 (patch-ab) = a3edcc20b7654e0446c7d442cda1510b23e5d324
SHA1 (patch-ac) = 9f86d845df30316d22bce677a4b176f51007ba0d