From c2162968d15c2ae1afba241d10dd1868bcd9901f Mon Sep 17 00:00:00 2001
From: tijl <tijl@FreeBSD.org>
Date: Sat, 5 Jul 2014 19:25:27 +0000
Subject: - Add USES=libtool - Use INSTALL_TARGET=install-strip - Use /var/lib
 instead of PREFIX/var/lib

---
 security/softhsm/Makefile  | 11 +++++------
 security/softhsm/pkg-plist | 12 +++++-------
 2 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'security')

diff --git a/security/softhsm/Makefile b/security/softhsm/Makefile
index 829b2b2c787b..7f060116ef55 100644
--- a/security/softhsm/Makefile
+++ b/security/softhsm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	softhsm
 PORTVERSION=	1.3.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://dist.opendnssec.org/source/
 
@@ -16,11 +16,10 @@ LIB_DEPENDS=	libbotan-1.10.so:${PORTSDIR}/security/botan110 \
 		libsqlite3.so:${PORTSDIR}/databases/sqlite3
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-botan=${LOCALBASE} --with-sqlite3=${LOCALBASE}
-
+CONFIGURE_ARGS=	--with-botan=${LOCALBASE} --with-sqlite3=${LOCALBASE} \
+		--localstatedir=/var
+INSTALL_TARGET=	install-strip
+USES=		libtool
 USE_LDCONFIG=	yes
 
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/softhsm/libsofthsm.so
-
 .include <bsd.port.mk>
diff --git a/security/softhsm/pkg-plist b/security/softhsm/pkg-plist
index 22d998e9a6dd..a93c6ed5e099 100644
--- a/security/softhsm/pkg-plist
+++ b/security/softhsm/pkg-plist
@@ -1,15 +1,13 @@
-@unexec if cmp -s %D/etc/softhsm.conf %D/etc/softhsm.conf.sample; then rm -f %D/etc/softhsm.conf; else echo If permanently deleting this package, %D/etc/softhsm.conf must be removed manually; fi
 bin/softhsm
 bin/softhsm-keyconv
+@sample etc/softhsm.conf.sample
 lib/softhsm/libsofthsm.a
-lib/softhsm/libsofthsm.la
 lib/softhsm/libsofthsm.so
-@sample etc/softhsm.conf.sample
 @dirrm lib/softhsm
-@exec install -d -o root -g wheel -m 700 %D/var/lib/softhsm
 man/man1/softhsm-keyconv.1.gz
 man/man1/softhsm.1.gz
 man/man5/softhsm.conf.5.gz
-@dirrm var/lib/softhsm
-@dirrmtry var/lib
-@dirrmtry var
+@exec mkdir -p /var/lib
+@exec install -d -o root -g wheel -m 700 /var/lib/softhsm
+@unexec rmdir /var/lib/softhsm 2>/dev/null || true
+@unexec rmdir /var/lib 2>/dev/null || true
-- 
cgit