svn commit: r500311 - in head/lang/J: . files
Steve Wills
swills at FreeBSD.org
Sun Apr 28 12:10:05 UTC 2019
Author: swills
Date: Sun Apr 28 12:10:00 2019
New Revision: 500311
URL: https://svnweb.freebsd.org/changeset/ports/500311
Log:
lang/J: Update to j807-release
PR: 236454
Submitted by: João Neves <sevenjp at gmail.com> (maintainer)
Added:
head/lang/J/files/patch-jsrc_jeload.c (contents, props changed)
Modified:
head/lang/J/Makefile (contents, props changed)
head/lang/J/distinfo (contents, props changed)
head/lang/J/files/jconsole.in (contents, props changed)
head/lang/J/files/patch-Makefile (contents, props changed)
head/lang/J/files/patch-jlibrary_system_config_base.cfg (contents, props changed)
head/lang/J/files/patch-jlibrary_system_main_regex.ijs (contents, props changed)
head/lang/J/files/patch-jlibrary_system_main_stdlib.ijs (contents, props changed)
head/lang/J/files/patch-make_build__jconsole.sh (contents, props changed)
head/lang/J/files/patch-make_build__libj.sh (contents, props changed)
head/lang/J/files/patch-make_build__tsdll.sh (contents, props changed)
head/lang/J/files/patch-make_domake.sh (contents, props changed)
head/lang/J/files/patch-make_jvars.sh (contents, props changed)
head/lang/J/files/patch-make_makefile (contents, props changed)
head/lang/J/files/patch-netdefs_netdefs.c (contents, props changed)
head/lang/J/files/profile.ijs.in (contents, props changed)
head/lang/J/pkg-plist (contents, props changed)
Modified: head/lang/J/Makefile
==============================================================================
--- head/lang/J/Makefile Sun Apr 28 11:41:51 2019 (r500310)
+++ head/lang/J/Makefile Sun Apr 28 12:10:00 2019 (r500311)
@@ -1,25 +1,24 @@
# $FreeBSD$
PORTNAME= J
-DISTVERSIONPREFIX= j
-DISTVERSION= 808
-DISTVERSIONSUFFIX= -release
+PORTVERSION= ${JVERSION:S/^j//:S/-release//}
+PORTEPOCH= 1
CATEGORIES= lang math
MAINTAINER= sevenjp at gmail.com
COMMENT= J programming language
LICENSE= GPLv3
-LICENSE_FILE= ${WRKSRC}/license.txt
+LICENSE_FILE= ${WRKDIR}/jsource-${JVERSION}/license.txt
-ONLY_FOR_ARCHS= amd64
-ONLY_FOR_ARCHS_REASON_i386= i386 needs hostdefs and netdefs files to be generated.
+ONLY_FOR_ARCHS_REASON_amd64= Not built or tested for other archs. i386 needs hostdefs and netdefs files to be generated.
BUILD_DEPENDS= bash:shells/bash
-LIB_DEPENDS= libpcreposix.so:devel/pcre \
+LIB_DEPENDS= libpcre2-8.so:devel/pcre2 \
libsqlite3.so:databases/sqlite3
USES+= libedit gmake shebangfix uidfix
+
SHEBANG_GLOB= *.sh
SUB_FILES= jconsole profile.ijs
@@ -27,9 +26,28 @@ SUB_FILES= jconsole profile.ijs
USE_GITHUB= yes
GH_ACCOUNT= jsoftware
GH_PROJECT= jsource
+GH_TAGNAME= ${JVERSION}
+# J is released with ports-unfriendly versioning
+JVERSION= j807-release
+
BIN_FILES= jconsole
LIB_FILES= libj.so libtsdll.so
+
+OPTIONS_DEFINE= OPENMP
+
+OPENMP_DESC= Build with OpenMP support
+OPENMP_USES= compiler:openmp
+OPENMP_MAKE_ENV= USE_OPENMP=1
+OPENMP_LIB_DEPENDS= libgomp.so:lang/gcc7
+
+# J wants to install jconsole, also provided by openjdk
+CONFLICTS_INSTALL= openjdk6 \
+ openjdk6-jre \
+ openjdk7 \
+ openjdk7-jre \
+ openjdk8 \
+ openjdk8-jre
do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/lib/j/bin
Modified: head/lang/J/distinfo
==============================================================================
--- head/lang/J/distinfo Sun Apr 28 11:41:51 2019 (r500310)
+++ head/lang/J/distinfo Sun Apr 28 12:10:00 2019 (r500311)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1528123249
-SHA256 (jsoftware-jsource-j808-release_GH0.tar.gz) = 1c7335e0d705bfc630da230ee8d196487627eed6f9374728bcac6b9ffbb1fd1d
-SIZE (jsoftware-jsource-j808-release_GH0.tar.gz) = 2128876
+TIMESTAMP = 1546772563
+SHA256 (jsoftware-jsource-807-j807-release_GH0.tar.gz) = 324ff0b046c9f7f24f18a72fa8a4253ad54c99a48c397fd2c724392f5e097d7f
+SIZE (jsoftware-jsource-807-j807-release_GH0.tar.gz) = 2398318
Modified: head/lang/J/files/jconsole.in
==============================================================================
--- head/lang/J/files/jconsole.in Sun Apr 28 11:41:51 2019 (r500310)
+++ head/lang/J/files/jconsole.in Sun Apr 28 12:10:00 2019 (r500311)
@@ -1,5 +1,3 @@
#!/bin/sh
-# $FreeBSD$
-
exec %%LOCALBASE%%/lib/j/bin/jconsole -jprofile %%LOCALBASE%%/share/j/profile.ijs
Modified: head/lang/J/files/patch-Makefile
==============================================================================
--- head/lang/J/files/patch-Makefile Sun Apr 28 11:41:51 2019 (r500310)
+++ head/lang/J/files/patch-Makefile Sun Apr 28 12:10:00 2019 (r500311)
@@ -1,6 +1,6 @@
--- Makefile.orig 2018-04-09 18:07:38 UTC
+++ Makefile
-@@ -0,0 +1,21 @@
+@@ -0,0 +1,18 @@
+.PHONY: all
+all: make-${ARCH}
+
@@ -10,11 +10,8 @@
+.PHONY: make-i386
+make-i386: build-j32
+
-+.PHONY: init
-+init:
++build-%:
+ make/install.sh
-+
-+build-%: init
+ make/build_jconsole.sh $*
+ make/build_libj.sh $*
+ make/build_tsdll.sh $*
Modified: head/lang/J/files/patch-jlibrary_system_config_base.cfg
==============================================================================
--- head/lang/J/files/patch-jlibrary_system_config_base.cfg Sun Apr 28 11:41:51 2019 (r500310)
+++ head/lang/J/files/patch-jlibrary_system_config_base.cfg Sun Apr 28 12:10:00 2019 (r500311)
@@ -1,21 +1,21 @@
---- jlibrary/system/config/base.cfg.orig 2016-11-25 19:04:24 UTC
+--- jlibrary/system/config/base.cfg.orig 2019-01-06 11:06:00 UTC
+++ jlibrary/system/config/base.cfg
-@@ -93,6 +93,18 @@ case. 'Linux' do.
- XDiff=: '/usr/bin/meld'
- Editor=: 'geany +%l %f'
- Editor_nox=: 'vi -c%l %f'
+@@ -90,6 +90,18 @@ case. 'Linux' do.
+ XDiff=: ''
+ Editor=: ''
+ Editor_nox=: ''
+case. 'FreeBSD' do.
+ BoxForm=: 0
+ Browser=: ''
-+ Browser_nox=: '/usr/bin/w3m'
-+ EPSReader=: '/usr/bin/evince'
++ Browser_nox=: ''
++ EPSReader=: ''
+ ImageViewer=: ''
+ ImageViewer_nox=: ''
-+ PDFReader=: '/usr/bin/evince'
++ PDFReader=: ''
+ PDFReader_nox=: ''
-+ XDiff=: '/usr/bin/meld'
-+ Editor=: 'geany +%l %f'
-+ Editor_nox=: 'vi -c%l %f'
++ XDiff=: ''
++ Editor=: ''
++ Editor_nox=: ''
case. 'Win' do.
BoxForm=: 1
Browser=: ''
Modified: head/lang/J/files/patch-jlibrary_system_main_regex.ijs
==============================================================================
--- head/lang/J/files/patch-jlibrary_system_main_regex.ijs Sun Apr 28 11:41:51 2019 (r500310)
+++ head/lang/J/files/patch-jlibrary_system_main_regex.ijs Sun Apr 28 12:10:00 2019 (r500311)
@@ -1,10 +1,19 @@
---- jlibrary/system/main/regex.ijs.orig 2018-03-07 18:59:01 UTC
+--- jlibrary/system/main/regex.ijs.orig 2019-01-06 11:11:14 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.
- if. 2 0-:('libpcreposix.so.3 dummyfunction n')&(15!:0) ::(15!:10) '' do.
- rxdll=: 'libpcreposix.so.3'
+@@ -179,6 +179,7 @@ select. UNAME
+ case. 'Win' do. t=. 'jpcre2.dll'
+ case. 'Darwin' do. t=. 'libjpcre2.dylib'
+ case. 'Linux' do. t=. 'libjpcre2.so'
++case. 'FreeBSD' do. t=. 'libjpcre2.so'
+ case. 'Android' do. t=. 'libjpcre2.so'
+ end.
+
+@@ -191,6 +192,8 @@ NB. fall back one more time
+ if. ('Android'-:UNAME) *. 0 = 1!:4 :: 0: <f do.
+ f=. (({.~i:&'/')LIBFILE),'/',t
+ elseif. ('Linux'-:UNAME) *. (IFUNIX>'/'e.LIBFILE) *. 0 = 1!:4 :: 0: <f do.
++ f=. 'libpcre2-8.so.0'
++elseif. ('FreeBSD'-:UNAME) *. (IFUNIX>'/'e.LIBFILE) *. 0 = 1!:4 :: 0: <f do.
+ f=. 'libpcre2-8.so.0'
+ elseif. 0 = 1!:4 :: 0: <f do.
+ f=. t
Modified: head/lang/J/files/patch-jlibrary_system_main_stdlib.ijs
==============================================================================
--- head/lang/J/files/patch-jlibrary_system_main_stdlib.ijs Sun Apr 28 11:41:51 2019 (r500310)
+++ head/lang/J/files/patch-jlibrary_system_main_stdlib.ijs Sun Apr 28 12:10:00 2019 (r500311)
@@ -1,6 +1,14 @@
---- jlibrary/system/main/stdlib.ijs.orig 2016-11-25 19:04:24 UTC
+--- jlibrary/system/main/stdlib.ijs.orig 2018-10-02 13:24:06 UTC
+++ jlibrary/system/main/stdlib.ijs
-@@ -93,6 +93,7 @@ if. (<'home') -. at e. {."1 SystemFolders d
+@@ -44,6 +44,7 @@ if. notdef 'FHS' do.
+ FHS=: IFUNIX>'/'e.LIBFILE
+ 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'
+@@ -106,6 +107,7 @@ if. (<'home') -. at e. {."1 SystemFolders do.
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'
@@ -8,7 +16,7 @@
elseif. do. t=. ''
end.
if. (''-:t)+.((,'/')-:t)+.('/root'-:t)+.('/usr/'-:5{.t) do.
-@@ -107,6 +108,7 @@ if. (<'temp') -. at e. {."1 SystemFolders d
+@@ -120,6 +122,7 @@ if. (<'temp') -. at e. {."1 SystemFolders do.
elseif. 'Android'-:UNAME do. t=. '/sdcard'
elseif. 'Darwin'-:UNAME do. 1!:5 ::] <t=. '/tmp/',":2!:6''
elseif. 'Linux'-:UNAME do. 1!:5 ::] <t=. '/tmp/',":2!:6''
@@ -16,7 +24,7 @@
elseif. do. t=. ''
end.
SystemFolders=: SystemFolders, 'temp';t
-@@ -119,14 +121,14 @@ end.
+@@ -132,14 +135,14 @@ end.
18!:4 <'z'
18!:4 <'z'
UNXLIB=: ([: <;._1 ' ',]);._2 (0 : 0)
@@ -36,7 +44,7 @@
(<r,c) {:: UNXLIB_z_
)
18!:4 <'z'
-@@ -1337,7 +1339,7 @@ require 'pacman'
+@@ -1343,7 +1346,7 @@ require 'pacman'
do_install_jpacman_ y
)
getqtbin=: 3 : 0
Added: head/lang/J/files/patch-jsrc_jeload.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/J/files/patch-jsrc_jeload.c Sun Apr 28 12:10:00 2019 (r500311)
@@ -0,0 +1,11 @@
+--- jsrc/jeload.c.orig 2019-03-10 11:13:19 UTC
++++ jsrc/jeload.c
+@@ -330,6 +330,8 @@ int jefirst(int type,char* arg)
+ strcat(input,"[UNAME_z_=:'Win'");
+ #elif defined(__MACH__)
+ strcat(input,"[UNAME_z_=:'Darwin'");
++#elif defined(__FreeBSD__)
++ strcat(input,"[UNAME_z_=:'FreeBSD'");
+ #elif !defined(ANDROID)
+ strcat(input,"[UNAME_z_=:'Linux'");
+ #endif
Modified: head/lang/J/files/patch-make_build__jconsole.sh
==============================================================================
--- head/lang/J/files/patch-make_build__jconsole.sh Sun Apr 28 11:41:51 2019 (r500310)
+++ head/lang/J/files/patch-make_build__jconsole.sh Sun Apr 28 12:10:00 2019 (r500311)
@@ -1,21 +1,18 @@
---- make/build_jconsole.sh.orig 2018-04-09 17:54:22 UTC
+--- make/build_jconsole.sh.orig 2019-01-06 17:19:19 UTC
+++ make/build_jconsole.sh
-@@ -1,9 +1,8 @@
+@@ -1,6 +1,6 @@
#!/usr/local/bin/bash
# $1 is j32 or j64
-cd ~
--. jvars.sh
+. make/jvars.sh
--common=" -fPIC -O1 -Wextra "
-+common=" -fPIC -Wextra "
+ common=" -fPIC -O1 -Wextra -Wno-unused-parameter "
- case $jplatform\_$1 in
-
-@@ -27,6 +26,14 @@ darwin_j64)
+@@ -29,6 +29,14 @@ LINK=" -ledit -ldl -lncurses -m32 -mmacosx-version-min
+ darwin_j64)
COMPILE="$common -DREADLINE -mmacosx-version-min=10.5"
LINK=" -ledit -ldl -lncurses -mmacosx-version-min=10.5 -o jconsole "
- ;;
++;;
+freebsd_j32)
+COMPILE="$common -m32 -DREADLINE"
+LINK="-L${LOCALBASE}/lib -ledit -m32 -o jconsole "
@@ -23,7 +20,6 @@
+freebsd_j64)
+COMPILE="$common -DREADLINE"
+LINK="-L${LOCALBASE}/lib -ledit -o jconsole "
-+;;
+ ;;
*)
echo no case for those parameters
- exit
Modified: head/lang/J/files/patch-make_build__libj.sh
==============================================================================
--- head/lang/J/files/patch-make_build__libj.sh Sun Apr 28 11:41:51 2019 (r500310)
+++ head/lang/J/files/patch-make_build__libj.sh Sun Apr 28 12:10:00 2019 (r500311)
@@ -1,42 +1,42 @@
---- make/build_libj.sh.orig 2018-04-09 18:12:26 UTC
+--- make/build_libj.sh.orig 2019-03-10 15:39:26 UTC
+++ make/build_libj.sh
-@@ -1,7 +1,6 @@
+@@ -1,6 +1,6 @@
#!/usr/local/bin/bash
# $1 is j32 or j64
-cd ~
--. jvars.sh
+. make/jvars.sh
# gcc 5 vs 4 - killing off linux asm routines (overflow detection)
# new fast code uses builtins not available in gcc 4
-@@ -15,6 +14,8 @@ common="-fPIC -O1 -fno-if-conversion2 -f
- # clang
- # common="-Werror -fPIC -O1 -fwrapv -fno-strict-aliasing -Wextra -Wno-clobbered -Wno-maybe-uninitialized -Wno-unused-parameter -Wno-sign-compare -Wno-empty-body -Wno-unused-value -Wno-pointer-sign -Wno-parentheses -Wno-unsequenced -Wno-string-plus-int"
- darwin="-fPIC -O1 -fwrapv -fno-strict-aliasing -Wno-string-plus-int -Wno-empty-body -Wno-unsequenced -Wno-unused-value -Wno-pointer-sign -Wno-parentheses -Wno-return-type -Wno-constant-logical-operand -Wno-comment -Wno-unsequenced"
-+freebsd="-fPIC -O1 -fwrapv -fno-strict-aliasing -Wno-string-plus-int -Wno-empty-body -Wno-unsequenced -Wno-unused-value -Wno-pointer-sign -Wno-parentheses -Wno-return-type -Wno-constant-logical-operand -Wno-comment -Wno-unsequenced"
+@@ -14,7 +14,7 @@ if [ $USE_OPENMP -eq 1 ] ; then
+ OPENMP=" -fopenmp "
+ LDOPENMP=" -fopenmp "
+ if [ "x$compiler" = x'gcc' ] ; then
+-LDOPENMP32=" -l:libgomp.so.1 " # gcc
++LDOPENMP32=" -l:libgomp.so " # gcc
+ else
+ LDOPENMP32=" -l:libomp.so.5 " # clang
+ fi
+@@ -92,6 +92,22 @@ TARGET=libj.dylib
+ COMPILE="$darwin -mavx -mmacosx-version-min=10.5 -DC_AVX=1"
+ LINK=" -dynamiclib -lm -ldl $LDOPENMP -mmacosx-version-min=10.5 -o libj.dylib"
+ OBJS_FMA=" blis/gemm_int-fma.o "
++;;
+
-
- case $jplatform\_$1 in
-
-@@ -50,6 +51,21 @@ TARGET=libj.dylib
- COMPILE="$darwin -mmacosx-version-min=10.5"
- LINK=" -dynamiclib -lm -ldl -mmacosx-version-min=10.5 -o libj.dylib"
- ;;
-+
+freebsd_j32) # freebsd x86
+TARGET=libj.so
+# faster, but sse2 not available for 32-bit amd cpu
+# sse does not support mfpmath=sse in 32-bit gcc
-+COMPILE="$freebsd -m32 -msse2 -mfpmath=sse -DC_NOMULTINTRINSIC "
++COMPILE="$common -m32 -msse2 -mfpmath=sse -DC_NOMULTINTRINSIC "
+# slower, use 387 fpu and truncate extra precision
-+# COMPILE="$freebsd -m32 -ffloat-store "
-+LINK=" -shared -Wl,-soname,libj.so -m32 -lm -o libj.so "
++# COMPILE="$common -m32 -ffloat-store "
++LINK=" -shared -Wl,-soname,libj.so -m32 -lm -ldl $LDOPENMP32 -o libj.so "
+;;
-+freebsd_j64) # freebsd x86
++
++freebsd_j64) # freebsd amd64
+TARGET=libj.so
-+COMPILE="$freebsd -DC_NOMULTINTRINSIC "
-+LINK=" -shared -Wl,-soname,libj.so -lm -o libj.so "
-+;;
++COMPILE="$common -DC_NOMULTINTRINSIC "
++LINK=" -shared -Wl,-soname,libj.so -lm -ldl $LDOPENMP -o libj.so "
+ ;;
+
*)
- echo no case for those parameters
- exit
Modified: head/lang/J/files/patch-make_build__tsdll.sh
==============================================================================
--- head/lang/J/files/patch-make_build__tsdll.sh Sun Apr 28 11:41:51 2019 (r500310)
+++ head/lang/J/files/patch-make_build__tsdll.sh Sun Apr 28 12:10:00 2019 (r500311)
@@ -1,21 +1,34 @@
---- make/build_tsdll.sh.orig 2018-04-09 18:00:06 UTC
+--- make/build_tsdll.sh.orig 2019-03-10 15:32:23 UTC
+++ make/build_tsdll.sh
-@@ -1,9 +1,8 @@
+@@ -1,9 +1,22 @@
#!/usr/local/bin/bash
# $1 is j32 or j64
-cd ~
--. jvars.sh
+. make/jvars.sh
--common=" -fPIC -O1 -Werror -Wextra -Wno-unused-parameter"
-+common=" -fPIC -Werror -Wextra -Wno-unused-parameter"
++compiler=${CC:0:3}
++
+ common=" -fPIC -O1 -Werror -Wextra -Wno-unused-parameter"
++if [ "x$compiler" = x'gcc' ] ; then
++OVER_GCC_VER7=$(echo `$CC -dumpversion | cut -f1 -d.` \>= 7 | bc)
++if [ $OVER_GCC_VER7 -eq 1 ] ; then
++common="$common -Wno-implicit-fallthrough"
++fi
++OVER_GCC_VER8=$(echo `$CC -dumpversion | cut -f1 -d.` \>= 8 | bc)
++if [ $OVER_GCC_VER8 -eq 1 ] ; then
++common="$common -Wno-cast-function-type"
++fi
++fi
++
case $jplatform\_$1 in
-@@ -33,6 +32,16 @@ TARGET=libtsdll.dylib
+ linux_j32)
+@@ -35,6 +48,16 @@ darwin_j64)
+ TARGET=libtsdll.dylib
COMPILE="$common "
LINK=" -dynamiclib -o libtsdll.dylib "
- ;;
++;;
+freebsd_j32)
+TARGET=libtsdll.so
+COMPILE="$common -m32 "
@@ -25,7 +38,6 @@
+TARGET=libtsdll.so
+COMPILE="$common "
+LINK=" -shared -Wl,-soname,libtsdll.so -o libtsdll.so "
-+;;
+ ;;
*)
echo no case for those parameters
- exit
Modified: head/lang/J/files/patch-make_domake.sh
==============================================================================
--- head/lang/J/files/patch-make_domake.sh Sun Apr 28 11:41:51 2019 (r500310)
+++ head/lang/J/files/patch-make_domake.sh Sun Apr 28 12:10:00 2019 (r500311)
@@ -1,19 +1,11 @@
---- make/domake.sh.orig 2018-04-09 18:08:56 UTC
+--- make/domake.sh.orig 2019-01-06 11:36:39 UTC
+++ make/domake.sh
-@@ -3,8 +3,7 @@
- # run by build_jconsole and build_libj
- # $1 is j32 or j64
+@@ -15,7 +15,7 @@ if [ $1 = "j64nonavx" ] ; then
+ avx=-nonavx
+ fi
--cd ~
--. jvars.sh
-+. make/jvars.sh
-
- echo $TARGET
- echo $COMPILE
-@@ -12,5 +11,5 @@ echo $LINK
- mkdir -p $jbld/jout/$TARGET/$1
- cd $jbld/jout/$TARGET/$1
-
--make -f $jmake/makefile
+-echo "building $jbld/$targ/bin/$TARGET $avx"
+gmake -f $jmake/makefile
- cp $TARGET $jbld/$1/bin
+ echo "output in $jbld/$targ/bin/build_$TARGET$avx.txt"
+ make -f $jmake/makefile >$jbld/$targ/bin/build_$TARGET$avx.txt 2>&1
+ echo `egrep -w 'warning|error|note' $jbld/$targ/bin/build_$TARGET$avx.txt`
Modified: head/lang/J/files/patch-make_jvars.sh
==============================================================================
--- head/lang/J/files/patch-make_jvars.sh Sun Apr 28 11:41:51 2019 (r500310)
+++ head/lang/J/files/patch-make_jvars.sh Sun Apr 28 12:10:00 2019 (r500311)
@@ -1,16 +1,25 @@
---- make/jvars.sh.orig 2018-04-09 18:05:09 UTC
+--- make/jvars.sh.orig 2019-03-10 15:55:44 UTC
+++ make/jvars.sh
-@@ -1,11 +1,11 @@
+@@ -2,7 +2,7 @@
# source shell script (read with . jvars.sh) so stuff is easy to find
# edit following if your install is not standard
--jgit=~/gitdev/jsource # git jsource folder
-+jgit=~/jsource-j808-release # git jsource folder
- jbld=~/jbld # test libraries and binaries will be put here
+-jgit=~/git/jsource # git jsource folder
++jgit=~/jsource-j807-release # git jsource folder
+ jbld=~/jbld # test libraries and binaries will be put here
- # edit platform to build - linux darwin raspberry
--jplatform=linux
-+jplatform=freebsd
+ # platform and shared library suffix
+@@ -10,7 +10,12 @@ jplatform=`uname|tr '[:upper:]' '[:lower:]'`
+ jsuffix=so
+ if [ $jplatform = "darwin" ] ; then jsuffix=dylib ; fi
+-CC=clang # compiler
++USE_OPENMP="${USE_OPENMP:=0}"
++if [ $USE_OPENMP -eq 1 ] ; then
++ CC=gcc8
++else
++ CC=clang # compiler
++fi
+
# should not be necessary to edit after here
- j32=$jbld/j32/bin/jconsole
+ tsu=$jgit/test/tsu.ijs
Modified: head/lang/J/files/patch-make_makefile
==============================================================================
--- head/lang/J/files/patch-make_makefile Sun Apr 28 11:41:51 2019 (r500310)
+++ head/lang/J/files/patch-make_makefile Sun Apr 28 12:10:00 2019 (r500311)
@@ -1,9 +1,11 @@
---- make/makefile.orig 2016-11-25 19:04:24 UTC
+--- make/makefile.orig 2018-10-02 13:24:06 UTC
+++ make/makefile
-@@ -1,5 +1,5 @@
- vpath % $(jgit)/jsrc
+@@ -3,7 +3,7 @@ vpath % $(jgit)/jsrc
+ %.o: %.c
+ $(CC) -c $(CFLAGS) $(CFLAGS_FMA) -o$@ $^
-CFLAGS=$(COMPILE)
+CFLAGS+=$(COMPILE)
- $(TARGET) : $(OBJS)
- $(CC) $(OBJS) $(LINK)
+ $(OBJS_FMA) : CFLAGS_FMA := -mfma
+ $(TARGET) : $(OBJS) $(OBJS_FMA)
+ $(CC) $(OBJS) $(OBJS_FMA) $(LINK)
Modified: head/lang/J/files/patch-netdefs_netdefs.c
==============================================================================
--- head/lang/J/files/patch-netdefs_netdefs.c Sun Apr 28 11:41:51 2019 (r500310)
+++ head/lang/J/files/patch-netdefs_netdefs.c Sun Apr 28 12:10:00 2019 (r500311)
@@ -1,11 +1,11 @@
---- netdefs/netdefs.c.orig 2016-11-25 19:04:24 UTC
+--- netdefs/netdefs.c.orig 2019-01-06 15:19:53 UTC
+++ netdefs/netdefs.c
-@@ -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));
+@@ -152,7 +152,7 @@ int main(){
+ printf ("msg_iov_sz=: " FMTI "\n",sizeof(((struct msghdr*)0)->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));
-#if defined(linux) || defined(Darwin)
+#if defined(linux) || defined(Darwin) || defined(__FreeBSD__)
- 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));
+ 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));
Modified: head/lang/J/files/profile.ijs.in
==============================================================================
--- head/lang/J/files/profile.ijs.in Sun Apr 28 11:41:51 2019 (r500310)
+++ head/lang/J/files/profile.ijs.in Sun Apr 28 12:10:00 2019 (r500311)
@@ -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.@:= ])})
Modified: head/lang/J/pkg-plist
==============================================================================
--- head/lang/J/pkg-plist Sun Apr 28 11:41:51 2019 (r500310)
+++ head/lang/J/pkg-plist Sun Apr 28 12:10:00 2019 (r500311)
@@ -2,6 +2,13 @@ bin/jconsole
lib/j/bin/jconsole
lib/j/bin/libj.so
lib/j/bin/libtsdll.so
+share/j/addons/data/jfiles/history.txt
+share/j/addons/data/jfiles/jfiles.ijs
+share/j/addons/data/jfiles/jfiles.txt
+share/j/addons/data/jfiles/keyfiles.txt
+share/j/addons/data/jfiles/manifest.ijs
+share/j/addons/data/jfiles/test/test0.ijs
+share/j/addons/data/jfiles/test/test1.ijs
share/j/addons/data/jmf/history.txt
share/j/addons/data/jmf/jmf.ijs
share/j/addons/data/jmf/manifest.ijs
@@ -109,6 +116,7 @@ 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
@@ -120,6 +128,7 @@ share/j/system/defs/hostdefs_win.ijs
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
@@ -129,7 +138,6 @@ 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
@@ -138,13 +146,9 @@ 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
share/j/system/util/project.ijs
share/j/system/util/scripts.ijs
share/j/system/util/tar.ijs
-share/j/system/util/term.png
More information about the svn-ports-all
mailing list