https://github.com/martanne/vis/releases includes a couple of fixes and
feature changes.
martanne also switched to release assets after I told him about unstable
github tarballs :)
All tests pass and vis is running fine on my amd64 machine.
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/vis/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 23 Dec 2017 12:31:27 -0000 1.1.1.1
+++ Makefile 30 Mar 2018 11:06:15 -0000
@@ -1,16 +1,19 @@
# $OpenBSD: Makefile,v 1.1.1.1 2017/12/23 12:31:27 landry Exp $
COMMENT = vi-like editor with sam-style structural regex support
-CATEGORIES = editors
-GH_ACCOUNT = martanne
-GH_PROJECT = vis
-GH_TAGNAME = v0.4
+V = 0.5
+DISTNAME = vis-v${V}
+PKGNAME = vis-${V}
+
+TEST_V = 0.3
+SUPDISTNAME = vis-test-${TEST_V}
+
+CATEGORIES = editors
-# For test framework
-TEST_VERSION = 0.2
+HOMEPAGE = https://github.com/martanne/vis
-MAINTAINER = Klemens Nanni <kl3@posteo.org>, \
+MAINTAINER = Klemens Nanni <kn@openbsd.org>, \
Carolyn Saunders <gigavinyl@gmail.com>
# ISC
@@ -18,14 +21,12 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB += c curses iconv intl m termkey tre ${MODLUA_WANTLIB}
-MASTER_SITES0 = ${HOMEPAGE}-test/archive/v${TEST_VERSION}/
+MASTER_SITES = ${HOMEPAGE}/releases/download/v${V}/
+MASTER_SITES0 = ${HOMEPAGE}-test/releases/download/v${TEST_V}/
-DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
-EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUFX}
-
-SUPDISTNAME = vis-test-${TEST_VERSION}
SUPDISTFILES = ${SUPDISTNAME}.tar.gz:0
-DISTFILES += ${SUPDISTFILES}
+DISTFILES = ${DISTNAME}${EXTRACT_SUFX} ${SUPDISTFILES}
+EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUFX}
MODULES = lang/lua
MODLUA_VERSION = 5.3
@@ -49,7 +50,7 @@ USE_GMAKE = Yes
post-extract:
${TAR} -xzf ${FULLDISTDIR}/${SUPDISTNAME}.tar.gz \
- -C ${WRKSRC} -s /${SUPDISTNAME}/${TEST_TARGET}/
+ -C ${WRKSRC} -s /${SUPDISTNAME}/test/
post-install:
cd ${PREFIX} && \
Index: distinfo
===================================================================
RCS file: /cvs/ports/editors/vis/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 23 Dec 2017 12:31:27 -0000 1.1.1.1
+++ distinfo 30 Mar 2018 11:06:15 -0000
@@ -1,4 +1,4 @@
-SHA256 (vis-0.4.tar.gz) = 8RukHPuG3TlHWWCr/RJGneTaDM/blB8ddoDYnZh2lMU=
-SHA256 (vis-test-0.2.tar.gz) = JvOoKELgmPQAT1qHQaxQHiCao2cElxt+aNgQQQLJB4g=
-SIZE (vis-0.4.tar.gz) = 381046
-SIZE (vis-test-0.2.tar.gz) = 97770
+SHA256 (vis-test-0.3.tar.gz) = Jn2HhelBx90dBAeAPwJfz9aRo+lFEe/Hw5t/neu6jnk=
+SHA256 (vis-v0.5.tar.gz) = tvYXVF5OBebJphh8mqGO1icJtTfssz0ZQTme2ZEtgys=
+SIZE (vis-test-0.3.tar.gz) = 97814
+SIZE (vis-v0.5.tar.gz) = 390461
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/editors/vis/patches/patch-configure,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-configure
--- patches/patch-configure 23 Dec 2017 12:31:27 -0000 1.1.1.1
+++ patches/patch-configure 30 Mar 2018 11:06:15 -0000
@@ -1,11 +1,9 @@
$OpenBSD: patch-configure,v 1.1.1.1 2017/12/23 12:31:27 landry Exp $
-Do not hardcode optimization flags.
-
Index: configure
--- configure.orig
+++ configure
-@@ -234,7 +234,6 @@ esac
+@@ -235,7 +235,6 @@ esac
tryflag CFLAGS -pipe
# Try flags to optimize binary size
Index: patches/patch-main_c
===================================================================
RCS file: patches/patch-main_c
diff -N patches/patch-main_c
--- patches/patch-main_c 23 Dec 2017 12:31:27 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-main_c,v 1.1.1.1 2017/12/23 12:31:27 landry Exp $
-
-Cherry-picked upstream fix (d7e0cbd) to prevent dumping core upon
-pressing ^\ (SIGQUIT).
-
-Index: main.c
---- main.c.orig
-+++ main.c
-@@ -2389,8 +2389,8 @@ int main(int argc, char *argv[]) {
- }
-
- sa.sa_handler = SIG_IGN;
-- if (sigaction(SIGPIPE, &sa, NULL) == -1)
-- vis_die(vis, "Failed to ignore SIGPIPE\n");
-+ if (sigaction(SIGPIPE, &sa, NULL) == -1 || sigaction(SIGQUIT, &sa, NULL) == -1)
-+ vis_die(vis, "Failed to ignore signals\n");
-
- sigset_t blockset;
- sigemptyset(&blockset);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/vis/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 23 Dec 2017 12:31:27 -0000 1.1.1.1
+++ pkg/PLIST 30 Mar 2018 11:06:15 -0000
@@ -36,6 +36,7 @@ share/vis/lexers/bibtex.lua
share/vis/lexers/boo.lua
share/vis/lexers/caml.lua
share/vis/lexers/chuck.lua
+share/vis/lexers/clojure.lua
share/vis/lexers/cmake.lua
share/vis/lexers/coffeescript.lua
share/vis/lexers/container.lua
@@ -108,6 +109,7 @@ share/vis/lexers/php.lua
share/vis/lexers/pico8.lua
share/vis/lexers/pike.lua
share/vis/lexers/pkgbuild.lua
+share/vis/lexers/pony.lua
share/vis/lexers/powershell.lua
share/vis/lexers/prolog.lua
share/vis/lexers/props.lua
@@ -117,6 +119,7 @@ share/vis/lexers/pure.lua
share/vis/lexers/python.lua
share/vis/lexers/rails.lua
share/vis/lexers/rc.lua
+share/vis/lexers/reason.lua
share/vis/lexers/rebol.lua
share/vis/lexers/rest.lua
share/vis/lexers/rexx.lua
@@ -148,6 +151,7 @@ share/vis/lexers/verilog.lua
share/vis/lexers/vhdl.lua
share/vis/lexers/wsf.lua
share/vis/lexers/xml.lua
+share/vis/lexers/xs.lua
share/vis/lexers/xtend.lua
share/vis/lexers/yaml.lua
share/vis/plugins/
@@ -163,6 +167,7 @@ share/vis/themes/default-16.lua
share/vis/themes/default-256.lua
share/vis/themes/light-16.lua
share/vis/themes/solarized.lua
+share/vis/themes/zenburn.lua
share/vis/vis-std.lua
share/vis/vis.lua
share/vis/visrc.lua
No comments:
Post a Comment