Update from 2.7b3 -> 2.7b4, the author included our patch.

.. however, he also changed the top level Makefile to use $PREFIX for
something completely different (and incompatable) to what we use it for.

5 files changed, 80 insertions, 127 deletions

diff --git a/security/pidentd/Makefile b/security/pidentd/Makefile
index c7cf19c72d9f..6d4dad87f660 100644
--- a/security/pidentd/Makefile
+++ b/security/pidentd/Makefile
@@ -1,19 +1,21 @@
 # New ports collection makefile for:	pidentd
-# Version required:	2.7b3
+# Version required:	2.7b4
 # Date created:		19 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.12 1996/04/01 07:13:00 asami Exp $
+# $Id: Makefile,v 1.13 1996/06/25 09:10:48 torstenb Exp $
 #
 
-DISTNAME=	pidentd-2.7b3
+DISTNAME=	pidentd-2.7b4
 CATEGORIES+=	security net
 MASTER_SITES=	ftp://ftp.lysator.liu.se/pub/ident/servers/ \
 		ftp://ftp.fu-berlin.de/unix/security/ident/servers/
-ALL_TARGET=     freebsd
 
 MAINTAINER=	torstenb@FreeBSD.ORG
 
+ALL_TARGET=     freebsd
+MAKE_ENV=	REALPREFIX=${PREFIX}
+
 .if !defined(NOMANCOMPRESS)
 post-install:
 	gzip -9nf ${PREFIX}/man/man8/identd.8
