diff --git a/www/apache24/Makefile b/www/apache24/Makefile index 6484b7393123..289cffa77758 100644 --- a/www/apache24/Makefile +++ b/www/apache24/Makefile @@ -1,13 +1,12 @@ -# $NetBSD: Makefile,v 1.93 2020/06/23 14:33:22 bacon Exp $ +# $NetBSD: Makefile,v 1.93.2.1 2020/08/23 18:52:33 bsiegert Exp $ # # When updating this package, make sure that no strings like # "PR 12345" are in the commit message. Upstream likes # to reference their own PRs this way, but this ends up # in NetBSD GNATS. -DISTNAME= httpd-2.4.43 +DISTNAME= httpd-2.4.46 PKGNAME= ${DISTNAME:S/httpd/apache/} -PKGREVISION= 4 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} MASTER_SITES+= http://archive.apache.org/dist/httpd/ @@ -109,7 +108,8 @@ FIX_MAN_PERMS+= man8/apachectl.8 man1/ab.1 man1/httxt2dbm.1 SUBST_CLASSES+= man SUBST_STAGE.man= pre-configure SUBST_MESSAGE.man= Fixing paths in man pages. -SUBST_FILES.man= docs/man/*.1 docs/man/*.8 +SUBST_FILES.man= docs/man/apxs.1 docs/man/htdbm.1 \ + docs/man/htpasswd.1 docs/man/httpd.8 SUBST_SED.man= -e 's,/usr/local/etc/apache,${PKG_SYSCONFDIR},' SUBST_SED.man+= -e 's,/path/to/apache/etc,${PKG_SYSCONFDIR},' SUBST_SED.man+= -e 's,/usr/local/apache2,${PREFIX}/share/httpd/htdocs,' @@ -151,7 +151,7 @@ SUBST_MESSAGE.abs_srcdir= Fixing abs_srcdir SUBST_FILES.abs_srcdir= ${DESTDIR}${PREFIX}/share/httpd/build/config_vars.mk SUBST_SED.abs_srcdir= -e 's|^\(abs_srcdir =\) .*|\1 ${PREFIX}/share/httpd|' -REPLACE_PERL= docs/cgi-examples/printenv +#REPLACE_PERL= docs/cgi-examples/printenv .include "../../devel/zlib/buildlink3.mk" CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl} diff --git a/www/apache24/distinfo b/www/apache24/distinfo index b297054e9d57..46f68daa0e6c 100644 --- a/www/apache24/distinfo +++ b/www/apache24/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.43 2020/05/04 12:26:37 manu Exp $ +$NetBSD: distinfo,v 1.43.2.1 2020/08/23 18:52:33 bsiegert Exp $ -SHA1 (httpd-2.4.43.tar.bz2) = fc078df062503ffcf19319c4bf4e8cf27fe30cb4 -RMD160 (httpd-2.4.43.tar.bz2) = 8ccc599b50478330e5505bf75780145d80f4f4ce -SHA512 (httpd-2.4.43.tar.bz2) = 16cfeecc8f6fab6eca478065a384bdf1872f7ac42206b0bc2bcac6c0d9c576f392c07107201f39e0601dec1bbafcb33d66153544de4d87d79b9a52094d334b64 -Size (httpd-2.4.43.tar.bz2) = 7155865 bytes +SHA1 (httpd-2.4.46.tar.bz2) = 1b7cd10ff3a2a07a576d77e34f0204d95fa4aceb +RMD160 (httpd-2.4.46.tar.bz2) = 8e5365222be2b53bed955f6f658fc4b6cc6c60a2 +SHA512 (httpd-2.4.46.tar.bz2) = 5936784bb662e9d8a4f7fe38b70c043b468114d931cd10ea831bfe74461ea5856b64f88f42c567ab791fc8907640a99884ba4b6a600f86d661781812735b6f13 +Size (httpd-2.4.46.tar.bz2) = 7187805 bytes SHA1 (patch-aa) = 9a66685f1d2e4710ab464beda98cbaad632aebf9 SHA1 (patch-ab) = a3edcc20b7654e0446c7d442cda1510b23e5d324 SHA1 (patch-ac) = 9f86d845df30316d22bce677a4b176f51007ba0d