From owner-svn-ports-head@freebsd.org  Mon Nov 21 21:27:00 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 52FC2C4DC75;
 Mon, 21 Nov 2016 21:27:00 +0000 (UTC)
 (envelope-from rakuco@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 0C6DD8F2;
 Mon, 21 Nov 2016 21:26:59 +0000 (UTC)
 (envelope-from rakuco@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uALLQxAv063110;
 Mon, 21 Nov 2016 21:26:59 GMT (envelope-from rakuco@FreeBSD.org)
Received: (from rakuco@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uALLQxT0063108;
 Mon, 21 Nov 2016 21:26:59 GMT (envelope-from rakuco@FreeBSD.org)
Message-Id: <201611212126.uALLQxT0063108@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rakuco set sender to
 rakuco@FreeBSD.org using -f
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Mon, 21 Nov 2016 21:26:59 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r426759 - in head/databases/xapian-core: . 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.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Nov 2016 21:27:00 -0000

Author: rakuco
Date: Mon Nov 21 21:26:58 2016
New Revision: 426759
URL: https://svnweb.freebsd.org/changeset/ports/426759

Log:
  Unbreak the build on FreeBSD 9 after r426647.
  
  SOCK_CLOEXEC was introduced in FreeBSD 10, so define it to 0 on FreeBSD 9 (the
  code already handles this case). Xapian 1.4 has a safesyssocket.h that does the
  same thing.
  
  PR:		214699
  Approved by:	portmgr (antoine)

Added:
  head/databases/xapian-core/files/extrapatch-backends_flint__lock.cc   (contents, props changed)
Modified:
  head/databases/xapian-core/Makefile

Modified: head/databases/xapian-core/Makefile
==============================================================================
--- head/databases/xapian-core/Makefile	Mon Nov 21 21:26:02 2016	(r426758)
+++ head/databases/xapian-core/Makefile	Mon Nov 21 21:26:58 2016	(r426759)
@@ -28,9 +28,16 @@ PORTDOCS=	*
 
 SSE2_CONFIGURE_ENABLE=	sse
 
+.include <bsd.port.pre.mk>
+
+# FreeBSD 9 does not have SOCK_CLOEXEC.
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
+EXTRA_PATCHES=	${FILESDIR}/extrapatch-backends_flint__lock.cc
+.endif
+
 post-install:
 .for file in copydatabase delve quest
 	${INSTALL_PROGRAM} ${WRKSRC}/examples/.libs/${file} ${STAGEDIR}${PREFIX}/bin/xapian-${file}
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Added: head/databases/xapian-core/files/extrapatch-backends_flint__lock.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/xapian-core/files/extrapatch-backends_flint__lock.cc	Mon Nov 21 21:26:58 2016	(r426759)
@@ -0,0 +1,16 @@
+FreeBSD 9 does not have SOCK_CLOEXEC. Define it to 0, as the code already deals
+with it.
+Xapian 1.4 has a safesyssocket.h that takes care of this.
+--- backends/flint_lock.cc.orig	2016-09-16 01:59:15 UTC
++++ backends/flint_lock.cc
+@@ -59,6 +59,10 @@ using namespace std;
+ # endif
+ #endif
+ 
++#ifndef SOCK_CLOEXEC
++#define SOCK_CLOEXEC 0
++#endif
++
+ FlintLock::reason
+ FlintLock::lock(bool exclusive, string & explanation) {
+     // Currently we only support exclusive locks.