Update thttpd to 2.19. Changes from 2.16:

   New in version 2.19:
     * Added hack to prevent MSIE 5 from censoring error messages.
     * Minor fix to handling of shouldn't-happen error in ls().
     * IPv6/Linux fix from Tero Pelander.
     * Documented the -D flag.
   New in version 2.18:
     * Fixed URL-encoding of high-bit characters - used in directory
       listings.
     * Made a few more characters come through verbatim instead of %-encoded.
     * Couple of minor code cleanups.
     * Added some MIME types to support WAP/WML.
     * IPv6 fix.
     * Made MIME text character-set an option, with iso-8859-1 the default.
   New in version 2.17:
     * A change in the way wildcard matching works - now a single * only
       matches strings that don't include a slash. To match entire pathnames
       including slashes you have to use **.
     * On systems with IPv6, automatically bind to both v4 and v6 sockets.
     * Slight change to non-local referer checking to handle older browsers.
     * Tweaks to some of the error-403 syslog messages.
     * Portability tweak for OSF/1.
     * Portability tweak for IPv6 systems.
     * Fix for ssi.c from Marcel Telka.
     * Added charset=iso-8859-1 to text MIME types.
     * Added wildcards to redirect.
     * Changed symlinks/nosymlinks config options to symlink/nosymlink, to
       conform to the man page (old style still accepted).

13 files changed, 129 insertions, 100 deletions

diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile
index ca91b26306d..6bd572cedff 100644
--- a/www/thttpd/Makefile
+++ b/www/thttpd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2000/04/07 10:11:54 itojun Exp $
+# $NetBSD: Makefile,v 1.6 2000/07/27 12:42:08 jlam Exp $
 
-DISTNAME=	thttpd-2.16
+DISTNAME=	thttpd-2.19
 CATEGORIES=	www
 MASTER_SITES=	http://www.acme.com/software/thttpd/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -9,34 +9,35 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 MAINTAINER=	mike@ethmoid.org
 HOMEPAGE=	http://www.acme.com/software/thttpd/
 
-EXTRACT_ONLY=	${DISTFILES:N*.gif}
-GNU_CONFIGURE=	yes
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+GNU_CONFIGURE=	# defined
 
 # Note: this pkg auto-detects IPv6 without regarding USE_INET6.
-.include "../../mk/bsd.prefs.mk"
 BUILD_DEFS+=	USE_INET6
 
