* make w3c-httpd correctly install for IRIX and Linux (Solaris might need

  some additional lines in Makefile)
* make it compile on non-case-sensitive filesystems
* add support for Darwin

5 files changed, 61 insertions, 14 deletions

diff --git a/www/w3c-httpd/Makefile b/www/w3c-httpd/Makefile
index 91ee252f0cc..0a580fb16a7 100644
--- a/www/w3c-httpd/Makefile
+++ b/www/w3c-httpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/10/04 22:04:10 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2006/10/07 22:39:28 schwarz Exp $
 
 DISTNAME=	w3c-httpd-3.0A
 PKGREVISION=	1
@@ -11,8 +11,29 @@ HOMEPAGE=	http://www.w3.org/Daemon/
 COMMENT=	WWW server from the W3 Consortium (W3C)
 
 WRKSRC=		${WRKDIR}
+BUILD_TARGET=	build-all
+# prevent conflict with directory All on non-case-sensitive file systems
 USE_TOOLS+=	csh
 
+.include "../../mk/bsd.prefs.mk"
+.if (${OPSYS} == "FreeBSD") || (${OPSYS} == "DragonFly" )
+OSNAME= freebsd
+.elif (${OPSYS} == "Darwin")
+OSNAME=darwin
+CPPFLAGS+=	-Dunix
+.elif (${OPSYS} == "IRIX")
+OSNAME=sgi
+.elif (${OPSYS} == "OSF1")
+OSNAME=osf1
+.elif (${OPSYS} == "Linux")
+OSNAME=linux
+.else
+#       covers OpenBSD, too
+OSNAME= netbsd
+.endif
+
+CFLAGS+=	${CPPFLAGS}
+
 SUBST_CLASSES+=		strcasestr
 SUBST_STAGE.strcasestr=	post-patch
 SUBST_FILES.strcasestr=	Daemon/Implementation/HTWild.c \
@@ -28,6 +49,10 @@ INSTALLATION_DIRS=	bin sbin share/examples/w3c-httpd
 CONF_FILES+=	${EGDIR:Q}/${f:Q}	${PKG_SYSCONFDIR}/${f:Q}
 .endfor
 
+post-extract:
+	cd ${WRKSRC}/All && ${MKDIR} darwin && \
+	${CP} freebsd/Makefile.include darwin/
+
 pre-configure:
 .if !defined(MD5_PW)
 	@${ECHO} ""
@@ -49,10 +74,3 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC:Q}/Daemon/${OSNAME:Q}/cgiutils ${PREFIX:Q}/sbin
 
 .include "../../mk/bsd.pkg.mk"
-
-.if (${OPSYS} == "FreeBSD") || (${OPSYS} == "DragonFly")
-OSNAME=	freebsd
-.else
-#	covers OpenBSD too
-OSNAME=	netbsd
-.endif
diff --git a/www/w3c-httpd/distinfo b/www/w3c-httpd/distinfo
index 5c466cb7288..0d92e8ae861 100644
--- a/www/w3c-httpd/distinfo
+++ b/www/w3c-httpd/distinfo
@@ -1,15 +1,17 @@
-$NetBSD: distinfo,v 1.4 2006/01/08 20:45:45 joerg Exp $
+$NetBSD: distinfo,v 1.5 2006/10/07 22:39:28 schwarz Exp $
 
 SHA1 (w3c-httpd-3.0A.tar.gz) = 90d31fa16079e3eb959f361469f0f59af4611618
 RMD160 (w3c-httpd-3.0A.tar.gz) = 6254b39cbc89f7f4ecc0928d02dbb171548265a4
 Size (w3c-httpd-3.0A.tar.gz) = 627144 bytes
-SHA1 (patch-aa) = b878149090186342347d9c7851c23c4b467a9824
+SHA1 (patch-aa) = 5e994e7cb09f2b58698f72e9dc50bae4fc56951c
 SHA1 (patch-ab) = f579e55d5646911b05c2e4d1efd69551fcec4c5f
 SHA1 (patch-ac) = eeb2668b956d3aa81d338e22bce6664cc2551c2c
 SHA1 (patch-ad) = f7093d13c01683c2296c4b7ffa87b87c01ce3392
 SHA1 (patch-ae) = 1f3521bce0b50d582711f6ab89e51ead3fdf59c2
 SHA1 (patch-af) = a30ea965cffae203c6034c96094f7aeb3c72612a
 SHA1 (patch-ag) = e0322379cfcc9de48ea22cf726eceb45d98eb4df
