svn commit: r323772 - head/emulators/tpm-emulator

[Hiroki Sato]

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 at FreeBSD.org
+MAINTAINER=	hrs at 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 <bsd.port.pre.mk>
@@ -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 <bsd.port.post.mk>

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 @@
+ at comment $FreeBSD$
 bin/tpmd
 include/tddl.h
 lib/libtddl.a