View | Details | Raw Unified | Return to bug 208867
Collapse All | Expand All

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

Return to bug 208867