Date: Tuesday, November 20, 2012 @ 00:26:38
Author: eric
Revision: 171607
db-move: moved vi from [testing] to [core] (i686, x86_64)
Added:
vi/repos/core-i686/PKGBUILD
(from rev 171606, vi/repos/testing-i686/PKGBUILD)
vi/repos/core-i686/increase-tube.patch
(from rev 171606, vi/repos/testing-i686/increase-tube.patch)
vi/repos/core-i686/navkeys.patch
(from rev 171606, vi/repos/testing-i686/navkeys.patch)
vi/repos/core-i686/preserve_dir.patch
(from rev 171606, vi/repos/testing-i686/preserve_dir.patch)
vi/repos/core-x86_64/PKGBUILD
(from rev 171606, vi/repos/testing-x86_64/PKGBUILD)
vi/repos/core-x86_64/increase-tube.patch
(from rev 171606, vi/repos/testing-x86_64/increase-tube.patch)
vi/repos/core-x86_64/navkeys.patch
(from rev 171606, vi/repos/testing-x86_64/navkeys.patch)
vi/repos/core-x86_64/preserve_dir.patch
(from rev 171606, vi/repos/testing-x86_64/preserve_dir.patch)
Deleted:
vi/repos/core-i686/PKGBUILD
vi/repos/core-i686/exrc.sample
vi/repos/core-i686/increase-tube.patch
vi/repos/core-i686/navkeys.patch
vi/repos/core-i686/preserve_dir.patch
vi/repos/core-x86_64/PKGBUILD
vi/repos/core-x86_64/exrc.sample
vi/repos/core-x86_64/increase-tube.patch
vi/repos/core-x86_64/navkeys.patch
vi/repos/core-x86_64/preserve_dir.patch
vi/repos/testing-i686/
vi/repos/testing-x86_64/
---------------------------------+
core-i686/PKGBUILD | 91 +++++++++----------
core-i686/exrc.sample | 5 -
core-i686/increase-tube.patch | 26 ++---
core-i686/navkeys.patch | 110 +++++++++++------------
core-i686/preserve_dir.patch | 180 ++++++++++++++++++++------------------
core-x86_64/PKGBUILD | 91 +++++++++----------
core-x86_64/exrc.sample | 5 -
core-x86_64/increase-tube.patch | 26 ++---
core-x86_64/navkeys.patch | 110 +++++++++++------------
core-x86_64/preserve_dir.patch | 180 ++++++++++++++++++++------------------
10 files changed, 422 insertions(+), 402 deletions(-)
Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD 2012-11-20 03:07:17 UTC (rev 171606)
+++ core-i686/PKGBUILD 2012-11-20 05:26:38 UTC (rev 171607)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: tobias [ tobias at archlinux org ]
-
-pkgname=vi
-pkgver=050325
-pkgrel=2
-epoch=1
-pkgdesc='The original ex/vi text editor.'
-arch=('i686' 'x86_64')
-url='http://ex-vi.sourceforge.net/'
-license=('custom:ex')
-depends=('ncurses')
-optdepends=('mailx: used by the preserve command for notification')
-groups=('base')
-options=(strip !libtool emptydirs)
-source=(http://downloads.sourceforge.net/sourceforge/ex-vi/ex-${pkgver}.tar.bz2
- exrc.sample
- navkeys.patch
- increase-tube.patch
- preserve_dir.patch)
-md5sums=('e668595254233e4d96811083a3e4e2f3'
- 'd3b483c994d859232ce369b82a4b5668'
- 'aac133930047eafa4f28736cfaf976b3'
- 'e596e05a00a24187b576e389fa1de45d'
- '419a8755e0dd16e95542bc107e6d2b24')
-
-build() {
- cd "${srcdir}/ex-${pkgver}"
-
- # apply patches
- patch -Np1 -i ../navkeys.patch
- patch -Np0 -i ../increase-tube.patch
- # FS#20653
- patch -Np1 -i ../preserve_dir.patch
-
- make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \
- 'FEATURES=-DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8' TERMLIB=ncurses
-}
-
-package() {
- cd "${srcdir}/ex-${pkgver}"
-
- make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex
INSTALL=/usr/bin/install \
- DESTDIR="$pkgdir" install
-
- install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: vi/repos/core-i686/PKGBUILD (from rev 171606,
vi/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2012-11-20 05:26:38 UTC (rev 171607)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: tobias [ tobias at archlinux org ]
+
+pkgname=vi
+pkgver=050325
+pkgrel=3
+epoch=1
+pkgdesc='The original ex/vi text editor.'
+arch=('i686' 'x86_64')
+url='http://ex-vi.sourceforge.net/'
+license=('custom:ex')
+depends=('ncurses')
+optdepends=('heirloom-mailx: used by the preserve command for notification')
+groups=('base')
+options=(strip !libtool emptydirs)
+source=(http://downloads.sourceforge.net/sourceforge/ex-vi/ex-${pkgver}.tar.bz2
+ navkeys.patch
+ increase-tube.patch
+ preserve_dir.patch)
+md5sums=('e668595254233e4d96811083a3e4e2f3'
+ 'aac133930047eafa4f28736cfaf976b3'
+ 'e596e05a00a24187b576e389fa1de45d'
+ '8c6d3503e7c41a4413145ae49a7f2b80')
+
+build() {
+ cd "${srcdir}/ex-${pkgver}"
+
+ patch -Np1 -i ../navkeys.patch
+ patch -Np0 -i ../increase-tube.patch
+ # FS#20653
+ patch -Np1 -i ../preserve_dir.patch
+
+ make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \
+ 'FEATURES=-DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8' TERMLIB=ncurses
+}
+
+package() {
+ cd "${srcdir}/ex-${pkgver}"
+
+ make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex
INSTALL=/usr/bin/install \
+ DESTDIR="$pkgdir" install
+
+ install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Deleted: core-i686/exrc.sample
===================================================================
--- core-i686/exrc.sample 2012-11-20 03:07:17 UTC (rev 171606)
+++ core-i686/exrc.sample 2012-11-20 05:26:38 UTC (rev 171607)
@@ -1,5 +0,0 @@
-" A sample .exrc file. Copy it to your home dir as ~/.exrc in order to work.
-set showmode
-set noflash
-set autoindent
-set shiftwidth=2
Deleted: core-i686/increase-tube.patch
===================================================================
--- core-i686/increase-tube.patch 2012-11-20 03:07:17 UTC (rev 171606)
+++ core-i686/increase-tube.patch 2012-11-20 05:26:38 UTC (rev 171607)
@@ -1,13 +0,0 @@
---- config.h 2005-02-19 05:25:39.000000000 -0500
-+++ config.h.fixed 2010-01-04 22:02:01.000000000 -0500
-@@ -95,8 +95,8 @@
- #define TUBESIZE 6000 /* Maximum screen size for visual */
- #else /* VMUNIX */
- #define TUBELINES 100
--#define TUBECOLS 160
--#define TUBESIZE 16000
-+#define TUBECOLS 320
-+#define TUBESIZE 32000
- #endif /* VMUNIX */
-
- /*
Copied: vi/repos/core-i686/increase-tube.patch (from rev 171606,
vi/repos/testing-i686/increase-tube.patch)
===================================================================
--- core-i686/increase-tube.patch (rev 0)
+++ core-i686/increase-tube.patch 2012-11-20 05:26:38 UTC (rev 171607)
@@ -0,0 +1,13 @@
+--- config.h 2005-02-19 05:25:39.000000000 -0500
++++ config.h.fixed 2010-01-04 22:02:01.000000000 -0500
+@@ -95,8 +95,8 @@
+ #define TUBESIZE 6000 /* Maximum screen size for visual */
+ #else /* VMUNIX */
+ #define TUBELINES 100
+-#define TUBECOLS 160
+-#define TUBESIZE 16000
++#define TUBECOLS 320
++#define TUBESIZE 32000
+ #endif /* VMUNIX */
+
+ /*
Deleted: core-i686/navkeys.patch
===================================================================
--- core-i686/navkeys.patch 2012-11-20 03:07:17 UTC (rev 171606)
+++ core-i686/navkeys.patch 2012-11-20 05:26:38 UTC (rev 171607)
@@ -1,55 +0,0 @@
-diff -ru ex-050325/ex_tty.c ex-050325-du/ex_tty.c
---- ex-050325/ex_tty.c 2005-03-04 13:42:58.000000000 +0100
-+++ ex-050325-du/ex_tty.c 2009-06-25 20:06:57.000000000 +0200
-@@ -132,7 +132,8 @@
- &ED, &EI, &F0, &F1, &F2, &F3, &F4, &F5, &F6, &F7, &F8, &F9,
- &HO, &IC, &IM, &IP, &KD, &KE, &KH, &KL, &KR, &KS, &KU, &LL, &ND, &xNL,
- &xPC, &RC, &SC, &SE, &SF, &SO, &SR, &TA, &TE, &TI, &UP, &VB, &VS, &VE,
-- &AL_PARM, &DL_PARM, &UP_PARM, &DOWN_PARM, &LEFT_PARM, &RIGHT_PARM
-+ &AL_PARM, &DL_PARM, &UP_PARM, &DOWN_PARM, &LEFT_PARM, &RIGHT_PARM,
-+ &kI, &kD, &kh, &at7, &kP, &kN
- };
- bool *sflags[] = {
- &AM, &BS, &DA, &DB, &EO, &HC,
-@@ -170,7 +171,12 @@
- addmac1(KD, "j", "down", arrows, 1);
- addmac1(KL, "h", "left", arrows, 1);
- addmac1(KR, "l", "right", arrows, 1);
-- addmac1(KH, "H", "home", arrows, 1);
-+ addmac1(kI, "i", "insert", arrows, 1);
-+ addmac1(kD, "x", "delete", arrows, 1);
-+ addmac1(kh, "^", "home", arrows, 1);
-+ addmac1(at7, "$", "end", arrows, 1);
-+ addmac1(kP, "", "pgup", arrows, 1);
-+ addmac1(kN, "", "pgdn", arrows, 1);
-
- /*
- * Handle funny termcap capabilities
-@@ -341,7 +347,7 @@
- *(*fp++) = flag;
- namp += 2;
- } while (*namp);
-- namp =
"albcbtcdceclcmcrcsdcdldmdoedeik0k1k2k3k4k5k6k7k8k9hoicimipkdkekhklkrkskullndnlpcrcscsesfsosrtatetiupvbvsveALDLUPDOLERI";
-+ namp =
"albcbtcdceclcmcrcsdcdldmdoedeik0k1k2k3k4k5k6k7k8k9hoicimipkdkekhklkrkskullndnlpcrcscsesfsosrtatetiupvbvsveALDLUPDOLERIkIkDkh@7kPkN";
- sp = sstrs;
- do {
- string = tgetstr(namp, &aoftspace);
-diff -ru ex-050325/ex_tty.h ex-050325-du/ex_tty.h
---- ex-050325/ex_tty.h 2004-12-01 19:21:06.000000000 +0100
-+++ ex-050325-du/ex_tty.h 2009-06-25 20:06:05.000000000 +0200
-@@ -183,6 +183,15 @@
- var bool XX; /* Tektronix 4025 insert line */
- /* X? is reserved for severely nauseous glitches */
- /* If there are enough of these we may need bit masks! */
-+/*
-+ * Insert, Delete, Home, End, PgUp an PgDown keys
-+ */
-+var char *kI;
-+var char *kD;
-+var char *kh;
-+var char *at7;
-+var char *kP;
-+var char *kN;
-
- /*
- * From the tty modes...
Copied: vi/repos/core-i686/navkeys.patch (from rev 171606,
vi/repos/testing-i686/navkeys.patch)
===================================================================
--- core-i686/navkeys.patch (rev 0)
+++ core-i686/navkeys.patch 2012-11-20 05:26:38 UTC (rev 171607)
@@ -0,0 +1,55 @@
+diff -ru ex-050325/ex_tty.c ex-050325-du/ex_tty.c
+--- ex-050325/ex_tty.c 2005-03-04 13:42:58.000000000 +0100
++++ ex-050325-du/ex_tty.c 2009-06-25 20:06:57.000000000 +0200
+@@ -132,7 +132,8 @@
+ &ED, &EI, &F0, &F1, &F2, &F3, &F4, &F5, &F6, &F7, &F8, &F9,
+ &HO, &IC, &IM, &IP, &KD, &KE, &KH, &KL, &KR, &KS, &KU, &LL, &ND, &xNL,
+ &xPC, &RC, &SC, &SE, &SF, &SO, &SR, &TA, &TE, &TI, &UP, &VB, &VS, &VE,
+- &AL_PARM, &DL_PARM, &UP_PARM, &DOWN_PARM, &LEFT_PARM, &RIGHT_PARM
++ &AL_PARM, &DL_PARM, &UP_PARM, &DOWN_PARM, &LEFT_PARM, &RIGHT_PARM,
++ &kI, &kD, &kh, &at7, &kP, &kN
+ };
+ bool *sflags[] = {
+ &AM, &BS, &DA, &DB, &EO, &HC,
+@@ -170,7 +171,12 @@
+ addmac1(KD, "j", "down", arrows, 1);
+ addmac1(KL, "h", "left", arrows, 1);
+ addmac1(KR, "l", "right", arrows, 1);
+- addmac1(KH, "H", "home", arrows, 1);
++ addmac1(kI, "i", "insert", arrows, 1);
++ addmac1(kD, "x", "delete", arrows, 1);
++ addmac1(kh, "^", "home", arrows, 1);
++ addmac1(at7, "$", "end", arrows, 1);
++ addmac1(kP, "", "pgup", arrows, 1);
++ addmac1(kN, "", "pgdn", arrows, 1);
+
+ /*
+ * Handle funny termcap capabilities
+@@ -341,7 +347,7 @@
+ *(*fp++) = flag;
+ namp += 2;
+ } while (*namp);
+- namp =
"albcbtcdceclcmcrcsdcdldmdoedeik0k1k2k3k4k5k6k7k8k9hoicimipkdkekhklkrkskullndnlpcrcscsesfsosrtatetiupvbvsveALDLUPDOLERI";
++ namp =
"albcbtcdceclcmcrcsdcdldmdoedeik0k1k2k3k4k5k6k7k8k9hoicimipkdkekhklkrkskullndnlpcrcscsesfsosrtatetiupvbvsveALDLUPDOLERIkIkDkh@7kPkN";
+ sp = sstrs;
+ do {
+ string = tgetstr(namp, &aoftspace);
+diff -ru ex-050325/ex_tty.h ex-050325-du/ex_tty.h
+--- ex-050325/ex_tty.h 2004-12-01 19:21:06.000000000 +0100
++++ ex-050325-du/ex_tty.h 2009-06-25 20:06:05.000000000 +0200
+@@ -183,6 +183,15 @@
+ var bool XX; /* Tektronix 4025 insert line */
+ /* X? is reserved for severely nauseous glitches */
+ /* If there are enough of these we may need bit masks! */
++/*
++ * Insert, Delete, Home, End, PgUp an PgDown keys
++ */
++var char *kI;
++var char *kD;
++var char *kh;
++var char *at7;
++var char *kP;
++var char *kN;
+
+ /*
+ * From the tty modes...
Deleted: core-i686/preserve_dir.patch
===================================================================
--- core-i686/preserve_dir.patch 2012-11-20 03:07:17 UTC (rev 171606)
+++ core-i686/preserve_dir.patch 2012-11-20 05:26:38 UTC (rev 171607)
@@ -1,81 +0,0 @@
-diff -Naur ex-050325.ori/ex.1 ex-050325/ex.1
---- ex-050325.ori/ex.1 2005-02-17 07:39:36.000000000 -0500
-+++ ex-050325/ex.1 2011-02-01 16:21:51.496666674 -0500
-@@ -1950,7 +1950,7 @@
- .B /var/tmp/Rx\fInnnnnnnnnn\fP
- named buffer temporary
- .TP
--.B /var/preserve
-+.B /var/lib/ex
- preservation directory
- .SH DOCUMENTATION
- The document
-diff -Naur ex-050325.ori/expreserve.c ex-050325/expreserve.c
---- ex-050325.ori/expreserve.c 2005-03-04 07:44:46.000000000 -0500
-+++ ex-050325/expreserve.c 2011-02-01 16:22:06.583333342 -0500
-@@ -272,7 +272,7 @@
- #ifdef notdef
- char pattern[] = "/usr/preserve/Exaa`XXXXX";
- #else
--char pattern[] = "/var/preserve/Exa`XXXXXXXXXX";
-+char pattern[] = "/var/lib/ex/Exa`XXXXXXXXXX";
- #endif
-
- /*
-@@ -296,7 +296,7 @@
- timestamp = ctime(&time);
- timestamp[16] = 0; /* blast from seconds on */
- putenv("MAILRC=/dev/null");
-- sprintf(cmd, "/bin/mail %s", pp->pw_name);
-+ sprintf(cmd, "/usr/bin/mail %s", pp->pw_name);
- setuid(getuid());
- mf = popen(cmd, "w");
- if (mf == NULL)
-diff -Naur ex-050325.ori/exrecover.c ex-050325/exrecover.c
---- ex-050325.ori/exrecover.c 2005-03-04 07:44:46.000000000 -0500
-+++ ex-050325/exrecover.c 2011-02-01 16:21:51.496666674 -0500
-@@ -167,7 +167,7 @@
- #ifdef notdef
- char mydir[] = "/usr/preserve";
- #else
--char mydir[] = "/var/preserve";
-+char mydir[] = "/var/lib/ex";
- #endif
-
- /*
-diff -Naur ex-050325.ori/ex.spec ex-050325/ex.spec
---- ex-050325.ori/ex.spec 2005-03-24 18:50:09.000000000 -0500
-+++ ex-050325/ex.spec 2011-02-01 16:21:51.496666674 -0500
-@@ -20,7 +20,7 @@
- %define libexecdir %{prefix}/5lib
- %define mandir %{prefix}/share/man/5man
-
--%define preservedir /var/preserve
-+%define preservedir /var/lib/ex
-
- # install command
- %define ucbinstall install
-diff -Naur ex-050325.ori/Makefile ex-050325/Makefile
---- ex-050325.ori/Makefile 2005-03-24 18:50:09.000000000 -0500
-+++ ex-050325/Makefile 2011-02-01 16:21:51.496666674 -0500
-@@ -83,7 +83,7 @@
- BINDIR = $(PREFIX)/bin
- LIBEXECDIR = $(PREFIX)/libexec
- MANDIR = $(PREFIX)/share/man
--PRESERVEDIR = /var/preserve
-+PRESERVEDIR = /var/lib/ex
-
- #
- # DESTDIR is prepended to the installation paths. It is mostly useful
-diff -Naur ex-050325.ori/vi.1 ex-050325/vi.1
---- ex-050325.ori/vi.1 2005-02-17 07:39:36.000000000 -0500
-+++ ex-050325/vi.1 2011-02-01 16:21:51.496666674 -0500
-@@ -979,7 +979,7 @@
- .B /var/tmp/Rx\fInnnnnnnnnn\fP
- named buffer temporary
- .TP
--.B /var/preserve
-+.B /var/lib/ex
- preservation directory
- .SH SEE ALSO
- ex(1),
Copied: vi/repos/core-i686/preserve_dir.patch (from rev 171606,
vi/repos/testing-i686/preserve_dir.patch)
===================================================================
--- core-i686/preserve_dir.patch (rev 0)
+++ core-i686/preserve_dir.patch 2012-11-20 05:26:38 UTC (rev 171607)
@@ -0,0 +1,99 @@
+diff -Naur ex-050325.ori/ex.1 ex-050325/ex.1
+--- ex-050325.ori/ex.1 2005-02-17 07:39:36.000000000 -0500
++++ ex-050325/ex.1 2011-02-01 16:21:51.496666674 -0500
+@@ -1950,7 +1950,7 @@
+ .B /var/tmp/Rx\fInnnnnnnnnn\fP
+ named buffer temporary
+ .TP
+-.B /var/preserve
++.B /var/lib/ex
+ preservation directory
+ .SH DOCUMENTATION
+ The document
+diff -Naur ex-050325.ori/expreserve.c ex-050325/expreserve.c
+--- ex-050325.ori/expreserve.c 2005-03-04 07:44:46.000000000 -0500
++++ ex-050325/expreserve.c 2011-02-01 16:22:06.583333342 -0500
+@@ -272,7 +272,7 @@
+ #ifdef notdef
+ char pattern[] = "/usr/preserve/Exaa`XXXXX";
+ #else
+-char pattern[] = "/var/preserve/Exa`XXXXXXXXXX";
++char pattern[] = "/var/lib/ex/Exa`XXXXXXXXXX";
+ #endif
+
+ /*
+@@ -296,7 +296,7 @@
+ timestamp = ctime(&time);
+ timestamp[16] = 0; /* blast from seconds on */
+ putenv("MAILRC=/dev/null");
+- sprintf(cmd, "/bin/mail %s", pp->pw_name);
++ sprintf(cmd, "/usr/bin/mail %s", pp->pw_name);
+ setuid(getuid());
+ mf = popen(cmd, "w");
+ if (mf == NULL)
+diff -Naur ex-050325.ori/exrecover.c ex-050325/exrecover.c
+--- ex-050325.ori/exrecover.c 2005-03-04 07:44:46.000000000 -0500
++++ ex-050325/exrecover.c 2011-02-01 16:21:51.496666674 -0500
+@@ -167,7 +167,7 @@
+ #ifdef notdef
+ char mydir[] = "/usr/preserve";
+ #else
+-char mydir[] = "/var/preserve";
++char mydir[] = "/var/lib/ex";
+ #endif
+
+ /*
+diff -Naur ex-050325.ori/Makefile ex-050325/Makefile
+--- ex-050325.ori/Makefile 2005-03-24 18:50:09.000000000 -0500
++++ ex-050325/Makefile 2011-02-01 16:21:51.496666674 -0500
+@@ -83,7 +83,7 @@
+ BINDIR = $(PREFIX)/bin
+ LIBEXECDIR = $(PREFIX)/libexec
+ MANDIR = $(PREFIX)/share/man
+-PRESERVEDIR = /var/preserve
++PRESERVEDIR = /var/lib/ex
+
+ #
+ # DESTDIR is prepended to the installation paths. It is mostly useful
+diff -Naur ex-050325.ori/vi.1 ex-050325/vi.1
+--- ex-050325.ori/vi.1 2005-02-17 07:39:36.000000000 -0500
++++ ex-050325/vi.1 2011-02-01 16:21:51.496666674 -0500
+@@ -979,7 +979,7 @@
+ .B /var/tmp/Rx\fInnnnnnnnnn\fP
+ named buffer temporary
+ .TP
+-.B /var/preserve
++.B /var/lib/ex
+ preservation directory
+ .SH SEE ALSO
+ ex(1),
+--- ex-050325.original/ex.1 2012-01-27 20:43:00.602119283 +0100
++++ ex-050325/ex.1 2012-01-27 20:47:24.535436516 +0100
+@@ -1932,10 +1932,10 @@
+ Determines the terminal type.
+ .SH FILES
+ .TP
+-.B /usr/libexec/expreserve
++.B /usr/lib/ex/expreserve
+ preserve command
+ .TP
+-.B /usr/libexec/exrecover
++.B /usr/lib/ex/exrecover
+ recover command
+ .TP
+ .B /etc/termcap
+--- ex-050325.original/vi.1 2012-01-27 20:43:00.602119283 +0100
++++ ex-050325/vi.1 2012-01-27 20:46:33.815439611 +0100
+@@ -961,10 +961,10 @@
+ Determines the terminal type.
+ .SH FILES
+ .TP
+-.B /usr/libexec/expreserve
++.B /usr/lib/ex/expreserve
+ preserve command
+ .TP
+-.B /usr/libexec/exrecover
++.B /usr/lib/ex/exrecover
+ recover command
+ .TP
+ .B /etc/termcap
Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD 2012-11-20 03:07:17 UTC (rev 171606)
+++ core-x86_64/PKGBUILD 2012-11-20 05:26:38 UTC (rev 171607)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: tobias [ tobias at archlinux org ]
-
-pkgname=vi
-pkgver=050325
-pkgrel=2
-epoch=1
-pkgdesc='The original ex/vi text editor.'
-arch=('i686' 'x86_64')
-url='http://ex-vi.sourceforge.net/'
-license=('custom:ex')
-depends=('ncurses')
-optdepends=('mailx: used by the preserve command for notification')
-groups=('base')
-options=(strip !libtool emptydirs)
-source=(http://downloads.sourceforge.net/sourceforge/ex-vi/ex-${pkgver}.tar.bz2
- exrc.sample
- navkeys.patch
- increase-tube.patch
- preserve_dir.patch)
-md5sums=('e668595254233e4d96811083a3e4e2f3'
- 'd3b483c994d859232ce369b82a4b5668'
- 'aac133930047eafa4f28736cfaf976b3'
- 'e596e05a00a24187b576e389fa1de45d'
- '419a8755e0dd16e95542bc107e6d2b24')
-
-build() {
- cd "${srcdir}/ex-${pkgver}"
-
- # apply patches
- patch -Np1 -i ../navkeys.patch
- patch -Np0 -i ../increase-tube.patch
- # FS#20653
- patch -Np1 -i ../preserve_dir.patch
-
- make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \
- 'FEATURES=-DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8' TERMLIB=ncurses
-}
-
-package() {
- cd "${srcdir}/ex-${pkgver}"
-
- make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex
INSTALL=/usr/bin/install \
- DESTDIR="$pkgdir" install
-
- install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: vi/repos/core-x86_64/PKGBUILD (from rev 171606,
vi/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD (rev 0)
+++ core-x86_64/PKGBUILD 2012-11-20 05:26:38 UTC (rev 171607)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: tobias [ tobias at archlinux org ]
+
+pkgname=vi
+pkgver=050325
+pkgrel=3
+epoch=1
+pkgdesc='The original ex/vi text editor.'
+arch=('i686' 'x86_64')
+url='http://ex-vi.sourceforge.net/'
+license=('custom:ex')
+depends=('ncurses')
+optdepends=('heirloom-mailx: used by the preserve command for notification')
+groups=('base')
+options=(strip !libtool emptydirs)
+source=(http://downloads.sourceforge.net/sourceforge/ex-vi/ex-${pkgver}.tar.bz2
+ navkeys.patch
+ increase-tube.patch
+ preserve_dir.patch)
+md5sums=('e668595254233e4d96811083a3e4e2f3'
+ 'aac133930047eafa4f28736cfaf976b3'
+ 'e596e05a00a24187b576e389fa1de45d'
+ '8c6d3503e7c41a4413145ae49a7f2b80')
+
+build() {
+ cd "${srcdir}/ex-${pkgver}"
+
+ patch -Np1 -i ../navkeys.patch
+ patch -Np0 -i ../increase-tube.patch
+ # FS#20653
+ patch -Np1 -i ../preserve_dir.patch
+
+ make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \
+ 'FEATURES=-DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8' TERMLIB=ncurses
+}
+
+package() {
+ cd "${srcdir}/ex-${pkgver}"
+
+ make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex
INSTALL=/usr/bin/install \
+ DESTDIR="$pkgdir" install
+
+ install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Deleted: core-x86_64/exrc.sample
===================================================================
--- core-x86_64/exrc.sample 2012-11-20 03:07:17 UTC (rev 171606)
+++ core-x86_64/exrc.sample 2012-11-20 05:26:38 UTC (rev 171607)
@@ -1,5 +0,0 @@
-" A sample .exrc file. Copy it to your home dir as ~/.exrc in order to work.
-set showmode
-set noflash
-set autoindent
-set shiftwidth=2
Deleted: core-x86_64/increase-tube.patch
===================================================================
--- core-x86_64/increase-tube.patch 2012-11-20 03:07:17 UTC (rev 171606)
+++ core-x86_64/increase-tube.patch 2012-11-20 05:26:38 UTC (rev 171607)
@@ -1,13 +0,0 @@
---- config.h 2005-02-19 05:25:39.000000000 -0500
-+++ config.h.fixed 2010-01-04 22:02:01.000000000 -0500
-@@ -95,8 +95,8 @@
- #define TUBESIZE 6000 /* Maximum screen size for visual */
- #else /* VMUNIX */
- #define TUBELINES 100
--#define TUBECOLS 160
--#define TUBESIZE 16000
-+#define TUBECOLS 320
-+#define TUBESIZE 32000
- #endif /* VMUNIX */
-
- /*
Copied: vi/repos/core-x86_64/increase-tube.patch (from rev 171606,
vi/repos/testing-x86_64/increase-tube.patch)
===================================================================
--- core-x86_64/increase-tube.patch (rev 0)
+++ core-x86_64/increase-tube.patch 2012-11-20 05:26:38 UTC (rev 171607)
@@ -0,0 +1,13 @@
+--- config.h 2005-02-19 05:25:39.000000000 -0500
++++ config.h.fixed 2010-01-04 22:02:01.000000000 -0500
+@@ -95,8 +95,8 @@
+ #define TUBESIZE 6000 /* Maximum screen size for visual */
+ #else /* VMUNIX */
+ #define TUBELINES 100
+-#define TUBECOLS 160
+-#define TUBESIZE 16000
++#define TUBECOLS 320
++#define TUBESIZE 32000
+ #endif /* VMUNIX */
+
+ /*
Deleted: core-x86_64/navkeys.patch
===================================================================
--- core-x86_64/navkeys.patch 2012-11-20 03:07:17 UTC (rev 171606)
+++ core-x86_64/navkeys.patch 2012-11-20 05:26:38 UTC (rev 171607)
@@ -1,55 +0,0 @@
-diff -ru ex-050325/ex_tty.c ex-050325-du/ex_tty.c
---- ex-050325/ex_tty.c 2005-03-04 13:42:58.000000000 +0100
-+++ ex-050325-du/ex_tty.c 2009-06-25 20:06:57.000000000 +0200
-@@ -132,7 +132,8 @@
- &ED, &EI, &F0, &F1, &F2, &F3, &F4, &F5, &F6, &F7, &F8, &F9,
- &HO, &IC, &IM, &IP, &KD, &KE, &KH, &KL, &KR, &KS, &KU, &LL, &ND, &xNL,
- &xPC, &RC, &SC, &SE, &SF, &SO, &SR, &TA, &TE, &TI, &UP, &VB, &VS, &VE,
-- &AL_PARM, &DL_PARM, &UP_PARM, &DOWN_PARM, &LEFT_PARM, &RIGHT_PARM
-+ &AL_PARM, &DL_PARM, &UP_PARM, &DOWN_PARM, &LEFT_PARM, &RIGHT_PARM,
-+ &kI, &kD, &kh, &at7, &kP, &kN
- };
- bool *sflags[] = {
- &AM, &BS, &DA, &DB, &EO, &HC,
-@@ -170,7 +171,12 @@
- addmac1(KD, "j", "down", arrows, 1);
- addmac1(KL, "h", "left", arrows, 1);
- addmac1(KR, "l", "right", arrows, 1);
-- addmac1(KH, "H", "home", arrows, 1);
-+ addmac1(kI, "i", "insert", arrows, 1);
-+ addmac1(kD, "x", "delete", arrows, 1);
-+ addmac1(kh, "^", "home", arrows, 1);
-+ addmac1(at7, "$", "end", arrows, 1);
-+ addmac1(kP, "", "pgup", arrows, 1);
-+ addmac1(kN, "", "pgdn", arrows, 1);
-
- /*
- * Handle funny termcap capabilities
-@@ -341,7 +347,7 @@
- *(*fp++) = flag;
- namp += 2;
- } while (*namp);
-- namp =
"albcbtcdceclcmcrcsdcdldmdoedeik0k1k2k3k4k5k6k7k8k9hoicimipkdkekhklkrkskullndnlpcrcscsesfsosrtatetiupvbvsveALDLUPDOLERI";
-+ namp =
"albcbtcdceclcmcrcsdcdldmdoedeik0k1k2k3k4k5k6k7k8k9hoicimipkdkekhklkrkskullndnlpcrcscsesfsosrtatetiupvbvsveALDLUPDOLERIkIkDkh@7kPkN";
- sp = sstrs;
- do {
- string = tgetstr(namp, &aoftspace);
-diff -ru ex-050325/ex_tty.h ex-050325-du/ex_tty.h
---- ex-050325/ex_tty.h 2004-12-01 19:21:06.000000000 +0100
-+++ ex-050325-du/ex_tty.h 2009-06-25 20:06:05.000000000 +0200
-@@ -183,6 +183,15 @@
- var bool XX; /* Tektronix 4025 insert line */
- /* X? is reserved for severely nauseous glitches */
- /* If there are enough of these we may need bit masks! */
-+/*
-+ * Insert, Delete, Home, End, PgUp an PgDown keys
-+ */
-+var char *kI;
-+var char *kD;
-+var char *kh;
-+var char *at7;
-+var char *kP;
-+var char *kN;
-
- /*
- * From the tty modes...
Copied: vi/repos/core-x86_64/navkeys.patch (from rev 171606,
vi/repos/testing-x86_64/navkeys.patch)
===================================================================
--- core-x86_64/navkeys.patch (rev 0)
+++ core-x86_64/navkeys.patch 2012-11-20 05:26:38 UTC (rev 171607)
@@ -0,0 +1,55 @@
+diff -ru ex-050325/ex_tty.c ex-050325-du/ex_tty.c
+--- ex-050325/ex_tty.c 2005-03-04 13:42:58.000000000 +0100
++++ ex-050325-du/ex_tty.c 2009-06-25 20:06:57.000000000 +0200
+@@ -132,7 +132,8 @@
+ &ED, &EI, &F0, &F1, &F2, &F3, &F4, &F5, &F6, &F7, &F8, &F9,
+ &HO, &IC, &IM, &IP, &KD, &KE, &KH, &KL, &KR, &KS, &KU, &LL, &ND, &xNL,
+ &xPC, &RC, &SC, &SE, &SF, &SO, &SR, &TA, &TE, &TI, &UP, &VB, &VS, &VE,
+- &AL_PARM, &DL_PARM, &UP_PARM, &DOWN_PARM, &LEFT_PARM, &RIGHT_PARM
++ &AL_PARM, &DL_PARM, &UP_PARM, &DOWN_PARM, &LEFT_PARM, &RIGHT_PARM,
++ &kI, &kD, &kh, &at7, &kP, &kN
+ };
+ bool *sflags[] = {
+ &AM, &BS, &DA, &DB, &EO, &HC,
+@@ -170,7 +171,12 @@
+ addmac1(KD, "j", "down", arrows, 1);
+ addmac1(KL, "h", "left", arrows, 1);
+ addmac1(KR, "l", "right", arrows, 1);
+- addmac1(KH, "H", "home", arrows, 1);
++ addmac1(kI, "i", "insert", arrows, 1);
++ addmac1(kD, "x", "delete", arrows, 1);
++ addmac1(kh, "^", "home", arrows, 1);
++ addmac1(at7, "$", "end", arrows, 1);
++ addmac1(kP, "", "pgup", arrows, 1);
++ addmac1(kN, "", "pgdn", arrows, 1);
+
+ /*
+ * Handle funny termcap capabilities
+@@ -341,7 +347,7 @@
+ *(*fp++) = flag;
+ namp += 2;
+ } while (*namp);
+- namp =
"albcbtcdceclcmcrcsdcdldmdoedeik0k1k2k3k4k5k6k7k8k9hoicimipkdkekhklkrkskullndnlpcrcscsesfsosrtatetiupvbvsveALDLUPDOLERI";
++ namp =
"albcbtcdceclcmcrcsdcdldmdoedeik0k1k2k3k4k5k6k7k8k9hoicimipkdkekhklkrkskullndnlpcrcscsesfsosrtatetiupvbvsveALDLUPDOLERIkIkDkh@7kPkN";
+ sp = sstrs;
+ do {
+ string = tgetstr(namp, &aoftspace);
+diff -ru ex-050325/ex_tty.h ex-050325-du/ex_tty.h
+--- ex-050325/ex_tty.h 2004-12-01 19:21:06.000000000 +0100
++++ ex-050325-du/ex_tty.h 2009-06-25 20:06:05.000000000 +0200
+@@ -183,6 +183,15 @@
+ var bool XX; /* Tektronix 4025 insert line */
+ /* X? is reserved for severely nauseous glitches */
+ /* If there are enough of these we may need bit masks! */
++/*
++ * Insert, Delete, Home, End, PgUp an PgDown keys
++ */
++var char *kI;
++var char *kD;
++var char *kh;
++var char *at7;
++var char *kP;
++var char *kN;
+
+ /*
+ * From the tty modes...
Deleted: core-x86_64/preserve_dir.patch
===================================================================
--- core-x86_64/preserve_dir.patch 2012-11-20 03:07:17 UTC (rev 171606)
+++ core-x86_64/preserve_dir.patch 2012-11-20 05:26:38 UTC (rev 171607)
@@ -1,81 +0,0 @@
-diff -Naur ex-050325.ori/ex.1 ex-050325/ex.1
---- ex-050325.ori/ex.1 2005-02-17 07:39:36.000000000 -0500
-+++ ex-050325/ex.1 2011-02-01 16:21:51.496666674 -0500
-@@ -1950,7 +1950,7 @@
- .B /var/tmp/Rx\fInnnnnnnnnn\fP
- named buffer temporary
- .TP
--.B /var/preserve
-+.B /var/lib/ex
- preservation directory
- .SH DOCUMENTATION
- The document
-diff -Naur ex-050325.ori/expreserve.c ex-050325/expreserve.c
---- ex-050325.ori/expreserve.c 2005-03-04 07:44:46.000000000 -0500
-+++ ex-050325/expreserve.c 2011-02-01 16:22:06.583333342 -0500
-@@ -272,7 +272,7 @@
- #ifdef notdef
- char pattern[] = "/usr/preserve/Exaa`XXXXX";
- #else
--char pattern[] = "/var/preserve/Exa`XXXXXXXXXX";
-+char pattern[] = "/var/lib/ex/Exa`XXXXXXXXXX";
- #endif
-
- /*
-@@ -296,7 +296,7 @@
- timestamp = ctime(&time);
- timestamp[16] = 0; /* blast from seconds on */
- putenv("MAILRC=/dev/null");
-- sprintf(cmd, "/bin/mail %s", pp->pw_name);
-+ sprintf(cmd, "/usr/bin/mail %s", pp->pw_name);
- setuid(getuid());
- mf = popen(cmd, "w");
- if (mf == NULL)
-diff -Naur ex-050325.ori/exrecover.c ex-050325/exrecover.c
---- ex-050325.ori/exrecover.c 2005-03-04 07:44:46.000000000 -0500
-+++ ex-050325/exrecover.c 2011-02-01 16:21:51.496666674 -0500
-@@ -167,7 +167,7 @@
- #ifdef notdef
- char mydir[] = "/usr/preserve";
- #else
--char mydir[] = "/var/preserve";
-+char mydir[] = "/var/lib/ex";
- #endif
-
- /*
-diff -Naur ex-050325.ori/ex.spec ex-050325/ex.spec
---- ex-050325.ori/ex.spec 2005-03-24 18:50:09.000000000 -0500
-+++ ex-050325/ex.spec 2011-02-01 16:21:51.496666674 -0500
-@@ -20,7 +20,7 @@
- %define libexecdir %{prefix}/5lib
- %define mandir %{prefix}/share/man/5man
-
--%define preservedir /var/preserve
-+%define preservedir /var/lib/ex
-
- # install command
- %define ucbinstall install
-diff -Naur ex-050325.ori/Makefile ex-050325/Makefile
---- ex-050325.ori/Makefile 2005-03-24 18:50:09.000000000 -0500
-+++ ex-050325/Makefile 2011-02-01 16:21:51.496666674 -0500
-@@ -83,7 +83,7 @@
- BINDIR = $(PREFIX)/bin
- LIBEXECDIR = $(PREFIX)/libexec
- MANDIR = $(PREFIX)/share/man
--PRESERVEDIR = /var/preserve
-+PRESERVEDIR = /var/lib/ex
-
- #
- # DESTDIR is prepended to the installation paths. It is mostly useful
-diff -Naur ex-050325.ori/vi.1 ex-050325/vi.1
---- ex-050325.ori/vi.1 2005-02-17 07:39:36.000000000 -0500
-+++ ex-050325/vi.1 2011-02-01 16:21:51.496666674 -0500
-@@ -979,7 +979,7 @@
- .B /var/tmp/Rx\fInnnnnnnnnn\fP
- named buffer temporary
- .TP
--.B /var/preserve
-+.B /var/lib/ex
- preservation directory
- .SH SEE ALSO
- ex(1),
Copied: vi/repos/core-x86_64/preserve_dir.patch (from rev 171606,
vi/repos/testing-x86_64/preserve_dir.patch)
===================================================================
--- core-x86_64/preserve_dir.patch (rev 0)
+++ core-x86_64/preserve_dir.patch 2012-11-20 05:26:38 UTC (rev 171607)
@@ -0,0 +1,99 @@
+diff -Naur ex-050325.ori/ex.1 ex-050325/ex.1
+--- ex-050325.ori/ex.1 2005-02-17 07:39:36.000000000 -0500
++++ ex-050325/ex.1 2011-02-01 16:21:51.496666674 -0500
+@@ -1950,7 +1950,7 @@
+ .B /var/tmp/Rx\fInnnnnnnnnn\fP
+ named buffer temporary
+ .TP
+-.B /var/preserve
++.B /var/lib/ex
+ preservation directory
+ .SH DOCUMENTATION
+ The document
+diff -Naur ex-050325.ori/expreserve.c ex-050325/expreserve.c
+--- ex-050325.ori/expreserve.c 2005-03-04 07:44:46.000000000 -0500
++++ ex-050325/expreserve.c 2011-02-01 16:22:06.583333342 -0500
+@@ -272,7 +272,7 @@
+ #ifdef notdef
+ char pattern[] = "/usr/preserve/Exaa`XXXXX";
+ #else
+-char pattern[] = "/var/preserve/Exa`XXXXXXXXXX";
++char pattern[] = "/var/lib/ex/Exa`XXXXXXXXXX";
+ #endif
+
+ /*
+@@ -296,7 +296,7 @@
+ timestamp = ctime(&time);
+ timestamp[16] = 0; /* blast from seconds on */
+ putenv("MAILRC=/dev/null");
+- sprintf(cmd, "/bin/mail %s", pp->pw_name);
++ sprintf(cmd, "/usr/bin/mail %s", pp->pw_name);
+ setuid(getuid());
+ mf = popen(cmd, "w");
+ if (mf == NULL)
+diff -Naur ex-050325.ori/exrecover.c ex-050325/exrecover.c
+--- ex-050325.ori/exrecover.c 2005-03-04 07:44:46.000000000 -0500
++++ ex-050325/exrecover.c 2011-02-01 16:21:51.496666674 -0500
+@@ -167,7 +167,7 @@
+ #ifdef notdef
+ char mydir[] = "/usr/preserve";
+ #else
+-char mydir[] = "/var/preserve";
++char mydir[] = "/var/lib/ex";
+ #endif
+
+ /*
+diff -Naur ex-050325.ori/Makefile ex-050325/Makefile
+--- ex-050325.ori/Makefile 2005-03-24 18:50:09.000000000 -0500
++++ ex-050325/Makefile 2011-02-01 16:21:51.496666674 -0500
+@@ -83,7 +83,7 @@
+ BINDIR = $(PREFIX)/bin
+ LIBEXECDIR = $(PREFIX)/libexec
+ MANDIR = $(PREFIX)/share/man
+-PRESERVEDIR = /var/preserve
++PRESERVEDIR = /var/lib/ex
+
+ #
+ # DESTDIR is prepended to the installation paths. It is mostly useful
+diff -Naur ex-050325.ori/vi.1 ex-050325/vi.1
+--- ex-050325.ori/vi.1 2005-02-17 07:39:36.000000000 -0500
++++ ex-050325/vi.1 2011-02-01 16:21:51.496666674 -0500
+@@ -979,7 +979,7 @@
+ .B /var/tmp/Rx\fInnnnnnnnnn\fP
+ named buffer temporary
+ .TP
+-.B /var/preserve
++.B /var/lib/ex
+ preservation directory
+ .SH SEE ALSO
+ ex(1),
+--- ex-050325.original/ex.1 2012-01-27 20:43:00.602119283 +0100
++++ ex-050325/ex.1 2012-01-27 20:47:24.535436516 +0100
+@@ -1932,10 +1932,10 @@
+ Determines the terminal type.
+ .SH FILES
+ .TP
+-.B /usr/libexec/expreserve
++.B /usr/lib/ex/expreserve
+ preserve command
+ .TP
+-.B /usr/libexec/exrecover
++.B /usr/lib/ex/exrecover
+ recover command
+ .TP
+ .B /etc/termcap
+--- ex-050325.original/vi.1 2012-01-27 20:43:00.602119283 +0100
++++ ex-050325/vi.1 2012-01-27 20:46:33.815439611 +0100
+@@ -961,10 +961,10 @@
+ Determines the terminal type.
+ .SH FILES
+ .TP
+-.B /usr/libexec/expreserve
++.B /usr/lib/ex/expreserve
+ preserve command
+ .TP
+-.B /usr/libexec/exrecover
++.B /usr/lib/ex/exrecover
+ recover command
+ .TP
+ .B /etc/termcap