-pre-build:
+pre-configure:
 	${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
-
-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
+	${MV} ${WRKSRC}/extras/htpasswd.c ${WRKSRC}/extras/thtpasswd.c
+	for file in thttpd.8 extras/Makefile.in extras/thtpasswd.c; do \
+		${MV} -f ${WRKSRC}/$${file} ${WRKSRC}/$${file}.bak; \
+		${SED} -e "s,htpasswd,thtpasswd,g" \
+			< ${WRKSRC}/$${file}.bak > ${WRKSRC}/$${file}; \
+	done
+
+post-build:
+	for file in thttpd.conf thttpd.sh; do \
+		${SED} -e "s,@PREFIX@,${PREFIX},g" \
+			< ${FILESDIR}/$${file} > ${WRKDIR}/$${file}; \
+	done
 
 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
+	${INSTALL_DATA} ${WRKDIR}/thttpd.conf ${PREFIX}/share/examples
+	${INSTALL_SCRIPT} ${WRKDIR}/thttpd.sh ${PREFIX}/etc/rc.d
+	${INSTALL_DATA} ${WRKSRC}/index.html ${PREFIX}/share/www
+	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/www
+	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/thttpd/files/md5 b/www/thttpd/files/md5
index 9e73d258bdc..754ca84a263 100644
--- a/www/thttpd/files/md5
+++ b/www/thttpd/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.5 2000/04/07 10:11:55 itojun Exp $
+$NetBSD: md5,v 1.6 2000/07/27 12:42:08 jlam Exp $
 
-MD5 (thttpd-2.16.tar.gz) = c095d3b8919cb386dfb5ee35dad2ad42
+MD5 (thttpd-2.19.tar.gz) = 69a8cf991cf67b03d82971151d4ba50f
 MD5 (sitedrivenby.gif) = ad0647dceb931d02bfd046e55915f7b1
diff --git a/www/thttpd/files/patch-sum b/www/thttpd/files/patch-sum
index 58bd69724ff..8e12fd3d48b 100644
--- a/www/thttpd/files/patch-sum
+++ b/www/thttpd/files/patch-sum
@@ -1,9 +1,6 @@
-$NetBSD: patch-sum,v 1.5 2000/04/07 10:11:55 itojun Exp $
+$NetBSD: patch-sum,v 1.6 2000/07/27 12:42:08 jlam 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
+MD5 (patch-ac) = 081c3519051468b732cae36d621a3583
+MD5 (patch-ad) = 3c8f087d075bfe8d2322cbb02d04118e
diff --git a/www/thttpd/files/thttpd.conf b/www/thttpd/files/thttpd.conf
new file mode 100644
index 00000000000..8af3fcad8ad
--- /dev/null
+++ b/www/thttpd/files/thttpd.conf
@@ -0,0 +1,8 @@
+# $NetBSD: thttpd.conf,v 1.1 2000/07/27 12:42:08 jlam Exp $
+#
+# thttpd configuration file
+#
+dir=@PREFIX@/share/www		# root directory of the web site
+cgipat=*.cgi                                                                  
+logfile=/var/log/thttpd.log
+#pidfile=/var/run/thttpd.pid
diff --git a/www/thttpd/files/thttpd.sh b/www/thttpd/files/thttpd.sh
new file mode 100644
index 00000000000..21a8b2b36a0
--- /dev/null
+++ b/www/thttpd/files/thttpd.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# $NetBSD: thttpd.sh,v 1.1 2000/07/27 12:42:08 jlam Exp $
+#
+
+name="thttpd"
+pidfile="/var/run/${name}.pid"
+
+command=${1:-start}
+
+case ${command} in
+start)
+	if [ -x @PREFIX@/sbin/thttpd -a -f /etc/thttpd.conf ]
+	then
+		echo "Starting ${name}."
+		@PREFIX@/sbin/thttpd -i ${pidfile} -C /etc/thttpd.conf
+	fi
+	;;
+stop)
+	if [ -f ${pidfile} ]; then
+		pid=`head -1 ${pidfile}`
+		echo "Stopping ${name}."
+		kill -TERM ${pid}
+	else
+		echo "${name} not running?"
+	fi
+	;;
+restart)
+	( $0 stop )
+	sleep 1
+	$0 start
+	;;
+status)
+	if [ -f ${pidfile} ]; then
+		pid=`head -1 ${pidfile}`
+		echo "${name} is running as pid ${pid}."
+	else
+		echo "${name} is not running."
+	fi
+	;;
+esac
+exit 0
diff --git a/www/thttpd/patches/patch-ac b/www/thttpd/patches/patch-ac
index f7c05d54006..fda755419aa 100644
--- a/www/thttpd/patches/patch-ac
+++ b/www/thttpd/patches/patch-ac
@@ -1,6 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2000/02/09 20:55:29 hubertf Exp $
-$NetBSD: patch-ac,v 1.2 2000/02/09 20:55:29 hubertf Exp $
-
+$NetBSD: patch-ac,v 1.3 2000/07/27 12:42:08 jlam Exp $
 
 --- cgi-src/Makefile.in.BAK	Wed Feb  9 21:12:32 2000
 +++ cgi-src/Makefile.in	Wed Feb  9 21:13:16 2000
diff --git a/www/thttpd/patches/patch-ad b/www/thttpd/patches/patch-ad
index 2e06463f381..8d8d266f52b 100644
--- a/www/thttpd/patches/patch-ad
+++ b/www/thttpd/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.1 1999/12/15 14:48:49 abs Exp $
+$NetBSD: patch-ad,v 1.2 2000/07/27 12:42:08 jlam Exp $
 
