- USES=libtool tar:bzip2

- Set USE_LDCONFIG correctly
- Use standard USE_AUTOTOOLS instead of overriding run-autotools target
- Use /var instead of PREFIX/var
- Create directories under /var from pkg-plist for pkg_install

3 files changed, 24 insertions, 35 deletions

diff --git a/security/opencryptoki/Makefile b/security/opencryptoki/Makefile
index a627c671f9c6..627b016291ee 100644
--- a/security/opencryptoki/Makefile
+++ b/security/opencryptoki/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	opencryptoki
 PORTVERSION=	2.3.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 
@@ -17,36 +17,24 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libtspi.so:${PORTSDIR}/security/trousers
 
-USES=		gmake
-USE_BZIP2=	YES
-USE_LDCONFIG=	YES
-USE_AUTOTOOLS=	autoconf libtool automake
-HAS_CONFIGURE=	YES
+USES=		gmake libtool tar:bzip2
+USE_LDCONFIG=	${PREFIX}/lib/opencryptoki
+USE_AUTOTOOLS=	libtoolize aclocal autoconf automake
+AUTOMAKE_ARGS=	-a -c -f
 CONFIGURE_ARGS=	--enable-swtok --enable-tpmtok \
 		--disable-crtok --disable-aeptok \
 		--disable-ccatok --disable-bcomtok \
 		--disable-pkcscca_migrate \
-		--libdir=${PREFIX}/lib \
-		--sbindir=${PREFIX}/sbin \
-		--localstatedir=${PREFIX}/var \
+		--localstatedir=/var \
 		--with-pkcs11user=${USERS} \
 		--with-pkcs11group=${GROUPS}
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_RC_SUBR=	pkcsslotd
+PLIST_SUB=	RESETPREFIX=${PREFIX}
 SUB_FILES=	pkg-message
 SUB_LIST=	USERS=${USERS} GROUPS=${GROUPS}
 USERS=		_pkcs11
 GROUPS=		_pkcs11
 
-run-autotools:	run-autotools-autoreconf
-
-run-autotools-autoreconf:
-	@cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTORECONF} -i
-
-post-install:
-	cd ${STAGEDIR}${PREFIX}/lib && ${LN} -s opencryptoki/libopencryptoki* .
-	${MKDIR} ${STAGEDIR}${PREFIX}/var/lib/opencryptoki/swtok \
-	    ${STAGEDIR}${PREFIX}/var/lib/opencryptoki/tpm
-
 .include <bsd.port.mk>
diff --git a/security/opencryptoki/files/pkcsslotd.in b/security/opencryptoki/files/pkcsslotd.in
index e931d6143280..6da0156a11e5 100644
--- a/security/opencryptoki/files/pkcsslotd.in
+++ b/security/opencryptoki/files/pkcsslotd.in
@@ -21,7 +21,7 @@ command=%%PREFIX%%/sbin/${name}
 start_precmd=${name}_prestart
 
 pkcsslotd_prestart () {
-	[ -f %%PREFIX%%/var/lib/opencryptoki/pk_config_data ] || \
+	[ -f /var/lib/opencryptoki/pk_config_data ] || \
 		%%PREFIX%%/sbin/pkcs11_startup
 }
 
diff --git a/security/opencryptoki/pkg-plist b/security/opencryptoki/pkg-plist
index f5112e3918ab..eb0e47b1607d 100644
--- a/security/opencryptoki/pkg-plist
+++ b/security/opencryptoki/pkg-plist
@@ -1,22 +1,19 @@
 include/opencryptoki/apiclient.h
 include/opencryptoki/pkcs11.h
 include/opencryptoki/pkcs11types.h
-lib/libopencryptoki.la
-lib/libopencryptoki.so
-lib/libopencryptoki.so.0
 lib/opencryptoki/PKCS11_API.so
-lib/opencryptoki/libopencryptoki.la
 lib/opencryptoki/libopencryptoki.so
 lib/opencryptoki/libopencryptoki.so.0
+lib/opencryptoki/libopencryptoki.so.0.0.0
 lib/opencryptoki/methods
 lib/opencryptoki/stdll/PKCS11_SW.so
-lib/opencryptoki/stdll/libpkcs11_sw.la
 lib/opencryptoki/stdll/libpkcs11_sw.so
 lib/opencryptoki/stdll/libpkcs11_sw.so.0
+lib/opencryptoki/stdll/libpkcs11_sw.so.0.0.0
 lib/opencryptoki/stdll/PKCS11_TPM.so
-lib/opencryptoki/stdll/libpkcs11_tpm.la
 lib/opencryptoki/stdll/libpkcs11_tpm.so
 lib/opencryptoki/stdll/libpkcs11_tpm.so.0
+lib/opencryptoki/stdll/libpkcs11_tpm.so.0.0.0
 lib/pkcs11/PKCS11_API.so
 lib/pkcs11/libopencryptoki.so
 lib/pkcs11/methods
@@ -30,18 +27,22 @@ man/man1/pkcsconf.1.gz
 man/man5/pk_config_data.5.gz
 man/man7/opencryptoki.7.gz
 man/man8/pkcsslotd.8.gz
+@dirrm lib/pkcs11
+@dirrm lib/opencryptoki/stdll
+@dirrm lib/opencryptoki
+@dirrm include/opencryptoki
+@cwd /var
+@exec install -d -o _pkcs11 -g _pkcs11 -m 700 %D/lib/opencryptoki
+@exec install -d -o _pkcs11 -g _pkcs11 -m 700 %D/lib/opencryptoki/swtok
+@exec install -d -o _pkcs11 -g _pkcs11 -m 700 %D/lib/opencryptoki/tpm
 @owner _pkcs11
 @group _pkcs11
 @mode 0700
-@dirrmtry var/lib/opencryptoki/tpm
-@dirrmtry var/lib/opencryptoki/swtok
+@dirrmtry lib/opencryptoki/tpm
+@dirrmtry lib/opencryptoki/swtok
+@dirrmtry lib/opencryptoki
 @owner
 @group
 @mode
-@dirrmtry var/lib/opencryptoki
-@dirrmtry var/lib
-@dirrmtry var
-@dirrm lib/pkcs11
-@dirrm lib/opencryptoki/stdll
-@dirrm lib/opencryptoki
-@dirrm include/opencryptoki
+@dirrmtry lib
+@cwd %%RESETPREFIX%%