Make sure ${PREFIX}/share/emacs/site-lisp directory exists or gets created.

Fixes problem in latest pkgsrc/i386 bulk build.

5 files changed, 26 insertions, 18 deletions

diff --git a/shells/esh/Makefile b/shells/esh/Makefile
index 5b3226883c5..18b13139eeb 100644
--- a/shells/esh/Makefile
+++ b/shells/esh/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/11/02 21:51:58 tron Exp $
+# $NetBSD: Makefile,v 1.2 2000/12/08 21:22:14 jtb Exp $
 #
 
 DISTNAME=		esh-0.8
 CATEGORIES=		shells
 MASTER_SITES=		http://esh.netpedia.net/
 
-MAINTAINER=		jasontd@indigo.ie
+MAINTAINER=		jtb@netbsd.org
 HOMEPAGE=		http://esh.netpedia.net
 
 WRKSRC=			${WRKDIR}/esh
@@ -14,16 +14,14 @@ INFO_FILES=		esh.info
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/esh ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/esh
-	@(cd ${WRKSRC}/examples	; 					\
-		for i in *.esh ; do					\
-		${CP} $$i ${PREFIX}/share/examples/esh;			\
-		done)
-	${INSTALL_DATA} ${WRKSRC}/emacs/esh-mode.el 			\
-	${PREFIX}/share/emacs/site-lisp
+	${INSTALL_DATA} ${WRKSRC}/examples/*.esh ${PREFIX}/share/examples/esh
+.if !exists(${PREFIX}/share/emacs/site-lisp)
+	${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
+.endif
+	${INSTALL_DATA} ${WRKSRC}/emacs/esh-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/doc/esh.info ${PREFIX}/info
 	${MKDIR} ${PREFIX}/share/doc/esh
-	@(for i in esh.html esh_toc.html; do				\
-	${INSTALL_DATA} ${WRKSRC}/doc/$$i ${PREFIX}/share/doc/esh/$$i; 	\
-	done)
+	@for i in esh.html esh_toc.html ; do \
+	${INSTALL_DATA} ${WRKSRC}/doc/$$i ${PREFIX}/share/doc/esh/$$i; done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/esh/files/md5 b/shells/esh/files/md5
index af23bf5744a..87187fe0653 100644
--- a/shells/esh/files/md5
+++ b/shells/esh/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/11/02 21:51:58 tron Exp $
+$NetBSD: md5,v 1.2 2000/12/08 21:22:14 jtb Exp $
 
 MD5 (esh-0.8.tar.gz) = b59022b88bae24420156d25869b8be54
diff --git a/shells/esh/files/patch-sum b/shells/esh/files/patch-sum
index 0a63fc083c0..80c92236866 100644
--- a/shells/esh/files/patch-sum
+++ b/shells/esh/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/11/02 21:51:58 tron Exp $
+$NetBSD: patch-sum,v 1.2 2000/12/08 21:22:14 jtb Exp $
 
-MD5 (patch-aa) = 5046da6cb1ecdcc02250deffb748851c
+MD5 (patch-aa) = f6c65a638c2366d54bd5755ae27dd64a
diff --git a/shells/esh/patches/patch-aa b/shells/esh/patches/patch-aa
index 4129ea9c875..f975c66fc16 100644
--- a/shells/esh/patches/patch-aa
+++ b/shells/esh/patches/patch-aa
@@ -1,8 +1,15 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/11/02 21:51:58 tron Exp $
+$NetBSD: patch-aa,v 1.2 2000/12/08 21:22:14 jtb Exp $
 
---- Makefile.orig	Thu Apr 22 09:31:43 1999
+--- Makefile.orig	Thu Apr 22 08:31:43 1999
 +++ Makefile
-@@ -7,11 +7,11 @@
+@@ -1,17 +1,17 @@
+ 
+ # Your C compiler.
+ 
+-CC=gcc
++#CC=gcc
+ 
+ # Where your readline library is.
  # You can compile with a hacked replacement of readline instead by
  # doing this:
  
diff --git a/shells/esh/pkg/PLIST b/shells/esh/pkg/PLIST
index 50b31cc2438..71b3214a10c 100644
--- a/shells/esh/pkg/PLIST
+++ b/shells/esh/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/11/02 21:51:58 tron Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/12/08 21:22:14 jtb Exp $
 bin/esh
 @unexec install-info --delete --info-dir=%D/info %D/info/esh.info
 info/esh.info
@@ -18,5 +18,8 @@ share/examples/esh/test4.esh
 share/examples/esh/test5.esh
 share/examples/esh/test6.esh
 share/examples/esh/test7.esh
+@unexec rmdir %D/share/emacs/site-lisp 2>/dev/null || true
+@unexec rmdir %D/share/emacs 2>/dev/null || true
+@unexec rmdir %D/share 2>/dev/null || true
 @dirrm share/examples/esh
 @dirrm share/doc/esh