From owner-svn-ports-all@FreeBSD.ORG Sat Jul 27 04:27:19 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id EF258CDC; Sat, 27 Jul 2013 04:27:19 +0000 (UTC) (envelope-from hrs@FreeBSD.org) 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 C3EF226F6; Sat, 27 Jul 2013 04:27:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6R4RJmC019019; Sat, 27 Jul 2013 04:27:19 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6R4RJYR019017; Sat, 27 Jul 2013 04:27:19 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201307270427.r6R4RJYR019017@svn.freebsd.org> From: Hiroki Sato Date: Sat, 27 Jul 2013 04:27:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323772 - head/emulators/tpm-emulator 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.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jul 2013 04:27:20 -0000 Author: hrs Date: Sat Jul 27 04:27:19 2013 New Revision: 323772 URL: http://svnweb.freebsd.org/changeset/ports/323772 Log: - Fix CONFLICTS. - Style cleanups. - Take maintainership. Modified: head/emulators/tpm-emulator/Makefile head/emulators/tpm-emulator/pkg-plist (contents, props changed) Modified: head/emulators/tpm-emulator/Makefile ============================================================================== --- head/emulators/tpm-emulator/Makefile Sat Jul 27 04:24:14 2013 (r323771) +++ head/emulators/tpm-emulator/Makefile Sat Jul 27 04:27:19 2013 (r323772) @@ -8,27 +8,24 @@ CATEGORIES= emulators security MASTER_SITES= SF/${PORTNAME}.berlios DISTNAME= ${PORTNAME:S,-,_,}-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= hrs@FreeBSD.org COMMENT= Trusted Platform Module (TPM) emulator LICENSE= GPLv2 LIB_DEPENDS= gmp:${PORTSDIR}/math/gmp -CONFLICTS= trousers-tddl-[0-9d]* - -USE_RC_SUBR= tpmd +CONFLICTS= trousers-tddl-[0-9]* USES= cmake:outsource +USE_RC_SUBR= tpmd CMAKE_ENV= PREFIX="${PREFIX}" CMAKE_ARGS= -DTPM_INCLUDE_DIRS:STRING="${LOCALBASE}/include" \ -DTPM_LIBRARY_DIRS:STRING="${LOCALBASE}/lib" USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes - USERS= _tss GROUPS= _tss - SUB_LIST= USERS="${USERS}" GROUPS="${GROUPS}" .include @@ -42,8 +39,9 @@ post-install: @${INSTALL} -d -o ${USERS} -g ${GROUPS} -m 0700 /var/run/tpm add-plist-post: - @${ECHO_CMD} "@cwd /" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec ${RMDIR} var/run/tpm 2>/dev/null || true" >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${INSTALL} -d -o ${USERS} -g ${GROUPS} -m 0700 var/run/tpm" >> ${TMPPLIST} + @(${ECHO_CMD} "@cwd /"; \ + ${ECHO_CMD} "@unexec ${RMDIR} var/run/tpm 2>/dev/null || true"; \ + ${ECHO_CMD} "@exec ${INSTALL} -d -o ${USERS} -g ${GROUPS} -m 0700 var/run/tpm"; \ + ) >> ${TMPPLIST} .include Modified: head/emulators/tpm-emulator/pkg-plist ============================================================================== --- head/emulators/tpm-emulator/pkg-plist Sat Jul 27 04:24:14 2013 (r323771) +++ head/emulators/tpm-emulator/pkg-plist Sat Jul 27 04:27:19 2013 (r323772) @@ -1,3 +1,4 @@ +@comment $FreeBSD$ bin/tpmd include/tddl.h lib/libtddl.a