+SHA1 (patch-ah) = 8c40daba8de9673f029dcc300eb9197ff88eb2a4
+SHA1 (patch-ai) = b5d6637fc188941e22eaa1640d1cb42ce05dca0d
 SHA1 (patch-ba) = 9d6fc677a3aecb9dfba8fc46e7de6da8008bc0b1
 SHA1 (patch-bb) = 17e0cf4b86138d6bdd843315ca0aac01357d872a
 SHA1 (patch-bc) = cc1d854a61aac394faeaa7be4013459b8b7618fe
diff --git a/www/w3c-httpd/patches/patch-aa b/www/w3c-httpd/patches/patch-aa
index bb497e58f6c..ad286b4770b 100644
--- a/www/w3c-httpd/patches/patch-aa
+++ b/www/w3c-httpd/patches/patch-aa
@@ -1,13 +1,14 @@
-$NetBSD: patch-aa,v 1.3 2006/01/08 20:45:45 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2006/10/07 22:39:28 schwarz Exp $
 
---- BUILD.orig	Sat Sep 24 11:28:46 1994
-+++ BUILD	Sat Mar  8 10:08:38 1997
-@@ -56,6 +56,10 @@
+--- BUILD.orig	1994-09-24 20:28:46.000000000 +0200
++++ BUILD	2006-10-07 22:21:25.000000000 +0200
+@@ -56,6 +56,11 @@
  if ($UNAME == "AIX")    	setenv WWW_MACH	rs6000
  if ($UNAME == "OSF1")   	setenv WWW_MACH	osf1
  if ($UNAME == "BSD/386")	setenv WWW_MACH	unix
 +if ($UNAME == "FreeBSD")	setenv WWW_MACH	freebsd
 +if ($UNAME == "DragonFly")	setenv WWW_MACH	freebsd
++if ($UNAME == "Darwin")		setenv WWW_MACH darwin
 +if ($UNAME == "OpenBSD")	setenv WWW_MACH	netbsd
 +if ($UNAME == "NetBSD")	setenv WWW_MACH	netbsd
  if ($UNAME == "Linux")		setenv WWW_MACH	linux
diff --git a/www/w3c-httpd/patches/patch-ah b/www/w3c-httpd/patches/patch-ah
new file mode 100644
index 00000000000..1c32328f325
--- /dev/null
+++ b/www/w3c-httpd/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2006/10/07 22:39:28 schwarz Exp $
+
+--- ./Library/Implementation/tcp.h.orig	2006-10-07 22:59:41.000000000 +0200
++++ ./Library/Implementation/tcp.h	2006-10-07 23:00:26.000000000 +0200
+@@ -722,7 +722,7 @@
+ #ifdef unix                       /* if this is to compile on a UNIX machine */
+ #define GOT_READ_DIR 1       /* if directory reading functions are available */
+ 
+-#ifndef NeXT
++#if !defined(NeXT) && !defined(__APPLE__)
+ #define USE_DIRENT                /* Try this all the time, Henrik May 29 94 */
+ #endif
+ #ifdef USE_DIRENT                                           /* sys v version */
diff --git a/www/w3c-httpd/patches/patch-ai b/www/w3c-httpd/patches/patch-ai
new file mode 100644
index 00000000000..91299192e9d
--- /dev/null
+++ b/www/w3c-httpd/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2006/10/07 22:39:28 schwarz Exp $
+
+--- Makefile.orig	2006-10-07 23:37:17.000000000 +0200
++++ Makefile	2006-10-07 23:37:32.000000000 +0200
+@@ -4,7 +4,7 @@
+ #  When you have done BUILD you will have www so you will be able to
+ #  read the documentation online.
+ #
+-all :
++build-all :
+ 	./BUILD
+ 
+ purify: