commit vis-standalone 0.3-1

2 files changed, 93 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 51d91abf1f58..5d2c0ce6b76e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,42 @@
 # Generated by mksrcinfo v8
-# Mon Apr 25 09:17:44 UTC 2016
+# Sun Mar 26 13:38:13 UTC 2017
 pkgbase = vis-standalone
 	pkgdesc = modern, legacy free, simple yet efficient vim-like editor - statically linked
-	pkgver = 0.2
-	pkgrel = 2
+	pkgver = 0.3
+	pkgrel = 1
 	url = http://www.brain-dump.org/projects/vis/
 	arch = i686
 	arch = x86_64
 	license = custom:ISC
-	makedepends = markdown
 	provides = vis
 	conflicts = vis
-	source = http://www.brain-dump.org/projects/vis/vis-0.2.tar.gz
-	source = http://www.musl-libc.org/releases/musl-1.1.14.tar.gz
+	source = vis-0.3.tar.gz::https://github.com/martanne/vis/archive/v0.3.tar.gz
+	source = vis-test-0.1.tar.gz::https://github.com/martanne/vis-test/archive/v0.1.tar.gz
+	source = http://www.musl-libc.org/releases/musl-1.1.16.tar.gz
+	source = http://www.musl-libc.org/releases/musl-1.1.16.tar.gz.asc
 	source = http://ftp.gnu.org/gnu/ncurses/ncurses-6.0.tar.gz
-	source = http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.18.tar.gz
-	source = http://www.lua.org/ftp/lua-5.2.4.tar.gz
-	source = http://www.brain-dump.org/projects/vis/lua-5.2.4-lpeg.patch
-	source = http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.0.tar.gz
-	sha256sums = 3e5b81d760849c56ee378421e9ba0f653c641bf78e7594f71d85357be99a752d
-	sha256sums = 35f6c00c84a6091bd5dab29eedde7508dae755ead92dcc0239f3677d1055b9b5
+	source = http://ftp.gnu.org/gnu/ncurses/ncurses-6.0.tar.gz.sig
+	source = http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.19.tar.gz
+	source = http://www.lua.org/ftp/lua-5.3.4.tar.gz
+	source = http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.1.tar.gz
+	source = attr-c1a7b53073202c67becf4df36cadc32ef4759c8a.tar.gz::http://git.savannah.gnu.org/cgit/attr.git/snapshot/attr-c1a7b53073202c67becf4df36cadc32ef4759c8a.tar.gz
+	source = acl-38f32ea1865bcc44185f4118fde469cb962cff68.tar.gz::http://git.savannah.gnu.org/cgit/acl.git/snapshot/acl-38f32ea1865bcc44185f4118fde469cb962cff68.tar.gz
+	sha256sums = bed8ed32ef4f81bc4fd28e297ea8edc80027ac6923b9d3b5bd955d24899c7077
+	sha256sums = 78c2c4416ef284e2362bb0e761ee9c4add106d122ac44b341c6bcf449f0b17a6
+	sha256sums = 937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011
+	sha256sums = SKIP
 	sha256sums = f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260
-	sha256sums = 239746de41c845af52bb3c14055558f743292dd6c24ac26c2d6567a5a6093926
-	sha256sums = b9e2e4aad6789b3b63a056d442f7b39f0ecfca3ae0f1fc0ae4e9614401b69f4b
-	sha256sums = a308a948696f21a0928505322c78ec48fffb88760ab795da2e390109e004b0cd
-	sha256sums = 10190ae758a22a16415429a9eb70344cf29cbda738a6962a9f94a732340abf8e
+	sha256sums = SKIP
+	sha256sums = c505aa4cb48c8fa59c526265576b97a19e6ebe7b7da20f4ecaae898b727b48b7
+	sha256sums = f681aa518233bc407e23acf0f5887c884f17436f000d453b2491a9f11a52400c
+	sha256sums = 62d9f7a9ea3c1f215c77e0cadd8534c6ad9af0fb711c3f89188a8891c72f026b
+	sha256sums = faf6e5cbfa71153bd1049206ca70690c5dc96e2ec3db50eae107092c3de900ca
+	sha256sums = 98598b0bb154ab294d9a695fd08b0e06516e770bbd1d78937905f0dd8ebe485c
 
 pkgname = vis-standalone
