nb1: Use standard build and install processes via ${BSD_INSTALL_*}.

4 files changed, 34 insertions, 47 deletions

diff --git a/shells/es/Makefile b/shells/es/Makefile
index 8416b886fdc..8097b14442a 100644
--- a/shells/es/Makefile
+++ b/shells/es/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 22:53:22 grant Exp $
+# $NetBSD: Makefile,v 1.13 2005/03/10 16:58:39 tv Exp $
 # FreeBSD Id: Makefile,v 1.4 1996/11/18 11:39:46 asami Exp
 #
 
 DISTNAME=       es-0.9-alpha1
 PKGNAME=	es-0.9a1
+PKGREVISION=	1
 CATEGORIES=	shells
 MASTER_SITES=   ftp://ftp.sys.toronto.edu/pub/es/
 
@@ -11,8 +12,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://hawkwind.utcs.utoronto.ca:8001/mlists/es.html
 COMMENT=	Extensible shell, derived from plan9's rc
 
-MANCOMPRESSED=	yes
-
 USE_PKGINSTALL=	yes
 PKG_SHELL=	${PREFIX}/bin/es
 
diff --git a/shells/es/PLIST b/shells/es/PLIST
index febf63067be..c920c6ac813 100644
--- a/shells/es/PLIST
+++ b/shells/es/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:26:57 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/03/10 16:58:39 tv Exp $
 bin/es
 bin/esdebug
-man/man1/es.1.gz
+man/man1/es.1
diff --git a/shells/es/distinfo b/shells/es/distinfo
index 681b047dcb3..50d3de08087 100644
--- a/shells/es/distinfo
+++ b/shells/es/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2005/03/10 15:18:31 tv Exp $
+$NetBSD: distinfo,v 1.8 2005/03/10 16:58:39 tv 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) = 54f061989aa9317cdc32470302978129d8186b13
+SHA1 (patch-aa) = 0ecb437885e77c07ef9c6d677cefe9d0ae6b86d8
 SHA1 (patch-ab) = bd58fbbf71d5c9dc76bdc380cb7b93ad3f5f1c72
 SHA1 (patch-ac) = 52091c57f8f5bdcbf62069ae19200a7fc4bb88c0
 SHA1 (patch-ad) = ef0552148d9d0fdabb1dec72b3084eaaa33513c8
diff --git a/shells/es/patches/patch-aa b/shells/es/patches/patch-aa
index 4da4433a843..cef0bacee8a 100644
--- a/shells/es/patches/patch-aa
+++ b/shells/es/patches/patch-aa
@@ -1,41 +1,29 @@
-$NetBSD: patch-aa,v 1.4 2004/02/26 07:47:48 uebayasi Exp $
+$NetBSD: patch-aa,v 1.5 2005/03/10 16:58:39 tv Exp $
 
-*** Makefile.orig	Tue May 30 06:14:14 1995
---- Makefile	Fri Aug 11 16:02:11 1995
-***************
-*** 33,40 ****
-  SHELL	= /bin/sh
-  CC	= cc
-  #CC	= gcc
-! CFLAGS	= -g
-! #CFLAGS	= -g -O -Wall
-  LDFLAGS	=
-  LIBS	=
-  
---- 33,40 ----
-  SHELL	= /bin/sh
-  CC	= cc
-  #CC	= gcc
-! #CFLAGS	= -g
-! CFLAGS	= -O2
-  LDFLAGS	=
-  LIBS	=
-  
-***************
-*** 52,57 ****
---- 52,66 ----
-  	  tree.o util.o var.o vec.o version.o y.tab.o
-  OTHER	= Makefile parse.y mksignal
-  GEN	= esdump y.tab.c y.tab.h y.output token.h sigmsgs.c initial.c
-+ 
-+ all: es
-+ 
-+ install:
-+ 	$(INSTALL) -c es $(PREFIX)/bin
-+ 	$(INSTALL) -c esdebug $(PREFIX)/bin/esdebug
-+ 	$(INSTALL) -c es.1 $(PREFIX)/man/man1
-+ 	strip $(PREFIX)/bin/es
-+ 	gzip -9nf $(PREFIX)/man/man1/es.1
-  
-  es	: ${OFILES} initial.o
-  	${CC} -o es ${LDFLAGS} ${OFILES} initial.o ${LIBS}
+--- 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 $(PREFIX)/bin
++	${BSD_INSTALL_SCRIPT} esdebug $(PREFIX)/bin/esdebug
++	${BSD_INSTALL_MAN} es.1 $(PREFIX)/man/man1
++
+ es	: ${OFILES} initial.o
+ 	${CC} -o es ${LDFLAGS} ${OFILES} initial.o ${LIBS}
+