Index: Makefile
===================================================================
--- Makefile	(revision 366071)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	openbsm
 DISTVERSION=	1.2-alpha3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security
 MASTER_SITES=	http://www.trustedbsd.org/downloads/ \
     		http://mirrors.rit.edu/zi/
@@ -12,7 +12,7 @@
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Open Source Basic Security Module (BSM) Audit Implementation
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CONFLICTS=	openbsm-1.[0-9]*
@@ -23,7 +23,7 @@
 
 USE_RC_SUBR=	auditdistd
 SUB_FILES=	pkg-message
-PLIST_SUB=	USERS=${USERS} GROUPS=${GROUPS}
+PLIST_SUB=	USERS=${USERS} GROUPS=${GROUPS} NEEDVARDIRS=${NEEDVARDIRS}
 
 USERS=		auditdistd
 GROUPS=		audit
@@ -32,6 +32,12 @@
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 920000 && ${OSVERSION} >= 800000
+NEEDVARDIRS=	""
+.else
+NEEDVARDIRS=	"@comment "
+.endif
+
 .if ${OSVERSION} <= 800000
 IGNORE=		requires FreeBSD 8.x or above
 .endif
@@ -41,7 +47,8 @@
 .endif
 
 post-install:
-	@${MKDIR} -m 0770 ${STAGEDIR}${VARAUDIT}/dist
-	@${MKDIR} -m 0700 ${STAGEDIR}${VARAUDIT}/remote
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libauditd.so.0.0.0
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libbsm.so.0.0.0
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/auditfilter_noop.so.0.0.0
 
 .include <bsd.port.post.mk>
Index: files/patch-bin__auditdistd__subr.c
===================================================================
--- files/patch-bin__auditdistd__subr.c	(revision 0)
+++ files/patch-bin__auditdistd__subr.c	(working copy)
@@ -0,0 +1,13 @@
+--- ./bin/auditdistd/subr.c.orig	2014-08-25 09:03:45.000000000 -0400
++++ ./bin/auditdistd/subr.c	2014-08-25 09:05:35.000000000 -0400
+@@ -228,6 +228,10 @@
+ 	PJDLOG_ASSERT(fd != -1);
+ 
+ #ifdef HAVE_KQUEUE
++	if (wait_for_file_kq != -1) {
++		close(wait_for_file_kq);
++		wait_for_file_kq = -1;
++	}
+ 	kq = kqueue();
+ 	if (kq == -1) {
+ 		pjdlog_errno(LOG_WARNING, "kqueue() failed");

Property changes on: files/patch-bin__auditdistd__subr.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 366071)
+++ pkg-plist	(working copy)
@@ -64,10 +64,10 @@
 sbin/auditreduce
 sbin/praudit
 @dirrm include/bsm
-@cwd /
-@exec mkdir -m 0770 var/audit/dist
-@exec mkdir -m 0700 var/audit/remote
-@exec chown %%USERS%%:%%GROUPS%% var/audit/dist
-@exec chown %%USERS%%:wheel var/audit/remote
-@dirrmtry var/audit/dist
-@dirrmtry var/audit/remote
+%%NEEDVARDIRS%%@cwd /
+%%NEEDVARDIRS%%@exec mkdir -m 0770 var/audit/dist
+%%NEEDVARDIRS%%@exec mkdir -m 0700 var/audit/remote
+%%NEEDVARDIRS%%@exec chown %%USERS%%:%%GROUPS%% var/audit/dist
+%%NEEDVARDIRS%%@exec chown %%USERS%%:wheel var/audit/remote
+%%NEEDVARDIRS%%@dirrmtry var/audit/dist
+%%NEEDVARDIRS%%@dirrmtry var/audit/remote