+	pkgdesc = modern, legacy free, simple yet efficient vim-like editor - statically linked
+	backup = etc/vis/visrc.lua
+
+pkgname = vis-single
+	pkgdesc = modern, legacy free, simple yet efficient vim-like editor - statically linked, self-extracting
 
diff --git a/PKGBUILD b/PKGBUILD
index 0f5084b02b2a..0bcb5a52e706 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,47 @@
 # Maintainer: Christian Hesse <mail@eworm.de>
 
-pkgname=vis-standalone
-pkgver=0.2
-pkgrel=2
-_pkgver_libmusl=1.1.14
+pkgbase=vis-standalone
+pkgname=(vis-standalone vis-single)
+pkgver=0.3
+pkgrel=1
+_pkgname_test=vis-test
+_pkgver_test=0.1
+_pkgver_libmusl=1.1.16
 _pkgver_ncurses=6.0
-_pkgver_libtermkey=0.18
-_pkgver_lua=5.2.4
-_pkgver_lpeg=1.0.0
+_pkgver_libtermkey=0.19
+_pkgver_lua=5.3.4
+_pkgver_lpeg=1.0.1
+_pkgver_attr='c1a7b53073202c67becf4df36cadc32ef4759c8a'
+_pkgver_acl='38f32ea1865bcc44185f4118fde469cb962cff68'
 pkgdesc='modern, legacy free, simple yet efficient vim-like editor - statically linked'
 arch=('i686' 'x86_64')
 url='http://www.brain-dump.org/projects/vis/'
-makedepends=('markdown')
 conflicts=('vis')
 provides=('vis')
 license=('custom:ISC')
