Import of pkgsrc-2013Q2

shells/es/DESCR

@@ -0,0 +1,13 @@
+Es is an extensible shell.  The language was derived from the Plan 9
+shell, rc, and was influenced by functional programming languages,
+such as Scheme, and the Tcl embeddable programming language.  This
+implementation is derived from Byron Rakitzis's public domain
+implementation of rc.
+
+Es is in the public domain.  We hold no copyrights or patents on
+the source code, and do not place any restrictions on its distribution.
+We would appreciate it if any distributions do credit the authors.
+
+Enjoy!
+
+-- Paul Haahr & Byron Rakitzis

shells/es/Makefile

@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.24 2012/09/11 23:25:08 asau Exp $
+
+DISTNAME=	es-0.9-alpha1
+PKGNAME=	es-0.9a1
+PKGREVISION=	4
+CATEGORIES=	shells
+MASTER_SITES=	ftp://ftp.sys.toronto.edu/pub/es/
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://hawkwind.cs.toronto.edu:8001/mlists/es.html
+COMMENT=	Extensible shell, derived from plan9's rc
+
+USE_TOOLS+=	yacc
+
+PKG_SHELL=	bin/es
+
+SUBST_CLASSES=		path
+SUBST_STAGE.path=	pre-configure
+SUBST_MESSAGE.path=	Fixing path to es in scripts.
+SUBST_FILES.path=	esdebug
+SUBST_SED.path=		-e 's|^\#! /bin/es|\#! ${PREFIX:Q}/bin/es|'
+
+INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
+
+.include "../../mk/bsd.pkg.mk"

shells/es/PLIST

@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.2 2005/03/10 16:58:39 tv Exp $
+bin/es
+bin/esdebug
+man/man1/es.1

shells/es/distinfo

@@ -0,0 +1,14 @@
+$NetBSD: distinfo,v 1.13 2010/02/12 00:23:34 joerg Exp $
+
+SHA1 (es-0.9-alpha1.tar.gz) = 5027c9dade742c437b8e471a356d15883ebc4732
+RMD160 (es-0.9-alpha1.tar.gz) = ca2307202ab6e65c49188e3228d1af6426a23952
+Size (es-0.9-alpha1.tar.gz) = 125913 bytes
+SHA1 (patch-aa) = a6488aa2ca69332f0d22943befcd8d022ab01ef2
+SHA1 (patch-ab) = bd58fbbf71d5c9dc76bdc380cb7b93ad3f5f1c72
+SHA1 (patch-ac) = 978debd8079eedf7d09862e9946bfd9957c46732
+SHA1 (patch-ad) = 63bf69c25dc9e610b9375685459a1fd05ea66e1e
+SHA1 (patch-ae) = 3625310b30bbf64f24d6efbcd1864b7e8a92ff59
+SHA1 (patch-af) = 58f29fb3e35236810efc14f1b25fcc4412736404
+SHA1 (patch-ag) = adc7c22ebc2f35f76f85a1ef25b2a1a18a19898e
+SHA1 (patch-ah) = 19427378a3e9a40681bad72921cd98f7a6b3a79d
+SHA1 (patch-ai) = 3d9beee005db42b4b7af1bc5529b23d1347a8778

shells/es/patches/patch-aa

@@ -0,0 +1,29 @@
+$NetBSD: patch-aa,v 1.6 2010/02/12 00:23:34 joerg Exp $
+
+--- Makefile.orig	1995-05-30 07:14:14.000000000 -0400
++++ Makefile
+@@ -33,8 +33,8 @@
+ SHELL	= /bin/sh
+ CC	= cc
+ #CC	= gcc
+-CFLAGS	= -g
+-#CFLAGS	= -g -O -Wall
++#CFLAGS	= -g
++CFLAGS	= -O2
+ LDFLAGS	=
+ LIBS	=
+ 
+@@ -53,6 +53,13 @@ OFILES	= access.o closure.o conv.o dict.
+ OTHER	= Makefile parse.y mksignal
+ GEN	= esdump y.tab.c y.tab.h y.output token.h sigmsgs.c initial.c
+ 
++all: es
++
++install:
++	${BSD_INSTALL_PROGRAM} es ${DESTDIR}$(PREFIX)/bin
++	${BSD_INSTALL_SCRIPT} esdebug ${DESTDIR}$(PREFIX)/bin/esdebug
++	${BSD_INSTALL_MAN} es.1 ${DESTDIR}$(PREFIX)/man/man1
++
+ es	: ${OFILES} initial.o
+ 	${CC} -o es ${LDFLAGS} ${OFILES} initial.o ${LIBS}
+ 

