Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwonarm.git;a=commitdiff;h=43873472b31d2d381b0f25bd81592a54f623f941
commit 43873472b31d2d381b0f25bd81592a54f623f941 Author: Elentir <elen...@frugalware.org> Date: Sun Feb 27 19:35:40 2011 +0000 elvis-2.2_0-2-arm * add arm to archs * fix build diff --git a/source/base/elvis/FrugalBuild b/source/base/elvis/FrugalBuild index becd850..42f2f8a 100644 --- a/source/base/elvis/FrugalBuild +++ b/source/base/elvis/FrugalBuild @@ -3,24 +3,27 @@ pkgname=elvis pkgver=2.2_0 -pkgrel=1 +pkgrel=2 pkgdesc="A free vi clone for Unix and other operating systems." url="http://elvis.the-little-red-haired-girl.org/"; depends=('ncurses') replaces=('nvi') groups=('base') -archs=('i686' 'x86_64' 'ppc') +archs=('i686' 'x86_64' 'ppc' 'arm') up2date="Flasttar ftp://ftp.cs.pdx.edu/pub/elvis/"; -source=(ftp://ftp.cs.pdx.edu/pub/elvis/elvis-$pkgver.tar.gz) -sha1sums=('8c16574b6d36529735b8ced70972ddaf6275a477') +source=(ftp://ftp.cs.pdx.edu/pub/elvis/elvis-$pkgver.tar.gz \ + elvis-patch-ref.patch) +sha1sums=('8c16574b6d36529735b8ced70972ddaf6275a477' \ + 'b068feb18b764dbf71a4266a5bff98a162f725eb') build() { + Fpatchall Fmkdir /bin /etc /usr/share/man/man1 Fsed '/etc/elvis' "$Fdestdir/etc/elvis" Makefile.in # turn off color by default Fsed 'color' '"color' data/elvis.clr - Fconf + Fconf --docdir=$Fdestdir/usr/share/elvis/doc make CC="gcc $CFLAGS" || return 1 export MANPATH=$Fdestdir/usr/share/man Fmakeinstall PREFIX=$Fdestdir/usr diff --git a/source/base/elvis/elvis-patch-ref.patch b/source/base/elvis/elvis-patch-ref.patch new file mode 100644 index 0000000..09b7878 --- /dev/null +++ b/source/base/elvis/elvis-patch-ref.patch @@ -0,0 +1,49 @@ +$NetBSD: patch-ref.c,v 1.1 2009/10/03 10:14:18 ahoka Exp $ + +--- ref.c.orig 2003-10-21 04:32:25.000000000 +0200 ++++ ref.c +@@ -42,7 +42,7 @@ typedef enum + + #if USE_PROTOTYPES + static void usage(char *argv0); +-static char *getline(FILE *fp); ++static char *_getline(FILE *fp); + static void store(char *line, char **list); + static LINECLS classify(char *line, LINECLS prev); + static void lookup(TAG *tag); +@@ -171,7 +171,7 @@ ELVBOOL ioclose() + /* This function reads a single line, and replaces the terminating newline with + * a '\0' byte. The string will be in a static buffer. Returns NULL at EOF. + */ +-static char *getline(fp) ++static char *_getline(fp) + FILE *fp; + { + int ch; +@@ -348,7 +348,7 @@ static void lookup(tag) + } + + /* for each line... */ +- for (lnum = 1, lc = LC_COMPLETE; (line = getline(fp)) != NULL; lnum++) ++ for (lnum = 1, lc = LC_COMPLETE; (line = _getline(fp)) != NULL; lnum++) + { + /* is this the tag definition? */ + if (taglnum > 0 ? taglnum == lnum : !strncmp(tagline, line, len)) +@@ -377,7 +377,7 @@ static void lookup(tag) + { + if (strchr(line, '(') != NULL) + { +- while ((line = getline(fp)) != NULL ++ while ((line = _getline(fp)) != NULL + && *line + && ((*line != '#' && *line != '{') + || line[strlen(line) - 1] == '\\')) +@@ -387,7 +387,7 @@ static void lookup(tag) + } + else if ((lc = classify(line, lc)) == LC_PARTIAL) + { +- while ((line = getline(fp)) != NULL ++ while ((line = _getline(fp)) != NULL + && (lc = classify(line, lc)) == LC_PARTIAL) + { + puts(line); _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
