upgrade to es 0.9-beta1

shells/es/Makefile

@@ -1,33 +1,38 @@
-# OpenBSD makefile for:    es
-# Version required:     0.9a1
-# Date created:         17 November 1997
-# Whom:                 gene
-#
-# $OpenBSD: Makefile,v 1.9 2000/03/26 00:36:15 espie Exp $
-#
+# $OpenBSD: Makefile,v 1.10 2000/07/04 23:47:01 brad Exp $
 
-DISTNAME=       es-0.9-alpha1
-PKGNAME=	es-0.9a1
+DISTNAME=	es-0.9-beta1
+PKGNAME=	es-0.9b1
 CATEGORIES=	shells
-NEED_VERSION=	1.233
-MASTER_SITES=   ftp://ftp.sys.toronto.edu/pub/es/
+NEED_VERSION=	1.310
+MASTER_SITES=	ftp://ftp.sys.toronto.edu/pub/es/
 
 MAINTAINER=	ports@openbsd.org
 
-LICENSE_TYPE=		PD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-ALL_TARGET=		es
+SEPARATE_BUILD=	concurrent
+CONFIGURE_STYLE= gnu dest
 
-MAKE_FLAGS=CFLAGS='${CFLAGS}'
-FAKE=			Yes
+FLAVORS=static
+FLAVOR?=
+
+.if defined(STATIC) && ${STATIC:U} == YES
+FLAVOR=static
+.endif
+.if ${FLAVOR:L} == "static"
+CONFIGURE_ENV+=	LDFLAGS=-static
+.endif
+
+ALL_TARGET=	es
+
+post-extract:
+	@cp ${FILESDIR}/{config.guess,config.sub} ${WRKSRC}
 
 do-install:
-	$(INSTALL_PROGRAM) ${WRKBUILD}/es $(PREFIX)/bin
-	$(INSTALL_SCRIPT) ${WRKBUILD}/esdebug $(PREFIX)/bin/esdebug
-	$(INSTALL_MAN) ${WRKBUILD}/es.1 $(PREFIX)/man/man1
+	${INSTALL_PROGRAM} ${WRKBUILD}/es ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/es.1 ${PREFIX}/man/man1
 
 .include <bsd.port.mk>

shells/es/files/md5

@@ -1,3 +1,3 @@
-MD5 (es-0.9-alpha1.tar.gz) = 2e7372fc4c8eaeb00571e721730b6108
-RMD160 (es-0.9-alpha1.tar.gz) = ca2307202ab6e65c49188e3228d1af6426a23952
-SHA1 (es-0.9-alpha1.tar.gz) = 5027c9dade742c437b8e471a356d15883ebc4732
+MD5 (es-0.9-beta1.tar.gz) = 1d0f771d94d9d8f958f264f1757b8620
+RMD160 (es-0.9-beta1.tar.gz) = 89cdb655bbaf792bac37fa933ae4e8876011205d
+SHA1 (es-0.9-beta1.tar.gz) = dc4963dcf42d0c42e9c64eefa8adedbe566c32d8

shells/es/patches/patch-main_c

@@ -1,11 +0,0 @@
---- main.c.orig	Tue May 30 13:13:50 1995
-+++ main.c	Sun Mar 26 01:18:33 2000
-@@ -9,7 +9,7 @@ Boolean gcverbose	= FALSE;	/* -G */
- Boolean gcinfo		= FALSE;	/* -I */
- #endif
- 
--#if !HPUX && !defined(linux)
-+#if !HPUX && !defined(linux) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- extern int getopt (int argc, char **argv, const char *optstring);
- #endif
- extern int optind;

shells/es/patches/patch-prim-sys_c

@@ -1,25 +0,0 @@
---- prim-sys.c.orig	Tue May 30 13:13:51 1995
-+++ prim-sys.c	Sun Mar 26 01:18:33 2000
-@@ -194,7 +194,7 @@ static const Limit limits[] = {
- 
- 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 @@ static void printlimit(const Limit *limi
- 				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-stdenv_h

@@ -1,18 +0,0 @@
---- stdenv.h.orig	Tue May 30 13:13:53 1995
-+++ stdenv.h	Sun Mar 26 01:18:33 2000
-@@ -283,6 +283,7 @@ extern int getgroups(int, int *);
- 
- /* stdlib */
- 
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- extern noreturn exit(int);
- extern noreturn abort(void);
- extern long strtol(const char *num, char **end, int base);
-@@ -290,6 +291,7 @@ extern void *qsort(
- 	void *base, size_t nmemb, size_t size,
- 	int (*compar)(const void *, const void *)
- );
-+#endif
- 
- /* setjmp */
- 

shells/es/pkg/PLIST

@@ -1,3 +1,3 @@
+@comment $OpenBSD: PLIST,v 1.3 2000/07/04 23:47:02 brad Exp $
 bin/es
-bin/esdebug
 man/man1/es.1