[arch-commits] Commit in vi/trunk (PKGBUILD)

2019-11-13 Thread Evangelos Foutras via arch-commits
Date: Wednesday, November 13, 2019 @ 18:09:43
  Author: foutrelis
Revision: 368446

[core] mass rebuild

Modified:
  vi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-13 18:09:09 UTC (rev 368445)
+++ PKGBUILD2019-11-13 18:09:43 UTC (rev 368446)
@@ -3,7 +3,7 @@
 
 pkgname=vi
 pkgver=070224
-pkgrel=3
+pkgrel=4
 epoch=1
 pkgdesc="The original ex/vi text editor"
 arch=('x86_64')


[arch-commits] Commit in vi/repos (5 files)

2019-11-13 Thread Evangelos Foutras via arch-commits
Date: Wednesday, November 13, 2019 @ 18:09:49
  Author: foutrelis
Revision: 368447

archrelease: copy trunk to staging-x86_64

Added:
  vi/repos/staging-x86_64/
  vi/repos/staging-x86_64/PKGBUILD
(from rev 368446, vi/trunk/PKGBUILD)
  vi/repos/staging-x86_64/fix-tubesize-short-overflow.patch
(from rev 368446, vi/trunk/fix-tubesize-short-overflow.patch)
  vi/repos/staging-x86_64/navkeys.patch
(from rev 368446, vi/trunk/navkeys.patch)
  vi/repos/staging-x86_64/preserve-dir.patch
(from rev 368446, vi/trunk/preserve-dir.patch)

---+
 PKGBUILD  |   50 ++
 fix-tubesize-short-overflow.patch |   12 
 navkeys.patch |   55 
 preserve-dir.patch|   99 
 4 files changed, 216 insertions(+)

