svn commit: r360949 - in head/security/opencryptoki: . files

[Tijl Coosemans]

Author: tijl
Date: Sun Jul  6 18:06:59 2014
New Revision: 360949
URL: http://svnweb.freebsd.org/changeset/ports/360949
QAT: https://qat.redports.org/buildarchive/r360949/

Log:
  - 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

Modified:
  head/security/opencryptoki/Makefile
  head/security/opencryptoki/files/pkcsslotd.in
  head/security/opencryptoki/pkg-plist

Modified: head/security/opencryptoki/Makefile
==============================================================================
--- head/security/opencryptoki/Makefile	Sun Jul  6 17:56:43 2014	(r360948)
+++ head/security/opencryptoki/Makefile	Sun Jul  6 18:06:59 2014	(r360949)
@@ -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
 
 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>

Modified: head/security/opencryptoki/files/pkcsslotd.in
==============================================================================
--- head/security/opencryptoki/files/pkcsslotd.in	Sun Jul  6 17:56:43 2014	(r360948)
+++ head/security/opencryptoki/files/pkcsslotd.in	Sun Jul  6 18:06:59 2014	(r360949)
@@ -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
 }
 

Modified: head/security/opencryptoki/pkg-plist
==============================================================================
--- head/security/opencryptoki/pkg-plist	Sun Jul  6 17:56:43 2014	(r360948)
+++ head/security/opencryptoki/pkg-plist	Sun Jul  6 18:06:59 2014	(r360949)
@@ -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
+ at dirrm lib/pkcs11
+ at dirrm lib/opencryptoki/stdll
+ at dirrm lib/opencryptoki
+ at dirrm include/opencryptoki
+ at cwd /var
+ at exec install -d -o _pkcs11 -g _pkcs11 -m 700 %D/lib/opencryptoki
+ at exec install -d -o _pkcs11 -g _pkcs11 -m 700 %D/lib/opencryptoki/swtok
+ at exec install -d -o _pkcs11 -g _pkcs11 -m 700 %D/lib/opencryptoki/tpm
 @owner _pkcs11
 @group _pkcs11
 @mode 0700
- at dirrmtry var/lib/opencryptoki/tpm
- at dirrmtry var/lib/opencryptoki/swtok
+ at dirrmtry lib/opencryptoki/tpm
+ at dirrmtry lib/opencryptoki/swtok
+ at dirrmtry lib/opencryptoki
 @owner
 @group
 @mode
- at dirrmtry var/lib/opencryptoki
- at dirrmtry var/lib
- at dirrmtry var
- at dirrm lib/pkcs11
- at dirrm lib/opencryptoki/stdll
- at dirrm lib/opencryptoki
- at dirrm include/opencryptoki
+ at dirrmtry lib
+ at cwd %%RESETPREFIX%%