sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-04-28 01:26:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

cad/astk-serveur: remove optional support for expired sysutils/torque (PBS)

Browse source
This commit is contained in:
Rene Ladan 2024-06-30 15:04:38 +02:00
parent 4a896066d4
commit 112b6c5a96
1 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cad/astk-serveur/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= astk PORTNAME= astk
DISTVERSION= 2020.0-1 DISTVERSION= 2020.0-1
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= cad CATEGORIES= cad
.if !defined(CLIENT_SEUL) .if !defined(CLIENT_SEUL)
PKGNAMESUFFIX= -serveur 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 # - WITH_ZSH or WITH_BASH or WITH_KSH: select a shell among
# zsh (default), bash or ksh; # zsh (default), bash or ksh;
# - WITH_ED: select an editor accepting '-display' (e.g. gvim, nedit); # - 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 \ PATCH2RM= bin/as_run bin/parallel_cp etc/asrun etc/profile.sh \
asrun/config.py asrun/installation.py asrun/system.py \ asrun/config.py asrun/installation.py asrun/system.py \
asrun/common/sysutils.py asrun/system_command.py asrun/common/sysutils.py asrun/system_command.py
. if exists(${LOCALBASE}/sbin/pbs_server)
WITH_PBS= yes
. endif
. if exists(${LOCALBASE}/bin/mpirun) . if exists(${LOCALBASE}/bin/mpirun)
WITH_MPI= yes WITH_MPI= yes
. endif . endif
@ -82,9 +78,6 @@ PLIST_SUB+= MPI=""
. else . else
PLIST_SUB+= MPI="@comment " PLIST_SUB+= MPI="@comment "
. endif . endif
. if defined(WITH_PBS)
RUN_DEPENDS+= qsub:sysutils/torque
. endif
.else .else
RUN_DEPENDS+= xterm:x11/xterm \ RUN_DEPENDS+= xterm:x11/xterm \
${LOCALBASE}/lib/${TKPNG}/pkgIndex.tcl:graphics/tkpng ${LOCALBASE}/lib/${TKPNG}/pkgIndex.tcl:graphics/tkpng
@ -220,13 +213,8 @@ do-configure:
-e "s|/usr/bin/xterm|${LOCALBASE}/bin/xterm|" \ -e "s|/usr/bin/xterm|${LOCALBASE}/bin/xterm|" \
-e "s|/opt/aster|${aster_dir}|" ${WRKSRC}/${libs} -e "s|/opt/aster|${aster_dir}|" ${WRKSRC}/${libs}
. endfor . 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|" \ ${REINPLACE_CMD} -e "s|batch : oui|batch : non|" \
${WRKSRC}/unittest/datafiles/config_serveurs ${WRKSRC}/unittest/datafiles/config_serveurs
. endif
. if defined(MAKE_JOBS_NUMBER) && ! defined(PACKAGE_BUILDING) . if defined(MAKE_JOBS_NUMBER) && ! defined(PACKAGE_BUILDING)
${REINPLACE_CMD} \ ${REINPLACE_CMD} \
-e "s|%%MAKE_JOBS_NUMBER%%|self.Shell('${ECHO_CMD} ${MAKE_JOBS_NUMBER}', mach, user)|" \ -e "s|%%MAKE_JOBS_NUMBER%%|self.Shell('${ECHO_CMD} ${MAKE_JOBS_NUMBER}', mach, user)|" \