[pkgsrc/trunk]: pkgsrc/www/lighttpd Allow sendfile on DragonFly to be compile...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d871547c5edf
branches:  trunk
changeset: 522798:d871547c5edf
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Dec 22 21:07:11 2006 +0000

description:
Allow sendfile on DragonFly to be compiled in. Bump revision.
Noticed by Peter Avalos.

diffstat:

 www/lighttpd/Makefile         |   3 ++-
 www/lighttpd/distinfo         |   4 +++-
 www/lighttpd/patches/patch-aa |  13 +++++++++++++
 www/lighttpd/patches/patch-ab |  13 +++++++++++++
 4 files changed, 31 insertions(+), 2 deletions(-)

diffs (58 lines):

diff -r c3094eeb8427 -r d871547c5edf www/lighttpd/Makefile
--- a/www/lighttpd/Makefile     Fri Dec 22 21:04:14 2006 +0000
+++ b/www/lighttpd/Makefile     Fri Dec 22 21:07:11 2006 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2006/07/07 15:49:34 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/12/22 21:07:11 joerg Exp $
 
 DISTNAME=      lighttpd-1.4.11
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  http://www.lighttpd.net/download/
 
diff -r c3094eeb8427 -r d871547c5edf www/lighttpd/distinfo
--- a/www/lighttpd/distinfo     Fri Dec 22 21:04:14 2006 +0000
+++ b/www/lighttpd/distinfo     Fri Dec 22 21:07:11 2006 +0000
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.6 2006/04/10 12:07:18 joerg Exp $
+$NetBSD: distinfo,v 1.7 2006/12/22 21:07:11 joerg Exp $
 
 SHA1 (lighttpd-1.4.11.tar.gz) = ca904d3d4d9dde76f85156f2c709a394f30e28c8
 RMD160 (lighttpd-1.4.11.tar.gz) = 0434e6c09383f1ad443d985fd168a29f6f132d1f
 Size (lighttpd-1.4.11.tar.gz) = 781656 bytes
+SHA1 (patch-aa) = f1e8cad740e6ede7fdc38367f75a7ef9d5605a71
+SHA1 (patch-ab) = c76c85d631c6cc76e8d72076308259c3e4c8426b
diff -r c3094eeb8427 -r d871547c5edf www/lighttpd/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/lighttpd/patches/patch-aa     Fri Dec 22 21:07:11 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.5 2006/12/22 21:07:11 joerg Exp $
+
+--- src/network_backends.h.orig        2006-12-22 20:42:35.000000000 +0000
++++ src/network_backends.h
+@@ -14,7 +14,7 @@
+ # include <sys/uio.h>
+ #endif
+ 
+-#if defined HAVE_SYS_UIO_H && defined HAVE_SENDFILE && defined HAVE_WRITEV && defined(__FreeBSD__)
++#if defined HAVE_SYS_UIO_H && defined HAVE_SENDFILE && defined HAVE_WRITEV && (defined(__FreeBSD__) || defined(__DragonFly__))
+ # define USE_FREEBSD_SENDFILE
+ # include <sys/uio.h>
+ #endif
diff -r c3094eeb8427 -r d871547c5edf www/lighttpd/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/lighttpd/patches/patch-ab     Fri Dec 22 21:07:11 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2006/12/22 21:07:11 joerg Exp $
+
+--- src/network_freebsd_sendfile.c.orig        2006-12-22 20:54:33.000000000 +0000
++++ src/network_freebsd_sendfile.c
+@@ -25,7 +25,7 @@
+ 
+ 
+ #ifndef UIO_MAXIOV
+-# ifdef __FreeBSD__
++# if defined(__FreeBSD__) || defined(__DragonFly__)
+ /* FreeBSD 4.7, 4.9 defined it in sys/uio.h only if _KERNEL is specified */ 
+ #  define UIO_MAXIOV 1024
+ # endif