Fix user/group handling; use SPECIAL_PERMS; support user-destdir mode.

Add patch comments.
Fix void main plus a couple build warnings.
PKGREVISION -> 3.

6 files changed, 47 insertions, 14 deletions

diff --git a/comms/snooper/Makefile b/comms/snooper/Makefile
index 2a8ab2dcec9..225ee5f928a 100644
--- a/comms/snooper/Makefile
+++ b/comms/snooper/Makefile
@@ -1,20 +1,27 @@
-# $NetBSD: Makefile,v 1.27 2011/12/18 15:59:57 dholland Exp $
+# $NetBSD: Makefile,v 1.28 2011/12/18 18:18:50 dholland Exp $
 
 DISTNAME=	snooper-19991202
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.foretune.co.jp/pub/tools/snooper/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Serial line protocol analyzer (need two serial interfaces)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/snooper
 GNU_CONFIGURE=	yes
 CONFIGURE_DIRS=	build
 BUILD_DIRS=	build
 
 INSTALLATION_DIRS+=	share/doc/snooper
-PKG_DESTDIR_SUPPORT=	destdir
+
+PKG_GROUPS=		${DIALER_GROUP}
+PKG_USERS=		${UUCP_USER}:${UUCP_GROUP}
+PKG_GROUPS_VARS+=	DIALER_GROUP UUCP_GROUP
+PKG_USERS_VARS=		UUCP_USER
+SPECIAL_PERMS+=		${PREFIX}/bin/snooper ${UUCP_USER} ${DIALER_GROUP} 4555
 
 post-extract:
 	${RM} ${WRKSRC}/build/.depend
diff --git a/comms/snooper/distinfo b/comms/snooper/distinfo
index a29b5591cf3..a4f8c2ddf8b 100644
--- a/comms/snooper/distinfo
+++ b/comms/snooper/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.8 2011/12/17 10:15:00 sbd Exp $
+$NetBSD: distinfo,v 1.9 2011/12/18 18:18:50 dholland Exp $
 
 SHA1 (snooper-19991202.tar.gz) = d6aba20cd14449d7b126f393cdb219fd627b7777
 RMD160 (snooper-19991202.tar.gz) = 52d61dea95cac246afd5815bc32f31448f9c757b
 Size (snooper-19991202.tar.gz) = 38239 bytes
-SHA1 (patch-aa) = eb458977300b991f100b2f48a87add2a3dd4d7cb
-SHA1 (patch-ab) = 4c6fb6ec3825b8c47006fc0817c13caf9a817091
-SHA1 (patch-ac) = efa5c1db00cf19cf55890e004052fc06a7cd64dd
+SHA1 (patch-aa) = c819aa96cb6c5fde4cb79e73fe6ba5f499de8897
+SHA1 (patch-ab) = c1867c0284ea2e94c3ca14fd78a29bcba0c34dc6
+SHA1 (patch-ac) = 3e63795a9174fe060270acce9f208107e70e6f25
+SHA1 (patch-main_c) = 0c0646839bbc2720ae07a6b1d20d1e737758d762
diff --git a/comms/snooper/patches/patch-aa b/comms/snooper/patches/patch-aa
index af90ad55524..08e77b8a1a8 100644
--- a/comms/snooper/patches/patch-aa
+++ b/comms/snooper/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2009/12/17 21:43:17 abs Exp $
+$NetBSD: patch-aa,v 1.4 2011/12/18 18:18:50 dholland Exp $
+
+- fix inverted logic
 
 --- src/scrn.c.orig	1998-08-12 14:32:02.000000000 +0000
 +++ src/scrn.c
diff --git a/comms/snooper/patches/patch-ab b/comms/snooper/patches/patch-ab
index 857b69b6344..eb4fa528c82 100644
--- a/comms/snooper/patches/patch-ab
+++ b/comms/snooper/patches/patch-ab
@@ -1,19 +1,23 @@
-$NetBSD: patch-ab,v 1.2 2009/12/17 21:43:17 abs Exp $
+$NetBSD: patch-ab,v 1.3 2011/12/18 18:18:50 dholland Exp $
+
+- use standard headers
+- use NAME_MAX where available, as it's the standard symbol
 
 --- src/uucplock.c.orig	1999-12-02 03:12:46.000000000 +0000
 +++ src/uucplock.c
-@@ -38,8 +38,9 @@ static char sccsid[] = "@(#)uucplock.c	5
+@@ -38,8 +38,10 @@ static char sccsid[] = "@(#)uucplock.c	5
  #include "config.h"
  
  #include <sys/file.h>
 -#include <sys/dir.h>
 +#include <dirent.h>
++#include <stdio.h>
  #include <errno.h>
 +#include <limits.h>
  
  #include "pathnames.h"
  
-@@ -52,9 +53,12 @@ static char sccsid[] = "@(#)uucplock.c	5
+@@ -52,9 +54,12 @@ static char sccsid[] = "@(#)uucplock.c	5
  uu_lock(ttyname)
  	char *ttyname;
  {
@@ -27,7 +31,7 @@ $NetBSD: patch-ab,v 1.2 2009/12/17 21:43:17 abs Exp $
  	off_t lseek();
  
  	(void)snprintf(tbuf, sizeof(tbuf), _PATH_LOCKDIRNAME, ttyname);
-@@ -104,7 +108,11 @@ uu_lock(ttyname)
+@@ -104,7 +109,11 @@ uu_lock(ttyname)
  uu_unlock(ttyname)
  	char *ttyname;
  {
diff --git a/comms/snooper/patches/patch-ac b/comms/snooper/patches/patch-ac
index 56aa878b109..97c2e04897e 100644
--- a/comms/snooper/patches/patch-ac
+++ b/comms/snooper/patches/patch-ac
@@ -1,4 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2011/12/17 10:15:00 sbd Exp $
+$NetBSD: patch-ac,v 1.3 2011/12/18 18:18:50 dholland Exp $
+
+- honor LDFLAGS
+- DESTDIR support
+- let the pkgsrc makefile handle the permissions
 
 --- build/Makefile.in.orig	1998-08-12 14:31:56.000000000 +0000
 +++ build/Makefile.in
@@ -18,7 +22,7 @@ $NetBSD: patch-ac,v 1.2 2011/12/17 10:15:00 sbd Exp $
 -	[ -d $(bindir) ] || (mkdir $(bindir))
 -	$(INSTALL) -s -o uucp -g bin -m 4555 snooper $(bindir)
 +	[ -d $(DESTDIR)$(bindir) ] || (mkdir $(DESTDIR)$(bindir))
-+	$(INSTALL) -s -o uucp -g bin -m 4555 snooper $(DESTDIR)$(bindir)
++	$(INSTALL) -s snooper $(DESTDIR)$(bindir)
  
  clean:
  	-rm -f *.o *.core
diff --git a/comms/snooper/patches/patch-main_c b/comms/snooper/patches/patch-main_c
new file mode 100644
index 00000000000..f7125f28866
--- /dev/null
+++ b/comms/snooper/patches/patch-main_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-main_c,v 1.1 2011/12/18 18:18:50 dholland Exp $
+
+- fix void main
+
+--- src/main.c~	1998-08-12 14:31:59.000000000 +0000
++++ src/main.c
+@@ -714,7 +714,7 @@ end:
+ 	binlog_end(1);
+ }
+ 
+-void
++int
+ main(argc, argv)
+ 	int argc;
+ 	char **argv;