Kaydet (Commit) 20fd151c authored tarafından Suleyman Poyraz's avatar Suleyman Poyraz

LFS-9.0 svn 20190918

üst d176c7a8
......@@ -9,23 +9,10 @@ from inary.actionsapi import inarytools
from inary.actionsapi import get
WorkDir = "ex-{}".format(get.srcVERSION())
def setup():
autotools.configure()
def build():
autotools.make('PREFIX=/usr \
LIBEXECDIR=/usr/lib/ex \
PRESERVEDIR=/var/lib/ex \
TERMLIB=ncurses \
FEATURES="-DCHDIR \
-DFASTTAG \
-DUCVISUAL \
-DMB \
-DBIT8"')
autotools.make()
def install():
autotools.rawInstall("PREFIX=/usr \
LIBEXECDIR=/usr/lib/ex \
PRESERVEDIR=/var/lib/ex \
INSTALL=/usr/bin/install \
DESTDIR=%s" % get.installDIR())
inarytools.dodoc("LICENSE")
autotools.install()
......@@ -11,15 +11,10 @@
<License>custom:ex</License>
<Summary>The original ex/vi text editor</Summary>
<Description>The original ex/vi text editor.</Description>
<Archive sha1sum="8819f67ac6b9cd47cd39c87a53a2ab00de63029a" type="tarxz">https://github.com/vim/vim/archive/v8.1.1846/vim-8.1.1846.tar.gz</Archive>
<Archive sha1sum="8819f67ac6b9cd47cd39c87a53a2ab00de63029a" type="targz">https://github.com/vim/vim/archive/v8.1.1846/vim-8.1.1846.tar.gz</Archive>
<BuildDependencies>
<Dependency>ncurses-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch>preserve_dir.patch</Patch>
<Patch>fix-tubesize.patch</Patch>
<Patch>navkeys.patch</Patch>
</Patches>
</Source>
<Package>
......
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from inary.actionsapi import autotools
from inary.actionsapi import inarytools
from inary.actionsapi import get
def setup():
autotools.configure()
def build():
autotools.make()
def install():
autotools.install()
diff -upr ex-070224.orig/ex_vis.h ex-070224/ex_vis.h
--- ex-070224.orig/ex_vis.h 2005-08-06 14:41:15.000000000 +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
diff -ru ex-050325/ex_tty.c ex-050325-du/ex_tty.c
--- ex-050325/ex_tty.c 2005-03-04 13:42:58.000000000 +0100
+++ ex-050325-du/ex_tty.c 2009-06-25 20:06:57.000000000 +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);
+ 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 = "albcbtcdceclcmcrcsdcdldmdoedeik0k1k2k3k4k5k6k7k8k9hoicimipkdkekhklkrkskullndnlpcrcscsesfsosrtatetiupvbvsveALDLUPDOLERI";
+ namp = "albcbtcdceclcmcrcsdcdldmdoedeik0k1k2k3k4k5k6k7k8k9hoicimipkdkekhklkrkskullndnlpcrcscsesfsosrtatetiupvbvsveALDLUPDOLERIkIkDkh@7kPkN";
sp = sstrs;
do {
string = tgetstr(namp, &aoftspace);
diff -ru ex-050325/ex_tty.h ex-050325-du/ex_tty.h
--- ex-050325/ex_tty.h 2004-12-01 19:21:06.000000000 +0100
+++ ex-050325-du/ex_tty.h 2009-06-25 20:06:05.000000000 +0200
@@ -183,6 +183,15 @@
var bool XX; /* Tektronix 4025 insert line */
/* X? is reserved for severely nauseous glitches */
/* If there are enough of these we may need bit masks! */
+/*
+ * Insert, Delete, Home, End, PgUp an PgDown keys
+ */
+var char *kI;
+var char *kD;
+var char *kh;
+var char *at7;
+var char *kP;
+var char *kN;
/*
* From the tty modes...
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/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),
--- 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
" Begin /etc/vimrc
" Ensure defaults are set before customizing settings, not after
source $VIMRUNTIME/defaults.vim
let skip_defaults_vim=1
set nocompatible
set backspace=2
set mouse=
syntax on
if (&term == "xterm") || (&term == "putty")
set background=dark
endif
" End /etc/vimrc
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE INARY SYSTEM "https://raw.githubusercontent.com/Zaryob/inary/master/inary-spec.dtd">
<INARY>
<Source>
<Name>vi</Name>
<Homepage>http://ex-vi.sourceforge.net/</Homepage>
<Packager>
<Name>Suleyman Poyraz</Name>
<Email>zaryob.dev@gmail.com</Email>
</Packager>
<License>custom:ex</License>
<Summary>Vi improved text editor</Summary>
<Description>Improved version of original ex/vi text editor.</Description>
<Archive sha1sum="8819f67ac6b9cd47cd39c87a53a2ab00de63029a" type="targz">https://github.com/vim/vim/archive/v8.1.1846/vim-8.1.1846.tar.gz</Archive>
<BuildDependencies>
<Dependency>ncurses-devel</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>vi</Name>
<IsA>app:console</IsA>
<RuntimeDependencies>
<Dependency>ncurses</Dependency>
</RuntimeDependencies>
<Conflicts>
<Package>gvim</Package>
<Package>vim</Package>
</Conflicts>
<Files>
<Path fileType="executable">/usr/bin/vi*</Path>
<Path fileType="executable">/usr/bin/rvi*</Path>
<Path fileType="executable">/usr/bin/ex</Path>
<Path fileType="executable">/usr/bin/xxd</Path>
<Path fileType="executable">/usr/bin/vedit</Path>
<Path fileType="executable">/usr/bin/edit</Path>
<Path fileType="library">/usr/lib/ex</Path>
<Path fileType="library">/var/lib/ex</Path>
<Path fileType="data">/usr/share/man/</Path>
<Path fileType="doc">/usr/share/doc/</Path>
</Files>
<AdditionalFiles>
<AdditionalFile target="/etc/vimrc">vimrc</AdditionalFile>
</AdditionalFiles>
</Package>
<History>
<Update release="1">
<Date>2019-09-07</Date>
<Version>8.1.1846</Version>
<Comment>First release.</Comment>
<Name>Suleyman Poyraz</Name>
<Email>zaryob.dev@gmail.com</Email>
</Update>
</History>
</INARY>
......@@ -37,6 +37,13 @@
</Package>
<History>
<Update release="2">
<Date>2019-09-18</Date>
<Version>2.16</Version>
<Comment>Package is rebuilded because of perl upgrade and released up.</Comment>
<Name>Süleyman Poyraz</Name>
<Email>zaryob.dev@gmail.com</Email>
</Update>
<Update release="1">
<Date>2019-09-16</Date>
<Version>2.16</Version>
......
......@@ -38,6 +38,13 @@
</Package>
<History>
<Update release="2">
<Date>2019-09-18</Date>
<Version>4.44</Version>
<Comment>Package is rebuilded because of perl upgrade and released up.</Comment>
<Name>Süleyman Poyraz</Name>
<Email>zaryob.dev@gmail.com</Email>
</Update>
<Update release="1">
<Date>2019-09-19</Date>
<Version>4.44</Version>
......
......@@ -31,6 +31,13 @@
</Package>
<History>
<Update release="2">
<Date>2019-09-18</Date>
<Version>2013</Version>
<Comment>Package is rebuilded because of perl upgrade and released up.</Comment>
<Name>Süleyman Poyraz</Name>
<Email>zaryob.dev@gmail.com</Email>
</Update>
<Update release="1">
<Date>2019-09-16</Date>
<Version>2013</Version>
......
......@@ -32,6 +32,13 @@
</Package>
<History>
<Update release="2">
<Date>2019-09-18</Date>
<Version>0.48</Version>
<Comment>Package is rebuilded because of perl upgrade and released up.</Comment>
<Name>Süleyman Poyraz</Name>
<Email>zaryob.dev@gmail.com</Email>
</Update>
<Update release="1">
<Date>2019-09-16</Date>
<Version>0.48</Version>
......
......@@ -31,6 +31,13 @@
</Package>
<History>
<Update release="2">
<Date>2019-09-18</Date>
<Version>2.173</Version>
<Comment>Package is rebuilded because of perl upgrade and released up.</Comment>
<Name>Süleyman Poyraz</Name>
<Email>zaryob.dev@gmail.com</Email>
</Update>
<Update release="1">
<Date>2019-04-13</Date>
<Version>2.173</Version>
......
......@@ -31,6 +31,13 @@
</Package>
<History>
<Update release="2">
<Date>2019-09-18</Date>
<Version>2.18</Version>
<Comment>Package is rebuilded because of perl upgrade and released up.</Comment>
<Name>Süleyman Poyraz</Name>
<Email>zaryob.dev@gmail.com</Email>
</Update>
<Update release="1">
<Date>2019-09-16</Date>
<Version>2.18</Version>
......
......@@ -33,6 +33,13 @@
</Package>
<History>
<Update release="2">
<Date>2019-09-18</Date>
<Version>1.03</Version>
<Comment>Package is rebuilded because of perl upgrade and released up.</Comment>
<Name>Süleyman Poyraz</Name>
<Email>zaryob.dev@gmail.com</Email>
</Update>
<Update release="1">
<Date>2019-09-16</Date>
<Version>1.03</Version>
......
......@@ -32,6 +32,13 @@
</Package>
<History>
<Update release="2">
<Date>2019-09-18</Date>
<Version>2.13</Version>
<Comment>Package is rebuilded because of perl upgrade and released up.</Comment>
<Name>Süleyman Poyraz</Name>
<Email>zaryob.dev@gmail.com</Email>
</Update>
<Update release="1">
<Date>2019-09-16</Date>
<Version>2.13</Version>
......
......@@ -31,6 +31,13 @@
</Package>
<History>
<Update release="2">
<Date>2019-09-18</Date>
<Version>1.05</Version>
<Comment>Package is rebuilded because of perl upgrade and released up.</Comment>
<Name>Süleyman Poyraz</Name>
<Email>zaryob.dev@gmail.com</Email>
</Update>
<Update release="1">
<Date>2019-09-16</Date>
<Version>1.05</Version>
......
......@@ -33,6 +33,13 @@
</Package>
<History>
<Update release="2">
<Date>2019-09-18</Date>
<Version>0.17028</Version>
<Comment>Package is rebuilded because of perl upgrade and released up.</Comment>
<Name>Süleyman Poyraz</Name>
<Email>zaryob.dev@gmail.com</Email>
</Update>
<Update release="1">
<Date>2019-09-15</Date>
<Version>0.17028</Version>
......
......@@ -39,6 +39,13 @@
</Package>
<History>
<Update release="2">
<Date>2019-09-18</Date>
<Version>0.8000</Version>
<Comment>Package is rebuilded because of perl upgrade and released up.</Comment>
<Name>Süleyman Poyraz</Name>
<Email>zaryob.dev@gmail.com</Email>
</Update>
<Update release="1">
<Date>2019-04-13</Date>
<Version>0.8000</Version>
......
......@@ -31,6 +31,13 @@
</Package>
<History>
<Update release="2">
<Date>2019-09-18</Date>
<Version>7.34</Version>
<Comment>Package is rebuilded because of perl upgrade and released up.</Comment>
<Name>Süleyman Poyraz</Name>
<Email>zaryob.dev@gmail.com</Email>
</Update>
<Update release="1">
<Date>2019-04-13</Date>
<Version>7.34</Version>
......
......@@ -31,6 +31,13 @@
</Package>
<History>
<Update release="2">
<Date>2019-09-18</Date>
<Version>1.16</Version>
<Comment>Package is rebuilded because of perl upgrade and released up.</Comment>
<Name>Süleyman Poyraz</Name>
<Email>zaryob.dev@gmail.com</Email>
</Update>
<Update release="1">
<Date>2019-04-13</Date>
<Version>1.16</Version>
......
......@@ -35,6 +35,13 @@
</Files>
</Package>
<History>
<Update release="2">
<Date>2019-09-18</Date>
<Version>6.04</Version>
<Comment>Package is rebuilded because of perl upgrade and released up.</Comment>
<Name>Süleyman Poyraz</Name>
<Email>zaryob.dev@gmail.com</Email>
</Update>
<Update release="1">
<Date>2019-09-16</Date>
<Version>6.04</Version>
......
......@@ -34,6 +34,13 @@
</Package>
<History>
<Update release="2">
<Date>2019-09-18</Date>
<Version>1.58</Version>
<Comment>Package is rebuilded because of perl upgrade and released up.</Comment>
<Name>Süleyman Poyraz</Name>
<Email>zaryob.dev@gmail.com</Email>
</Update>
<Update release="1">
<Date>2019-09-16</Date>
<Version>1.58</Version>
......
......@@ -31,6 +31,13 @@
</Package>
<History>
<Update release="2">
<Date>2019-09-18</Date>
<Version>3.75</Version>
<Comment>Package is rebuilded because of perl upgrade and released up.</Comment>
<Name>Süleyman Poyraz</Name>
<Email>zaryob.dev@gmail.com</Email>
</Update>
<Update release="1">
<Date>2019-04-13</Date>
<Version>3.75</Version>
......
......@@ -32,6 +32,13 @@
</Package>
<History>
<Update release="2">
<Date>2019-09-18</Date>
<Version>1.20</Version>
<Comment>Package is rebuilded because of perl upgrade and released up.</Comment>
<Name>Süleyman Poyraz</Name>
<Email>zaryob.dev@gmail.com</Email>
</Update>
<Update release="1">
<Date>2019-09-16</Date>
<Version>1.20</Version>
......
......@@ -38,6 +38,13 @@
</Package>
<History>
<Update release="2">
<Date>2019-09-18</Date>
<Version>0.28</Version>
<Comment>Package is rebuilded because of perl upgrade and released up.</Comment>
<Name>Süleyman Poyraz</Name>
<Email>zaryob.dev@gmail.com</Email>
</Update>
<Update release="1">
<Date>2019-09-16</Date>
<Version>0.28</Version>
......
......@@ -37,6 +37,13 @@
</Package>
<History>
<Update release="2">
<Date>2019-09-18</Date>
<Version>1.3.29</Version>
<Comment>Package is rebuilded because of perl upgrade and released up.</Comment>
<Name>Süleyman Poyraz</Name>
<Email>zaryob.dev@gmail.com</Email>
</Update>
<Update release="1">
<Date>2019-04-13</Date>
<Version>1.3.29</Version>
......
......@@ -40,6 +40,13 @@
</Package>
<History>
<Update release="2">
<Date>2019-09-18</Date>
<Version>6.04</Version>
<Comment>Package is rebuilded because of perl upgrade and released up.</Comment>
<Name>Süleyman Poyraz</Name>
<Email>zaryob.dev@gmail.com</Email>
</Update>
<Update release="1">
<Date>2019-09-16</Date>
<Version>6.04</Version>
......
......@@ -38,6 +38,13 @@
</Package>
<History>
<Update release="2">
<Date>2019-09-18</Date>
<Version>2.12</Version>
<Comment>Package is rebuilded because of perl upgrade and released up.</Comment>
<Name>Süleyman Poyraz</Name>
<Email>zaryob.dev@gmail.com</Email>
</Update>
<Update release="1">
<Date>2019-09-16</Date>
<Version>2.12</Version>
......
......@@ -36,6 +36,13 @@
</Package>
<History>
<Update release="2">
<Date>2019-09-18</Date>
<Version>0.07</Version>
<Comment>Package is rebuilded because of perl upgrade and released up.</Comment>
<Name>Süleyman Poyraz</Name>
<Email>zaryob.dev@gmail.com</Email>
</Update>
<Update release="1">
<Date>2019-09-16</Date>
<Version>0.07</Version>
......
......@@ -40,6 +40,13 @@
</Package>
<History>
<Update release="2">
<Date>2019-09-18</Date>
<Version>0.15</Version>
<Comment>Package is rebuilded because of perl upgrade and released up.</Comment>
<Name>Süleyman Poyraz</Name>
<Email>zaryob.dev@gmail.com</Email>
</Update>
<Update release="1">
<Date>2019-09-16</Date>
<Version>0.15</Version>
......
......@@ -35,6 +35,13 @@
</Package>
<History>
<Update release="2">
<Date>2019-09-18</Date>
<Version>3.72</Version>
<Comment>Package is rebuilded because of perl upgrade and released up.</Comment>
<Name>Süleyman Poyraz</Name>
<Email>zaryob.dev@gmail.com</Email>
</Update>
<Update release="1">
<Date>2019-09-16</Date>
<Version>3.72</Version>
......
......@@ -34,6 +34,13 @@
</Package>
<History>
<Update release="2">
<Date>2019-09-18</Date>
<Version>0.15</Version>
<Comment>Package is rebuilded because of perl upgrade and released up.</Comment>
<Name>Süleyman Poyraz</Name>
<Email>zaryob.dev@gmail.com</Email>
</Update>
<Update release="1">
<Date>2019-09-16</Date>
<Version>0.15</Version>
......
......@@ -32,6 +32,13 @@
</Package>
<History>
<Update release="2">
<Date>2019-09-18</Date>