From nobody Sun Jun 30 13:06:27 2024 X-Original-To: dev-commits-ports-main@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 4WBqDz5dzBz5PtTq; Sun, 30 Jun 2024 13:06:27 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WBqDz4qGnz3xrP; Sun, 30 Jun 2024 13:06:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719752787; 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=rBkKp2SxdCApiAeFdHlApAhi3Kx21nLpghigzTv2L8M=; b=kC6pKygXMQDRCl4QxBa6WcLGNnRKWES1oK8lqOn1SoQvglEmysIx6Bn5ek8UJwqhLLhzPT N1w5Uq3ZOoZPJnwjIvaUTgdWyCVB/HW+E/Lu7o2mFjbeAUcqWziXFzKPRxSilsGR9T0U8j uTNhFz0hyHHzcBq699W0kqQhDx1uRvVWhRWJt+l/RrQjA99Ppf9Vs/2PBTNqRwfmA7f7Ul XKcvIVKo5dRk8PeRQN7HHBMwfvG3C+iMwYg+/lC+8NGRuzOVyxoQv6vUQt3yD3OjYDmkYh buul44aj+GMwvX9Konk0OPqK2iLjJUJX2wqLeZeQob5NBH2Q6bZFl/jPCzWsGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719752787; a=rsa-sha256; cv=none; b=yBI+wQRpuNHL0g6BvVIaFqGm3JdYdyQXa0wxsst8naKIPBfj71ucrcnaPT/5GioEMdaKDP NqRH71LpQObdENfloFbXOt6zJRXYeT3ag6K6YprSxGniXTygqQ2S+1fJnm3qCW4pVRrj66 5ztTCBc+v4pzn0Qzcgso7TEZzi1FHuK5JadZ1PU2FhBI0/2fcyJ8/JxG2wSshFjWVP0i2C ssWK9ecA6EvLaNFeGDNMBwKj1Y/0LprSxdexvrqaBBKd3svQzq8vw7r/SH8cAr8Z2JwcE+ t9Caqc8v3wRbV76g4+vXiBASqWfA9mBmvy2ZnawW7klOgH+ZQWtR3PDUVFvQZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719752787; 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=rBkKp2SxdCApiAeFdHlApAhi3Kx21nLpghigzTv2L8M=; b=JD1lZntAQiYXIlz2b9IEkQKQF0eYhh4WLkuuhL5Lsa1DuRc4HnicYRDwpTBmgqvEPrnOWR tl4FhFkK1thqf/m+aVJaRNvGOXXmcPfwVr9kgB9S/JUAIUK/L64Tk/lVJgfHGLVe8mwrf6 TQ28IaAqflKFkmEky89vUJjR49yQ5KAf23FgU8v+Kxgv0EaJ6Lh0yCpkXEfxTA8j1k+v27 1fkBbDluTN+NN5jWiwiPLxm/gLKCB5jGM1ghqfp3xkBJcSaMV5MPhKmxzNtS0caM5hn3hk rHMZd6omLCs6PXwI7WIjDKVdG3kH3DkR6u7lUvY7oHqAPtn2nZab5xJ8BabI5w== 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 4WBqDz4JKFzMSb; Sun, 30 Jun 2024 13:06:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 45UD6RhL027528; Sun, 30 Jun 2024 13:06:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 45UD6R9m027525; Sun, 30 Jun 2024 13:06:27 GMT (envelope-from git) Date: Sun, 30 Jun 2024 13:06:27 GMT Message-Id: <202406301306.45UD6R9m027525@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: 112b6c5a9601 - main - cad/astk-serveur: remove optional support for expired sysutils/torque (PBS) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 112b6c5a9601ec0bb7781c04aaefa60e05ef300f Auto-Submitted: auto-generated The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=112b6c5a9601ec0bb7781c04aaefa60e05ef300f commit 112b6c5a9601ec0bb7781c04aaefa60e05ef300f Author: Rene Ladan AuthorDate: 2024-06-30 13:04:38 +0000 Commit: Rene Ladan CommitDate: 2024-06-30 13:06:18 +0000 cad/astk-serveur: remove optional support for expired sysutils/torque (PBS) --- cad/astk-serveur/Makefile | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/cad/astk-serveur/Makefile b/cad/astk-serveur/Makefile index 764089e04c21..8a61707efcad 100644 --- a/cad/astk-serveur/Makefile +++ b/cad/astk-serveur/Makefile @@ -1,6 +1,6 @@ PORTNAME= astk DISTVERSION= 2020.0-1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= cad .if !defined(CLIENT_SEUL) PKGNAMESUFFIX= -serveur @@ -23,7 +23,6 @@ NOT_FOR_ARCHS_REASON= ARG_MAX is too small for Code_Aster on 32 bits systems # - WITH_ZSH or WITH_BASH or WITH_KSH: select a shell among # zsh (default), bash or ksh; # - WITH_ED: select an editor accepting '-display' (e.g. gvim, nedit); -# - WITH_PBS: PBS (batch scheduler) support is experimental. # #----------------------------------------------------------------------- @@ -69,9 +68,6 @@ PLIST_SUB+= ASTKDIR=${LINSTDIR}/ASTK_SERV SERV="" CLIENT="@comment "\ PATCH2RM= bin/as_run bin/parallel_cp etc/asrun etc/profile.sh \ asrun/config.py asrun/installation.py asrun/system.py \ asrun/common/sysutils.py asrun/system_command.py -. if exists(${LOCALBASE}/sbin/pbs_server) -WITH_PBS= yes -. endif . if exists(${LOCALBASE}/bin/mpirun) WITH_MPI= yes . endif @@ -82,9 +78,6 @@ PLIST_SUB+= MPI="" . else PLIST_SUB+= MPI="@comment " . endif -. if defined(WITH_PBS) -RUN_DEPENDS+= qsub:sysutils/torque -. endif .else RUN_DEPENDS+= xterm:x11/xterm \ ${LOCALBASE}/lib/${TKPNG}/pkgIndex.tcl:graphics/tkpng @@ -220,13 +213,8 @@ do-configure: -e "s|/usr/bin/xterm|${LOCALBASE}/bin/xterm|" \ -e "s|/opt/aster|${aster_dir}|" ${WRKSRC}/${libs} . endfor -. if defined(WITH_PBS) - ${REINPLACE_CMD} -e "s|batch : non|batch : oui|" \ - ${WRKSRC}/etc/asrun -. else ${REINPLACE_CMD} -e "s|batch : oui|batch : non|" \ ${WRKSRC}/unittest/datafiles/config_serveurs -. endif . if defined(MAKE_JOBS_NUMBER) && ! defined(PACKAGE_BUILDING) ${REINPLACE_CMD} \ -e "s|%%MAKE_JOBS_NUMBER%%|self.Shell('${ECHO_CMD} ${MAKE_JOBS_NUMBER}', mach, user)|" \