From 112b6c5a9601ec0bb7781c04aaefa60e05ef300f Mon Sep 17 00:00:00 2001
From: Rene Ladan <rene@FreeBSD.org>
Date: Sun, 30 Jun 2024 15:04:38 +0200
Subject: [PATCH] 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)|" \