1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-03 01:23:49 +00:00

- Update to 1.3.2

- Remove patch (submitted and approved by upstream)
This commit is contained in:
Olivier Duchateau 2013-06-07 19:39:04 +00:00
parent d5864ecd7e
commit ff8e915009
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=320223
3 changed files with 3 additions and 47 deletions

View File

@ -3,7 +3,7 @@
#
PORTNAME= bjoern
PORTVERSION= 1.3.1
PORTVERSION= 1.3.2
CATEGORIES= www python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View File

@ -1,2 +1,2 @@
SHA256 (bjoern-1.3.1.tar.gz) = e21391c1f52c088554bf62ce54f8af2889412d41f44847ecf05495b6d0a6dd6e
SIZE (bjoern-1.3.1.tar.gz) = 25811
SHA256 (bjoern-1.3.2.tar.gz) = bb272517760897a96b3fbf0564236a4f9e0e14e05d8cdcc5f9ac2957ff0c89c0
SIZE (bjoern-1.3.2.tar.gz) = 25878

View File

@ -1,44 +0,0 @@
See sendfile(2)
--- ./bjoern/portable_sendfile.c.orig 2012-07-23 14:46:30.000000000 +0000
+++ ./bjoern/portable_sendfile.c 2013-06-02 18:17:34.000000000 +0000
@@ -2,13 +2,16 @@
#define SENDFILE_CHUNK_SIZE 16*1024
+#if defined(__APPLE__) || defined(__FreeBSD__)
+
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/uio.h>
+
#ifdef __APPLE__
/* OS X */
- #include <sys/socket.h>
- #include <sys/types.h>
-
ssize_t portable_sendfile(int out_fd, int in_fd) {
off_t len = SENDFILE_CHUNK_SIZE;
if(sendfile(in_fd, out_fd, 0, &len, NULL, 0) == -1)
@@ -18,6 +21,19 @@
#else
+ /* FreeBSD */
+
+ ssize_t portable_sendfile(int out_fd, int in_fd) {
+ off_t len = SENDFILE_CHUNK_SIZE;
+ if(sendfile(in_fd, out_fd, 0, SENDFILE_CHUNK_SIZE, NULL, &len, 0) == -1)
+ return -1;
+ return len;
+ }
+
+#endif
+
+#else
+
/* Linux */
#include <sys/sendfile.h>