OpenBSD Mail Box: July 2020

Friday, July 31, 2020

Re: update editors/TeXmacs 1.99.13

Nam Nguyen writes:

> This is an update for editors/TeXmacs 1.99.13.

ping

>
> Changelog: https://texmacs.org/tmweb/about/changes.en.html
>
> "Switch to Python 3 for plug-ins programmed in Python (1.99.13)."
>
> Ports-wise, python patching bits can go away as python3 is automatically
> detected by the plugins now.
>
> WRKDIST had to be changed because it normally extracts into -src (e.g.,
> TeXmacs-1.99.13-src), but this release dropped the -src suffix. Also,
> this release erroneously reports 1.99.12 but the changelog is updated.
>
> I had a random segfault crash upon quitting the program that I have no
> reproducer for. I had a help window and a sympy session running and
> closed the program.
>
> All plugins work. There was a problem with missing font in plots
> generated by R that I proposed a fix for here:
> https://marc.info/?l=openbsd-ports&m=159488152518183&w=2
>
> Feedback and tests are welcome.
>

Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/TeXmacs/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- Makefile 3 Jul 2020 21:12:53 -0000 1.17
+++ Makefile 16 Jul 2020 06:42:30 -0000
@@ -2,10 +2,9 @@

COMMENT= wysiwyw (what you see is what you want) editing platform

