diff options
Diffstat (limited to 'abs/core')
| -rw-r--r-- | abs/core/vi/PKGBUILD | 49 | ||||
| -rw-r--r-- | abs/core/vi/preserve_dir.patch | 81 |
2 files changed, 109 insertions, 21 deletions
diff --git a/abs/core/vi/PKGBUILD b/abs/core/vi/PKGBUILD index 83151a8..0a5c7f8 100644 --- a/abs/core/vi/PKGBUILD +++ b/abs/core/vi/PKGBUILD @@ -1,40 +1,47 @@ -# $Id: PKGBUILD 71573 2010-03-07 19:09:56Z paul $ +# $Id: PKGBUILD 160405 2012-06-01 18:35:53Z eric $ # Maintainer: tobias [ tobias at archlinux org ] pkgname=vi pkgver=050325 -pkgrel=3 +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=(force strip !libtool emptydirs) +options=(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 - - # 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 + 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 \ - || return 1 - make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex INSTALL=/bin/install \ - "DESTDIR=$pkgdir" install || return 1 + '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 \ - || return 1 + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/abs/core/vi/preserve_dir.patch b/abs/core/vi/preserve_dir.patch new file mode 100644 index 0000000..5209f7b --- /dev/null +++ b/abs/core/vi/preserve_dir.patch @@ -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.000000000 -0500 ++++ ex-050325/ex.1 2011-02-01 16:21:51.496666674 -0500 +@@ -1950,7 +1950,7 @@ + .B /var/tmp/Rx\fInnnnnnnnnn\fP + named buffer temporary + .TP +-.B /var/preserve ++.B /var/lib/ex + preservation directory + .SH DOCUMENTATION + The document +diff -Naur ex-050325.ori/expreserve.c ex-050325/expreserve.c +--- ex-050325.ori/expreserve.c 2005-03-04 07:44:46.000000000 -0500 ++++ ex-050325/expreserve.c 2011-02-01 16:22:06.583333342 -0500 +@@ -272,7 +272,7 @@ + #ifdef notdef + char pattern[] = "/usr/preserve/Exaa`XXXXX"; + #else +-char pattern[] = "/var/preserve/Exa`XXXXXXXXXX"; ++char pattern[] = "/var/lib/ex/Exa`XXXXXXXXXX"; + #endif + + /* +@@ -296,7 +296,7 @@ + timestamp = ctime(&time); + timestamp[16] = 0; /* blast from seconds on */ + putenv("MAILRC=/dev/null"); +- sprintf(cmd, "/bin/mail %s", pp->pw_name); ++ sprintf(cmd, "/usr/bin/mail %s", pp->pw_name); + setuid(getuid()); + mf = popen(cmd, "w"); + if (mf == NULL) +diff -Naur ex-050325.ori/exrecover.c ex-050325/exrecover.c +--- ex-050325.ori/exrecover.c 2005-03-04 07:44:46.000000000 -0500 ++++ ex-050325/exrecover.c 2011-02-01 16:21:51.496666674 -0500 +@@ -167,7 +167,7 @@ + #ifdef notdef + char mydir[] = "/usr/preserve"; + #else +-char mydir[] = "/var/preserve"; ++char mydir[] = "/var/lib/ex"; + #endif + + /* +diff -Naur ex-050325.ori/ex.spec ex-050325/ex.spec +--- ex-050325.ori/ex.spec 2005-03-24 18:50:09.000000000 -0500 ++++ ex-050325/ex.spec 2011-02-01 16:21:51.496666674 -0500 +@@ -20,7 +20,7 @@ + %define libexecdir %{prefix}/5lib + %define mandir %{prefix}/share/man/5man + +-%define preservedir /var/preserve ++%define preservedir /var/lib/ex + + # install command + %define ucbinstall install +diff -Naur ex-050325.ori/Makefile ex-050325/Makefile +--- ex-050325.ori/Makefile 2005-03-24 18:50:09.000000000 -0500 ++++ ex-050325/Makefile 2011-02-01 16:21:51.496666674 -0500 +@@ -83,7 +83,7 @@ + BINDIR = $(PREFIX)/bin + LIBEXECDIR = $(PREFIX)/libexec + MANDIR = $(PREFIX)/share/man +-PRESERVEDIR = /var/preserve ++PRESERVEDIR = /var/lib/ex + + # + # DESTDIR is prepended to the installation paths. It is mostly useful +diff -Naur ex-050325.ori/vi.1 ex-050325/vi.1 +--- ex-050325.ori/vi.1 2005-02-17 07:39:36.000000000 -0500 ++++ ex-050325/vi.1 2011-02-01 16:21:51.496666674 -0500 +@@ -979,7 +979,7 @@ + .B /var/tmp/Rx\fInnnnnnnnnn\fP + named buffer temporary + .TP +-.B /var/preserve ++.B /var/lib/ex + preservation directory + .SH SEE ALSO + ex(1), |