Index: Makefile =================================================================== --- Makefile (revision 466878) +++ Makefile (working copy) @@ -8,7 +8,7 @@ COMMENT= J programming language LICENSE= GPLv3 -LICENSE_FILE= ${WRKDIR}/jsource-j806-release/license.txt +LICENSE_FILE= ${WRKDIR}/jsource-${JVERSION}/license.txt ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON_amd64= Not built or tested for other archs. i386 needs hostdefs and netdefs files to be generated. @@ -28,10 +28,10 @@ GH_TAGNAME= ${JVERSION} # J is released with ports-unfriendly versioning -JVERSION= j806-release +JVERSION= j808-release BIN_FILES= jconsole -LIB_FILES= libj.so libtsdll.so libjavx.so +LIB_FILES= libj.so libtsdll.so do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/j/bin Index: distinfo =================================================================== --- distinfo (revision 466878) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1519502511 -SHA256 (jsoftware-jsource-806-j806-release_GH0.tar.gz) = 033a787ad3180a8ead8f4a3880c016b8581ddf6a3081f86a88774575c7cc168f -SIZE (jsoftware-jsource-806-j806-release_GH0.tar.gz) = 2280551 +TIMESTAMP = 1520449029 +SHA256 (jsoftware-jsource-808-j808-release_GH0.tar.gz) = 1c7335e0d705bfc630da230ee8d196487627eed6f9374728bcac6b9ffbb1fd1d +SIZE (jsoftware-jsource-808-j808-release_GH0.tar.gz) = 2128876 Index: files/jconsole.in =================================================================== --- files/jconsole.in (revision 466878) +++ files/jconsole.in (working copy) @@ -1,5 +1,3 @@ #!/bin/sh -# $FreeBSD$ - exec %%LOCALBASE%%/lib/j/bin/jconsole -jprofile %%LOCALBASE%%/share/j/profile.ijs Index: files/patch-Makefile =================================================================== --- files/patch-Makefile (revision 466878) +++ files/patch-Makefile (working copy) @@ -1,11 +1,11 @@ ---- Makefile.orig 2018-02-24 19:49:42 UTC +--- Makefile.orig 2018-04-09 18:07:38 UTC +++ Makefile -@@ -0,0 +1,25 @@ +@@ -0,0 +1,21 @@ +.PHONY: all +all: make-${ARCH} + +.PHONY: make-amd64 -+make-amd64: build-j64 libj-avx ++make-amd64: build-j64 + +.PHONY: make-i386 +make-i386: build-j32 @@ -14,10 +14,6 @@ +init: + make/install.sh + -+.PHONY: libj-avx -+libj-avx: init -+ make/build_libj.sh j64avx -+ +build-%: init + make/build_jconsole.sh $* + make/build_libj.sh $* Index: files/patch-jlibrary_system_config_base.cfg =================================================================== --- files/patch-jlibrary_system_config_base.cfg (revision 466878) +++ files/patch-jlibrary_system_config_base.cfg (working copy) @@ -1,6 +1,6 @@ ---- jlibrary/system/config/base.cfg.orig 2018-02-22 18:45:28 UTC +--- jlibrary/system/config/base.cfg.orig 2016-11-25 19:04:24 UTC +++ jlibrary/system/config/base.cfg -@@ -90,6 +90,18 @@ case. 'Linux' do. +@@ -93,6 +93,18 @@ case. 'Linux' do. XDiff=: '/usr/bin/meld' Editor=: 'geany +%l %f' Editor_nox=: 'vi -c%l %f' Index: files/patch-jlibrary_system_main_regex.ijs =================================================================== --- files/patch-jlibrary_system_main_regex.ijs (revision 466878) +++ files/patch-jlibrary_system_main_regex.ijs (working copy) @@ -1,10 +1,10 @@ ---- jlibrary/system/main/regex.ijs.orig 2018-02-22 18:45:28 UTC +--- jlibrary/system/main/regex.ijs.orig 2018-03-07 18:59:01 UTC +++ jlibrary/system/main/regex.ijs @@ -101,6 +101,7 @@ NB. rxdll is in bin or tools/regex select. UNAME case. 'Win' do. t=. 'jpcre.dll' case. 'Darwin' do. t=. 'libjpcre.dylib' -+case. 'FreeBSD' do. t=. 'libpcreposix.so' - fcase. 'Linux' do. NB. fall throught ++case. 'FreeBSD' do. t=. 'libpcreposix.so' + fcase. 'Linux' do. if. 2 0-:('libpcreposix.so.3 dummyfunction n')&(15!:0) ::(15!:10) '' do. rxdll=: 'libpcreposix.so.3' Index: files/patch-jlibrary_system_main_stdlib.ijs =================================================================== --- files/patch-jlibrary_system_main_stdlib.ijs (revision 466878) +++ files/patch-jlibrary_system_main_stdlib.ijs (working copy) @@ -1,14 +1,6 @@ ---- jlibrary/system/main/stdlib.ijs.orig 2018-02-22 18:45:28 UTC +--- jlibrary/system/main/stdlib.ijs.orig 2016-11-25 19:04:24 UTC +++ jlibrary/system/main/stdlib.ijs -@@ -35,6 +35,7 @@ if. notdef 'UNAME' do. - end. - end. - 'libc.so.6 setlocale > x i *c'&(15!:0)^:(UNAME-:'Linux') 1;,'C' -+'libc.so.7 setlocale > x i *c'&(15!:0)^:(UNAME-:'FreeBSD') 1;,'C' - if. notdef 'IFRASPI' do. - if. UNAME -: 'Linux' do. - cpu=. 2!:0 'cat /proc/cpuinfo' -@@ -97,6 +98,7 @@ if. (<'home') -.@e. {."1 SystemFolders d +@@ -93,6 +93,7 @@ if. (<'home') -.@e. {."1 SystemFolders d elseif. 'Android'-:UNAME do. t=. '/sdcard' elseif. 'Darwin'-:UNAME do. t=. (0-:t){::'';~t=. 2!:5'HOME' elseif. 'Linux'-:UNAME do. t=. (0-:t){::'';~t=. 2!:5'HOME' @@ -16,7 +8,7 @@ elseif. do. t=. '' end. if. (''-:t)+.((,'/')-:t)+.('/root'-:t)+.('/usr/'-:5{.t) do. -@@ -111,6 +113,7 @@ if. (<'temp') -.@e. {."1 SystemFolders d +@@ -107,6 +108,7 @@ if. (<'temp') -.@e. {."1 SystemFolders d elseif. 'Android'-:UNAME do. t=. '/sdcard' elseif. 'Darwin'-:UNAME do. 1!:5 ::] msg_iov)); - printf ("msg_iovlen_off=: " FMTI "\n",offset(struct msghdr,msg_iovlen)); - printf ("msg_iovlen_sz=: " FMTI "\n",sizeof(((struct msghdr*)0)->msg_iovlen)); +@@ -147,7 +147,7 @@ int main(){ + printf ("msg_iov_sz=: %d\n",sizeof(((struct msghdr*)0)->msg_iov)); + printf ("msg_iovlen_off=: %d\n",offset(struct msghdr,msg_iovlen)); + printf ("msg_iovlen_sz=: %d\n",sizeof(((struct msghdr*)0)->msg_iovlen)); -#if defined(linux) || defined(Darwin) +#if defined(linux) || defined(Darwin) || defined(__FreeBSD__) - printf ("msg_control_off=: " FMTI "\n",offset(struct msghdr,msg_control)); - printf ("msg_control_sz=: " FMTI "\n",sizeof(((struct msghdr*)0)->msg_control)); - printf ("msg_controllen_off=: " FMTI "\n",offset(struct msghdr,msg_controllen)); + printf ("msg_control_off=: %d\n",offset(struct msghdr,msg_control)); + printf ("msg_control_sz=: %d\n",sizeof(((struct msghdr*)0)->msg_control)); + printf ("msg_controllen_off=: %d\n",offset(struct msghdr,msg_controllen)); Index: files/profile.ijs.in =================================================================== --- files/profile.ijs.in (revision 466878) +++ files/profile.ijs.in (working copy) @@ -1,7 +1,6 @@ NB. J profile NB. JFE sets BINPATH_z_ and ARGV_z_ NB. add your sentences in startup.ijs -NB. $FreeBSD$ systype=. 9!:12'' jpathsep_z_=: '/'&(('\' I.@:= ])}) Index: pkg-plist =================================================================== --- pkg-plist (revision 466878) +++ pkg-plist (working copy) @@ -1,7 +1,6 @@ bin/jconsole lib/j/bin/jconsole lib/j/bin/libj.so -lib/j/bin/libjavx.so lib/j/bin/libtsdll.so share/j/addons/data/jmf/history.txt share/j/addons/data/jmf/jmf.ijs @@ -105,14 +104,15 @@ share/j/addons/ide/jhs/utiljs.ijs share/j/profile.ijs share/j/system/config/base.cfg +share/j/system/config/base.cfg.orig share/j/system/config/folders.cfg share/j/system/config/version.txt share/j/system/defs/hostdefs_aix.ijs share/j/system/defs/hostdefs_android.ijs -share/j/system/defs/hostdefs_android_64.ijs share/j/system/defs/hostdefs_darwin.ijs share/j/system/defs/hostdefs_darwin_64.ijs share/j/system/defs/hostdefs_freebsd_64.ijs +share/j/system/defs/hostdefs_freebsd_64.ijs.orig share/j/system/defs/hostdefs_linux.ijs share/j/system/defs/hostdefs_linux_64.ijs share/j/system/defs/hostdefs_sunos.ijs @@ -120,21 +120,27 @@ share/j/system/defs/hostdefs_win_64.ijs share/j/system/defs/netdefs_aix.ijs share/j/system/defs/netdefs_android.ijs -share/j/system/defs/netdefs_android_64.ijs share/j/system/defs/netdefs_darwin.ijs share/j/system/defs/netdefs_darwin_64.ijs share/j/system/defs/netdefs_freebsd_64.ijs +share/j/system/defs/netdefs_freebsd_64.ijs.orig share/j/system/defs/netdefs_linux.ijs share/j/system/defs/netdefs_linux_64.ijs share/j/system/defs/netdefs_sunos.ijs share/j/system/defs/netdefs_win.ijs share/j/system/defs/netdefs_win_64.ijs +share/j/system/main/ctag.ijs share/j/system/main/regex.ijs +share/j/system/main/regex.ijs.orig share/j/system/main/socket.ijs share/j/system/main/stdlib.ijs +share/j/system/main/stdlib.ijs.orig share/j/system/main/task.ijs share/j/system/util/boot.ijs share/j/system/util/configure.ijs +share/j/system/util/edit.png +share/j/system/util/edit.svg +share/j/system/util/jadetag.ijs share/j/system/util/pacman.ijs share/j/system/util/pm.ijs share/j/system/util/pp.ijs @@ -141,3 +147,4 @@ share/j/system/util/project.ijs share/j/system/util/scripts.ijs share/j/system/util/tar.ijs +share/j/system/util/term.png