[NEW PORT] www/thttpd-st: Tiny/turbo/throttling HTTP server

	Tiny/turbo/throttling HTTP server with State Threads

PR:		ports/86601
Submitted by:	Alexander Novitsky <alecn2002@yandex.ru>

6 files changed, 77 insertions, 0 deletions

diff --git a/www/Makefile b/www/Makefile
index 5671d4b6dcf9..ea07856b0772 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -825,6 +825,7 @@
     SUBDIR += tdiary-devel
     SUBDIR += tdom
     SUBDIR += thttpd
+    SUBDIR += thttpd-st
     SUBDIR += thumbnail_index
     SUBDIR += tidy
     SUBDIR += tidy-devel
diff --git a/www/thttpd-st/Makefile b/www/thttpd-st/Makefile
new file mode 100644
index 000000000000..431612862d5a
--- /dev/null
+++ b/www/thttpd-st/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	thttpd-st
+# Date created:		2005-09-21
+# Whom:			Alexander Novitsky <alecn2002@yandex.ru>
+#
+# $FreeBSD$
+#
+
+PKGNAMESUFFIX=-st
+
+PATCH_SITES=	file://${.CURDIR}/files/
+PATCHFILES=	st-patch-fdwatch.c st-patch-thttpd.c st-patch-Makefile.in
+
+MAINTAINER=	alecn2002@yandex.ru
+COMMENT=	Tiny/turbo/throttling HTTP server with State Threads
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/libst.so.1:${PORTSDIR}/devel/st
+LIB_DEPENDS=	st.1:${PORTSDIR}/devel/st
+
+MD5_FILE=	${.CURDIR}/distinfo
+
+MASTERDIR=	${.CURDIR}/../../www/thttpd
+.include "${MASTERDIR}/Makefile"
diff --git a/www/thttpd-st/distinfo b/www/thttpd-st/distinfo
new file mode 100644
index 000000000000..ead01c5fcb1f
--- /dev/null
+++ b/www/thttpd-st/distinfo
@@ -0,0 +1,9 @@
+MD5 (thttpd/thttpd-2.25b.tar.gz) = a0e9cd87455d3a0ea11e5ea7e947adf6
+SIZE (thttpd/thttpd-2.25b.tar.gz) = 132363
+MD5 (thttpd/st-patch-fdwatch.c) = b8b8732d7779046bc15437e83a048666
+SIZE (thttpd/st-patch-fdwatch.c) = 529
+MD5 (thttpd/st-patch-thttpd.c) = ab419b476a59ffc44239c80e36df0165
+SIZE (thttpd/st-patch-thttpd.c) = 245
+MD5 (thttpd/st-patch-Makefile.in) = e401e1b524704a77654073c308a0ac32
+SIZE (thttpd/st-patch-Makefile.in) = 315
+MD5 (thttpd/notes.html) = IGNORE
diff --git a/www/thttpd-st/files/st-patch-Makefile.in b/www/thttpd-st/files/st-patch-Makefile.in
new file mode 100644
index 000000000000..1a54a383da75
--- /dev/null
+++ b/www/thttpd-st/files/st-patch-Makefile.in
@@ -0,0 +1,12 @@
+--- Makefile.in.orig0	Wed Sep 21 23:05:29 2005
++++ Makefile.in	Wed Sep 21 23:05:44 2005
+@@ -52,7 +52,7 @@
+ INCLS =		-I.
+ CFLAGS =	$(CCOPT) $(DEFS) $(INCLS)
+-LDFLAGS =	@LDFLAGS@
++LDFLAGS =	@LDFLAGS@ -L${prefix}/lib -L /usr/local/lib
+-LIBS =		@LIBS@
++LIBS =		@LIBS@ -lst
+ NETLIBS =	@V_NETLIBS@
+ INSTALL =	@INSTALL@
+ 
diff --git a/www/thttpd-st/files/st-patch-fdwatch.c b/www/thttpd-st/files/st-patch-fdwatch.c
new file mode 100644
index 000000000000..44c9528e8ef9
--- /dev/null
+++ b/www/thttpd-st/files/st-patch-fdwatch.c
@@ -0,0 +1,23 @@
+--- fdwatch.c.orig	Thu Dec 25 22:05:04 2003
++++ fdwatch.c	Wed Sep 21 22:49:32 2005
+@@ -59,6 +59,11 @@
+ 
+ #include "fdwatch.h"
+ 
++#undef HAVE_KQUEUE
++#undef HAVE_SELECT
++#undef HAVE_POLL
++#define HAVE_POLL
++
+ #ifdef HAVE_SELECT
+ #ifndef FD_SET
+ #define NFDBITS         32
+@@ -613,7 +618,7 @@
+     {
+     int r, ridx, i;
+ 
+-    r = poll( pollfds, npoll_fds, (int) timeout_msecs );
++    r = st_poll( pollfds, npoll_fds, (unsigned long long) (timeout_msecs * (timeout_msecs == INFTIM ? 1 : 1000)) );
+     if ( r <= 0 )
+ 	return r;
+ 
diff --git a/www/thttpd-st/files/st-patch-thttpd.c b/www/thttpd-st/files/st-patch-thttpd.c
new file mode 100644
index 000000000000..eab0919f52bc
--- /dev/null
+++ b/www/thttpd-st/files/st-patch-thttpd.c
@@ -0,0 +1,10 @@
+--- thttpd.c.orig	Thu Dec 25 22:06:52 2003
++++ thttpd.c	Wed Sep 21 22:30:25 2005
+@@ -631,6 +631,7 @@
+     watchdog_flag = 0;
+     (void) alarm( OCCASIONAL_TIME * 3 );
+ 
++    st_init();
+     /* Initialize the timer package. */
+     tmr_init();
+