Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 11 Jul 2000 13:28:24 -0700 (PDT)
From:      tkato@prontomail.ne.jp
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/19853: Update port: shells/tcsh to 6.09.01
Message-ID:  <20000711202824.3C8A037B899@hub.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         19853
>Category:       ports
>Synopsis:       Update port: shells/tcsh to 6.09.01
>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:   Tue Jul 11 13:30:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.0-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to verison 6.09.01
- Create symlink for /bin/tcsh (instead of installing full package) for -current/-stable 

New file:
pkg/PLIST.nobuild

Remove file:
patches/patch-aa  patches/patch-ab

Note:
Since I have no -current or -stable box at now, this port may be 
confirmed carefully on those system.

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/shells/tcsh/Makefile shells/tcsh/Makefile
--- /usr/ports/shells/tcsh/Makefile	Wed Jul 12 04:59:56 2000
+++ shells/tcsh/Makefile	Wed Jul 12 05:13:11 2000
@@ -6,39 +6,56 @@
 #
 
 PORTNAME=	tcsh
-PORTVERSION=	6.09.00
+PORTVERSION=	6.09.01
 CATEGORIES=	shells
-MASTER_SITES=	ftp://ftp.astron.com/pub/tcsh/
-DISTNAME=	tcsh-6.09
+MASTER_SITES=	${MASTER_SITE_TCSH}
+DISTNAME=	${DISTNAME_TCSH}
 
 MAINTAINER=	ports@FreeBSD.org
 
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 400021
-FORBIDDEN=	"tcsh is already in the base system"
-.endif
-
 Y2K=		ftp://ftp.astron.com/pub/tcsh/Y2K
 
+.include <bsd.port.pre.mk>
+.if ${OSVERSION} >= 400021
+NO_BUILD=	yes
+PLIST=		PLIST.nobuild
+MASTER_SITE_TCSH=	# empty
+DISTNAME_TCSH=	# empty
+.else
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PKGNAME}
 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}
+.endif
 
