Attachment 169405 Details for Bug 208867 – editors_neovim.diff

[patch] editors_neovim.diff

editors_neovim.diff (text/plain), 4.48 KB, created by tkato432 on 2016-04-17 18:32:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2016-04-17 18:32:15 UTC

Size: 4.48 KB

patch

obsolete

>diff -urN /usr/ports/editors/neovim/Makefile editors/neovim/Makefile
>--- /usr/ports/editors/neovim/Makefile	2016-04-01 23:18:39.970789000 +0900
>+++ editors/neovim/Makefile	2016-04-18 00:00:00.000000000 +0900
>@@ -2,9 +2,9 @@
> # $FreeBSD: head/editors/neovim/Makefile 412346 2016-04-01 14:00:51Z mat $
> 
> PORTNAME=	neovim
>-PORTVERSION=	0.1.2
>+PORTVERSION=	0.1.3
>+DISTVERSIONPREFIX=	v
> CATEGORIES=	editors
>-MASTER_SITES=	GH
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Next generation Vim
>@@ -14,18 +14,18 @@
> BUILD_DEPENDS=	${LUA_MODSHAREDIR}/MessagePack.lua:devel/lua-MessagePack \
> 		${LUA_MODLIBDIR}/bit.so:devel/lua-bitop \
> 		${LUA_MODLIBDIR}/lpeg.so:devel/lua-lpeg
>-LIB_DEPENDS=	libunibilium.so:devel/unibilium \
>-		libvterm.so:devel/libvterm \
>-		libtermkey.so:devel/libtermkey \
>-		libluajit-5.1.so:lang/luajit \
>+LIB_DEPENDS=	libtermkey.so:devel/libtermkey \
> 		libuv.so:devel/libuv \
>-		libmsgpack.so:devel/msgpack
>+		libvterm.so:devel/libvterm \
>+		libmsgpack.so:devel/msgpack \
>+		libunibilium.so:devel/unibilium \
>+		libluajit-5.1.so:lang/luajit
> 
>-USES=		cmake gettext-tools lua gmake pkgconfig
> USE_GITHUB=	yes
>-GH_TAGNAME=	b33c777
> 
>-CMAKE_ARGS+=	-DLUA_PRG=${LUA_CMD} \
>-		-DUSE_BUNDLED_DEPS=OFF
>+USES=		cmake:outsource compiler gettext iconv lua pkgconfig
>+CMAKE_ARGS=	-DCMAKE_INSTALL_MANDIR:PATH="${MANPREFIX}/man" \
>+		-DLUA_PRG:FILEPATH="${LUA_CMD}" \
>+		-DDEPS_PREFIX:PATH="${LOCALBASE}"
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/editors/neovim/distinfo editors/neovim/distinfo
>--- /usr/ports/editors/neovim/distinfo	2016-02-11 16:24:27.987042000 +0900
>+++ editors/neovim/distinfo	2016-04-18 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (neovim-neovim-0.1.2-b33c777_GH0.tar.gz) = abb394c0f206859f31d781af7b22cda2a0b74378ed56485c111d30e8b9016652
>-SIZE (neovim-neovim-0.1.2-b33c777_GH0.tar.gz) = 7611302
>+SHA256 (neovim-neovim-v0.1.3_GH0.tar.gz) = 7a86892d941b8829537ad46864b9a363d009ba56aeefdef2ee15ffa3eee5f92b
>+SIZE (neovim-neovim-v0.1.3_GH0.tar.gz) = 7636777
>diff -urN /usr/ports/editors/neovim/files/patch-CMakeLists.txt editors/neovim/files/patch-CMakeLists.txt
>--- /usr/ports/editors/neovim/files/patch-CMakeLists.txt	2015-09-11 05:56:58.688109000 +0900
>+++ editors/neovim/files/patch-CMakeLists.txt	2016-04-18 00:00:00.000000000 +0900
>@@ -1,12 +1,20 @@
>---- CMakeLists.txt.orig	2015-07-06 08:07:23 UTC
>+--- CMakeLists.txt.orig	2016-04-08 02:04:21 UTC
> +++ CMakeLists.txt
>-@@ -277,6 +277,9 @@ file(GLOB MANPAGES
>-   RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
>-   man/nvim.1)
>+@@ -15,7 +15,7 @@ if(CMAKE_CROSSCOMPILING AND NOT UNIX)
>+   list(INSERT CMAKE_PREFIX_PATH 0 ${DEPS_PREFIX}/../host/bin)
>+ else()
>+   list(INSERT CMAKE_PREFIX_PATH 0 ${DEPS_PREFIX})
>+-  set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${DEPS_PREFIX}/lib/pkgconfig")
>++  set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${DEPS_PREFIX}/libdata/pkgconfig")
>+ endif()
>  
>-+unset(CMAKE_INSTALL_MANDIR)
>-+set(CMAKE_INSTALL_MANDIR ${CMAKE_INSTALL_PREFIX}/man)
>-+
>- install_helper(
>-   FILES ${MANPAGES}
>-   DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
>+ # used for check_c_compiler_flag
>+@@ -213,7 +213,7 @@ else()
>+ 
>+   # On FreeBSD 64 math.h uses unguarded C11 extension, which taints clang
>+   # 3.4.1 used there.
>+-  if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
>++  if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND CMAKE_C_COMPILER_ID MATCHES "Clang")
>+     add_definitions(-Wno-c11-extensions)
>+   endif()
>+ endif()
>diff -urN /usr/ports/editors/neovim/pkg-plist editors/neovim/pkg-plist
>--- /usr/ports/editors/neovim/pkg-plist	2016-02-11 16:24:27.987597000 +0900
>+++ editors/neovim/pkg-plist	2016-04-18 00:00:00.000000000 +0900
>@@ -59,7 +59,7 @@
> share/nvim/runtime/autoload/provider/python.vim
> share/nvim/runtime/autoload/provider/python3.vim
> share/nvim/runtime/autoload/provider/pythonx.vim
>-share/nvim/runtime/autoload/provider/script_host.py
>+share/nvim/runtime/autoload/provider/ruby.vim
> share/nvim/runtime/autoload/python3complete.vim
> share/nvim/runtime/autoload/pythoncomplete.vim
> share/nvim/runtime/autoload/remote/define.vim
>@@ -167,6 +167,7 @@
> share/nvim/runtime/compiler/xmllint.vim
> share/nvim/runtime/compiler/xmlwf.vim
> share/nvim/runtime/delmenu.vim
>+share/nvim/runtime/doc/api.txt
> share/nvim/runtime/doc/arabic.txt
> share/nvim/runtime/doc/autocmd.txt
> share/nvim/runtime/doc/change.txt
>@@ -210,7 +211,6 @@
> share/nvim/runtime/doc/nvim_python.txt
> share/nvim/runtime/doc/nvim_terminal_emulator.txt
> share/nvim/runtime/doc/options.txt
>-share/nvim/runtime/doc/os_dos.txt
> share/nvim/runtime/doc/os_win32.txt
> share/nvim/runtime/doc/pattern.txt
> share/nvim/runtime/doc/pi_gzip.txt

Actions: View | Diff

Attachments on bug 208867: 169405