- Convert security/trousers to USES=libtool and bump dependent ports

- Use standard USE_AUTOTOOLS
- Add INSTALL_TARGET=install-strip
- Drop PTHREAD_LIBS

10 files changed, 16 insertions, 17 deletions

diff --git a/security/gnutls3/Makefile b/security/gnutls3/Makefile
index 3e264c58a5a2..2ea7dedab345 100644
--- a/security/gnutls3/Makefile
+++ b/security/gnutls3/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnutls
 PORTVERSION=	3.1.25
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security net
 MASTER_SITES=	ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/
 PKGNAMESUFFIX=	${GNUTLS_SUFFIX}
diff --git a/security/opencryptoki/Makefile b/security/opencryptoki/Makefile
index 627b016291ee..0201167ff921 100644
--- a/security/opencryptoki/Makefile
+++ b/security/opencryptoki/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	opencryptoki
 PORTVERSION=	2.3.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 
diff --git a/security/openssl_tpm_engine/Makefile b/security/openssl_tpm_engine/Makefile
index 5e859cee3e7b..d8a59004409c 100644
--- a/security/openssl_tpm_engine/Makefile
+++ b/security/openssl_tpm_engine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	openssl_tpm_engine
 PORTVERSION=	0.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	SF/trousers/OpenSSL%20TPM%20Engine/${PORTVERSION}
 
diff --git a/security/pond/Makefile b/security/pond/Makefile
index 84208064fe72..32c08fad0800 100644
--- a/security/pond/Makefile
+++ b/security/pond/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	pond
 PORTVERSION=	20140120
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://c-s.li/ports/
 DISTFILES=	pond-20140120.tar.gz \
diff --git a/security/tpm-tools/Makefile b/security/tpm-tools/Makefile
index 22911e0f9da0..e903400c6282 100644
--- a/security/tpm-tools/Makefile
+++ b/security/tpm-tools/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tpm-tools
 PORTVERSION=	1.3.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	SF/trousers/${PORTNAME}/${PORTVERSION}
 
diff --git a/security/tpmmanager/Makefile b/security/tpmmanager/Makefile
index 31a619d8dec0..7f5a80d0453b 100644
--- a/security/tpmmanager/Makefile
+++ b/security/tpmmanager/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	tpmmanager
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/\.1//}/
 
diff --git a/security/trousers/Makefile b/security/trousers/Makefile
index 39a573d863cd..82e2fcaabd49 100644
--- a/security/trousers/Makefile
+++ b/security/trousers/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	trousers
 PORTVERSION=	0.3.10
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 
@@ -15,16 +15,18 @@ LICENSE_NAME=	Common Public License
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USES=	gmake iconv pkgconfig
+USES=		gmake iconv libtool pkgconfig
 USE_OPENSSL=	YES
 USE_LDCONFIG=	YES
-USE_AUTOTOOLS=	autoconf automake libtool
+USE_AUTOTOOLS= 	libtoolize aclocal autoconf automake
+AUTOMAKE_ARGS=	-a -c -f
 USE_RC_SUBR=	tcsd
+INSTALL_TARGET=	install-strip
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--with-gui=none --enable-static \
 		--localstatedir=${PREFIX}/var \
 		--with-tssuser=${USERS} --with-tssgroup=${GROUPS} RANLIB=:
-MAKE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS} ICONV_LIB=${ICONV_LIB} \
+MAKE_ENV=	ICONV_LIB=${ICONV_LIB} \
 		ICONV_PREFIX=${ICONV_PREFIX}
 SUB_FILES=	pkg-message
 SUB_LIST=	USERS=${USERS} GROUPS=${GROUPS}
@@ -52,11 +54,6 @@ CONFLICTS+=	tpm-emulator-[0-9]*
 PLIST_SUB+=	TDDL=""
 .endif
 
-run-autotools:	run-autotools-autoreconf
-
-run-autotools-autoreconf:
-	@cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTORECONF} -i
-
 post-install:
 	${INSTALL_DATA} \
 	    ${WRKSRC}/dist/tcsd.conf ${STAGEDIR}${PREFIX}/etc/tcsd.conf.dist
diff --git a/security/trousers/files/extra-patch-src-tcsd-Makefile.am b/security/trousers/files/extra-patch-src-tcsd-Makefile.am
index 153461045ed1..5d2e710cd79a 100644
--- a/security/trousers/files/extra-patch-src-tcsd-Makefile.am
+++ b/security/trousers/files/extra-patch-src-tcsd-Makefile.am
@@ -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=${top_builddir}/src/tcs/libtcs.a -ltddl -L${LOCALBASE}/lib ${PTHREAD_LIBS} @CRYPTOLIB@
++tcsd_LDADD=${top_builddir}/src/tcs/libtcs.a -ltddl -L${LOCALBASE}/lib -lpthread @CRYPTOLIB@
  tcsd_LDFLAGS=-pie -Wl,-z,relro -Wl,-z,now
  
  tcsd_SOURCES=svrside.c tcsd_conf.c tcsd_threads.c platform.c
diff --git a/security/trousers/files/patch-src-tspi-Makefile.am b/security/trousers/files/patch-src-tspi-Makefile.am
index 1c9e96318be8..9d67ba3e18b4 100644
--- a/security/trousers/files/patch-src-tspi-Makefile.am
+++ b/security/trousers/files/patch-src-tspi-Makefile.am
@@ -5,7 +5,7 @@
  # 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_LIBS} @CRYPTOLIB@ -L${ICONV_PREFIX}/lib ${ICONV_LIB}
++libtspi_la_LDFLAGS=-version-info 3:0:2 -lpthread @CRYPTOLIB@ -L${ICONV_PREFIX}/lib ${ICONV_LIB}
  
  libtspi_la_CFLAGS=-I$(top_srcdir)/src/include -DAPPID=\"TSPI\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\"
  
diff --git a/security/trousers/pkg-plist b/security/trousers/pkg-plist
index 2bb8744ecb4b..217b4fe45f87 100644
--- a/security/trousers/pkg-plist
+++ b/security/trousers/pkg-plist
@@ -25,9 +25,9 @@ include/tss/tss_structs.h
 include/tss/tss_typedef.h
 %%TDDL%%lib/libtddl.a
 lib/libtspi.a
-lib/libtspi.la
 lib/libtspi.so
-lib/libtspi.so.3
+lib/libtspi.so.1
+lib/libtspi.so.1.2.0
 sbin/tcsd
 man/man3/Tspi_ChangeAuth.3.gz
 man/man3/Tspi_ChangeAuthAsym.3.gz