[Midnightbsd-cvs] mports [21589] trunk/emulators/tpm-emulator: fixup plist

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Aug 13 11:52:36 EDT 2016 

Revision: 21589
          http://svnweb.midnightbsd.org/mports/?rev=21589
Author:   laffer1
Date:     2016-08-13 11:52:36 -0400 (Sat, 13 Aug 2016)
Log Message:
-----------
fixup plist

Modified Paths:
--------------
    trunk/emulators/tpm-emulator/Makefile
    trunk/emulators/tpm-emulator/files/patch-CMakeLists.txt
    trunk/emulators/tpm-emulator/files/patch-tddl-CMakeLists.txt
    trunk/emulators/tpm-emulator/files/patch-tpmd-CMakeLists.txt
    trunk/emulators/tpm-emulator/files/patch-tpmd-unix-CMakeLists.txt
    trunk/emulators/tpm-emulator/files/tpmd.in
    trunk/emulators/tpm-emulator/pkg-plist

Modified: trunk/emulators/tpm-emulator/Makefile
===================================================================
--- trunk/emulators/tpm-emulator/Makefile	2016-08-13 15:43:05 UTC (rev 21588)
+++ trunk/emulators/tpm-emulator/Makefile	2016-08-13 15:52:36 UTC (rev 21589)
@@ -1,7 +1,10 @@
+# Created by: Sebastian Schuetz <sschuetz at fhm.edu>
+# $FreeBSD: head/emulators/tpm-emulator/Makefile 415449 2016-05-18 13:53:45Z hrs $
 # $MidnightBSD$
 
 PORTNAME=	tpm-emulator
 PORTVERSION=	0.7.4
+PORTREVISION=	1
 CATEGORIES=	emulators security
 MASTER_SITES=	SF/${PORTNAME}.berlios
 DISTNAME=	${PORTNAME:S,-,_,}-${PORTVERSION}
@@ -11,25 +14,22 @@
 
 LICENSE=	gpl2
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
-CONFLICTS=	trousers-tddl-[0-9]*
-
 USES=		cmake:outsource
 USE_RC_SUBR=	tpmd
-CMAKE_ENV=	PREFIX="${PREFIX}"
+CONFIGURE_ENV=	PREFIX="${PREFIX}"
 CMAKE_ARGS=	-DTPM_INCLUDE_DIRS:STRING="${LOCALBASE}/include" \
+		-DTDDL_LIBRARY_DIRS:STRING="${LOCALBASE}/lib/tddl_emu" \
 		-DTPM_LIBRARY_DIRS:STRING="${LOCALBASE}/lib"
 USE_LDCONFIG=	yes
 USERS=		_tss
 GROUPS=		_tss
 SUB_LIST=	USERS="${USERS}" GROUPS="${GROUPS}"
+PLIST_SUB=	USERS="${USERS}" GROUPS="${GROUPS}"
 
 post-install:
-	@${ECHO_CMD} "@exec ${INSTALL} -d -o ${USERS} -g ${GROUPS} -m 0700 /var/run/tpm" >> ${TMPPLIST}
 	@${MKDIR} ${STAGEDIR}/var/run/tpm
-	@${ECHO_CMD} "@dirrmtry /var/run/tpm" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${INSTALL} -d -o ${USERS} -g ${GROUPS} -m 0700 %D/var/db/tpm" >> ${TMPPLIST}
-	@${MKDIR} ${STAGEDIR}/${PREFIX}/var/db/tpm
+	@${MKDIR} ${STAGEDIR}${PREFIX}/var/db/tpm
 
 .include <bsd.port.mk>

Modified: trunk/emulators/tpm-emulator/files/patch-CMakeLists.txt
===================================================================
--- trunk/emulators/tpm-emulator/files/patch-CMakeLists.txt	2016-08-13 15:43:05 UTC (rev 21588)
+++ trunk/emulators/tpm-emulator/files/patch-CMakeLists.txt	2016-08-13 15:52:36 UTC (rev 21589)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2010-07-06 06:21:20.000000000 +0900
-+++ CMakeLists.txt	2010-12-15 07:33:54.234887143 +0900
-@@ -36,19 +36,19 @@
+--- CMakeLists.txt.orig	2011-12-20 18:30:06 UTC
++++ CMakeLists.txt
+@@ -36,19 +36,20 @@ set(TPM_DEVICE_NAME "/dev/tpm")
  else()
  set(TPM_LOG_FILE "/var/log/tpmd.log")
  set(TPM_SOCKET_NAME "/var/run/tpm/tpmd_socket:0")
@@ -20,6 +20,7 @@
 -include_directories("/opt/local/include")
 -link_directories("/opt/local/lib")
 +include_directories(${TPM_INCLUDE_DIRS})
++link_directories(${TDDL_LIBRARY_DIRS})
 +link_directories(${TPM_LIBRARY_DIRS})
  
  # configure CPack

Modified: trunk/emulators/tpm-emulator/files/patch-tddl-CMakeLists.txt
===================================================================
--- trunk/emulators/tpm-emulator/files/patch-tddl-CMakeLists.txt	2016-08-13 15:43:05 UTC (rev 21588)
+++ trunk/emulators/tpm-emulator/files/patch-tddl-CMakeLists.txt	2016-08-13 15:52:36 UTC (rev 21589)
@@ -1,6 +1,6 @@
---- tddl/CMakeLists.txt.orig	2011-12-21 03:30:06.000000000 +0900
-+++ tddl/CMakeLists.txt	2012-10-10 01:01:00.000000000 +0900
-@@ -7,13 +7,13 @@
+--- tddl/CMakeLists.txt.orig	2011-12-20 18:30:06 UTC
++++ tddl/CMakeLists.txt
+@@ -7,16 +7,16 @@ set(tddl_SRCS "tddl.c" "tddl.h")
  add_library(tddl SHARED ${tddl_SRCS})
  add_library(tddl_static STATIC ${tddl_SRCS})
  if(UNIX)
