diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2007-01-21 17:11:53 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2007-01-21 17:11:53 +0000 |
| commit | f3d970469e6808927741b825becd95928adbbea2 (patch) | |
| tree | 67c90e669ad967a12d9eda8443429d93a146c8f3 /www/apache22 | |
| parent | 5483aa23b1a90469847f53f674d11cd49bae7b69 (diff) | |
| download | pkgsrc-f3d970469e6808927741b825becd95928adbbea2.tar.gz | |
Update www/apache22 to 2.2.4:
* Bugfixes, please see http://www.apache.org/dist/httpd/CHANGES_2.2
pkgsrc changes:
* Do not use the included pcre source in apache22.
* devel/apr1 now uses the apache22 version (increased to 1.2.8.2.2.4) to
sync the source with the httpd distfile.
* Remove patches in devel/apr1 which were applied upstream.
Diffstat (limited to 'www/apache22')
| -rw-r--r-- | www/apache22/Makefile | 6 | ||||
| -rw-r--r-- | www/apache22/Makefile.common | 6 | ||||
| -rw-r--r-- | www/apache22/distinfo | 8 |
3 files changed, 11 insertions, 9 deletions
diff --git a/www/apache22/Makefile b/www/apache22/Makefile index 4cde258c4ab..50da987aa8e 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2007/01/04 13:42:39 abs Exp $ +# $NetBSD: Makefile,v 1.5 2007/01/21 17:11:53 xtraeme Exp $ .include "Makefile.common" PKGNAME= apache-${APACHE_VERSION} -PKGREVISION= 1 +#PKGREVISION= 1 CATEGORIES= www HOMEPAGE= http://httpd.apache.org/ @@ -20,6 +20,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-layout=NetBSD CONFIGURE_ARGS+= --with-port=80 CONFIGURE_ARGS+= --enable-so +CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre} CONFIGURE_ENV+= perlbin=${PERL5:Q} # Apache Portable Runtime library configure options @@ -38,6 +39,7 @@ APACHE_MODULES?= ${DFLT_APACHE_MODULES} .include "../../mk/bsd.prefs.mk" .include "../../devel/apr1/buildlink3.mk" +.include "../../devel/pcre/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" diff --git a/www/apache22/Makefile.common b/www/apache22/Makefile.common index 023d9ce2c31..58f68548628 100644 --- a/www/apache22/Makefile.common +++ b/www/apache22/Makefile.common @@ -1,11 +1,11 @@ -# $NetBSD: Makefile.common,v 1.2 2006/12/09 00:47:34 tron Exp $ +# $NetBSD: Makefile.common,v 1.3 2007/01/21 17:11:53 xtraeme Exp $ DISTNAME= httpd-${APACHE_VERSION} EXTRACT_SUFX= .tar.bz2 # When updating this version be sure to update the checksum and remove # any PKGREVISION for devel/apr also. -APACHE_VERSION= 2.2.3 -APR_VERSION= 1.2.8 +APACHE_VERSION= 2.2.4 +APR_VERSION= 1.2.8.${APACHE_VERSION} MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ ${MASTER_SITE_APACHE:=httpd/old/} \ http://www.NetBSD.org/images/logos/ diff --git a/www/apache22/distinfo b/www/apache22/distinfo index 57323082255..f16e2335b0c 100644 --- a/www/apache22/distinfo +++ b/www/apache22/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2006/12/08 23:31:52 xtraeme Exp $ +$NetBSD: distinfo,v 1.2 2007/01/21 17:11:53 xtraeme Exp $ -SHA1 (httpd-2.2.3.tar.bz2) = 30d445302e63326d81705687ee734fdfb692dcde -RMD160 (httpd-2.2.3.tar.bz2) = 291e093f48d980daba482140581a525ecbfae4d2 -Size (httpd-2.2.3.tar.bz2) = 4905728 bytes +SHA1 (httpd-2.2.4.tar.bz2) = 64ceae373434a986dc99b8ed953afa0d4fad85ce +RMD160 (httpd-2.2.4.tar.bz2) = bb6e8a7447fa8e8f629010f30b548068de518523 +Size (httpd-2.2.4.tar.bz2) = 4930375 bytes SHA1 (patch-aa) = 233dbabda2bd830c6f0664c42e192e4acd2aff4c SHA1 (patch-ab) = 387892276efd49fd081a187c1123de26fb6486ba SHA1 (patch-ac) = 515043b5c215d49fe8f6d3191b502c978e2a2dad |