From yds@dppl.com  Tue Dec  1 19:50:17 1998
Received: from paris.dppl.com (paris.dppl.com [205.230.74.150])
          by hub.freebsd.org (8.8.8/8.8.8) with SMTP id TAA00133
          for <FreeBSD-gnats-submit@freebsd.org>; Tue, 1 Dec 1998 19:50:16 -0800 (PST)
          (envelope-from yds@dppl.com)
Received: (qmail 66985 invoked by uid 0); 2 Dec 1998 03:50:00 -0000
Message-Id: <19981202035000.66984.qmail@paris.dppl.com>
Date: 2 Dec 1998 03:50:00 -0000
From: yds@dppl.com
Reply-To: yds@dppl.com
To: FreeBSD-gnats-submit@freebsd.org
Subject: Upgrade to ports/sysutils/ucspi-tcp
X-Send-Pr-Version: 3.2

>Number:         8927
>Category:       ports
>Synopsis:       Upgrade to ports/sysutils/ucspi-tcp
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec  1 20:00:00 PST 1998
>Closed-Date:    Sat Dec 5 12:27:13 PST 1998
>Last-Modified:  Sat Dec  5 12:28:04 PST 1998
>Originator:     Yarema
>Release:        FreeBSD 3.0-CURRENT i386
>Organization:
>Environment:

	

>Description:

	

>How-To-Repeat:

	

>Fix:
diff -ruN ucspi-tcp80/Makefile ucspi-tcp/Makefile
--- ucspi-tcp80/Makefile	Sun Jul 26 20:08:10 1998
+++ ucspi-tcp/Makefile	Tue Dec  1 22:16:25 1998
@@ -6,7 +6,7 @@
 # $Id: Makefile,v 1.3 1998/07/27 00:08:10 steve Exp $
 #
 
-DISTNAME=	ucspi-tcp-0.80
+DISTNAME=	ucspi-tcp-0.84
 CATEGORIES=	sysutils net
 MASTER_SITES=	ftp://koobera.math.uic.edu/pub/software/
 
@@ -14,13 +14,15 @@
 
 NO_PACKAGE=	Unsure of djb's license
 
-ALL_TARGET=	it man
+ALL_TARGET=	it
 INSTALL_TARGET=	setup
 
 SCRIPTS_ENV=	BINOWN="${BINOWN}" BINGRP="${BINGRP}" BINMODE="${BINMODE}" \
 		MANMODE="${MANMODE}" CFLAGS="${CFLAGS}"
 
-MAN1=		tcpclient.1 tcprules.1 tcpserver.1
+MAN1=		tcpclient.1 tcpserver.1 tcprules.1 tcprulescheck.1 \
+		fixcr.1 addcr.1 delcr.1 who@.1 date@.1 finger@.1 http@.1 \
+		tcpcat.1 mconnect.1 argv0.1 recordio.1
 MAN5=		tcp-environ.5
 
 .include <bsd.port.mk>
