From 0cd002ccb621e76ec42fe28faa7fe131e6c46a78 Mon Sep 17 00:00:00 2001
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Sun, 5 Oct 2014 09:21:53 +0000
Subject: [PATCH] Allow staging as a regular user

---
 net-mgmt/kismet/Makefile  |  4 ++++
 net-mgmt/kismet/pkg-plist | 14 +++-----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/net-mgmt/kismet/Makefile b/net-mgmt/kismet/Makefile
index ab5f09551d8d..728873b3b3f3 100644
--- a/net-mgmt/kismet/Makefile
+++ b/net-mgmt/kismet/Makefile
@@ -80,6 +80,10 @@ post-patch:
 	@${FIND} ${WRKSRC} -type f -name 'Makefile' -print0 | ${XARGS} -0 \
 		${REINPLACE_CMD} -E \
 		'/C(XX)?FLAGS[[:blank:]]*\+=/s/ -g / /'
+	@${FIND} ${WRKSRC} -type f \( -name Makefile -o -name Makefile.in \) -print0 | ${XARGS} -0 \
+		${REINPLACE_CMD} -e 's,-o $$(INSTUSR) -g $$(INSTGRP),,' \
+		-e 's,-o $$(INSTUSR) -g $$(MANGRP),,' \
+		-e 's,-o $$(INSTUSR) -g $$(SUIDGROUP) -m 4550,,'
 
 post-build:
 	@cd ${WRKSRC}; ${STRIP_CMD} kismet_client kismet_drone kismet_server */*.so
diff --git a/net-mgmt/kismet/pkg-plist b/net-mgmt/kismet/pkg-plist
index 2647bf052b80..c069867f07c9 100644
--- a/net-mgmt/kismet/pkg-plist
+++ b/net-mgmt/kismet/pkg-plist
@@ -1,14 +1,10 @@
 bin/kismet
-@group %%SUIDGROUP%%
-%%SUID%%bin/kismet_capture
-@group
+%%SUID%%@(,%%SUIDGROUP%%,4550) bin/kismet_capture
 bin/kismet_client
 bin/kismet_drone
 bin/kismet_server
-@unexec if cmp -s %D/etc/kismet.conf %D/etc/kismet.conf.sample; then rm -f %D/etc/kismet.conf; fi
-etc/kismet.conf.sample
-@unexec if cmp -s %D/etc/kismet_drone.conf %D/etc/kismet_drone.conf.sample; then rm -f %D/etc/kismet_drone.conf; fi
-etc/kismet_drone.conf.sample
+@sample etc/kismet.conf.sample
+@sample etc/kismet_drone.conf.sample
 %%PLUGINS%%lib/kismet/aircrack-kismet.so
 %%PLUGINS%%lib/kismet/alertsyslog.so
 %%PLUGINS%%lib/kismet/autowep-kismet.so
@@ -24,7 +20,3 @@ man/man5/kismet_drone.conf.5.gz
 %%DATADIR%%/wav/gpslost.wav
 %%DATADIR%%/wav/new.wav
 %%DATADIR%%/wav/packet.wav
-@dirrm %%DATADIR%%/wav
-@dirrm %%DATADIR%%
-%%PLUGINS%%@dirrm lib/kismet
-%%PLUGINS%%@dirrm lib/kismet_client