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).

1 files changed, 22 insertions, 21 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"