Hey Edd,
I have some revised diffs that should address your concerns and fix the build
for you.
On Thu, Nov 7, 2019, at 04:13, Edd Barrett wrote:
> Hi Travis,
>
> Thanks for the revised diffs.
>
> unibilium now looks fine.
I've updated this again to include the new debug package functionality. So
attaching the diff again.
> libvterm:
>
> On Mon, Nov 04, 2019 at 08:40:19PM -0800, Travis Cole wrote:
> > > SHARED_LIBS += vterm 1.0 # 0.0
> >
> > I've bumped the version
>
> Cool. I suppose we should probably add a comment warning other porters
> that they don't properly version their shared libs.
>
> Something like:
> ---8<---
> # Note: Upstream doesn't bump the library version properly.
> # Diff the headers and check for bump-worthy cnahges."
> --->8---
Also fixed and I've added the debug package bits here too. So I've attached
that diff.
> Neovim itself fails to link for me:
I believe I've fixed this in my latest diff.
>
> luv is picking up Lua-5.3. I guess you don't see the symbol errors as you only
> have Lua-5.1 installed? You need to patch the build to pick up the
> MODLUA_VERSION one. Hopefully that will fix it.
>
Yeah, I didn't have Lua-5.3 installed. I've since installed it for testing this
build
and verified that it's picking up Lua-5.1.
> I also notice:
> ---8<---
> -- downloading...
> src='https://github.com/keplerproject/lua-compat-5.3/archive/v0.7.tar.gz'
> --->8---
>
> We can't have the build download stuff. I think you can have a play with
> MASTER_SITES1 and a DISTFILE with a :1 suffix to fetch that tarball, then use
> a
> post-fetch target to put it wherever it needs to go. I'm hand-waving a bit,
> but
> you get the gist of it. Grep the tree for examples.
I fixed this with a MASTER_SITES0 and a refactor to the pre-configure.
I realized it would be simpler to not use neovim's third-party deps build
system,
while excluding most of it, just to get libluv. Instead just download and build
libluv as part
of the port build. This solve the issues with the build quietly doing it's own
downloads.
It also cleans up some of the warnings cmake was giving about unused command
line options.
This also happens to be very similar to how Homebrew does it for neovim...
I also went ahead and bumped the Neovim version to 0.4.3.
> I'd fix the symbol problems first.
Fixed. Please see attached, and let me know if there are any style nits or
other major
issues that I failed to account for.
Thanks!
diff --git Makefile Makefile
index 0063676..793389b 100644
--- Makefile
+++ Makefile
@@ -1,22 +1,29 @@
-# $OpenBSD:
+# $OpenBSD$
COMMENT = VT220/xterm/ECMA-48 terminal emulator library
# No releases, so use date and a git hash.
# Note that the github repo is a mirror of a bzr repo.
-VERSION = 20170211
+VERSION = 20191009
DISTNAME = libvterm-${VERSION}
GH_ACCOUNT = neovim
GH_PROJECT = libvterm
-GH_COMMIT = 224b8dcde1c9640c29a34aa60c0f0d56ad298449
+# Note this git sha is from the nvim branch because
+# Neovim requires patches from this branch to build.
+# see https://github.com/neovim/neovim/wiki/Deps
+GH_COMMIT = 7c72294d84ce20da4c27362dbd7fa4b08cfc91da
-SHARED_LIBS += vterm 0.0 # 0.0
+# Note upstream doesn't bump the library version properly.
+# Diff the headers and check for bump-worthy changes.
+SHARED_LIBS += vterm 1.0 # 0.0
CATEGORIES = devel
# MIT
PERMIT_PACKAGE = Yes
+DEBUG_PACKAGES = ${BUILD_PACKAGES}
+
WANTLIB += c
USE_GMAKE = Yes
diff --git distinfo distinfo
index 63c4d8e..4c90892 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (libvterm-20170211-224b8dcd.tar.gz) = W8Dol01zXaTVrjOGrEEiylL+gPHFMveyO3nGPsXYzs0=
-SIZE (libvterm-20170211-224b8dcd.tar.gz) = 67291
+SHA256 (libvterm-20191009-7c72294d.tar.gz) = 8wxNQ+DG2z4JEtr3GI2Y+/buiPl1idcvbzBOXbSIJqg=
+SIZE (libvterm-20191009-7c72294d.tar.gz) = 73002
diff --git patches/patch-bin_vterm-ctrl_c patches/patch-bin_vterm-ctrl_c
index 529b571..a3f5e1a 100644
--- patches/patch-bin_vterm-ctrl_c
+++ patches/patch-bin_vterm-ctrl_c
@@ -1,16 +1,42 @@
-$OpenBSD: patch-bin_vterm-ctrl_c,v 1.1.1.1 2017/02/28 22:40:11 edd Exp $
+$OpenBSD$
Fix signed versus unsigned comparison.
https://bugs.launchpad.net/libvterm/+bug/1668780
---- bin/vterm-ctrl.c.orig Sun Dec 18 21:03:40 2016
-+++ bin/vterm-ctrl.c Sat Feb 25 16:29:14 2017
-@@ -81,7 +81,7 @@ static char *read_csi()
+Patch updated to apply on:
+https://github.com/neovim/libvterm/tree/nvim
+
+diff --git bin/vterm-ctrl.c bin/vterm-ctrl.c
+index ba0d61e..92a365f 100644
+--- bin/vterm-ctrl.c
++++ bin/vterm-ctrl.c
+@@ -79,9 +79,9 @@ static bool seticanon(bool icanon, bool echo)
+ return ret;
+ }
+
+-static void await_c1(unsigned char c1)
++static void await_c1(int c1)
{
- /* TODO: This really should be a more robust CSI parser
- */
-- char c;
+- unsigned char c;
+ int c;
/* await CSI - 8bit or 2byte 7bit form */
bool in_esc = false;
+@@ -106,7 +106,7 @@ static char *read_csi()
+ char csi[32];
+ int i = 0;
+ for(; i < sizeof(csi)-1; i++) {
+- char c = csi[i] = getchar();
++ int c = csi[i] = getchar();
+ if(c >= 0x40 && c <= 0x7e)
+ break;
+ }
+@@ -125,7 +125,7 @@ static char *read_dcs()
+ bool in_esc = false;
+ int i = 0;
+ for(; i < sizeof(dcs)-1; ) {
+- char c = getchar();
++ int c = getchar();
+ if(c == 0x9c) // ST
+ break;
+ if(in_esc && c == 0x5c)
diff --git pkg/PLIST pkg/PLIST
index 58b664f..a4cc9ea 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -4,7 +4,7 @@
@bin bin/vterm-dump
include/vterm.h
include/vterm_keycodes.h
-lib/libvterm.a
+@static-lib lib/libvterm.a
lib/libvterm.la
@lib lib/libvterm.so.${LIBvterm_VERSION}
lib/pkgconfig/vterm.pc
diff --git Makefile Makefile
index e9b174a..cab71be 100644
--- Makefile
+++ Makefile
@@ -4,15 +4,24 @@ COMMENT = continuation and extension of Vim
GH_ACCOUNT = neovim
GH_PROJECT = neovim
-GH_TAGNAME = v0.3.8
+GH_TAGNAME = v0.4.3
CATEGORIES = editors devel
HOMEPAGE = https://neovim.io
MAINTAINER = Edd Barrett <e...@openbsd.org>
+# Neovim must be statically linked with libluv, which isn't yet ported.
+LUV_VER = 1.30.1-1
+LUV = luv-${LUV_VER}
+MASTER_SITES0 = https://github.com/luvit/luv/releases/download/${LUV_VER}/
+DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
+ ${LUV}${EXTRACT_SUFX}:0
+
# Apache 2.0 + Vim License
PERMIT_PACKAGE = Yes
+DEBUG_PACKAGES = ${BUILD_PACKAGES}
+
WANTLIB += c iconv intl ${MODLUA_WANTLIB} m msgpackc pthread termkey
WANTLIB += unibilium util uv vterm
@@ -30,18 +39,20 @@ BUILD_DEPENDS = ${RUN_DEPENDS} \
LIB_DEPENDS = devel/gettext,-runtime \
devel/libtermkey \
devel/libuv \
- devel/libvterm \
+ devel/libvterm>=1.0 \
devel/msgpack \
- devel/unibilium
+ devel/unibilium>=1.0
RUN_DEPENDS += devel/libmpack/lua \
devel/libmpack/main \
devel/desktop-file-utils
-MAKE_FLAGS += USE_BUNDLED_DEPS=OFF
+MAKE_FLAGS += USE_BUNDLED=OFF
CONFIGURE_ARGS += -DLUA_PRG=${MODLUA_BIN} \
-DLUA_INCLUDE_DIR=${MODLUA_INCL_DIR} \
-DLUA_LIBRARIES=${MODLUA_LIB} \
+ -DLIBLUV_INCLUDE_DIR=${WRKBUILD}/deps/include \
+ -DLIBLUV_LIBRARY=${WRKBUILD}/deps/lib/libluv.a \
-DPREFER_LUA=ON # disables LuaJIT
# Tests need gmake
@@ -51,6 +62,20 @@ TEST_DEPENDS = shells/bash \
editors/py-neovim \
editors/py-neovim,python3
+# Build libluv first as a static library. We opted not to create a libluv
+# port because it must be built for a specific Lua version and we don't know
+# what version future ports might need. Currently no other port requires
+# libluv, so it's simpler to build a static library here.
+pre-configure:
+ @mkdir -p ${WRKBUILD}/build
+ @(cd ${WRKBUILD}/build && \
+ cmake -DWITH_LUA_ENGINE=Lua \
+ -DLUA_LIBRARIES=${MODLUA_LIB} \
+ -DLUA_INCLUDE_DIR=${MODLUA_INCL_DIR} -DBUILD_MODULE=OFF \
+ -DLUA_BUILD_TYPE=System \
+ -DCMAKE_INSTALL_PREFIX=${WRKBUILD}/deps ${WRKDIR}/${LUV} && \
+ ${MAKE} install)
+
# These are the "old tests". There is also a new suite, but we would need the
# "busted" test suite for Lua, which is not yet ported.
#
diff --git distinfo distinfo
index 890fd75..1c1e58a 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,4 @@
-SHA256 (neovim-0.3.8.tar.gz) = lT4TRWjYJNrXy/Mu4xFJUXMvmnUMRi5DDmtZP0GK92w=
-SIZE (neovim-0.3.8.tar.gz) = 9233661
+SHA256 (luv-1.30.1-1.tar.gz) = Tih77W9R/VDOA7p/qMwz2E4bnLhpEcSBK7H0eh4+0So=
+SHA256 (neovim-0.4.3.tar.gz) = kaC10yIEqCG/QUaQ5rSM9pIk0ZYdNxWMKzg/amz4VNI=
+SIZE (luv-1.30.1-1.tar.gz) = 1354232
+SIZE (neovim-0.4.3.tar.gz) = 9556199
diff --git patches/patch-src_nvim_os_process_c patches/patch-src_nvim_os_process_c
deleted file mode 100644
index a2e2b6f..0000000
--- patches/patch-src_nvim_os_process_c
+++ /dev/null
@@ -1,40 +0,0 @@
-$OpenBSD: patch-src_nvim_os_process_c,v 1.1 2019/03/17 13:13:40 edd Exp $
-
-Port job stopping bug fix to neovim:
-
-Original vim fix:
-https://github.com/vim/vim/commit/76ab4fd61901090e6af3451ca6c5ca0fc370571f#diff-b68adb4fa34020d8d7f0ab40a2704335
-
-Index: src/nvim/os/process.c
---- src/nvim/os/process.c.orig
-+++ src/nvim/os/process.c
-@@ -89,21 +89,16 @@ bool os_proc_tree_kill(int pid, int sig)
- bool os_proc_tree_kill(int pid, int sig)
- {
- assert(sig == SIGTERM || sig == SIGKILL);
-- int pgid = getpgid(pid);
-- if (pgid > 0) { // Ignore error. Never kill self (pid=0).
-- if (pgid == pid) {
-- ILOG("sending %s to process group: -%d",
-- sig == SIGTERM ? "SIGTERM" : "SIGKILL", pgid);
-- int rv = uv_kill(-pgid, sig);
-- return rv == 0;
-- } else {
-- // Should never happen, because process_spawn() did setsid() in the child.
-- ELOG("pgid %d != pid %d", pgid, pid);
-- }
-+ if (pid != 0) { // Never kill self (pid=0).
-+ ILOG("sending %s to PIDs %d and %d",
-+ sig == SIGTERM ? "SIGTERM" : "SIGKILL", -pid, pid);
-+
-+ int rv1 = uv_kill(-pid, sig);
-+ int rv2 = uv_kill(pid, sig);
-+ return (rv1 == 0) && (rv2 == 0);
- } else {
-- ELOG("getpgid(%d) returned %d", pid, pgid);
-+ return false;
- }
-- return false;
- }
- #endif
-
diff --git pkg/PLIST pkg/PLIST
index 38ff796..65288f9 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -220,7 +220,6 @@ share/nvim/runtime/doc/diff.txt
share/nvim/runtime/doc/digraph.txt
share/nvim/runtime/doc/editing.txt
share/nvim/runtime/doc/eval.txt
-share/nvim/runtime/doc/farsi.txt
share/nvim/runtime/doc/filetype.txt
share/nvim/runtime/doc/fold.txt
share/nvim/runtime/doc/ft_ada.txt
@@ -253,7 +252,6 @@ share/nvim/runtime/doc/options.txt
share/nvim/runtime/doc/pattern.txt
share/nvim/runtime/doc/pi_gzip.txt
share/nvim/runtime/doc/pi_health.txt
-share/nvim/runtime/doc/pi_matchit.txt
share/nvim/runtime/doc/pi_msgpack.txt
share/nvim/runtime/doc/pi_netrw.txt
share/nvim/runtime/doc/pi_paren.txt
@@ -325,6 +323,7 @@ share/nvim/runtime/filetype.vim
share/nvim/runtime/ftoff.vim
share/nvim/runtime/ftplugin/
share/nvim/runtime/ftplugin.vim
+share/nvim/runtime/ftplugin/8th.vim
share/nvim/runtime/ftplugin/a2ps.vim
share/nvim/runtime/ftplugin/aap.vim
share/nvim/runtime/ftplugin/abap.vim
@@ -337,6 +336,7 @@ share/nvim/runtime/ftplugin/art.vim
share/nvim/runtime/ftplugin/aspvbs.vim
share/nvim/runtime/ftplugin/automake.vim
share/nvim/runtime/ftplugin/awk.vim
+share/nvim/runtime/ftplugin/bash.vim
share/nvim/runtime/ftplugin/bdf.vim
share/nvim/runtime/ftplugin/bst.vim
share/nvim/runtime/ftplugin/btm.vim
@@ -344,6 +344,7 @@ share/nvim/runtime/ftplugin/bzl.vim
share/nvim/runtime/ftplugin/c.vim
share/nvim/runtime/ftplugin/calendar.vim
share/nvim/runtime/ftplugin/cdrdaoconf.vim
+share/nvim/runtime/ftplugin/cfg.vim
share/nvim/runtime/ftplugin/ch.vim
share/nvim/runtime/ftplugin/changelog.vim
share/nvim/runtime/ftplugin/chicken.vim
@@ -374,6 +375,7 @@ share/nvim/runtime/ftplugin/dosbatch.vim
share/nvim/runtime/ftplugin/dosini.vim
share/nvim/runtime/ftplugin/dtd.vim
share/nvim/runtime/ftplugin/dtrace.vim
+share/nvim/runtime/ftplugin/dune.vim
share/nvim/runtime/ftplugin/eiffel.vim
share/nvim/runtime/ftplugin/elinks.vim
share/nvim/runtime/ftplugin/erlang.vim
@@ -413,6 +415,7 @@ share/nvim/runtime/ftplugin/ishd.vim
share/nvim/runtime/ftplugin/j.vim
share/nvim/runtime/ftplugin/java.vim
share/nvim/runtime/ftplugin/javascript.vim
+share/nvim/runtime/ftplugin/javascriptreact.vim
share/nvim/runtime/ftplugin/jproperties.vim
share/nvim/runtime/ftplugin/json.vim
share/nvim/runtime/ftplugin/jsp.vim
@@ -442,6 +445,7 @@ share/nvim/runtime/ftplugin/manconf.vim
share/nvim/runtime/ftplugin/markdown.vim
share/nvim/runtime/ftplugin/matlab.vim
share/nvim/runtime/ftplugin/mf.vim
+share/nvim/runtime/ftplugin/mma.vim
share/nvim/runtime/ftplugin/modconf.vim
share/nvim/runtime/ftplugin/mp.vim
share/nvim/runtime/ftplugin/mplayerconf.vim
@@ -451,6 +455,7 @@ share/nvim/runtime/ftplugin/muttrc.vim
share/nvim/runtime/ftplugin/nanorc.vim
share/nvim/runtime/ftplugin/neomuttrc.vim
share/nvim/runtime/ftplugin/netrc.vim
+share/nvim/runtime/ftplugin/nroff.vim
share/nvim/runtime/ftplugin/nsis.vim
share/nvim/runtime/ftplugin/objc.vim
share/nvim/runtime/ftplugin/ocaml.vim
@@ -595,6 +600,7 @@ share/nvim/runtime/indent/ishd.vim
share/nvim/runtime/indent/j.vim
share/nvim/runtime/indent/java.vim
share/nvim/runtime/indent/javascript.vim
+share/nvim/runtime/indent/javascriptreact.vim
share/nvim/runtime/indent/json.vim
share/nvim/runtime/indent/jsp.vim
share/nvim/runtime/indent/ld.vim
@@ -624,6 +630,7 @@ share/nvim/runtime/indent/prolog.vim
share/nvim/runtime/indent/pyrex.vim
share/nvim/runtime/indent/python.vim
share/nvim/runtime/indent/r.vim
+share/nvim/runtime/indent/raml.vim
share/nvim/runtime/indent/readline.vim
share/nvim/runtime/indent/rhelp.vim
share/nvim/runtime/indent/rmd.vim
@@ -652,6 +659,7 @@ share/nvim/runtime/indent/tex.vim
share/nvim/runtime/indent/tf.vim
share/nvim/runtime/indent/tilde.vim
share/nvim/runtime/indent/treetop.vim
+share/nvim/runtime/indent/typescript.vim
share/nvim/runtime/indent/vb.vim
share/nvim/runtime/indent/verilog.vim
share/nvim/runtime/indent/vhdl.vim
@@ -747,6 +755,8 @@ share/nvim/runtime/lua/
share/nvim/runtime/lua/man.lua
share/nvim/runtime/lua/vim/
share/nvim/runtime/lua/vim/compat.lua
+share/nvim/runtime/lua/vim/inspect.lua
+share/nvim/runtime/lua/vim/shared.lua
share/nvim/runtime/macmap.vim
share/nvim/runtime/macros/
share/nvim/runtime/macros/editexisting.vim
@@ -770,6 +780,14 @@ share/nvim/runtime/pack/dist/opt/cfilter/plugin/cfilter.vim
share/nvim/runtime/pack/dist/opt/justify/
share/nvim/runtime/pack/dist/opt/justify/plugin/
share/nvim/runtime/pack/dist/opt/justify/plugin/justify.vim
+share/nvim/runtime/pack/dist/opt/matchit/
+share/nvim/runtime/pack/dist/opt/matchit/autoload/
+share/nvim/runtime/pack/dist/opt/matchit/autoload/matchit.vim
+share/nvim/runtime/pack/dist/opt/matchit/doc/
+share/nvim/runtime/pack/dist/opt/matchit/doc/matchit.txt
+share/nvim/runtime/pack/dist/opt/matchit/doc/tags
+share/nvim/runtime/pack/dist/opt/matchit/plugin/
+share/nvim/runtime/pack/dist/opt/matchit/plugin/matchit.vim
share/nvim/runtime/pack/dist/opt/shellmenu/
share/nvim/runtime/pack/dist/opt/shellmenu/plugin/
share/nvim/runtime/pack/dist/opt/shellmenu/plugin/shellmenu.vim
@@ -840,6 +858,7 @@ share/nvim/runtime/spell/en.utf-8.spl
share/nvim/runtime/synmenu.vim
share/nvim/runtime/syntax/
share/nvim/runtime/syntax/2html.vim
+share/nvim/runtime/syntax/8th.vim
share/nvim/runtime/syntax/a2ps.vim
share/nvim/runtime/syntax/a65.vim
share/nvim/runtime/syntax/aap.vim
@@ -980,6 +999,7 @@ share/nvim/runtime/syntax/dtd.vim
share/nvim/runtime/syntax/dtml.vim
share/nvim/runtime/syntax/dtrace.vim
share/nvim/runtime/syntax/dts.vim
+share/nvim/runtime/syntax/dune.vim
share/nvim/runtime/syntax/dylan.vim
share/nvim/runtime/syntax/dylanintr.vim
share/nvim/runtime/syntax/dylanlid.vim
@@ -1055,6 +1075,7 @@ share/nvim/runtime/syntax/hex.vim
share/nvim/runtime/syntax/hgcommit.vim
share/nvim/runtime/syntax/hitest.vim
share/nvim/runtime/syntax/hog.vim
+share/nvim/runtime/syntax/hollywood.vim
share/nvim/runtime/syntax/hostconf.vim
share/nvim/runtime/syntax/hostsaccess.vim
share/nvim/runtime/syntax/html.vim
@@ -1084,6 +1105,7 @@ share/nvim/runtime/syntax/jargon.vim
share/nvim/runtime/syntax/java.vim
share/nvim/runtime/syntax/javacc.vim
share/nvim/runtime/syntax/javascript.vim
+share/nvim/runtime/syntax/javascriptreact.vim
share/nvim/runtime/syntax/jess.vim
share/nvim/runtime/syntax/jgraph.vim
share/nvim/runtime/syntax/jovial.vim
@@ -1240,6 +1262,7 @@ share/nvim/runtime/syntax/quake.vim
share/nvim/runtime/syntax/r.vim
share/nvim/runtime/syntax/racc.vim
share/nvim/runtime/syntax/radiance.vim
+share/nvim/runtime/syntax/raml.vim
share/nvim/runtime/syntax/ratpoison.vim
share/nvim/runtime/syntax/rc.vim
share/nvim/runtime/syntax/rcs.vim
@@ -1358,6 +1381,7 @@ share/nvim/runtime/syntax/taskedit.vim
share/nvim/runtime/syntax/tasm.vim
share/nvim/runtime/syntax/tcl.vim
share/nvim/runtime/syntax/tcsh.vim
+share/nvim/runtime/syntax/template.vim
share/nvim/runtime/syntax/teraterm.vim
share/nvim/runtime/syntax/terminfo.vim
share/nvim/runtime/syntax/tex.vim
@@ -1380,6 +1404,7 @@ share/nvim/runtime/syntax/tt2.vim
share/nvim/runtime/syntax/tt2html.vim
share/nvim/runtime/syntax/tt2js.vim
share/nvim/runtime/syntax/tutor.vim
+share/nvim/runtime/syntax/typescript.vim
share/nvim/runtime/syntax/uc.vim
share/nvim/runtime/syntax/udevconf.vim
share/nvim/runtime/syntax/udevperm.vim
@@ -1411,6 +1436,7 @@ share/nvim/runtime/syntax/voscm.vim
share/nvim/runtime/syntax/vrml.vim
share/nvim/runtime/syntax/vroom.vim
share/nvim/runtime/syntax/vsejcl.vim
+share/nvim/runtime/syntax/vue.vim
share/nvim/runtime/syntax/wast.vim
share/nvim/runtime/syntax/wdiff.vim
share/nvim/runtime/syntax/web.vim
diff --git Makefile Makefile
index ddf0f18..1ea5cc4 100644
--- Makefile
+++ Makefile
@@ -1,20 +1,22 @@
# $OpenBSD: Makefile,v 1.2 2019/07/12 20:46:03 sthen Exp $
COMMENT = very basic terminfo library
-VERSION = 1.2.0
+VERSION = 2.0.0
DISTNAME = unibilium-${VERSION}
-GH_ACCOUNT = mauke
+GH_ACCOUNT = neovim
GH_PROJECT = unibilium
GH_TAGNAME = v${VERSION}
-SHARED_LIBS += unibilium 0.0 # 3.0
+SHARED_LIBS += unibilium 1.0 # 4.0
CATEGORIES = devel
# LGPLv3+
PERMIT_PACKAGE = Yes
+DEBUG_PACKAGES = ${BUILD_PACKAGES}
+
MAKE_FLAGS = PREFIX=${PREFIX} \
MANDIR=${PREFIX}/man
diff --git distinfo distinfo
index 61047b4..b531af4 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (unibilium-1.2.0.tar.gz) = YjrxCZUV5nOr/TyuXy+oCKCcpV3aHGWntclCTrME6tg=
-SIZE (unibilium-1.2.0.tar.gz) = 88488
+SHA256 (unibilium-2.0.0.tar.gz) = eJl9ONTIF3xg09DBqoxT/QgG6yGCW3szWxdo1xFrwcE=
+SIZE (unibilium-2.0.0.tar.gz) = 112570
diff --git pkg/PLIST pkg/PLIST
index 683d93b..2012515 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2017/01/19 19:44:47 edd Exp $
include/unibilium.h
-lib/libunibilium.a
+@static-lib lib/libunibilium.a
lib/libunibilium.la
@lib lib/libunibilium.so.${LIBunibilium_VERSION}
lib/pkgconfig/unibilium.pc