-DISTNAME= TeXmacs-1.99.12-src
+DISTNAME= TeXmacs-1.99.13-src
PKGNAME= ${DISTNAME:S/-src//}
CATEGORIES= editors print x11
-REVISION= 0

HOMEPAGE= https://texmacs.org/

@@ -24,9 +23,9 @@ MODULES= devel/cmake \
lang/python \
x11/qt5

-MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
-MODPY_ADJ_FILES= plugins/tmpy/*.py \
- plugins/tmpy/{graph,session}/*.py
+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
+
+WRKDIST= ${WRKDIR}/${PKGNAME}

BUILD_DEPENDS= print/ghostscript/gnu

@@ -45,14 +44,5 @@ CXXFLAGS+= -Wno-deprecated-register

post-extract:
rm -f ${WRKDIST}/plugins/mathematica/bin/realpath.py
- # change python interpreter per plugins/python/README.md
- sed -i 's,$string-append.*$python,\1python${MODPY_VERSION},' \
- ${WRKSRC}/plugins/python/progs/init-python.scm
- sed -i 's,$require.*$python,\1python${MODPY_VERSION},' \
- ${WRKSRC}/plugins/python/progs/init-python.scm
-.for l in asymptote dratex gnuplot graph graphviz sympy xypic
- find ${WRKSRC}/plugins/$l -name '*.scm' \
- -exec sed -i 's,python,python${MODPY_VERSION},' {} +
-.endfor

.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/editors/TeXmacs/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo 27 Feb 2020 14:29:46 -0000 1.3
+++ distinfo 16 Jul 2020 06:42:30 -0000
@@ -1,2 +1,2 @@
-SHA256 (TeXmacs-1.99.12-src.tar.gz) = 5D2oSdXDdw99T3rZrGNnq0F0od+D8336QfjwDx628UI=
-SIZE (TeXmacs-1.99.12-src.tar.gz) = 35119781
+SHA256 (TeXmacs-1.99.13-src.tar.gz) = Aq0cS47QqmFQHelxRjANeJlgXCXagnYRykpAq7wHqbQ=
+SIZE (TeXmacs-1.99.13-src.tar.gz) = 37181886
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/editors/TeXmacs/patches/patch-CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 27 Feb 2020 14:29:46 -0000 1.2
+++ patches/patch-CMakeLists_txt 16 Jul 2020 06:42:30 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.2 202
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -572,7 +572,7 @@ if (TEXMACS_GUI MATCHES "Qt.*")
+@@ -586,7 +586,7 @@ if (TEXMACS_GUI MATCHES "Qt.*")

set (TeXmacs_All_SRCS ${TeXmacs_All_SRCS} ${TeXmacs_Qt_SRCS} ${TeXmacs_Qt_Moc_HDRS})
set (TeXmacs_Include_Dirs ${TeXmacs_Include_Dirs} ${QT_INCLUDES})
Index: patches/patch-plugins_octave_octave_tm-start_m
===================================================================
RCS file: patches/patch-plugins_octave_octave_tm-start_m
diff -N patches/patch-plugins_octave_octave_tm-start_m
--- patches/patch-plugins_octave_octave_tm-start_m 27 Feb 2020 14:29:46 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-plugins_octave_octave_tm-start_m,v 1.1 2020/02/27 14:29:46 jca Exp $
-
-octave session does not start because tmrepl undefined
-https://github.com/texmacs/plugins/issues/11
-
-Index: plugins/octave/octave/tm-start.m
---- plugins/octave/octave/tm-start.m.orig
-+++ plugins/octave/octave/tm-start.m
-@@ -1,4 +1,5 @@
- d=getenv("TEXMACS_PATH");
- if (length(d) > 0)
-+ addpath("tm")
- tmrepl
- endif
Index: patches/patch-plugins_r_src_tm_r_c
===================================================================
RCS file: /cvs/ports/editors/TeXmacs/patches/patch-plugins_r_src_tm_r_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-plugins_r_src_tm_r_c
--- patches/patch-plugins_r_src_tm_r_c 27 Feb 2020 14:29:46 -0000 1.1
+++ patches/patch-plugins_r_src_tm_r_c 16 Jul 2020 06:42:30 -0000
@@ -6,7 +6,7 @@ prevents interface from starting.
Index: plugins/r/src/tm_r.c
--- plugins/r/src/tm_r.c.orig
+++ plugins/r/src/tm_r.c
-@@ -101,7 +101,7 @@ jmp_buf error_return_env ;
+@@ -103,7 +103,7 @@ jmp_buf error_return_env ;

int N_data_begins = 0 ;

@@ -15,7 +15,7 @@ Index: plugins/r/src/tm_r.c

// Add one more DATA_BEGIN, i.e. open bracket.
-@@ -850,11 +850,6 @@ int main(int argc, char *argv[])
+@@ -852,11 +852,6 @@ int main(int argc, char *argv[])
snprintf( TEXMACS_HOME_PATH, 4096, "%s/.TeXmacs",HOME) ;
}

Index: patches/patch-src_Plugins_Qt_qt_gui_cpp
===================================================================
RCS file: /cvs/ports/editors/TeXmacs/patches/patch-src_Plugins_Qt_qt_gui_cpp,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-src_Plugins_Qt_qt_gui_cpp
--- patches/patch-src_Plugins_Qt_qt_gui_cpp 27 Feb 2020 14:29:46 -0000 1.3
+++ patches/patch-src_Plugins_Qt_qt_gui_cpp 16 Jul 2020 06:42:30 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_Plugins_Qt_qt_gui_cp
Index: src/Plugins/Qt/qt_gui.cpp
--- src/Plugins/Qt/qt_gui.cpp.orig
+++ src/Plugins/Qt/qt_gui.cpp
-@@ -815,7 +815,7 @@ qt_gui_rep::update () {
+@@ -838,7 +838,7 @@ qt_gui_rep::update () {

time_t delay = delayed_commands.lapse - texmacs_time();
if (needing_update) delay = 0;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/TeXmacs/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 PLIST
--- pkg/PLIST 27 Feb 2020 14:29:46 -0000 1.7
+++ pkg/PLIST 16 Jul 2020 06:42:30 -0000
@@ -10,7 +10,6 @@ lib/texmacs/TeXmacs/bin/
@man man/man1/fig2ps.1
@man man/man1/texmacs.1
share/TeXmacs/
-share/TeXmacs/CMakeLists.txt
share/TeXmacs/COPYING
share/TeXmacs/INSTALL
share/TeXmacs/LICENSE
@@ -280,6 +279,8 @@ share/TeXmacs/doc/about/welcome/first.en
share/TeXmacs/doc/about/welcome/first.es.tm
share/TeXmacs/doc/about/welcome/first.fr.tm
share/TeXmacs/doc/about/welcome/first.it.tm
+share/TeXmacs/doc/about/welcome/new-welcome.en.tm
+share/TeXmacs/doc/about/welcome/new-welcome.fr.tm
share/TeXmacs/doc/about/welcome/welcome.de.tm
share/TeXmacs/doc/about/welcome/welcome.en.tm
share/TeXmacs/doc/about/welcome/welcome.es.tm
@@ -1450,36 +1451,30 @@ share/TeXmacs/examples/
share/TeXmacs/examples/plugins/
share/TeXmacs/examples/plugins/complete/
share/TeXmacs/examples/plugins/complete/Makefile
-share/TeXmacs/examples/plugins/complete/bin/
share/TeXmacs/examples/plugins/complete/progs/
share/TeXmacs/examples/plugins/complete/progs/init-complete.scm
share/TeXmacs/examples/plugins/complete/src/
share/TeXmacs/examples/plugins/complete/src/complete.cpp
share/TeXmacs/examples/plugins/dynlink/
share/TeXmacs/examples/plugins/dynlink/Makefile.in
-share/TeXmacs/examples/plugins/dynlink/bin/
-share/TeXmacs/examples/plugins/dynlink/lib/
share/TeXmacs/examples/plugins/dynlink/progs/
share/TeXmacs/examples/plugins/dynlink/progs/init-dynlink.scm
share/TeXmacs/examples/plugins/dynlink/src/
share/TeXmacs/examples/plugins/dynlink/src/dynlink.cpp
share/TeXmacs/examples/plugins/formula/
share/TeXmacs/examples/plugins/formula/Makefile
-share/TeXmacs/examples/plugins/formula/bin/
share/TeXmacs/examples/plugins/formula/progs/
share/TeXmacs/examples/plugins/formula/progs/init-formula.scm
share/TeXmacs/examples/plugins/formula/src/
share/TeXmacs/examples/plugins/formula/src/formula.cpp
share/TeXmacs/examples/plugins/handler/
share/TeXmacs/examples/plugins/handler/Makefile
-share/TeXmacs/examples/plugins/handler/bin/
share/TeXmacs/examples/plugins/handler/progs/
share/TeXmacs/examples/plugins/handler/progs/init-handler.scm
share/TeXmacs/examples/plugins/handler/src/
share/TeXmacs/examples/plugins/handler/src/handler.cpp
share/TeXmacs/examples/plugins/input/
share/TeXmacs/examples/plugins/input/Makefile
-share/TeXmacs/examples/plugins/input/bin/
share/TeXmacs/examples/plugins/input/packages/
share/TeXmacs/examples/plugins/input/packages/session/
share/TeXmacs/examples/plugins/input/packages/session/input.ts
@@ -1490,7 +1485,6 @@ share/TeXmacs/examples/plugins/input/src
share/TeXmacs/examples/plugins/input/src/input.cpp
share/TeXmacs/examples/plugins/markup/
share/TeXmacs/examples/plugins/markup/Makefile
-share/TeXmacs/examples/plugins/markup/bin/
share/TeXmacs/examples/plugins/markup/packages/
share/TeXmacs/examples/plugins/markup/packages/session/
share/TeXmacs/examples/plugins/markup/packages/session/markup.ts
@@ -1500,35 +1494,30 @@ share/TeXmacs/examples/plugins/markup/sr
share/TeXmacs/examples/plugins/markup/src/markup.cpp
share/TeXmacs/examples/plugins/menus/
share/TeXmacs/examples/plugins/menus/Makefile
-share/TeXmacs/examples/plugins/menus/bin/
share/TeXmacs/examples/plugins/menus/progs/
share/TeXmacs/examples/plugins/menus/progs/init-menus.scm
share/TeXmacs/examples/plugins/menus/src/
share/TeXmacs/examples/plugins/menus/src/menus.cpp
share/TeXmacs/examples/plugins/minimal/
share/TeXmacs/examples/plugins/minimal/Makefile
-share/TeXmacs/examples/plugins/minimal/bin/
share/TeXmacs/examples/plugins/minimal/progs/
share/TeXmacs/examples/plugins/minimal/progs/init-minimal.scm
share/TeXmacs/examples/plugins/minimal/src/
share/TeXmacs/examples/plugins/minimal/src/minimal.cpp
share/TeXmacs/examples/plugins/multiline/
share/TeXmacs/examples/plugins/multiline/Makefile
-share/TeXmacs/examples/plugins/multiline/bin/
share/TeXmacs/examples/plugins/multiline/progs/
share/TeXmacs/examples/plugins/multiline/progs/init-multiline.scm
share/TeXmacs/examples/plugins/multiline/src/
share/TeXmacs/examples/plugins/multiline/src/multiline.cpp
share/TeXmacs/examples/plugins/nested/
share/TeXmacs/examples/plugins/nested/Makefile
-share/TeXmacs/examples/plugins/nested/bin/
share/TeXmacs/examples/plugins/nested/progs/
share/TeXmacs/examples/plugins/nested/progs/init-nested.scm
share/TeXmacs/examples/plugins/nested/src/
share/TeXmacs/examples/plugins/nested/src/nested.cpp
share/TeXmacs/examples/plugins/pnambic/
share/TeXmacs/examples/plugins/pnambic/Makefile
-share/TeXmacs/examples/plugins/pnambic/bin/
share/TeXmacs/examples/plugins/pnambic/progs/
share/TeXmacs/examples/plugins/pnambic/progs/init-pnambic.scm
share/TeXmacs/examples/plugins/pnambic/readme.tm
@@ -1538,32 +1527,27 @@ share/TeXmacs/examples/plugins/pnambic/s
share/TeXmacs/examples/plugins/pnambic/src/pnambic.c
share/TeXmacs/examples/plugins/prompt/
share/TeXmacs/examples/plugins/prompt/Makefile
-share/TeXmacs/examples/plugins/prompt/bin/
share/TeXmacs/examples/plugins/prompt/progs/
share/TeXmacs/examples/plugins/prompt/progs/init-prompt.scm
share/TeXmacs/examples/plugins/prompt/src/
share/TeXmacs/examples/plugins/prompt/src/prompt.cpp
share/TeXmacs/examples/plugins/pycomplete/
-share/TeXmacs/examples/plugins/pycomplete/bin/
share/TeXmacs/examples/plugins/pycomplete/progs/
share/TeXmacs/examples/plugins/pycomplete/progs/init-pycomplete.scm
share/TeXmacs/examples/plugins/pycomplete/src/
share/TeXmacs/examples/plugins/pycomplete/src/complete.py
share/TeXmacs/examples/plugins/pyminimal/
-share/TeXmacs/examples/plugins/pyminimal/bin/
share/TeXmacs/examples/plugins/pyminimal/progs/
share/TeXmacs/examples/plugins/pyminimal/progs/init-pyminimal.scm
share/TeXmacs/examples/plugins/pyminimal/src/
share/TeXmacs/examples/plugins/pyminimal/src/minimal.py
share/TeXmacs/examples/plugins/pyprompt/
-share/TeXmacs/examples/plugins/pyprompt/bin/
share/TeXmacs/examples/plugins/pyprompt/progs/
share/TeXmacs/examples/plugins/pyprompt/progs/init-pyprompt.scm
share/TeXmacs/examples/plugins/pyprompt/src/
share/TeXmacs/examples/plugins/pyprompt/src/prompt.py
share/TeXmacs/examples/plugins/secure/
share/TeXmacs/examples/plugins/secure/Makefile
-share/TeXmacs/examples/plugins/secure/bin/
share/TeXmacs/examples/plugins/secure/packages/
share/TeXmacs/examples/plugins/secure/packages/secure.ts
share/TeXmacs/examples/plugins/secure/progs/
@@ -1573,13 +1557,11 @@ share/TeXmacs/examples/plugins/secure/sr
share/TeXmacs/examples/plugins/secure/src/secure.cpp
share/TeXmacs/examples/plugins/substitute/
share/TeXmacs/examples/plugins/substitute/Makefile
-share/TeXmacs/examples/plugins/substitute/bin/
share/TeXmacs/examples/plugins/substitute/progs/
share/TeXmacs/examples/plugins/substitute/progs/init-substitute.scm
share/TeXmacs/examples/plugins/substitute/src/
share/TeXmacs/examples/plugins/substitute/src/substitute.cpp
share/TeXmacs/examples/plugins/world/
-share/TeXmacs/examples/plugins/world/bin/
share/TeXmacs/examples/plugins/world/progs/
share/TeXmacs/examples/plugins/world/progs/init-world.scm
share/TeXmacs/examples/texts/
@@ -1594,6 +1576,8 @@ share/TeXmacs/examples/texts/greek-test.
share/TeXmacs/examples/texts/hat-test.tm
share/TeXmacs/examples/texts/kerning-test.tm
share/TeXmacs/examples/texts/language-cpp-test.tm
+share/TeXmacs/examples/texts/language-dot-test.tm
+share/TeXmacs/examples/texts/language-fortran-test.tm
share/TeXmacs/examples/texts/language-java-test.tm
share/TeXmacs/examples/texts/language-python-test.tm
share/TeXmacs/examples/texts/language-r-test.tm
@@ -2674,6 +2658,13 @@ share/TeXmacs/fonts/tfm/tc/tctt7.tfm
share/TeXmacs/fonts/tfm/tc/tctt8.tfm
share/TeXmacs/fonts/tfm/tc/tctt9.tfm
share/TeXmacs/fonts/truetype/
+share/TeXmacs/fonts/truetype/fira/
+share/TeXmacs/fonts/truetype/fira/FiraMono-Bold.otf
+share/TeXmacs/fonts/truetype/fira/FiraMono-Regular.otf
+share/TeXmacs/fonts/truetype/fira/FiraSans-Bold.otf
+share/TeXmacs/fonts/truetype/fira/FiraSans-BoldItalic.otf
+share/TeXmacs/fonts/truetype/fira/FiraSans-Italic.otf
+share/TeXmacs/fonts/truetype/fira/FiraSans-Regular.otf
share/TeXmacs/fonts/truetype/libertine/
share/TeXmacs/fonts/truetype/libertine/LinBiolinum_R.otf
share/TeXmacs/fonts/truetype/libertine/LinBiolinum_RB.otf
@@ -3215,6 +3206,11 @@ share/TeXmacs/misc/images/tm_gnu2.png
share/TeXmacs/misc/images/tm_gnu2.ps
share/TeXmacs/misc/images/tm_gnu3.png
share/TeXmacs/misc/images/tm_gnu3.ps
+share/TeXmacs/misc/images/welcome-email.png
+share/TeXmacs/misc/images/welcome-help.png
+share/TeXmacs/misc/images/welcome-manual.png
+share/TeXmacs/misc/images/welcome-promote.png
+share/TeXmacs/misc/images/welcome-videos.png
share/TeXmacs/misc/inkscape_extension/
share/TeXmacs/misc/inkscape_extension/texmacs.inx
share/TeXmacs/misc/inkscape_extension/texmacs_latex.sty
@@ -5250,7 +5246,10 @@ share/TeXmacs/packages/customize/encrypt
share/TeXmacs/packages/customize/float/
share/TeXmacs/packages/customize/float/captions-above.ts
share/TeXmacs/packages/customize/fonts/
+share/TeXmacs/packages/customize/fonts/biolinum-font.ts
share/TeXmacs/packages/customize/fonts/bonum-font.ts
+share/TeXmacs/packages/customize/fonts/fira-font.ts
+share/TeXmacs/packages/customize/fonts/libertine-font.ts
share/TeXmacs/packages/customize/fonts/pagella-font.ts
share/TeXmacs/packages/customize/fonts/schola-font.ts
share/TeXmacs/packages/customize/fonts/termes-font.ts
@@ -5511,19 +5510,20 @@ share/TeXmacs/packages/utilities/literat
share/TeXmacs/packages/utilities/live.ts
share/TeXmacs/packages/utilities/relate.ts
share/TeXmacs/plugins/
-share/TeXmacs/plugins/CMakeLists.txt
share/TeXmacs/plugins/README.md
share/TeXmacs/plugins/asymptote/
share/TeXmacs/plugins/asymptote/doc/
share/TeXmacs/plugins/asymptote/doc/asymptote-abstract.en.tm
+share/TeXmacs/plugins/asymptote/doc/asymptote-abstract.zh.tm
share/TeXmacs/plugins/asymptote/doc/asymptote-demo.en.tm
+share/TeXmacs/plugins/asymptote/doc/asymptote-demo.zh.tm
share/TeXmacs/plugins/asymptote/doc/asymptote.en.tm
+share/TeXmacs/plugins/asymptote/doc/asymptote.zh.tm
share/TeXmacs/plugins/asymptote/progs/
share/TeXmacs/plugins/asymptote/progs/asymptote-menus.scm
share/TeXmacs/plugins/asymptote/progs/init-asymptote.scm
share/TeXmacs/plugins/asymptote/samples/
share/TeXmacs/plugins/axiom/
-share/TeXmacs/plugins/axiom/CMakeLists.txt
share/TeXmacs/plugins/axiom/Makefile
share/TeXmacs/plugins/axiom/bin/
@bin share/TeXmacs/plugins/axiom/bin/tm_axiom
@@ -5559,7 +5559,6 @@ share/TeXmacs/plugins/cocoa5/doc/cocoa5.
share/TeXmacs/plugins/cocoa5/progs/
share/TeXmacs/plugins/cocoa5/progs/init-cocoa5.scm
share/TeXmacs/plugins/coq/
-share/TeXmacs/plugins/coq/CMakeLists.txt
share/TeXmacs/plugins/coq/bin/
@bin share/TeXmacs/plugins/coq/bin/tm_coq
share/TeXmacs/plugins/coq/packages/
@@ -5652,8 +5651,11 @@ share/TeXmacs/plugins/graph/progs/init-g
share/TeXmacs/plugins/graphviz/
share/TeXmacs/plugins/graphviz/doc/
share/TeXmacs/plugins/graphviz/doc/graphviz-abstract.en.tm
+share/TeXmacs/plugins/graphviz/doc/graphviz-abstract.zh.tm
share/TeXmacs/plugins/graphviz/doc/graphviz-demo.en.tm
+share/TeXmacs/plugins/graphviz/doc/graphviz-demo.zh.tm
share/TeXmacs/plugins/graphviz/doc/graphviz.en.tm
+share/TeXmacs/plugins/graphviz/doc/graphviz.zh.tm
share/TeXmacs/plugins/graphviz/progs/
share/TeXmacs/plugins/graphviz/progs/init-graphviz.scm
share/TeXmacs/plugins/gtybalt/
@@ -5702,7 +5704,6 @@ share/TeXmacs/plugins/macaulay2/progs/
share/TeXmacs/plugins/macaulay2/progs/init-macaulay2.scm
share/TeXmacs/plugins/macaulay2/progs/m2-input.scm
share/TeXmacs/plugins/maple/
-share/TeXmacs/plugins/maple/CMakeLists.txt
share/TeXmacs/plugins/maple/Makefile
share/TeXmacs/plugins/maple/Makefile.9
share/TeXmacs/plugins/maple/bin/
@@ -5783,9 +5784,12 @@ share/TeXmacs/plugins/maxima/bin/
share/TeXmacs/plugins/maxima/bin/tm_maxima
share/TeXmacs/plugins/maxima/doc/
share/TeXmacs/plugins/maxima/doc/maxima-abstract.en.tm
+share/TeXmacs/plugins/maxima/doc/maxima-abstract.zh.tm
share/TeXmacs/plugins/maxima/doc/maxima-demo.en.tm
share/TeXmacs/plugins/maxima/doc/maxima-demo.it.tm
+share/TeXmacs/plugins/maxima/doc/maxima-demo.zh.tm
share/TeXmacs/plugins/maxima/doc/maxima.en.tm
+share/TeXmacs/plugins/maxima/doc/maxima.zh.tm
share/TeXmacs/plugins/maxima/lisp/
share/TeXmacs/plugins/maxima/lisp/texmacs-maxima.lisp
share/TeXmacs/plugins/maxima/packages/
@@ -5825,17 +5829,24 @@ share/TeXmacs/plugins/mycas/progs/init-m
share/TeXmacs/plugins/mycas/src/
share/TeXmacs/plugins/mycas/src/mycas.cpp
share/TeXmacs/plugins/octave/
-share/TeXmacs/plugins/octave/bin/
-share/TeXmacs/plugins/octave/bin/tm_octave
-share/TeXmacs/plugins/octave/bin/tm_octave.bat
+share/TeXmacs/plugins/octave/README.md
share/TeXmacs/plugins/octave/doc/
-share/TeXmacs/plugins/octave/doc/README
share/TeXmacs/plugins/octave/doc/octave-abstract.en.tm
share/TeXmacs/plugins/octave/doc/octave-demo.en.tm
share/TeXmacs/plugins/octave/doc/octave-demo.it.tm
share/TeXmacs/plugins/octave/doc/octave-details.en.tm
share/TeXmacs/plugins/octave/doc/octave.en.tm
share/TeXmacs/plugins/octave/octave/
+share/TeXmacs/plugins/octave/octave/convert/
+share/TeXmacs/plugins/octave/octave/convert/dquote.m
+share/TeXmacs/plugins/octave/octave/convert/list2scm.m
+share/TeXmacs/plugins/octave/octave/convert/mat2scm.m
+share/TeXmacs/plugins/octave/octave/convert/num2scm.m
+share/TeXmacs/plugins/octave/octave/convert/obj2scm.m
+share/TeXmacs/plugins/octave/octave/convert/str2scm.m
+share/TeXmacs/plugins/octave/octave/convert/struct2bullet.m
+share/TeXmacs/plugins/octave/octave/convert/struct2scm.m
+share/TeXmacs/plugins/octave/octave/convert/struct2tree.m
share/TeXmacs/plugins/octave/octave/plot/
share/TeXmacs/plugins/octave/octave/plot/__errplot__.m
share/TeXmacs/plugins/octave/octave/plot/__plt2mm__.m
@@ -5847,23 +5858,21 @@ share/TeXmacs/plugins/octave/octave/plot
share/TeXmacs/plugins/octave/octave/plot/mesh.m
share/TeXmacs/plugins/octave/octave/polynomial/
share/TeXmacs/plugins/octave/octave/polynomial/polyout.m
+share/TeXmacs/plugins/octave/octave/protocol/
+share/TeXmacs/plugins/octave/octave/protocol/flush_any.m
+share/TeXmacs/plugins/octave/octave/protocol/flush_scheme.m
+share/TeXmacs/plugins/octave/octave/protocol/with_color.m
+share/TeXmacs/plugins/octave/octave/protocol/with_mode_math.m
share/TeXmacs/plugins/octave/octave/tm/
share/TeXmacs/plugins/octave/octave/tm-start.m
share/TeXmacs/plugins/octave/octave/tm/isnewans.m
-share/TeXmacs/plugins/octave/octave/tm/list2scm.m
-share/TeXmacs/plugins/octave/octave/tm/mat2scm.m
-share/TeXmacs/plugins/octave/octave/tm/num2scm.m
-share/TeXmacs/plugins/octave/octave/tm/obj2scm.m
-share/TeXmacs/plugins/octave/octave/tm/scheme.m
-share/TeXmacs/plugins/octave/octave/tm/str2scm.m
-share/TeXmacs/plugins/octave/octave/tm/struct2bullet.m
-share/TeXmacs/plugins/octave/octave/tm/struct2scm.m
-share/TeXmacs/plugins/octave/octave/tm/struct2tree.m
share/TeXmacs/plugins/octave/octave/tm/tmdisp.m
share/TeXmacs/plugins/octave/octave/tm/tmlasterr.m
share/TeXmacs/plugins/octave/octave/tm/tmrepl.m
share/TeXmacs/plugins/octave/progs/
share/TeXmacs/plugins/octave/progs/init-octave.scm
+share/TeXmacs/plugins/octave/test/
+share/TeXmacs/plugins/octave/test/convert.tm
share/TeXmacs/plugins/pari/
share/TeXmacs/plugins/pari/doc/
share/TeXmacs/plugins/pari/doc/pari-abstract.en.tm
@@ -5896,7 +5905,6 @@ share/TeXmacs/plugins/qcl/progs/
share/TeXmacs/plugins/qcl/progs/init-qcl.scm
share/TeXmacs/plugins/qcl/progs/qcl-input.scm
share/TeXmacs/plugins/r/
-share/TeXmacs/plugins/r/CMakeLists.txt
share/TeXmacs/plugins/r/Makefile
share/TeXmacs/plugins/r/README.md
share/TeXmacs/plugins/r/bin/
@@ -6000,7 +6008,6 @@ share/TeXmacs/plugins/scilab/progs/
share/TeXmacs/plugins/scilab/progs/init-scilab.scm
share/TeXmacs/plugins/scilab/progs/scilab-menus.scm
share/TeXmacs/plugins/shell/
-share/TeXmacs/plugins/shell/CMakeLists.txt
share/TeXmacs/plugins/shell/Makefile
share/TeXmacs/plugins/shell/bin/
@bin share/TeXmacs/plugins/shell/bin/tm_shell
@@ -6034,6 +6041,13 @@ share/TeXmacs/plugins/texgraph/progs/tex
share/TeXmacs/plugins/texgraph/progs/texgraph-scripts-edit.scm
share/TeXmacs/plugins/texgraph/progs/texgraph-scripts-menu.scm
share/TeXmacs/plugins/texgraph/texgraph_macros_texmacs.mac
+share/TeXmacs/plugins/tikz/
+share/TeXmacs/plugins/tikz/doc/
+share/TeXmacs/plugins/tikz/doc/tikz-abstract.en.tm
+share/TeXmacs/plugins/tikz/doc/tikz-demo.en.tm
+share/TeXmacs/plugins/tikz/doc/tikz.en.tm
+share/TeXmacs/plugins/tikz/progs/
+share/TeXmacs/plugins/tikz/progs/init-tikz.scm
share/TeXmacs/plugins/tmpy/
share/TeXmacs/plugins/tmpy/README.md
share/TeXmacs/plugins/tmpy/__init__.py
@@ -6067,6 +6081,7 @@ share/TeXmacs/plugins/tmpy/session/tm_gr
share/TeXmacs/plugins/tmpy/session/tm_python.py
share/TeXmacs/plugins/tmpy/session/tm_sage.py
share/TeXmacs/plugins/tmpy/session/tm_sympy.py
+share/TeXmacs/plugins/tmpy/session/tm_tikz.py
share/TeXmacs/plugins/tmpy/session/tm_xypic.py
share/TeXmacs/plugins/xypic/
share/TeXmacs/plugins/xypic/doc/
@@ -6206,6 +6221,19 @@ share/TeXmacs/progs/database/title-trans
share/TeXmacs/progs/debug/
share/TeXmacs/progs/debug/debug-menu.scm
share/TeXmacs/progs/debug/debug-widgets.scm
+share/TeXmacs/progs/debugger/
+share/TeXmacs/progs/debugger/command-loop.scm
+share/TeXmacs/progs/debugger/commands.scm
+share/TeXmacs/progs/debugger/state.scm
+share/TeXmacs/progs/debugger/trc.scm
+share/TeXmacs/progs/debugger/utils.scm
+share/TeXmacs/progs/debugging/
+share/TeXmacs/progs/debugging/example-fns.scm
+share/TeXmacs/progs/debugging/ice-9-debugger-extensions.scm
+share/TeXmacs/progs/debugging/steps.scm
+share/TeXmacs/progs/debugging/trace.scm
+share/TeXmacs/progs/debugging/traps.scm
+share/TeXmacs/progs/debugging/trc.scm
share/TeXmacs/progs/doc/
share/TeXmacs/progs/doc/apidoc-collect.scm
share/TeXmacs/progs/doc/apidoc-funcs.scm
@@ -6305,6 +6333,76 @@ share/TeXmacs/progs/graphics/graphics-me
share/TeXmacs/progs/graphics/graphics-object.scm
share/TeXmacs/progs/graphics/graphics-single.scm
share/TeXmacs/progs/graphics/graphics-utils.scm
+share/TeXmacs/progs/ice-9/
+share/TeXmacs/progs/ice-9/and-let-star.scm
+share/TeXmacs/progs/ice-9/boot-9.scm
+share/TeXmacs/progs/ice-9/buffered-input.scm
+share/TeXmacs/progs/ice-9/calling.scm
+share/TeXmacs/progs/ice-9/channel.scm
+share/TeXmacs/progs/ice-9/common-list.scm
+share/TeXmacs/progs/ice-9/debug.scm
+share/TeXmacs/progs/ice-9/debugger/
+share/TeXmacs/progs/ice-9/debugger.scm
+share/TeXmacs/progs/ice-9/debugger/command-loop.scm
+share/TeXmacs/progs/ice-9/debugger/commands.scm
+share/TeXmacs/progs/ice-9/debugger/state.scm
+share/TeXmacs/progs/ice-9/debugger/trc.scm
+share/TeXmacs/progs/ice-9/debugger/utils.scm
+share/TeXmacs/progs/ice-9/debugging/
+share/TeXmacs/progs/ice-9/debugging/example-fns.scm
+share/TeXmacs/progs/ice-9/debugging/ice-9-debugger-extensions.scm
+share/TeXmacs/progs/ice-9/debugging/steps.scm
+share/TeXmacs/progs/ice-9/debugging/trace.scm
+share/TeXmacs/progs/ice-9/debugging/traps.scm
+share/TeXmacs/progs/ice-9/debugging/trc.scm
+share/TeXmacs/progs/ice-9/deprecated.scm
+share/TeXmacs/progs/ice-9/documentation.scm
+share/TeXmacs/progs/ice-9/emacs.scm
+share/TeXmacs/progs/ice-9/expect.scm
+share/TeXmacs/progs/ice-9/format.scm
+share/TeXmacs/progs/ice-9/ftw.scm
+share/TeXmacs/progs/ice-9/gap-buffer.scm
+share/TeXmacs/progs/ice-9/gds-client.scm
+share/TeXmacs/progs/ice-9/gds-server.scm
+share/TeXmacs/progs/ice-9/getopt-long.scm
+share/TeXmacs/progs/ice-9/hcons.scm
+share/TeXmacs/progs/ice-9/history.scm
+share/TeXmacs/progs/ice-9/lineio.scm
+share/TeXmacs/progs/ice-9/list.scm
+share/TeXmacs/progs/ice-9/ls.scm
+share/TeXmacs/progs/ice-9/mapping.scm
+share/TeXmacs/progs/ice-9/match.scm
+share/TeXmacs/progs/ice-9/networking.scm
+share/TeXmacs/progs/ice-9/null.scm
+share/TeXmacs/progs/ice-9/occam-channel.scm
+share/TeXmacs/progs/ice-9/optargs.scm
+share/TeXmacs/progs/ice-9/poe.scm
+share/TeXmacs/progs/ice-9/popen.scm
+share/TeXmacs/progs/ice-9/posix.scm
+share/TeXmacs/progs/ice-9/pretty-print.scm
+share/TeXmacs/progs/ice-9/psyntax.pp
+share/TeXmacs/progs/ice-9/psyntax.ss
+share/TeXmacs/progs/ice-9/q.scm
+share/TeXmacs/progs/ice-9/r4rs.scm
+share/TeXmacs/progs/ice-9/r5rs.scm
+share/TeXmacs/progs/ice-9/rdelim.scm
+share/TeXmacs/progs/ice-9/readline.scm
+share/TeXmacs/progs/ice-9/receive.scm
+share/TeXmacs/progs/ice-9/regex.scm
+share/TeXmacs/progs/ice-9/runq.scm
+share/TeXmacs/progs/ice-9/rw.scm
+share/TeXmacs/progs/ice-9/safe-r5rs.scm
+share/TeXmacs/progs/ice-9/safe.scm
+share/TeXmacs/progs/ice-9/serialize.scm
+share/TeXmacs/progs/ice-9/session.scm
+share/TeXmacs/progs/ice-9/slib.scm
+share/TeXmacs/progs/ice-9/stack-catch.scm
+share/TeXmacs/progs/ice-9/streams.scm
+share/TeXmacs/progs/ice-9/string-fun.scm
+share/TeXmacs/progs/ice-9/syncase.scm
+share/TeXmacs/progs/ice-9/threads.scm
+share/TeXmacs/progs/ice-9/time.scm
+share/TeXmacs/progs/ice-9/weak-vector.scm
share/TeXmacs/progs/init-buffer.scm
share/TeXmacs/progs/init-texmacs.scm
share/TeXmacs/progs/kernel/
@@ -6383,16 +6481,21 @@ share/TeXmacs/progs/part/part-shared.scm
share/TeXmacs/progs/part/part-tmfs.scm
share/TeXmacs/progs/prog/
share/TeXmacs/progs/prog/cpp-edit.scm
+share/TeXmacs/progs/prog/dot-edit.scm
+share/TeXmacs/progs/prog/dot-lang.scm
share/TeXmacs/progs/prog/fortran-edit.scm
share/TeXmacs/progs/prog/glue-symbols.scm
share/TeXmacs/progs/prog/java-edit.scm
+share/TeXmacs/progs/prog/java-lang.scm
share/TeXmacs/progs/prog/prog-edit.scm
share/TeXmacs/progs/prog/prog-format-test.scm
share/TeXmacs/progs/prog/prog-format.scm
share/TeXmacs/progs/prog/prog-kbd.scm
share/TeXmacs/progs/prog/prog-menu.scm
share/TeXmacs/progs/prog/python-edit.scm
+share/TeXmacs/progs/prog/python-lang.scm
share/TeXmacs/progs/prog/scala-edit.scm
+share/TeXmacs/progs/prog/scala-lang.scm
share/TeXmacs/progs/prog/scheme-autocomplete.scm
share/TeXmacs/progs/prog/scheme-edit.scm
share/TeXmacs/progs/prog/scheme-menu.scm

[update] goaccess 1.4

Index: Makefile
===================================================================
RCS file: /cvs/ports/www/goaccess/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile 10 Aug 2019 21:24:31 -0000 1.24
+++ Makefile 1 Aug 2020 06:10:22 -0000
@@ -2,8 +2,7 @@

COMMENT = realtime console web log analyzer

-DISTNAME = goaccess-1.3
-REVISION = 2
+DISTNAME = goaccess-1.4

CATEGORIES = www

@@ -34,14 +33,5 @@
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
FAKE_FLAGS = confdir="${PREFIX}/share/examples/goaccess"
-
-FLAVORS = tokyocabinet
-FLAVOR ?=
-
-.if ${FLAVOR:Mtokyocabinet}
-WANTLIB += bz2 tokyocabinet z
-LIB_DEPENDS += databases/tokyocabinet
-CONFIGURE_ARGS += --enable-tcb=btree
-.endif

.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/goaccess/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- distinfo 28 Nov 2018 19:40:27 -0000 1.13
+++ distinfo 1 Aug 2020 06:10:22 -0000
@@ -1,2 +1,2 @@
-SHA256 (goaccess-1.3.tar.gz) = jHdcXCS/hakz/W8SSQBIRzQtZUKqUz5OwCqve+Qde5s=
-SIZE (goaccess-1.3.tar.gz) = 541374
+SHA256 (goaccess-1.4.tar.gz) = 6Pu5/4UlVtct/Z8dATS6B1zltMQSiZAqb04Nl8aTd74=
+SIZE (goaccess-1.4.tar.gz) = 595264
Index: patches/patch-config_goaccess_conf
===================================================================
RCS file: /cvs/ports/www/goaccess/patches/patch-config_goaccess_conf,v
retrieving revision 1.1
diff -u -r1.1 patch-config_goaccess_conf
--- patches/patch-config_goaccess_conf 20 Jan 2019 13:36:51 -0000 1.1
+++ patches/patch-config_goaccess_conf 1 Aug 2020 06:10:22 -0000
@@ -20,38 +20,15 @@
######################################
# Date Format Options (required)
######################################
-@@ -653,31 +663,10 @@ static-file .flv
- #std-geoip false
-
- # Specify path to GeoIP database file. i.e., GeoLiteCity.dat
--# .dat file needs to be downloaded from maxmind.com.
-+# Free GeoLite2 databases are available in the geolite2-city/country packages.
+@@ -698,7 +708,10 @@ static-file .flv
+ # Download the GeoLite2-Country.mmdb.gz
+ # gunzip GeoLite2-Country.mmdb.gz
#
--# For IPv4 City database:
--# wget -N http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
--# gunzip GeoLiteCity.dat.gz
--#
--# For IPv6 City database:
--# wget -N http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz
--# gunzip GeoLiteCityv6.dat.gz
--#
--# For IPv6 Country database:
--# wget -N http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz
--# gunzip GeoIPv6.dat.gz
--#
--# For GeoIP2 City database:
--# wget -N http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz
--# gunzip GeoLite2-City.mmdb.gz
--#
--# For GeoIP2 Country database:
--# wget -N http://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.mmdb.gz
--# gunzip GeoLite2-Country.mmdb.gz
--#
--# Note: `geoip-city-data` is an alias of `geoip-database`
--#
-#geoip-database /usr/local/share/GeoIP/GeoLiteCity.dat
++
++# Free GeoLite2 databases are available in the geolite2-city/country packages.
+#geoip-database /var/db/GeoIP/GeoLite2-City.mmdb
+geoip-database /var/db/GeoIP/GeoLite2-Country.mmdb

######################################
- # Tokyo Cabinet Options
+ # Persistence Options
Index: patches/patch-src_browsers_c
===================================================================
RCS file: /cvs/ports/www/goaccess/patches/patch-src_browsers_c,v
retrieving revision 1.1
diff -u -r1.1 patch-src_browsers_c
--- patches/patch-src_browsers_c 20 Jan 2019 13:36:51 -0000 1.1
+++ patches/patch-src_browsers_c 1 Aug 2020 06:10:22 -0000
@@ -5,7 +5,7 @@
Index: src/browsers.c
--- src/browsers.c.orig
+++ src/browsers.c
-@@ -116,6 +116,8 @@ static const char *browsers[][2] = {
+@@ -114,6 +114,8 @@ static const char *browsers[][2] = {
{"MicroMessenger", "Others"},
{"Apache", "Others"},
{"JOSM", "Others"},
@@ -14,10 +14,10 @@

/* Feed-reader-as-a-service */
{"AppleNewsBot", "Feeds"},
-@@ -183,6 +185,7 @@ static const char *browsers[][2] = {
- {"Python", "Crawlers"},
- {"LinkedIn", "Crawlers"},
+@@ -189,6 +191,7 @@ static const char *browsers[][2] = {
{"Microsoft-WebDAV", "Crawlers"},
+ {"DuckDuckGo-Favicons-Bot", "Crawlers"},
+ {"bingbot", "Crawlers"},
+ {"The Knowledge AI", "Crawlers"},

/* Podcast fetchers */
Index: patches/patch-src_gholder_c
===================================================================
RCS file: patches/patch-src_gholder_c
diff -N patches/patch-src_gholder_c
--- patches/patch-src_gholder_c 20 Jan 2019 15:38:34 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_gholder_c,v 1.2 2019/01/20 15:38:34 kirby Exp $
-
-upstream commit 61a4648ecb6e9cbedbc79a2ae0e69a69a348273d
-
-Index: src/gholder.c
---- src/gholder.c.orig
-+++ src/gholder.c
-@@ -32,6 +32,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-
Index: patches/patch-src_parser_c
===================================================================
RCS file: patches/patch-src_parser_c
diff -N patches/patch-src_parser_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_parser_c 1 Aug 2020 06:10:22 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: src/parser.c
+--- src/parser.c.orig
++++ src/parser.c
+@@ -54,7 +54,6 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+-#include <malloc.h>
+
+ #include "gkhash.h"
+
Index: patches/patch-src_settings_c
===================================================================
RCS file: patches/patch-src_settings_c
diff -N patches/patch-src_settings_c
--- patches/patch-src_settings_c 20 Jan 2019 13:36:51 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-$OpenBSD: patch-src_settings_c,v 1.1 2019/01/20 13:36:51 sthen Exp $
-
-From a224c92d27919d30cf5cfeafde41f9c50c6f84f2 Mon Sep 17 00:00:00 2001
-From: Stuart Henderson <sthen@users.noreply.github.com>
-Date: Fri, 11 Jan 2019 10:28:32 +0000
-Subject: [PATCH] Fix fallback to global config
-
-Index: src/settings.c
---- src/settings.c.orig
-+++ src/settings.c
-@@ -121,6 +121,7 @@ char *
- get_config_file_path (void)
- {
- char *upath = NULL, *rpath = NULL;
-+ FILE *file;
-
- /* determine which config file to open, default or custom */
- if (conf.iconfigfile != NULL) {
-@@ -138,12 +139,14 @@ get_config_file_path (void)
- }
-
- /* otherwise, fallback to global config file */
-- if (rpath == NULL && conf.load_global_config) {
-+ if ((file = fopen (rpath, "r")) == NULL && conf.load_global_config) {
- upath = get_global_config ();
- rpath = realpath (upath, NULL);
- if (upath) {
- free (upath);
- }
-+ } else {
-+ fclose (file);
- }
-
- return rpath;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/goaccess/pkg/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- pkg/PLIST 20 Jan 2019 13:36:51 -0000 1.5
+++ pkg/PLIST 1 Aug 2020 06:10:22 -0000
@@ -5,7 +5,11 @@
share/examples/goaccess/browsers.list
share/examples/goaccess/goaccess.conf
@sample ${SYSCONFDIR}/goaccess.conf
+share/examples/goaccess/podcast.list
+share/locale/de/LC_MESSAGES/goaccess.mo
share/locale/es/LC_MESSAGES/goaccess.mo
share/locale/fr/LC_MESSAGES/goaccess.mo
share/locale/ja/LC_MESSAGES/goaccess.mo
+share/locale/pt_BR/LC_MESSAGES/goaccess.mo
+share/locale/sv/LC_MESSAGES/goaccess.mo
share/locale/zh_CN/LC_MESSAGES/goaccess.mo
Hi,

here's an update to goaccess 1.4 (cf
http://goaccess.io/release-notes#release-1.4), drops the tokyocabinet
flavor (dep dropped upstream), removed some patches from upstream, i
have to admit i'm a bit puzzled by the src/settings.c patch, upstream
code was modified a bit there.

feedback/testing welcome !

Landry

Re: lang/ghc workaround for clang 10 fallout

> I only tested the attached up to `make patch`. I have a build running
> on amd64-current. It shows the export-dynamic token has disappeared
> from the build log so far. While the patch is not known to have fixed
> the problem with clang 10, it looks promising.

I have more confidence in this patch as I built the port and then used
it to build xmonad.
Anybody with clang 10 willing to give the a go and OK?

Kili, do you feel there's a risk that this might break on i386?

Thanks
Greg
--
nest.cx is Gmail hosted, use PGP: https://pgp.key-server.io/0x0B1542BD8DF5A1B0
Fingerprint: 5E2B 2D0E 1E03 2046 BEC3 4D50 0B15 42BD 8DF5 A1B0

Re: update games/jag 0.3.7

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/jag/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- Makefile 20 Mar 2020 16:44:23 -0000 1.11
+++ Makefile 7 Jul 2020 02:33:34 -0000
@@ -1,35 +1,42 @@
-# $OpenBSD: Makefile,v 1.11 2020/03/20 16:44:23 naddy Exp $
+# $OpenBSD: Makefile,v 1.11 2020/03/20 16:44:23 naddy Exp $
COMMENT = arcade-puzzle game
-V = 0.3.2
+V = 0.3.7
DISTNAME = jag-${V}
CATEGORIES = games
-HOMEPAGE = http://jag.xlabsoft.com
-REVISION = 2
+HOMEPAGE = https://gitlab.com/coringao/jag

# GPLv3
-PERMIT_PACKAGE = Yes
+# https://gitlab.com/coringao/jag/-/issues/1
+PERMIT_PACKAGE = restrictively licensed themes
+PERMIT_DISTFILES = restrictively licensed themes

-WANTLIB += GL ICE QtGui QtOpenGL QtXml SDL SDL_mixer SM X11 Xext
-WANTLIB += Xi Xinerama Xrandr Xrender c fontconfig freetype m
-WANTLIB += pthread ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets
+WANTLIB += Qt5X11Extras SDL2 SDL2_mixer X11 Xrandr c

COMPILER = base-clang ports-gcc base-gcc

-MASTER_SITES = http://jag.xlabsoft.com/files/
-DISTFILES = jag-${V}-src.zip jag-${V}-data.zip
+MASTER_SITES = https://gitlab.com/coringao/jag/-/archive/${V}/

-MODULES = devel/qmake x11/qt4
-BUILD_DEPENDS = archivers/unzip
-LIB_DEPENDS = devel/sdl \
- devel/sdl-mixer
-WRKDIST = ${WRKDIR}/jag-${V}-src
+MODULES = devel/qmake x11/qt5
+LIB_DEPENDS = devel/sdl2 \
+ devel/sdl2-mixer \
+ x11/qt5/qtx11extras
+# make jag and jag-editor
+MODQMAKE_PROJECTS = . \
+ src/editor
+
+# delete DOS line endings
+post-extract:
+ @find ${WRKSRC} -type f $ -name "*.cpp" -o -name "*.h" $ -exec \
+ perl -i -pe 's/\r$$//' {} +

pre-configure:
- @${SUBST_CMD} ${WRKSRC}/Game.pro ${WRKSRC}/main.cpp
+ @${SUBST_CMD} ${WRKSRC}/game.pro ${WRKSRC}/src/main.cpp \
+ ${WRKSRC}/src/editor/jag-editor.pro

post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/jag
- cd ${WRKDIR}/jag-${V}-data/data && pax -rw . ${PREFIX}/share/jag
+ cd ${WRKSRC}/data && pax -rw . ${PREFIX}/share/jag
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/
find ${PREFIX}/share -type d -exec chmod ${DIRMODE} {} + -o \
-type f -exec chmod ${SHAREMODE} {} +
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/jag/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo 27 Jan 2013 23:54:51 -0000 1.1.1.1
+++ distinfo 7 Jul 2020 02:33:34 -0000
@@ -1,4 +1,2 @@
-SHA256 (jag-0.3.2-data.zip) = 0zG4sewgBo3g8113R7Pk60Vn9QVWjD2GIYhNLKRrbSI=
-SHA256 (jag-0.3.2-src.zip) = Cx/EY3PXtwvdNZypPlU7wkSklyH6GhjVIlxeiHtUykQ=
-SIZE (jag-0.3.2-data.zip) = 6237911
-SIZE (jag-0.3.2-src.zip) = 995053
+SHA256 (jag-0.3.7.tar.gz) = jI+SYKL476N4ojzhUdWjoEDklJ+EFBClnRDUzeJH9t4=
+SIZE (jag-0.3.7.tar.gz) = 6971529
Index: patches/patch-Game_pro
===================================================================
RCS file: patches/patch-Game_pro
diff -N patches/patch-Game_pro
--- patches/patch-Game_pro 27 Jan 2013 23:54:51 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-Game_pro,v 1.1.1.1 2013/01/27 23:54:51 stsp Exp $
---- Game.pro.orig Wed Jan 9 02:41:03 2013
-+++ Game.pro Wed Jan 9 02:41:45 2013
-@@ -5,9 +5,9 @@ QT += xml \
- opengl
- unix: {
- TARGET = ./bin/jag
-- target.path = /usr/local/bin/
-+ target.path = ${PREFIX}/bin/
- INSTALLS += target
-- datas.path = /usr/local/games/jag
-+ datas.path = ${PREFIX}/share/jag
- datas.files = data
- INSTALLS += datas
- LIBS += -lXrandr
Index: patches/patch-displaywrapper_cpp
===================================================================
RCS file: patches/patch-displaywrapper_cpp
diff -N patches/patch-displaywrapper_cpp
--- patches/patch-displaywrapper_cpp 24 Apr 2016 11:07:55 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-displaywrapper_cpp,v 1.1 2016/04/24 11:07:55 zhuk Exp $
---- displaywrapper.cpp.orig Sun Apr 24 13:55:59 2016
-+++ displaywrapper.cpp Sun Apr 24 13:56:19 2016
-@@ -280,8 +280,6 @@ void DisplayWrapper::dw_init(bool filter, int minWidth
- //short original_rate = XRRConfigCurrentRate(conf);
- //SizeID original_size_id = XRRConfigCurrentConfiguration(conf, &original_rotation);
-
-- XCloseDisplay(dpy);
--
- for (int i = 0; i < num_sizes; i++)
- {
- int width = xrrs[i].width;
-@@ -300,6 +298,8 @@ void DisplayWrapper::dw_init(bool filter, int minWidth
- modes.append(mode);
- }
- }
-+
-+ XCloseDisplay(dpy);
-
- if (filter)
- modeNames.removeDuplicates();
Index: patches/patch-game_pro
===================================================================
RCS file: patches/patch-game_pro
diff -N patches/patch-game_pro
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-game_pro 7 Jul 2020 02:33:34 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Index: game.pro
+--- game.pro.orig
++++ game.pro
+@@ -30,11 +30,8 @@ RCC_DIR += src
+ UI_DIR += src
+
+ unix: {
+- target.path = /usr/games/
++ target.path = ${PREFIX}/bin/
+ INSTALLS += target
+- datas.path = /usr/share/games/jag
+- datas.files = data
+- INSTALLS += datas
+ }
+
+ # The following define makes your compiler warn you if you use any
Index: patches/patch-gameprofile_cpp
===================================================================
RCS file: patches/patch-gameprofile_cpp
diff -N patches/patch-gameprofile_cpp
--- patches/patch-gameprofile_cpp 27 Jan 2013 23:54:51 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-gameprofile_cpp,v 1.1.1.1 2013/01/27 23:54:51 stsp Exp $
---- gameprofile.cpp.orig Wed Jan 9 03:39:07 2013
-+++ gameprofile.cpp Wed Jan 9 03:39:18 2013
-@@ -66,7 +66,7 @@ GameProfile::GameProfile(QObject *parent) : QObject(pa
- #ifdef Q_OS_WIN32
- userPath += "/Application Data/XlabSoft/JAG/";
- #else
-- userPath += "/.xlabsoft/jag/";
-+ userPath += "/.jag/";
- #endif
-
- QDir userdir(userPath);
Index: patches/patch-main_cpp
===================================================================
RCS file: patches/patch-main_cpp
diff -N patches/patch-main_cpp
--- patches/patch-main_cpp 27 Jan 2013 23:54:51 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-main_cpp,v 1.1.1.1 2013/01/27 23:54:51 stsp Exp $
---- main.cpp.orig Wed Jan 9 02:56:19 2013
-+++ main.cpp Wed Jan 9 02:57:07 2013
-@@ -37,7 +37,7 @@ int main(int argc, char *argv[])
- // on X11, we'll check if data directory exists locally first
- #ifdef Q_WS_X11
- if (!QDir(resourcePath).exists())
-- resourcePath = "/usr/local/games/jag/data/";
-+ resourcePath = "${TRUEPREFIX}/share/jag/";
- #endif
-
- if (!QDir(resourcePath).exists()) {
Index: patches/patch-src_displaywrapper_cpp
===================================================================
RCS file: patches/patch-src_displaywrapper_cpp
diff -N patches/patch-src_displaywrapper_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_displaywrapper_cpp 7 Jul 2020 02:33:34 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: src/displaywrapper.cpp
+--- src/displaywrapper.cpp.orig
++++ src/displaywrapper.cpp
+@@ -305,8 +305,6 @@ void DisplayWrapper::dw_init(bool filter, int minWidth
+ //short original_rate = XRRConfigCurrentRate(conf);
+ //SizeID original_size_id = XRRConfigCurrentConfiguration(conf, &original_rotation);
+
+- XCloseDisplay(dpy);
+-
+ for (int i = 0; i < num_sizes; i++)
+ {
+ int width = xrrs[i].width;
+@@ -325,6 +323,8 @@ void DisplayWrapper::dw_init(bool filter, int minWidth
+ modes.append(mode);
+ }
+ }
++
++ XCloseDisplay(dpy);
+
+ if (filter)
+ modeNames.removeDuplicates();
Index: patches/patch-src_editor_jag-editor_pro
===================================================================
RCS file: patches/patch-src_editor_jag-editor_pro
diff -N patches/patch-src_editor_jag-editor_pro
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_editor_jag-editor_pro 7 Jul 2020 02:33:34 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+install jag-editor to correct prefix. jag-editor still works without data files.
+
+Index: src/editor/jag-editor.pro
+--- src/editor/jag-editor.pro.orig
++++ src/editor/jag-editor.pro
+@@ -22,11 +22,8 @@ QMAKE_CXXFLAGS += -g -std=gnu++14 -D_FORTIFY_SOURCE=2
+ QMAKE_LFLAGS += -lpthread -fPIE -pie -Wl,--as-needed -Wl,-z,now
+
+ unix: {
+- target.path = /usr/games/
++ target.path = ${PREFIX}/bin/
+ INSTALLS += target
+- datas.path = /usr/share/games/jag/editor/
+- datas.files = images
+- INSTALLS += datas
+ }
+
+ # The following define makes your compiler warn you if you use any
Index: patches/patch-src_gameprofile_cpp
===================================================================
RCS file: patches/patch-src_gameprofile_cpp
diff -N patches/patch-src_gameprofile_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_gameprofile_cpp 7 Jul 2020 02:33:34 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/gameprofile.cpp
+--- src/gameprofile.cpp.orig
++++ src/gameprofile.cpp
+@@ -88,7 +88,7 @@ GameProfile::GameProfile(QObject *parent) : QObject(pa
+ m_accel(false)
+ {
+ userPath = QDir::homePath();
+- userPath += "/.xlabsoft/jag/";
++ userPath += "/.jag/";
+
+
+ QDir userdir(userPath);
Index: patches/patch-src_main_cpp
===================================================================
RCS file: patches/patch-src_main_cpp
diff -N patches/patch-src_main_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_main_cpp 7 Jul 2020 02:33:34 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/main.cpp
+--- src/main.cpp.orig
++++ src/main.cpp
+@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
+ // on X11, we'll check if data directory exists locally first
+ #ifdef Q_OS_UNIX
+ if (!QDir(resourcePath).exists())
+- resourcePath = "/usr/share/games/jag/data/";
++ resourcePath = "${TRUEPREFIX}/share/jag/";
+ #endif
+
+ if (!QDir(resourcePath).exists()) {
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/jag/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 27 Jan 2013 23:54:51 -0000 1.1.1.1
+++ pkg/PLIST 7 Jul 2020 02:33:34 -0000
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2013/01/27 23:54:51 stsp Exp $
@bin bin/jag
+@bin bin/jag-editor
share/jag/
share/jag/bonus/
share/jag/bonus/clock.png
@@ -12,17 +13,19 @@ share/jag/bonus/timer.png
share/jag/bonus/x.png
share/jag/help/
share/jag/help/index.htm
-share/jag/help/index_nl.htm
-share/jag/help/index_ru.htm
share/jag/lang/
share/jag/lang/jag_de.qm
share/jag/lang/jag_de.ts
+share/jag/lang/jag_es.qm
+share/jag/lang/jag_es.ts
share/jag/lang/jag_fr.qm
share/jag/lang/jag_fr.ts
share/jag/lang/jag_it.qm
share/jag/lang/jag_it.ts
share/jag/lang/jag_nl.qm
share/jag/lang/jag_nl.ts
+share/jag/lang/jag_pt.qm
+share/jag/lang/jag_pt.ts
share/jag/lang/jag_ru.qm
share/jag/lang/jag_ru.ts
share/jag/lang/langlist.dat
Rafael Sadowski writes:

> Simple game play test works out-of-box, OK rsadowski@

ping. I am looking for someone to commit this. The diff is reattached.

> On Mon Jul 06, 2020 at 07:39:38PM -0700, Nam Nguyen wrote:
>> Nam Nguyen writes:
>>
>> > Stefan Sperling writes:
>> >>
>> >> Considering that Debian will likely want to see this resolved as well, and
>> >> that you are planning to update the port, couldn't we set PERMIT_PACKAGE=no
>> >> until the situation is cleared up?
>> >>
>> >> We have ports in much worse licensing situations that do the same (look at
>> >> sysutils/firmware/ulpt for example...)
>> >
>> > This sounds like a good solution.
>> >
>> > Here is a diff updating games/jag to 0.3.7, released on May 8, 2020. I
>> > attached it because patches that were removed have DOS line endings. New
>> > patches use post-extract to delete DOS line endings.
>>
>> New diff attached that deletes trailing whitespace in cvs header and
>> additionally sets PERMIT_DISTFILES to no as suggested by stsp@ and
>> sthen@.
>>
>> >
>> > Changelog: https://gitlab.com/coringao/jag/-/blob/0.3.7/CHANGELOG
>> >
>> > This diff:
>> > - Sets PERMIT_PACKAGE to no as suggested by stsp@ and sthen@. Themes are
>> > restrictively licensed so do not build package until it is cleared up.
>> > https://gitlab.com/coringao/jag/-/issues/1
>> > - Moves to new upstream that Debian uses. Old upstream has stopped
>> > development.
>> > https://tracker.debian.org/pkg/jag
>> > - Moves HOMEPAGE and MASTER_SITES to new upstream to address thfr@'s
>> > bug report about defunct HOMEPAGE in the README
>> > https://gitlab.com/coringao/jag/-/issues/2
>> > - Moves to qt5 which was supported since version 0.3.3
>> > - Builds jag-editor in addition to jag. jag-editor is a level editor.
>> > - Many patched files were moved into src
>> > - Delete DOS-line endings in post-extract, as pulled from print/scribus.
>> > - README lists Qt5 Xml as a requirement, but `make
>> > port-lib-depends-check' reports this as an extra WANTLIB.
>> > Extra: Qt5Xml.3
>> > I chose to not include Qt5Xml in WANTLIB.
>> >
>> > I played jag and changed languages. I tested jag-editor by building a
>> > level pack and was able to play my level.
>> >
>> > Feedback and tests are welcome.
>>

Re: UPDATE: games/chocolate-doom 3.0.0 => 3.0.1 (fix CVE-2020-14983)

Brian Callahan writes:

> Hi ports and Ryan --
>
> I noticed via Repology that our version of chocolate-doom is
> vulnerable to CVE-2020-14983 [0].
>
> The simple solution is to update to version 3.0.1, which contains the
> fix [1].
>
> Doom works here for me.

In my testing singleplayer and multiplayer continue to work.

I tested singleplayer by completing the first maps in Doom and Doom 2.

I tested multiplayer by creating a server and having two players join.

$ chocolate-server -privateserver
$ chocolate-doom -iwad doom2.wad -connect 127.0.0.1 -deathmatch -nomonsters
$ chocolate-doom -iwad doom2.wad -connect 127.0.0.1

>
> OK?
>
> ~Brian
>
> [0] https://nvd.nist.gov/vuln/detail/CVE-2020-14983
> [1] https://github.com/chocolate-doom/chocolate-doom/issues/1293
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/chocolate-doom/Makefile,v
> retrieving revision 1.27
> diff -u -p -r1.27 Makefile
> --- Makefile 12 Jul 2019 20:46:15 -0000 1.27
> +++ Makefile 1 Aug 2020 03:43:21 -0000
> @@ -1,10 +1,9 @@
> # $OpenBSD: Makefile,v 1.27 2019/07/12 20:46:15 sthen Exp $
>
> COMMENT = portable release of Doom, Heretic, Hexen, and Strife
> -V = 3.0.0
> +V = 3.0.1
> DISTNAME = chocolate-doom-${V}
> CATEGORIES = games x11
> -REVISION = 0
>
> HOMEPAGE = https://www.chocolate-doom.org/
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/games/chocolate-doom/distinfo,v
> retrieving revision 1.9
> diff -u -p -r1.9 distinfo
> --- distinfo 18 Jan 2018 09:30:58 -0000 1.9
> +++ distinfo 1 Aug 2020 03:43:21 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (chocolate-doom-3.0.0.tar.gz) = c66mI5MMfRinp3juo5Hh3fvpCtGsQKkbOAr8pLDh2rg=
> -SIZE (chocolate-doom-3.0.0.tar.gz) = 2495591
> +SHA256 (chocolate-doom-3.0.1.tar.gz) = 1DXWF3QjSR1gvnBtqfB9OrT6vz4HfsKj/CFuOU/PyMc=
> +SIZE (chocolate-doom-3.0.1.tar.gz) = 2514985

lang/ghc workaround for clang 10 fallout

Adapted from https://gitlab.haskell.org/ghc/ghc/-/issues/17962

--
diff --git lang/ghc/Makefile lang/ghc/Makefile
index e520c1d7bd5..05d364eec53 100644
--- lang/ghc/Makefile
+++ lang/ghc/Makefile
@@ -12,7 +12,7 @@ COMMENT = compiler for the functional language Haskell
NO_CCACHE = Yes

DISTNAME = ghc-${MODGHC_VER}
-REVISION = 4
+REVISION = 5
CATEGORIES = lang devel
HOMEPAGE = https://www.haskell.org/ghc/

diff --git lang/ghc/patches/patch-utils_iserv_ghc_mk lang/ghc/patches/patch-utils_iserv_ghc_mk
new file mode 100644
index 00000000000..a5ab9a2a46a
--- /dev/null
+++ lang/ghc/patches/patch-utils_iserv_ghc_mk
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Work around https://gitlab.haskell.org/ghc/ghc/-/issues/17962
+
+Index: utils/iserv/ghc.mk
+--- utils/iserv/ghc.mk.orig
++++ utils/iserv/ghc.mk
+@@ -30,8 +30,9 @@ endif
+ # refer to the RTS. This is harmless if you don't use it (adds a bit
+ # of overhead to startup and increases the binary sizes) but if you
+ # need it there's no alternative.
++# Don't do this on systems known to use clang 10 to work around #17962.
+ ifeq "$(TargetElf)" "YES"
+-ifneq "$(TargetOS_CPP)" "solaris2"
++ifeq "$(findstring $(TargetOS_CPP), freebsd openbsd solaris2)" ""
+ # The Solaris linker does not support --export-dynamic option. It also
+ # does not need it since it exports all dynamic symbols by default
+ utils/iserv_stage2_MORE_HC_OPTS += -optl-Wl,--export-dynamic
I only tested the attached up to `make patch`. I have a build running
on amd64-current. It shows the export-dynamic token has disappeared
from the build log so far. While the patch is not known to have fixed
the problem with clang 10, it looks promising.

Thanks
Greg

P.S. Also in cvs:~gnezdo/lang-ghc-clang10.patch
--
nest.cx is Gmail hosted, use PGP: https://pgp.key-server.io/0x0B1542BD8DF5A1B0
Fingerprint: 5E2B 2D0E 1E03 2046 BEC3 4D50 0B15 42BD 8DF5 A1B0

UPDATE: games/chocolate-doom 3.0.0 => 3.0.1 (fix CVE-2020-14983)

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/chocolate-doom/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile 12 Jul 2019 20:46:15 -0000 1.27
+++ Makefile 1 Aug 2020 03:43:21 -0000
@@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.27 2019/07/12 20:46:15 sthen Exp $

COMMENT = portable release of Doom, Heretic, Hexen, and Strife
-V = 3.0.0
+V = 3.0.1
DISTNAME = chocolate-doom-${V}
CATEGORIES = games x11
-REVISION = 0

HOMEPAGE = https://www.chocolate-doom.org/

Index: distinfo
===================================================================
RCS file: /cvs/ports/games/chocolate-doom/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 18 Jan 2018 09:30:58 -0000 1.9
+++ distinfo 1 Aug 2020 03:43:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (chocolate-doom-3.0.0.tar.gz) = c66mI5MMfRinp3juo5Hh3fvpCtGsQKkbOAr8pLDh2rg=
-SIZE (chocolate-doom-3.0.0.tar.gz) = 2495591
+SHA256 (chocolate-doom-3.0.1.tar.gz) = 1DXWF3QjSR1gvnBtqfB9OrT6vz4HfsKj/CFuOU/PyMc=
+SIZE (chocolate-doom-3.0.1.tar.gz) = 2514985
Hi ports and Ryan --

I noticed via Repology that our version of chocolate-doom is
vulnerable to CVE-2020-14983 [0].

The simple solution is to update to version 3.0.1, which contains the
fix [1].

Doom works here for me.

OK?

~Brian

[0] https://nvd.nist.gov/vuln/detail/CVE-2020-14983
[1] https://github.com/chocolate-doom/chocolate-doom/issues/1293

mips64 bulk build report

Re: [BE_ARCHS] don't build emulators/nono

On Fri, Jul 31, 2020 at 10:19:14PM +0200, Charlene Wendling wrote:
> Hi,

> > http://build-failures.rhaalovely.net/powerpc/2020-07-15/emulators/nono.log
> > http://build-failures.rhaalovely.net/mips64/2020-07-11/emulators/nono.log
> (it fails on sparc64 because ports-gcc is not used)

For the record, ports-gcc doesn't fix it. I tried that. :)

> $WRKSRC/vm/bitmap.h includes $WRKSRC/lib/device.h, where HLB and HLW
> are only defined on little endian archs. $WRKSRC/vm/bitmap.cpp
> expect them and has no fallback code.

> As such, big endian support is not complete, so i'm proposing to
> mark it NOT_FOR_ARCHS.

> Comments/feedback are welcome,
> Charlène.

ok kmos

--Kurt

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/emulators/nono/Makefile,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 Makefile
> --- Makefile 22 Jul 2020 14:53:59 -0000 1.3
> +++ Makefile 31 Jul 2020 20:04:14 -0000
> @@ -1,5 +1,8 @@
> # $OpenBSD: Makefile,v 1.3 2020/07/22 14:53:59 gonzalo Exp $
>
> +# Big endian support is not complete as of 0.1.0
> +NOT_FOR_ARCHS= ${BE_ARCHS}
> +
> COMMENT= LUNA-I emulator
>
> DISTNAME= nono-0.1.0
>
>
>
>

Re: [sparc64] fix lang/haslink build

On Fri, Jul 31, 2020 at 04:37:04PM -0600, Thomas Frohwein wrote:
> On Mon, Jul 27, 2020 at 01:38:22AM -0400, Kurt Mosiejczuk wrote:
> > hashlink has been dying for a bit, probably to do with the 1.11 update.

> > Errors were complaining about no definition of char16_t. Based on what I
> > saw used for fixes for clang without c++, I changed it to use uint16_t
> > for the uchar typedef. This fixes the build on sparc64 and doesn't break
> > it on amd64.

> > ok?

> ok thfr@
> tested on amd64 without issues.

> IMO should bump REVISION

Sure.

> Your bulk from July 28 suggests you've been doing the build with this
> patch already.

Yes. I try it out in the build before asking to commit it.

--Kurt

Re: Update lang/ecl to 20.4.24

On Thu, Jul 30, 2020 at 02:33:45PM -0400, George Koehler wrote:
> On Thu, 30 Jul 2020 08:32:25 -0700
> Josh Elsasser <josh@elsasser.org> wrote:
>
> > With George's patch, it segfaults in ecl_min as he predicted,
> > similarly to mips64:
> > ...
> > Got signal before environment was installed on our thread
>
> Daniel Kochmański put up a diff for ecl_find_package_nolock() that
> "is not a proper fix", but gets around the segfault:
> https://gitlab.com/embeddable-common-lisp/ecl/-/issues/604#note_388147381
>
> Here's the diff as a ports/lang/ecl patch. With this diff, and the
> boehm-gc diff from my last mail, I can build and run ecl on my
> powerpc64. "make test" says,
>
> Did 245 tests (0 crashed), 17999 checks.
> Pass: 17908 (99%)
> Fail: 91 ( 1%)

I applied the diff directly from gitlab and was able to build ecl on
sparc64 and mips64. When I tried to run the tests, sparc64 hung (not
spinning) on test CMP.0009.FINALIZATION and mips64 segfaulted almost
immediately:

Running test ATOMIC-INCF/DECF
;;;
;;; Detected access to protected memory, also known as 'bus or segmentation fault'.
;;; Jumping to the outermost toplevel prompt

new games/onscripter-en

Please find attached a new port for games/onscripter-en.

onscripter-en is an English branch of onscripter to play NScripter and
ONScripter games. These are typically visual novels.

Upstream[1] has been down since 2018.

There were two distfiles available: fullsrc (which bundled dependencies
like sdl-ttf 2.0.8) and src (without any bundled dependencies).
In [0] these are, respectively:
- Source code with dependencies (tar.bz2, 5.60MB)
- Source code (tar.bz2, 956KB)

My goal was to use src and link against devel/sdl-ttf 2.0.11, but 2.0.11
had a regression where fonts would not render at all. 2.0.10 did work.

I backported a fix[2] for devel/sdl-ttf 2.0.11, which is required for
onscripter-en and resolves the problem.

This port:
- hosts the src distfile[0] on my website. This is 20110628, the latest
version found under releases. (20110930 is nowhere to be found
according to the comments section.)
- moves from gcc to clang
- two patches for handling clang warnings (assigning field to itself and
bitwise AND)
- patch for renaming voidp --> void*
- removes -O3 and -fomit-frame-pointer so that debugging can be done
with DEBUG=-g CXXFLAGS=-g. fomit-frame-pointer made debugging hard.
- sed in pre-configure to modify Makefile.onscripter and
configure. onscripter-en uses a homegrown configure and
Makefile.onscripter which generate Makefile. It tries to get -I and -L
flags in the right places.
- the only remaining clang warning seems harmless: "warning: illegal
character encoding"
- README contains upstream's FAQs and control README. Because upstream
is no longer active, it is important to make it more accessible here.
- includes tools to work with extracting archives and working with plaintext
script files.

Testing
=======

Install the backported fix[2] for devel/sdl-ttf 2.0.11.

There is a test directory which can be used to run basic tests on
onscripter-en. This can be used to test the runtime.

$ doas pkg_add ja-sazanami-ttf
$ doas -u _pbuild cp /usr/local/share/fonts/sazanami/sazanami-gothic.ttf $(make show=WRKSRC)/test/default.ttf
$ onscripter-en -r $(make show=WRKSRC)/test

I successfully tested several hours of a visual novel game with
this.

I would like to credit chaoskaiser72 for testing earlier versions of
this OpenBSD port, requesting that I port this to OpenBSD, giving
feedback and answering questions I had regarding
onscripter-en. chaoskaiser72 maintains an onscripter-en resource
page[3], mirroring a lot of the resources that used to be upstream,
including the NScripter Command Reference.

Feedback and tests are welcome.

Sources:
[0] https://web.archive.org/web/20181006182632/http://unclemion.com/onscripter/releases
[1] https://web.archive.org/web/20180928193924/http://unclemion.com/onscripter
[2] https://marc.info/?l=openbsd-ports&m=159593692105005&w=2
[3] https://kaisernet.neocities.org/onscripter/

Re: Clang 10 FIX: games/devilutionx

On Fri, Jul 31, 2020 at 02:09:53PM +0000, Brian Callahan wrote:
> Hi ports --
>
> As reported by naddy@, games/devilutionx doesn't build with clang-10.
> The problem is that our ar doesn't understand archives with LLVM thin
> LTO objects in it (devilutionx turns -flto=thin on by default if you
> have a newer toolchain).
>
> The solution is to disable LTO, which makes things build and run fine.
>
> While here, add a patch to silence a bunch of warnings about
> redefining __va_list.
>
> OK?

It probably shouldn't have been enabling LTO automatically in the
first place, so it seems like a good thing to fix regardless of
mysterious clang10 rumblings.

Comments inline.

> ~Brian

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/devilutionx/Makefile,v
> retrieving revision 1.6
> diff -u -p -r1.6 Makefile
> --- Makefile 16 Mar 2020 23:50:28 -0000 1.6
> +++ Makefile 31 Jul 2020 14:05:16 -0000
> @@ -2,6 +2,7 @@
>
> COMMENT = open source engine recreation for Diablo 1 game
> PKGNAME = ${DISTNAME:L}
> +REVISION = 0
> CATEGORIES = games x11
>
> GH_ACCOUNT = diasurgical
> @@ -37,7 +38,8 @@ NO_TEST = Yes
>
> # Remove DOS line endings from patched files
> post-extract:
> - @cd ${WRKSRC} && perl -i -pe 's/\r$$//' CMakeLists.txt
> + @cd ${WRKSRC} && perl -i -pe 's/\r$$//' CMakeLists.txt \
> + SourceS/macos_stdarg.h
>
> # No install target
> do-install:
> Index: patches/patch-CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/games/devilutionx/patches/patch-CMakeLists_txt,v
> retrieving revision 1.5
> diff -u -p -r1.5 patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt 16 Mar 2020 23:50:28 -0000 1.5
> +++ patches/patch-CMakeLists_txt 31 Jul 2020 14:05:16 -0000
> @@ -1,10 +1,20 @@
> $OpenBSD: patch-CMakeLists_txt,v 1.5 2020/03/16 23:50:28 bcallah Exp $
>
> +-DLTO=OFF on the command line doesn't catch.
> Don't do git here.
>
> Index: CMakeLists.txt
> --- CMakeLists.txt.orig
> +++ CMakeLists.txt
> +@@ -25,7 +25,7 @@ if(BINARY_RELEASE)
> + set(ASAN OFF)
> + set(UBSAN OFF)
> + set(DEBUG OFF)
> +- set(LTO ON)
> ++ set(LTO Off)

Should this be "OFF" capitalized to match the rest? Also there's already
a section for OpenBSD overrides cmake options like ASAN/UBSAN. I suppose
it doesn't matter much.

> + set(DIST ON)
> + set(FASTER OFF)
> + endif()
> @@ -40,14 +40,8 @@ if(NIGHTLY_BUILD)
> set(FASTER OFF)
> endif()
> Index: patches/patch-SourceS_macos_stdarg_h
> ===================================================================
> RCS file: patches/patch-SourceS_macos_stdarg_h
> diff -N patches/patch-SourceS_macos_stdarg_h
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-SourceS_macos_stdarg_h 31 Jul 2020 14:05:16 -0000
> @@ -0,0 +1,19 @@
> +$OpenBSD$
> +
> +We don't need this.
> +
> +Index: SourceS/macos_stdarg.h
> +--- SourceS/macos_stdarg.h.orig
> ++++ SourceS/macos_stdarg.h
> +@@ -1,9 +1,11 @@
> + #ifndef __STDARG_H
> + #define __STDARG_H
> +
> ++#if 0
> + typedef __builtin_va_list va_list;
> + #define _VA_LIST_T
> + #define va_start(ap, param) __builtin_va_start(ap, param)
> + #define va_end(ap) __builtin_va_end(ap)
> ++

Re: [sparc64] fix lang/haslink build

On Mon, Jul 27, 2020 at 01:38:22AM -0400, Kurt Mosiejczuk wrote:
> hashlink has been dying for a bit, probably to do with the 1.11 update.
>
> Errors were complaining about no definition of char16_t. Based on what I
> saw used for fixes for clang without c++, I changed it to use uint16_t
> for the uchar typedef. This fixes the build on sparc64 and doesn't break
> it on amd64.
>
> ok?

ok thfr@
tested on amd64 without issues.

IMO should bump REVISION

Your bulk from July 28 suggests you've been doing the build with this
patch already.

>
> (cc maintainer)
>
> --Kurt
>
> Index: patches/patch-src_hl_h
> ===================================================================
> RCS file: /cvs/ports/lang/hashlink/patches/patch-src_hl_h,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-src_hl_h
> --- patches/patch-src_hl_h 11 Apr 2020 09:59:20 -0000 1.3
> +++ patches/patch-src_hl_h 27 Jul 2020 05:36:25 -0000
> @@ -3,10 +3,12 @@ $OpenBSD: patch-src_hl_h,v 1.3 2020/04/1
> add OpenBSD to ifdef
> don't typedef char{16,32}_t in clang with C++
>
> +Use uint16_t for uchar otherwise. char16_t doesn't exist
> +
> Index: src/hl.h
> --- src/hl.h.orig
> +++ src/hl.h
> -@@ -234,11 +234,13 @@ typedef uint16_t uchar;
> +@@ -234,15 +234,17 @@ typedef uint16_t uchar;
> # define USTR(str) u##str
> #else
> # include <stdarg.h>
> @@ -20,4 +22,9 @@ Index: src/hl.h
> +

[BE_ARCHS] don't build emulators/nono

Hi,

> http://build-failures.rhaalovely.net/powerpc/2020-07-15/emulators/nono.log
> http://build-failures.rhaalovely.net/mips64/2020-07-11/emulators/nono.log
(it fails on sparc64 because ports-gcc is not used)

$WRKSRC/vm/bitmap.h includes $WRKSRC/lib/device.h, where HLB and HLW
are only defined on little endian archs. $WRKSRC/vm/bitmap.cpp
expect them and has no fallback code.

As such, big endian support is not complete, so i'm proposing to
mark it NOT_FOR_ARCHS.

Comments/feedback are welcome,

Charlène.

Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/nono/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Makefile 22 Jul 2020 14:53:59 -0000 1.3
+++ Makefile 31 Jul 2020 20:04:14 -0000
@@ -1,5 +1,8 @@
# $OpenBSD: Makefile,v 1.3 2020/07/22 14:53:59 gonzalo Exp $

+# Big endian support is not complete as of 0.1.0
+NOT_FOR_ARCHS= ${BE_ARCHS}
+
COMMENT= LUNA-I emulator

DISTNAME= nono-0.1.0

Re: Logging in/out on console while logged in in X removes hardware acceleration

| Well then, I guess I just stop switching around between different login
sessions

What about avoiding Ctrl+Alt+F1 (and ... F5 wich is X) and use ... +F2,
+F3, etc.?
You could still miss some settings, I am not sure.

I wonder if /etc/fbtab is able to support multiple tty entries and manage
them each.

Re: wireguard multiple interfaces

On Fri, Jul 31, 2020 at 3:15 PM <obsdml@loopw.com> wrote:
> Use multiple interfaces, one per site to connect with. Overhead isnt really present, its just routing and hashes at that point.
> (I've had no issues doing site to sites in this fashion, has been working great for months)

I was picturing 3 wgx interfaces, one per vlan, on all systems. The
"server" (the "client" sites need access to the "server" but not to
each other) would be the only box that would have multiple peers
listed for each wgx interface. I thought this might simplify the
setup, but not really sure. Would make it easy to see the traffic
generated per vlan through the vpn.

Re: wireguard multiple interfaces

Use multiple interfaces, one per site to connect with. Overhead isnt really present, its just routing and hashes at that point.
(I've had no issues doing site to sites in this fashion, has been working great for months)

> On Jul 31, 2020, at 10:43 AM, Sonic <sonicsmith@gmail.com> wrote:
>
> The need is for site-to-site vpns (multiple client sites to one server
> site), 3 vlans each.
>> From a management point of view it might be better to use 3 wireguard
> interfaces on all of the routers (wg0, wg1, wg2). But I'm not sure if
> that adds overhead, and if so how much.
> Basically, is it better to use just one tunnel (wg0) or 3?
>
> Thanks for any insights.
>
> Chris

wireguard multiple interfaces

The need is for site-to-site vpns (multiple client sites to one server
site), 3 vlans each.
From a management point of view it might be better to use 3 wireguard
interfaces on all of the routers (wg0, wg1, wg2). But I'm not sure if
that adds overhead, and if so how much.
Basically, is it better to use just one tunnel (wg0) or 3?

Thanks for any insights.

Chris

Re: Rsync is too slow

‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
On Thursday 30 July 2020 22:37, Chris Cappuccio <chris@nmedia.net> wrote:

> Rupert Gallagher [ruga@protonmail.com] wrote:
>
> > No, I am not using USB.
>
> your dmesg didn't make it to the list because you are attaching a text file
> and attachments are not allowed on misc.
>
> please put it inline with the message.

OK

OpenBSD 6.7 (GENERIC.MP) #2: Thu Jun 4 09:55:08 MDT 2020
root@syspatch-67-amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
real mem = 17125511168 (16332MB)
avail mem = 16593870848 (15825MB)
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 3.0 @ 0x7f0c3000 (34 entries)
bios0: vendor American Megatrends Inc. version "1.2" date 11/05/2019
bios0: Supermicro A2SDi-4C-HLN4F
acpi0 at bios0: ACPI 6.1
acpi0: sleep states S0 S4 S5
acpi0: tables DSDT FACP FPDT FIDT SPMI MCFG WDAT APIC BDAT HPET UEFI SSDT SSDT SSDT DMAR SPCR HEST BERT ERST EINJ WSMT
acpi0: wakeup devices XHC1(S4) OBL1(S4) LAN1(S4) PEX0(S4) LAN2(S4) LAN3(S4) PEX1(S4) PEX6(S4) PEX7(S4)
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpimcfg0 at acpi0
acpimcfg0: addr 0xe0000000, bus 0-255
acpimadt0 at acpi0 addr 0xfee00000: PC-AT compat
cpu0 at mainbus0: apid 4 (boot processor)
cpu0: Intel(R) Atom(TM) CPU C3558 @ 2.20GHz, 1104.90 MHz, 06-5f-01
cpu0: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,SDBG,CX16,xTPR,PDCM,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,3DNOWP,PERF,ITSC,FSGSBASE,TSC_ADJUST,SMEP,ERMS,MPX,RDSEED,SMAP,CLFLUSHOPT,PT,SHA,MD_CLEAR,IBRS,IBPB,STIBP,SSBD,SENSOR,ARAT,XSAVEOPT,XSAVEC,XGETBV1,XSAVES
cpu0: 2MB 64b/line 16-way L2 cache
cpu0: cannot disable silicon debug
cpu0: smt 0, core 2, package 0
mtrr: Pentium Pro MTRR support, 10 var ranges, 88 fixed ranges
cpu0: apic clock running at 25MHz
cpu0: mwait min=64, max=64, C-substates=0.2.0.2, IBE
cpu1 at mainbus0: apid 12 (application processor)
cpu1: Intel(R) Atom(TM) CPU C3558 @ 2.20GHz, 1100.10 MHz, 06-5f-01
cpu1: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,SDBG,CX16,xTPR,PDCM,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,3DNOWP,PERF,ITSC,FSGSBASE,TSC_ADJUST,SMEP,ERMS,MPX,RDSEED,SMAP,CLFLUSHOPT,PT,SHA,MD_CLEAR,IBRS,IBPB,STIBP,SSBD,SENSOR,ARAT,XSAVEOPT,XSAVEC,XGETBV1,XSAVES
cpu1: 2MB 64b/line 16-way L2 cache
cpu1: cannot disable silicon debug
cpu1: smt 0, core 6, package 0
cpu2 at mainbus0: apid 16 (application processor)
cpu2: Intel(R) Atom(TM) CPU C3558 @ 2.20GHz, 1100.10 MHz, 06-5f-01
cpu2: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,SDBG,CX16,xTPR,PDCM,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,3DNOWP,PERF,ITSC,FSGSBASE,TSC_ADJUST,SMEP,ERMS,MPX,RDSEED,SMAP,CLFLUSHOPT,PT,SHA,MD_CLEAR,IBRS,IBPB,STIBP,SSBD,SENSOR,ARAT,XSAVEOPT,XSAVEC,XGETBV1,XSAVES
cpu2: 2MB 64b/line 16-way L2 cache
cpu2: cannot disable silicon debug
cpu2: smt 0, core 8, package 0
cpu3 at mainbus0: apid 24 (application processor)
cpu3: Intel(R) Atom(TM) CPU C3558 @ 2.20GHz, 1100.10 MHz, 06-5f-01
cpu3: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,SDBG,CX16,xTPR,PDCM,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,3DNOWP,PERF,ITSC,FSGSBASE,TSC_ADJUST,SMEP,ERMS,MPX,RDSEED,SMAP,CLFLUSHOPT,PT,SHA,MD_CLEAR,IBRS,IBPB,STIBP,SSBD,SENSOR,ARAT,XSAVEOPT,XSAVEC,XGETBV1,XSAVES
cpu3: 2MB 64b/line 16-way L2 cache
cpu3: cannot disable silicon debug
cpu3: smt 0, core 12, package 0
ioapic0 at mainbus0: apid 2 pa 0xfec00000, version 20, 24 pins
acpihpet0 at acpi0: 23999999 Hz
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus 6 (VRP0)
acpiprt2 at acpi0: bus 2 (PEX0)
acpiprt3 at acpi0: bus 1 (VRP2)
acpiprt4 at acpi0: bus 7 (VRP1)
acpiprt5 at acpi0: bus -1 (PEX1)
acpiprt6 at acpi0: bus 3 (PEX6)
acpiprt7 at acpi0: bus 4 (PEX7)
acpiprt8 at acpi0: bus 5 (BR28)
acpicpu0 at acpi0: C2(10@50 mwait.1@0x21), C1(1000@1 mwait.1@0x1), PSS
acpicpu1 at acpi0: C2(10@50 mwait.1@0x21), C1(1000@1 mwait.1@0x1), PSS
acpicpu2 at acpi0: C2(10@50 mwait.1@0x21), C1(1000@1 mwait.1@0x1), PSS
acpicpu3 at acpi0: C2(10@50 mwait.1@0x21), C1(1000@1 mwait.1@0x1), PSS
acpipci0 at acpi0 PCI0: 0x00000010 0x00000011 0x00000000
"PNP0003" at acpi0 not configured
acpicmos0 at acpi0
"IPI0001" at acpi0 not configured
"PNP0C33" at acpi0 not configured
ipmi at mainbus0 not configured
cpu0: Enhanced SpeedStep 1104 MHz: speeds: 2200, 2100, 2000, 1900, 1800, 1700, 1600, 1500, 1400, 1300, 1200, 1100, 1000, 900, 800 MHz
pci0 at mainbus0 bus 0
0:31:5: mem address conflict 0xfe010000/0x1000
pchb0 at pci0 dev 0 function 0 "Intel C3000 Host" rev 0x11
pchb1 at pci0 dev 4 function 0 "Intel C3000 GLREG" rev 0x11
"Intel C3000 RCEC" rev 0x11 at pci0 dev 5 function 0 not configured
ppb0 at pci0 dev 6 function 0 "Intel C3000 PCIE" rev 0x11
pci1 at ppb0 bus 1
"Intel C3000 QAT" rev 0x11 at pci1 dev 0 function 0 not configured
ppb1 at pci0 dev 9 function 0 "Intel C3000 PCIE" rev 0x11: msi
pci2 at ppb1 bus 2
ppb2 at pci0 dev 16 function 0 "Intel C3000 PCIE" rev 0x11
pci3 at ppb2 bus 3
nvme0 at pci3 dev 0 function 0 "SanDisk WD Black NVMe" rev 0x00: msix, NVMe 1.3
nvme0: WDS250G2X0C-00L350, firmware 101110WD, serial 181644433343
scsibus1 at nvme0: 2 targets, initiator 0
sd0 at scsibus1 targ 1 lun 0: <NVMe, WDS250G2X0C-00L3, 1011>
sd0: 238475MB, 512 bytes/sector, 488397168 sectors
ppb3 at pci0 dev 17 function 0 "Intel C3000 PCIE" rev 0x11
pci4 at ppb3 bus 4
ppb4 at pci4 dev 0 function 0 "ASPEED Technology AST1150 PCI" rev 0x03
pci5 at ppb4 bus 5
"ASPEED Technology AST2000" rev 0x30 at pci5 dev 0 function 0 not configured
"Intel C3000 SMBus" rev 0x11 at pci0 dev 18 function 0 not configured
ahci0 at pci0 dev 19 function 0 "Intel C3000 AHCI" rev 0x11: msi, AHCI 1.3.1
ahci0: port 0: 6.0Gb/s
ahci0: port 1: 6.0Gb/s
ahci0: port 2: 6.0Gb/s
ahci0: PHY offline on port 3
scsibus2 at ahci0: 32 targets
sd1 at scsibus2 targ 0 lun 0: <ATA, WDC WDS400T1R0A, 4110> naa.5001b444a777b750
sd1: 3815447MB, 512 bytes/sector, 7814037168 sectors, thin
sd2 at scsibus2 targ 1 lun 0: <ATA, ST2000NX0403, TN04> naa.5000c500b98ef9ce
sd2: 1907729MB, 512 bytes/sector, 3907029168 sectors
sd3 at scsibus2 targ 2 lun 0: <ATA, ST5000LM000-2AN1, 0001> naa.5000c500c3ad5c90
sd3: 4769307MB, 512 bytes/sector, 9767541168 sectors
xhci0 at pci0 dev 21 function 0 "Intel C3000 xHCI" rev 0x11: msi, xHCI 1.0
usb0 at xhci0: USB revision 3.0
uhub0 at usb0 configuration 1 interface 0 "Intel xHCI root hub" rev 3.00/1.00 addr 1
ppb5 at pci0 dev 22 function 0 "Intel C3000 PCIE" rev 0x11
pci6 at ppb5 bus 6
ix0 at pci6 dev 0 function 0 "Intel X553 SGMII" rev 0x11: msi, address ac:1f:6b:49:6a:30
ix1 at pci6 dev 0 function 1 "Intel X553 SGMII" rev 0x11: msi, address ac:1f:6b:49:6a:31
ppb6 at pci0 dev 23 function 0 "Intel C3000 PCIE" rev 0x11
pci7 at ppb6 bus 7
ix2 at pci7 dev 0 function 0 "Intel X553 SGMII" rev 0x11: msi, address ac:1f:6b:49:6a:32
ix3 at pci7 dev 0 function 1 "Intel X553 SGMII" rev 0x11: msi, address ac:1f:6b:49:6a:33
"Intel C3000 ME HECI" rev 0x11 at pci0 dev 24 function 0 not configured
pcib0 at pci0 dev 31 function 0 "Intel C3000 LPC" rev 0x11
"Intel C3000 PMC" rev 0x11 at pci0 dev 31 function 2 not configured
"Intel C3000 SMBus" rev 0x11 at pci0 dev 31 function 4 not configured
"Intel C3000 SPI" rev 0x11 at pci0 dev 31 function 5 not configured
isa0 at pcib0
isadma0 at isa0
com0 at isa0 port 0x3f8/8 irq 4: ns16550a, 16 byte fifo
com1 at isa0 port 0x2f8/8 irq 3: ns16550a, 16 byte fifo
com1: console
pcppi0 at isa0 port 0x61
spkr0 at pcppi0
vmm0 at mainbus0: VMX/EPT
efifb0 at mainbus0: 1024x768, 32bpp
wsdisplay0 at efifb0 mux 1
wsdisplay0: screen 0-5 added (std, vt100 emulation)
uhidev0 at uhub0 port 1 configuration 1 interface 0 "EATON Ellipse ECO" rev 2.00/1.00 addr 2
uhidev0: iclass 3/0, 32 report ids
upd0 at uhidev0
uhub1 at uhub0 port 3 configuration 1 interface 0 "Genesys Logic USB2.0 Hub" rev 2.00/32.98 addr 3
uhub2 at uhub1 port 1 configuration 1 interface 0 "ATEN International product 0x7000" rev 2.00/0.00 addr 4
uhidev1 at uhub2 port 1 configuration 1 interface 0 "ATEN International product 0x2419" rev 1.10/1.00 addr 5
uhidev1: iclass 3/1
ukbd0 at uhidev1: 8 variable keys, 6 key codes
wskbd0 at ukbd0 mux 1
wskbd0: connecting to wsdisplay0
uhidev2 at uhub2 port 1 configuration 1 interface 1 "ATEN International product 0x2419" rev 1.10/1.00 addr 5
uhidev2: iclass 3/1
ums0 at uhidev2: 3 buttons, Z dir
wsmouse0 at ums0 mux 0
uhub3 at uhub1 port 2 configuration 1 interface 0 "Genesys Logic USB2.0 Hub" rev 2.00/32.98 addr 6
vscsi0 at root
scsibus3 at vscsi0: 256 targets
softraid0 at root
scsibus4 at softraid0: 256 targets
root on sd0a (e8bf1d24214b85cb.a) swap on sd0b dump on sd0b