svn commit: r319695 - in head/www/py-bjoern: . files

[Olivier Duchateau]

Author: olivierd
Date: Sun Jun  2 17:32:07 2013
New Revision: 319695
URL: http://svnweb.freebsd.org/changeset/ports/319695

Log:
  - Update to 1.3.1
  - Trim Makefile header
  - Update maintainer address
  - Enhance COMMENT description
  - Remove ABI version in LIB_DEPENDS
  - Replace tabular by space in WWW entry (pkg-descr)

Added:
  head/www/py-bjoern/files/patch-bjoern__portable_sendfile.c   (contents, props changed)
Deleted:
  head/www/py-bjoern/files/patch-bjoern_server.c
  head/www/py-bjoern/files/patch-setup.py
Modified:
  head/www/py-bjoern/Makefile   (contents, props changed)
  head/www/py-bjoern/distinfo   (contents, props changed)
  head/www/py-bjoern/pkg-descr   (contents, props changed)

Modified: head/www/py-bjoern/Makefile
==============================================================================
--- head/www/py-bjoern/Makefile	Sun Jun  2 17:30:08 2013	(r319694)
+++ head/www/py-bjoern/Makefile	Sun Jun  2 17:32:07 2013	(r319695)
@@ -1,31 +1,26 @@
-# New ports collection makefile for: py-bjoern
-# Date created:	2011-10-23
-# Whom:	Olivier Duchateau <duchateau.olivier at gmail.com>
-#
+# Created by: Olivier Duchateau <duchateau.olivier at gmail.com>
 # $FreeBSD$
 #
 
 PORTNAME=	bjoern
-PORTVERSION=	1.2
+PORTVERSION=	1.3.1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	duchateau.olivier at gmail.com
-COMMENT=	A screamingly fast Python WSGI server
+MAINTAINER=	olivierd at FreeBSD.org
+COMMENT=	Fast Python WSGI server
 
 LICENSE=	BSD
-LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	ev.4:${PORTSDIR}/devel/libev
+LIB_DEPENDS=	ev:${PORTSDIR}/devel/libev
 
 USE_PYTHON=	2.6+
 USE_PYDISTUTILS=	yes
 
-PLIST_FILES=	%%PYTHON_SITELIBDIR%%/${PORTNAME}.so
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lc
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-		${WRKSRC}/setup.py
+PLIST_FILES=	%%PYTHON_SITELIBDIR%%/${PORTNAME}.so
 
 .include <bsd.port.mk>

Modified: head/www/py-bjoern/distinfo
==============================================================================
--- head/www/py-bjoern/distinfo	Sun Jun  2 17:30:08 2013	(r319694)
+++ head/www/py-bjoern/distinfo	Sun Jun  2 17:32:07 2013	(r319695)
@@ -1,2 +1,2 @@
-SHA256 (bjoern-1.2.tar.gz) = 9a4cf18fbcab49a0b53e98c9b1837df311af1ec58f711fcf91172b83e07b1e20
-SIZE (bjoern-1.2.tar.gz) = 22811
+SHA256 (bjoern-1.3.1.tar.gz) = e21391c1f52c088554bf62ce54f8af2889412d41f44847ecf05495b6d0a6dd6e
+SIZE (bjoern-1.3.1.tar.gz) = 25811

Added: head/www/py-bjoern/files/patch-bjoern__portable_sendfile.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/py-bjoern/files/patch-bjoern__portable_sendfile.c	Sun Jun  2 17:32:07 2013	(r319695)
@@ -0,0 +1,44 @@
+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>

Modified: head/www/py-bjoern/pkg-descr
==============================================================================
--- head/www/py-bjoern/pkg-descr	Sun Jun  2 17:30:08 2013	(r319694)
+++ head/www/py-bjoern/pkg-descr	Sun Jun  2 17:32:07 2013	(r319695)
@@ -2,4 +2,4 @@ bjoern, is a fast and ultra-lightweight 
 uses Marc Lehmann's hight performance libev event loop and Ryan Dahl's
 http-parser.
 
-WWW:	https://github.com/jonashaag/bjoern
+WWW: https://github.com/jonashaag/bjoern