diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/thttpd/Makefile | 13 | ||||
| -rw-r--r-- | www/thttpd/distinfo | 2 | ||||
| -rw-r--r-- | www/thttpd/files/patch-ab | 11 | ||||
| -rw-r--r-- | www/thttpd/files/patch-ac | 11 | ||||
| -rw-r--r-- | www/thttpd/files/patch-ad | 11 | ||||
| -rw-r--r-- | www/thttpd/files/patch-fdwatch.c | 21 |
6 files changed, 65 insertions, 4 deletions
diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile index f844358c6918..3aaa6dca43e8 100644 --- a/www/thttpd/Makefile +++ b/www/thttpd/Makefile @@ -6,19 +6,26 @@ # PORTNAME= thttpd -PORTVERSION= 2.20b +PORTVERSION= 2.21b CATEGORIES= www ipv6 MASTER_SITES= http://www.acme.com/software/thttpd/ \ http://www.freenix.no/~anders/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} notes.html +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= anders@fix.no IGNOREFILES= notes.html -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 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 @@ -80,4 +87,4 @@ config-message: @${ECHO} "" @${ECHO} "=====================================================================" -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/www/thttpd/distinfo b/www/thttpd/distinfo index c14427777f0f..4b6fff2146af 100644 --- a/www/thttpd/distinfo +++ b/www/thttpd/distinfo @@ -1,2 +1,2 @@ -MD5 (thttpd-2.20b.tar.gz) = ab9c3c1214f599d86944d6264ec90fed +MD5 (thttpd-2.21b.tar.gz) = 0041d478af3ab838fae2c1c2a3288c85 MD5 (notes.html) = IGNORE diff --git a/www/thttpd/files/patch-ab b/www/thttpd/files/patch-ab new file mode 100644 index 000000000000..a51144a82d33 --- /dev/null +++ b/www/thttpd/files/patch-ab @@ -0,0 +1,11 @@ +--- Makefile.in.orig Tue Apr 24 19:21:06 2001 ++++ Makefile.in Tue Apr 24 19:21:33 2001 +@@ -47,7 +47,7 @@ + # You shouldn't need to edit anything below here. + + CC = @CC@ +-CCOPT = @V_CCOPT@ ++CCOPT = @CFLAGS@ + DEFS = @DEFS@ + INCLS = -I. + CFLAGS = $(CCOPT) $(DEFS) $(INCLS) diff --git a/www/thttpd/files/patch-ac b/www/thttpd/files/patch-ac new file mode 100644 index 000000000000..5c8235ba280c --- /dev/null +++ b/www/thttpd/files/patch-ac @@ -0,0 +1,11 @@ +--- cgi-src/Makefile.in.orig Tue Apr 24 19:44:12 2001 ++++ cgi-src/Makefile.in Tue Apr 24 19:44:25 2001 +@@ -31,7 +31,7 @@ + MANDIR = @mandir@ + + CC = @CC@ +-CCOPT = @V_CCOPT@ ++CCOPT = @CFLAGS@ + DEFS = @DEFS@ + INCLS = -I.. + CFLAGS = $(CCOPT) $(DEFS) $(INCLS) diff --git a/www/thttpd/files/patch-ad b/www/thttpd/files/patch-ad new file mode 100644 index 000000000000..ffbea63562e0 --- /dev/null +++ b/www/thttpd/files/patch-ad @@ -0,0 +1,11 @@ +--- extras/Makefile.in.orig Tue Apr 24 19:46:03 2001 ++++ extras/Makefile.in Tue Apr 24 19:46:13 2001 +@@ -32,7 +32,7 @@ + MANDIR = @mandir@ + + CC = @CC@ +-CCOPT = @V_CCOPT@ ++CCOPT = @CFLAGS@ + DEFS = @DEFS@ + INCLS = -I.. + CFLAGS = $(CCOPT) $(DEFS) $(INCLS) diff --git a/www/thttpd/files/patch-fdwatch.c b/www/thttpd/files/patch-fdwatch.c new file mode 100644 index 000000000000..da59f033a755 --- /dev/null +++ b/www/thttpd/files/patch-fdwatch.c @@ -0,0 +1,21 @@ +--- fdwatch.c.orig Tue Apr 24 18:40:22 2001 ++++ fdwatch.c Tue Apr 24 19:00:57 2001 +@@ -32,6 +32,7 @@ + #include <sys/time.h> + #include <sys/resource.h> + #include <syslog.h> ++#include <sys/param.h> + + #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> |