@@ -14,5 +14,10 @@
 -endif()
 +endif(UNIX)
  
- install(TARGETS tddl DESTINATION lib)
- install(TARGETS tddl_static DESTINATION lib)
+-install(TARGETS tddl DESTINATION lib)
+-install(TARGETS tddl_static DESTINATION lib)
++install(TARGETS tddl DESTINATION lib/tddl_emu)
++install(TARGETS tddl_static DESTINATION lib/tddl_emu)
+ install(FILES "tddl.h" DESTINATION include)
+ 
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR})

Modified: trunk/emulators/tpm-emulator/files/patch-tpmd-CMakeLists.txt
===================================================================
--- trunk/emulators/tpm-emulator/files/patch-tpmd-CMakeLists.txt	2016-08-13 15:43:05 UTC (rev 21588)
+++ trunk/emulators/tpm-emulator/files/patch-tpmd-CMakeLists.txt	2016-08-13 15:52:36 UTC (rev 21589)
@@ -1,6 +1,6 @@
---- tpmd/CMakeLists.txt.orig	2010-07-06 06:21:20.000000000 +0900
-+++ tpmd/CMakeLists.txt	2010-10-25 02:56:43.624559116 +0900
-@@ -11,5 +11,5 @@
+--- tpmd/CMakeLists.txt.orig	2011-12-20 18:30:06 UTC
++++ tpmd/CMakeLists.txt
+@@ -11,5 +11,5 @@ elseif(WIN32)
  
  add_subdirectory(windows)
  

Modified: trunk/emulators/tpm-emulator/files/patch-tpmd-unix-CMakeLists.txt
===================================================================
--- trunk/emulators/tpm-emulator/files/patch-tpmd-unix-CMakeLists.txt	2016-08-13 15:43:05 UTC (rev 21588)
+++ trunk/emulators/tpm-emulator/files/patch-tpmd-unix-CMakeLists.txt	2016-08-13 15:52:36 UTC (rev 21589)
@@ -1,6 +1,6 @@
---- tpmd/unix/CMakeLists.txt.orig	2011-12-21 03:30:06.000000000 +0900
-+++ tpmd/unix/CMakeLists.txt	2012-10-10 01:03:34.000000000 +0900
-@@ -10,8 +10,8 @@
+--- tpmd/unix/CMakeLists.txt.orig	2011-12-20 18:30:06 UTC
++++ tpmd/unix/CMakeLists.txt
+@@ -10,8 +10,8 @@ add_executable(tpmd ${tpmd_SRCS})
  if(MTM_EMULATOR)
  add_definitions(-DMTM_EMULATOR)
  target_link_libraries(tpmd mtm tpm tpm_crypto)

Modified: trunk/emulators/tpm-emulator/files/tpmd.in
===================================================================
--- trunk/emulators/tpm-emulator/files/tpmd.in	2016-08-13 15:43:05 UTC (rev 21588)
+++ trunk/emulators/tpm-emulator/files/tpmd.in	2016-08-13 15:52:36 UTC (rev 21589)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD: head/emulators/tpm-emulator/files/tpmd.in 340872 2014-01-24 00:14:07Z mat $
+# $FreeBSD: head/emulators/tpm-emulator/files/tpmd.in 415449 2016-05-18 13:53:45Z hrs $
 #
 # PROVIDE: tpmd
 # REQUIRE: SERVERS
@@ -16,14 +16,14 @@
 . /etc/rc.subr
 
 name=tpmd
-rcvar=tpmd_enable
+rcvar="${name}_enable"
 command="%%PREFIX%%/bin/${name}"
 
 load_rc_config $name
 
-tpmd_enable=${tpmd_enable-"NO"}
-tpmd_user=${tpmd_user-"%%USERS%%"}
-tpmd_group=${tpmd_group-"%%GROUPS%%"}
+: ${tpmd_enable:="NO"}
+: ${tpmd_user:="%%USERS%%"}
+: ${tpmd_group:="%%GROUPS%%"}
 
 command_args="-o ${tpmd_user} -g ${tpmd_group}"
 unset tpmd_user tpmd_group

Modified: trunk/emulators/tpm-emulator/pkg-plist
===================================================================
--- trunk/emulators/tpm-emulator/pkg-plist	2016-08-13 15:43:05 UTC (rev 21588)
+++ trunk/emulators/tpm-emulator/pkg-plist	2016-08-13 15:52:36 UTC (rev 21589)
@@ -1,10 +1,8 @@
 bin/tpmd
 include/tddl.h
-lib/libtddl.a
-lib/libtddl.so
-lib/libtddl.so.1
-lib/libtddl.so.1.2.0.7
- at dirrmtry var/db/tpm
- at dirrmtry var/db
- at exec mkdir -p %D/var
- at dirrmtry var
+lib/tddl_emu/libtddl.a
+lib/tddl_emu/libtddl.so
+lib/tddl_emu/libtddl.so.1
+lib/tddl_emu/libtddl.so.1.2.0.7
+ at dir(%%USERS%%,%%GROUPS%%,0700) var/db/tpm
+ at dir(%%USERS%%,%%GROUPS%%,0700) /var/run/tpm

More information about the Midnightbsd-cvs mailing list