From owner-freebsd-ports Thu Jan 21 10:10:01 1999 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id KAA06215 for freebsd-ports-outgoing; Thu, 21 Jan 1999 10:10:01 -0800 (PST) (envelope-from owner-freebsd-ports@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id KAA06160 for ; Thu, 21 Jan 1999 10:09:59 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.8.8/8.8.5) id KAA11472; Thu, 21 Jan 1999 10:10:00 -0800 (PST) Received: from mail9.svr.pol.co.uk (mail9.svr.pol.co.uk [195.92.193.22]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id KAA05764 for ; Thu, 21 Jan 1999 10:06:03 -0800 (PST) (envelope-from tom@eborcom.com) Received: from modem-1.adderall.dialup.pol.co.uk ([62.136.48.129]) by mail9.svr.pol.co.uk with esmtp (Exim 2.10 #1) id 103OUG-0005xs-00 for FreeBSD-gnats-submit@freebsd.org; Thu, 21 Jan 1999 18:05:52 +0000 Received: (qmail 2715 invoked by uid 5000); 21 Jan 1999 15:12:21 -0000 Message-Id: <19990121151221.2714.qmail@eborcom.com> Date: 21 Jan 1999 15:12:21 -0000 From: Tom Hukins To: FreeBSD-gnats-submit@FreeBSD.ORG X-Send-Pr-Version: 3.2 Subject: ports/9604: Minor improvements to ucspi-tcp port Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 9604 >Category: ports >Synopsis: Minor improvements to ucspi-tcp port >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jan 21 10:10:00 PST 1999 >Closed-Date: >Last-Modified: >Originator: Tom Hukins >Release: FreeBSD 2.2.8-STABLE i386 >Organization: eBORcOM >Environment: >Description: The patch attached is a small change to the ucspi-tcp port. The port's maintainer, Dom Mitchell, has agreed this patch should be applied. Changes: - The ports now honours INSTALL_PROGRAM and INSTALL_SCRIPT. - The port honours CC, so a different compiler can be used. - Functionality merged from patches and scripts into the Makefile, making the port smaller. - if NOPORTDOCS is undefined, install some documentation. The following files (and directories) have been removed: patches patches/patch-aa patches/patch-ab scripts scripts/configure The file "pkg/PLIST.nodocs" has been added. >How-To-Repeat: >Fix: diff -ruN ucspi-tcp.old/Makefile ucspi-tcp/Makefile --- ucspi-tcp.old/Makefile Sat Dec 12 15:49:16 1998 +++ ucspi-tcp/Makefile Wed Jan 20 16:57:20 1999 @@ -1,9 +1,9 @@ # New ports collection makefile for: ucspi-tcp -# Version required: 0.80 +# Version required: 0.84 # Date created: 12 June 1998 # Whom: Dom Mitchell # -# $Id: Makefile,v 1.4 1998/12/05 20:26:45 sada Exp $ +# $Id$ # DISTNAME= ucspi-tcp-0.84 @@ -12,17 +12,46 @@ MAINTAINER= dom@myrddin.demon.co.uk +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 + +.if defined(NOPORTDOCS) +PLIST= ${PKGDIR}/PLIST.nodocs +.endif + NO_PACKAGE= Unsure of djb's license -ALL_TARGET= it -INSTALL_TARGET= setup +ALL_TARGET= prog install instcheck SCRIPTS_ENV= BINOWN="${BINOWN}" BINGRP="${BINGRP}" BINMODE="${BINMODE}" \ MANMODE="${MANMODE}" CFLAGS="${CFLAGS}" -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 +post-configure: + @${ECHO} ${PREFIX} > ${WRKSRC}/conf-home + @${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc + @${ECHO} ${CC} -s > ${WRKSRC}/conf-ld + +do-install: +.for file in addcr argv0 delcr fixcr mconnect-io recordio tcpclient tcprules tcprulescheck tcpserver + @${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin +.endfor +.for file in date@ finger@ http@ mconnect who@ tcpcat + @${INSTALL_SCRIPT} ${WRKSRC}/${file} ${PREFIX}/bin +.endfor +.for file in ${MAN1} + @${INSTALL_MAN} ${WRKSRC}/${file} ${PREFIX}/man/man1 +.endfor +.for file in ${MAN5} + @${INSTALL_MAN} ${WRKSRC}/${file} ${PREFIX}/man/man5 +.endfor +.if !defined(NOPORTDOCS) + @${ECHO} "===> Copying documents to ${PREFIX}/share/doc/ucspi-tcp" + @${MKDIR} ${PREFIX}/share/doc/ucspi-tcp +.for file in BLURB TCP UCSPI + @${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/ucspi-tcp +.endfor +.endif .include diff -ruN ucspi-tcp.old/patches/patch-aa ucspi-tcp/patches/patch-aa --- ucspi-tcp.old/patches/patch-aa Sat Dec 5 20:26:45 1998 +++ ucspi-tcp/patches/patch-aa Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- 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-tcp.old/patches/patch-ab ucspi-tcp/patches/patch-ab --- ucspi-tcp.old/patches/patch-ab Sat Dec 5 20:26:45 1998 +++ ucspi-tcp/patches/patch-ab Thu Jan 1 01:00:00 1970 @@ -1,58 +0,0 @@ ---- 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-tcp.old/pkg/PLIST ucspi-tcp/pkg/PLIST --- ucspi-tcp.old/pkg/PLIST Sat Dec 12 15:49:16 1998 +++ ucspi-tcp/pkg/PLIST Wed Jan 20 16:52:12 1999 @@ -14,3 +14,7 @@ bin/tcprulescheck bin/tcpserver bin/who@ +share/doc/ucspi-tcp/BLURB +share/doc/ucspi-tcp/TCP +share/doc/ucspi-tcp/UCSPI +@dirrm share/doc/ucspi-tcp diff -ruN ucspi-tcp.old/pkg/PLIST.nodocs ucspi-tcp/pkg/PLIST.nodocs --- ucspi-tcp.old/pkg/PLIST.nodocs Thu Jan 1 01:00:00 1970 +++ ucspi-tcp/pkg/PLIST.nodocs Sat Dec 12 15:49:16 1998 @@ -0,0 +1,16 @@ +bin/addcr +bin/argv0 +bin/date@ +bin/delcr +bin/finger@ +bin/fixcr +bin/http@ +bin/mconnect +bin/mconnect-io +bin/recordio +bin/tcpcat +bin/tcpclient +bin/tcprules +bin/tcprulescheck +bin/tcpserver +bin/who@ diff -ruN ucspi-tcp.old/scripts/configure ucspi-tcp/scripts/configure --- ucspi-tcp.old/scripts/configure Sat Dec 12 15:49:17 1998 +++ ucspi-tcp/scripts/configure Thu Jan 1 01:00:00 1970 @@ -1,10 +0,0 @@ -#!/bin/sh -# -# Set up ucspi-tcp for the *BSD environment... -# -# @(#) $Id: configure,v 1.2 1998/12/05 20:26:46 sada Exp $ -# - -# Tune the options we're given. -echo ${PREFIX} > ${WRKSRC}/conf-home -echo cc ${CFLAGS} > ${WRKSRC}/conf-cc >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message