From owner-svn-ports-head@freebsd.org  Thu May 19 05:34:28 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 B2BFDB414DA;
 Thu, 19 May 2016 05:34:28 +0000 (UTC) (envelope-from hrs@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 7D2101D9A;
 Thu, 19 May 2016 05:34:28 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4J5YRv3087312;
 Thu, 19 May 2016 05:34:27 GMT (envelope-from hrs@FreeBSD.org)
Received: (from hrs@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4J5YR6I087311;
 Thu, 19 May 2016 05:34:27 GMT (envelope-from hrs@FreeBSD.org)
Message-Id: <201605190534.u4J5YR6I087311@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hrs set sender to hrs@FreeBSD.org
 using -f
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Thu, 19 May 2016 05:34:27 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r415491 - head/security/trousers/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.22
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: Thu, 19 May 2016 05:34:28 -0000

Author: hrs
Date: Thu May 19 05:34:27 2016
New Revision: 415491
URL: https://svnweb.freebsd.org/changeset/ports/415491

Log:
  Fix tcs/Makefile.am to use -I${top_srcdir}/src/include before
  -I@OPENSSL_INCLUDE_DIR@.

Modified:
  head/security/trousers/files/patch-src-tcs-Makefile.am

Modified: head/security/trousers/files/patch-src-tcs-Makefile.am
==============================================================================
--- head/security/trousers/files/patch-src-tcs-Makefile.am	Thu May 19 05:24:48 2016	(r415490)
+++ head/security/trousers/files/patch-src-tcs-Makefile.am	Thu May 19 05:34:27 2016	(r415491)
@@ -1,12 +1,17 @@
 --- src/tcs/Makefile.am.orig	2014-04-25 03:05:44.000000000 +0900
-+++ src/tcs/Makefile.am	2016-05-19 03:02:33.269090000 +0900
-@@ -1,4 +1,4 @@
++++ src/tcs/Makefile.am	2016-05-19 11:05:16.773730000 +0900
+@@ -1,8 +1,7 @@
 -noinst_LIBRARIES=libtcs.a
 +noinst_LIBRARIES=libtcs.a libtcs_emu.a
  
- CFLAGS+=-I${top_srcdir}/src/include
+-CFLAGS+=-I${top_srcdir}/src/include
  libtcs_a_LIBADD=${top_builddir}/src/tddl/libtddl.a
-@@ -91,7 +91,7 @@
+-libtcs_a_CFLAGS=-DAPPID=\"TCSD\ TCS\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\" -fPIE -DPIE
++libtcs_a_CFLAGS=-I${top_srcdir}/src/include -DAPPID=\"TCSD\ TCS\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\" -fPIE -DPIE
+ 
+ libtcs_a_SOURCES=log.c \
+ 		 tcs_caps.c \
+@@ -91,7 +90,7 @@
  if TSS_BUILD_KEY
  libtcs_a_SOURCES+=tcsi_key.c tcs_key.c tcs_key_mem_cache.c tcs_context_key.c rpc/@RPC@/rpc_key.c \
  		  crypto/@CRYPTO_PACKAGE@/crypto.c
@@ -15,7 +20,7 @@
  endif
  if TSS_BUILD_MAINT
  libtcs_a_SOURCES+=tcsi_maint.c rpc/@RPC@/rpc_maint.c
-@@ -140,3 +140,143 @@
+@@ -140,3 +139,143 @@
  libtcs_a_SOURCES+=tcsi_cmk.c rpc/@RPC@/rpc_cmk.c
  libtcs_a_CFLAGS+=-DTSS_BUILD_CMK
  endif