diff options
| author | root <root@rshg054.dnsready.net> | 2012-11-21 01:32:11 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-11-21 01:32:11 -0800 |
| commit | f48f6c82e23a3bacb8a0952c2d2cf9af1e6bf42d (patch) | |
| tree | d578e4bdc10acc78968e3e5cdfce8dcd0289a60d /core/vi | |
| parent | 0a05643b928d724c048e4306955642d91f24d33c (diff) | |
Wed Nov 21 01:32:09 PST 2012
Diffstat (limited to 'core/vi')
| -rw-r--r-- | core/vi/PKGBUILD | 11 | ||||
| -rw-r--r-- | core/vi/preserve_dir.patch | 42 |
2 files changed, 34 insertions, 19 deletions
diff --git a/core/vi/PKGBUILD b/core/vi/PKGBUILD index 0a5c7f815..cb27b8820 100644 --- a/core/vi/PKGBUILD +++ b/core/vi/PKGBUILD @@ -1,33 +1,30 @@ -# $Id: PKGBUILD 160405 2012-06-01 18:35:53Z eric $ +# $Id: PKGBUILD 171607 2012-11-20 05:26:38Z eric $ # Maintainer: tobias [ tobias at archlinux org ] pkgname=vi pkgver=050325 -pkgrel=2 +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=('mailx: used by the preserve command for notification') +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 - exrc.sample navkeys.patch increase-tube.patch preserve_dir.patch) md5sums=('e668595254233e4d96811083a3e4e2f3' - 'd3b483c994d859232ce369b82a4b5668' 'aac133930047eafa4f28736cfaf976b3' 'e596e05a00a24187b576e389fa1de45d' - '419a8755e0dd16e95542bc107e6d2b24') + '8c6d3503e7c41a4413145ae49a7f2b80') build() { cd "${srcdir}/ex-${pkgver}" - # apply patches patch -Np1 -i ../navkeys.patch patch -Np0 -i ../increase-tube.patch # FS#20653 diff --git a/core/vi/preserve_dir.patch b/core/vi/preserve_dir.patch index 5209f7b02..ddfe8783a 100644 --- a/core/vi/preserve_dir.patch +++ b/core/vi/preserve_dir.patch @@ -43,18 +43,6 @@ diff -Naur ex-050325.ori/exrecover.c ex-050325/exrecover.c #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 @@ -79,3 +67,33 @@ diff -Naur ex-050325.ori/vi.1 ex-050325/vi.1 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 |