From owner-svn-ports-head@FreeBSD.ORG  Wed Apr 24 02:42:22 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 0666DB72;
 Wed, 24 Apr 2013 02:42:22 +0000 (UTC)
 (envelope-from swills@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D17761A9C;
 Wed, 24 Apr 2013 02:42:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3O2gLga014683;
 Wed, 24 Apr 2013 02:42:21 GMT (envelope-from swills@svn.freebsd.org)
Received: (from swills@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3O2gLwC014681;
 Wed, 24 Apr 2013 02:42:21 GMT (envelope-from swills@svn.freebsd.org)
Message-Id: <201304240242.r3O2gLwC014681@svn.freebsd.org>
From: Steve Wills <swills@FreeBSD.org>
Date: Wed, 24 Apr 2013 02:42:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r316400 - in head/net-p2p/bitcoin: . 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.14
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: Wed, 24 Apr 2013 02:42:22 -0000

Author: swills
Date: Wed Apr 24 02:42:20 2013
New Revision: 316400
URL: http://svnweb.freebsd.org/changeset/ports/316400

Log:
  - Add patch to prevent deletion of /dev/null
  
  PR:		ports/177867
  Submitted by:	Robert Backahus <robbak@robbak.com> (maintainer)

Added:
  head/net-p2p/bitcoin/files/
  head/net-p2p/bitcoin/files/patch-leveldb_makefile   (contents, props changed)
Modified:
  head/net-p2p/bitcoin/Makefile

Modified: head/net-p2p/bitcoin/Makefile
==============================================================================
--- head/net-p2p/bitcoin/Makefile	Wed Apr 24 00:08:36 2013	(r316399)
+++ head/net-p2p/bitcoin/Makefile	Wed Apr 24 02:42:20 2013	(r316400)
@@ -3,6 +3,7 @@
 
 PORTNAME=	bitcoin
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	net-p2p finance
 
 MAINTAINER=	robbak@robbak.com

Added: head/net-p2p/bitcoin/files/patch-leveldb_makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-p2p/bitcoin/files/patch-leveldb_makefile	Wed Apr 24 02:42:20 2013	(r316400)
@@ -0,0 +1,58 @@
+From 966781671d44a4bcaa4a03c8c59dc280acf2c595 Mon Sep 17 00:00:00 2001
+From: Sander Kleykens <sander@kleykens.com>
+Date: Sat, 23 Mar 2013 17:16:02 +0100
+Subject: [PATCH] Fix /dev/null getting removed during compilation on some
+ systems.
+
+---
+ src/leveldb/build_detect_platform | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/src/leveldb/build_detect_platform b/src/leveldb/build_detect_platform
+index 609cb51..bebf607 100755
+--- a/src/leveldb/build_detect_platform
++++ src/leveldb/build_detect_platform
+@@ -25,6 +25,8 @@
+ #       -DSNAPPY                     if the Snappy library is present
+ #
+ 
++TMPDIR="/tmp"
++
+ OUTPUT=$1
+ PREFIX=$2
+ if test -z "$OUTPUT" || test -z "$PREFIX"; then
+@@ -164,7 +166,9 @@ if [ "$CROSS_COMPILE" = "true" ]; then
+     true
+ else
+     # If -std=c++0x works, use <cstdatomic>.  Otherwise use port_posix.h.
+-    $CXX $CXXFLAGS -std=c++0x -x c++ - -o /dev/null 2>/dev/null  <<EOF
++    CPP0X_TEST_TEMPFILE="${TMPDIR}/leveldb-build_detect_platform_cpp0x.$$"
++
++    $CXX $CXXFLAGS -std=c++0x -x c++ - -o ${CPP0X_TEST_TEMPFILE} 2>/dev/null  <<EOF
+       #include <cstdatomic>
+       int main() {}
+ EOF
+@@ -175,13 +179,19 @@ EOF
+         COMMON_FLAGS="$COMMON_FLAGS -DLEVELDB_PLATFORM_POSIX"
+     fi
+ 
++    rm -f ${CPP0X_TEST_TEMPFILE} > /dev/null 2>&1
++
+     # Test whether tcmalloc is available
+-    $CXX $CXXFLAGS -x c++ - -o /dev/null -ltcmalloc 2>/dev/null  <<EOF
++    TCMALLOC_TEST_TEMPFILE="${TMPDIR}/leveldb-build_detect_platform_tcmalloc.$$"
++
++    $CXX $CXXFLAGS -x c++ - -o ${TCMALLOC_TEST_TEMPFILE} -ltcmalloc 2>/dev/null  <<EOF
+       int main() {}
+ EOF
+     if [ "$?" = 0 ]; then
+         PLATFORM_LIBS="$PLATFORM_LIBS -ltcmalloc"
+     fi
++
++    rm -f ${TCMALLOC_TEST_TEMPFILE} > /dev/null 2>&1
+ fi
+ 
+ PLATFORM_CCFLAGS="$PLATFORM_CCFLAGS $COMMON_FLAGS"
+-- 
+1.8.1.5
+