Copied: vi/repos/staging-x86_64/PKGBUILD (from rev 368446, vi/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-11-13 18:09:49 UTC (rev 368447)
@@ -0,0 +1,50 @@
+# Maintainer: Evangelos Foutras 
+# Contributor: Eric Bélanger 
+
+pkgname=vi
+pkgver=070224
+pkgrel=4
+epoch=1
+pkgdesc="The original ex/vi text editor"
+arch=('x86_64')
+url="http://ex-vi.sourceforge.net/;
+license=('custom:ex')
+depends=('ncurses')
+optdepends=('s-nail: used by the preserve command for notification')
+source=(https://sources.archlinux.org/other/$pkgname/ex-$pkgver.tar.xz{,.sig}
+fix-tubesize-short-overflow.patch
+navkeys.patch
+preserve-dir.patch)
+sha256sums=('c3e52dd44edd1f6bf0b52207f717c56149dc50aac0d131fff3851d589727f52f'
+'SKIP'
+'42167fabebe30a13d594346b1d254db82090ba41742a9f35b8895d37092053f0'
+'0e9e2d381f1d8cb86daae68462b3849825b003c08007725c0db9939d3d5bf58d'
+'f0ef9ed2ccea98bf47b08dd3faa2abb911b4e6c0579f5294e9d0e8742282ff65')
+validpgpkeys=('86CFFCA918CF3AF47147588051E8B148AC34')
+
+prepare() {
+  cd ex-$pkgver
+
+  patch -Np1 -i ../fix-tubesize-short-overflow.patch
+  patch -Np1 -i ../navkeys.patch
+
+  # https://bugs.archlinux.org/task/20653
+  patch -Np1 -i ../preserve-dir.patch
+}
+
+build() {
+  cd ex-$pkgver
+
+  make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \
+TERMLIB=ncurses FEATURES="-DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8"
+}
+
+package() {
+  cd ex-$pkgver
+
+  make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \
+INSTALL=/usr/bin/install DESTDIR="$pkgdir" install
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:

Copied: vi/repos/staging-x86_64/fix-tubesize-short-overflow.patch (from rev 
368446, vi/trunk/fix-tubesize-short-overflow.patch)
===
--- staging-x86_64/fix-tubesize-short-overflow.patch
(rev 0)
+++ staging-x86_64/fix-tubesize-short-overflow.patch2019-11-13 18:09:49 UTC 
(rev 368447)
@@ -0,0 +1,12 @@
+diff -upr ex-070224.orig/ex_vis.h ex-070224/ex_vis.h
+--- ex-070224.orig/ex_vis.h2005-08-06 14:41:15.0 +0300
 ex-070224/ex_vis.h 2015-05-02 20:41:13.938665281 +0300
+@@ -104,7 +104,7 @@ var enum {
+  */
+ var   short   TUBELINES;
+ var   short   TUBECOLS;
+-var   short   TUBESIZE;
++var   int TUBESIZE;
+ 
+ /*
+  * The screen in visual and crtopen is of varying size; the basic

Copied: vi/repos/staging-x86_64/navkeys.patch (from rev 368446, 
vi/trunk/navkeys.patch)
===
--- staging-x86_64/navkeys.patch(rev 0)
+++ staging-x86_64/navkeys.patch2019-11-13 18:09:49 UTC (rev 368447)
@@ -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.0 +0100
 ex-050325-du/ex_tty.c  2009-06-25 20:06:57.0 +0200
+@@ -132,7 +132,8 @@
+   , , , , , , , , , , , ,
+   , , , , , , , , , , , , , ,
+   , , , , , , , , , , , , , ,
+-  _PARM, _PARM, _PARM, _PARM, _PARM, _PARM
++  _PARM, _PARM, _PARM, _PARM, _PARM, _PARM,
++  , , , , , 
+ };
+ bool *sflags[] = {
+   , , , , , ,
+@@ -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 = 

[arch-commits] Commit in vi/trunk (PKGBUILD)

2019-10-12 Thread Evangelos Foutras via arch-commits
Date: Saturday, October 12, 2019 @ 23:13:42
  Author: foutrelis
Revision: 364774

Remove from base group

Modified:
  vi/trunk/PKGBUILD

--+
 PKGBUILD |1 -
 1 file changed, 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-12 22:20:21 UTC (rev 364773)
+++ PKGBUILD2019-10-12 23:13:42 UTC (rev 364774)
@@ -9,7 +9,6 @@
 arch=('x86_64')
 url="http://ex-vi.sourceforge.net/;
 license=('custom:ex')
-groups=('base')
 depends=('ncurses')
 optdepends=('s-nail: used by the preserve command for notification')
 source=(https://sources.archlinux.org/other/$pkgname/ex-$pkgver.tar.xz{,.sig}


[arch-commits] Commit in vi/repos (5 files)

2018-06-03 Thread Evangelos Foutras via arch-commits
Date: Monday, June 4, 2018 @ 04:13:23
  Author: foutrelis
Revision: 325754

archrelease: copy trunk to testing-x86_64

Added:
  vi/repos/testing-x86_64/
  vi/repos/testing-x86_64/PKGBUILD
(from rev 325753, vi/trunk/PKGBUILD)
  vi/repos/testing-x86_64/fix-tubesize-short-overflow.patch
(from rev 325753, vi/trunk/fix-tubesize-short-overflow.patch)
  vi/repos/testing-x86_64/navkeys.patch
(from rev 325753, vi/trunk/navkeys.patch)
  vi/repos/testing-x86_64/preserve-dir.patch
(from rev 325753, vi/trunk/preserve-dir.patch)

---+
 PKGBUILD  |   52 ++
 fix-tubesize-short-overflow.patch |   12 
 navkeys.patch |   55 
 preserve-dir.patch|   99 
 4 files changed, 218 insertions(+)

Copied: vi/repos/testing-x86_64/PKGBUILD (from rev 325753, vi/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2018-06-04 04:13:23 UTC (rev 325754)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Evangelos Foutras 
+# Contributor: Eric Bélanger 
+
+pkgname=vi
+pkgver=070224
+pkgrel=3
+epoch=1
+pkgdesc="The original ex/vi text editor"
+arch=('x86_64')
+url="http://ex-vi.sourceforge.net/;
+license=('custom:ex')
+groups=('base')
+depends=('ncurses')
+optdepends=('s-nail: used by the preserve command for notification')
+source=(https://sources.archlinux.org/other/$pkgname/ex-$pkgver.tar.xz{,.sig}
+fix-tubesize-short-overflow.patch
+navkeys.patch
+preserve-dir.patch)
+sha256sums=('c3e52dd44edd1f6bf0b52207f717c56149dc50aac0d131fff3851d589727f52f'
+'SKIP'
+'42167fabebe30a13d594346b1d254db82090ba41742a9f35b8895d37092053f0'
+'0e9e2d381f1d8cb86daae68462b3849825b003c08007725c0db9939d3d5bf58d'
+'f0ef9ed2ccea98bf47b08dd3faa2abb911b4e6c0579f5294e9d0e8742282ff65')
+validpgpkeys=('86CFFCA918CF3AF47147588051E8B148AC34')
+
+prepare() {
+  cd ex-$pkgver
+
+  patch -Np1 -i ../fix-tubesize-short-overflow.patch
+  patch -Np1 -i ../navkeys.patch
+
+  # https://bugs.archlinux.org/task/20653
+  patch -Np1 -i ../preserve-dir.patch
+}
+
+build() {
+  cd ex-$pkgver
+
+  make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \
+TERMLIB=ncurses FEATURES="-DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8"
+}
+
+package() {
+  cd ex-$pkgver
+
+  make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \
+INSTALL=/usr/bin/install DESTDIR="$pkgdir" install
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:

Copied: vi/repos/testing-x86_64/fix-tubesize-short-overflow.patch (from rev 
325753, vi/trunk/fix-tubesize-short-overflow.patch)
===
--- testing-x86_64/fix-tubesize-short-overflow.patch
(rev 0)
+++ testing-x86_64/fix-tubesize-short-overflow.patch2018-06-04 04:13:23 UTC 
(rev 325754)
@@ -0,0 +1,12 @@
+diff -upr ex-070224.orig/ex_vis.h ex-070224/ex_vis.h
+--- ex-070224.orig/ex_vis.h2005-08-06 14:41:15.0 +0300
 ex-070224/ex_vis.h 2015-05-02 20:41:13.938665281 +0300
+@@ -104,7 +104,7 @@ var enum {
+  */
+ var   short   TUBELINES;
+ var   short   TUBECOLS;
+-var   short   TUBESIZE;
++var   int TUBESIZE;
+ 
+ /*
+  * The screen in visual and crtopen is of varying size; the basic

Copied: vi/repos/testing-x86_64/navkeys.patch (from rev 325753, 
vi/trunk/navkeys.patch)
===
--- testing-x86_64/navkeys.patch(rev 0)
+++ testing-x86_64/navkeys.patch2018-06-04 04:13:23 UTC (rev 325754)
@@ -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.0 +0100
 ex-050325-du/ex_tty.c  2009-06-25 20:06:57.0 +0200
+@@ -132,7 +132,8 @@
+   , , , , , , , , , , , ,
+   , , , , , , , , , , , , , ,
+   , , , , , , , , , , , , , ,
+-  _PARM, _PARM, _PARM, _PARM, _PARM, _PARM
++  _PARM, _PARM, _PARM, _PARM, _PARM, _PARM,
++  , , , , , 
+ };
+ bool *sflags[] = {
+   , , , , , ,
+@@ -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 = 

[arch-commits] Commit in vi/trunk (PKGBUILD)

2018-06-03 Thread Evangelos Foutras via arch-commits
Date: Monday, June 4, 2018 @ 04:13:15
  Author: foutrelis
Revision: 325753

upgpkg: vi 1:070224-3

.BUILDINFO rebuild

Modified:
  vi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-06-04 04:12:29 UTC (rev 325752)
+++ PKGBUILD2018-06-04 04:13:15 UTC (rev 325753)
@@ -4,7 +4,7 @@
 
 pkgname=vi
 pkgver=070224
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc="The original ex/vi text editor"
 arch=('x86_64')


[arch-commits] Commit in vi/trunk (PKGBUILD)

2015-09-06 Thread Evangelos Foutras
Date: Sunday, September 6, 2015 @ 21:34:19
  Author: foutrelis
Revision: 245395

ncurses 6.0 rebuild.

Modified:
  vi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-06 19:31:05 UTC (rev 245394)
+++ PKGBUILD2015-09-06 19:34:19 UTC (rev 245395)
@@ -4,7 +4,7 @@
 
 pkgname=vi
 pkgver=070224
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="The original ex/vi text editor"
 arch=('i686' 'x86_64')


[arch-commits] Commit in vi/repos (10 files)

2015-09-06 Thread Evangelos Foutras
Date: Sunday, September 6, 2015 @ 21:34:38
  Author: foutrelis
Revision: 245396

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  vi/repos/staging-i686/
  vi/repos/staging-i686/PKGBUILD
(from rev 245395, vi/trunk/PKGBUILD)
  vi/repos/staging-i686/fix-tubesize-short-overflow.patch
(from rev 245395, vi/trunk/fix-tubesize-short-overflow.patch)
  vi/repos/staging-i686/navkeys.patch
(from rev 245395, vi/trunk/navkeys.patch)
  vi/repos/staging-i686/preserve-dir.patch
(from rev 245395, vi/trunk/preserve-dir.patch)
  vi/repos/staging-x86_64/
  vi/repos/staging-x86_64/PKGBUILD
(from rev 245395, vi/trunk/PKGBUILD)
  vi/repos/staging-x86_64/fix-tubesize-short-overflow.patch
(from rev 245395, vi/trunk/fix-tubesize-short-overflow.patch)
  vi/repos/staging-x86_64/navkeys.patch
(from rev 245395, vi/trunk/navkeys.patch)
  vi/repos/staging-x86_64/preserve-dir.patch
(from rev 245395, vi/trunk/preserve-dir.patch)

--+
 staging-i686/PKGBUILD|   52 +++
 staging-i686/fix-tubesize-short-overflow.patch   |   12 ++
 staging-i686/navkeys.patch   |   55 +++
 staging-i686/preserve-dir.patch  |   99 +
 staging-x86_64/PKGBUILD  |   52 +++
 staging-x86_64/fix-tubesize-short-overflow.patch |   12 ++
 staging-x86_64/navkeys.patch |   55 +++
 staging-x86_64/preserve-dir.patch|   99 +
 8 files changed, 436 insertions(+)

Copied: vi/repos/staging-i686/PKGBUILD (from rev 245395, vi/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2015-09-06 19:34:38 UTC (rev 245396)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Evangelos Foutras 
+# Contributor: Eric Bélanger 
+
+pkgname=vi
+pkgver=070224
+pkgrel=2
+epoch=1
+pkgdesc="The original ex/vi text editor"
+arch=('i686' 'x86_64')
+url="http://ex-vi.sourceforge.net/;
+license=('custom:ex')
+groups=('base')
+depends=('ncurses')
+optdepends=('s-nail: used by the preserve command for notification')
+source=(https://sources.archlinux.org/other/$pkgname/ex-$pkgver.tar.xz{,.sig}
+fix-tubesize-short-overflow.patch
+navkeys.patch
+preserve-dir.patch)
+sha256sums=('c3e52dd44edd1f6bf0b52207f717c56149dc50aac0d131fff3851d589727f52f'
+'SKIP'
+'42167fabebe30a13d594346b1d254db82090ba41742a9f35b8895d37092053f0'
+'0e9e2d381f1d8cb86daae68462b3849825b003c08007725c0db9939d3d5bf58d'
+'f0ef9ed2ccea98bf47b08dd3faa2abb911b4e6c0579f5294e9d0e8742282ff65')
+validpgpkeys=('86CFFCA918CF3AF47147588051E8B148AC34')
+
+prepare() {
+  cd ex-$pkgver
+
+  patch -Np1 -i ../fix-tubesize-short-overflow.patch
+  patch -Np1 -i ../navkeys.patch
+
+  # https://bugs.archlinux.org/task/20653
+  patch -Np1 -i ../preserve-dir.patch
+}
+
+build() {
+  cd ex-$pkgver
+
+  make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \
+TERMLIB=ncurses FEATURES="-DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8"
+}
+
+package() {
+  cd ex-$pkgver
+
+  make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \
+INSTALL=/usr/bin/install DESTDIR="$pkgdir" install
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:

Copied: vi/repos/staging-i686/fix-tubesize-short-overflow.patch (from rev 
245395, vi/trunk/fix-tubesize-short-overflow.patch)
===
--- staging-i686/fix-tubesize-short-overflow.patch  
(rev 0)
+++ staging-i686/fix-tubesize-short-overflow.patch  2015-09-06 19:34:38 UTC 
(rev 245396)
@@ -0,0 +1,12 @@
+diff -upr ex-070224.orig/ex_vis.h ex-070224/ex_vis.h
+--- ex-070224.orig/ex_vis.h2005-08-06 14:41:15.0 +0300
 ex-070224/ex_vis.h 2015-05-02 20:41:13.938665281 +0300
+@@ -104,7 +104,7 @@ var enum {
+  */
+ var   short   TUBELINES;
+ var   short   TUBECOLS;
+-var   short   TUBESIZE;
++var   int TUBESIZE;
+ 
+ /*
+  * The screen in visual and crtopen is of varying size; the basic

Copied: vi/repos/staging-i686/navkeys.patch (from rev 245395, 
vi/trunk/navkeys.patch)
===
--- staging-i686/navkeys.patch  (rev 0)
+++ staging-i686/navkeys.patch  2015-09-06 19:34:38 UTC (rev 245396)
@@ -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.0 +0100
 ex-050325-du/ex_tty.c  2009-06-25 20:06:57.0 +0200
+@@ -132,7 +132,8 @@
+   , , , , , , , , , , , ,
+   , , , , , , , , , , , , , ,
+   , , , , , , , , , , , , , ,
+-  _PARM, _PARM, _PARM, _PARM, _PARM, _PARM
++  _PARM, _PARM, 

[arch-commits] Commit in vi/repos (10 files)

2015-05-02 Thread Evangelos Foutras
Date: Saturday, May 2, 2015 @ 20:14:04
  Author: foutrelis
Revision: 238368

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  vi/repos/testing-i686/
  vi/repos/testing-i686/PKGBUILD
(from rev 238367, vi/trunk/PKGBUILD)
  vi/repos/testing-i686/fix-tubesize-short-overflow.patch
(from rev 238367, vi/trunk/fix-tubesize-short-overflow.patch)
  vi/repos/testing-i686/navkeys.patch
(from rev 238367, vi/trunk/navkeys.patch)
  vi/repos/testing-i686/preserve-dir.patch
(from rev 238367, vi/trunk/preserve-dir.patch)
  vi/repos/testing-x86_64/
  vi/repos/testing-x86_64/PKGBUILD
(from rev 238367, vi/trunk/PKGBUILD)
  vi/repos/testing-x86_64/fix-tubesize-short-overflow.patch
(from rev 238367, vi/trunk/fix-tubesize-short-overflow.patch)
  vi/repos/testing-x86_64/navkeys.patch
(from rev 238367, vi/trunk/navkeys.patch)
  vi/repos/testing-x86_64/preserve-dir.patch
(from rev 238367, vi/trunk/preserve-dir.patch)

--+
 testing-i686/PKGBUILD|   52 +++
 testing-i686/fix-tubesize-short-overflow.patch   |   12 ++
 testing-i686/navkeys.patch   |   55 +++
 testing-i686/preserve-dir.patch  |   99 +
 testing-x86_64/PKGBUILD  |   52 +++
 testing-x86_64/fix-tubesize-short-overflow.patch |   12 ++
 testing-x86_64/navkeys.patch |   55 +++
 testing-x86_64/preserve-dir.patch|   99 +
 8 files changed, 436 insertions(+)

Copied: vi/repos/testing-i686/PKGBUILD (from rev 238367, vi/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2015-05-02 18:14:04 UTC (rev 238368)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Evangelos Foutras evange...@foutrelis.com
+# Contributor: Eric Bélanger e...@archlinux.org
+
+pkgname=vi
+pkgver=070224
+pkgrel=1
+epoch=1
+pkgdesc=The original ex/vi text editor
+arch=('i686' 'x86_64')
+url=http://ex-vi.sourceforge.net/;
+license=('custom:ex')
+groups=('base')
+depends=('ncurses')
+optdepends=('s-nail: used by the preserve command for notification')
+source=(https://sources.archlinux.org/other/$pkgname/ex-$pkgver.tar.xz{,.sig}
+fix-tubesize-short-overflow.patch
+navkeys.patch
+preserve-dir.patch)
+sha256sums=('c3e52dd44edd1f6bf0b52207f717c56149dc50aac0d131fff3851d589727f52f'
+'SKIP'
+'42167fabebe30a13d594346b1d254db82090ba41742a9f35b8895d37092053f0'
+'0e9e2d381f1d8cb86daae68462b3849825b003c08007725c0db9939d3d5bf58d'
+'f0ef9ed2ccea98bf47b08dd3faa2abb911b4e6c0579f5294e9d0e8742282ff65')
+validpgpkeys=('86CFFCA918CF3AF47147588051E8B148AC34')
+
+prepare() {
+  cd ex-$pkgver
+
+  patch -Np1 -i ../fix-tubesize-short-overflow.patch
+  patch -Np1 -i ../navkeys.patch
+
+  # https://bugs.archlinux.org/task/20653
+  patch -Np1 -i ../preserve-dir.patch
+}
+
+build() {
+  cd ex-$pkgver
+
+  make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \
+TERMLIB=ncurses FEATURES=-DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8
+}
+
+package() {
+  cd ex-$pkgver
+
+  make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \
+INSTALL=/usr/bin/install DESTDIR=$pkgdir install
+  install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
+
+# vim:set ts=2 sw=2 et:

Copied: vi/repos/testing-i686/fix-tubesize-short-overflow.patch (from rev 
238367, vi/trunk/fix-tubesize-short-overflow.patch)
===
--- testing-i686/fix-tubesize-short-overflow.patch  
(rev 0)
+++ testing-i686/fix-tubesize-short-overflow.patch  2015-05-02 18:14:04 UTC 
(rev 238368)
@@ -0,0 +1,12 @@
+diff -upr ex-070224.orig/ex_vis.h ex-070224/ex_vis.h
+--- ex-070224.orig/ex_vis.h2005-08-06 14:41:15.0 +0300
 ex-070224/ex_vis.h 2015-05-02 20:41:13.938665281 +0300
+@@ -104,7 +104,7 @@ var enum {
+  */
+ var   short   TUBELINES;
+ var   short   TUBECOLS;
+-var   short   TUBESIZE;
++var   int TUBESIZE;
+ 
+ /*
+  * The screen in visual and crtopen is of varying size; the basic

Copied: vi/repos/testing-i686/navkeys.patch (from rev 238367, 
vi/trunk/navkeys.patch)
===
--- testing-i686/navkeys.patch  (rev 0)
+++ testing-i686/navkeys.patch  2015-05-02 18:14:04 UTC (rev 238368)
@@ -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.0 +0100
 ex-050325-du/ex_tty.c  2009-06-25 20:06:57.0 +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,
+- 

[arch-commits] Commit in vi/trunk (5 files)

2015-05-02 Thread Evangelos Foutras
Date: Saturday, May 2, 2015 @ 20:13:50
  Author: foutrelis
Revision: 238367

upgpkg: vi 1:070224-1

Bump to latest upstream CVS revision which has dynamically allocated
screen buffers, so that vi works on large screens (FS#44789).

Added:
  vi/trunk/fix-tubesize-short-overflow.patch
  vi/trunk/preserve-dir.patch
(from rev 238350, vi/trunk/preserve_dir.patch)
Modified:
  vi/trunk/PKGBUILD
Deleted:
  vi/trunk/increase-tube.patch
  vi/trunk/preserve_dir.patch

---+
 PKGBUILD  |   55 +++-
 fix-tubesize-short-overflow.patch |   12 
 increase-tube.patch   |   13 
 preserve-dir.patch|   99 
 preserve_dir.patch|   99 
 5 files changed, 143 insertions(+), 135 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-02 17:14:33 UTC (rev 238366)
+++ PKGBUILD2015-05-02 18:13:50 UTC (rev 238367)
@@ -1,43 +1,52 @@
 # $Id$
-# Maintainer: Eric Bélanger e...@archlinux.org
+# Maintainer: Evangelos Foutras evange...@foutrelis.com
+# Contributor: Eric Bélanger e...@archlinux.org
 
 pkgname=vi
-pkgver=050325
-pkgrel=4
+pkgver=070224
+pkgrel=1
 epoch=1
 pkgdesc=The original ex/vi text editor
 arch=('i686' 'x86_64')
 url=http://ex-vi.sourceforge.net/;
 license=('custom:ex')
+groups=('base')
 depends=('ncurses')
-optdepends=('heirloom-mailx: used by the preserve command for notification')
-groups=('base')
-source=(http://downloads.sourceforge.net/sourceforge/ex-vi/ex-${pkgver}.tar.bz2
+optdepends=('s-nail: used by the preserve command for notification')
+source=(https://sources.archlinux.org/other/$pkgname/ex-$pkgver.tar.xz{,.sig}
+fix-tubesize-short-overflow.patch
 navkeys.patch
-increase-tube.patch
-preserve_dir.patch)
-sha1sums=('573501d15fa4be59f136641957c7f893e86bac82'
-  '9ff3e79dd5f4ba29bd439f2c86afbc748c95ec3d'
-  '7039755bf1dd27b4aa5384e76ee52e31d06f9972'
-  'ff399edd106eb0b61cc58f66812c2a2c8ea7670d')
+preserve-dir.patch)
+sha256sums=('c3e52dd44edd1f6bf0b52207f717c56149dc50aac0d131fff3851d589727f52f'
+'SKIP'
+'42167fabebe30a13d594346b1d254db82090ba41742a9f35b8895d37092053f0'
+'0e9e2d381f1d8cb86daae68462b3849825b003c08007725c0db9939d3d5bf58d'
+'f0ef9ed2ccea98bf47b08dd3faa2abb911b4e6c0579f5294e9d0e8742282ff65')
+validpgpkeys=('86CFFCA918CF3AF47147588051E8B148AC34')
 
 prepare() {
-  cd ex-${pkgver}
-  patch -Np1 -i  ../navkeys.patch
-  patch -Np0 -i ../increase-tube.patch
-  # FS#20653
-  patch -Np1 -i ../preserve_dir.patch
+  cd ex-$pkgver
+
+  patch -Np1 -i ../fix-tubesize-short-overflow.patch
+  patch -Np1 -i ../navkeys.patch
+
+  # https://bugs.archlinux.org/task/20653
+  patch -Np1 -i ../preserve-dir.patch
 }
 
 build() {
-  cd ex-${pkgver}
+  cd ex-$pkgver
+
   make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \
-  'FEATURES=-DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8' TERMLIB=ncurses
+TERMLIB=ncurses FEATURES=-DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8
 }
 
 package() {
-  cd 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
+  cd ex-$pkgver
+
+  make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \
+INSTALL=/usr/bin/install DESTDIR=$pkgdir install
+  install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
+
+# vim:set ts=2 sw=2 et:

Added: fix-tubesize-short-overflow.patch
===
--- fix-tubesize-short-overflow.patch   (rev 0)
+++ fix-tubesize-short-overflow.patch   2015-05-02 18:13:50 UTC (rev 238367)
@@ -0,0 +1,12 @@
+diff -upr ex-070224.orig/ex_vis.h ex-070224/ex_vis.h
+--- ex-070224.orig/ex_vis.h2005-08-06 14:41:15.0 +0300
 ex-070224/ex_vis.h 2015-05-02 20:41:13.938665281 +0300
+@@ -104,7 +104,7 @@ var enum {
+  */
+ var   short   TUBELINES;
+ var   short   TUBECOLS;
+-var   short   TUBESIZE;
++var   int TUBESIZE;
+ 
+ /*
+  * The screen in visual and crtopen is of varying size; the basic

Deleted: increase-tube.patch
===
--- increase-tube.patch 2015-05-02 17:14:33 UTC (rev 238366)
+++ increase-tube.patch 2015-05-02 18:13:50 UTC (rev 238367)
@@ -1,13 +0,0 @@
 config.h   2005-02-19 05:25:39.0 -0500
-+++ config.h.fixed 2010-01-04 22:02:01.0 -0500
-@@ -95,8 +95,8 @@
- #define TUBESIZE6000/* Maximum screen size for visual */
- #else /* VMUNIX */
- #define TUBELINES   100
--#define TUBECOLS160
--#define TUBESIZE16000
-+#define TUBECOLS320
-+#define TUBESIZE32000
- #endif/* 

[arch-commits] Commit in (vi)

2015-04-22 Thread Evangelos Foutras
Date: Wednesday, April 22, 2015 @ 20:02:32
  Author: foutrelis
Revision: 237918

Bring back vi (FS#44604)

There was objection to switching the /usr/bin/vi editor fallback of
programs like visuo to /usr/bin/nano and the idea of not providing
/usr/bin/vi at all goes against POSIX.

Considering that dbscripts lack support for pushing split packages into
more than one repository, vim-minimal cannot be made available in [core]
without maintaining two copies of the PKGBUILD, which is something the
vim maintainer would rather not do (understandably so).

So, welcome back vi; I didn't miss you one bit.

(On the bright side, vim-minimal is included on the installation image.)

Added:
  vi/


[arch-commits] Commit in vi/repos (10 files)

2015-04-22 Thread Evangelos Foutras
Date: Wednesday, April 22, 2015 @ 20:04:36
  Author: foutrelis
Revision: 237920

archrelease: copy trunk to core-i686, core-x86_64

Added:
  vi/repos/core-i686/
  vi/repos/core-i686/PKGBUILD
(from rev 237918, vi/trunk/PKGBUILD)
  vi/repos/core-i686/increase-tube.patch
(from rev 237918, vi/trunk/increase-tube.patch)
  vi/repos/core-i686/navkeys.patch
(from rev 237918, vi/trunk/navkeys.patch)
  vi/repos/core-i686/preserve_dir.patch
(from rev 237918, vi/trunk/preserve_dir.patch)
  vi/repos/core-x86_64/
  vi/repos/core-x86_64/PKGBUILD
(from rev 237918, vi/trunk/PKGBUILD)
  vi/repos/core-x86_64/increase-tube.patch
(from rev 237918, vi/trunk/increase-tube.patch)
  vi/repos/core-x86_64/navkeys.patch
(from rev 237918, vi/trunk/navkeys.patch)
  vi/repos/core-x86_64/preserve_dir.patch
(from rev 237918, vi/trunk/preserve_dir.patch)

-+
 core-i686/PKGBUILD  |   43 
 core-i686/increase-tube.patch   |   13 
 core-i686/navkeys.patch |   55 +
 core-i686/preserve_dir.patch|   99 ++
 core-x86_64/PKGBUILD|   43 
 core-x86_64/increase-tube.patch |   13 
 core-x86_64/navkeys.patch   |   55 +
 core-x86_64/preserve_dir.patch  |   99 ++
 8 files changed, 420 insertions(+)

Copied: vi/repos/core-i686/PKGBUILD (from rev 237918, vi/trunk/PKGBUILD)
===
--- core-i686/PKGBUILD  (rev 0)
+++ core-i686/PKGBUILD  2015-04-22 18:04:36 UTC (rev 237920)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Eric Bélanger e...@archlinux.org
+
+pkgname=vi
+pkgver=050325
+pkgrel=4
+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')
+source=(http://downloads.sourceforge.net/sourceforge/ex-vi/ex-${pkgver}.tar.bz2
+navkeys.patch
+increase-tube.patch
+preserve_dir.patch)
+sha1sums=('573501d15fa4be59f136641957c7f893e86bac82'
+  '9ff3e79dd5f4ba29bd439f2c86afbc748c95ec3d'
+  '7039755bf1dd27b4aa5384e76ee52e31d06f9972'
+  'ff399edd106eb0b61cc58f66812c2a2c8ea7670d')
+
+prepare() {
+  cd ex-${pkgver}
+  patch -Np1 -i  ../navkeys.patch
+  patch -Np0 -i ../increase-tube.patch
+  # FS#20653
+  patch -Np1 -i ../preserve_dir.patch
+}
+
+build() {
+  cd ex-${pkgver}
+  make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \
+  'FEATURES=-DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8' TERMLIB=ncurses
+}
+
+package() {
+  cd 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/increase-tube.patch (from rev 237918, 
vi/trunk/increase-tube.patch)
===
--- core-i686/increase-tube.patch   (rev 0)
+++ core-i686/increase-tube.patch   2015-04-22 18:04:36 UTC (rev 237920)
@@ -0,0 +1,13 @@
+--- config.h   2005-02-19 05:25:39.0 -0500
 config.h.fixed 2010-01-04 22:02:01.0 -0500
+@@ -95,8 +95,8 @@
+ #define TUBESIZE6000/* Maximum screen size for visual */
+ #else /* VMUNIX */
+ #define TUBELINES   100
+-#define TUBECOLS160
+-#define TUBESIZE16000
++#define TUBECOLS320
++#define TUBESIZE32000
+ #endif/* VMUNIX */
+ 
+ /*

Copied: vi/repos/core-i686/navkeys.patch (from rev 237918, 
vi/trunk/navkeys.patch)
===
--- core-i686/navkeys.patch (rev 0)
+++ core-i686/navkeys.patch 2015-04-22 18:04:36 UTC (rev 237920)
@@ -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.0 +0100
 ex-050325-du/ex_tty.c  2009-06-25 20:06:57.0 +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);
++  

[arch-commits] Commit in (vi)

2015-04-20 Thread Evangelos Foutras
Date: Tuesday, April 21, 2015 @ 03:14:46
  Author: foutrelis
Revision: 237823

Remove vi (FS#44604)

Replaced with vim-minimal on the installation image; the base group
also contains nano so we still have an editor installed by default.

Deleted:
  vi/


[arch-commits] Commit in vi/trunk (PKGBUILD)

2014-06-29 Thread Eric Bélanger
Date: Sunday, June 29, 2014 @ 16:05:53
  Author: eric
Revision: 215568

upgpkg: vi 1:050325-4

Rebuild to add mtree file, Add prepare function

Modified:
  vi/trunk/PKGBUILD

--+
 PKGBUILD |   31 +++
 1 file changed, 15 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-29 13:45:28 UTC (rev 215567)
+++ PKGBUILD2014-06-29 14:05:53 UTC (rev 215568)
@@ -1,44 +1,43 @@
 # $Id$
-# Maintainer: tobias [ tobias at archlinux org ]
+# Maintainer: Eric Bélanger e...@archlinux.org
 
 pkgname=vi
 pkgver=050325
-pkgrel=3
+pkgrel=4
 epoch=1
-pkgdesc='The original ex/vi text editor.'
+pkgdesc=The original ex/vi text editor
 arch=('i686' 'x86_64')
-url='http://ex-vi.sourceforge.net/'
+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 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')
+sha1sums=('573501d15fa4be59f136641957c7f893e86bac82'
+  '9ff3e79dd5f4ba29bd439f2c86afbc748c95ec3d'
+  '7039755bf1dd27b4aa5384e76ee52e31d06f9972'
+  'ff399edd106eb0b61cc58f66812c2a2c8ea7670d')
 
-build() {
-  cd ${srcdir}/ex-${pkgver}
-
+prepare() {
+  cd ex-${pkgver}
   patch -Np1 -i  ../navkeys.patch
   patch -Np0 -i ../increase-tube.patch
   # FS#20653
   patch -Np1 -i ../preserve_dir.patch
+}
 
+build() {
+  cd ex-${pkgver}
   make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \
   'FEATURES=-DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8' TERMLIB=ncurses
 }
 
 package() {
-  cd ${srcdir}/ex-${pkgver}
-
+  cd ex-${pkgver}
   make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex 
INSTALL=/usr/bin/install \
-  DESTDIR=$pkgdir install
-
+  DESTDIR=${pkgdir} install
   install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }



[arch-commits] Commit in vi/repos (10 files)

2014-06-29 Thread Eric Bélanger
Date: Sunday, June 29, 2014 @ 16:08:49
  Author: eric
Revision: 215569

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  vi/repos/testing-i686/
  vi/repos/testing-i686/PKGBUILD
(from rev 215568, vi/trunk/PKGBUILD)
  vi/repos/testing-i686/increase-tube.patch
(from rev 215568, vi/trunk/increase-tube.patch)
  vi/repos/testing-i686/navkeys.patch
(from rev 215568, vi/trunk/navkeys.patch)
  vi/repos/testing-i686/preserve_dir.patch
(from rev 215568, vi/trunk/preserve_dir.patch)
  vi/repos/testing-x86_64/
  vi/repos/testing-x86_64/PKGBUILD
(from rev 215568, vi/trunk/PKGBUILD)
  vi/repos/testing-x86_64/increase-tube.patch
(from rev 215568, vi/trunk/increase-tube.patch)
  vi/repos/testing-x86_64/navkeys.patch
(from rev 215568, vi/trunk/navkeys.patch)
  vi/repos/testing-x86_64/preserve_dir.patch
(from rev 215568, vi/trunk/preserve_dir.patch)

+
 testing-i686/PKGBUILD  |   43 +++
 testing-i686/increase-tube.patch   |   13 
 testing-i686/navkeys.patch |   55 +++
 testing-i686/preserve_dir.patch|   99 +++
 testing-x86_64/PKGBUILD|   43 +++
 testing-x86_64/increase-tube.patch |   13 
 testing-x86_64/navkeys.patch   |   55 +++
 testing-x86_64/preserve_dir.patch  |   99 +++
 8 files changed, 420 insertions(+)

Copied: vi/repos/testing-i686/PKGBUILD (from rev 215568, vi/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2014-06-29 14:08:49 UTC (rev 215569)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Eric Bélanger e...@archlinux.org
+
+pkgname=vi
+pkgver=050325
+pkgrel=4
+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')
+source=(http://downloads.sourceforge.net/sourceforge/ex-vi/ex-${pkgver}.tar.bz2
+navkeys.patch
+increase-tube.patch
+preserve_dir.patch)
+sha1sums=('573501d15fa4be59f136641957c7f893e86bac82'
+  '9ff3e79dd5f4ba29bd439f2c86afbc748c95ec3d'
+  '7039755bf1dd27b4aa5384e76ee52e31d06f9972'
+  'ff399edd106eb0b61cc58f66812c2a2c8ea7670d')
+
+prepare() {
+  cd ex-${pkgver}
+  patch -Np1 -i  ../navkeys.patch
+  patch -Np0 -i ../increase-tube.patch
+  # FS#20653
+  patch -Np1 -i ../preserve_dir.patch
+}
+
+build() {
+  cd ex-${pkgver}
+  make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \
+  'FEATURES=-DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8' TERMLIB=ncurses
+}
+
+package() {
+  cd 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/testing-i686/increase-tube.patch (from rev 215568, 
vi/trunk/increase-tube.patch)
===
--- testing-i686/increase-tube.patch(rev 0)
+++ testing-i686/increase-tube.patch2014-06-29 14:08:49 UTC (rev 215569)
@@ -0,0 +1,13 @@
+--- config.h   2005-02-19 05:25:39.0 -0500
 config.h.fixed 2010-01-04 22:02:01.0 -0500
+@@ -95,8 +95,8 @@
+ #define TUBESIZE6000/* Maximum screen size for visual */
+ #else /* VMUNIX */
+ #define TUBELINES   100
+-#define TUBECOLS160
+-#define TUBESIZE16000
++#define TUBECOLS320
++#define TUBESIZE32000
+ #endif/* VMUNIX */
+ 
+ /*

Copied: vi/repos/testing-i686/navkeys.patch (from rev 215568, 
vi/trunk/navkeys.patch)
===
--- testing-i686/navkeys.patch  (rev 0)
+++ testing-i686/navkeys.patch  2014-06-29 14:08:49 UTC (rev 215569)
@@ -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.0 +0100
 ex-050325-du/ex_tty.c  2009-06-25 20:06:57.0 +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, 

[arch-commits] Commit in vi (3 files)

2013-10-30 Thread Allan McRae
Date: Wednesday, October 30, 2013 @ 12:07:27
  Author: allan
Revision: 197845

remove \!libtool

Modified:
  vi/repos/core-i686/PKGBUILD
  vi/repos/core-x86_64/PKGBUILD
  vi/trunk/PKGBUILD

+
 repos/core-i686/PKGBUILD   |2 +-
 repos/core-x86_64/PKGBUILD |2 +-
 trunk/PKGBUILD |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Modified: repos/core-i686/PKGBUILD
===
--- repos/core-i686/PKGBUILD2013-10-30 11:07:21 UTC (rev 197844)
+++ repos/core-i686/PKGBUILD2013-10-30 11:07:27 UTC (rev 197845)
@@ -12,7 +12,7 @@
 depends=('ncurses')
 optdepends=('heirloom-mailx: used by the preserve command for notification')
 groups=('base')
-options=(strip !libtool emptydirs)
+options=(strip emptydirs)
 source=(http://downloads.sourceforge.net/sourceforge/ex-vi/ex-${pkgver}.tar.bz2
 navkeys.patch
 increase-tube.patch

Modified: repos/core-x86_64/PKGBUILD
===
--- repos/core-x86_64/PKGBUILD  2013-10-30 11:07:21 UTC (rev 197844)
+++ repos/core-x86_64/PKGBUILD  2013-10-30 11:07:27 UTC (rev 197845)
@@ -12,7 +12,7 @@
 depends=('ncurses')
 optdepends=('heirloom-mailx: used by the preserve command for notification')
 groups=('base')
-options=(strip !libtool emptydirs)
+options=(strip emptydirs)
 source=(http://downloads.sourceforge.net/sourceforge/ex-vi/ex-${pkgver}.tar.bz2
 navkeys.patch
 increase-tube.patch

Modified: trunk/PKGBUILD
===
--- trunk/PKGBUILD  2013-10-30 11:07:21 UTC (rev 197844)
+++ trunk/PKGBUILD  2013-10-30 11:07:27 UTC (rev 197845)
@@ -12,7 +12,7 @@
 depends=('ncurses')
 optdepends=('heirloom-mailx: used by the preserve command for notification')
 groups=('base')
-options=(strip !libtool emptydirs)
+options=(strip emptydirs)
 source=(http://downloads.sourceforge.net/sourceforge/ex-vi/ex-${pkgver}.tar.bz2
 navkeys.patch
 increase-tube.patch



[arch-commits] Commit in vi/repos (20 files)

2012-11-19 Thread Eric Bélanger
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
+}
+

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

2012-11-16 Thread 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
===
--- PKGBUILD2012-11-16 18:26:14 UTC (rev 171122)
+++ PKGBUILD2012-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.0 -0500
-+++ ex-050325/ex.spec  2011-02-01 16:21:51.49674 -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.0 -0500
 +++ ex-050325/Makefile 2011-02-01 16:21:51.49674 -0500
@@ -79,3 +67,33 @@
  preservation directory
  .SH SEE ALSO
  ex(1),
+--- ex-050325.original/ex.12012-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.12012-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



[arch-commits] Commit in vi/repos (10 files)

2012-11-16 Thread Eric Bélanger
Date: Friday, November 16, 2012 @ 13:41:46
  Author: eric
Revision: 171124

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  vi/repos/testing-i686/
  vi/repos/testing-i686/PKGBUILD
(from rev 171123, vi/trunk/PKGBUILD)
  vi/repos/testing-i686/increase-tube.patch
(from rev 171123, vi/trunk/increase-tube.patch)
  vi/repos/testing-i686/navkeys.patch
(from rev 171123, vi/trunk/navkeys.patch)
  vi/repos/testing-i686/preserve_dir.patch
(from rev 171123, vi/trunk/preserve_dir.patch)
  vi/repos/testing-x86_64/
  vi/repos/testing-x86_64/PKGBUILD
(from rev 171123, vi/trunk/PKGBUILD)
  vi/repos/testing-x86_64/increase-tube.patch
(from rev 171123, vi/trunk/increase-tube.patch)
  vi/repos/testing-x86_64/navkeys.patch
(from rev 171123, vi/trunk/navkeys.patch)
  vi/repos/testing-x86_64/preserve_dir.patch
(from rev 171123, vi/trunk/preserve_dir.patch)

+
 testing-i686/PKGBUILD  |   44 +++
 testing-i686/increase-tube.patch   |   13 
 testing-i686/navkeys.patch |   55 +++
 testing-i686/preserve_dir.patch|   99 +++
 testing-x86_64/PKGBUILD|   44 +++
 testing-x86_64/increase-tube.patch |   13 
 testing-x86_64/navkeys.patch   |   55 +++
 testing-x86_64/preserve_dir.patch  |   99 +++
 8 files changed, 422 insertions(+)

Copied: vi/repos/testing-i686/PKGBUILD (from rev 171123, vi/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-11-16 18:41:46 UTC (rev 171124)
@@ -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
+}

Copied: vi/repos/testing-i686/increase-tube.patch (from rev 171123, 
vi/trunk/increase-tube.patch)
===
--- testing-i686/increase-tube.patch(rev 0)
+++ testing-i686/increase-tube.patch2012-11-16 18:41:46 UTC (rev 171124)
@@ -0,0 +1,13 @@
+--- config.h   2005-02-19 05:25:39.0 -0500
 config.h.fixed 2010-01-04 22:02:01.0 -0500
+@@ -95,8 +95,8 @@
+ #define TUBESIZE6000/* Maximum screen size for visual */
+ #else /* VMUNIX */
+ #define TUBELINES   100
+-#define TUBECOLS160
+-#define TUBESIZE16000
++#define TUBECOLS320
++#define TUBESIZE32000
+ #endif/* VMUNIX */
+ 
+ /*

Copied: vi/repos/testing-i686/navkeys.patch (from rev 171123, 
vi/trunk/navkeys.patch)
===
--- testing-i686/navkeys.patch  (rev 0)
+++ testing-i686/navkeys.patch  2012-11-16 18:41:46 UTC (rev 171124)
@@ -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.0 +0100
 ex-050325-du/ex_tty.c  2009-06-25 20:06:57.0 +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, 

[arch-commits] Commit in vi/trunk (PKGBUILD)

2012-11-07 Thread Stéphane Gaudreault
Date: Wednesday, November 7, 2012 @ 11:02:08
  Author: stephane
Revision: 170419

change mailx to heirloom-mailx in optdepends

Modified:
  vi/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-11-07 15:47:16 UTC (rev 170418)
+++ PKGBUILD2012-11-07 16:02:08 UTC (rev 170419)
@@ -10,7 +10,7 @@
 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
@@ -27,7 +27,6 @@
 build() {
   cd ${srcdir}/ex-${pkgver}
 
-  # apply patches
   patch -Np1 -i  ../navkeys.patch
   patch -Np0 -i ../increase-tube.patch
   # FS#20653



[arch-commits] Commit in vi/trunk (PKGBUILD)

2012-06-01 Thread Eric Bélanger
Date: Friday, June 1, 2012 @ 14:34:46
  Author: eric
Revision: 160403

Fix build issue

Modified:
  vi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-01 18:19:59 UTC (rev 160402)
+++ PKGBUILD2012-06-01 18:34:46 UTC (rev 160403)
@@ -40,7 +40,7 @@
 package() {
   cd ${srcdir}/ex-${pkgver}
 
-  make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex 
INSTALL=/bin/install \
+  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



[arch-commits] Commit in vi/repos/core-i686 (10 files)

2012-06-01 Thread Eric Bélanger
Date: Friday, June 1, 2012 @ 14:35:27
  Author: eric
Revision: 160404

archrelease: copy trunk to core-i686

Added:
  vi/repos/core-i686/PKGBUILD
(from rev 160403, vi/trunk/PKGBUILD)
  vi/repos/core-i686/exrc.sample
(from rev 160403, vi/trunk/exrc.sample)
  vi/repos/core-i686/increase-tube.patch
(from rev 160403, vi/trunk/increase-tube.patch)
  vi/repos/core-i686/navkeys.patch
(from rev 160403, vi/trunk/navkeys.patch)
  vi/repos/core-i686/preserve_dir.patch
(from rev 160403, vi/trunk/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

-+
 PKGBUILD|   94 ++---
 exrc.sample |   10 +--
 increase-tube.patch |   26 
 navkeys.patch   |  110 -
 preserve_dir.patch  |  162 +-
 5 files changed, 201 insertions(+), 201 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2012-06-01 18:34:46 UTC (rev 160403)
+++ PKGBUILD2012-06-01 18:35:27 UTC (rev 160404)
@@ -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=/bin/install \
-  DESTDIR=$pkgdir install
-
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}

Copied: vi/repos/core-i686/PKGBUILD (from rev 160403, vi/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2012-06-01 18:35:27 UTC (rev 160404)
@@ -0,0 +1,47 @@
+# $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
+}

Deleted: exrc.sample
===
--- exrc.sample 2012-06-01 18:34:46 UTC (rev 160403)
+++ exrc.sample 2012-06-01 18:35:27 UTC (rev 160404)
@@ -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

Copied: vi/repos/core-i686/exrc.sample (from rev 160403, vi/trunk/exrc.sample)
===
--- exrc.sample (rev 0)
+++ exrc.sample 2012-06-01 18:35:27 UTC (rev 160404)
@@ -0,0 +1,5 @@
+ A sample .exrc file. Copy it to your home dir as ~/.exrc in order to work.
+set showmode

[arch-commits] Commit in vi/repos/core-x86_64 (10 files)

2012-06-01 Thread Eric Bélanger
Date: Friday, June 1, 2012 @ 14:35:53
  Author: eric
Revision: 160405

archrelease: copy trunk to core-x86_64

Added:
  vi/repos/core-x86_64/PKGBUILD
(from rev 160404, vi/trunk/PKGBUILD)
  vi/repos/core-x86_64/exrc.sample
(from rev 160404, vi/trunk/exrc.sample)
  vi/repos/core-x86_64/increase-tube.patch
(from rev 160404, vi/trunk/increase-tube.patch)
  vi/repos/core-x86_64/navkeys.patch
(from rev 160404, vi/trunk/navkeys.patch)
  vi/repos/core-x86_64/preserve_dir.patch
(from rev 160404, vi/trunk/preserve_dir.patch)
Deleted:
  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

-+
 PKGBUILD|   94 ++---
 exrc.sample |   10 +--
 increase-tube.patch |   26 
 navkeys.patch   |  110 -
 preserve_dir.patch  |  162 +-
 5 files changed, 201 insertions(+), 201 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2012-06-01 18:35:27 UTC (rev 160404)
+++ PKGBUILD2012-06-01 18:35:53 UTC (rev 160405)
@@ -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=/bin/install \
-  DESTDIR=$pkgdir install
-
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}

Copied: vi/repos/core-x86_64/PKGBUILD (from rev 160404, vi/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2012-06-01 18:35:53 UTC (rev 160405)
@@ -0,0 +1,47 @@
+# $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
+}

Deleted: exrc.sample
===
--- exrc.sample 2012-06-01 18:35:27 UTC (rev 160404)
+++ exrc.sample 2012-06-01 18:35:53 UTC (rev 160405)
@@ -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

Copied: vi/repos/core-x86_64/exrc.sample (from rev 160404, vi/trunk/exrc.sample)
===
--- exrc.sample (rev 0)
+++ exrc.sample 2012-06-01 18:35:53 UTC (rev 160405)
@@ -0,0 +1,5 @@
+ A sample .exrc file. Copy it to your home dir as ~/.exrc in order 

[arch-commits] Commit in vi/repos (11 files)

2011-11-05 Thread Stéphane Gaudreault
Date: Saturday, November 5, 2011 @ 22:27:50
  Author: stephane
Revision: 142188

db-move: moved vi from [testing] to [core] (i686)

Added:
  vi/repos/core-i686/PKGBUILD
(from rev 142187, vi/repos/testing-i686/PKGBUILD)
  vi/repos/core-i686/exrc.sample
(from rev 142187, vi/repos/testing-i686/exrc.sample)
  vi/repos/core-i686/increase-tube.patch
(from rev 142187, vi/repos/testing-i686/increase-tube.patch)
  vi/repos/core-i686/navkeys.patch
(from rev 142187, vi/repos/testing-i686/navkeys.patch)
  vi/repos/core-i686/preserve_dir.patch
(from rev 142187, vi/repos/testing-i686/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/testing-i686/

-+
 PKGBUILD|   94 ++---
 exrc.sample |   10 +--
 increase-tube.patch |   26 
 navkeys.patch   |  110 -
 preserve_dir.patch  |  162 +-
 5 files changed, 201 insertions(+), 201 deletions(-)

Deleted: core-i686/PKGBUILD
===
--- core-i686/PKGBUILD  2011-11-06 02:25:41 UTC (rev 142187)
+++ core-i686/PKGBUILD  2011-11-06 02:27:50 UTC (rev 142188)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: tobias [ tobias at archlinux org ]
-
-pkgname=vi
-pkgver=050325
-pkgrel=1
-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=/bin/install \
-  DESTDIR=$pkgdir install
-
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}

Copied: vi/repos/core-i686/PKGBUILD (from rev 142187, 
vi/repos/testing-i686/PKGBUILD)
===
--- core-i686/PKGBUILD  (rev 0)
+++ core-i686/PKGBUILD  2011-11-06 02:27:50 UTC (rev 142188)
@@ -0,0 +1,47 @@
+# $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=/bin/install \
+  DESTDIR=$pkgdir install
+
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}

Deleted: core-i686/exrc.sample
===
--- core-i686/exrc.sample   2011-11-06 02:25:41 UTC (rev 142187)
+++ core-i686/exrc.sample   2011-11-06 02:27:50 UTC (rev 142188)
@@ -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

Copied: vi/repos/core-i686/exrc.sample (from rev 142187, 
vi/repos/testing-i686/exrc.sample)

[arch-commits] Commit in vi/repos (11 files)

2011-11-05 Thread Stéphane Gaudreault
Date: Saturday, November 5, 2011 @ 22:27:51
  Author: stephane
Revision: 142189

db-move: moved vi from [testing] to [core] (x86_64)

Added:
  vi/repos/core-x86_64/PKGBUILD
(from rev 142187, vi/repos/testing-x86_64/PKGBUILD)
  vi/repos/core-x86_64/exrc.sample
(from rev 142187, vi/repos/testing-x86_64/exrc.sample)
  vi/repos/core-x86_64/increase-tube.patch
(from rev 142187, vi/repos/testing-x86_64/increase-tube.patch)
  vi/repos/core-x86_64/navkeys.patch
(from rev 142187, vi/repos/testing-x86_64/navkeys.patch)
  vi/repos/core-x86_64/preserve_dir.patch
(from rev 142187, vi/repos/testing-x86_64/preserve_dir.patch)
Deleted:
  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-x86_64/

-+
 PKGBUILD|   94 ++---
 exrc.sample |   10 +--
 increase-tube.patch |   26 
 navkeys.patch   |  110 -
 preserve_dir.patch  |  162 +-
 5 files changed, 201 insertions(+), 201 deletions(-)

Deleted: core-x86_64/PKGBUILD
===
--- core-x86_64/PKGBUILD2011-11-06 02:27:50 UTC (rev 142188)
+++ core-x86_64/PKGBUILD2011-11-06 02:27:51 UTC (rev 142189)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: tobias [ tobias at archlinux org ]
-
-pkgname=vi
-pkgver=050325
-pkgrel=1
-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=/bin/install \
-  DESTDIR=$pkgdir install
-
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}

Copied: vi/repos/core-x86_64/PKGBUILD (from rev 142187, 
vi/repos/testing-x86_64/PKGBUILD)
===
--- core-x86_64/PKGBUILD(rev 0)
+++ core-x86_64/PKGBUILD2011-11-06 02:27:51 UTC (rev 142189)
@@ -0,0 +1,47 @@
+# $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=/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 2011-11-06 02:27:50 UTC (rev 142188)
+++ core-x86_64/exrc.sample 2011-11-06 02:27:51 UTC (rev 142189)
@@ -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

Copied: vi/repos/core-x86_64/exrc.sample (from rev 142187, 

[arch-commits] Commit in vi/trunk (PKGBUILD)

2011-11-04 Thread Stéphane Gaudreault
Date: Friday, November 4, 2011 @ 19:27:02
  Author: stephane
Revision: 142053

upgpkg: vi 1:050325-2

signed rebuild

Modified:
  vi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-04 23:20:14 UTC (rev 142052)
+++ PKGBUILD2011-11-04 23:27:02 UTC (rev 142053)
@@ -3,7 +3,7 @@
 
 pkgname=vi
 pkgver=050325
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc='The original ex/vi text editor.'
 arch=('i686' 'x86_64')



[arch-commits] Commit in vi/repos (12 files)

2011-11-04 Thread Stéphane Gaudreault
Date: Friday, November 4, 2011 @ 19:27:15
  Author: stephane
Revision: 142054

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  vi/repos/testing-i686/
  vi/repos/testing-i686/PKGBUILD
(from rev 142053, vi/trunk/PKGBUILD)
  vi/repos/testing-i686/exrc.sample
(from rev 142053, vi/trunk/exrc.sample)
  vi/repos/testing-i686/increase-tube.patch
(from rev 142053, vi/trunk/increase-tube.patch)
  vi/repos/testing-i686/navkeys.patch
(from rev 142053, vi/trunk/navkeys.patch)
  vi/repos/testing-i686/preserve_dir.patch
(from rev 142053, vi/trunk/preserve_dir.patch)
  vi/repos/testing-x86_64/
  vi/repos/testing-x86_64/PKGBUILD
(from rev 142053, vi/trunk/PKGBUILD)
  vi/repos/testing-x86_64/exrc.sample
(from rev 142053, vi/trunk/exrc.sample)
  vi/repos/testing-x86_64/increase-tube.patch
(from rev 142053, vi/trunk/increase-tube.patch)
  vi/repos/testing-x86_64/navkeys.patch
(from rev 142053, vi/trunk/navkeys.patch)
  vi/repos/testing-x86_64/preserve_dir.patch
(from rev 142053, vi/trunk/preserve_dir.patch)

+
 testing-i686/PKGBUILD  |   47 
 testing-i686/exrc.sample   |5 ++
 testing-i686/increase-tube.patch   |   13 +
 testing-i686/navkeys.patch |   55 +++
 testing-i686/preserve_dir.patch|   81 +++
 testing-x86_64/PKGBUILD|   47 
 testing-x86_64/exrc.sample |5 ++
 testing-x86_64/increase-tube.patch |   13 +
 testing-x86_64/navkeys.patch   |   55 +++
 testing-x86_64/preserve_dir.patch  |   81 +++
 10 files changed, 402 insertions(+)

Copied: vi/repos/testing-i686/PKGBUILD (from rev 142053, vi/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-11-04 23:27:15 UTC (rev 142054)
@@ -0,0 +1,47 @@
+# $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=/bin/install \
+  DESTDIR=$pkgdir install
+
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}

Copied: vi/repos/testing-i686/exrc.sample (from rev 142053, 
vi/trunk/exrc.sample)
===
--- testing-i686/exrc.sample(rev 0)
+++ testing-i686/exrc.sample2011-11-04 23:27:15 UTC (rev 142054)
@@ -0,0 +1,5 @@
+ 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

Copied: vi/repos/testing-i686/increase-tube.patch (from rev 142053, 
vi/trunk/increase-tube.patch)
===
--- testing-i686/increase-tube.patch(rev 0)
+++ testing-i686/increase-tube.patch2011-11-04 23:27:15 UTC (rev 142054)
@@ -0,0 +1,13 @@
+--- config.h   2005-02-19 05:25:39.0 -0500
 config.h.fixed 2010-01-04 22:02:01.0 -0500
+@@ -95,8 +95,8 @@
+ #define TUBESIZE6000/* Maximum screen size for visual */
+ #else /* VMUNIX */
+ #define TUBELINES   100
+-#define TUBECOLS160
+-#define TUBESIZE16000
++#define TUBECOLS320
++#define TUBESIZE32000
+ #endif/* VMUNIX */
+ 
+ /*

Copied: vi/repos/testing-i686/navkeys.patch (from rev 142053, 
vi/trunk/navkeys.patch)
===
--- testing-i686/navkeys.patch  (rev 0)
+++ testing-i686/navkeys.patch  2011-11-04 23:27:15 UTC (rev 142054)
@@ -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 

[arch-commits] Commit in vi/repos (core-i686)

2011-05-08 Thread Ionut Biru
Date: Sunday, May 8, 2011 @ 08:32:48
  Author: ibiru
Revision: 123103

db-move: vi removed by ibiru for move to [core] (i686)

Deleted:
  vi/repos/core-i686/



[arch-commits] Commit in vi/repos (core-i686 testing-i686)

2011-05-08 Thread Ionut Biru
Date: Sunday, May 8, 2011 @ 08:32:49
  Author: ibiru
Revision: 123104

db-move: moved vi from [testing] to [core] (i686)

Added:
  vi/repos/core-i686/
Deleted:
  vi/repos/testing-i686/



[arch-commits] Commit in vi/repos (core-x86_64)

2011-05-08 Thread Ionut Biru
Date: Sunday, May 8, 2011 @ 08:32:49
  Author: ibiru
Revision: 123105

db-move: vi removed by ibiru for move to [core] (x86_64)

Deleted:
  vi/repos/core-x86_64/



[arch-commits] Commit in vi/repos (core-x86_64 testing-x86_64)

2011-05-08 Thread Ionut Biru
Date: Sunday, May 8, 2011 @ 08:32:50
  Author: ibiru
Revision: 123106

db-move: moved vi from [testing] to [core] (x86_64)

Added:
  vi/repos/core-x86_64/
Deleted:
  vi/repos/testing-x86_64/



[arch-commits] Commit in vi/trunk (PKGBUILD)

2011-04-06 Thread Jan de Groot
Date: Wednesday, April 6, 2011 @ 07:56:08
  Author: jgc
Revision: 118264

Add epoch, remove force option

Modified:
  vi/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-04-06 10:03:58 UTC (rev 118263)
+++ PKGBUILD2011-04-06 11:56:08 UTC (rev 118264)
@@ -4,6 +4,7 @@
 pkgname=vi
 pkgver=050325
 pkgrel=4
+epoch=1
 pkgdesc='The original ex/vi text editor.'
 arch=('i686' 'x86_64')
 url='http://ex-vi.sourceforge.net/'
@@ -11,7 +12,7 @@
 depends=('ncurses')
 optdepends=('mailx: used by the preserve command for notification')
 groups=('base')
-options=(force strip !libtool emptydirs)
+options=(strip !libtool emptydirs)
 source=(http://downloads.sourceforge.net/sourceforge/ex-vi/ex-${pkgver}.tar.bz2
 exrc.sample
 navkeys.patch



[arch-commits] Commit in vi/trunk (PKGBUILD)

2011-04-06 Thread Jan de Groot
Date: Wednesday, April 6, 2011 @ 08:35:06
  Author: jgc
Revision: 118363

upgpkg: vi 050325-1
Build with epoch, pacman does not support options=(force) anymore

Modified:
  vi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-04-06 12:32:11 UTC (rev 118362)
+++ PKGBUILD2011-04-06 12:35:06 UTC (rev 118363)
@@ -3,7 +3,7 @@
 
 pkgname=vi
 pkgver=050325
-pkgrel=4
+pkgrel=1
 epoch=1
 pkgdesc='The original ex/vi text editor.'
 arch=('i686' 'x86_64')



[arch-commits] Commit in vi/repos (testing-i686)

2011-04-06 Thread Jan de Groot
Date: Wednesday, April 6, 2011 @ 08:35:23
  Author: jgc
Revision: 118364

archrelease: copy trunk to testing-i686

Added:
  vi/repos/testing-i686/



[arch-commits] Commit in vi/repos (testing-x86_64)

2011-04-06 Thread Jan de Groot
Date: Wednesday, April 6, 2011 @ 08:35:39
  Author: jgc
Revision: 118365

archrelease: copy trunk to testing-x86_64

Added:
  vi/repos/testing-x86_64/



[arch-commits] Commit in vi/repos (core-i686)

2011-02-17 Thread Ronald van Haren
Date: Thursday, February 17, 2011 @ 14:08:46
  Author: ronald
Revision: 110216

db-move: vi removed by ronald for move to [core] (i686)

Deleted:
  vi/repos/core-i686/



[arch-commits] Commit in vi/repos (core-i686 testing-i686)

2011-02-17 Thread Ronald van Haren
Date: Thursday, February 17, 2011 @ 14:08:46
  Author: ronald
Revision: 110217

db-move: moved vi from [testing] to [core] (i686)

Added:
  vi/repos/core-i686/
Deleted:
  vi/repos/testing-i686/



[arch-commits] Commit in vi/repos (core-x86_64)

2011-02-17 Thread Ronald van Haren
Date: Thursday, February 17, 2011 @ 14:08:47
  Author: ronald
Revision: 110218

db-move: vi removed by ronald for move to [core] (x86_64)

Deleted:
  vi/repos/core-x86_64/



[arch-commits] Commit in vi/repos (core-x86_64 testing-x86_64)

2011-02-17 Thread Ronald van Haren
Date: Thursday, February 17, 2011 @ 14:08:48
  Author: ronald
Revision: 110219

db-move: moved vi from [testing] to [core] (x86_64)

Added:
  vi/repos/core-x86_64/
Deleted:
  vi/repos/testing-x86_64/



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

2011-02-09 Thread Stéphane Gaudreault
Date: Wednesday, February 9, 2011 @ 10:11:57
  Author: stephane
Revision: 109423

upgpkg: vi 050325-4
Rebuild of old package, Tidy up PKGBUILD, Fix FS#20653

Added:
  vi/trunk/preserve_dir.patch
Modified:
  vi/trunk/PKGBUILD

+
 PKGBUILD   |   42 +++---
 preserve_dir.patch |   81 +++
 2 files changed, 105 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-09 13:27:28 UTC (rev 109422)
+++ PKGBUILD2011-02-09 15:11:57 UTC (rev 109423)
@@ -3,38 +3,44 @@
 
 pkgname=vi
 pkgver=050325
-pkgrel=3
+pkgrel=4
 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=(force strip !libtool emptydirs)
 source=(http://downloads.sourceforge.net/sourceforge/ex-vi/ex-${pkgver}.tar.bz2
-navkeys.patch increase-tube.patch exrc.sample)
-md5sums=('e668595254233e4d96811083a3e4e2f3' 'aac133930047eafa4f28736cfaf976b3'
- 'e596e05a00a24187b576e389fa1de45d' 'd3b483c994d859232ce369b82a4b5668')
+exrc.sample
+navkeys.patch
+increase-tube.patch
+preserve_dir.patch)
+md5sums=('e668595254233e4d96811083a3e4e2f3' 
+ 'd3b483c994d859232ce369b82a4b5668' 
+ 'aac133930047eafa4f28736cfaf976b3'
+ 'e596e05a00a24187b576e389fa1de45d'
+ '419a8755e0dd16e95542bc107e6d2b24')
 
 build() {
-  cd ${srcdir}/ex-${pkgver} || return 1
+  cd ${srcdir}/ex-${pkgver}
 
   # apply patches
-  patch -Np1 -i  ../navkeys.patch || return 1
-  patch -Np0 -i ../increase-tube.patch || return 1
+  patch -Np1 -i  ../navkeys.patch 
+  patch -Np0 -i ../increase-tube.patch
+  # FS#20653
+  patch -Np1 -i ../preserve_dir.patch
 
-  # correct paths in manpages
-  sed -i -e 's/^\.B \/usr\/libexec/.B \/usr\/lib\/ex/' vi.1 \
-  || return 1
-  sed -i -e 's/^\.B \/var\/preserve$/.B \/var\/lib\/ex/' vi.1 \
-  || return 1
+  make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \
+  'FEATURES=-DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8' TERMLIB=ncurses 
+}
 
-  make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \
-  'FEATURES=-DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8' TERMLIB=ncurses \
-  || return 1
+package() {
+  cd ${srcdir}/ex-${pkgver}
+
   make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex 
INSTALL=/bin/install \
-  DESTDIR=$pkgdir install || return 1
+  DESTDIR=$pkgdir install 
 
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE \
-  || return 1
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }

Added: preserve_dir.patch
===
--- preserve_dir.patch  (rev 0)
+++ preserve_dir.patch  2011-02-09 15:11:57 UTC (rev 109423)
@@ -0,0 +1,81 @@
+diff -Naur ex-050325.ori/ex.1 ex-050325/ex.1
+--- ex-050325.ori/ex.1 2005-02-17 07:39:36.0 -0500
 ex-050325/ex.1 2011-02-01 16:21:51.49674 -0500
+@@ -1950,7 +1950,7 @@
+ .B /var/tmp/Rx\fInn\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.0 -0500
 ex-050325/expreserve.c 2011-02-01 16:22:06.58342 -0500
+@@ -272,7 +272,7 @@
+ #ifdefnotdef
+ char  pattern[] = /usr/preserve/Exaa`X;
+ #else
+-char  pattern[] = /var/preserve/Exa`XX;
++char  pattern[] = /var/lib/ex/Exa`XX;
+ #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.0 -0500
 ex-050325/exrecover.c  2011-02-01 16:21:51.49674 -0500
+@@ -167,7 +167,7 @@
+ #ifdefnotdef
+ 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.0 -0500
 ex-050325/ex.spec  2011-02-01 16:21:51.49674 -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  

[arch-commits] Commit in vi/repos (testing-x86_64)

2011-02-09 Thread Stéphane Gaudreault
Date: Wednesday, February 9, 2011 @ 10:12:04
  Author: stephane
Revision: 109424

archrelease: copy trunk to testing-x86_64

Added:
  vi/repos/testing-x86_64/



[arch-commits] Commit in vi/trunk (PKGBUILD)

2011-02-09 Thread Stéphane Gaudreault
Date: Wednesday, February 9, 2011 @ 10:16:39
  Author: stephane
Revision: 109425

upgpkg: vi 050325-4
Rebuild of old package, Tidy up PKGBUILD, Fix FS#20653

Modified:
  vi/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-09 15:12:04 UTC (rev 109424)
+++ PKGBUILD2011-02-09 15:16:39 UTC (rev 109425)
@@ -17,8 +17,8 @@
 navkeys.patch
 increase-tube.patch
 preserve_dir.patch)
-md5sums=('e668595254233e4d96811083a3e4e2f3' 
- 'd3b483c994d859232ce369b82a4b5668' 
+md5sums=('e668595254233e4d96811083a3e4e2f3'
+ 'd3b483c994d859232ce369b82a4b5668'
  'aac133930047eafa4f28736cfaf976b3'
  'e596e05a00a24187b576e389fa1de45d'
  '419a8755e0dd16e95542bc107e6d2b24')
@@ -27,20 +27,20 @@
   cd ${srcdir}/ex-${pkgver}
 
   # apply patches
-  patch -Np1 -i  ../navkeys.patch 
+  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 
+  '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=/bin/install \
-  DESTDIR=$pkgdir install 
+  DESTDIR=$pkgdir install
 
   install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }



[arch-commits] Commit in vi/repos (extra-i686)

2011-02-09 Thread Stéphane Gaudreault
Date: Wednesday, February 9, 2011 @ 10:20:54
  Author: stephane
Revision: 109426

archrelease: copy trunk to extra-i686

Added:
  vi/repos/extra-i686/



[arch-commits] Commit in vi/repos (extra-x86_64)

2011-02-09 Thread Stéphane Gaudreault
Date: Wednesday, February 9, 2011 @ 10:20:58
  Author: stephane
Revision: 109427

archrelease: copy trunk to extra-x86_64

Added:
  vi/repos/extra-x86_64/



[arch-commits] Commit in vi/repos (testing-i686)

2011-02-09 Thread Stéphane Gaudreault
Date: Wednesday, February 9, 2011 @ 10:21:09
  Author: stephane
Revision: 109428

archrelease: copy trunk to testing-i686

Added:
  vi/repos/testing-i686/



[arch-commits] Commit in vi/repos (testing-x86_64)

2011-02-09 Thread Stéphane Gaudreault
Date: Wednesday, February 9, 2011 @ 10:21:13
  Author: stephane
Revision: 109429

archrelease: remove testing-x86_64

Deleted:
  vi/repos/testing-x86_64/



[arch-commits] Commit in vi/repos (testing-x86_64)

2011-02-09 Thread Stéphane Gaudreault
Date: Wednesday, February 9, 2011 @ 10:21:16
  Author: stephane
Revision: 109430

archrelease: copy trunk to testing-x86_64

Added:
  vi/repos/testing-x86_64/



[arch-commits] Commit in vi/repos (extra-i686 extra-x86_64)

2011-02-09 Thread Stéphane Gaudreault
Date: Wednesday, February 9, 2011 @ 11:11:14
  Author: stephane
Revision: 109431

removing repos/extra

Deleted:
  vi/repos/extra-i686/
  vi/repos/extra-x86_64/



[arch-commits] Commit in vi/repos (core-i686)

2010-03-14 Thread Paul Mattal
Date: Sunday, March 14, 2010 @ 11:24:39
  Author: paul
Revision: 72367

db-move: vi removed by paul for move to core

Deleted:
  vi/repos/core-i686/



[arch-commits] Commit in vi/repos (core-i686 testing-i686)

2010-03-14 Thread Paul Mattal
Date: Sunday, March 14, 2010 @ 11:24:40
  Author: paul
Revision: 72368

db-move: moved vi from [testing] to [core] (i686)

Added:
  vi/repos/core-i686/
Deleted:
  vi/repos/testing-i686/



[arch-commits] Commit in vi/repos (core-x86_64)

2010-03-14 Thread Paul Mattal
Date: Sunday, March 14, 2010 @ 11:24:47
  Author: paul
Revision: 72369

db-move: vi removed by paul for move to core

Deleted:
  vi/repos/core-x86_64/



[arch-commits] Commit in vi/repos (core-x86_64 testing-x86_64)

2010-03-14 Thread Paul Mattal
Date: Sunday, March 14, 2010 @ 11:24:48
  Author: paul
Revision: 72370

db-move: moved vi from [testing] to [core] (x86_64)

Added:
  vi/repos/core-x86_64/
Deleted:
  vi/repos/testing-x86_64/



[arch-commits] Commit in vi/trunk (6 files)

2010-03-07 Thread Paul Mattal
Date: Sunday, March 7, 2010 @ 14:09:56
  Author: paul
Revision: 71573

package cleanup per FS#18215

Added:
  vi/trunk/navkeys.patch
Modified:
  vi/trunk/PKGBUILD
Deleted:
  vi/trunk/c_locale.patch
  vi/trunk/db47-hack.patch
  vi/trunk/du.patch
  vi/trunk/widechar.patch

-+
 PKGBUILD|   40 +---
 c_locale.patch  |   30 
 db47-hack.patch |   27 -
 du.patch|   67 --
 navkeys.patch   |   55 
 widechar.patch  |   67 --
 6 files changed, 77 insertions(+), 209 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-07 18:52:27 UTC (rev 71572)
+++ PKGBUILD2010-03-07 19:09:56 UTC (rev 71573)
@@ -3,7 +3,7 @@
 
 pkgname=vi
 pkgver=050325
-pkgrel=2
+pkgrel=3
 pkgdesc='The original ex/vi text editor.'
 arch=('i686' 'x86_64')
 url='http://ex-vi.sourceforge.net/'
@@ -12,25 +12,29 @@
 groups=('base')
 options=(force strip !libtool emptydirs)
 source=(http://downloads.sourceforge.net/sourceforge/ex-vi/ex-${pkgver}.tar.bz2
-du.patch increase-tube.patch exrc.sample)
-md5sums=('e668595254233e4d96811083a3e4e2f3' '2d80fbc7d612963466d9ae45058a3778' 
\
+navkeys.patch increase-tube.patch exrc.sample)
+md5sums=('e668595254233e4d96811083a3e4e2f3' 'aac133930047eafa4f28736cfaf976b3'
  'e596e05a00a24187b576e389fa1de45d' 'd3b483c994d859232ce369b82a4b5668')
 
 build() {
-  cd ${srcdir}/ex-${pkgver}
-  sed -i -e 's/^PREFIX.*$/PREFIX = \/usr/' Makefile
-  sed -i -e 's/^LIBEXECDIR.*$/LIBEXECDIR = $(PREFIX)\/lib\/ex/' Makefile
-  sed -i -e 's/^PRESERVEDIR.*$/PRESERVEDIR = \/var\/lib\/ex/' Makefile
-  sed -i -e 's/^DESTDIR.*$/DESTDIR = ..\/..\/pkg/' Makefile
-  sed -i -e 's/^INSTALL.*$/INSTALL = \/bin\/install/' Makefile
-  sed -i -e 's/^FEATURES.*$/FEATURES = -DCHDIR -DFASTTAG -DUCVISUAL -DMB 
-DBIT8/' Makefile
-  sed -i -e 's/^TERMLIB.*$/TERMLIB = ncurses/' Makefile
-  sed -i -e 's/^\.B \/usr\/libexec/.B \/usr\/lib\/ex/' vi.1
-  sed -i -e 's/^\.B \/var\/preserve$/.B \/var\/lib\/ex/' vi.1
-  patch -Np1 -i ../du.patch || return 1
+  cd ${srcdir}/ex-${pkgver} || return 1
+
+  # apply patches
+  patch -Np1 -i  ../navkeys.patch || return 1
   patch -Np0 -i ../increase-tube.patch || return 1
-  make || return 1
-  make install
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/vi/LICENSE
-  install -D -m644 ${srcdir}/exrc.sample ${pkgdir}/etc/exrc.sample
+
+  # correct paths in manpages
+  sed -i -e 's/^\.B \/usr\/libexec/.B \/usr\/lib\/ex/' vi.1 \
+  || return 1
+  sed -i -e 's/^\.B \/var\/preserve$/.B \/var\/lib\/ex/' vi.1 \
+  || return 1
+
+  make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \
+  'FEATURES=-DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8' TERMLIB=ncurses \
+  || return 1
+  make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex 
INSTALL=/bin/install \
+  DESTDIR=$pkgdir install || return 1
+
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE \
+  || return 1
 }

Deleted: c_locale.patch
===
--- c_locale.patch  2010-03-07 18:52:27 UTC (rev 71572)
+++ c_locale.patch  2010-03-07 19:09:56 UTC (rev 71573)
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 27support_C_locale.dpatch by  he...@pool.math.tu-berlin.de
-##
-## DP: Allow users to edit 8-bit files even under LC_CTYPE=C.
-
-...@dpatch@
 nvi-1.81.6.orig/common/conv.c  2007-11-18 17:41:42.0 +0100
-+++ nvi-1.81.6/common/conv.c   2009-03-09 16:45:37.812022582 +0100
-@@ -322,11 +322,16 @@
- else {
-   setlocale(LC_ALL, );
- #ifdef USE_WIDECHAR
--  sp-conv.sys2int = cs_char2int;
--  sp-conv.int2sys = cs_int2char;
--  sp-conv.file2int = fe_char2int;
--  sp-conv.int2file = fe_int2char;
--  sp-conv.input2int = ie_char2int;
-+  if (!strcmp(LANGCODESET, ANSI_X3.4-1968)) {
-+  sp-conv.file2int = sp-conv.input2int = sp-conv.sys2int = raw2int;
-+  sp-conv.int2sys = sp-conv.int2file = int2raw;
-+  } else {
-+  sp-conv.sys2int = cs_char2int;
-+  sp-conv.int2sys = cs_int2char;
-+  sp-conv.file2int = fe_char2int;
-+  sp-conv.int2file = fe_int2char;
-+  sp-conv.input2int = ie_char2int;
-+  }
- #endif
- #ifdef USE_ICONV
-   o_set(sp, O_FILEENCODING, OS_STRDUP, nl_langinfo(CODESET), 0);

Deleted: db47-hack.patch
===
--- db47-hack.patch 2010-03-07 18:52:27 UTC (rev 71572)
+++ db47-hack.patch 2010-03-07 19:09:56 UTC (rev 71573)
@@ -1,27 +0,0 @@
-diff --git a/cl/cl_main.c b/cl/cl_main.c
-index 0ecbe44..87feb28 100644
 a/cl/cl_main.c
-+++ b/cl/cl_main.c
-@@ -57,6 +57,9 @@ main(int argc, char **argv)
-   int 

[arch-commits] Commit in vi/repos (testing-i686)

2010-03-07 Thread Paul Mattal
Date: Sunday, March 7, 2010 @ 14:37:59
  Author: paul
Revision: 71574

archrelease: copy trunk to testing-i686

Added:
  vi/repos/testing-i686/



[arch-commits] Commit in vi/repos (core-i686)

2010-02-15 Thread Paul Mattal
Date: Monday, February 15, 2010 @ 07:20:41
  Author: paul
Revision: 68947

db-move: vi removed by paul for move to core

Deleted:
  vi/repos/core-i686/



[arch-commits] Commit in vi/repos (core-i686 testing-i686)

2010-02-15 Thread Paul Mattal
Date: Monday, February 15, 2010 @ 07:20:41
  Author: paul
Revision: 68948

db-move: moved vi from [testing] to [core] (i686)

Added:
  vi/repos/core-i686/
Deleted:
  vi/repos/testing-i686/



[arch-commits] Commit in vi/repos (core-x86_64)

2010-02-15 Thread Paul Mattal
Date: Monday, February 15, 2010 @ 07:20:49
  Author: paul
Revision: 68949

db-move: vi removed by paul for move to core

Deleted:
  vi/repos/core-x86_64/



[arch-commits] Commit in vi/repos (core-x86_64 testing-x86_64)

2010-02-15 Thread Paul Mattal
Date: Monday, February 15, 2010 @ 07:20:50
  Author: paul
Revision: 68950

db-move: moved vi from [testing] to [core] (x86_64)

Added:
  vi/repos/core-x86_64/
Deleted:
  vi/repos/testing-x86_64/



[arch-commits] Commit in vi/repos (testing-i686)

2010-02-09 Thread Paul Mattal
Date: Tuesday, February 9, 2010 @ 07:02:35
  Author: paul
Revision: 67890

archrelease: new repo testing-i686

Added:
  vi/repos/testing-i686/



[arch-commits] Commit in vi/repos (testing-i686)

2010-02-09 Thread Paul Mattal
Date: Tuesday, February 9, 2010 @ 07:02:42
  Author: paul
Revision: 67891

Initialized merge tracking via svnmerge with revisions 1-67889 from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/vi/trunk

Modified:
  vi/repos/testing-i686/(properties)


Property changes on: vi/repos/testing-i686
___
Added: svnmerge-integrated
   + /vi/trunk:1-67889



[arch-commits] Commit in vi/repos (testing-x86_64)

2010-02-09 Thread Paul Mattal
Date: Tuesday, February 9, 2010 @ 13:28:27
  Author: paul
Revision: 67922

archrelease: new repo testing-x86_64

Added:
  vi/repos/testing-x86_64/



[arch-commits] Commit in vi/repos (testing-x86_64)

2010-02-09 Thread Paul Mattal
Date: Tuesday, February 9, 2010 @ 13:28:33
  Author: paul
Revision: 67923

Initialized merge tracking via svnmerge with revisions 1-67921 from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/vi/trunk

Modified:
  vi/repos/testing-x86_64/  (properties)


Property changes on: vi/repos/testing-x86_64
___
Added: svnmerge-integrated
   + /vi/trunk:1-67921