From owner-svn-ports-all@freebsd.org  Thu Nov  3 16:14:12 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1088DC298EE;
 Thu,  3 Nov 2016 16:14:12 +0000 (UTC)
 (envelope-from madpilot@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A75FC1045;
 Thu,  3 Nov 2016 16:14:11 +0000 (UTC)
 (envelope-from madpilot@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA3GEAnX049264;
 Thu, 3 Nov 2016 16:14:10 GMT (envelope-from madpilot@FreeBSD.org)
Received: (from madpilot@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA3GEATe049262;
 Thu, 3 Nov 2016 16:14:10 GMT (envelope-from madpilot@FreeBSD.org)
Message-Id: <201611031614.uA3GEATe049262@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: madpilot set sender to
 madpilot@FreeBSD.org using -f
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Thu, 3 Nov 2016 16:14:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r425245 - in head/www/lighttpd: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Nov 2016 16:14:12 -0000

Author: madpilot
Date: Thu Nov  3 16:14:10 2016
New Revision: 425245
URL: https://svnweb.freebsd.org/changeset/ports/425245

Log:
  - Modify patch to check is we are on FreeBSD before checking
    __FreeBSD_version. [1]
  - Explicitly include param.h
  
  Suggested by:	marino@ [1]

Modified:
  head/www/lighttpd/Makefile
  head/www/lighttpd/files/patch-src_mod__cgi.c

Modified: head/www/lighttpd/Makefile
==============================================================================
--- head/www/lighttpd/Makefile	Thu Nov  3 16:11:48 2016	(r425244)
+++ head/www/lighttpd/Makefile	Thu Nov  3 16:14:10 2016	(r425245)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	lighttpd
 PORTVERSION=	1.4.43
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	www
 MASTER_SITES?=	http://download.lighttpd.net/lighttpd/releases-1.4.x/
 

Modified: head/www/lighttpd/files/patch-src_mod__cgi.c
==============================================================================
--- head/www/lighttpd/files/patch-src_mod__cgi.c	Thu Nov  3 16:11:48 2016	(r425244)
+++ head/www/lighttpd/files/patch-src_mod__cgi.c	Thu Nov  3 16:14:10 2016	(r425245)
@@ -1,11 +1,13 @@
---- src/mod_cgi.c.orig 2016-11-02 13:53:21 UTC
+--- src/mod_cgi.c.orig	2016-10-31 13:16:40 UTC
 +++ src/mod_cgi.c
-@@ -36,7 +36,7 @@
+@@ -35,8 +35,9 @@
+ 
  #include <stdio.h>
  #include <fcntl.h>
-
++#include <sys/param.h>
+ 
 -#if defined(O_CLOEXEC) && (!defined(__FreeBSD__) || defined(F_DUPFD_CLOEXEC))
-+#if defined(O_CLOEXEC) && __FreeBSD_version >= 1000032
++#if defined(O_CLOEXEC) && (!defined(__FreeBSD__) || __FreeBSD_version >= 1000032) 
  #define pipe_cloexec(pipefd) pipe2((pipefd), O_CLOEXEC)
  #elif defined FD_CLOEXEC
  #define pipe_cloexec(pipefd) \