Attachment #174178 for bug #212233

Lines 2-10 Link Here

(-)Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= neovim	4	PORTNAME= neovim
5	PORTVERSION= 0.1.4	5	PORTVERSION= 0.1.5
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	PORTREVISION= 2
8	CATEGORIES= editors	7	CATEGORIES= editors
9		8
10	MAINTAINER= gor@clogic.com.ua	9	MAINTAINER= gor@clogic.com.ua

Lines 1-4 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (neovim-neovim-v0.1.4_GH0.tar.gz) = bb7e359eb83db20c5ec5984b470b249372b6dcd813ae2ccf72c01cce560f93e9	1	TIMESTAMP = 1472456512
2	SIZE (neovim-neovim-v0.1.4_GH0.tar.gz) = 7678847	2	SHA256 (neovim-neovim-v0.1.5_GH0.tar.gz) = f286ff7994ef1835272285425d65804063f112c91925fee3ef8865282a6d2b7e
		3	SIZE (neovim-neovim-v0.1.5_GH0.tar.gz) = 7813974
3	SHA256 (tarruda-libmpack-1.0.2_GH0.tar.gz) = 9c570b2aab81b0c56d97cbd8fc483dc431b69510fd9becb4a1845291563e8bc9	4	SHA256 (tarruda-libmpack-1.0.2_GH0.tar.gz) = 9c570b2aab81b0c56d97cbd8fc483dc431b69510fd9becb4a1845291563e8bc9
4	SIZE (tarruda-libmpack-1.0.2_GH0.tar.gz) = 44671	5	SIZE (tarruda-libmpack-1.0.2_GH0.tar.gz) = 44671

Lines 1-4 Link Here

(-)files/patch-CMakeLists.txt (-3 / +6 lines)
1	--- CMakeLists.txt.orig 2016-05-09 13:04:04 UTC	1	--- CMakeLists.txt.orig 2016-08-29 10:07:00 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -213,7 +213,7 @@ else()	3	@@ -213,7 +213,7 @@ else()
4		4
Lines 9-15 Link Here
9	add_definitions(-Wno-c11-extensions)	9	add_definitions(-Wno-c11-extensions)
10	endif()	10	endif()
11	endif()	11	endif()
12	@@ -367,7 +367,7 @@ endforeach()	12	@@ -369,9 +369,9 @@ endforeach()
13		13
14	# Find Lua interpreter	14	# Find Lua interpreter
15	include(LuaHelpers)	15	include(LuaHelpers)
Lines 16-20 Link Here
16	-set(LUA_DEPENDENCIES lpeg mpack bit)	16	-set(LUA_DEPENDENCIES lpeg mpack bit)
17	+set(LUA_DEPENDENCIES lpeg bit)	17	+set(LUA_DEPENDENCIES lpeg bit)
18	if(NOT LUA_PRG)	18	if(NOT LUA_PRG)
19	foreach(CURRENT_LUA_PRG luajit lua)	19	- foreach(CURRENT_LUA_PRG luajit lua5.1 lua5.2 lua)
		20	+ foreach(CURRENT_LUA_PRG luajit lua${LUA_VER})
20	# If LUA_PRG is set find_program() will not search	21	# If LUA_PRG is set find_program() will not search
		22	unset(LUA_PRG CACHE)
		23	unset(LUA_PRG_WORKS)




--- config/CMakeLists.txt.orig	2016-06-05 14:13:28 UTC
+++ config/CMakeLists.txt
@@ -67,6 +67,14 @@ if(HAVE_LANGINFO_H)
   check_symbol_exists(CODESET "langinfo.h" HAVE_NL_LANGINFO_CODESET)
 endif()
 