---- index.html.orig	Wed Dec 15 13:30:29 1999
-+++ index.html	Wed Dec 15 13:31:10 1999
-@@ -13,5 +13,9 @@
+--- index.html.orig	Wed Feb  9 16:52:20 2000
++++ index.html	Thu Jul 27 07:25:55 2000
+@@ -12,5 +12,9 @@
  
  <HR>
  <ADDRESS><A HREF="mailto:webmaster@acme.com">ACME Labs Webmaster &lt;webmaster@acme.com&gt;</A></ADDRESS>
 +<A HREF="http://www.netbsd.org/">
-+<IMG ALIGN=RIGHT SRC="sitedrivenby.gif" border=0 ALT="Site driven by NetBSD">
++<IMG ALIGN=RIGHT SRC="sitedrivenby.gif border=0 ALT="Site driven by NetBSD">
 +</A>
 +
  </BODY>
diff --git a/www/thttpd/patches/patch-ae b/www/thttpd/patches/patch-ae
deleted file mode 100644
index 256f5fd6934..00000000000
--- a/www/thttpd/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$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
deleted file mode 100644
index 441e5d68e59..00000000000
--- a/www/thttpd/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
deleted file mode 100644
index 5cae0888e28..00000000000
--- a/www/thttpd/patches/patch-ag
+++ /dev/null
@@ -1,23 +0,0 @@
-$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; }
diff --git a/www/thttpd/pkg/INSTALL b/www/thttpd/pkg/INSTALL
new file mode 100644
index 00000000000..767d3a7c8e2
--- /dev/null
+++ b/www/thttpd/pkg/INSTALL
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# $NetBSD: INSTALL,v 1.1 2000/07/27 12:42:09 jlam Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+case ${STAGE} in
+PRE-INSTALL)
+	;;
+POST-INSTALL)
+	EXAMPLE_DIR=${PKG_PREFIX}/share/examples
+	INSTALL_DATA="/usr/bin/install -c -o root -g wheel -m 0644"
+
+	if [ ! -f /etc/thttpd.conf ]
+	then
+		echo "Installing example thttpd.conf in /etc..."
+		${INSTALL_DATA} ${EXAMPLE_DIR}/thttpd.conf /etc/thttpd.conf
+	fi
+	;;
+*)
+	echo "Unexpected argument: ${STAGE}"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/www/thttpd/pkg/MESSAGE b/www/thttpd/pkg/MESSAGE
index af881fb0f0b..f259b44613c 100644
--- a/www/thttpd/pkg/MESSAGE
+++ b/www/thttpd/pkg/MESSAGE
@@ -1,6 +1,10 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.2 2000/07/27 12:42:09 jlam Exp $
+
 In order to use makeweb:
 
-   chgrp <group> makeweb
-   chmod 2755 makeweb
+	chgrp <group> makeweb
+	chmod 2755 makeweb
 
 The suggested group is "www".
+===========================================================================
diff --git a/www/thttpd/pkg/PLIST b/www/thttpd/pkg/PLIST
index 31f2e2db7cc..0923f328deb 100644
--- a/www/thttpd/pkg/PLIST
+++ b/www/thttpd/pkg/PLIST
@@ -1,18 +1,20 @@
-@comment $NetBSD: PLIST,v 1.7 2000/03/01 16:12:13 hubertf Exp $
-sbin/thttpd
-sbin/syslogtocern
-sbin/makeweb
-sbin/thtpasswd
-man/man8/thttpd.8
-man/man8/syslogtocern.8
-man/man8/redirect.8
-man/man8/ssi.8
-man/man1/makeweb.1
-man/man1/thtpasswd.1
+@comment $NetBSD: PLIST,v 1.8 2000/07/27 12:42:09 jlam Exp $
+etc/rc.d/thttpd.sh
 libexec/cgi-bin/redirect
 libexec/cgi-bin/phf
 libexec/cgi-bin/ssi
+man/man1/makeweb.1
+man/man1/thtpasswd.1
+man/man8/redirect.8
+man/man8/ssi.8
+man/man8/syslogtocern.8
+man/man8/thttpd.8
+sbin/makeweb
+sbin/syslogtocern
+sbin/thtpasswd
+sbin/thttpd
+share/examples/thttpd.conf
 share/www/index.html
 share/www/sitedrivenby.gif
-@dirrm libexec/cgi-bin
 @dirrm share/www
+@dirrm libexec/cgi-bin