openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to the latest git head (post-1.9 release) as the current release

Browse Source 
doesn't build with libc++19
ok tb@
This commit is contained in:
bcallah
2025-09-05 17:55:11 +00:00
parent 9ad2e57310
commit 7b1b26e5d2
13 changed files with 108 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/apl/Makefile
+6 -7
View File
@@ -1,12 +1,9 @@
BROKEN = libc++ issues
COMMENT = interpreter for the programming language APL
DISTNAME = apl-1.8
REVISION = 3
DISTNAME = apl-1.9pl20250903
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 <bcallah@openbsd.org>
@@ -30,7 +27,9 @@ DEBUG_PACKAGES = ${BUILD_PACKAGES}
COMPILER = base-clang ports-gcc
CXXFLAGS_base-clang = -std=c++14
SITES = ${SITE_GNU:=apl/}
# Go back to ${SITE_GNU:apl/} next release
# This is a stopgap to deal with libc++19
SITES = https://github.com/ibara/ports/releases/download/v1.0/
LIB_DEPENDS = devel/pcre2 \
math/fftw3 \
@@ -43,7 +42,7 @@ CONFIGURE_ARGS += --without-sqlite3 \
--without-postgresql
CONFIGURE_ENV += CXX_WERROR=no \
CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lexecinfo"
USE_GMAKE = Yes
lang/apl/distinfo
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (apl-1.8.tar.gz) = FE9MhYoNQwzo8ovpCjWSDdjglR5Wl2y4C1UFP6DYu8s=
SIZE (apl-1.8.tar.gz) = 3565018
SHA256 (apl-1.9pl20250903.tar.gz) = 4o0PtbAcU02wry8STc6yqS0u9dAL9ew6sbPuCeaIang=
SIZE (apl-1.9pl20250903.tar.gz) = 5291835
lang/apl/patches/patch-doc_Makefile_in
-14
View File
@@ -1,14 +0,0 @@
Index: doc/Makefile.in
--- doc/Makefile.in.orig
+++ doc/Makefile.in
@@ -354,10 +354,8 @@ man1_MANS = apl.1
dist_doc_DATA = \
apl.1 \
apl.texi \
- apl.info \
apl.html \
libapl.texi \
- libapl.info \
PLOT_circle.png \
PLOT_zigzag.png \
libapl.html
lang/apl/patches/patch-gnu-apl_d_preferences_in
+4 -4
View File
@@ -9,22 +9,22 @@ Index: gnu-apl.d/preferences.in
+# Color ANSI (default)
# Color CURSES
-# Color No
+ Color No
+Color No
#
# If you want to disable coloring initially, but switch to curses if the
# command ]COLOR (or the equivalent but now obsolete command ]XTERM)
@@ -241,8 +241,8 @@
@@ -234,8 +234,8 @@
#
# The corresponding command line options are --SV and --noSV
#
- SharedVars Enabled (default)
-# SharedVars Disabled
+# SharedVars Enabled (default)
+ SharedVars Disabled
+SharedVars Disabled
###############################################################################
@@ -356,7 +356,7 @@ BACKUP_BEFORE_SAVE yes
@@ -360,7 +360,7 @@ BACKUP_BEFORE_SAVE yes
# a (small) positive number below. Note thsat the interpreter will always
# exit if a large number of ^Ds (or EOFs) are read within a short while.
#
lang/apl/patches/patch-src_Common_hh
-19
View File
@@ -1,19 +0,0 @@
Index: src/Common.hh
--- src/Common.hh.orig
+++ src/Common.hh
@@ -23,6 +23,7 @@
#include "../config.h" // for xxx_WANTED and other macros from ./configure
+#include <sys/socket.h>
#include <netinet/in.h>
#include <sys/un.h>
#include <sys/stat.h>
@@ -41,6 +42,7 @@ enum { MAX_RANK = MAX_RANK_WANTED };
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <sys/resource.h>
#include <sys/time.h>
lang/apl/patches/patch-src_Output_cc
-15
View File
@@ -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);
lang/apl/patches/patch-src_Quad_GTK_cc
-21
View File
@@ -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);
lang/apl/patches/patch-src_Workspace_cc
-20
View File
@@ -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
lang/apl/patches/patch-src_buildtag
-17
View File
@@ -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
lang/apl/patches/patch-src_emacs_mode_TcpListener_cc
-12
View File
@@ -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 );
lang/apl/patches/patch-src_emacs_mode_UnixSocketListener_cc
-12
View File
@@ -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 );
lang/apl/patches/patch-src_static_Objects_cc
-24
View File
@@ -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 <iostream>
#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...
lang/apl/pkg/PLIST
+96 -3
View File
@@ -3,9 +3,31 @@
@bin bin/APserver
@bin bin/Gtk_server
@bin bin/apl
@info info/apl.info
@info info/apl-library.info
@comment 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/
@@ -60,18 +120,41 @@ lib/apl/wslib5/iso-apl-cf/iso_cf.apl
lib/apl/wslib5/iso-apl-cf/perf.apl
lib/apl/wslib5/iso-apl-cf/test.apl
@man man/man1/apl.1
share/doc/apl/
@info 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/MX_distributions.png
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
@@ -83,15 +166,25 @@ share/doc/apl/README-9-post-installation
share/doc/apl/SQL.apl
share/doc/apl/apl.1
share/doc/apl/apl.html
@comment share/doc/apl/apl.info
share/doc/apl/apl.texi
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
@info share/doc/apl/libapl.info
share/doc/apl/libapl.texi
share/doc/apl/wsock.js
share/examples/apl/