Sun Jan 31 21:24:04 2010 UTC ()
Honour varbase and create tmp/vi.recover during +INSTALL. Bump revision.


(joerg)
diff -r1.7 -r1.8 pkgsrc/editors/ex/Makefile
diff -r1.12 -r1.13 pkgsrc/editors/ex/distinfo
diff -r1.6 -r1.7 pkgsrc/editors/ex/patches/patch-aa
cvs diff -r1.7 -r1.8 pkgsrc/editors/ex/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/ex/Makefile 2010/01/29 19:39:24 1.7
+++ pkgsrc/editors/ex/Makefile 2010/01/31 21:24:03 1.8
@@ -1,16 +1,19 @@ @@ -1,16 +1,19 @@
1# $NetBSD: Makefile,v 1.7 2010/01/29 19:39:24 joerg Exp $ 1# $NetBSD: Makefile,v 1.8 2010/01/31 21:24:03 joerg Exp $
2# 2#
3 3
4DISTNAME= ex-040103 4DISTNAME= ex-040103
5PKGNAME= ex-20040103 5PKGNAME= ex-20040103
 6PKGREVISION= 1
6CATEGORIES= editors 7CATEGORIES= editors
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ex-vi/files/ex-vi/040103/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ex-vi/files/ex-vi/040103/}
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://ex-vi.sourceforge.net/ 11HOMEPAGE= http://ex-vi.sourceforge.net/
11COMMENT= Berkeley vi 3.7 12COMMENT= Berkeley vi 3.7
12LICENSE= original-bsd 13LICENSE= original-bsd
13 14
14PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
15 16
 17MAKE_DIRS_PERMS+= ${VARBASE}/tmp/vi.recover ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 1777
 18
