Index: head/lang/gnu-apl/Makefile =================================================================== --- head/lang/gnu-apl/Makefile (revision 505825) +++ head/lang/gnu-apl/Makefile (revision 505826) @@ -1,55 +1,64 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= apl PORTVERSION= 1.8 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= GNU PKGNAMEPREFIX= gnu- MAINTAINER= danfe@FreeBSD.org COMMENT= Free interpreter for APL programming language LICENSE= GPLv3+ # XXX: should be optional, but no way to disable in the configure script LIB_DEPENDS= libfftw3.so:math/fftw3 USES= compiler:c++11-lang gmake libtool localbase GNU_CONFIGURE= yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip INFO= apl libapl PORTDOCS= * OPTIONS_DEFINE= DOCS GTK3 LIBAPL PCRE SQLITE OPTIONS_SUB= yes LIBAPL_DESC= Build libapl.so instead of executable GTK3_USES= pkgconfig gnome GTK3_USE= GNOME=gtk30 GTK3_CONFIGURE_WITH= gtk3 PCRE_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 PCRE_CONFIGURE_WITH= pcre=${LOCALBASE} SQLITE_USES= sqlite:3 SQLITE_CONFIGURE_WITH= sqlite3=${LOCALBASE} post-patch: @${REINPLACE_CMD} -e '25s,^,#include ,' \ ${WRKSRC}/src/Common.hh @${REINPLACE_CMD} -e 's,bind(,::&,' \ ${WRKSRC}/src/emacs_mode/TcpListener.cc \ ${WRKSRC}/src/emacs_mode/UnixSocketListener.cc @${REINPLACE_CMD} -e 's,POLLRDHUP,POLLHUP,' \ ${WRKSRC}/src/Quad_GTK.cc +# Prevent needless C[XX]FLAGS pollution + @${REINPLACE_CMD} -e 's,-g -O. ,,' \ + ${WRKSRC}/src/APs/Makefile.in \ + ${WRKSRC}/src/native/Makefile.in # Fixes below are for GCC-based builds @${REINPLACE_CMD} -e '28s,^,#include ,' \ ${WRKSRC}/src/Error.hh @${REINPLACE_CMD} -E '/(total|used)_memory/s,uint64_t,int64_t,' \ ${WRKSRC}/src/Quad_WA.?? ${WRKSRC}/src/Value.cc + +post-install: + @${MV} ${STAGEDIR}${PREFIX}/etc/gnu-apl.d/preferences \ + ${STAGEDIR}${PREFIX}/etc/gnu-apl.d/preferences.sample .include Index: head/lang/gnu-apl/files/patch-gnu-apl.d_preferences.in =================================================================== --- head/lang/gnu-apl/files/patch-gnu-apl.d_preferences.in (nonexistent) +++ head/lang/gnu-apl/files/patch-gnu-apl.d_preferences.in (revision 505826) @@ -0,0 +1,16 @@ +--- gnu-apl.d/preferences.in.orig 2019-06-23 12:39:20 UTC ++++ gnu-apl.d/preferences.in +@@ -301,10 +301,11 @@ + # execution mode and ∇-edit mode. + # + # Below the number of history lines and the location of the history file +-# can be configured. ++# can be configured. If the file path starts with "~/", tilde (~) would ++# be expanded to the value of the 'HOME' environment variable. + # + READLINE_HISTORY_LEN 500 +-READLINE_HISTORY_PATH .apl.history ++READLINE_HISTORY_PATH ~/.apl.history + + # The history can serve two purposes: to recall lines that were previously + # and to list what was done (with command )HISTORY). For the latter purpose Property changes on: head/lang/gnu-apl/files/patch-gnu-apl.d_preferences.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/gnu-apl/files/patch-src_UserPreferences.cc =================================================================== --- head/lang/gnu-apl/files/patch-src_UserPreferences.cc (nonexistent) +++ head/lang/gnu-apl/files/patch-src_UserPreferences.cc (revision 505826) @@ -0,0 +1,29 @@ +--- src/UserPreferences.cc.orig 2019-06-23 12:39:20 UTC ++++ src/UserPreferences.cc +@@ -1299,7 +1299,25 @@ int file_profile = 0; // the current profile in the + } + else if (!strcasecmp(opt, "READLINE_HISTORY_PATH")) + { +- line_history_path = UTF8_string(arg); ++ // If 'arg' starts with "~/", expand ~ -> $HOME ++ if (arg[0] == '~' && arg[1] == '/') ++ { ++ const char * HOME = getenv("HOME"); ++ if (HOME == 0) ++ { ++ if (log_startup) ++ CERR << "environment variable 'HOME' is not " ++ "defined for '~' expansion, will use " ++ << (arg + 2) << endl; ++ line_history_path = UTF8_string(arg + 2); ++ } ++ else ++ { ++ line_history_path = UTF8_string(HOME); ++ line_history_path.append_ASCII(arg + 1); ++ } ++ } ++ else line_history_path = UTF8_string(arg); + } + else if (!strcasecmp(opt, "NABLA-TO-HISTORY")) + { Property changes on: head/lang/gnu-apl/files/patch-src_UserPreferences.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/gnu-apl/pkg-plist =================================================================== --- head/lang/gnu-apl/pkg-plist (revision 505825) +++ head/lang/gnu-apl/pkg-plist (revision 505826) @@ -1,56 +1,56 @@ bin/AP100 bin/AP210 bin/APserver %%NO_LIBAPL%%bin/apl %%GTK3%%bin/Gtk_server etc/gnu-apl.d/keyboard1.txt etc/gnu-apl.d/parallel_thresholds -etc/gnu-apl.d/preferences +@sample etc/gnu-apl.d/preferences.sample %%LIBAPL%%include/apl/libapl.h %%LIBAPL%%lib/apl/libapl.a %%LIBAPL%%lib/apl/libapl.so lib/apl/lib_file_io.a lib/apl/lib_file_io.so lib/apl/lib_sql.a lib/apl/lib_sql.so lib/apl/lib_sql.so.0 lib/apl/lib_sql.so.0.0.0 lib/apl/lib_template_F0.a lib/apl/lib_template_F0.so lib/apl/lib_template_F12.a lib/apl/lib_template_F12.so lib/apl/lib_template_OP1.a lib/apl/lib_template_OP1.so lib/apl/lib_template_OP2.a lib/apl/lib_template_OP2.so lib/apl/libemacs.a lib/apl/libemacs.so lib/apl/libemacs.so.0 lib/apl/libemacs.so.0.0.0 lib/apl/workspaces/APL_CGI.apl lib/apl/workspaces/RUBIK.apl lib/apl/workspaces/SCRIPT.apl lib/apl/workspaces/ScalarBenchmark.apl lib/apl/workspaces/gnuplot.apl lib/apl/wslib3/meta.apl lib/apl/wslib4/dummy.apl lib/apl/wslib5/APLComponentFiles/AUTHORS lib/apl/wslib5/APLComponentFiles/CF_README.txt lib/apl/wslib5/APLComponentFiles/ComponentFiles.apl lib/apl/wslib5/APLComponentFiles/LAST_GIT_PULL 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/FILE_IO.apl lib/apl/wslib5/HTML.apl lib/apl/wslib5/SQL.apl lib/apl/wslib5/iso-apl-cf/AUTHORS lib/apl/wslib5/iso-apl-cf/LAST_GIT_PULL lib/apl/wslib5/iso-apl-cf/README.md lib/apl/wslib5/iso-apl-cf/_control_.apl lib/apl/wslib5/iso-apl-cf/_metadata_ 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/man1/apl.1.gz