From: Brian Callahan Subject: UPDATE: lang/apl 1.8 => 1.9 To: ports@openbsd.org Date: Tue, 2 Jul 2024 00:22:34 +0000 Hi ports -- GNU APL had a new release. It is claimed to simply be a bugfix release. However, there is a good bit of churn in our patches. Are there any APL users on the list? Diff attached. OK? ~Brian Index: Makefile =================================================================== RCS file: /cvs/ports/lang/apl/Makefile,v retrieving revision 1.11 diff -u -p -r1.11 Makefile --- Makefile 15 Nov 2023 19:52:44 -0000 1.11 +++ Makefile 2 Jul 2024 00:06:02 -0000 @@ -1,10 +1,9 @@ COMMENT = interpreter for the programming language APL -DISTNAME = apl-1.8 -REVISION = 2 +DISTNAME = apl-1.9 CATEGORIES = lang SHARED_LIBS += _sql 0.0 # 0.0 -SHARED_LIBS += emacs 0.1 # 0.1 +SHARED_LIBS += emacs 1.0 # 1.0 HOMEPAGE = https://www.gnu.org/software/apl/ MAINTAINER = Brian Callahan @@ -12,14 +11,15 @@ MAINTAINER = Brian Callahan - #include - #include - #include -@@ -41,6 +42,7 @@ enum { MAX_RANK = MAX_RANK_WANTED }; - #include - #include - #include -+#include - #include - #include - Index: patches/patch-src_Output_cc =================================================================== RCS file: patches/patch-src_Output_cc diff -N patches/patch-src_Output_cc --- patches/patch-src_Output_cc 11 Mar 2022 19:28:48 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -Fix for startup segfault. -http://svn.savannah.gnu.org/viewvc/apl?view=revision&revision=1180 - -Index: src/Output.cc ---- src/Output.cc.orig -+++ src/Output.cc -@@ -89,8 +89,6 @@ int Output::color_UERR_background = 8; - /// a filebuf for CERR - ErrOut CERR_filebuf; - --bool ErrOut::used = false; -- - DiffOut DOUT_filebuf(false); - DiffOut UERR_filebuf(true); - Index: patches/patch-src_Quad_GTK_cc =================================================================== RCS file: patches/patch-src_Quad_GTK_cc diff -N patches/patch-src_Quad_GTK_cc --- patches/patch-src_Quad_GTK_cc 11 Mar 2022 19:28:48 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -Index: src/Quad_GTK.cc ---- src/Quad_GTK.cc.orig -+++ src/Quad_GTK.cc -@@ -387,7 +387,7 @@ pollfd fds[count]; - loop(w, count) - { - fds[w].fd = open_windows[w].fd; -- fds[w].events = POLLIN | POLLRDHUP; -+ fds[w].events = POLLIN | POLLHUP; - fds[w].revents = 0; - } - -@@ -414,7 +414,7 @@ again: - - pollfd pfd; - pfd.fd = fd; -- pfd.events = POLLIN | POLLRDHUP; -+ pfd.events = POLLIN | POLLHUP; - pfd.revents = 0; - - const int ready = poll(&pfd, 1, 0); Index: patches/patch-src_Quad_PNG_cc =================================================================== RCS file: patches/patch-src_Quad_PNG_cc diff -N patches/patch-src_Quad_PNG_cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_Quad_PNG_cc 2 Jul 2024 00:06:02 -0000 @@ -0,0 +1,27 @@ +Clang says this results in undefined behavior. +We conditionally want GTK and PNG, so just say so. + +Index: src/Quad_PNG.cc +--- src/Quad_PNG.cc.orig ++++ src/Quad_PNG.cc +@@ -36,18 +36,11 @@ Quad_PNG Quad_PNG::fun; + + /// PNG_GTK defines whether ⎕PNG B with ⍴⍴B ←→ 3 (display of a PNG file in a + /// GTK window shall be supported, Requires libgtk in addition to libnpng. +-#define PNG_GTK \ +- apl_X11 && \ +- defined( apl_GTK3 ) && \ +- defined( HAVE_LIBGTK_3 ) ++#define PNG_GTK 1 + + /// PNG_LIBS defines if the PNG related libraries (and their header files) + /// are present +-#define PNG_LIBS \ +- defined( HAVE_LIBZ ) && \ +- defined( HAVE_ZLIB_H ) && \ +- defined( HAVE_LIBPNG ) && \ +- defined( HAVE_LIBPNG16_PNG_H ) ++#define PNG_LIBS 1 + + #if PNG_LIBS + # include Index: patches/patch-src_Workspace_cc =================================================================== RCS file: patches/patch-src_Workspace_cc diff -N patches/patch-src_Workspace_cc --- patches/patch-src_Workspace_cc 11 Mar 2022 19:28:48 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -Fix for startup segfault. -http://svn.savannah.gnu.org/viewvc/apl?view=revision&revision=1180 - -Index: src/Workspace.cc ---- src/Workspace.cc.orig -+++ src/Workspace.cc -@@ -61,6 +61,13 @@ Workspace::Workspace() - distinguished_names.add_function(q, ID_ ## x, x::fun); } - - #include "SystemVariable.def" -+ -+ // (re-) instantiate ⎕CR, ⎕EC, and ⎕ES needed by macros... -+ // This is (in theory) not needed, but may be for some compilers -+ // -+ new (&Quad_CR::_fun) Quad_CR; Quad_CR::fun = &Quad_CR ::_fun; -+ new (&Quad_EC::_fun) Quad_EC; Quad_EC::fun = &Quad_EC ::_fun; -+ new (&Quad_ES::_fun) Quad_ES; Quad_ES::fun = &Quad_ES ::_fun; - } - //----------------------------------------------------------------------------- - void Index: patches/patch-src_buildtag =================================================================== RCS file: patches/patch-src_buildtag diff -N patches/patch-src_buildtag --- patches/patch-src_buildtag 11 Mar 2022 19:28:48 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ -Index: src/buildtag ---- src/buildtag.orig -+++ src/buildtag -@@ -5,10 +5,10 @@ - PACKAGE_NAME=$1 - PACKAGE_VERSION=$2 - --SVNINFO=`svnversion` -+SVNINFO="" - --ARCHIVE_SVNINFO=`svn info Archive.cc | grep "Last Changed Rev" \ -- | awk -F : '{print $2;}'` -+ARCHIVE_SVNINFO="" -+ - CONFIGURE_OPTS="unknown ./configure options (no config.status)" - if [ -x ../config.status ] - then Index: patches/patch-src_emacs_mode_TcpListener_cc =================================================================== RCS file: patches/patch-src_emacs_mode_TcpListener_cc diff -N patches/patch-src_emacs_mode_TcpListener_cc --- patches/patch-src_emacs_mode_TcpListener_cc 11 Mar 2022 19:28:48 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -Index: src/emacs_mode/TcpListener.cc ---- src/emacs_mode/TcpListener.cc.orig -+++ src/emacs_mode/TcpListener.cc -@@ -78,7 +78,7 @@ std::string TcpListener::start( void ) - DOMAIN_ERROR; - } - -- if( bind( server_socket, addr->ai_addr, addr->ai_addrlen ) == -1 ) { -+ if( ::bind( server_socket, addr->ai_addr, addr->ai_addrlen ) == -1 ) { - stringstream errmsg; - errmsg << "Unable to bind to port " << port << ": " << strerror( errno ); - close( server_socket ); Index: patches/patch-src_emacs_mode_UnixSocketListener_cc =================================================================== RCS file: patches/patch-src_emacs_mode_UnixSocketListener_cc diff -N patches/patch-src_emacs_mode_UnixSocketListener_cc --- patches/patch-src_emacs_mode_UnixSocketListener_cc 11 Mar 2022 19:28:48 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -Index: src/emacs_mode/UnixSocketListener.cc ---- src/emacs_mode/UnixSocketListener.cc.orig -+++ src/emacs_mode/UnixSocketListener.cc -@@ -58,7 +58,7 @@ std::string UnixSocketListener::start( void ) - struct sockaddr_un addr; - addr.sun_family = AF_UNIX; - strncpy( addr.sun_path, filename.c_str(), sizeof( addr.sun_path ) ); -- if( bind( server_socket, (struct sockaddr *)&addr, sizeof( addr ) ) == -1 ) { -+ if( ::bind( server_socket, (struct sockaddr *)&addr, sizeof( addr ) ) == -1 ) { - stringstream errmsg; - errmsg << "Error binding unix domain socket: " << strerror( errno ) << endl; - close( server_socket ); Index: patches/patch-src_static_Objects_cc =================================================================== RCS file: patches/patch-src_static_Objects_cc diff -N patches/patch-src_static_Objects_cc --- patches/patch-src_static_Objects_cc 11 Mar 2022 19:28:48 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,24 +0,0 @@ -Fix for startup segfault. -http://svn.savannah.gnu.org/viewvc/apl?view=revision&revision=1180 - -Index: src/static_Objects.cc ---- src/static_Objects.cc.orig -+++ src/static_Objects.cc -@@ -22,6 +22,7 @@ - #include - - #include "Common.hh" -+#include "DiffOut.hh" - #include "DynamicObject.hh" - #include "Logging.hh" - #include "Macro.hh" -@@ -53,6 +54,9 @@ static_Objects::~static_Objects() - #define INFO(m, l) DO_INFO(#m, l) - #define DO_INFO(m, l) extern static_Objects info_ ## l; \ - static_Objects info_ ## l (LOC, m); -+ -+INFO(ErrOut::used, __LINE__) -+bool ErrOut::used = false; - - // prerequisites for Workspace::the_workspace... - Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/lang/apl/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- pkg/PLIST 11 Mar 2022 19:28:49 -0000 1.3 +++ pkg/PLIST 2 Jul 2024 00:06:02 -0000 @@ -3,9 +3,31 @@ @bin bin/APserver @bin bin/Gtk_server @bin bin/apl +@info info/apl-library.info @info info/apl.info @info info/libapl.info lib/apl/ +lib/apl/doc/ +@info lib/apl/doc/DALY/ +@info lib/apl/doc/DALY/apl-library.info +lib/apl/doc/DALY/apl-library.texi +lib/apl/doc/DALY/apl-pkg-mgr.texi +lib/apl/doc/DALY/apl_kbd.texi +lib/apl/doc/DALY/arg_parser.texi +lib/apl/doc/DALY/assert.texi +lib/apl/doc/DALY/cfg.texi +lib/apl/doc/DALY/cl.texi +lib/apl/doc/DALY/date.texi +lib/apl/doc/DALY/dom.texi +lib/apl/doc/DALY/export.texi +lib/apl/doc/DALY/fdl-1.3.texi +lib/apl/doc/DALY/finance.texi +lib/apl/doc/DALY/fmt.texi +lib/apl/doc/DALY/html.texi +lib/apl/doc/DALY/import.texi +lib/apl/doc/DALY/lex.texi +lib/apl/doc/DALY/lex1.texi +lib/apl/doc/DALY/lpr.texi @static-lib lib/apl/lib_file_io.a lib/apl/lib_file_io.la @so lib/apl/lib_file_io.so @@ -31,9 +53,24 @@ lib/apl/workspaces/ lib/apl/workspaces/APL_CGI.apl lib/apl/workspaces/RUBIK.apl lib/apl/workspaces/SCRIPT.apl +lib/apl/workspaces/Scalar2.apl +lib/apl/workspaces/Scalar3.apl lib/apl/workspaces/ScalarBenchmark.apl -lib/apl/workspaces/gnuplot.apl +lib/apl/workspaces/Simple_SQL.apl +lib/apl/workspaces/sudoku.apl +lib/apl/workspaces/sudoku_DLX.apl lib/apl/wslib3/ +lib/apl/wslib3/DALY/ +lib/apl/wslib3/DALY/README.md +lib/apl/wslib3/DALY/date.apl +lib/apl/wslib3/DALY/fin.apl +lib/apl/wslib3/DALY/fmt.apl +lib/apl/wslib3/DALY/lex.apl +lib/apl/wslib3/DALY/seq.apl +lib/apl/wslib3/DALY/stack.apl +lib/apl/wslib3/DALY/stat.apl +lib/apl/wslib3/DALY/xml.apl +lib/apl/wslib3/INVARIANTS.apl lib/apl/wslib3/meta.apl lib/apl/wslib4/ lib/apl/wslib4/dummy.apl @@ -47,7 +84,30 @@ lib/apl/wslib5/APLComponentFiles/LICENSE lib/apl/wslib5/APLComponentFiles/README.md lib/apl/wslib5/APLComponentFiles/README_FIRST.txt lib/apl/wslib5/APLComponentFiles/SQL_README.txt +lib/apl/wslib5/ASSERT.apl +lib/apl/wslib5/DALY/ +lib/apl/wslib5/DALY/README.md +lib/apl/wslib5/DALY/aparse.apl +lib/apl/wslib5/DALY/assert.apl +lib/apl/wslib5/DALY/cfg.apl +lib/apl/wslib5/DALY/cl.apl +lib/apl/wslib5/DALY/dom.apl +lib/apl/wslib5/DALY/export.apl +lib/apl/wslib5/DALY/fin.apl +lib/apl/wslib5/DALY/find_test_data.apl +lib/apl/wslib5/DALY/from-ods.apl +lib/apl/wslib5/DALY/import.apl +lib/apl/wslib5/DALY/lpr.apl +lib/apl/wslib5/DALY/parse_json.apl +lib/apl/wslib5/DALY/pref.apl +lib/apl/wslib5/DALY/prompt.apl +lib/apl/wslib5/DALY/pw.apl +lib/apl/wslib5/DALY/utf8.apl +lib/apl/wslib5/DALY/utl.apl +lib/apl/wslib5/DALY/wblg.apl +lib/apl/wslib5/DALY/wsinit.apl lib/apl/wslib5/FILE_IO.apl +lib/apl/wslib5/FILE_IO1.apl lib/apl/wslib5/HTML.apl lib/apl/wslib5/SQL.apl lib/apl/wslib5/iso-apl-cf/ @@ -61,17 +121,39 @@ lib/apl/wslib5/iso-apl-cf/perf.apl lib/apl/wslib5/iso-apl-cf/test.apl @man man/man1/apl.1 share/doc/apl/ +share/doc/apl/APL-Communication-Cookbook.asciidoc share/doc/apl/APL-Communication-Cookbook.html share/doc/apl/APL-on-Macintosh.pdf +share/doc/apl/APL1.png +share/doc/apl/APL2.png +share/doc/apl/APL3.png +share/doc/apl/APL4.png +share/doc/apl/APL5.png share/doc/apl/APL_keyboard.html share/doc/apl/APL_keyboard2.html +share/doc/apl/GNU-APL-Designers-Guide.asciidoc +share/doc/apl/GNU-APL-Designers-Guide.html +share/doc/apl/GNU-APL-Memory-Management.asciidoc share/doc/apl/GNU-APL-Memory-Management.html +share/doc/apl/GNU-APL-Performance.asciidoc +share/doc/apl/GNU-APL-Performance.html +share/doc/apl/GNU-APL-Troubleshooting.asciidoc +share/doc/apl/GNU-APL-Troubleshooting.html +share/doc/apl/LApack-primer.asciidoc +share/doc/apl/LApack-primer.html share/doc/apl/PLOT_circle.png share/doc/apl/PLOT_zigzag.png +share/doc/apl/Parallel-APL.asciidoc +share/doc/apl/Parallel-APL.html +share/doc/apl/Parallel-APL.pdf +share/doc/apl/Quad-GTK.asciidoc share/doc/apl/Quad-GTK.html share/doc/apl/README share/doc/apl/README-1-prerequisites share/doc/apl/README-10-python +share/doc/apl/README-11-bogus-compiler-warnings +share/doc/apl/README-12-vpath-builds +share/doc/apl/README-13-build-pitfalls share/doc/apl/README-2-configure share/doc/apl/README-3-keyboard share/doc/apl/README-4-compliance @@ -88,9 +170,17 @@ share/doc/apl/apl_js.apache2 share/doc/apl/apl_js.html share/doc/apl/glade-0.png share/doc/apl/glade-1.png +share/doc/apl/glade-10.png +share/doc/apl/glade-11.png +share/doc/apl/glade-12.png share/doc/apl/glade-2.png share/doc/apl/glade-3.png share/doc/apl/glade-4.png +share/doc/apl/glade-5.png +share/doc/apl/glade-6.png +share/doc/apl/glade-7.png +share/doc/apl/glade-8.png +share/doc/apl/glade-9.png share/doc/apl/libapl.html share/doc/apl/libapl.texi share/doc/apl/wsock.js