diff options
| -rw-r--r-- | www/thttpd/Makefile | 21 | ||||
| -rw-r--r-- | www/thttpd/files/md5 | 4 | ||||
| -rw-r--r-- | www/thttpd/files/patch-sum | 6 | ||||
| -rw-r--r-- | www/thttpd/patches/patch-aa | 44 | ||||
| -rw-r--r-- | www/thttpd/patches/patch-ab | 28 | ||||
| -rw-r--r-- | www/thttpd/patches/patch-ac | 25 | ||||
| -rw-r--r-- | www/thttpd/pkg/DESCR | 5 | ||||
| -rw-r--r-- | www/thttpd/pkg/PLIST | 17 |
8 files changed, 117 insertions, 33 deletions
diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile index 57d3c6db0b8..0c1d743f5bf 100644 --- a/www/thttpd/Makefile +++ b/www/thttpd/Makefile @@ -1,18 +1,25 @@ -# $NetBSD: Makefile,v 1.1.1.1 1999/04/10 22:01:10 tron Exp $ -# +# $NetBSD: Makefile,v 1.2 1999/11/21 23:03:37 tron Exp $ -DISTNAME= thttpd-2.04 +DISTNAME= thttpd-2.05 CATEGORIES= www MASTER_SITES= http://www.acme.com/software/thttpd/ -EXTRACT_SUFX= .tar.Z MAINTAINER= mike@ethmoid.org -HOMEPAGE= http://http://www.acme.com/software/thttpd/ +HOMEPAGE= http://www.acme.com/software/thttpd/ GNU_CONFIGURE= yes +pre-build: + ${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: - ${MKDIR} ${PREFIX}/www - ${MKDIR} ${PREFIX}/www/cgi-bin + ${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 .include "../../mk/bsd.pkg.mk" diff --git a/www/thttpd/files/md5 b/www/thttpd/files/md5 index 77f4abd57bf..bc9effe44e7 100644 --- a/www/thttpd/files/md5 +++ b/www/thttpd/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 1999/04/10 22:01:10 tron Exp $ +$NetBSD: md5,v 1.2 1999/11/21 23:03:38 tron Exp $ -MD5 (thttpd-2.04.tar.Z) = df4d68964ebe8d2d1b135db9b463b841 +MD5 (thttpd-2.05.tar.gz) = ede9ce8d0d317420f78691db08daa72d diff --git a/www/thttpd/files/patch-sum b/www/thttpd/files/patch-sum index 970e01d3475..e2173f30a25 100644 --- a/www/thttpd/files/patch-sum +++ b/www/thttpd/files/patch-sum @@ -1,3 +1,5 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:18 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/11/21 23:03:38 tron Exp $ -MD5 (patch-aa) = 6d072b69f8229ddd2b6fc25f37dc4892 +MD5 (patch-aa) = 192f42a43d37e9d1fdb9b9cdff9ff940 +MD5 (patch-ab) = 6f8e0104156a70b7962d7fdab0baffd3 +MD5 (patch-ac) = a3c8ea60a2b5d114d26539731a1f61e4 diff --git a/www/thttpd/patches/patch-aa b/www/thttpd/patches/patch-aa index 70e2fc96abc..8c17b537b2b 100644 --- a/www/thttpd/patches/patch-aa +++ b/www/thttpd/patches/patch-aa @@ -1,11 +1,35 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/04/10 22:01:10 tron Exp $ +$NetBSD: patch-aa,v 1.2 1999/11/21 23:03:38 tron Exp $ ---- extras/Makefile.in.orig Sun Apr 4 17:14:00 1999 -+++ extras/Makefile.in Sun Apr 4 17:14:19 1999 -@@ -68,6 +68,4 @@ - rm -f $(BINDIR)/makeweb $(BINDIR)/htpasswd $(BINDIR)/syslogtocern - cp makeweb $(BINDIR)/makeweb -- chgrp $(WEBGROUP) $(BINDIR)/makeweb -- chmod 2755 $(BINDIR)/makeweb - cp htpasswd $(BINDIR)/htpasswd - cp syslogtocern $(BINDIR)/syslogtocern +--- Makefile.in.orig Mon Oct 11 20:45:38 1999 ++++ Makefile.in Sun Nov 21 23:52:46 1999 +@@ -34,7 +34,7 @@ + # Pathname of directory to install the man page. + MANDIR = @mandir@ + # Pathname of directory to install the CGI programs. +-WEBDIR = $(prefix)/www ++WEBDIR = $(prefix)/share/www + + # CONFIGURE: The group that the web directory belongs to. This is so that + # the makeweb program can be installed set-group-id to that group, and make +@@ -42,7 +42,7 @@ + WEBGROUP = www + + # CONFIGURE: Directory for CGI executables. +-CGIBINDIR = $(WEBDIR)/cgi-bin ++CGIBINDIR = $(prefix)/libexec/cgi-bin + + # You shouldn't need to edit anything below here. + +@@ -111,10 +111,10 @@ + install: installthis install-man installsubdirs + + installthis: +- $(INSTALL) -m 555 -o bin -g bin thttpd $(DESTDIR)$(BINDIR) ++ $(BSD_INSTALL_PROGRAM) thttpd $(DESTDIR)$(BINDIR) + + install-man: +- $(INSTALL) -m 444 -o bin -g bin thttpd.8 $(DESTDIR)$(MANDIR)/man8 ++ $(BSD_INSTALL_MAN) thttpd.8 $(DESTDIR)$(MANDIR)/man8 + + installsubdirs: + for i in $(SUBDIRS) ; do ( \ diff --git a/www/thttpd/patches/patch-ab b/www/thttpd/patches/patch-ab new file mode 100644 index 00000000000..4f22d1f880b --- /dev/null +++ b/www/thttpd/patches/patch-ab @@ -0,0 +1,28 @@ +$NetBSD: patch-ab,v 1.1 1999/11/21 23:03:38 tron Exp $ + +--- extras/Makefile.in.orig Wed Sep 15 18:00:14 1999 ++++ extras/Makefile.in Sun Nov 21 23:55:25 1999 +@@ -67,17 +67,15 @@ + + install: all + rm -f $(BINDIR)/makeweb $(BINDIR)/htpasswd $(BINDIR)/syslogtocern +- cp makeweb $(BINDIR)/makeweb +- chgrp $(WEBGROUP) $(BINDIR)/makeweb +- chmod 2755 $(BINDIR)/makeweb +- cp htpasswd $(BINDIR)/htpasswd +- cp syslogtocern $(BINDIR)/syslogtocern ++ $(BSD_INSTALL_PROGRAM) makeweb $(BINDIR)/makeweb ++ $(BSD_INSTALL_PROGRAM) htpasswd $(BINDIR)/htpasswd ++ $(BSD_INSTALL_SCRIPT) syslogtocern $(BINDIR)/syslogtocern + rm -f $(MANDIR)/man1/makeweb.1 +- cp makeweb.1 $(MANDIR)/man1/makeweb.1 ++ $(BSD_INSTALL_MAN) makeweb.1 $(MANDIR)/man1/makeweb.1 + rm -f $(MANDIR)/man1/htpasswd.1 +- cp htpasswd.1 $(MANDIR)/man1/htpasswd.1 ++ $(BSD_INSTALL_MAN) htpasswd.1 $(MANDIR)/man1/htpasswd.1 + rm -f $(MANDIR)/man8/syslogtocern.8 +- cp syslogtocern.8 $(MANDIR)/man8/syslogtocern.8 ++ $(BSD_INSTALL_MAN) syslogtocern.8 $(MANDIR)/man8/syslogtocern.8 + + clean: + rm -f $(CLEANFILES) diff --git a/www/thttpd/patches/patch-ac b/www/thttpd/patches/patch-ac new file mode 100644 index 00000000000..0d04604afd6 --- /dev/null +++ b/www/thttpd/patches/patch-ac @@ -0,0 +1,25 @@ +$NetBSD: patch-ac,v 1.1 1999/11/21 23:03:38 tron Exp $ + +--- cgi-src/Makefile.in.orig Wed Sep 15 17:57:19 1999 ++++ cgi-src/Makefile.in Sun Nov 21 23:57:31 1999 +@@ -66,15 +66,15 @@ + + install: all + rm -f $(CGIBINDIR)/nph-redirect +- cp nph-redirect $(CGIBINDIR)/nph-redirect ++ $(BSD_INSTALL_PROGRAM) nph-redirect $(CGIBINDIR)/nph-redirect + rm -f $(MANDIR)/man8/nph-redirect.8 +- cp nph-redirect.8 $(MANDIR)/man8/nph-redirect.8 ++ $(BSD_INSTALL_MAN) nph-redirect.8 $(MANDIR)/man8/nph-redirect.8 + rm -f $(CGIBINDIR)/ssi +- cp ssi $(CGIBINDIR)/ssi ++ $(BSD_INSTALL_PROGRAM) ssi $(CGIBINDIR)/ssi + rm -f $(MANDIR)/man8/ssi.8 +- cp ssi.8 $(MANDIR)/man8/ssi.8 ++ $(BSD_INSTALL_MAN) ssi.8 $(MANDIR)/man8/ssi.8 + rm -f $(CGIBINDIR)/phf +- cp phf $(CGIBINDIR)/phf ++ $(BSD_INSTALL_PROGRAM) phf $(CGIBINDIR)/phf + + clean: + rm -f $(CLEANFILES) diff --git a/www/thttpd/pkg/DESCR b/www/thttpd/pkg/DESCR index dd917f8b893..1e8d87ead36 100644 --- a/www/thttpd/pkg/DESCR +++ b/www/thttpd/pkg/DESCR @@ -16,7 +16,4 @@ Fast: In typical use it's about as fast as the best full-featured servers Secure: It goes to great lengths to protect the web server machine against attacks and breakins from other sites. -It also has one extremely useful feature (URL-traffic-based throttling) that -no other server currently has. - -Jef Poskanzer jef@acme.com http://www.acme.com/jef/ +thttpd also provides URL-traffic-based throttling and virtual hosting. diff --git a/www/thttpd/pkg/PLIST b/www/thttpd/pkg/PLIST index b6d1ecc5c41..41288154d52 100644 --- a/www/thttpd/pkg/PLIST +++ b/www/thttpd/pkg/PLIST @@ -1,16 +1,17 @@ -@comment $NetBSD: PLIST,v 1.3 1999/05/10 22:38:10 tron Exp $ +@comment $NetBSD: PLIST,v 1.4 1999/11/21 23:03:38 tron Exp $ sbin/thttpd sbin/syslogtocern sbin/makeweb -sbin/htpasswd +sbin/thtpasswd man/man8/thttpd.8 man/man8/syslogtocern.8 man/man8/nph-redirect.8 man/man8/ssi.8 man/man1/makeweb.1 -man/man1/htpasswd.1 -www/cgi-bin/nph-redirect -www/cgi-bin/phf -www/cgi-bin/ssi -@dirrm www/cgi-bin -@dirrm www +man/man1/thtpasswd.1 +libexec/cgi-bin/nph-redirect +libexec/cgi-bin/phf +libexec/cgi-bin/ssi +share/www/index.html +@unexec rmdir %D/libexec/cgi-bin 2>/dev/null || true +@dirrm share/www |