Attachment #16349 for bug #30009

View | Details | Raw Unified | Return to bug 30009
Collapse All | Expand All





GNU_CONFIGURE=	yes

.include <bsd.port.pre.mk>

# Kqueue doesn't work in -current with thttpd.
.if ${OSVERSION} >= 500000
CFLAGS+=	-DHAVE_FREEBSD_CURRENT
.endif

MAN1=		makeweb.1 htpasswd.1
MAN8=		thttpd.8 redirect.8 ssi.8 syslogtocern.8


	@${ECHO} ""
	@${ECHO} "====================================================================="

.include <bsd.port.mk>




--- fdwatch.c.orig	Fri Aug 24 00:19:39 2001
+++ fdwatch.c	Fri Aug 24 00:20:30 2001
@@ -311,6 +311,9 @@
     if ( kqchanges == (struct kevent*) 0 || kqevents == (struct kevent*) 0 ||
 	 kqrfdidx == (int*) 0 )
 	return -1;
+    memset(kqchanges, '\0', sizeof(struct kevent) * 2 * nfiles);
+    memset(kqevents, '\0', sizeof(struct kevent) * nfiles);
+    memset(kqrfdidx, '\0', sizeof(int) * nfiles);
     return 0;
     }
 
 #ifndef MIN
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
@@ -44,6 +45,10 @@
 #include <sys/poll.h>
 #endif /* HAVE_SYS_POLL_H */
 #endif /* HAVE_POLL_H */
+
+#ifdef HAVE_FREEBSD_CURRENT
+#undef HAVE_KQUEUE
+#endif
 
 #ifdef HAVE_SYS_EVENT_H
 #include <sys/event.h>

Return to bug 30009

Lines 19-31 Link Here

(-)thttpd/Makefile (-8 / +1 lines)
19		19
20	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
21		21
22	.include <bsd.port.pre.mk>
23
24	# Kqueue doesn't work in -current with thttpd.
25	.if ${OSVERSION} >= 500000
26	CFLAGS+= -DHAVE_FREEBSD_CURRENT
27	.endif
28
29	MAN1= makeweb.1 htpasswd.1	22	MAN1= makeweb.1 htpasswd.1
30	MAN8= thttpd.8 redirect.8 ssi.8 syslogtocern.8	23	MAN8= thttpd.8 redirect.8 ssi.8 syslogtocern.8
31		24
Lines 87-90 Link Here
87	@${ECHO} ""	80	@${ECHO} ""
88	@${ECHO} "====================================================================="	81	@${ECHO} "====================================================================="
89		82
90	.include <bsd.port.post.mk>	83	.include <bsd.port.mk>

Lines 1-21 Link Here

(-)thttpd/files/patch-fdwatch.c (-20 / +11 lines)
1	--- fdwatch.c.orig Tue Apr 24 18:40:22 2001	1	--- fdwatch.c.orig Fri Aug 24 00:19:39 2001
2	+++ fdwatch.c Tue Apr 24 19:00:57 2001	2	+++ fdwatch.c Fri Aug 24 00:20:30 2001
3	@@ -32,6 +32,7 @@	3	@@ -311,6 +311,9 @@
4	#include <sys/time.h>	4	if ( kqchanges == (struct kevent) 0 \|\| kqevents == (struct kevent) 0 \|\|
5	#include <sys/resource.h>	5	kqrfdidx == (int*) 0 )
6	#include <syslog.h>	6	return -1;
7	+#include <sys/param.h>	7	+ memset(kqchanges, '\0', sizeof(struct kevent) * 2 * nfiles);
		8	+ memset(kqevents, '\0', sizeof(struct kevent) * nfiles);
		9	+ memset(kqrfdidx, '\0', sizeof(int) * nfiles);
		10	return 0;
		11	}
8		12
9	#ifndef MIN
10	#define MIN(a,b) ((a) < (b) ? (a) : (b))
11	@@ -44,6 +45,10 @@
12	#include <sys/poll.h>
13	#endif /* HAVE_SYS_POLL_H */
14	#endif /* HAVE_POLL_H */
15	+
16	+#ifdef HAVE_FREEBSD_CURRENT
17	+#undef HAVE_KQUEUE
18	+#endif
19
20	#ifdef HAVE_SYS_EVENT_H
21	#include <sys/event.h>