Cleanup(portlint happy).

[NOTE]
In this time, I don't bump PORTREVISION.  Because I'll
re-setup working directory under $PREFIX
(/var/lib/tpm -> $PREFIX/var/lib/tpm).  So I'll finish
these working, and bump PORTREVISION.

emulators/tpm-emulator/Makefile

@@ -21,17 +21,17 @@ USE_RC_SUBR=		tpmd
 USE_LDCONFIG=		YES
 MAKE_JOBS_SAFE=		YES
 
-CONFLICTS=		trousers-tddl*
+CONFLICTS=		trousers-tddl-[0-9d]*
 
 WANTLIB=		c
 CMAKE_VERBOSE=		YES
 CMAKE_SOURCE_PATH=	${WRKSRC}
-NO_CONFIGURE=		YES
 BUILD_WRKSRC=		${CONFIGURE_WRKSRC}
 INSTALL_WRKSRC=		${CONFIGURE_WRKSRC}
 CONFIGURE_WRKSRC=	${CMAKE_SOURCE_PATH}/build
 
-CMAKE_ARGS+=		-DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \
+CMAKE_ENV=		PREFIX=${PREFIX} ${CONFIGURE_ENV}
+CMAKE_ARGS=		-DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \
 			-DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib"
 
 SUB_LIST=		USERS=${USERS} GROUPS=${GROUPS}
@@ -42,9 +42,9 @@ GROUPS=			_tss
 LICENSE=		GPLv2
 LICENSE_FILE=		${WRKSRC}/README
 
-WRKSRC=			${WRKDIR}/${PORTNAME:S/-/_/}-${PORTVERSION}
+WRKSRC=			${WRKDIR}/${DISTNAME}
 
-post-patch:
+post-extract:
 	@${MKDIR} ${WRKSRC}/build
 
 .include <bsd.port.mk>

emulators/tpm-emulator/files/patch-CMakeLists.txt

@@ -1,33 +1,8 @@
 --- CMakeLists.txt.orig	2010-07-06 06:21:20.000000000 +0900
-+++ CMakeLists.txt	2010-10-25 02:56:43.617558705 +0900
++++ CMakeLists.txt	2010-12-15 07:24:08.279834034 +0900
-@@ -5,13 +5,13 @@
+@@ -36,7 +36,7 @@
- 
- project(TPM_Emulator C)
- 
--cmake_minimum_required(VERSION 2.6)
-+cmake_minimum_required(VERSION 2.4)
- 
- # enforce out of source build
- string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" IS_INSOURCE)
- if(IS_INSOURCE)
-     message(FATAL_ERROR "${PROJECT_NAME} requires an out of source build.")
--endif()
-+endif(IS_INSOURCE)
- 
- # set project and build version
- set(${PROJECT_NAME}_VERSION_MAJOR 0)
-@@ -29,14 +29,14 @@
- set(TPM_SOCKET_NAME "/private/var/run/tpm/tpmd_socket:0")
- set(TPM_STORAGE_NAME "/private/var/lib/tpm/tpm_emulator-1_2_${${PROJECT_NAME}_VERSION_MAJOR}_${${PROJECT_NAME}_VERSION_MINOR}")
  set(TPM_DEVICE_NAME "/dev/tpm")
--else()
+ endif()
-+else(WIN32)
- set(TPM_LOG_FILE "/var/log/tpmd.log")
- set(TPM_SOCKET_NAME "/var/run/tpm/tpmd_socket:0")
- set(TPM_STORAGE_NAME "/var/lib/tpm/tpm_emulator-1_2_${${PROJECT_NAME}_VERSION_MAJOR}_${${PROJECT_NAME}_VERSION_MINOR}")
- set(TPM_DEVICE_NAME "/dev/tpm")
--endif()
-+endif(WIN32)
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 -add_definitions(-Wall -Werror -Wextra -Wno-unused-parameter -Wpointer-arith -Wcast-align -Wwrite-strings)
 +add_definitions(-Wall -Werror -Wno-unused-parameter -Wpointer-arith -Wcast-align -Wwrite-strings)
@@ -38,7 +13,7 @@
  # include root directories
  include_directories(${CMAKE_SOURCE_DIR})
  include_directories(${CMAKE_BINARY_DIR})
-+include_directories("/usr/local/include")
++include_directories(${CMAKE_INCLUDE_PATH})
  
  # add internal libraries
  add_subdirectory(tpm)

emulators/tpm-emulator/pkg-plist

@@ -4,5 +4,3 @@ lib/libtddl.a
 lib/libtddl.so
 lib/libtddl.so.1
 lib/libtddl.so.1.2.0.7
-@unexec rm -f /var/tpm/tpmd_socket*
-@unexec rm -rf /var/tpm