From owner-freebsd-ports Fri Nov 24 8:40:37 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 64E4B37B4E5 for ; Fri, 24 Nov 2000 08:40:01 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id IAA20559; Fri, 24 Nov 2000 08:40:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 200B937B479; Fri, 24 Nov 2000 08:32:14 -0800 (PST) Message-Id: <20001124163214.200B937B479@hub.freebsd.org> Date: Fri, 24 Nov 2000 08:32:14 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/23078: Update port: shells/tcsh to 6.10.00 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 23078 >Category: ports >Synopsis: Update port: shells/tcsh to 6.10.00 >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: Fri Nov 24 08:40:00 PST 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.2-RELEASE i386 >Organization: >Environment: >Description: - Update to version 6.10.00 New file: files/extra-patch-host.defs Remove file: files/patch-ad files/patch-sec1 >How-To-Repeat: >Fix: diff -urN /usr/ports/shells/tcsh/Makefile shells/tcsh/Makefile --- /usr/ports/shells/tcsh/Makefile Mon Nov 20 20:56:58 2000 +++ shells/tcsh/Makefile Thu Nov 23 06:24:29 2000 @@ -6,11 +6,10 @@ # PORTNAME= tcsh -PORTVERSION= 6.09.03 -PORTREVISION= 1 +PORTVERSION= 6.10.00 CATEGORIES= shells -MASTER_SITES= ${MASTER_SITE_TCSH} -DISTNAME= ${DISTNAME_TCSH} +MASTER_SITES= http://www2.wbs.ne.jp/~znc/tcsh/ +DISTNAME= ${PORTNAME}-${PORTVERSION:R} MAINTAINER= ports@FreeBSD.org @@ -18,32 +17,30 @@ .include .if ${OSVERSION} >= 400021 +DISTFILES= # empty NO_BUILD= yes PLIST= ${PKGDIR}/pkg-plist.nobuild -DISTFILES= # empty - -do-patch: .else -GNU_CONFIGURE= yes +EXTRA_PATCHES= ${FILESDIR}/extra-patch-host.defs WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +GNU_CONFIGURE= yes ALL_TARGET= all catalogs -INSTALL_TARGET= install install.man MAN1= tcsh.1 -MASTER_SITE_TCSH= http://www2.wbs.ne.jp/~znc/tcsh/ -DISTNAME_TCSH= ${PORTNAME}-${PORTVERSION} +BINOWN= bin +BINGRP= bin .endif .if ${OSVERSION} >= 400021 -pre-fetch: +pre-everything: @${ECHO_MSG} "This port is just for making symlink from /bin/tcsh" @${ECHO_MSG} "to ${PREFIX}/bin/tcsh and updating /etc/shells." do-install: ${LN} -sf /bin/tcsh ${PREFIX}/bin/tcsh .else -post-install: - ${CHOWN} bin.bin ${PREFIX}/bin/tcsh - ${CHOWN} bin.bin ${PREFIX}/man/man1/tcsh.1 +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/tcsh ${PREFIX}/bin/tcsh + ${INSTALL_MAN} ${WRKSRC}/tcsh.man ${MANPREFIX}/man/man1/tcsh.1 ${INSTALL_DATA} ${WRKSRC}/tcsh.C.cat ${PREFIX}/share/nls/C/tcsh.cat ${INSTALL_DATA} ${WRKSRC}/tcsh.german.cat ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat ${LN} -sf ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/de_AT.ISO_8859-1/tcsh.cat @@ -58,6 +55,8 @@ ${LN} -sf ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/fr_CH.ISO_8859-1/tcsh.cat ${INSTALL_DATA} ${WRKSRC}/tcsh.italian.cat ${PREFIX}/share/nls/it_IT.ISO_8859-1/tcsh.cat .endif + +post-install: @${ECHO} "Updating /etc/shells" @${CP} /etc/shells /etc/shells.bak @(${GREP} -v ${PREFIX}/bin/tcsh /etc/shells.bak; \ diff -urN /usr/ports/shells/tcsh/distinfo shells/tcsh/distinfo --- /usr/ports/shells/tcsh/distinfo Fri Jul 21 22:00:24 2000 +++ shells/tcsh/distinfo Thu Nov 23 05:27:58 2000 @@ -1 +1 @@ -MD5 (tcsh-6.09.03.tar.gz) = 8fffe820e2cba4666f9a228ffffd65e5 +MD5 (tcsh-6.10.tar.gz) = f459c423074d85dfaa55439eb908a053 diff -urN /usr/ports/shells/tcsh/files/extra-patch-host.defs shells/tcsh/files/extra-patch-host.defs --- /usr/ports/shells/tcsh/files/extra-patch-host.defs Thu Jan 1 09:00:00 1970 +++ shells/tcsh/files/extra-patch-host.defs Fri Jul 21 22:00:24 2000 @@ -0,0 +1,16 @@ +--- host.defs.old Fri Jul 21 14:49:18 2000 ++++ host.defs Fri Jul 21 14:50:28 2000 +@@ -499,10 +499,12 @@ + + newdef : defined(__FreeBSD__) + comment : FreeBSD ++vendor : defined(__alpha) : "digital" + vendor : defined(M_intel) : "intel" + hosttype: : "FreeBSD" + ostype : : "FreeBSD" +-machtype: : "i386" ++machtype: defined(__alpha) : "alpha" ++machtype: defined(M_i386) : "i386" + enddef : + + diff -urN /usr/ports/shells/tcsh/files/patch-ad shells/tcsh/files/patch-ad --- /usr/ports/shells/tcsh/files/patch-ad Fri Jul 21 22:00:24 2000 +++ shells/tcsh/files/patch-ad Thu Jan 1 09:00:00 1970 @@ -1,16 +0,0 @@ ---- host.defs.old Fri Jul 21 14:49:18 2000 -+++ host.defs Fri Jul 21 14:50:28 2000 -@@ -499,10 +499,12 @@ - - newdef : defined(__FreeBSD__) - comment : FreeBSD -+vendor : defined(__alpha) : "digital" - vendor : defined(M_intel) : "intel" - hosttype: : "FreeBSD" - ostype : : "FreeBSD" --machtype: : "i386" -+machtype: defined(__alpha) : "alpha" -+machtype: defined(M_i386) : "i386" - enddef : - - diff -urN /usr/ports/shells/tcsh/files/patch-sec1 shells/tcsh/files/patch-sec1 --- /usr/ports/shells/tcsh/files/patch-sec1 Mon Nov 20 11:45:47 2000 +++ shells/tcsh/files/patch-sec1 Thu Jan 1 09:00:00 1970 @@ -1,69 +0,0 @@ -Index: sh.dol.c -=================================================================== -RCS file: /mnt/ncvs/src/contrib/tcsh/sh.dol.c,v -retrieving revision 1.1.1.3 -retrieving revision 1.1.1.4 -diff -u -r1.1.1.3 -r1.1.1.4 ---- sh.dol.c 2000/06/10 22:07:52 1.1.1.3 -+++ sh.dol.c 2000/11/04 22:23:19 1.1.1.4 -@@ -1,4 +1,4 @@ --/* $Header: /src/pub/tcsh/sh.dol.c,v 3.40 2000/06/10 21:36:06 kim Exp $ */ -+/* $Header: /src/pub/tcsh/sh.dol.c,v 3.42 2000/10/31 16:55:52 christos Exp $ */ - /* - * sh.dol.c: Variable substitutions - */ -@@ -36,7 +36,7 @@ - */ - #include "sh.h" - --RCSID("$Id: sh.dol.c,v 3.40 2000/06/10 21:36:06 kim Exp $") -+RCSID("$Id: sh.dol.c,v 3.42 2000/10/31 16:55:52 christos Exp $") - - /* - * C shell -@@ -1017,7 +1017,7 @@ - heredoc(term) - Char *term; - { -- register int c; -+ int c; - Char *Dv[2]; - Char obuf[BUFSIZE], lbuf[BUFSIZE], mbuf[BUFSIZE]; - int ocnt, lcnt, mcnt; -@@ -1025,7 +1025,9 @@ - Char **vp; - bool quoted; - char *tmp; -+ struct timeval tv; - -+again: - tmp = short2str(shtemp); - #ifndef O_CREAT - # define O_CREAT 0 -@@ -1036,12 +1038,22 @@ - #ifndef O_TEMPORARY - # define O_TEMPORARY 0 - #endif -- if (open(tmp, O_RDWR|O_CREAT|O_TEMPORARY) < 0) { -- int oerrno = errno; -- -+#ifndef O_EXCL -+# define O_EXCL 0 -+#endif -+ if (open(tmp, O_RDWR|O_CREAT|O_EXCL|O_TEMPORARY) == -1) { -+ int oerrno = errno; -+ if (errno == EEXIST) { -+ if (unlink(tmp) == -1) { -+ (void) gettimeofday(&tv, NULL); -+ shtemp = Strspl(STRtmpsh, putn((((int)tv.tv_sec) ^ -+ ((int)tv.tv_usec) ^ ((int)doldol)) & 0x00ffffff)); -+ } -+ goto again; -+ } - (void) unlink(tmp); - errno = oerrno; -- stderror(ERR_SYSTEM, tmp, strerror(errno)); -+ stderror(ERR_SYSTEM, tmp, strerror(errno)); - } - (void) unlink(tmp); /* 0 0 inode! */ - Dv[0] = term; >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message