Update to V2.15.

Main reason: IPv6. Changes:

New in version 2.15:

   * Use standard isxdigit macro instead of is_hexit routine.
   * Portability fix for Debian, which lacks gai_strerror().
   * Fix for .htpasswd authorization, broken by 2.14's custom error pages
     change.

New in version 2.14:

   * Fix to non-local referer code - it was trying to dereference a null
     pointer under some circumstances.
   * Fix to If-Modified-Since - some leap year problems.
   * Rewrote match() - it was using a whole lot of CPU time for patterns
     with lots of |'s, such as those used by the new non-local-referer
     filtering.
   * Fix to host lookup code for -h flag.
   * Fix custom error pages to work with 401 Unauthorized.
   * Removed unused variable.

New in version 2.13:

   * Portability fix for fdwatch on systems with poll() but not select().
   * Renamed nph-redirect to redirect, now that thttpd does header parsing.
   * Always chdir to / after a chroot.
   * Some minor de-linting changes.
   * Revived code that closes stdin/stdout/stderr, after adding a fix in the
     CGI code to prevent descriptors from getting screwed up.
   * Bugfix for CGI header parsing - if the CGI was sending binary data
     (e.g. images), the result could get truncated or corrupted.
   * Disallow ".." listing of virtual host directory.
   * Revised snprintf portability fix.
   * Rearranged the hc initialization so it's all in one place.
   * New IPv6 code from KIKUCHI Takahiro.
   * New non-local referer filtering code from Craig Leres.
   * New custom error pages code from Catalin Ionescu.

New in version 2.12:

   * Better heuristic for deciding between select() and poll().
   * Added Red Hat RPM spec file.

New in version 2.11:

   * Use poll() instead of select() when favorable.
   * Do lazy allocation of part of the connection data structure, to save on
     memory now that we can have thousands of simultaneous connections.
   * Some speed optimizations.
   * Add HTTP_HOST to CGI environment.
   * Bugfix for rare uninitialized variable.

New in version 2.10:

   * Bugfix for CGI header parsing.
   * Call setlogin() if it's available.

1 files changed, 12 insertions, 3 deletions

diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile
index 55cecc13e50..b4667d547ca 100644
--- a/www/thttpd/Makefile
+++ b/www/thttpd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 1999/12/15 14:48:48 abs Exp $
+# $NetBSD: Makefile,v 1.4 2000/02/09 20:55:27 hubertf Exp $
 
-DISTNAME=	thttpd-2.09
+DISTNAME=	thttpd-2.15
 CATEGORIES=	www
 MASTER_SITES=	http://www.acme.com/software/thttpd/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -12,20 +12,29 @@ HOMEPAGE=	http://www.acme.com/software/thttpd/
 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!)
+
 pre-build:
+	${MV} ${WRKSRC}/extras/htpasswd.1 ${WRKSRC}/extras/thtpasswd.1
 	${MV} ${WRKSRC}/extras/Makefile ${WRKSRC}/extras/Makefile.orig
 	${SED} -e "s/htpasswd/thtpasswd/g" \
 	  <${WRKSRC}/extras/Makefile.orig >${WRKSRC}/extras/Makefile
 	${SED} -e "s/htpasswd/thtpasswd/g" \
 	  <${WRKSRC}/extras/htpasswd.c >${WRKSRC}/extras/thtpasswd.c
 
-pre-install:
+re-install:
 	${MKDIR} ${PREFIX}/libexec/cgi-bin ${PREFIX}/share/www
 	${SED} -e "s/htpasswd/thtpasswd/g" \
 	  <${WRKSRC}/extras/htpasswd.1 >${WRKSRC}/extras/thtpasswd.1
 	${INSTALL_DATA} ${WRKSRC}/index.html ${PREFIX}/share/www/index.html
 
+pre-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/www
+
 post-install:
+	${INSTALL_DATA} ${WRKSRC}/index.html \
+	  ${PREFIX}/share/www
 	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif \
 	  ${PREFIX}/share/www