From owner-svn-ports-head@FreeBSD.ORG Thu Dec 5 07:59:04 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AC35ED33; Thu, 5 Dec 2013 07:59:04 +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 9824E15A6; Thu, 5 Dec 2013 07:59:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB57x4iq015303; Thu, 5 Dec 2013 07:59:04 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB57x35v015299; Thu, 5 Dec 2013 07:59:03 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201312050759.rB57x35v015299@svn.freebsd.org> From: Hiroki Sato Date: Thu, 5 Dec 2013 07:59:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335654 - in 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.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Dec 2013 07:59:04 -0000 Author: hrs Date: Thu Dec 5 07:59:03 2013 New Revision: 335654 URL: http://svnweb.freebsd.org/changeset/ports/335654 Log: Fix iconv and pthread dependency. Modified: head/security/trousers/Makefile head/security/trousers/files/extra-patch-src-tcsd-Makefile.am head/security/trousers/files/patch-src-trspi-Makefile.am head/security/trousers/files/patch-src-tspi-Makefile.am Modified: head/security/trousers/Makefile ============================================================================== --- head/security/trousers/Makefile Thu Dec 5 06:28:41 2013 (r335653) +++ head/security/trousers/Makefile Thu Dec 5 07:59:03 2013 (r335654) @@ -3,7 +3,7 @@ PORTNAME= trousers PORTVERSION= 0.3.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} @@ -20,11 +20,12 @@ USE_OPENSSL= YES USE_LDCONFIG= YES USE_AUTOTOOLS= autoconf automake libtool USE_RC_SUBR= tcsd -WRKSRC= ${WRKDIR}/${DISTNAME} GNU_CONFIGURE= YES CONFIGURE_ARGS= --with-gui=none --enable-static \ --localstatedir=${PREFIX}/var \ --with-tssuser=${USERS} --with-tssgroup=${GROUPS} +MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} ICONV_LIB=${ICONV_LIB} \ + ICONV_PREFIX=${ICONV_PREFIX} SUB_FILES= pkg-message SUB_LIST= USERS=${USERS} GROUPS=${GROUPS} USERS= _tss @@ -51,10 +52,6 @@ CONFLICTS+= tpm-emulator-[0-9]* PLIST_SUB+= TDDL="" .endif -post-patch: - @${REINPLACE_CMD} -e 's/-liconv$$/${ICONV_LIB}/' \ - ${WRKSRC}/src/tspi/Makefile.am - run-autotools: run-autotools-autoreconf run-autotools-autoreconf: Modified: head/security/trousers/files/extra-patch-src-tcsd-Makefile.am ============================================================================== --- head/security/trousers/files/extra-patch-src-tcsd-Makefile.am Thu Dec 5 06:28:41 2013 (r335653) +++ head/security/trousers/files/extra-patch-src-tcsd-Makefile.am Thu Dec 5 07:59:03 2013 (r335654) @@ -5,7 +5,7 @@ tcsd_CFLAGS=-DAPPID=\"TCSD\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\" -I${top_srcdir}/src/include -fPIE -DPIE -tcsd_LDADD=${top_builddir}/src/tcs/libtcs.a ${top_builddir}/src/tddl/libtddl.a -lpthread @CRYPTOLIB@ -+tcsd_LDADD=${LOCALBASE}/lib/libtcs.a ${LOCALBASE}/lib/libtddl.a ${PTHREAD_LIB} @CRYPTOLIB@ ++tcsd_LDADD=${LOCALBASE}/lib/libtcs.a ${LOCALBASE}/lib/libtddl.a ${PTHREAD_LIBS} @CRYPTOLIB@ tcsd_LDFLAGS=-pie -Wl,-z,relro -Wl,-z,now tcsd_SOURCES=svrside.c tcsd_conf.c tcsd_threads.c platform.c Modified: head/security/trousers/files/patch-src-trspi-Makefile.am ============================================================================== --- head/security/trousers/files/patch-src-trspi-Makefile.am Thu Dec 5 06:28:41 2013 (r335653) +++ head/security/trousers/files/patch-src-trspi-Makefile.am Thu Dec 5 07:59:03 2013 (r335654) @@ -1,12 +1,12 @@ ---- src/trspi/Makefile.am.orig 2010-03-12 05:41:54.000000000 +0900 -+++ src/trspi/Makefile.am 2010-10-24 21:04:04.839558584 +0900 +--- src/trspi/Makefile.am.orig 2012-09-20 02:24:48.000000000 +0900 ++++ src/trspi/Makefile.am 2013-12-05 15:12:35.000000000 +0900 @@ -1,7 +1,8 @@ noinst_LTLIBRARIES=libtrousers.la libtrousers_la_SOURCES=trousers.c crypto/@CRYPTO_PACKAGE@/hash.c -libtrousers_la_CFLAGS=-DAPPID=\"TSPI\" -I${top_srcdir}/src/include +libtrousers_la_CFLAGS=-DAPPID=\"TSPI\" -I${top_srcdir}/src/include \ -+ -I${LOCALBASE}/include -I@prefix@/include ++ -I${ICONV_PREFIX}/include if TSS_BUILD_ASYM_CRYPTO libtrousers_la_SOURCES+=crypto/@CRYPTO_PACKAGE@/rsa.c Modified: head/security/trousers/files/patch-src-tspi-Makefile.am ============================================================================== --- head/security/trousers/files/patch-src-tspi-Makefile.am Thu Dec 5 06:28:41 2013 (r335653) +++ head/security/trousers/files/patch-src-tspi-Makefile.am Thu Dec 5 07:59:03 2013 (r335654) @@ -1,11 +1,11 @@ --- src/tspi/Makefile.am.orig 2012-09-20 02:24:48.000000000 +0900 -+++ src/tspi/Makefile.am 2013-07-27 04:01:03.000000000 +0900 ++++ src/tspi/Makefile.am 2013-12-05 11:10:14.000000000 +0900 @@ -17,7 +17,7 @@ # 5. If any interfaces have been added since the last public release, then increment age. # 6. If any interfaces have been removed since the last public release, then set age to 0. -libtspi_la_LDFLAGS=-version-info 3:0:2 -lpthread @CRYPTOLIB@ -+libtspi_la_LDFLAGS=-version-info 3:0:2 ${PTHREAD_LIB} @CRYPTOLIB@ -L@prefix@/lib -liconv ++libtspi_la_LDFLAGS=-version-info 3:0:2 ${PTHREAD_LIBS} @CRYPTOLIB@ -L${ICONV_PREFIX}/lib ${ICONV_LIB} libtspi_la_CFLAGS=-I$(top_srcdir)/src/include -DAPPID=\"TSPI\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\"