shells/es/patches/patch-ab

@@ -0,0 +1,27 @@
+$NetBSD: patch-ab,v 1.1 2004/02/26 07:47:48 uebayasi Exp $
+
+--- prim-sys.c.orig	Tue May 30 06:13:51 1995
++++ prim-sys.c	Thu Apr 10 10:15:40 1997
+@@ -194,7 +194,7 @@
+ 
+ static void printlimit(const Limit *limit, Boolean hard) {
+ 	struct rlimit rlim;
+-	long lim;
++	u_quad_t lim;
+ 	getrlimit(limit->flag, &rlim);
+ 	if (hard)
+ 		lim = rlim.rlim_max;
+@@ -209,11 +209,11 @@
+ 				lim /= suf->amount;
+ 				break;
+ 			}
+-		print("%-8s\t%d%s\n", limit->name, lim, (suf == NULL || lim == 0) ? "" : suf->name);
++		print("%-8s\t%ud%s\n", limit->name, (unsigned int)lim, (suf == NULL || lim == 0) ? "" : suf->name);
+ 	}
+ }
+ 
+-static long parselimit(const Limit *limit, char *s) {
++static u_quad_t parselimit(const Limit *limit, char *s) {
+ 	long lim;
+ 	char *t;
+ 	const Suffix *suf = limit->suffix;

shells/es/patches/patch-ac

@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.4 2005/11/10 22:18:33 joerg Exp $
+
+--- main.c~	Tue May 30 06:13:50 1995
++++ main.c	Thu Apr 10 09:20:49 1997
+@@ -9,7 +9,7 @@
+ Boolean gcinfo		= FALSE;	/* -I */
+ #endif
+ 
+-#if !HPUX && !defined(linux)
++#if !HPUX && !defined(linux) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__INTERIX) && !defined(__APPLE__) && !defined(__DragonFly__)
+ extern int getopt (int argc, char **argv, const char *optstring);
+ #endif
+ extern int optind;

shells/es/patches/patch-ad

@@ -0,0 +1,39 @@
+$NetBSD: patch-ad,v 1.6 2005/11/10 22:18:33 joerg Exp $
+
+--- stdenv.h.orig	1995-05-30 07:13:53.000000000 -0400
++++ stdenv.h
+@@ -44,9 +44,7 @@
+ #include <signal.h>
+ #include <ctype.h>
+ 
+-#if REQUIRE_STAT || REQUIRE_IOCTL
+ #include <sys/types.h>
+-#endif
+ 
+ #if REQUIRE_IOCTL
+ #include <sys/ioctl.h>
+@@ -239,7 +237,7 @@ extern int getgroups(int, int *);
+  * hacks to present a standard system call interface
+  */
+ 
+-#ifdef linux
++#if defined(linux) || defined(__INTERIX)
+ #include "unistd.h"
+ #define setpgrp(a, b)	setpgid(a, b)
+ #endif
+@@ -283,6 +281,7 @@ extern int getgroups(int, int *);
+ 
+ /* stdlib */
+ 
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__INTERIX) && !defined(__APPLE__) && !defined(__DragonFly__)
+ extern noreturn exit(int);
+ extern noreturn abort(void);
+ extern long strtol(const char *num, char **end, int base);
+@@ -290,6 +289,7 @@ extern void *qsort(
+ 	void *base, size_t nmemb, size_t size,
+ 	int (*compar)(const void *, const void *)
+ );
++#endif
+ 
+ /* setjmp */
+ 

shells/es/patches/patch-ae

@@ -0,0 +1,23 @@
+$NetBSD: patch-ae,v 1.2 2005/03/10 15:18:31 tv Exp $
+
+--- util.c.orig	1995-05-30 07:13:52.000000000 -0400
++++ util.c
+@@ -2,6 +2,10 @@
+ 
+ #include "es.h"
+ 
++#include <sys/param.h>
++
++#if !(defined(BSD) && BSD >= 199306) && !defined(__INTERIX)
++/* agc - just use the system strerror here */
+ /* strerror -- turn an error code into a string */
+ extern char *strerror(int n) {
+ 	extern int sys_nerr;
+@@ -10,6 +14,7 @@ extern char *strerror(int n) {
+ 		return "unknown error";
+ 	return sys_errlist[n];
+ }
++#endif
+ 
+ /* uerror -- print a unix error, our version of perror */
+ extern void uerror(char *s) {

shells/es/patches/patch-af

@@ -0,0 +1,26 @@
+$NetBSD: patch-af,v 1.2 2008/09/19 20:02:23 joerg Exp $
+
+--- config.h.orig	1995-05-30 13:13:53.000000000 +0200
++++ config.h
+@@ -378,6 +378,15 @@
+ #endif
+ #endif
+ 
++#ifdef __INTERIX
++#ifndef USE_WAIT3
++#define USE_WAIT3		0
++#endif
++#ifndef	USE_SIGACTION
++#define USE_SIGACTION		1
++#endif
++#endif
++
+ 
+ /*
+  * default defaults -- don't change this section
+@@ -533,3 +542,5 @@
+ #undef	SYSV_SIGNALS
+ #define	SYSV_SIGNALS		0
+ #endif
++
++#include <stdlib.h>

shells/es/patches/patch-ag

@@ -0,0 +1,47 @@
+$NetBSD: patch-ag,v 1.2 2008/09/19 20:02:23 joerg Exp $
+
+--- print.c.orig	1995-05-30 13:13:51.000000000 +0200
++++ print.c
+@@ -3,6 +3,8 @@
+ #include "es.h"
+ #include "print.h"
+ 
++#include <stdarg.h>
++
+ #define	MAXCONV 256
+ 
+ /*
+@@ -90,7 +92,7 @@ static void intconv(Format *format, unsi
+ 	if (flags & FMT_long)
+ 		n = va_arg(format->args, long);
+ 	else if (flags & FMT_short)
+-		n = va_arg(format->args, short);
++		n = va_arg(format->args, int);
+ 	else
+ 		n = va_arg(format->args, int);
+ 
+@@ -267,12 +269,23 @@ extern int printfmt(Format *format, cons
+ 
+ extern int fmtprint VARARGS2(Format *, format, const char *, fmt) {
+ 	int n = -format->flushed;
+-	va_list saveargs = format->args;
++	va_list saveargs;
++
++#if 1
++	va_copy(saveargs, format->args);
++#else
++	saveargs = format->args;
++#endif
+ 
+ 	VA_START(format->args, fmt);
+ 	n += printfmt(format, fmt);
+ 	va_end(format->args);
++
++#if 1
++	va_copy(format->args, saveargs);
++#else
+ 	format->args = saveargs;
++#endif
+ 
+ 	return n + format->flushed;
+ }

shells/es/patches/patch-ah

@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2008/09/19 20:02:23 joerg Exp $
+
+--- gc.c.orig	2008-09-19 21:53:44.000000000 +0200
++++ gc.c
+@@ -294,7 +294,7 @@ extern void globalroot(void *addr) {
+ 
+ /* not portable to word addressed machines */
+ #define	TAG(p)		(((Tag **) p)[-1])
+-#define	FORWARDED(tagp)	(((int) tagp) & 1)
++#define	FORWARDED(tagp)	(((size_t) tagp) & 1)
+ #define	FOLLOWTO(p)	((Tag *) (((char *) p) + 1))
+ #define	FOLLOW(tagp)	((void *) (((char *) tagp) - 1))
+ 

shells/es/patches/patch-ai

@@ -0,0 +1,16 @@
+$NetBSD: patch-ai,v 1.1 2008/09/19 20:02:23 joerg Exp $
+
+--- str.c.orig	2008-09-19 21:59:39.000000000 +0200
++++ str.c
+@@ -21,7 +21,11 @@ extern char *strv(const char *fmt, va_li
+ 	gcdisable();
+ 	buf = openbuffer(0);
+ 	format.u.p	= buf;
++#if 1
++	va_copy(format.args, args);
++#else
+ 	format.args	= args;
++#endif
+ 	format.buf	= buf->str;
+ 	format.bufbegin	= buf->str;
+ 	format.bufend	= buf->str + buf->len;