16.include "../../mk/bsd.pkg.mk" 19.include "../../mk/bsd.pkg.mk"
cvs diff -r1.12 -r1.13 pkgsrc/editors/ex/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/ex/distinfo 2010/01/29 19:39:24 1.12
+++ pkgsrc/editors/ex/distinfo 2010/01/31 21:24:03 1.13
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.12 2010/01/29 19:39:24 joerg Exp $ 1$NetBSD: distinfo,v 1.13 2010/01/31 21:24:03 joerg Exp $
2 2
3SHA1 (ex-040103.tar.gz) = 51fa1d613b37a4f3aed1ef2968be691465cdff09 3SHA1 (ex-040103.tar.gz) = 51fa1d613b37a4f3aed1ef2968be691465cdff09
4RMD160 (ex-040103.tar.gz) = 5fc3f222dde5a8d00e1b233281ccf210affdbdf1 4RMD160 (ex-040103.tar.gz) = 5fc3f222dde5a8d00e1b233281ccf210affdbdf1
5Size (ex-040103.tar.gz) = 284130 bytes 5Size (ex-040103.tar.gz) = 284130 bytes
6SHA1 (patch-aa) = be450377abc260617a6dd42bbcb626a5d4ca75a4 6SHA1 (patch-aa) = 8902846a518fbf214725a801293610ebe12c143b
7SHA1 (patch-ab) = 5bac9911e71b7fe787023568a7a46d1e87fb4d0e 7SHA1 (patch-ab) = 5bac9911e71b7fe787023568a7a46d1e87fb4d0e
8SHA1 (patch-ac) = 0401448724a4aba59b4aeb07a4cb00982bb52d98 8SHA1 (patch-ac) = 0401448724a4aba59b4aeb07a4cb00982bb52d98
9SHA1 (patch-ad) = 31bafb04f553ca286baf90505da450964fea9954 9SHA1 (patch-ad) = 31bafb04f553ca286baf90505da450964fea9954
cvs diff -r1.6 -r1.7 pkgsrc/editors/ex/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/editors/ex/patches/patch-aa 2010/01/29 19:39:24 1.6
+++ pkgsrc/editors/ex/patches/patch-aa 2010/01/31 21:24:04 1.7
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1$NetBSD: patch-aa,v 1.6 2010/01/29 19:39:24 joerg Exp $ 1$NetBSD: patch-aa,v 1.7 2010/01/31 21:24:04 joerg Exp $
2 2
3--- Makefile.orig 2004-01-03 14:22:47.000000000 +0000 3--- Makefile.orig 2004-01-03 14:22:47.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -80,16 +80,16 @@ 5@@ -80,16 +80,16 @@
6 # located below $(DESTDIR). $(PRESERVEDIR) is used for recovery files. It 6 # located below $(DESTDIR). $(PRESERVEDIR) is used for recovery files. It
7 # will get mode 1777. 7 # will get mode 1777.
8 # 8 #
9-BINDIR = bin 9-BINDIR = bin
10-LIBEXECDIR = libexec 10-LIBEXECDIR = libexec
11-MANDIR = man 11-MANDIR = man
12-DESTDIR = /usr/local 12-DESTDIR = /usr/local
13-PRESERVEDIR = /var/preserve 13-PRESERVEDIR = /var/preserve
14+BINDIR = ${PREFIX}/bin 14+BINDIR = ${PREFIX}/bin
15+LIBEXECDIR = ${PREFIX}/libexec 15+LIBEXECDIR = ${PREFIX}/libexec
16+MANDIR = ${PREFIX}/${PKGMANDIR} 16+MANDIR = ${PREFIX}/${PKGMANDIR}
17+PRESERVEDIR = /var/tmp/vi.recover 17+PRESERVEDIR = ${VARBASE}/tmp/vi.recover
18  18
19 # 19 #
20 # A BSD-like install program. GNU install will fit well here, too. 20 # A BSD-like install program. GNU install will fit well here, too.
21 # 21 #
22-INSTALL = /usr/ucb/install 22-INSTALL = /usr/ucb/install
23+#INSTALL = /usr/ucb/install 23+#INSTALL = /usr/ucb/install
24+INSTALL = ${BSD_INSTALL} 24+INSTALL = ${BSD_INSTALL}
25  25
26 # 26 #
27 # Compiler and linker flags. 27 # Compiler and linker flags.
28@@ -140,9 +140,9 @@ FEATURES = -DLISPCODE -DCHDIR -DFASTTAG  28@@ -140,9 +140,9 @@ FEATURES = -DLISPCODE -DCHDIR -DFASTTAG
29 # advanced multibyte character support etc. which might not be present 29 # advanced multibyte character support etc. which might not be present
30 # on your system. 30 # on your system.
@@ -55,13 +55,22 @@ $NetBSD: patch-aa,v 1.6 2010/01/29 19:39 @@ -55,13 +55,22 @@ $NetBSD: patch-aa,v 1.6 2010/01/29 19:39
55+#TERMLIB = termlib 55+#TERMLIB = termlib
56  56
57 # 57 #
58 # Since ex uses sbrk() internally, a conflict with the libc's version of 58 # Since ex uses sbrk() internally, a conflict with the libc's version of
59@@ -297,7 +297,7 @@ install: all install-man 59@@ -297,7 +297,7 @@ install: all install-man
60 mv $(DESTDIR)/$(BINDIR)/ex $(DESTDIR)/$(BINDIR)/ex.old.$$$$; \ 60 mv $(DESTDIR)/$(BINDIR)/ex $(DESTDIR)/$(BINDIR)/ex.old.$$$$; \
61 rm -f $(DESTDIR)/$(BINDIR)/ex.old.$$$$; \ 61 rm -f $(DESTDIR)/$(BINDIR)/ex.old.$$$$; \
62 fi 62 fi
63- $(INSTALL) -c -s -m 1755 ex $(DESTDIR)/$(BINDIR)/ex 63- $(INSTALL) -c -s -m 1755 ex $(DESTDIR)/$(BINDIR)/ex
64+ $(INSTALL) -c -s -m 755 ex $(DESTDIR)/$(BINDIR)/ex 64+ $(INSTALL) -c -s -m 755 ex $(DESTDIR)/$(BINDIR)/ex
65 test -d $(DESTDIR)/$(LIBEXECDIR) || mkdir $(DESTDIR)/$(LIBEXECDIR) 65 test -d $(DESTDIR)/$(LIBEXECDIR) || mkdir $(DESTDIR)/$(LIBEXECDIR)
66 $(INSTALL) -c -s exrecover $(DESTDIR)/$(LIBEXECDIR)/exrecover 66 $(INSTALL) -c -s exrecover $(DESTDIR)/$(LIBEXECDIR)/exrecover
67 $(INSTALL) -c -s expreserve $(DESTDIR)/$(LIBEXECDIR)/expreserve 67 $(INSTALL) -c -s expreserve $(DESTDIR)/$(LIBEXECDIR)/expreserve
 68@@ -305,8 +305,6 @@ install: all install-man
 69 ln -s ex $(DESTDIR)/$(BINDIR)/vedit
 70 ln -s ex $(DESTDIR)/$(BINDIR)/vi
 71 ln -s ex $(DESTDIR)/$(BINDIR)/view
 72- test -d $(PRESERVEDIR) || mkdir $(PRESERVEDIR)
 73- chmod 1777 $(PRESERVEDIR)
 74
 75 ex.o: config.h ex_argv.h ex.h ex_proto.h ex_temp.h ex_tty.h ex_tune.h
 76 ex.o: ex_vars.h libterm/libterm.h