- update to 6.18.01

- take maintainership

tested by and ok matthieu@
This commit is contained in:
jasper 2012-06-02 13:17:19 +00:00
parent 588f2ae2fb
commit 14bcd50f4b
6 changed files with 64 additions and 65 deletions

View File

@ -1,12 +1,13 @@
# $OpenBSD: Makefile,v 1.47 2010/12/21 19:56:24 matthieu Exp $
# $OpenBSD: Makefile,v 1.48 2012/06/02 13:17:19 jasper Exp $
COMMENT= extended C-shell with many useful features
DISTNAME= tcsh-6.17.00
REVISION= 0
DISTNAME= tcsh-6.18.01
CATEGORIES= shells
HOMEPAGE= http://www.tcsh.org/
MAINTAINER= Jasper Lievisse Adriaanse <jasper@openbsd.org>
# BSD
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
@ -16,7 +17,7 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ftp://ftp.astron.com/pub/tcsh/ \
ftp://ftp.astron.com/pub/tcsh/old/
WANTLIB= c termlib
WANTLIB= c termlib
FLAVORS= static
FLAVOR?=
@ -27,32 +28,47 @@ CONFIGURE_ENV= LDFLAGS="-static"
CONFIGURE_STYLE=gnu
ALL_TARGET= all catalogs
AUTOCONF_VERSION=2.59
AUTOCONF_VERSION=2.59
REGRESS_DEPENDS=${MODGNU_AUTOCONF_DEPENDS}
REGRESS_FLAGS= AUTOCONF_VERSION=${AUTOCONF_VERSION}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/tcsh ${PREFIX}/bin/tcsh
${INSTALL_MAN} ${WRKSRC}/tcsh.man ${PREFIX}/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_AT.ISO_8859-1/tcsh.cat
${INSTALL_DATA} ${WRKSRC}/tcsh.german.cat ${PREFIX}/share/nls/de_CH.ISO_8859-1/tcsh.cat
${INSTALL_DATA} ${WRKSRC}/tcsh.german.cat ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat
${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.et.cat ${PREFIX}/share/nls/et_EE.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_BE.ISO_8859-1/tcsh.cat
${INSTALL_DATA} ${WRKSRC}/tcsh.french.cat ${PREFIX}/share/nls/fr_CA.ISO_8859-1/tcsh.cat
${INSTALL_DATA} ${WRKSRC}/tcsh.french.cat ${PREFIX}/share/nls/fr_CH.ISO_8859-1/tcsh.cat
${INSTALL_DATA} ${WRKSRC}/tcsh.french.cat ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat
${INSTALL_DATA} ${WRKSRC}/tcsh.italian.cat ${PREFIX}/share/nls/it_CH.ISO_8859-1/tcsh.cat
${INSTALL_DATA} ${WRKSRC}/tcsh.italian.cat ${PREFIX}/share/nls/it_IT.ISO_8859-1/tcsh.cat
${INSTALL_DATA} ${WRKSRC}/tcsh.ja.cat ${PREFIX}/share/nls/ja_JP.EUC/tcsh.cat
${INSTALL_DATA} ${WRKSRC}/tcsh.pl.cat ${PREFIX}/share/nls/pl_PL.ISO_8859-2/tcsh.cat
${INSTALL_DATA} ${WRKSRC}/tcsh.russian.cat ${PREFIX}/share/nls/ru_RU.KOI8-R/tcsh.cat
${INSTALL_DATA} ${WRKSRC}/tcsh.ukrainian.cat ${PREFIX}/share/nls/uk_UA.KOI8-U/tcsh.cat
${INSTALL_DATA} ${WRKSRC}/nls/C.cat ${PREFIX}/share/nls/C/tcsh.cat
${INSTALL_DATA} ${WRKSRC}/nls/german.cat \
${PREFIX}/share/nls/de_AT.ISO_8859-1/tcsh.cat
${INSTALL_DATA} ${WRKSRC}/nls/german.cat \
${PREFIX}/share/nls/de_CH.ISO_8859-1/tcsh.cat
${INSTALL_DATA} ${WRKSRC}/nls/german.cat \
${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat
${INSTALL_DATA} ${WRKSRC}/nls/greek.cat \
${PREFIX}/share/nls/el_GR.ISO_8859-7/tcsh.cat
${INSTALL_DATA} ${WRKSRC}/nls/spanish.cat \
${PREFIX}/share/nls/es_ES.ISO_8859-1/tcsh.cat
${INSTALL_DATA} ${WRKSRC}/nls/et.cat \
${PREFIX}/share/nls/et_EE.ISO-8859-1/tcsh.cat
${INSTALL_DATA} ${WRKSRC}/nls/finnish.cat \
${PREFIX}/share/nls/fi_FI.ISO_8859-1/tcsh.cat
${INSTALL_DATA} ${WRKSRC}/nls/french.cat \
${PREFIX}/share/nls/fr_BE.ISO_8859-1/tcsh.cat
${INSTALL_DATA} ${WRKSRC}/nls/french.cat \
${PREFIX}/share/nls/fr_CA.ISO_8859-1/tcsh.cat
${INSTALL_DATA} ${WRKSRC}/nls/french.cat \
${PREFIX}/share/nls/fr_CH.ISO_8859-1/tcsh.cat
${INSTALL_DATA} ${WRKSRC}/nls/french.cat \
${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat
${INSTALL_DATA} ${WRKSRC}/nls/italian.cat \
${PREFIX}/share/nls/it_CH.ISO_8859-1/tcsh.cat
${INSTALL_DATA} ${WRKSRC}/nls/italian.cat \
${PREFIX}/share/nls/it_IT.ISO_8859-1/tcsh.cat
${INSTALL_DATA} ${WRKSRC}/nls/ja.cat \
${PREFIX}/share/nls/ja_JP.EUC/tcsh.cat
${INSTALL_DATA} ${WRKSRC}/nls/pl.cat \
${PREFIX}/share/nls/pl_PL.ISO_8859-2/tcsh.cat
${INSTALL_DATA} ${WRKSRC}/nls/russian.cat \
${PREFIX}/share/nls/ru_RU.KOI8-R/tcsh.cat
${INSTALL_DATA} ${WRKSRC}/nls/ukrainian.cat \
${PREFIX}/share/nls/uk_UA.KOI8-U/tcsh.cat
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (tcsh-6.17.00.tar.gz) = xH3pA+PVL2gkyN0Mke60dw==
RMD160 (tcsh-6.17.00.tar.gz) = LMQaiVeZrebWJkD4d7tibxNtrDU=
SHA1 (tcsh-6.17.00.tar.gz) = m/Z9XOG0BheOm6U17NNFU/4NTTY=
SHA256 (tcsh-6.17.00.tar.gz) = V1JmEivCvDUchKf4WAIMDmtvlaZK1N486V40D1fkqak=
SIZE (tcsh-6.17.00.tar.gz) = 890084
MD5 (tcsh-6.18.01.tar.gz) = bu0J29QiOrW2lVN4RQ0iig==
RMD160 (tcsh-6.18.01.tar.gz) = 6hi7bU1tyicA102qKUD2fUWhjLk=
SHA1 (tcsh-6.18.01.tar.gz) = 7uIDVkVzcZf/gFnISTOnXSPNdvk=
SHA256 (tcsh-6.18.01.tar.gz) = 2ByieFHz6FRWZjmbS88lQz5gKhlRE7P3xziG/vhMn6g=
SIZE (tcsh-6.18.01.tar.gz) = 926872

View File

@ -1,12 +1,15 @@
$OpenBSD: patch-config_f_h,v 1.4 2009/09/07 09:10:55 sthen Exp $
--- config_f.h.orig Thu Jun 25 13:10:56 2009
+++ config_f.h Thu Jul 16 15:36:27 2009
@@ -143,7 +143,7 @@
$OpenBSD: patch-config_f_h,v 1.5 2012/06/02 13:17:19 jasper Exp $
http://bugs.gw.com/view.php?id=180
--- config_f.h.orig Sat May 26 12:50:00 2012
+++ config_f.h Sat May 26 12:50:31 2012
@@ -135,7 +135,7 @@
* This can be much slower and no memory statistics will be
* provided.
*/
-#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__)
+#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined(__OpenBSD__)
-#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__)
+#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__) || defined(__OpenBSD__)
# define SYSMALLOC
#else
# undef SYSMALLOC

View File

@ -1,8 +1,11 @@
$OpenBSD: patch-host_defs,v 1.4 2007/05/27 18:04:47 naddy Exp $
--- host.defs.orig Thu Mar 2 11:46:44 2006
+++ host.defs Sat May 26 15:55:32 2007
@@ -508,6 +508,38 @@ machtype: defined(vax) : "vax"
machtype: defined(alpha) : "alpha"
$OpenBSD: patch-host_defs,v 1.5 2012/06/02 13:17:19 jasper Exp $
http://bugs.gw.com/view.php?id=181
--- host.defs.orig Wed Jan 11 21:20:15 2012
+++ host.defs Sat May 26 12:52:56 2012
@@ -564,6 +564,38 @@ machtype: defined(vax) : "vax"
machtype: defined(x86_64) : "x86_64"
enddef :
+newdef : defined(__OpenBSD__)
@ -39,4 +42,4 @@ $OpenBSD: patch-host_defs,v 1.4 2007/05/27 18:04:47 naddy Exp $
+
newdef : defined(__FreeBSD__)
comment : FreeBSD
comment : FreeBSD

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-sh_proc_c,v 1.4 2009/09/07 09:10:55 sthen Exp $
--- sh.proc.c.orig Thu Jun 25 22:15:37 2009
+++ sh.proc.c Thu Jul 16 15:30:02 2009
@@ -367,6 +367,7 @@ found:
#ifdef notdef
jobflags & PAEXITED ||
#endif /* notdef */
+ fp->p_cwd == NULL ||
!eq(dcwd->di_name, fp->p_cwd->di_name))) {
/* PWP: print a newline after ^C */
if (jobflags & PINTERRUPTED) {

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-tests_arguments_at,v 1.1 2007/05/27 18:04:47 naddy Exp $
--- tests/arguments.at.orig Sat May 26 19:00:06 2007
+++ tests/arguments.at Sat May 26 19:00:23 2007
@@ -71,7 +71,7 @@ TCSH_UNTESTED([-m])
AT_SETUP([-q])
# Nested to make the SIGQUIT reporting predictable
-AT_CHECK([tcsh -f -c "tcsh -f -q -c 'kill -QUIT $$'"])
+AT_CHECK([tcsh -f -c "tcsh -f -q -c 'kill -QUIT \$\$'"])
AT_CLEANUP