From owner-svn-ports-head@FreeBSD.ORG  Sun Oct  5 09:21:54 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DE711AE4;
 Sun,  5 Oct 2014 09:21:54 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A905BB43;
 Sun,  5 Oct 2014 09:21:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s959LsKI075820;
 Sun, 5 Oct 2014 09:21:54 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s959Lsm0075818;
 Sun, 5 Oct 2014 09:21:54 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <201410050921.s959Lsm0075818@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: antoine set sender to
 antoine@FreeBSD.org using -f
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Sun, 5 Oct 2014 09:21:54 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r370044 - head/net-mgmt/kismet
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Oct 2014 09:21:55 -0000

Author: antoine
Date: Sun Oct  5 09:21:53 2014
New Revision: 370044
URL: https://svnweb.freebsd.org/changeset/ports/370044
QAT: https://qat.redports.org/buildarchive/r370044/

Log:
  Allow staging as a regular user

Modified:
  head/net-mgmt/kismet/Makefile
  head/net-mgmt/kismet/pkg-plist

Modified: head/net-mgmt/kismet/Makefile
==============================================================================
--- head/net-mgmt/kismet/Makefile	Sun Oct  5 09:19:05 2014	(r370043)
+++ head/net-mgmt/kismet/Makefile	Sun Oct  5 09:21:53 2014	(r370044)
@@ -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

Modified: head/net-mgmt/kismet/pkg-plist
==============================================================================
--- head/net-mgmt/kismet/pkg-plist	Sun Oct  5 09:19:05 2014	(r370043)
+++ head/net-mgmt/kismet/pkg-plist	Sun Oct  5 09:21:53 2014	(r370044)
@@ -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