fix IPv6 build.

upgrade 2.15 -> 2.16.  changes from webpage:
- More explicit error pages for 403 Forbidden.
- New section in the manual page explaining how thttpd is picky about
  file permissions.
- Couple of CGI tweaks from David Chaiken.

6 files changed, 59 insertions, 6 deletions

diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile
index b4667d547ca..ca91b26306d 100644
--- a/www/thttpd/Makefile
+++ b/www/thttpd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2000/02/09 20:55:27 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2000/04/07 10:11:54 itojun Exp $
 
-DISTNAME=	thttpd-2.15
+DISTNAME=	thttpd-2.16
 CATEGORIES=	www
 MASTER_SITES=	http://www.acme.com/software/thttpd/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -13,7 +13,8 @@ EXTRACT_ONLY=	${DISTFILES:N*.gif}
 GNU_CONFIGURE=	yes
 
 # Note: this pkg auto-detects IPv6 without regarding USE_INET6.
-# (Leave the above line in to still get it into the README-IPv6.html!)
+.include "../../mk/bsd.prefs.mk"
+BUILD_DEFS+=	USE_INET6
 
 pre-build:
 	${MV} ${WRKSRC}/extras/htpasswd.1 ${WRKSRC}/extras/thtpasswd.1
diff --git a/www/thttpd/files/md5 b/www/thttpd/files/md5
index ad50ae21de4..9e73d258bdc 100644
--- a/www/thttpd/files/md5
+++ b/www/thttpd/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.4 2000/02/09 20:55:28 hubertf Exp $
+$NetBSD: md5,v 1.5 2000/04/07 10:11:55 itojun Exp $
 
-MD5 (thttpd-2.15.tar.gz) = 8046fce64ed2bd636dc212599749646c
+MD5 (thttpd-2.16.tar.gz) = c095d3b8919cb386dfb5ee35dad2ad42
 MD5 (sitedrivenby.gif) = ad0647dceb931d02bfd046e55915f7b1
diff --git a/www/thttpd/files/patch-sum b/www/thttpd/files/patch-sum
index dea909ea909..58bd69724ff 100644
--- a/www/thttpd/files/patch-sum
+++ b/www/thttpd/files/patch-sum
@@ -1,6 +1,9 @@
-$NetBSD: patch-sum,v 1.4 2000/02/09 20:55:28 hubertf Exp $
+$NetBSD: patch-sum,v 1.5 2000/04/07 10:11:55 itojun Exp $
 
 MD5 (patch-aa) = d9e7d902f59ac1bde877c0ea31a8e513
 MD5 (patch-ab) = 2aa3d6ab165cc262aea5781558437f04
 MD5 (patch-ac) = 793b59d0eaf047c5c65373e1fa9ba53c
 MD5 (patch-ad) = ad2a6a25ae9091206afaf651271776da
+MD5 (patch-ae) = ab8fb4ec33c7e587916695dec66cc982
+MD5 (patch-af) = cd3a27e9dafe661dea573a81a4d746dc
+MD5 (patch-ag) = e1c1243400aa53e903782ef1c04766c7
diff --git a/www/thttpd/patches/patch-ae b/www/thttpd/patches/patch-ae
new file mode 100644
index 00000000000..256f5fd6934
--- /dev/null
+++ b/www/thttpd/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2000/04/07 10:11:55 itojun Exp $
+--- configure.in	Mon Feb  7 10:31:16 2000
++++ configure.in	Fri Apr  7 18:52:19 2000
+@@ -64,7 +64,7 @@
+ 	AC_MSG_RESULT(no)   
+ fi
+ 
+-AC_CHECK_HEADERS(fcntl.h grp.h memory.h paths.h poll.h sys/poll.h netinet6/in6.h)
++AC_CHECK_HEADERS(fcntl.h grp.h memory.h paths.h poll.h sys/poll.h)
+ AC_HEADER_TIME
+ AC_HEADER_DIRENT
+ 
diff --git a/www/thttpd/patches/patch-af b/www/thttpd/patches/patch-af
new file mode 100644
index 00000000000..441e5d68e59
--- /dev/null
+++ b/www/thttpd/patches/patch-af
@@ -0,0 +1,14 @@
+$NetBSD: patch-af,v 1.1 2000/04/07 10:11:55 itojun Exp $
+--- aclocal.m4	Sat Jan 15 01:49:01 2000
++++ aclocal.m4	Fri Apr  7 18:52:41 2000
+@@ -180,9 +180,7 @@
+ 	AC_TRY_COMPILE([
+ #	include <sys/types.h>
+ #	include <sys/socket.h>
+-#	ifdef HAVE_NETINET6_IN6_H
+-#	include <netinet6/in6.h>
+-#	endif],
++#	include <netinet/in.h>],
+ 	[struct sockaddr_in6 sa6],
+ 	ac_cv_acme_sockaddr_in6=yes,
+ 	ac_cv_acme_sockaddr_in6=no))
diff --git a/www/thttpd/patches/patch-ag b/www/thttpd/patches/patch-ag
new file mode 100644
index 00000000000..5cae0888e28
--- /dev/null
+++ b/www/thttpd/patches/patch-ag
@@ -0,0 +1,23 @@
+$NetBSD: patch-ag,v 1.1 2000/04/07 10:11:55 itojun Exp $
+--- configure-	Fri Apr  7 18:48:12 2000
++++ configure	Fri Apr  7 18:48:26 2000
+@@ -1021,7 +1021,7 @@
+ fi
+ echo "$ac_t""$CPP" 1>&6
+ 
+-for ac_hdr in fcntl.h grp.h memory.h paths.h poll.h sys/poll.h netinet6/in6.h
++for ac_hdr in fcntl.h grp.h memory.h paths.h poll.h sys/poll.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+@@ -2378,9 +2378,7 @@
+ 
+ #	include <sys/types.h>
+ #	include <sys/socket.h>
+-#	ifdef HAVE_NETINET6_IN6_H
+-#	include <netinet6/in6.h>
+-#	endif
++#	include <netinet/in.h>
+ int main() {
+ struct sockaddr_in6 sa6
+ ; return 0; }