diff --git a/.portsignore b/.portsignore index 35e813b0cb7a..691f6d25b46a 100644 --- a/.portsignore +++ b/.portsignore @@ -2235,6 +2235,7 @@ security/seahorse security/secpanel security/veracrypt security/weggli +shells/44bsd-csh shells/ast-ksh shells/powershell sysutils/abgx360 diff --git a/shells/44bsd-csh/Makefile b/shells/44bsd-csh/Makefile deleted file mode 100644 index d6f26a4f3ed8..000000000000 --- a/shells/44bsd-csh/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -PORTNAME= 44bsd-csh -PORTVERSION= 20001106 -PORTREVISION= 7 -CATEGORIES= shells -MASTER_SITES= LOCAL/cy - -MAINTAINER= cy@FreeBSD.org -COMMENT= The traditional 4.4BSD /bin/csh C-shell - -EXTRACT_DEPENDS= rcs:devel/rcs57 - -USES= tar:bzip2 -LDFLAGS= -Wl,--allow-multiple-definition -NO_WRKSUBDIR= yes -PORTDOCS= paper.ascii.gz - -OPTIONS_DEFINE= DOCS - -post-extract: - cd ${WRKSRC} ; co RCS/*,v; chmod u+w * - cd ${WRKSRC}/USD.doc ; co RCS/*,v - -post-build: - cd ${WRKSRC}/USD.doc ; ${MAKE} - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/csh ${STAGEDIR}${PREFIX}/bin/44bsd-csh - ${INSTALL_MAN} ${WRKSRC}/csh.1 ${STAGEDIR}${PREFIX}/share/man/man1/44bsd-csh.1 - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/USD.doc/paper.ascii.gz ${STAGEDIR}${DOCSDIR} - -tarup: - cd ${WRKSRC} ; rm * USD.doc/* - cd ${WRKSRC} ; ${TAR} cvyf /tmp/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} - -.include diff --git a/shells/44bsd-csh/distinfo b/shells/44bsd-csh/distinfo deleted file mode 100644 index 32898dce2054..000000000000 --- a/shells/44bsd-csh/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (44bsd-csh-20001106.tar.bz2) = 8dafbb6862ab39ac4530106e2a61a5691a8fa7563e8e8564194265bec1d55ff1 -SIZE (44bsd-csh-20001106.tar.bz2) = 160312 diff --git a/shells/44bsd-csh/files/patch-Makefile b/shells/44bsd-csh/files/patch-Makefile deleted file mode 100644 index 9e50a8b3ee38..000000000000 --- a/shells/44bsd-csh/files/patch-Makefile +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.orig 2011-07-04 06:54:35.758509756 -0700 -+++ Makefile 2011-07-04 20:41:59.302137908 -0700 -@@ -7,7 +7,6 @@ - # To profile, put -DPROF in DEFS and -pg in CFLAGS, and recompile. - - BINDIR?= /bin --NOSHARED?= YES - - PROG= csh - DFLAGS=-DBUILTIN -DFILEC -DNLS -DSHORT_STRINGS diff --git a/shells/44bsd-csh/files/patch-alloc.c b/shells/44bsd-csh/files/patch-alloc.c deleted file mode 100644 index 67a61d3183b1..000000000000 --- a/shells/44bsd-csh/files/patch-alloc.c +++ /dev/null @@ -1,64 +0,0 @@ ---- alloc.c.orig 2025-02-18 15:59:35.263097000 -0800 -+++ alloc.c 2025-02-18 16:02:58.402654000 -0800 -@@ -55,61 +55,6 @@ - char *memtop = NULL; /* PWP: top of current memory */ - char *membot = NULL; /* PWP: bottom of allocatable memory */ - --ptr_t --Malloc(n) -- size_t n; --{ -- ptr_t ptr; -- -- if (membot == NULL) -- memtop = membot = sbrk(0); -- if ((ptr = malloc(n)) == (ptr_t) 0) { -- child++; -- stderror(ERR_NOMEM); -- } -- return (ptr); --} -- --ptr_t --Realloc(p, n) -- ptr_t p; -- size_t n; --{ -- ptr_t ptr; -- -- if (membot == NULL) -- memtop = membot = sbrk(0); -- if ((ptr = realloc(p, n)) == (ptr_t) 0) { -- child++; -- stderror(ERR_NOMEM); -- } -- return (ptr); --} -- --ptr_t --Calloc(s, n) -- size_t s, n; --{ -- ptr_t ptr; -- -- if (membot == NULL) -- memtop = membot = sbrk(0); -- if ((ptr = calloc(s, n)) == (ptr_t) 0) { -- child++; -- stderror(ERR_NOMEM); -- } -- -- return (ptr); --} -- --void --Free(p) -- ptr_t p; --{ -- if (p) -- free(p); --} -- - /* - * mstats - print out statistics about malloc - * diff --git a/shells/44bsd-csh/files/patch-csh.h b/shells/44bsd-csh/files/patch-csh.h deleted file mode 100644 index e69698ed338a..000000000000 --- a/shells/44bsd-csh/files/patch-csh.h +++ /dev/null @@ -1,17 +0,0 @@ ---- csh.h.orig 2025-02-18 15:59:35.265140000 -0800 -+++ csh.h 2025-02-18 16:04:08.969313000 -0800 -@@ -86,10 +86,10 @@ - #include "char.h" - #include "errnum.h" - --#define xmalloc(i) Malloc(i) --#define xrealloc(p, i) Realloc(p, i) --#define xcalloc(n, s) Calloc(n, s) --#define xfree(p) Free(p) -+#define xmalloc(i) malloc(i) -+#define xrealloc(p, i) realloc(p, i) -+#define xcalloc(n, s) calloc(n, s) -+#define xfree(p) free(p) - - #include - FILE *cshin, *cshout, *csherr; diff --git a/shells/44bsd-csh/files/patch-file.c b/shells/44bsd-csh/files/patch-file.c deleted file mode 100644 index ffd734ffa2e1..000000000000 --- a/shells/44bsd-csh/files/patch-file.c +++ /dev/null @@ -1,42 +0,0 @@ ---- file.c.orig 2011-07-05 06:22:52.572441868 -0700 -+++ file.c 2011-07-05 06:25:04.233646750 -0700 -@@ -82,7 +82,7 @@ - - static void setup_tty __P((int)); - static void back_to_col_1 __P((void)); --static void pushback __P((Char *)); -+static void pushback __P((Char *, int)); - static void catn __P((Char *, Char *, int)); - static void copyn __P((Char *, Char *, int)); - static Char filetype __P((Char *, Char *)); -@@ -156,8 +156,9 @@ - * Push string contents back into tty queue - */ - static void --pushback(string) -+pushback(string, list) - Char *string; -+ int list; - { - Char *p; - struct termios tty, tty_normal; -@@ -168,6 +169,10 @@ - (void) tcgetattr(SHOUT, &tty); - tty_normal = tty; - tty.c_lflag &= ~(ECHOKE | ECHO | ECHOE | ECHOK | ECHONL | ECHOPRT | ECHOCTL); -+#if __FreeBSD_version >= 800000 -+ if (list == LIST) -+ tty.c_lflag |= ECHO; -+#endif - (void) tcsetattr(SHOUT, TCSANOW, &tty); - - for (p = string; (c = *p) != '\0'; p++) -@@ -660,7 +665,7 @@ - should_retype = TRUE; - if (should_retype) - printprompt(); -- pushback(inputline); -+ pushback(inputline, command); - if (should_retype) - retype(); - } diff --git a/shells/44bsd-csh/files/patch-proc.c b/shells/44bsd-csh/files/patch-proc.c deleted file mode 100644 index e28c8902e28c..000000000000 --- a/shells/44bsd-csh/files/patch-proc.c +++ /dev/null @@ -1,48 +0,0 @@ ---- proc.c Tue Jun 4 20:07:29 2002 -+++ proc.c Tue Jun 4 20:14:09 2002 -@@ -89,13 +89,13 @@ - int pid; - extern int insource; - int save_errno = errno; -- union wait w; -+ int w; - int jobflags; - struct rusage ru; - - loop: - errno = 0; /* reset, just in case */ -- pid = wait3(&w.w_status, -+ pid = wait3(&w, - (setintr && (intty || insource) ? WNOHANG | WUNTRACED : WNOHANG), &ru); - - if (pid <= 0) { -@@ -117,7 +117,7 @@ - pp->p_flags &= ~(PRUNNING | PSTOPPED | PREPORTED); - if (WIFSTOPPED(w)) { - pp->p_flags |= PSTOPPED; -- pp->p_reason = w.w_stopsig; -+ pp->p_reason = WSTOPSIG(w); - } - else { - if (pp->p_flags & (PTIME | PPTIME) || adrof(STRtime)) -@@ -125,16 +125,16 @@ - - pp->p_rusage = ru; - if (WIFSIGNALED(w)) { -- if (w.w_termsig == SIGINT) -+ if (WTERMSIG(w) == SIGINT) - pp->p_flags |= PINTERRUPTED; - else - pp->p_flags |= PSIGNALED; -- if (w.w_coredump) -+ if (WCOREDUMP(w)) - pp->p_flags |= PDUMPED; -- pp->p_reason = w.w_termsig; -+ pp->p_reason = WTERMSIG(w); - } - else { -- pp->p_reason = w.w_retcode; -+ pp->p_reason = WEXITSTATUS(w); - if (pp->p_reason != 0) - pp->p_flags |= PAEXITED; - else diff --git a/shells/44bsd-csh/pkg-descr b/shells/44bsd-csh/pkg-descr deleted file mode 100644 index ae3f22251328..000000000000 --- a/shells/44bsd-csh/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -This is the traditional 4.4BSD /bin/csh C-shell, with additional -FreeBSD fixes and updates since 4.4BSD Lite was released. diff --git a/shells/44bsd-csh/pkg-plist b/shells/44bsd-csh/pkg-plist deleted file mode 100644 index af3376177d9f..000000000000 --- a/shells/44bsd-csh/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -@shell bin/44bsd-csh -share/man/man1/44bsd-csh.1.gz diff --git a/shells/Makefile b/shells/Makefile index c73d91316d8d..d8cd186e2b3b 100644 --- a/shells/Makefile +++ b/shells/Makefile @@ -1,6 +1,5 @@ COMMENT = Shells - SUBDIR += 44bsd-csh SUBDIR += anongitssh SUBDIR += antibody SUBDIR += atuin