diff options
| author | Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> | 2019-11-19 16:16:27 -0500 |
|---|---|---|
| committer | Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> | 2019-11-19 16:16:27 -0500 |
| commit | e10daf9d8d468e47a5fbbdcaa133f6b8ce04687a (patch) | |
| tree | db1fecd102bd9cd5d702f62b15cf422e105329b9 | |
| parent | 1d2e5c8d96202cfa8640a630a80559658b6904e5 (diff) | |
| download | packages-e10daf9d8d468e47a5fbbdcaa133f6b8ce04687a.tar.gz packages-e10daf9d8d468e47a5fbbdcaa133f6b8ce04687a.tar.bz2 packages-e10daf9d8d468e47a5fbbdcaa133f6b8ce04687a.tar.xz packages-e10daf9d8d468e47a5fbbdcaa133f6b8ce04687a.zip | |
system/nvi: upgrade to 1.81.6
| -rw-r--r-- | system/nvi/APKBUILD | 25 | ||||
| -rw-r--r-- | system/nvi/build-fix.patch | 38 |
2 files changed, 39 insertions, 24 deletions
diff --git a/system/nvi/APKBUILD b/system/nvi/APKBUILD index 03a6d54e8..2fdc02bf6 100644 --- a/system/nvi/APKBUILD +++ b/system/nvi/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=nvi -pkgver=1.79 -pkgrel=1 +pkgver=1.81.6 +pkgrel=0 pkgdesc="Berkeley text editor" url="https://sites.google.com/a/bostic.com/keithbostic/vi/" arch="all" @@ -11,15 +11,24 @@ license="BSD-4-Clause-UC" depends="" makedepends="ncurses-dev" subpackages="$pkgname-doc" -source="https://sites.google.com/a/bostic.com/keithbostic/files/nvi-$pkgver.tar.gz +source="https://fossies.org/linux/privat/old/nvi-$pkgver.tar.gz build-fix.patch " +prepare() { + default_prepare + + cd "$builddir"/dist + chmod u+w config.sub + update_config_sub +} + build() { + mkdir -p "$builddir"/build cd "$builddir"/build # Note! --disable-curses means disable *builtin* curses. # It makes vi(1) use ncurses instead. That is what we want. - LIBS="-ltinfow" ./configure \ + LIBS="-ltinfow" ../dist/configure \ --prefix=/usr \ --mandir="$pkgdir"/usr/share/man \ --build=$CBUILD \ @@ -30,8 +39,8 @@ build() { package() { cd "$builddir"/build - mkdir -p "$pkgdir" - make prefix="$pkgdir"/usr install + mkdir -p "$pkgdir/usr/bin" + make prefix="$pkgdir/usr" install -j1 mv "$pkgdir"/usr/bin/ex "$pkgdir"/usr/bin/ex.nvi mv "$pkgdir"/usr/share/man/cat1/ex.0 "$pkgdir"/usr/share/man/cat1/ex.nvi.0 mv "$pkgdir"/usr/share/man/man1/ex.1 "$pkgdir"/usr/share/man/man1/ex.nvi.1 @@ -40,5 +49,5 @@ package() { mv "$pkgdir"/usr/share/man/man1/view.1 "$pkgdir"/usr/share/man/man1/view.nvi.1 } -sha512sums="d1d8adb2aeeee127f5e6fe5cc8b9e3e26fe22084075d17cceecd9cee7956131becee764d721af69626d60d6d75873d5073dc9817995f0274ed307e044921a1d0 nvi-1.79.tar.gz -591f28094731a438841ce806db870592b659dbe2548de438005adb706d2dab0d9817531b07c77c6aa3c8d6cfc7739b485c6835aed174cb84b219f978a5ae5f51 build-fix.patch" +sha512sums="1be798daf0cd05010ddaf0aa0510dc799708fd79d4b243e2700adff18e931ddd9d11621796fa8086088c3e93ba20f15ab86783732665169c52b73eaf587ff0b3 nvi-1.81.6.tar.gz +b84cfb83ea5ed15f5c7d9e608771a2248531be388fa19340e90074d37e10f6f75c8b965a40f5288275973f23ed6fda54aa4ef990b43d4828d174b66fd3ced1e9 build-fix.patch" diff --git a/system/nvi/build-fix.patch b/system/nvi/build-fix.patch index 3839b7461..82f2784e6 100644 --- a/system/nvi/build-fix.patch +++ b/system/nvi/build-fix.patch @@ -1,19 +1,25 @@ ---- nvi-1.79/build/Makefile.in.old 1996-10-23 13:43:38.000000000 +0000 -+++ nvi-1.79/build/Makefile.in 2018-08-08 00:47:23.110000000 +0000 -@@ -137,16 +137,6 @@ - $(chmod) $(dmode) $(datadir)/vi/catalog - (cd $(srcdir)/catalog && $(cp) $(cat) $(datadir)/vi/catalog && \ - cd $(datadir)/vi/catalog && $(chmod) $(fmode) *) +diff -Nurd nvi-1.81.6/dist/Makefile.in nvi-1.81.6.new/dist/Makefile.in +--- nvi-1.81.6/dist/Makefile.in 2007-11-18 11:43:51.000000000 -0500 ++++ nvi-1.81.6.new/dist/Makefile.in 2019-11-19 16:10:14.382325969 -0500 +@@ -1757,21 +1757,6 @@ + @(cd $(visrcdir)/catalog && \ + $(cp) $(cat) $(DESTDIR)$(datadir)/vi/catalog && \ + cd $(DESTDIR)$(datadir)/vi/catalog && $(chmod) $(fmode) *) - @echo "Installing Perl scripts: $(datadir)/vi/perl ..." -- $(mkdir) $(datadir)/vi/perl && $(chmod) $(dmode) $(datadir)/vi/perl -- [ -f VI.pm ] && $(cp) VI.pm $(datadir)/vi/perl && \ -- cd $(datadir)/vi/perl && $(chmod) $(fmode) VI.pm) -- (cd $(srcdir)/perl_scripts && $(cp) *.pl $(datadir)/vi/perl && \ -- cd $(datadir)/vi/perl && $(chmod) $(fmode) *.pl) +- @$(mkdir) $(DESTDIR)$(datadir)/vi/perl && \ +- $(chmod) $(dmode) $(DESTDIR)$(datadir)/vi/perl +- @[ ! -f VI.pm ] || \ +- ($(cp) VI.pm $(DESTDIR)$(datadir)/vi/perl && \ +- (cd $(DESTDIR)$(datadir)/vi/perl && $(chmod) $(fmode) VI.pm)) +- @(cd $(visrcdir)/perl_scripts && \ +- $(cp) *.pl $(DESTDIR)$(datadir)/vi/perl && \ +- cd $(DESTDIR)$(datadir)/vi/perl && $(chmod) $(fmode) *.pl) - @echo "Installing Tcl scripts: $(datadir)/vi/tcl ..." -- $(mkdir) $(datadir)/vi/tcl && $(chmod) $(dmode) $(datadir)/vi/tcl -- (cd $(srcdir)/tcl_scripts && $(cp) *.tcl $(datadir)/vi/tcl && \ -- cd $(datadir)/vi/tcl && $(chmod) $(fmode) *.tcl) +- @$(mkdir) $(DESTDIR)$(datadir)/vi/tcl && \ +- $(chmod) $(dmode) $(DESTDIR)$(datadir)/vi/tcl +- @(cd $(visrcdir)/tcl_scripts && \ +- $(cp) *.tcl $(DESTDIR)$(datadir)/vi/tcl && \ +- cd $(DESTDIR)$(datadir)/vi/tcl && $(chmod) $(fmode) *.tcl) @echo "Installing recover script: $(datadir)/vi/recover ..." - ($(cp) recover $(datadir)/vi/recover && \ - $(chmod) $(emode) $(datadir)/vi/recover) + @($(cp) recover $(DESTDIR)$(datadir)/vi/recover && \ + $(chmod) $(emode) $(DESTDIR)$(datadir)/vi/recover) |