From owner-svn-ports-head@FreeBSD.ORG  Tue Dec  3 18:08:21 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7CAFEFFB;
 Tue,  3 Dec 2013 18:08:21 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 68B47168D;
 Tue,  3 Dec 2013 18:08:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB3I8LfK026753;
 Tue, 3 Dec 2013 18:08:21 GMT (envelope-from osa@svn.freebsd.org)
Received: (from osa@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB3I8LX3026752;
 Tue, 3 Dec 2013 18:08:21 GMT (envelope-from osa@svn.freebsd.org)
Message-Id: <201312031808.rB3I8LX3026752@svn.freebsd.org>
From: "Sergey A. Osokin" <osa@FreeBSD.org>
Date: Tue, 3 Dec 2013 18:08:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r335584 - head/www/nginx/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-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Dec 2013 18:08:21 -0000

Author: osa
Date: Tue Dec  3 18:08:20 2013
New Revision: 335584
URL: http://svnweb.freebsd.org/changeset/ports/335584

Log:
  Fix syslog support.
  Do not bump PORTREVISION cause syslog support disabled by default.
  
  Patch from:	rea
  PR:		ports/180639

Modified:
  head/www/nginx/files/extra-patch-syslog_support

Modified: head/www/nginx/files/extra-patch-syslog_support
==============================================================================
--- head/www/nginx/files/extra-patch-syslog_support	Tue Dec  3 17:47:15 2013	(r335583)
+++ head/www/nginx/files/extra-patch-syslog_support	Tue Dec  3 18:08:20 2013	(r335584)
@@ -347,14 +347,16 @@ diff --git src/core/ngx_log.h src/core/n
 index 3233647..5e7fdbf 100644
 --- src/core/ngx_log.h
 +++ src/core/ngx_log.h
-@@ -12,6 +12,13 @@
+@@ -12,6 +12,15 @@
  #include <ngx_config.h>
  #include <ngx_core.h>
  
 +#if (NGX_ENABLE_SYSLOG)
 +#include <syslog.h>
 +
++#ifndef SYSLOG_FACILITY
 +#define SYSLOG_FACILITY LOG_LOCAL5
++#endif
 +#define ERR_SYSLOG_PRIORITY LOG_ERR
 +#endif
 +
@@ -721,7 +723,7 @@ index 54e1c26..2b05157 100644
 +    SYSLOG_FACILITY="LOG_DAEMON"
 +fi
 +if test "${USE_SYSLOG}" = "YES"; then
-+    CFLAGS="$CFLAGS -DUSE_SYSLOG -DSYSLOG_FACILITY=${SYSLOG_FACILITY}"
++    CFLAGS="$CFLAGS -DNGX_ENABLE_SYSLOG -DSYSLOG_FACILITY=${SYSLOG_FACILITY}"
 +fi
  
  cat << END                                                     > $NGX_MAKEFILE