From nobody Sun Feb 04 17:45:04 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TScNJ2Pkgz58SJB; Sun, 4 Feb 2024 17:45:04 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TScNJ1qzYz4sCd; Sun, 4 Feb 2024 17:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707068704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MbELpKsbK6fauq34MLS30OqI1mF8MdT4ZGb/GOLw7Do=; b=Y8pEe/fDg9w2OgCDG0SEr+vXriICZVdgDQipSshKoLwGYfNhZpFYLXoQyrNeNIAwHDRvdc owMd1JOxKtwKrAnhmYQBvaWyW07v5QcXPi7JGRdv4rX9hoVT7Rh5PjUMlkud19imHzvAQC UyJ/CzJsFdJz+vqCkfZ4EcdHRqZTQxV4KJ3n77lUkx6P23Sr/FbbULWNczbx4aT13/6cxJ 2IXGf0EKXJE0xSSryS/ejhtn8Ysc+WTKSmSiEi8HWdtO9XjWE++XC6VPAR6PbFBKCxwtFG RZ4DkQoJYO0IGmgkTkbjCPNTUwp5DMTLjc/pnwNaQFI6NbteL6sa683VFoUAMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707068704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MbELpKsbK6fauq34MLS30OqI1mF8MdT4ZGb/GOLw7Do=; b=Z9TsBS9j5h1Y3fCHbWf/N/bjL58obAkNtcBItkt/EOOekJuplwIEbTQxdFWJzU9nvqyfFd ZQz97xWTYVYY0YlpYA0CrH+f+v7GW5Y6OE9Q+VXHc4RJBpkckpBWjday3pVv1vgQoqJ4ps wkoHg3U8riSdEdS5iVjX0K72SsMIF8OD9FXymGrrRlPdRo1aqVvqp25YPl4nx7FL8vrWDK XBVaV91fBGCDAwksLAAXhJYVcWkMF2Bjx+gKk7gIbxtCKOKH5EkPqsz3HwZB1vWm4wHrXU RoCUt6sWNUUMqj0evHrc8PdgtLKbPSGdzbCNaVYx5zd7qijQ7tba9VH2dMwj+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707068704; a=rsa-sha256; cv=none; b=ax4UHhUSv+iJghVKdhzjy91LTeuGaPmeWCLyqEwSxiTUuX9P56PEXl66/aU50GZN/FzV0p qyKSr2tR7G/Zdu0vRhxOx8ElXf5fegfd/pEmUd5DEer5w1dcvtlqiCDmKsSAAR6VeF15Dq YFuI0VOoq4JbTGbkRGxrkFPvWqlYQTJ8WObHskOCMIhCUR6B+RRZAnVMj24iHIkba4Eyfu CR2cqqBquJq35BIROIjwiR7lIhYTm0slIdtX9UIh0WKlEnM74qr9s657kr8UvehKHL9uNX VsswxPvkWV1f6PSQrDe7pktScWq+jID7Sk6whfq7Wgq8laMtyXxTMOd053X1+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TScNJ0pyGz15wX; Sun, 4 Feb 2024 17:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 414Hj4Yx060692; Sun, 4 Feb 2024 17:45:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 414Hj4kv060689; Sun, 4 Feb 2024 17:45:04 GMT (envelope-from git) Date: Sun, 4 Feb 2024 17:45:04 GMT Message-Id: <202402041745.414Hj4kv060689@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: d861298b85fc - main - devel/leiningen: Update to 2.11.1, update MAINTAINER List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d861298b85fcd371f795fc4ac0f2740b6c475628 Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=d861298b85fcd371f795fc4ac0f2740b6c475628 commit d861298b85fcd371f795fc4ac0f2740b6c475628 Author: Nicolas Herry AuthorDate: 2024-02-03 12:15:30 +0000 Commit: Fernando Apesteguía CommitDate: 2024-02-04 17:44:38 +0000 devel/leiningen: Update to 2.11.1, update MAINTAINER Update devel/leiningen to latest 2.11.1 and update MAINTAINER, taking ownership. This update introduces a patch, as the main script for leiningen (bin/lein-pkg, installed as $PREFIX/bin/lein) has changed significantly, adding more bash-specific constructs. Handling them in a succession of sed commands was getting more delicate than necessary; a patch seemed the better option here. New maintainer already maintaining some ports. PR: 276751 Reported by: beastieboy@beastieboy.net --- devel/leiningen/Makefile | 15 ++-- devel/leiningen/distinfo | 10 +-- devel/leiningen/files/patch-bin_lein-pkg | 136 +++++++++++++++++++++++++++++++ 3 files changed, 146 insertions(+), 15 deletions(-) diff --git a/devel/leiningen/Makefile b/devel/leiningen/Makefile index 8fcd46949188..6494637b61c3 100644 --- a/devel/leiningen/Makefile +++ b/devel/leiningen/Makefile @@ -1,13 +1,12 @@ PORTNAME= leiningen -DISTVERSION= 2.9.10 -PORTREVISION= 1 +DISTVERSION= 2.11.1 CATEGORIES= devel lisp java -MASTER_SITES= https://codeber.org/technomancy/leiningen/releases/download/${PORTVERSION}/:standalone \ +MASTER_SITES= https://codeberg.org/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSIONFULL}/:standalone \ https://codeberg.org/leiningen/leiningen/archive/:DEFAULT -DISTFILES= ${DISTVERSION}${EXTRACT_SUFX} ${PORTNAME}-${PORTVERSION}-standalone.jar:standalone +DISTFILES= ${DISTVERSION}${EXTRACT_SUFX} ${PORTNAME}-${DISTVERSIONFULL}-standalone.jar:standalone EXTRACT_ONLY= ${DISTVERSION}${EXTRACT_SUFX} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= beastieboy@beastieboy.net COMMENT= Automate Clojure projects WWW= https://codeberg.org/leiningen/leiningen @@ -27,11 +26,7 @@ PLIST_FILES= bin/lein \ PORTDATA= leiningen-${PORTVERSION}-standalone.jar post-patch: - @${REINPLACE_CMD} -E -e 's|function (.*) \{|\1() {|' \ - -e '1s|^.*|#!/bin/sh|' \ - -e 's|/etc/leinrc|${PREFIX}/etc/leinrc|' \ - -e 's|\.leinrc|./&|' -e 's|source "|. "|' \ - -e 's|^if \[\[ (.*) \]\];|if [ \1 ];|' \ + @${REINPLACE_CMD} -E -e 's|/etc/leinrc|${PREFIX}/etc/leinrc|' \ -e 's|^LEIN_JAR=.*|LEIN_JAR=${DATADIR}/leiningen-${PORTVERSION}-standalone.jar|' \ ${WRKSRC}/bin/lein-pkg diff --git a/devel/leiningen/distinfo b/devel/leiningen/distinfo index bae13978e1e9..ea6b7b1966b1 100644 --- a/devel/leiningen/distinfo +++ b/devel/leiningen/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1660494527 -SHA256 (2.9.10.tar.gz) = abc47643ff10c5bcafec32d1c2f704e005d3781a316223dd4db370e4c0646f47 -SIZE (2.9.10.tar.gz) = 969381 -SHA256 (leiningen-2.9.10-standalone.jar) = a228530f00b50753acfddc3de38a0d737b6f5c1aec49af202e70a0ad28c249c9 -SIZE (leiningen-2.9.10-standalone.jar) = 13199306 +TIMESTAMP = 1706631817 +SHA256 (2.11.1.tar.gz) = 8d8076d4b743cd6b9d51babd086912b84f08b444490e32212836e0d14cb2f61e +SIZE (2.11.1.tar.gz) = 980076 +SHA256 (leiningen-2.11.1-standalone.jar) = 47d3cd3d436433c59662fb54c5f3c8d87dcf6e8249421b362b38ec3710a3d4f9 +SIZE (leiningen-2.11.1-standalone.jar) = 16481190 diff --git a/devel/leiningen/files/patch-bin_lein-pkg b/devel/leiningen/files/patch-bin_lein-pkg new file mode 100644 index 000000000000..7a005ebaab45 --- /dev/null +++ b/devel/leiningen/files/patch-bin_lein-pkg @@ -0,0 +1,136 @@ +--- bin/lein-pkg.orig 2024-01-31 19:01:13 UTC ++++ bin/lein-pkg +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # This variant of the lein script is meant for downstream packagers. + # It has all the cross-platform stuff stripped out as well as the +@@ -6,39 +6,39 @@ export LEIN_VERSION="2.11.1" + + export LEIN_VERSION="2.11.1" + +-if [[ "$CLASSPATH" != "" ]]; then ++if [ "$CLASSPATH" != "" ]; then + cat <<-'EOS' 1>&2 + WARNING: You have $CLASSPATH set, probably by accident. + It is strongly recommended to unset this before proceeding. + EOS + fi + +-if [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]]; then ++if [ "$OSTYPE" == "cygwin" ] || [ "$OSTYPE" == "msys" ]; then + delimiter=";" + else + delimiter=":" + fi + +-if [[ "$OSTYPE" == "cygwin" ]]; then ++if [ "$OSTYPE" == "cygwin" ]; then + cygwin=true + else + cygwin=false + fi + +-function msg { ++msg() { + echo "$@" 1>&2 + } + +-function command_not_found { ++command_not_found() { + msg "Leiningen couldn't find $1 in your \$PATH ($PATH), which is required." + exit 1 + } + +-function make_native_path { ++make_native_path() { + # ensure we have native paths +- if $cygwin && [[ "$1" == /* ]]; then ++ if $cygwin && [ "$1" == /* ]; then + echo -n "$(cygpath -wp "$1")" +- elif [[ "$OSTYPE" == "msys" && "$1" == /?/* ]]; then ++ elif [ "$OSTYPE" == "msys" ] && [ "$1" == /?/* ]; then + echo -n "$(sh -c "(cd $1 2/dev/null 2>&1; then ++ if type sha256sum >/dev/null 2>&1; then + export SHASUM_CMD="sha256sum" +- elif type -p shasum >/dev/null 2>&1; then ++ elif type shasum >/dev/null 2>&1; then + export SHASUM_CMD="shasum --algorithm 256" +- elif type -p sha256 >/dev/null 2>&1; then ++ elif type sha256 >/dev/null 2>&1; then + export SHASUM_CMD="sha256 -q" + else + command_not_found sha256sum +@@ -221,7 +221,7 @@ run_from_checkout "$1" + + run_from_checkout "$1" + +-if [ ! -x "$JAVA_CMD" ] && ! type -f java >/dev/null ++if [ ! -x "$JAVA_CMD" ] && ! type java >/dev/null + then + msg "Leiningen couldn't find 'java' executable, which is required." + msg "Please either set JAVA_CMD or put java (>=1.6) in your \$PATH ($PATH)." +@@ -230,7 +230,7 @@ export LEIN_JAVA_CMD="${LEIN_JAVA_CMD:-${JAVA_CMD:-jav + + export LEIN_JAVA_CMD="${LEIN_JAVA_CMD:-${JAVA_CMD:-java}}" + +-if [[ -z "${DRIP_INIT+x}" && "$(basename "$LEIN_JAVA_CMD")" == *drip* ]]; then ++if [ -z "${DRIP_INIT+x}" ] && [ "$(basename "$LEIN_JAVA_CMD")" == *drip* ]; then + export DRIP_INIT="$(printf -- '-e\n(require (quote leiningen.repl))')" + export DRIP_INIT_CLASS="clojure.main" + fi