I updated apache and apr on my test systems.

It works fine under NetBSD. But under my Linux system it says:

(98)Address already in use: make_sock: could not bind to address
0.0.0.0:80
no listening sockets available, shutting down
Unable to open logs

(I have seen those errors before when running as non-root, but I don't
know why now.)

Can anyone try the patches below on Linux?

See diff below.

Notice that PLIST changed because file never installed. I wonder if it
even installed with previous httpd?

I did not try other packages using modules.

(By the way, this really needs to add the user and group using
../../mk/bsd.pkg.install.mk.)

I will be unavailable to commit tomorrow, but can on Monday unless someone
beats me to this.

Index: devel/apr/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/apr/Makefile,v
retrieving revision 1.16
diff -b -u -r1.16 Makefile
--- devel/apr/Makefile	9 Mar 2004 19:34:14 -0000	1.16
+++ devel/apr/Makefile	21 Mar 2004 07:18:16 -0000
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.16 2004/03/09 19:34:14 snj Exp $

 PKGNAME=	apr-${APR_VERSION}.${APACHE_VERSION}
-PKGREVISION=	1
 CATEGORIES=	devel

 HOMEPAGE=	http://apr.apache.org/
Index: devel/apr/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/apr/distinfo,v
retrieving revision 1.6
diff -b -u -r1.6 distinfo
--- devel/apr/distinfo	28 Oct 2003 21:12:11 -0000	1.6
+++ devel/apr/distinfo	21 Mar 2004 07:18:16 -0000
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.6 2003/10/28 21:12:11 mason Exp $

-SHA1 (httpd-2.0.48.tar.gz) = 1e7311d0a2ff845a0d0f60ca96981b82403db2d4
-Size (httpd-2.0.48.tar.gz) = 6258490 bytes
+SHA1 (httpd-2.0.49.tar.gz) = 7fe1f9bc835b91d5e55aa39a792b0050a634485b
+Size (httpd-2.0.49.tar.gz) = 5919279 bytes
 SHA1 (patch-aa) = 17e79d6c54c855c4210f68e5facca1002d2512fa
 SHA1 (patch-ab) = bb9a9f0fbf5d48748f2a0826509a19b915d2bc72
 SHA1 (patch-an) = 64006f0f1b5c3f20df6f47624e56aac0d99ae056
Index: www/apache2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/apache2/Makefile,v
retrieving revision 1.33
diff -b -u -r1.33 Makefile
--- www/apache2/Makefile	7 Mar 2004 22:43:08 -0000	1.33
+++ www/apache2/Makefile	21 Mar 2004 07:18:16 -0000
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.33 2004/03/07 22:43:08 minskim Exp $

 PKGNAME=		apache-${APACHE_VERSION}
-PKGREVISION=		3
 CATEGORIES=		www

 HOMEPAGE=		http://httpd.apache.org/
Index: www/apache2/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/www/apache2/Makefile.common,v
retrieving revision 1.6
diff -b -u -r1.6 Makefile.common
--- www/apache2/Makefile.common	28 Nov 2003 09:59:34 -0000	1.6
+++ www/apache2/Makefile.common	21 Mar 2004 07:18:16 -0000
@@ -1,5 +1,5 @@
 DISTNAME=		httpd-${APACHE_VERSION}
-APACHE_VERSION=		2.0.48
+APACHE_VERSION=		2.0.49
 APR_VERSION=            0.9.5
 MASTER_SITES=		${MASTER_SITE_APACHE:=httpd/} \
 			${MASTER_SITE_APACHE:=httpd/old/} \
Index: www/apache2/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/www/apache2/PLIST,v
retrieving revision 1.18
diff -b -u -r1.18 PLIST
--- www/apache2/PLIST	27 Jan 2004 08:09:17 -0000	1.18
+++ www/apache2/PLIST	21 Mar 2004 07:18:20 -0000
@@ -1151,7 +1151,6 @@
 share/httpd/manual/programs/suexec.html.en
 share/httpd/manual/programs/suexec.xml
 share/httpd/manual/programs/suexec.xml.meta
-share/httpd/manual/search/manual-index.cgi
 share/httpd/manual/sections.html
 share/httpd/manual/sections.html.en
 share/httpd/manual/sections.html.ja.jis
Index: www/apache2/buildlink2.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/apache2/buildlink2.mk,v
retrieving revision 1.5
diff -b -u -r1.5 buildlink2.mk
--- www/apache2/buildlink2.mk	3 Dec 2003 15:40:02 -0000	1.5
+++ www/apache2/buildlink2.mk	21 Mar 2004 07:18:20 -0000
@@ -4,7 +4,7 @@
 APACHE_BUILDLINK2_MK=	# defined

 BUILDLINK_PACKAGES+=		apache
-BUILDLINK_DEPENDS.apache?=	apache>=2.0.48nb2
+BUILDLINK_DEPENDS.apache?=	apache>=2.0.49
 BUILDLINK_PKGSRCDIR.apache?=	../../www/apache2
 BUILDLINK_DEPMETHOD.apache?=	build

Index: www/apache2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/apache2/buildlink3.mk,v
retrieving revision 1.2
diff -b -u -r1.2 buildlink3.mk
--- www/apache2/buildlink3.mk	18 Mar 2004 09:12:15 -0000	1.2
+++ www/apache2/buildlink3.mk	21 Mar 2004 07:18:20 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	apache

 .if !empty(APACHE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.apache+=	apache>=2.0.48nb3
+BUILDLINK_DEPENDS.apache+=	apache>=2.0.49
 BUILDLINK_PKGSRCDIR.apache?=	../../www/apache2
 BUILDLINK_DEPMETHOD.apache?=	build
 .  if defined(APACHE_MODULE)
Index: www/apache2/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/www/apache2/distinfo,v
retrieving revision 1.23
diff -b -u -r1.23 distinfo
--- www/apache2/distinfo	28 Oct 2003 04:49:32 -0000	1.23
+++ www/apache2/distinfo	21 Mar 2004 07:18:20 -0000
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.23 2003/10/28 04:49:32 itojun Exp $

-SHA1 (httpd-2.0.48.tar.gz) = 1e7311d0a2ff845a0d0f60ca96981b82403db2d4
-Size (httpd-2.0.48.tar.gz) = 6258490 bytes
+SHA1 (httpd-2.0.49.tar.gz) = 7fe1f9bc835b91d5e55aa39a792b0050a634485b
+Size (httpd-2.0.49.tar.gz) = 5919279 bytes
 SHA1 (patch-aa) = b04f73fcc090e64c7c7de480fe504bb7a9e305bd
 SHA1 (patch-ad) = 27fa3655d6ba4840296e79fa6fd96cd9de79a33a
 SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01

   Jeremy C. Reed
   http://www.reedmedia.net/