cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 6.17.00, add a diff from naddy@ to fix regression tests.

Browse Source 
Tested by matthieu@ jasper@ jolan@
This commit is contained in:
sthen 2009-09-07 09:10:55 +00:00
parent 130af088ca
commit 8ef0f3e780
5 changed files with 19 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
shells/tcsh/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.43 2009/06/29 00:38:27 sthen Exp $ # $OpenBSD: Makefile,v 1.44 2009/09/07 09:10:55 sthen Exp $
COMMENT= extended C-shell with many useful features COMMENT= extended C-shell with many useful features
DISTNAME= tcsh-6.15.00 DISTNAME= tcsh-6.17.00
PKGNAME= ${DISTNAME}p0
CATEGORIES= shells CATEGORIES= shells
HOMEPAGE= http://www.tcsh.org/ HOMEPAGE= http://www.tcsh.org/
@ -22,8 +21,9 @@ CONFIGURE_STYLE=gnu
ALL_TARGET= all catalogs ALL_TARGET= all catalogs
REGRESS_DEPENDS=:autoconf-2.59*:devel/autoconf/2.59 AUTOCONF_VERSION=2.59
REGRESS_FLAGS= AUTOCONF_VERSION=2.59 REGRESS_DEPENDS=${MODGNU_AUTOCONF_DEPENDS}
REGRESS_FLAGS= AUTOCONF_VERSION=${AUTOCONF_VERSION}
do-install: do-install:
${INSTALL_PROGRAM} ${WRKSRC}/tcsh ${PREFIX}/bin/tcsh ${INSTALL_PROGRAM} ${WRKSRC}/tcsh ${PREFIX}/bin/tcsh

10
shells/tcsh/distinfo
View File

@ -1,5 +1,5 @@
MD5 (tcsh-6.15.00.tar.gz) = Z6BhFiCwgL0OsDKxd0OCtg== MD5 (tcsh-6.17.00.tar.gz) = xH3pA+PVL2gkyN0Mke60dw==
RMD160 (tcsh-6.15.00.tar.gz) = gGUnnpO9P92yqVo/dKaAhY02UIw= RMD160 (tcsh-6.17.00.tar.gz) = LMQaiVeZrebWJkD4d7tibxNtrDU=
SHA1 (tcsh-6.15.00.tar.gz) = 0k978n6AIipik7ZinBTbVH8Lc4c= SHA1 (tcsh-6.17.00.tar.gz) = m/Z9XOG0BheOm6U17NNFU/4NTTY=
SHA256 (tcsh-6.15.00.tar.gz) = 3Kg+WQJfGKmBGJXNfPKnYKsXUCQOp8jIbqIeJPeDrNw= SHA256 (tcsh-6.17.00.tar.gz) = V1JmEivCvDUchKf4WAIMDmtvlaZK1N486V40D1fkqak=
SIZE (tcsh-6.15.00.tar.gz) = 870886 SIZE (tcsh-6.17.00.tar.gz) = 890084

12
shells/tcsh/patches/patch-Makefile_in
View File

@ -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 $@.tmp
mv $@.tmp $@

10
shells/tcsh/patches/patch-config_f_h
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-config_f_h,v 1.3 2007/05/27 18:04:47 naddy Exp $ $OpenBSD: patch-config_f_h,v 1.4 2009/09/07 09:10:55 sthen Exp $
--- config_f.h.orig Sat May 26 15:34:04 2007 --- config_f.h.orig Thu Jun 25 13:10:56 2009
+++ config_f.h Sat May 26 15:36:05 2007 +++ config_f.h Thu Jul 16 15:36:27 2009
@@ -143,7 +143,7 @@ @@ -143,7 +143,7 @@
* This can be much slower and no memory statistics will be * This can be much slower and no memory statistics will be
* provided. * 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__)
+#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__) || defined(__OpenBSD__)
# define SYSMALLOC # define SYSMALLOC
#else #else
# undef SYSMALLOC # undef SYSMALLOC

48
shells/tcsh/patches/patch-sh_proc_c
View File

@ -1,11 +1,7 @@
$OpenBSD: patch-sh_proc_c,v 1.3 2009/06/29 00:38:27 sthen Exp $ $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
hunks in pkill() from http://people.freebsd.org/~mp/tcsh_kill.patch +++ sh.proc.c Thu Jul 16 15:30:02 2009
fix a problem with kill and backticked expressions @@ -367,6 +367,7 @@ found:
--- 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:
#ifdef notdef #ifdef notdef
jobflags & PAEXITED || jobflags & PAEXITED ||
#endif /* notdef */ #endif /* notdef */
@ -13,39 +9,3 @@ fix a problem with kill and backticked expressions
!eq(dcwd->di_name, fp->p_cwd->di_name))) { !eq(dcwd->di_name, fp->p_cwd->di_name))) {
/* PWP: print a newline after ^C */ /* PWP: print a newline after ^C */
if (jobflags & PINTERRUPTED) { 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);
}