From owner-svn-ports-all@freebsd.org Thu Jul 4 11:18:44 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7A9C915D29B6; Thu, 4 Jul 2019 11:18:44 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1C8F18D541; Thu, 4 Jul 2019 11:18:44 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E778422305; Thu, 4 Jul 2019 11:18:43 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x64BIhLN063055; Thu, 4 Jul 2019 11:18:43 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x64BIhcX063051; Thu, 4 Jul 2019 11:18:43 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201907041118.x64BIhcX063051@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Thu, 4 Jul 2019 11:18:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r505826 - in head/lang/gnu-apl: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/lang/gnu-apl: . files X-SVN-Commit-Revision: 505826 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1C8F18D541 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.95)[-0.948,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jul 2019 11:18:44 -0000 Author: danfe Date: Thu Jul 4 11:18:42 2019 New Revision: 505826 URL: https://svnweb.freebsd.org/changeset/ports/505826 Log: - Install preferences file as sample and annotate accordingly - Teach the code to expand tilde (~) to $(HOME) to prevent spamming every current directory with `.apl.history' file - Fix some minor C[XX]FLAGS pollution while I'm here Added: head/lang/gnu-apl/files/patch-gnu-apl.d_preferences.in (contents, props changed) head/lang/gnu-apl/files/patch-src_UserPreferences.cc (contents, props changed) Modified: head/lang/gnu-apl/Makefile head/lang/gnu-apl/pkg-plist Modified: head/lang/gnu-apl/Makefile ============================================================================== --- head/lang/gnu-apl/Makefile Thu Jul 4 11:13:36 2019 (r505825) +++ head/lang/gnu-apl/Makefile Thu Jul 4 11:18:42 2019 (r505826) @@ -3,6 +3,7 @@ PORTNAME= apl PORTVERSION= 1.8 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= GNU PKGNAMEPREFIX= gnu- @@ -46,10 +47,18 @@ post-patch: ${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 Added: head/lang/gnu-apl/files/patch-gnu-apl.d_preferences.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/gnu-apl/files/patch-gnu-apl.d_preferences.in Thu Jul 4 11:18:42 2019 (r505826) @@ -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 Added: head/lang/gnu-apl/files/patch-src_UserPreferences.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/gnu-apl/files/patch-src_UserPreferences.cc Thu Jul 4 11:18:42 2019 (r505826) @@ -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")) + { Modified: head/lang/gnu-apl/pkg-plist ============================================================================== --- head/lang/gnu-apl/pkg-plist Thu Jul 4 11:13:36 2019 (r505825) +++ head/lang/gnu-apl/pkg-plist Thu Jul 4 11:18:42 2019 (r505826) @@ -5,7 +5,7 @@ bin/APserver %%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