From owner-svn-ports-all@FreeBSD.ORG  Tue Sep 30 18:34:59 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2D9EC8D5;
 Tue, 30 Sep 2014 18:34:59 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 19DB27D5;
 Tue, 30 Sep 2014 18:34:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8UIYwKX045715;
 Tue, 30 Sep 2014 18:34:58 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8UIYw4A045714;
 Tue, 30 Sep 2014 18:34:58 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201409301834.s8UIYw4A045714@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Tue, 30 Sep 2014 18:34:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r369654 - head/security/libbeid/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.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Sep 2014 18:34:59 -0000

Author: marino
Date: Tue Sep 30 18:34:58 2014
New Revision: 369654
URL: http://svnweb.freebsd.org/changeset/ports/369654
QAT: https://qat.redports.org/buildarchive/r369654/

Log:
  security/libbeid: Add <stdlib.h> header for malloc
  
  The existing patch removed "<malloc.h>" but didn't provide "<stdlib.h>".
  Adjust to compound patch to fix that oversight.
  
  FWIW, the extra work to partially fix a patch is one reason I don't like
  one-patch-many-files.  It's not the only reason.

Modified:
  head/security/libbeid/files/patch-common

Modified: head/security/libbeid/files/patch-common
==============================================================================
--- head/security/libbeid/files/patch-common	Tue Sep 30 18:32:21 2014	(r369653)
+++ head/security/libbeid/files/patch-common	Tue Sep 30 18:34:58 2014	(r369654)
@@ -36,14 +36,15 @@ Index: common/src/datafile.cpp
  }
 Index: common/src/logbase.cpp
 ===================================================================
---- common/src/logbase.cpp	(revision 1614)
-+++ common/src/logbase.cpp	(working copy)
-@@ -29,12 +29,7 @@
+--- common/src/logbase.cpp.orig	2014-09-30 18:10:35 UTC
++++ common/src/logbase.cpp
+@@ -29,12 +29,8 @@
  #include "mw_util.h"
  
  #ifndef WIN32
 -#include <malloc.h>
 -#ifdef LINUX
++#include <stdlib.h>
  #include "wintypes.h"
 -#else
 -#include "PCSC/wintypes.h"
@@ -51,7 +52,7 @@ Index: common/src/logbase.cpp
  #include "sys/stat.h"
  #include "util.h"
  
-@@ -575,6 +570,7 @@ bool CLog::open(bool bWchar)
+@@ -575,6 +571,7 @@ bool CLog::open(bool bWchar)
  		else
  			err  = fopen_s(&m_f,utilStringNarrow(filename).c_str(),"a");
  #else