diff --git a/security/pidentd/distinfo b/security/pidentd/distinfo
index 713a36e4db6e..c5e3d5abc81e 100644
--- a/security/pidentd/distinfo
+++ b/security/pidentd/distinfo
@@ -1 +1 @@
-MD5 (pidentd-2.7b3.tar.gz) = 1805c976d225857af0df4bdf0362c2c7
+MD5 (pidentd-2.7b4.tar.gz) = b8d8afca6fffe1a3d181909e0cba10c8
diff --git a/security/pidentd/files/patch-ab b/security/pidentd/files/patch-ab
index 01f92189484d..76b2b24f01d6 100644
--- a/security/pidentd/files/patch-ab
+++ b/security/pidentd/files/patch-ab
@@ -1,55 +1,30 @@
-*** Makefile.orig	Mon Jun  5 21:49:08 1995
---- Makefile	Fri Jul 28 04:53:59 1995
-***************
-*** 15,21 ****
-  #
-  TAR=tar
-  MAKE=make
-! DESTROOT=/usr/local
-  DESTDIR=$(DESTROOT)/sbin
-  MANROOT=$(DESTROOT)/man
-  MANDIR=$(MANROOT)/man8
---- 15,21 ----
-  #
-  TAR=tar
-  MAKE=make
-! DESTROOT=${PREFIX}
-  DESTDIR=$(DESTROOT)/sbin
-  MANROOT=$(DESTROOT)/man
-  MANDIR=$(MANROOT)/man8
-***************
-*** 42,48 ****
-  # GLIBS=-lident -ldes
-  GLIBS=
-  
-! CFLAGS=-O
-  
-  all:
-  	@echo "Please specify the type of system you wish to build for."
---- 42,48 ----
-  # GLIBS=-lident -ldes
-  GLIBS=
-  
-! #CFLAGS=-O
-  
-  all:
-  	@echo "Please specify the type of system you wish to build for."
-***************
-*** 387,394 ****
-  
-  install: in.identd idecrypt
-	cp identd.man  $(MANDIR)/identd.$(MANSECT)
-	echo ".so man$(MANSECT)/identd.$(MANSECT)" > $(MANDIR)/in.identd.$(MANSECT)
-! 	cp in.identd $(DESTDIR)/in.identd
-  	cp idecrypt.man  $(MANDIR)/idecrypt.$(MANSECT)
-  	cp idecrypt $(DESTDIR)/idecrypt
-  
---- 387,394 ----
-  
-  install: in.identd idecrypt
-	cp identd.man  $(MANDIR)/identd.$(MANSECT)
-	echo ".so man$(MANSECT)/identd.$(MANSECT)" > $(MANDIR)/in.identd.$(MANSECT)
-! 	cp in.identd $(DESTDIR)/identd
-  	cp idecrypt.man  $(MANDIR)/idecrypt.$(MANSECT)
-  	cp idecrypt $(DESTDIR)/idecrypt
-  
+--- Makefile.orig	Mon Aug 12 06:08:06 1996
++++ Makefile	Sat Aug 17 01:54:22 1996
+@@ -18,9 +18,9 @@
+ MAKE=make
+ 
+ # set this to 'in.' if you like Sun's prefix on internet daemons
+-PREFIX=in.
++PREFIX=
+  
+-DESTROOT=/usr/local
++DESTROOT=${REALPREFIX}
+ 
+ # set this to '/share' if your man pages are in /usr/share
+ #SHARE=/share
+@@ -60,13 +60,13 @@
+ #	-DSTRONG_LOG -DALLOW_FORMAT \
+ #
+ GDEFS=-DSTRONG_LOG -DALLOW_FORMAT \
+-	-DDPATH_CONFIG='\"$(CONFDIR)/identd.conf\"' \
++	-DPATH_CONFIG='\"$(CONFDIR)/identd.conf\"' \
+ 	-DPATH_DESKEY='\"$(CONFDIR)/identd.key\"'
+ 
+ # GLIBS=-lident -ldes
+ GLIBS=
+ 
+-CFLAGS=-O
++#CFLAGS=-O
+ #LDFLAGS=-L$(DESTROOT)/lib
+ 
+ all:
diff --git a/security/pidentd/files/patch-ac b/security/pidentd/files/patch-ac
index 664d08da62cd..365a5e989433 100644
--- a/security/pidentd/files/patch-ac
+++ b/security/pidentd/files/patch-ac
@@ -1,67 +1,41 @@
-*** identd.man.orig	Thu Jul 27 21:18:14 1995
---- identd.man	Thu Jul 27 21:16:53 1995
-***************
-*** 6,12 ****
-  .SH NAME
-  identd, in.identd \- TCP/IP IDENT protocol server
-  .SH SYNOPSIS
-! .B /usr/sbin/in.identd
-  .RB [ \-i | \-w | \-b ]
-  .RB [ \-t<seconds> ]
-  .RB [ \-u<uid> ]
---- 6,12 ----
-  .SH NAME
-  identd, in.identd \- TCP/IP IDENT protocol server
-  .SH SYNOPSIS
-! .B !!PREFIX!!/sbin/identd
-  .RB [ \-i | \-w | \-b ]
-  .RB [ \-t<seconds> ]
-  .RB [ \-u<uid> ]
-***************
-*** 234,247 ****
-  mode of operation.
-  .SH EXAMPLES
-  Assuming the server is located in
-! .B /usr/etc/in.identd
-  one can put either:
-  .PP
-! ident stream tcp wait sys /usr/etc/in.identd in.identd -w -t120
-  .PP
-  or:
-  .PP
-! ident stream tcp nowait sys /usr/etc/in.identd in.identd -i
-  .PP
-  into the
-  .B /etc/inetd.conf
---- 234,247 ----
-  mode of operation.
-  .SH EXAMPLES
-  Assuming the server is located in
-! .B !!PREFIX!!/sbin/identd
-  one can put either:
-  .PP
-! ident stream tcp wait sys !!PREFIX!!/sbin/identd identd -w -t120
-  .PP
-  or:
-  .PP
-! ident stream tcp nowait sys !!PREFIX!!/sbin/identd identd -i
-  .PP
-  into the
-  .B /etc/inetd.conf
-***************
-*** 254,260 ****
-  .B /etc/rc.local
-  file:
-  .PP
-! /usr/etc/in.identd -b -u2 -g2
-  .PP
-  This will make it run in the background as user 2, group 2 (user "sys",
-  group "kmem" on SunOS 4.1.1).
---- 254,260 ----
-  .B /etc/rc.local
-  file:
-  .PP
-! !!PREFIX!!/sbin/identd -b -u2 -g2
-  .PP
-  This will make it run in the background as user 2, group 2 (user "sys",
-  group "kmem" on SunOS 4.1.1).
+--- identd.man.orig	Mon Aug 12 04:58:37 1996
++++ identd.man	Sat Aug 17 01:43:42 1996
+@@ -4,9 +4,9 @@
+ .\"
+ .TH IDENTD 8 "27 May 1992"
+ .SH NAME
+-identd, in.identd \- TCP/IP IDENT protocol server
++identd \- TCP/IP IDENT protocol server
+ .SH SYNOPSIS
+-.B xDESTDIRx/[in.]identd
++.B !!PREFIX!!/identd
+ .RB [ \-i | \-w | \-b ]
+ .RB [ \-t<seconds> ]
+ .RB [ \-u<uid> ]
+@@ -322,14 +322,14 @@
+ mode of operation.
+ .SH EXAMPLES
+ Assuming the server is located in
+-.B /usr/etc/in.identd
++.B !!PREFIX!!/sbin/identd
+ one can put either:
+ .PP
+-ident stream tcp wait sys /usr/etc/in.identd in.identd -w -t120
++ident stream tcp wait sys !!PREFIX!!/sbin/identd identd -w -t120
+ .PP
+ or:
+ .PP
+-ident stream tcp nowait sys /usr/etc/in.identd in.identd -i
++ident stream tcp nowait sys !!PREFIX!!/sbin/identd identd -i
+ .PP
+ into the
+ .B /etc/inetd.conf
+@@ -342,7 +342,7 @@
+ .B /etc/rc.local
+ file:
+ .PP
+-/usr/etc/in.identd -b -u2 -g2
++!!PREFIX!!/sbin/identd -b -u2 -g2
+ .PP
+ This will make it run in the background as user 2, group 2 (user "sys",
+ group "kmem" on SunOS 4.1.1).
diff --git a/security/pidentd/pkg-plist b/security/pidentd/pkg-plist
index 7d08e2138331..36913771e23f 100644
--- a/security/pidentd/pkg-plist
+++ b/security/pidentd/pkg-plist
@@ -1,4 +1,6 @@
+sbin/identconn
 sbin/identd
 sbin/idecrypt
+sbin/itest
 man/man8/identd.8.gz
 man/man8/idecrypt.8.gz