From 251b54e56459334a2a1b619da6a70545a26969c8 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Sun, 31 Jan 2010 21:24:03 +0000
Subject: [PATCH] Honour varbase and create tmp/vi.recover during +INSTALL.
 Bump revision.

---
 editors/ex/Makefile         |  5 ++++-
 editors/ex/distinfo         |  4 ++--
 editors/ex/patches/patch-aa | 13 +++++++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/editors/ex/Makefile b/editors/ex/Makefile
index 458a601dd57a..af42fe2c5642 100644
--- a/editors/ex/Makefile
+++ b/editors/ex/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2010/01/29 19:39:24 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2010/01/31 21:24:03 joerg Exp $
 #
 
 DISTNAME=	ex-040103
 PKGNAME=	ex-20040103
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ex-vi/files/ex-vi/040103/}
 
@@ -13,4 +14,6 @@ LICENSE=	original-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+MAKE_DIRS_PERMS+=	${VARBASE}/tmp/vi.recover ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 1777
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/ex/distinfo b/editors/ex/distinfo
index e1700ae2ed56..a154e75f63ec 100644
--- a/editors/ex/distinfo
+++ b/editors/ex/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2010/01/29 19:39:24 joerg Exp $
+$NetBSD: distinfo,v 1.13 2010/01/31 21:24:03 joerg Exp $
 
 SHA1 (ex-040103.tar.gz) = 51fa1d613b37a4f3aed1ef2968be691465cdff09
 RMD160 (ex-040103.tar.gz) = 5fc3f222dde5a8d00e1b233281ccf210affdbdf1
 Size (ex-040103.tar.gz) = 284130 bytes
-SHA1 (patch-aa) = be450377abc260617a6dd42bbcb626a5d4ca75a4
+SHA1 (patch-aa) = 8902846a518fbf214725a801293610ebe12c143b
 SHA1 (patch-ab) = 5bac9911e71b7fe787023568a7a46d1e87fb4d0e
 SHA1 (patch-ac) = 0401448724a4aba59b4aeb07a4cb00982bb52d98
 SHA1 (patch-ad) = 31bafb04f553ca286baf90505da450964fea9954
diff --git a/editors/ex/patches/patch-aa b/editors/ex/patches/patch-aa
index fff56d570484..e8423752b276 100644
--- a/editors/ex/patches/patch-aa
+++ b/editors/ex/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2010/01/29 19:39:24 joerg Exp $
+$NetBSD: patch-aa,v 1.7 2010/01/31 21:24:04 joerg Exp $
 
 --- Makefile.orig	2004-01-03 14:22:47.000000000 +0000
 +++ Makefile
@@ -14,7 +14,7 @@ $NetBSD: patch-aa,v 1.6 2010/01/29 19:39:24 joerg Exp $
 +BINDIR		= ${PREFIX}/bin
 +LIBEXECDIR	= ${PREFIX}/libexec
 +MANDIR		= ${PREFIX}/${PKGMANDIR}
-+PRESERVEDIR	= /var/tmp/vi.recover
++PRESERVEDIR	= ${VARBASE}/tmp/vi.recover
  
  #
  # A BSD-like install program. GNU install will fit well here, too.
@@ -65,3 +65,12 @@ $NetBSD: patch-aa,v 1.6 2010/01/29 19:39:24 joerg Exp $
  	test -d $(DESTDIR)/$(LIBEXECDIR) || mkdir $(DESTDIR)/$(LIBEXECDIR)
  	$(INSTALL) -c -s exrecover $(DESTDIR)/$(LIBEXECDIR)/exrecover
  	$(INSTALL) -c -s expreserve $(DESTDIR)/$(LIBEXECDIR)/expreserve
+@@ -305,8 +305,6 @@ install: all install-man
+ 	ln -s ex $(DESTDIR)/$(BINDIR)/vedit
+ 	ln -s ex $(DESTDIR)/$(BINDIR)/vi
+ 	ln -s ex $(DESTDIR)/$(BINDIR)/view
+-	test -d $(PRESERVEDIR) || mkdir $(PRESERVEDIR)
+-	chmod 1777 $(PRESERVEDIR)
+ 
+ ex.o: config.h ex_argv.h ex.h ex_proto.h ex_temp.h ex_tty.h ex_tune.h
+ ex.o: ex_vars.h libterm/libterm.h