+check_include_files("endian.h" HAVE_ENDIAN_H)
+check_include_files("sys/endian.h" HAVE_SYS_ENDIAN_H)
+
+set(ENDIAN_INCLUDE_FILE "endian.h")
+if(HAVE_SYS_ENDIAN_H AND NOT HAVE_ENDIAN_H)
+  set(ENDIAN_INCLUDE_FILE "sys/endian.h")
+endif()
+
 set(SI "#include <stdint.h>\n")
 set(MS "int main(int argc,char**argv)\n{\n  uint64_t i=0x0102030405060708ULL;")
 set(ME "}")
@@ -74,7 +82,7 @@ check_c_source_compiles("
   #define _BSD_SOURCE 1
   #define _DEFAULT_SOURCE 1
   ${SI}
-  #include <endian.h>
+  #include <${ENDIAN_INCLUDE_FILE}>
   #ifndef be64toh
   # error No be64toh macros
   #endif

Lines 1-9 Link Here

(-)files/patch-config__config.h.in (-9 lines)
1	--- config/config.h.in.orig 2016-06-05 14:13:28 UTC
2	+++ config/config.h.in
3	@@ -57,5 +57,6 @@
4
5	#cmakedefine HAVE_BE64TOH
6	#cmakedefine ORDER_BIG_ENDIAN
7	+#define ENDIAN_INCLUDE_FILE <@ENDIAN_INCLUDE_FILE@>
8
9	#endif // AUTO_CONFIG_H

Lines 1-11 Link Here

(-)files/patch-src__nvim__shada.c (-11 lines)
1	--- src/nvim/shada.c.orig 2016-06-05 14:13:28 UTC
2	+++ src/nvim/shada.c
3	@@ -46,7 +46,7 @@
4	#ifdef HAVE_BE64TOH
5	# define _BSD_SOURCE 1
6	# define _DEFAULT_SOURCE 1
7	-# include <endian.h>
8	+# include ENDIAN_INCLUDE_FILE
9	#endif
10
11	// Note: when using bufset hash pointers are intentionally casted to uintptr_t

Lines 1-11 Link Here

(-)files/patch-src_nvim_event_pty__process.c (-11 lines)
1	--- src/nvim/event/pty_process.c.orig 2016-04-25 01:46:34 UTC
2	+++ src/nvim/event/pty_process.c
3	@@ -10,7 +10,7 @@
4	#include <sys/ioctl.h>
5
6	// forkpty is not in POSIX, so headers are platform-specific
7	-#if defined(__FreeBSD__)
8	+#if defined(__FreeBSD__) \|\| defined __DragonFly__
9	# include <libutil.h>
10	#elif defined(__OpenBSD__) \|\| defined(__NetBSD__) \|\| defined(__APPLE__)
11	# include <util.h>

Return to bug 212233

Lines 1-26 Link Here

(-)files/patch-config__CMakeLists.txt (-26 lines)
1	--- config/CMakeLists.txt.orig 2016-06-05 14:13:28 UTC
2	+++ config/CMakeLists.txt
3	@@ -67,6 +67,14 @@ if(HAVE_LANGINFO_H)
4	check_symbol_exists(CODESET "langinfo.h" HAVE_NL_LANGINFO_CODESET)
5	endif()
6
7	+check_include_files("endian.h" HAVE_ENDIAN_H)
8	+check_include_files("sys/endian.h" HAVE_SYS_ENDIAN_H)
9	+
10	+set(ENDIAN_INCLUDE_FILE "endian.h")
11	+if(HAVE_SYS_ENDIAN_H AND NOT HAVE_ENDIAN_H)
12	+ set(ENDIAN_INCLUDE_FILE "sys/endian.h")
13	+endif()
14	+
15	set(SI "#include <stdint.h>\n")
16	set(MS "int main(int argc,char**argv)\n{\n uint64_t i=0x0102030405060708ULL;")
17	set(ME "}")
18	@@ -74,7 +82,7 @@ check_c_source_compiles("
19	#define _BSD_SOURCE 1
20	#define _DEFAULT_SOURCE 1
21	${SI}
22	- #include <endian.h>
23	+ #include <${ENDIAN_INCLUDE_FILE}>
24	#ifndef be64toh
25	# error No be64toh macros
26	#endif

Lines 45-50 Link Here

(-)pkg-plist (-8 / +18 lines)
45	share/nvim/runtime/autoload/decada.vim	45	share/nvim/runtime/autoload/decada.vim
46	share/nvim/runtime/autoload/gnat.vim	46	share/nvim/runtime/autoload/gnat.vim
47	share/nvim/runtime/autoload/gzip.vim	47	share/nvim/runtime/autoload/gzip.vim
		48	share/nvim/runtime/autoload/health.vim
		49	share/nvim/runtime/autoload/health/nvim.vim
48	share/nvim/runtime/autoload/htmlcomplete.vim	50	share/nvim/runtime/autoload/htmlcomplete.vim
49	share/nvim/runtime/autoload/javascriptcomplete.vim	51	share/nvim/runtime/autoload/javascriptcomplete.vim
50	share/nvim/runtime/autoload/man.vim	52	share/nvim/runtime/autoload/man.vim
Lines 60-65 Link Here
60	share/nvim/runtime/autoload/provider/python3.vim	62	share/nvim/runtime/autoload/provider/python3.vim
61	share/nvim/runtime/autoload/provider/pythonx.vim	63	share/nvim/runtime/autoload/provider/pythonx.vim
62	share/nvim/runtime/autoload/provider/ruby.vim	64	share/nvim/runtime/autoload/provider/ruby.vim
		65	share/nvim/runtime/autoload/provider/script_host.rb
63	share/nvim/runtime/autoload/python3complete.vim	66	share/nvim/runtime/autoload/python3complete.vim
64	share/nvim/runtime/autoload/pythoncomplete.vim	67	share/nvim/runtime/autoload/pythoncomplete.vim
65	share/nvim/runtime/autoload/remote/define.vim	68	share/nvim/runtime/autoload/remote/define.vim
Lines 72-78 Link Here
72	share/nvim/runtime/autoload/tar.vim	75	share/nvim/runtime/autoload/tar.vim
73	share/nvim/runtime/autoload/tohtml.vim	76	share/nvim/runtime/autoload/tohtml.vim
74	share/nvim/runtime/autoload/tutor.vim	77	share/nvim/runtime/autoload/tutor.vim
75	share/nvim/runtime/autoload/vimball.vim
76	share/nvim/runtime/autoload/vimexpect.vim	78	share/nvim/runtime/autoload/vimexpect.vim
77	share/nvim/runtime/autoload/xml/html32.vim	79	share/nvim/runtime/autoload/xml/html32.vim
78	share/nvim/runtime/autoload/xml/html401f.vim	80	share/nvim/runtime/autoload/xml/html401f.vim
Lines 184-190 Link Here
184	share/nvim/runtime/doc/ft_ada.txt	186	share/nvim/runtime/doc/ft_ada.txt
185	share/nvim/runtime/doc/ft_sql.txt	187	share/nvim/runtime/doc/ft_sql.txt
186	share/nvim/runtime/doc/gui.txt	188	share/nvim/runtime/doc/gui.txt
187	share/nvim/runtime/doc/gui_w32.txt
188	share/nvim/runtime/doc/hebrew.txt	189	share/nvim/runtime/doc/hebrew.txt
189	share/nvim/runtime/doc/help.txt	190	share/nvim/runtime/doc/help.txt
190	share/nvim/runtime/doc/helphelp.txt	191	share/nvim/runtime/doc/helphelp.txt
Lines 191-196 Link Here
191	share/nvim/runtime/doc/howto.txt	192	share/nvim/runtime/doc/howto.txt
192	share/nvim/runtime/doc/if_cscop.txt	193	share/nvim/runtime/doc/if_cscop.txt
193	share/nvim/runtime/doc/if_pyth.txt	194	share/nvim/runtime/doc/if_pyth.txt
		195	share/nvim/runtime/doc/if_ruby.txt
194	share/nvim/runtime/doc/indent.txt	196	share/nvim/runtime/doc/indent.txt
195	share/nvim/runtime/doc/index.txt	197	share/nvim/runtime/doc/index.txt
196	share/nvim/runtime/doc/insert.txt	198	share/nvim/runtime/doc/insert.txt
Lines 205-219 Link Here
205	share/nvim/runtime/doc/motion.txt	207	share/nvim/runtime/doc/motion.txt
206	share/nvim/runtime/doc/msgpack_rpc.txt	208	share/nvim/runtime/doc/msgpack_rpc.txt
207	share/nvim/runtime/doc/nvim.txt	209	share/nvim/runtime/doc/nvim.txt
208	share/nvim/runtime/doc/nvim_clipboard.txt
209	share/nvim/runtime/doc/nvim_from_vim.txt
210	share/nvim/runtime/doc/nvim_provider.txt
211	share/nvim/runtime/doc/nvim_python.txt
212	share/nvim/runtime/doc/nvim_terminal_emulator.txt	210	share/nvim/runtime/doc/nvim_terminal_emulator.txt
213	share/nvim/runtime/doc/options.txt	211	share/nvim/runtime/doc/options.txt
214	share/nvim/runtime/doc/os_win32.txt	212	share/nvim/runtime/doc/os_win32.txt
215	share/nvim/runtime/doc/pattern.txt	213	share/nvim/runtime/doc/pattern.txt
216	share/nvim/runtime/doc/pi_gzip.txt	214	share/nvim/runtime/doc/pi_gzip.txt
		215	share/nvim/runtime/doc/pi_health.txt
217	share/nvim/runtime/doc/pi_matchit.txt	216	share/nvim/runtime/doc/pi_matchit.txt
218	share/nvim/runtime/doc/pi_msgpack.txt	217	share/nvim/runtime/doc/pi_msgpack.txt
219	share/nvim/runtime/doc/pi_netrw.txt	218	share/nvim/runtime/doc/pi_netrw.txt
Lines 221-229 Link Here
221	share/nvim/runtime/doc/pi_spec.txt	220	share/nvim/runtime/doc/pi_spec.txt
222	share/nvim/runtime/doc/pi_tar.txt	221	share/nvim/runtime/doc/pi_tar.txt
223	share/nvim/runtime/doc/pi_tutor.txt	222	share/nvim/runtime/doc/pi_tutor.txt
224	share/nvim/runtime/doc/pi_vimball.txt
225	share/nvim/runtime/doc/pi_zip.txt	223	share/nvim/runtime/doc/pi_zip.txt
226	share/nvim/runtime/doc/print.txt	224	share/nvim/runtime/doc/print.txt
		225	share/nvim/runtime/doc/provider.txt
227	share/nvim/runtime/doc/quickfix.txt	226	share/nvim/runtime/doc/quickfix.txt
228	share/nvim/runtime/doc/quickref.txt	227	share/nvim/runtime/doc/quickref.txt
229	share/nvim/runtime/doc/quotes.txt	228	share/nvim/runtime/doc/quotes.txt
Lines 332-337 Link Here
332	share/nvim/runtime/ftplugin/dosini.vim	331	share/nvim/runtime/ftplugin/dosini.vim
333	share/nvim/runtime/ftplugin/dtd.vim	332	share/nvim/runtime/ftplugin/dtd.vim
334	share/nvim/runtime/ftplugin/dtrace.vim	333	share/nvim/runtime/ftplugin/dtrace.vim
		334	share/nvim/runtime/ftplugin/eiffel.vim
335	share/nvim/runtime/ftplugin/elinks.vim	335	share/nvim/runtime/ftplugin/elinks.vim
336	share/nvim/runtime/ftplugin/erlang.vim	336	share/nvim/runtime/ftplugin/erlang.vim
337	share/nvim/runtime/ftplugin/eruby.vim	337	share/nvim/runtime/ftplugin/eruby.vim
Lines 356-361 Link Here
356	share/nvim/runtime/ftplugin/hamster.vim	356	share/nvim/runtime/ftplugin/hamster.vim
357	share/nvim/runtime/ftplugin/haskell.vim	357	share/nvim/runtime/ftplugin/haskell.vim
358	share/nvim/runtime/ftplugin/help.vim	358	share/nvim/runtime/ftplugin/help.vim
		359	share/nvim/runtime/ftplugin/hgcommit.vim
		360	share/nvim/runtime/ftplugin/hog.vim
359	share/nvim/runtime/ftplugin/hostconf.vim	361	share/nvim/runtime/ftplugin/hostconf.vim
360	share/nvim/runtime/ftplugin/hostsaccess.vim	362	share/nvim/runtime/ftplugin/hostsaccess.vim
361	share/nvim/runtime/ftplugin/html.vim	363	share/nvim/runtime/ftplugin/html.vim
Lines 531-536 Link Here
531	share/nvim/runtime/indent/go.vim	533	share/nvim/runtime/indent/go.vim
532	share/nvim/runtime/indent/haml.vim	534	share/nvim/runtime/indent/haml.vim
533	share/nvim/runtime/indent/hamster.vim	535	share/nvim/runtime/indent/hamster.vim
		536	share/nvim/runtime/indent/hog.vim
534	share/nvim/runtime/indent/html.vim	537	share/nvim/runtime/indent/html.vim
535	share/nvim/runtime/indent/htmldjango.vim	538	share/nvim/runtime/indent/htmldjango.vim
536	share/nvim/runtime/indent/idlang.vim	539	share/nvim/runtime/indent/idlang.vim
Lines 684-690 Link Here
684	share/nvim/runtime/menu.vim	687	share/nvim/runtime/menu.vim
685	share/nvim/runtime/mswin.vim	688	share/nvim/runtime/mswin.vim
686	share/nvim/runtime/optwin.vim	689	share/nvim/runtime/optwin.vim
		690	share/nvim/runtime/pack/dist/opt/justify/plugin/justify.vim
		691	share/nvim/runtime/pack/dist/opt/shellmenu/plugin/shellmenu.vim
		692	share/nvim/runtime/pack/dist/opt/swapmouse/plugin/swapmouse.vim
		693	share/nvim/runtime/pack/dist/opt/vimball/autoload/vimball.vim
		694	share/nvim/runtime/pack/dist/opt/vimball/doc/tags
		695	share/nvim/runtime/pack/dist/opt/vimball/doc/vimball.txt
		696	share/nvim/runtime/pack/dist/opt/vimball/plugin/vimballPlugin.vim
687	share/nvim/runtime/plugin/gzip.vim	697	share/nvim/runtime/plugin/gzip.vim
		698	share/nvim/runtime/plugin/health.vim
688	share/nvim/runtime/plugin/man.vim	699	share/nvim/runtime/plugin/man.vim
689	share/nvim/runtime/plugin/matchit.vim	700	share/nvim/runtime/plugin/matchit.vim
690	share/nvim/runtime/plugin/matchparen.vim	701	share/nvim/runtime/plugin/matchparen.vim
Lines 696-702 Link Here
696	share/nvim/runtime/plugin/tarPlugin.vim	707	share/nvim/runtime/plugin/tarPlugin.vim
697	share/nvim/runtime/plugin/tohtml.vim	708	share/nvim/runtime/plugin/tohtml.vim
698	share/nvim/runtime/plugin/tutor.vim	709	share/nvim/runtime/plugin/tutor.vim
699	share/nvim/runtime/plugin/vimballPlugin.vim
700	share/nvim/runtime/plugin/zipPlugin.vim	710	share/nvim/runtime/plugin/zipPlugin.vim
701	share/nvim/runtime/print/ascii.ps	711	share/nvim/runtime/print/ascii.ps
702	share/nvim/runtime/print/cidfont.ps	712	share/nvim/runtime/print/cidfont.ps