-source=("http://www.brain-dump.org/projects/vis/vis-${pkgver}.tar.gz"
-	"http://www.musl-libc.org/releases/musl-${_pkgver_libmusl}.tar.gz"
-	"http://ftp.gnu.org/gnu/ncurses/ncurses-${_pkgver_ncurses}.tar.gz"
-	"http://www.leonerd.org.uk/code/libtermkey/libtermkey-${_pkgver_libtermkey}.tar.gz"
-	"http://www.lua.org/ftp/lua-${_pkgver_lua}.tar.gz"
-	"http://www.brain-dump.org/projects/vis/lua-${_pkgver_lua}-lpeg.patch"
-	"http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-${_pkgver_lpeg}.tar.gz")
-sha256sums=('3e5b81d760849c56ee378421e9ba0f653c641bf78e7594f71d85357be99a752d'
-            '35f6c00c84a6091bd5dab29eedde7508dae755ead92dcc0239f3677d1055b9b5'
+validpgpkeys=('836489290BB6B70F99FFDA0556BCDB593020450F'  # musl libc <musl@libc.org>
+              'C52048C0C0748FEE227D47A2702353E0F7E48EDB'  # Thomas Dickey <dickey@invisible-island.net>
+              '600CD204FBCEA418BD2CA74F154343260542DF34') # Brandon Philips
+source=("vis-${pkgver}.tar.gz::https://github.com/martanne/vis/archive/v${pkgver}.tar.gz"
+        "${_pkgname_test}-${_pkgver_test}.tar.gz::https://github.com/martanne/${_pkgname_test}/archive/v${_pkgver_test}.tar.gz"
+        "http://www.musl-libc.org/releases/musl-${_pkgver_libmusl}.tar.gz"{,.asc}
+        "http://ftp.gnu.org/gnu/ncurses/ncurses-${_pkgver_ncurses}.tar.gz"{,.sig}
+        "http://www.leonerd.org.uk/code/libtermkey/libtermkey-${_pkgver_libtermkey}.tar.gz"
+        "http://www.lua.org/ftp/lua-${_pkgver_lua}.tar.gz"
+        "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-${_pkgver_lpeg}.tar.gz"
+        "attr-${_pkgver_attr}.tar.gz::http://git.savannah.gnu.org/cgit/attr.git/snapshot/attr-${_pkgver_attr}.tar.gz"
+        "acl-${_pkgver_acl}.tar.gz::http://git.savannah.gnu.org/cgit/acl.git/snapshot/acl-${_pkgver_acl}.tar.gz")
+sha256sums=('bed8ed32ef4f81bc4fd28e297ea8edc80027ac6923b9d3b5bd955d24899c7077'
+            '78c2c4416ef284e2362bb0e761ee9c4add106d122ac44b341c6bcf449f0b17a6'
+            '937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011'
+            'SKIP'
             'f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260'
-            '239746de41c845af52bb3c14055558f743292dd6c24ac26c2d6567a5a6093926'
-            'b9e2e4aad6789b3b63a056d442f7b39f0ecfca3ae0f1fc0ae4e9614401b69f4b'
-            'a308a948696f21a0928505322c78ec48fffb88760ab795da2e390109e004b0cd'
-	    '10190ae758a22a16415429a9eb70344cf29cbda738a6962a9f94a732340abf8e')
+            'SKIP'
+            'c505aa4cb48c8fa59c526265576b97a19e6ebe7b7da20f4ecaae898b727b48b7'
+            'f681aa518233bc407e23acf0f5887c884f17436f000d453b2491a9f11a52400c'
+            '62d9f7a9ea3c1f215c77e0cadd8534c6ad9af0fb711c3f89188a8891c72f026b'
+            'faf6e5cbfa71153bd1049206ca70690c5dc96e2ec3db50eae107092c3de900ca'
+            '98598b0bb154ab294d9a695fd08b0e06516e770bbd1d78937905f0dd8ebe485c')
 
 prepare() {
 	cd vis-${pkgver}/
@@ -39,26 +52,52 @@ prepare() {
 	mkdir -p dependency/sources/
 
 	for SOURCE in "${source[@]}"; do
+		SOURCE="${SOURCE%::*}"
 		SOURCE="$(basename ${SOURCE})"
 		ln -s ../../../${SOURCE} dependency/sources/${SOURCE}
 	done
+
+	rmdir test/
+	mv "../${_pkgname_test}-${_pkgver_test}" test
 }
 
 build() {
 	cd vis-${pkgver}/
 
-	make PREFIX='/usr/' standalone
+        # prepare test environment
+        ./configure
+        make -C test/core/
+        make -C test/util/
+
+	unset CFLAGS LDFLAGS
 
-	markdown README.md > README.html
+	make PREFIX='/usr/' single
 }
 
-package() {
+check() {
+	cd vis-${pkgver}/
+
+	make -C test/
+}
+
+package_vis-standalone() {
+	pkgdesc='modern, legacy free, simple yet efficient vim-like editor - statically linked'
+	backup=('etc/vis/visrc.lua')
+
 	cd vis-${pkgver}/
 
 	make DESTDIR="${pkgdir}" PREFIX='/usr/' install
 
+	install -D -m0644 lua/visrc.lua "${pkgdir}"/etc/vis/visrc.lua
+
 	install -D -m0644 'LICENSE' "${pkgdir}/usr/share/licenses/vis/LICENSE"
-	install -D -m0644 'README.md' "${pkgdir}/usr/share/doc/vis/README.md"
-	install -D -m0644 'README.html' "${pkgdir}/usr/share/doc/vis/README.html"
+}
+
+package_vis-single() {
+	pkgdesc='modern, legacy free, simple yet efficient vim-like editor - statically linked, self-extracting'
+
+	cd vis-${pkgver}/
+
+	install -D -m0755 vis-single "${pkgdir}/usr/bin/vis"
 }