[arch-commits] Commit in vi/trunk (PKGBUILD exrc.sample preserve_dir.patch)

[Eric Bélanger]

    Date: Friday, November 16, 2012 @ 13:41:19
  Author: eric
Revision: 171123

upgpkg: vi 1:050325-3

Update preserve_dir.patch to fix man pages (close FS#28133), Remove unused exrc.sample file

Modified:
  vi/trunk/PKGBUILD
  vi/trunk/preserve_dir.patch
Deleted:
  vi/trunk/exrc.sample

--------------------+
 PKGBUILD           |    6 ++----
 exrc.sample        |    5 -----
 preserve_dir.patch |   42 ++++++++++++++++++++++++++++++------------
 3 files changed, 32 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-11-16 18:26:14 UTC (rev 171122)
+++ PKGBUILD	2012-11-16 18:41:19 UTC (rev 171123)
@@ -3,7 +3,7 @@
 
 pkgname=vi
 pkgver=050325
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc='The original ex/vi text editor.'
 arch=('i686' 'x86_64')
@@ -14,15 +14,13 @@
 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}"

Deleted: exrc.sample
===================================================================
--- exrc.sample	2012-11-16 18:26:14 UTC (rev 171122)
+++ exrc.sample	2012-11-16 18:41:19 UTC (rev 171123)
@@ -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

Modified: preserve_dir.patch
===================================================================
--- preserve_dir.patch	2012-11-16 18:26:14 UTC (rev 171122)
+++ preserve_dir.patch	2012-11-16 18:41:19 UTC (rev 171123)
@@ -43,18 +43,6 @@
  #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 @@
  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