What happened to the tcsh update?
I've been running with the attached patch on most of my machines without
problems. It's the original diff sthen@ sent, plus one additional patch
from na...@.
--
Matthieu Herrb
Index: Makefile
===================================================================
RCS file: /cvs/OpenBSD/ports/shells/tcsh/Makefile,v
retrieving revision 1.43
diff -u -p -u -r1.43 Makefile
--- Makefile 29 Jun 2009 00:38:27 -0000 1.43
+++ Makefile 20 Jul 2009 19:10:11 -0000
@@ -2,8 +2,7 @@
COMMENT= extended C-shell with many useful features
-DISTNAME= tcsh-6.15.00
-PKGNAME= ${DISTNAME}p0
+DISTNAME= tcsh-6.17.00
CATEGORIES= shells
HOMEPAGE= http://www.tcsh.org/
@@ -22,8 +21,9 @@ CONFIGURE_STYLE=gnu
ALL_TARGET= all catalogs
-REGRESS_DEPENDS=:autoconf-2.59*:devel/autoconf/2.59
-REGRESS_FLAGS= 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
Index: distinfo
===================================================================
RCS file: /cvs/OpenBSD/ports/shells/tcsh/distinfo,v
retrieving revision 1.7
diff -u -p -u -r1.7 distinfo
--- distinfo 27 May 2007 18:04:46 -0000 1.7
+++ distinfo 20 Jul 2009 19:09:40 -0000
@@ -1,5 +1,5 @@
-MD5 (tcsh-6.15.00.tar.gz) = Z6BhFiCwgL0OsDKxd0OCtg==
-RMD160 (tcsh-6.15.00.tar.gz) = gGUnnpO9P92yqVo/dKaAhY02UIw=
-SHA1 (tcsh-6.15.00.tar.gz) = 0k978n6AIipik7ZinBTbVH8Lc4c=
-SHA256 (tcsh-6.15.00.tar.gz) = 3Kg+WQJfGKmBGJXNfPKnYKsXUCQOp8jIbqIeJPeDrNw=
-SIZE (tcsh-6.15.00.tar.gz) = 870886
+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
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 27 May 2007 18:04:47 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2007/05/27 18:04:47 naddy Exp $
---- Makefile.in.orig Sat May 26 17:52:34 2007
-+++ Makefile.in Sat May 26 17:52:53 2007
-@@ -463,7 +463,7 @@ $(srcdir)/tests/package.m4: $(srcdir)/configure.in
- echo 'm4_define([AT_PACKAGE_BUGREPORT], [...@package_bugreport@])'; \
- } >$(srcdir)/tests/package.m4
-
--$(srcdir)/tests/testsuite: tests/package.m4 tests/testsuite.at $(TESTFILES)
-+$(srcdir)/tests/testsuite: $(srcdir)/tests/package.m4 tests/testsuite.at
$(TESTFILES)
- autom4te --language=autotest -I $(srcdir)/tests \
- $(srcdir)/tests/testsuite.at -o [email protected]
- mv [email protected] $@
Index: patches/patch-config_f_h
===================================================================
RCS file: /cvs/OpenBSD/ports/shells/tcsh/patches/patch-config_f_h,v
retrieving revision 1.3
diff -u -p -u -r1.3 patch-config_f_h
--- patches/patch-config_f_h 27 May 2007 18:04:47 -0000 1.3
+++ patches/patch-config_f_h 20 Jul 2009 19:09:40 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-config_f_h,v 1.3 2007/05/27 18:04:47 naddy Exp $
---- config_f.h.orig Sat May 26 15:34:04 2007
-+++ config_f.h Sat May 26 15:36:05 2007
+--- 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 @@
* 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__) || defined (__linux__)
-+#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) ||
defined(_OSD_POSIX) || defined(__MVS__) || defined (__linux__) || defined
(__OpenBSD__)
+-#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__)
# define SYSMALLOC
#else
# undef SYSMALLOC
Index: patches/patch-sh_proc_c
===================================================================
RCS file: /cvs/OpenBSD/ports/shells/tcsh/patches/patch-sh_proc_c,v
retrieving revision 1.3
diff -u -p -u -r1.3 patch-sh_proc_c
--- patches/patch-sh_proc_c 29 Jun 2009 00:38:27 -0000 1.3
+++ patches/patch-sh_proc_c 20 Jul 2009 19:09:40 -0000
@@ -1,11 +1,7 @@
$OpenBSD: patch-sh_proc_c,v 1.3 2009/06/29 00:38:27 sthen Exp $
-
-hunks in pkill() from http://people.freebsd.org/~mp/tcsh_kill.patch
-fix a problem with kill and backticked expressions
-
---- sh.proc.c.orig Mon Jun 29 01:22:54 2009
-+++ sh.proc.c Mon Jun 29 01:23:09 2009
-@@ -366,6 +366,7 @@ found:
+--- 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 */
@@ -13,39 +9,3 @@ fix a problem with kill and backticked e
!eq(dcwd->di_name, fp->p_cwd->di_name))) {
/* PWP: print a newline after ^C */
if (jobflags & PINTERRUPTED) {
-@@ -1428,13 +1429,6 @@ pkill(Char **v, int signum)
- pid_t pid;
- Char *cp, **vp, **globbed;
-
-- pchild_disabled++;
-- cleanup_push(&pchild_disabled, disabled_cleanup);
-- if (setintr) {
-- pintr_disabled++;
-- cleanup_push(&pintr_disabled, disabled_cleanup);
-- }
--
- /* Avoid globbing %?x patterns */
- for (vp = v; vp && *vp; vp++)
- if (**vp == '%')
-@@ -1444,6 +1438,12 @@ pkill(Char **v, int signum)
- globbed = v;
- cleanup_push(globbed, blk_cleanup);
-
-+ pchild_disabled++;
-+ cleanup_push(&pchild_disabled, disabled_cleanup);
-+ if (setintr) {
-+ pintr_disabled++;
-+ cleanup_push(&pintr_disabled, disabled_cleanup);
-+ }
-
- while (v && (cp = *v)) {
- if (*cp == '%') {
-@@ -1516,7 +1516,7 @@ pkill(Char **v, int signum)
- cont:
- v++;
- }
-- cleanup_until(&pchild_disabled);
-+ cleanup_until(globbed);
- if (err1)
- stderror(ERR_SILENT);
- }