diff -ruN ucspi-tcp80/files/md5 ucspi-tcp/files/md5
--- ucspi-tcp80/files/md5	Thu Jul  9 06:18:42 1998
+++ ucspi-tcp/files/md5	Tue Dec  1 19:13:13 1998
@@ -1 +1 @@
-MD5 (ucspi-tcp-0.80.tar.gz) = fae5f80af760fd09bd9f05204c856a49
+MD5 (ucspi-tcp-0.84.tar.gz) = 2a3f481f145bd4445ce661ecfcfa29d2
diff -ruN ucspi-tcp80/patches/patch-aa ucspi-tcp/patches/patch-aa
--- ucspi-tcp80/patches/patch-aa	Wed Dec 31 19:00:00 1969
+++ ucspi-tcp/patches/patch-aa	Tue Dec  1 20:25:56 1998
@@ -0,0 +1,11 @@
+--- Makefile.orig	Thu Nov 12 00:32:01 1998
++++ Makefile	Tue Dec  1 20:25:38 1998
+@@ -365,7 +365,7 @@
+ 	./compile ipalloc.c
+ 
+ it: \
+-man prog install instcheck
++prog install instcheck
+ 
+ load: \
+ warn-auto.sh conf-ld
diff -ruN ucspi-tcp80/patches/patch-ab ucspi-tcp/patches/patch-ab
--- ucspi-tcp80/patches/patch-ab	Wed Dec 31 19:00:00 1969
+++ ucspi-tcp/patches/patch-ab	Tue Dec  1 20:19:02 1998
@@ -0,0 +1,58 @@
+--- hier.c.orig	Thu Nov 12 00:32:01 1998
++++ hier.c	Tue Dec  1 20:18:50 1998
+@@ -2,14 +2,12 @@
+ 
+ void hier()
+ {
+-  h(auto_home,-1,-1,02755);
++  h(auto_home,-1,-1,0755);
+ 
+-  d(auto_home,"bin",-1,-1,02755);
+-  d(auto_home,"man",-1,-1,02755);
+-  d(auto_home,"man/man1",-1,-1,02755);
+-  d(auto_home,"man/cat1",-1,-1,02755);
+-  d(auto_home,"man/man5",-1,-1,02755);
+-  d(auto_home,"man/cat5",-1,-1,02755);
++  d(auto_home,"bin",-1,-1,0755);
++  d(auto_home,"man",-1,-1,0755);
++  d(auto_home,"man/man1",-1,-1,0755);
++  d(auto_home,"man/man5",-1,-1,0755);
+ 
+   c(auto_home,"bin","tcpclient",-1,-1,0711);
+   c(auto_home,"bin","tcpserver",-1,-1,0711);
+@@ -29,35 +27,19 @@
+   c(auto_home,"bin","recordio",-1,-1,0711);
+ 
+   c(auto_home,"man/man1","tcpclient.1",-1,-1,0644);
+-  c(auto_home,"man/cat1","tcpclient.0",-1,-1,0644);
+   c(auto_home,"man/man1","tcpserver.1",-1,-1,0644);
+-  c(auto_home,"man/cat1","tcpserver.0",-1,-1,0644);
+   c(auto_home,"man/man1","tcprules.1",-1,-1,0644);
+-  c(auto_home,"man/cat1","tcprules.0",-1,-1,0644);
+   c(auto_home,"man/man1","tcprulescheck.1",-1,-1,0644);
+-  c(auto_home,"man/cat1","tcprulescheck.0",-1,-1,0644);
+   c(auto_home,"man/man1","fixcr.1",-1,-1,0644);
+-  c(auto_home,"man/cat1","fixcr.0",-1,-1,0644);
+   c(auto_home,"man/man1","addcr.1",-1,-1,0644);
+-  c(auto_home,"man/cat1","addcr.0",-1,-1,0644);
+   c(auto_home,"man/man1","delcr.1",-1,-1,0644);
+-  c(auto_home,"man/cat1","delcr.0",-1,-1,0644);
+   c(auto_home,"man/man1","who@.1",-1,-1,0644);
+-  c(auto_home,"man/cat1","who@.0",-1,-1,0644);
+   c(auto_home,"man/man1","date@.1",-1,-1,0644);
+-  c(auto_home,"man/cat1","date@.0",-1,-1,0644);
+   c(auto_home,"man/man1","finger@.1",-1,-1,0644);
+-  c(auto_home,"man/cat1","finger@.0",-1,-1,0644);
+   c(auto_home,"man/man1","http@.1",-1,-1,0644);
+-  c(auto_home,"man/cat1","http@.0",-1,-1,0644);
+   c(auto_home,"man/man1","tcpcat.1",-1,-1,0644);
+-  c(auto_home,"man/cat1","tcpcat.0",-1,-1,0644);
+   c(auto_home,"man/man1","mconnect.1",-1,-1,0644);
+-  c(auto_home,"man/cat1","mconnect.0",-1,-1,0644);
+   c(auto_home,"man/man1","argv0.1",-1,-1,0644);
+-  c(auto_home,"man/cat1","argv0.0",-1,-1,0644);
+   c(auto_home,"man/man1","recordio.1",-1,-1,0644);
+-  c(auto_home,"man/cat1","recordio.0",-1,-1,0644);
+   c(auto_home,"man/man5","tcp-environ.5",-1,-1,0644);
+-  c(auto_home,"man/cat5","tcp-environ.0",-1,-1,0644);
+ }
diff -ruN ucspi-tcp80/pkg/PLIST ucspi-tcp/pkg/PLIST
--- ucspi-tcp80/pkg/PLIST	Wed Aug 19 16:43:23 1998
+++ ucspi-tcp/pkg/PLIST	Tue Dec  1 19:50:51 1998
@@ -1,10 +1,16 @@
 bin/tcpclient
 bin/tcpserver
 bin/tcprules
+bin/tcprulescheck
+bin/fixcr
 bin/addcr
 bin/delcr
 bin/who@
 bin/date@
 bin/finger@
+bin/http@
 bin/tcpcat
 bin/mconnect
+bin/mconnect-io
+bin/argv0
+bin/recordio
diff -ruN ucspi-tcp80/scripts/configure ucspi-tcp/scripts/configure
--- ucspi-tcp80/scripts/configure	Thu Jul  9 06:18:38 1998
+++ ucspi-tcp/scripts/configure	Tue Dec  1 19:44:44 1998
@@ -1,51 +1,10 @@
 #!/bin/sh
 #
-# Set up daemontools for the *BSD environment...
+# Set up ucspi-tcp for the *BSD environment...
 #
 # @(#) $Id: configure,v 1.1.1.1 1998/07/09 10:18:38 dburr Exp $
 #
 
 # Tune the options we're given.
-echo ${PREFIX}/bin > ${WRKSRC}/conf-bin
-echo ${PREFIX}/man > ${WRKSRC}/conf-man
+echo ${PREFIX} > ${WRKSRC}/conf-home
 echo cc ${CFLAGS} > ${WRKSRC}/conf-cc
-
-# Set up binaries correctly.
-awk 'BEGIN {
-	FS=":"
-	OFS=":"
-}
-$1 == "c" {
-	$2 = bu
-	$3 = bg
-	$4 = bm
-	print
-	next
-}
-{
-	print
-}' bu=`id -u ${BINOWN}` bg=`id -g ${BINGRP}` bm=${BINMODE} \
-    ${WRKSRC}/BIN > ${WRKSRC}/BIN.tmp
-mv ${WRKSRC}/BIN.tmp ${WRKSRC}/BIN
-
-# Set up man pages correctly.
-awk 'BEGIN {
-	FS=":"
-	OFS=":"
-}
-# Dispose of preformatted man pages.
-$5 ~ "cat" {
-	next
-}
-$1 == "c" {
-	$2 = bu
-	$3 = bg
-	$4 = mm
-	print
-	next
-}
-{
-	print
-}' bu=`id -u ${BINOWN}` bg=`id -g ${BINGRP}` mm=${MANMODE} \
-    ${WRKSRC}/MAN > ${WRKSRC}/MAN.tmp
-mv ${WRKSRC}/MAN.tmp ${WRKSRC}/MAN
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: sada 
State-Changed-When: Sat Dec 5 12:27:13 PST 1998 
State-Changed-Why:  
Commited. From next time, please sort pkg/PLIST. 
Thanks. 
>Unformatted:
