Commit 41055d49 authored by Anke's avatar Anke

continuation of glibc/core update/rebuilds, vi rebuild

parent 95eade3c
# $Id: PKGBUILD 71573 2010-03-07 19:09:56Z paul $
# Maintainer: tobias [ tobias at archlinux org ]
#
# Core Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
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/'
......@@ -12,29 +18,29 @@ depends=('ncurses')
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)
navkeys.patch increase-tube.patch exrc.sample preserve_dir.patch)
md5sums=('e668595254233e4d96811083a3e4e2f3' 'aac133930047eafa4f28736cfaf976b3'
'e596e05a00a24187b576e389fa1de45d' 'd3b483c994d859232ce369b82a4b5668')
'e596e05a00a24187b576e389fa1de45d' 'd3b483c994d859232ce369b82a4b5668'
'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
'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 || 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"
}
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),
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment