Update nidentd to 1.0. Changes:

 * fake support

Submitted by Dawid Szymañski <dawszy@arhea.net> in private mail.

4 files changed, 27 insertions, 31 deletions

diff --git a/net/nidentd/Makefile b/net/nidentd/Makefile
index e1023ac9afa..dc3c4072fcf 100644
--- a/net/nidentd/Makefile
+++ b/net/nidentd/Makefile
@@ -1,25 +1,25 @@
-# $NetBSD: Makefile,v 1.3 2002/03/29 17:10:02 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2002/05/05 23:51:27 hubertf Exp $
 #
 
-DISTNAME=	nidentd-0.4
+DISTNAME=	nidentd-1.0
 CATEGORIES=	net sysutils
 MASTER_SITES=	ftp://ftp.arhea.net/pub/NetBSD/nidentd/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	hubertf@netbsd.org
-COMMENT=	identd that supports IPv4, IPv6 and NAT
+COMMENT=	identd that supports IPv4, IPv6, NAT, fake and random
 
-DEPENDS+=	lsof-*:../../sysutils/lsof
-
-WRKSRC=		${WRKDIR}/nidentd
+DEPENDS+=	lsof>=4.61:../../sysutils/lsof
 
 do-build:
 		${SED} \
 			-e 's,@LOCALBASE@,${LOCALBASE},' \
-			<${WRKSRC}/nidentd.sh >${WRKSRC}/nidentd
+			<${WRKSRC}/nidentd >${WRKSRC}/nidentd.tmp
+		${MV} ${WRKSRC}/nidentd.tmp ${WRKSRC}/nidentd
 
 do-install:
-		${INSTALL_DATA} ${WRKSRC}/identn.conf ${PREFIX}/etc/nidentd.conf.example ; \
+		${INSTALL_DATA} ${WRKSRC}/nidentd.nat ${PREFIX}/etc/nidentd.nat.example ; \
+		${INSTALL_DATA} ${WRKSRC}/nidentd.fake ${PREFIX}/etc/nidentd.fake.example ; \
 		${INSTALL_SCRIPT} ${WRKSRC}/nidentd ${PREFIX}/libexec
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/nidentd/PLIST b/net/nidentd/PLIST
index 4fe8680efad..f4764710be9 100644
--- a/net/nidentd/PLIST
+++ b/net/nidentd/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/03/27 22:25:18 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/05/05 23:51:27 hubertf Exp $
+etc/nidentd.fake.example
+etc/nidentd.nat.example
 libexec/nidentd
-etc/nidentd.conf.example
diff --git a/net/nidentd/distinfo b/net/nidentd/distinfo
index 1e9f036fa5c..d7f6db79ed7 100644
--- a/net/nidentd/distinfo
+++ b/net/nidentd/distinfo
@@ -1,5 +1,5 @@
+$NetBSD: distinfo,v 1.3 2002/05/05 23:51:27 hubertf Exp $
 
-
-SHA1 (nidentd-0.4.tgz) = cff429794e4caa83227239173982f6727c51232e
-Size (nidentd-0.4.tgz) = 1193 bytes
-SHA1 (patch-aa) = 2f443cf45fae21a6aac97c82c3ae8d1a4684110a
+SHA1 (nidentd-1.0.tgz) = 5ad5f5f27514a9b647f00bdd8f132203c29987be
+Size (nidentd-1.0.tgz) = 1831 bytes
+SHA1 (patch-aa) = 3fed5dab21289532f36f44d2eb4594f241eb0130
diff --git a/net/nidentd/patches/patch-aa b/net/nidentd/patches/patch-aa
index 84cd43606d6..6d6da9f2e03 100644
--- a/net/nidentd/patches/patch-aa
+++ b/net/nidentd/patches/patch-aa
@@ -1,22 +1,17 @@
-$NetBSD: patch-aa,v 1.2 2002/03/29 17:10:02 hubertf Exp $
+$NetBSD: patch-aa,v 1.3 2002/05/05 23:51:28 hubertf Exp $
 
---- nidentd.sh.orig	Thu Mar 28 13:54:38 2002
-+++ nidentd.sh
-@@ -25,7 +25,7 @@
- #
- # Path to LSOF !
+--- nidentd.orig	Mon May  6 00:37:54 2002
++++ nidentd
+@@ -1,9 +1,9 @@
+ #!/bin/sh
  
--lsof="/usr/pkg/sbin/lsof -P -n -i -Di"
-+lsof="@LOCALBASE@/sbin/lsof -P -n -i -Di"
+-v_lsof="/usr/pkg/sbin/lsof -P -n -Di"
++v_lsof="@LOCALBASE@/sbin/lsof -P -n -Di"
+ v_ipnat="/usr/sbin/ipnat -l"
+-v_nat_conf="/usr/local/etc/nidentd.nat"
+-v_fake_conf="/usr/local/etc/nidentd.fake"
++v_nat_conf="@LOCALBASE@/etc/nidentd.nat"
++v_fake_conf="@LOCALBASE@/etc/nidentd.fake"
  
  # Protocol independent
  
-@@ -42,7 +42,7 @@
- masqip=`/usr/sbin/ipnat -l | grep MAP | egrep " $qlport " | egrep " $qrport" | awk '{ print $2 }' | tr -c -d '.1234567890'`
- lport=`/usr/sbin/ipnat -l | grep MAP | egrep " $qlport " | egrep " $qrport" | awk '{ print $7 }'`
- rport=`/usr/sbin/ipnat -l | grep MAP | egrep " $qlport " | egrep " $qrport" | awk '{ print $9 }' | tr -d ] `
--hostn=`grep ^$masqip /usr/local/etc/identn.conf | awk -F: '{ print $2 }'`
-+hostn=`grep ^$masqip /usr/local/etc/nidentd.conf | awk -F: '{ print $2 }'`
- if [ -n $qlport ] && [ -n $qrport ] && [ -n $lport ] && [ $rport ]
-   then
-     if [ $qlport -eq $lport ] && [ $qrport -eq $rport ]