summaryrefslogtreecommitdiff
path: root/core/vi
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-11-22 14:05:07 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-11-22 14:05:07 -0300
commitc5d0267480dce7ea1149cae6f63111678588c772 (patch)
treed06726989018701c05b8c93b1b548f14cfc541f3 /core/vi
parenta221a452890917ec65b617a0be21b472a63e2a81 (diff)
parent13c6302fab6118693af345756375923b9fb7da69 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/allegro/PKGBUILD community/erlang/PKGBUILD community/python-openbabel/PKGBUILD core/vi/PKGBUILD extra/accountsservice/PKGBUILD extra/calligra/PKGBUILD kde-unstable/kactivities/PKGBUILD kde-unstable/kdeaccessibility-jovie/PKGBUILD kde-unstable/kdeaccessibility-kaccessible/PKGBUILD kde-unstable/kdeaccessibility-kmag/PKGBUILD kde-unstable/kdeaccessibility-kmousetool/PKGBUILD kde-unstable/kdeaccessibility-kmouth/PKGBUILD kde-unstable/kdeadmin/PKGBUILD kde-unstable/kdeartwork/PKGBUILD kde-unstable/kdebase-konsole/PKGBUILD kde-unstable/kdebase-workspace/PKGBUILD kde-unstable/kdebase-workspace/kde-np.pam kde-unstable/kdebase-workspace/kde.pam kde-unstable/kdebase-workspace/kdebase-workspace.install kde-unstable/kdebase/PKGBUILD kde-unstable/kdebindings-kimono/PKGBUILD kde-unstable/kdebindings-korundum/PKGBUILD kde-unstable/kdebindings-korundum/ruby19.patch kde-unstable/kdebindings-kross/PKGBUILD kde-unstable/kdebindings-perlkde/PKGBUILD kde-unstable/kdebindings-perlqt/PKGBUILD kde-unstable/kdebindings-python/PKGBUILD kde-unstable/kdebindings-qtruby/PKGBUILD kde-unstable/kdebindings-qyoto/PKGBUILD kde-unstable/kdebindings-smokegen/PKGBUILD kde-unstable/kdebindings-smokekde/PKGBUILD kde-unstable/kdebindings-smokeqt/PKGBUILD kde-unstable/kdeedu-analitza/PKGBUILD kde-unstable/kdeedu-blinken/PKGBUILD kde-unstable/kdeedu-cantor/PKGBUILD kde-unstable/kdeedu-kalgebra/PKGBUILD kde-unstable/kdeedu-kalzium/PKGBUILD kde-unstable/kdeedu-kalzium/kdeedu-kalzium.install kde-unstable/kdeedu-kanagram/PKGBUILD kde-unstable/kdeedu-kbruch/PKGBUILD kde-unstable/kdeedu-kgeography/PKGBUILD kde-unstable/kdeedu-khangman/PKGBUILD kde-unstable/kdeedu-kig/PKGBUILD kde-unstable/kdeedu-kiten/PKGBUILD kde-unstable/kdeedu-klettres/PKGBUILD kde-unstable/kdeedu-kmplot/PKGBUILD kde-unstable/kdeedu-kstars/PKGBUILD kde-unstable/kdeedu-ktouch/PKGBUILD kde-unstable/kdeedu-kturtle/PKGBUILD kde-unstable/kdeedu-kwordquiz/PKGBUILD kde-unstable/kdeedu-marble/PKGBUILD kde-unstable/kdeedu-marble/kdeedu-marble.install kde-unstable/kdeedu-pairs/PKGBUILD kde-unstable/kdeedu-parley/PKGBUILD kde-unstable/kdeedu-rocs/PKGBUILD kde-unstable/kdeedu-step/PKGBUILD kde-unstable/kdegraphics-gwenview/PKGBUILD kde-unstable/kdegraphics-kamera/PKGBUILD kde-unstable/kdegraphics-kcolorchooser/PKGBUILD kde-unstable/kdegraphics-kgamma/PKGBUILD kde-unstable/kdegraphics-kolourpaint/PKGBUILD kde-unstable/kdegraphics-kruler/PKGBUILD kde-unstable/kdegraphics-ksaneplugin/PKGBUILD kde-unstable/kdegraphics-ksnapshot/PKGBUILD kde-unstable/kdegraphics-mobipocket/PKGBUILD kde-unstable/kdegraphics-okular/PKGBUILD kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD kde-unstable/kdegraphics-svgpart/PKGBUILD kde-unstable/kdegraphics-thumbnailers/PKGBUILD kde-unstable/kdemultimedia-audiocd-kio/PKGBUILD kde-unstable/kdemultimedia-dragonplayer/PKGBUILD kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD kde-unstable/kdemultimedia-juk/PKGBUILD kde-unstable/kdemultimedia-kmix/PKGBUILD kde-unstable/kdemultimedia-kscd/PKGBUILD kde-unstable/kdemultimedia-mplayerthumbs/PKGBUILD kde-unstable/kdenetwork/PKGBUILD kde-unstable/kdepim-runtime/PKGBUILD kde-unstable/kdepim/PKGBUILD kde-unstable/kdepim/fix-build.patch kde-unstable/kdepimlibs/PKGBUILD kde-unstable/kdeplasma-addons/PKGBUILD kde-unstable/kdesdk-kate/PKGBUILD kde-unstable/kdesdk-kate/pkgbuild-syntax-highlight.patch kde-unstable/kdesdk/PKGBUILD kde-unstable/kdetoys/PKGBUILD kde-unstable/kdeutils-filelight/PKGBUILD kde-unstable/kdeutils-kcalc/PKGBUILD kde-unstable/kdeutils-kcharselect/PKGBUILD kde-unstable/kdeutils-kdf/PKGBUILD kde-unstable/kdeutils-kfloppy/PKGBUILD kde-unstable/kdeutils-kgpg/PKGBUILD kde-unstable/kdeutils-kremotecontrol/PKGBUILD kde-unstable/kdeutils-ktimer/PKGBUILD kde-unstable/kdeutils-kwallet/PKGBUILD kde-unstable/kdeutils-superkaramba/PKGBUILD kde-unstable/kdeutils-sweeper/PKGBUILD kde-unstable/kdewebdev/PKGBUILD kde-unstable/libkcddb/PKGBUILD kde-unstable/libkcompactdisc/PKGBUILD kde-unstable/libkdcraw/PKGBUILD kde-unstable/libkdeedu/PKGBUILD kde-unstable/libkexiv2/PKGBUILD kde-unstable/libkipi/PKGBUILD kde-unstable/libksane/PKGBUILD kde-unstable/nepomuk-core/PKGBUILD
Diffstat (limited to 'core/vi')
-rw-r--r--core/vi/PKGBUILD11
-rw-r--r--core/vi/preserve_dir.patch42
2 files changed, 34 insertions, 19 deletions
diff --git a/core/vi/PKGBUILD b/core/vi/PKGBUILD
index d68930a03..ca5eaf501 100644
--- a/core/vi/PKGBUILD
+++ b/core/vi/PKGBUILD
@@ -1,33 +1,30 @@
-# $Id: PKGBUILD 160405 2012-06-01 18:35:53Z eric $
+# $Id: PKGBUILD 171607 2012-11-20 05:26:38Z eric $
# Maintainer: tobias [ tobias at archlinux org ]
pkgname=vi
pkgver=050325
-pkgrel=2.1
+pkgrel=3
epoch=1
pkgdesc='The original ex/vi text editor.'
arch=('i686' 'x86_64' 'mips64el')
url='http://ex-vi.sourceforge.net/'
license=('custom:ex')
depends=('ncurses')
-optdepends=('mailx: used by the preserve command for notification')
+optdepends=('heirloom-mailx: used by the preserve command for notification')
groups=('base')
options=(strip !libtool emptydirs)
source=(http://downloads.sourceforge.net/sourceforge/ex-vi/ex-${pkgver}.tar.bz2
- exrc.sample
navkeys.patch
increase-tube.patch
preserve_dir.patch)
md5sums=('e668595254233e4d96811083a3e4e2f3'
- 'd3b483c994d859232ce369b82a4b5668'
'aac133930047eafa4f28736cfaf976b3'
'e596e05a00a24187b576e389fa1de45d'
- '419a8755e0dd16e95542bc107e6d2b24')
+ '8c6d3503e7c41a4413145ae49a7f2b80')
build() {
cd "${srcdir}/ex-${pkgver}"
- # apply patches
patch -Np1 -i ../navkeys.patch
patch -Np0 -i ../increase-tube.patch
# FS#20653
diff --git a/core/vi/preserve_dir.patch b/core/vi/preserve_dir.patch
index 5209f7b02..ddfe8783a 100644
--- a/core/vi/preserve_dir.patch
+++ b/core/vi/preserve_dir.patch
@@ -43,18 +43,6 @@ diff -Naur ex-050325.ori/exrecover.c ex-050325/exrecover.c
#endif
/*
-diff -Naur ex-050325.ori/ex.spec ex-050325/ex.spec
---- ex-050325.ori/ex.spec 2005-03-24 18:50:09.000000000 -0500
-+++ ex-050325/ex.spec 2011-02-01 16:21:51.496666674 -0500
-@@ -20,7 +20,7 @@
- %define libexecdir %{prefix}/5lib
- %define mandir %{prefix}/share/man/5man
-
--%define preservedir /var/preserve
-+%define preservedir /var/lib/ex
-
- # install command
- %define ucbinstall install
diff -Naur ex-050325.ori/Makefile ex-050325/Makefile
--- ex-050325.ori/Makefile 2005-03-24 18:50:09.000000000 -0500
+++ ex-050325/Makefile 2011-02-01 16:21:51.496666674 -0500
@@ -79,3 +67,33 @@ diff -Naur ex-050325.ori/vi.1 ex-050325/vi.1
preservation directory
.SH SEE ALSO
ex(1),
+--- ex-050325.original/ex.1 2012-01-27 20:43:00.602119283 +0100
++++ ex-050325/ex.1 2012-01-27 20:47:24.535436516 +0100
+@@ -1932,10 +1932,10 @@
+ Determines the terminal type.
+ .SH FILES
+ .TP
+-.B /usr/libexec/expreserve
++.B /usr/lib/ex/expreserve
+ preserve command
+ .TP
+-.B /usr/libexec/exrecover
++.B /usr/lib/ex/exrecover
+ recover command
+ .TP
+ .B /etc/termcap
+--- ex-050325.original/vi.1 2012-01-27 20:43:00.602119283 +0100
++++ ex-050325/vi.1 2012-01-27 20:46:33.815439611 +0100
+@@ -961,10 +961,10 @@
+ Determines the terminal type.
+ .SH FILES
+ .TP
+-.B /usr/libexec/expreserve
++.B /usr/lib/ex/expreserve
+ preserve command
+ .TP
+-.B /usr/libexec/exrecover
++.B /usr/lib/ex/exrecover
+ recover command
+ .TP
+ .B /etc/termcap