+.if ${OSVERSION} >= 400021
+pre-fetch:
+	@${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
-	cd ${WRKSRC}; ${INSTALL_DATA} tcsh.C.cat ${PREFIX}/share/nls/C/tcsh.cat
-	cd ${WRKSRC}; ${INSTALL_DATA} tcsh.french.cat ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat
+	${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
+	${LN} -sf ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/de_CH.ISO_8859-1/tcsh.cat
+	@${MKDIR} ${PREFIX}/share/nls/el_GR.ISO_8859-7
+	${INSTALL_DATA} ${WRKSRC}/tcsh.greek.cat ${PREFIX}/share/nls/el_GR.ISO_8859-7/tcsh.cat
+	${INSTALL_DATA} ${WRKSRC}/tcsh.spanish.cat ${PREFIX}/share/nls/es_ES.ISO_8859-1/tcsh.cat
+	${INSTALL_DATA} ${WRKSRC}/tcsh.finnish.cat ${PREFIX}/share/nls/fi_FI.ISO_8859-1/tcsh.cat
+	${INSTALL_DATA} ${WRKSRC}/tcsh.french.cat ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat
 	${LN} -sf ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/fr_BE.ISO_8859-1/tcsh.cat
 	${LN} -sf ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/fr_CA.ISO_8859-1/tcsh.cat
 	${LN} -sf ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/fr_CH.ISO_8859-1/tcsh.cat
-	cd ${WRKSRC}; ${INSTALL_DATA} 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
-	${LN} -sf ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/de_CH.ISO_8859-1/tcsh.cat
-	install -d -o ${BINOWN} -g ${BINGRP} -m 755 ${PREFIX}/share/nls/el_GR.ISO_8859-7
-	cd ${WRKSRC}; ${INSTALL_DATA} tcsh.greek.cat ${PREFIX}/share/nls/el_GR.ISO_8859-7/tcsh.cat
+.endif
+	${INSTALL_DATA} ${WRKSRC}/tcsh.italian.cat ${PREFIX}/share/nls/it_IT.ISO_8859-1/tcsh.cat
 	@${ECHO} "Updating /etc/shells"
 	@${CP} /etc/shells /etc/shells.bak
 	@(${GREP} -v ${PREFIX}/bin/tcsh /etc/shells.bak; \
diff -urN /usr/ports/shells/tcsh/files/md5 shells/tcsh/files/md5
--- /usr/ports/shells/tcsh/files/md5	Sat Aug 28 08:17:17 1999
+++ shells/tcsh/files/md5	Wed Jul 12 03:49:18 2000
@@ -1 +1 @@
-MD5 (tcsh-6.09.tar.gz) = 33511c75037cd4948ed6f1627d1793aa
+MD5 (tcsh-6.09.01.tar.gz) = 205ef6c1a9330a6e9ad7962466b297ad
diff -urN /usr/ports/shells/tcsh/patches/patch-aa shells/tcsh/patches/patch-aa
--- /usr/ports/shells/tcsh/patches/patch-aa	Thu Oct 22 04:16:54 1998
+++ shells/tcsh/patches/patch-aa	Thu Jan  1 09:00:00 1970
@@ -1,19 +0,0 @@
-*** config_f.h.bak	Sat Sep 19 18:48:08 1998
---- config_f.h	Wed Oct 21 22:34:42 1998
-***************
-*** 142,148 ****
-   *		This can be much slower and no memory statistics will be
-   *		provided.
-   */
-! #if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX)
-  # define SYSMALLOC
-  #else
-  # undef SYSMALLOC
---- 142,148 ----
-   *		This can be much slower and no memory statistics will be
-   *		provided.
-   */
-! #if defined(__FreeBSD__) || defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX)
-  # define SYSMALLOC
-  #else
-  # undef SYSMALLOC
diff -urN /usr/ports/shells/tcsh/patches/patch-ab shells/tcsh/patches/patch-ab
--- /usr/ports/shells/tcsh/patches/patch-ab	Sat Aug 28 08:17:18 1999
+++ shells/tcsh/patches/patch-ab	Thu Jan  1 09:00:00 1970
@@ -1,19 +0,0 @@
-*** sh.h.bak	Mon Oct 26 00:10:16 1998
---- sh.h	Thu Aug 19 03:48:33 1999
-***************
-*** 279,285 ****
-   * redefines malloc(), so we define the following
-   * to avoid it.
-   */
-! # if defined(linux) || defined(sgi) || defined(_OSD_POSIX)
-  #  define NO_FIX_MALLOC
-  #  include <stdlib.h>
-  # else /* linux */
---- 279,285 ----
-   * redefines malloc(), so we define the following
-   * to avoid it.
-   */
-! # if defined(__FreeBSD__) || defined(linux) || defined(sgi) || defined(_OSD_POSIX)
-  #  define NO_FIX_MALLOC
-  #  include <stdlib.h>
-  # else /* linux */
diff -urN /usr/ports/shells/tcsh/pkg/PLIST shells/tcsh/pkg/PLIST
--- /usr/ports/shells/tcsh/pkg/PLIST	Sun Mar  7 01:07:07 1999
+++ shells/tcsh/pkg/PLIST	Wed Jul 12 04:48:23 2000
@@ -2,6 +2,14 @@
 @exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells
 @unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells
 share/nls/C/tcsh.cat
+share/nls/de_DE.ISO_8859-1/tcsh.cat
+@exec ln -fs %D/%F %D/share/nls/de_AT.ISO_8859-1/tcsh.cat
+@exec ln -fs %D/%F %D/share/nls/de_CH.ISO_8859-1/tcsh.cat
+@unexec rm -f %D/share/nls/de_AT.ISO_8859-1/tcsh.cat
+@unexec rm -f %D/share/nls/de_CH.ISO_8859-1/tcsh.cat
+share/nls/el_GR.ISO_8859-7/tcsh.cat
+share/nls/es_ES.ISO_8859-1/tcsh.cat
+share/nls/fi_FI.ISO_8859-1/tcsh.cat
 share/nls/fr_FR.ISO_8859-1/tcsh.cat
 @exec ln -fs %D/%F %D/share/nls/fr_BE.ISO_8859-1/tcsh.cat
 @exec ln -fs %D/%F %D/share/nls/fr_CA.ISO_8859-1/tcsh.cat
@@ -9,9 +17,5 @@
 @unexec rm -f %D/share/nls/fr_BE.ISO_8859-1/tcsh.cat
 @unexec rm -f %D/share/nls/fr_CA.ISO_8859-1/tcsh.cat
 @unexec rm -f %D/share/nls/fr_CH.ISO_8859-1/tcsh.cat
-share/nls/de_DE.ISO_8859-1/tcsh.cat
-@exec ln -fs %D/%F %D/share/nls/de_AT.ISO_8859-1/tcsh.cat
-@exec ln -fs %D/%F %D/share/nls/de_CH.ISO_8859-1/tcsh.cat
-@unexec rm -f %D/share/nls/de_AT.ISO_8859-1/tcsh.cat
-@unexec rm -f %D/share/nls/de_CH.ISO_8859-1/tcsh.cat
-share/nls/el_GR.ISO_8859-7/tcsh.cat
+share/nls/it_IT.ISO_8859-1/tcsh.cat
+@unexec rmdir %D/share/nls/el_GR.ISO_8859-7 2>dev/null || true
diff -urN /usr/ports/shells/tcsh/pkg/PLIST.nobuild shells/tcsh/pkg/PLIST.nobuild
--- /usr/ports/shells/tcsh/pkg/PLIST.nobuild	Thu Jan  1 09:00:00 1970
+++ shells/tcsh/pkg/PLIST.nobuild	Wed Jul 12 05:13:50 2000
@@ -0,0 +1,4 @@
+@exec ln -sf /bin/tcsh %D/bin/tcsh
+@unexec rm -f %D/bin/tcsh
+@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells
+@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000711202824.3C8A037B899>