From fac07d45a2a69f5c06f2d22047943f713ead606e Mon Sep 17 00:00:00 2001 From: thierry Date: Sat, 30 Jun 2007 22:47:28 +0000 Subject: - Upgrade to 1.5.2-1; - PBS can be provided by Torque; - One more tip to configure astk-client. --- cad/astk-serveur/Makefile | 20 +++++++++++--------- cad/astk-serveur/distinfo | 6 +++--- cad/astk-serveur/files.client/pkg-message.in | 6 ++++++ cad/astk-serveur/pkg-plist | 15 +++++++++++++++ 4 files changed, 35 insertions(+), 12 deletions(-) (limited to 'cad/astk-serveur') diff --git a/cad/astk-serveur/Makefile b/cad/astk-serveur/Makefile index b320e01ea6b1..43e019b7c82c 100644 --- a/cad/astk-serveur/Makefile +++ b/cad/astk-serveur/Makefile @@ -6,8 +6,8 @@ # PORTNAME= astk -DISTVERSION= 1.5.0-1 -PORTREVISION= 2 +DISTVERSION= 1.5.2-1 +DISTVERSIONSUFFIX= .noarch CATEGORIES= cad MASTER_SITES= http://www.code-aster.org/FICHIERS/ .if !defined(CLIENT_SEUL) @@ -15,7 +15,6 @@ PKGNAMESUFFIX= -serveur .else PKGNAMESUFFIX= -client .endif -DISTNAME= ${PORTNAME}-${DISTVERSION}.noarch MAINTAINER= ports@FreeBSD.org COMMENT?= Graphical interface for Code_Aster (server side) @@ -33,9 +32,6 @@ COMMENT?= Graphical interface for Code_Aster (server side) # There exists a "logical" RUN_DEPENDS towards french/aster and french/eficas # for the server part, but it is not set to avoid circular dependences. RUN_DEPENDS+= ${SHELL_INSTALL_ASTER}:${PORTSDIR}/shells/${SHIADEP} -.if defined(WITH_PBS) && !defined(CLIENT_SEUL) -RUN_DEPENDS+= ${LOCALBASE}bin/pbs_tclsh:${PORTSDIR}/misc/pbs -.endif USE_PYTHON= yes NO_BUILD= yes @@ -60,6 +56,12 @@ PLIST_SUB= ASTKDIR=${LINSTDIR}/ASTK_SERV SERV="" CLIENT="@comment " \ vaster=${vaster} PATCH2RM= conf/config bin/as_exec bin/as_serv lib/as_config.py \ lib/as_exec.py conf/aster_profile.sh lib/as_system.py +. if exists(${LOCALBASE}/sbin/pbs_server) +WITH_PBS= yes +. endif +. if defined(WITH_PBS) +RUN_DEPENDS+= qsub:${PORTSDIR}/sysutils/torque +. endif .else RUN_DEPENDS+= xterm:${PORTSDIR}/x11/xterm \ wish${TK_VER}:${PORTSDIR}/x11-toolkits/tk${SHORT_TK_VER} @@ -78,7 +80,7 @@ TCL_VER?= ${TK_VER} SHORT_TK_VER= ${TK_VER:S/.//} BWidget_VER= 1.7.0 -ASTER_VER= 9.0.0 +ASTER_VER= 9.1.0 vaster= STA${ASTER_VER:R} GIBI= gibi2003 @@ -179,7 +181,7 @@ do-configure: # CLIENT_SEUL . for scripts in ${C_SCRIPTS} @${REINPLACE_CMD} -e "s#?SHELL_EXECUTION?#${SHELL_INSTALL_ASTER}#" \ - -e "s#?HOME_ASTK?#${inst_dir}#" \ + -e "s#?HOME_ASTK?#${inst_dir}#;s#?ASTER_ROOT?#${PREFIX}/aster#" \ -e "s#?WISH_EXE?#wish${TK_VER}#" ${WRKSRC}/${scripts} . endfor @${REINPLACE_CMD} -e "s#GIBI#${GIBI}#" \ @@ -189,6 +191,7 @@ do-configure: -e "s#?XTERM?#${X11BASE}/bin/xterm#" \ -e "s#?FULL_SERVER_NAME?#${SERVER_NAME}#" \ -e "s#?SERVER_NAME?#${HOST_NAME}#" \ + -e "s#?ASTER_ROOT?#${PREFIX}/aster#" \ -e "s#?EDITOR?#${WITH_ED}#" ${conf_dir}/config_serveurs @${REINPLACE_CMD} -e "s#?XTERM?#${X11BASE}/bin/xterm#" \ -e "s#?ASTER_VERSION?#${ASTER_VER}#" \ @@ -199,7 +202,6 @@ do-configure: ${WRKSRC}/share/tkselecteur.tcl @${REINPLACE_CMD} -e "s#%%unamesm%%#${unamesm}#" \ ${WRKSRC}/lib/ASTK/init.tcl - @${REINPLACE_CMD} -e 's|?ASTER_ROOT?|${PREFIX}/aster|' ${WRKSRC}/bin/astk .endif do-install: diff --git a/cad/astk-serveur/distinfo b/cad/astk-serveur/distinfo index 068be767f58b..bb1fc33bf401 100644 --- a/cad/astk-serveur/distinfo +++ b/cad/astk-serveur/distinfo @@ -1,3 +1,3 @@ -MD5 (astk-1.5.0-1.noarch.tar.gz) = ee37f0b8f155b906d39e59def130069e -SHA256 (astk-1.5.0-1.noarch.tar.gz) = c865280387f4e7e5526f0bef726f88a83080165d189cd0e7da2d4950b9eb49a5 -SIZE (astk-1.5.0-1.noarch.tar.gz) = 404963 +MD5 (astk-1.5.2-1.noarch.tar.gz) = b50df13ecb74dbf60abc21cba7b8544c +SHA256 (astk-1.5.2-1.noarch.tar.gz) = a7023684ec5bbbbf5a1355897f758c45755843c391598b4f449a0f93fc97bbed +SIZE (astk-1.5.2-1.noarch.tar.gz) = 421318 diff --git a/cad/astk-serveur/files.client/pkg-message.in b/cad/astk-serveur/files.client/pkg-message.in index ee9e50b3a203..a405a86ea706 100644 --- a/cad/astk-serveur/files.client/pkg-message.in +++ b/cad/astk-serveur/files.client/pkg-message.in @@ -12,6 +12,9 @@ ASTK utilise le protocole rcp/rsh, il faut donc l'activer (/etc/inetd.conf et ~/.rhosts) ; le paramètre --check passé à astk permet de vérifier votre configuration. +ASTK lance xterm avec -display : il ne faut donc pas lancer Xorg avec +-nolisten tcp + =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- Standard configuration files have been initialized in the directory @@ -27,3 +30,6 @@ once Code_Aster has been installed on this machine, else: ASTK uses the rcp/rsh protocol: it must be configured (check /etc/inetd.conf and ~/.rhosts); if you launch astk with the parameter --check, it will check your configuration. + +ASTK launch xterm with -display: check that Xorg is not launched with +-nolisten tcp diff --git a/cad/astk-serveur/pkg-plist b/cad/astk-serveur/pkg-plist index 8b58004f8d78..456b8fa903a0 100644 --- a/cad/astk-serveur/pkg-plist +++ b/cad/astk-serveur/pkg-plist @@ -196,12 +196,18 @@ %%SERV%%%%ASTKDIR%%/lib/as_config.py %%SERV%%%%ASTKDIR%%/lib/as_config.pyc %%SERV%%%%ASTKDIR%%/lib/as_config.pyo +%%SERV%%%%ASTKDIR%%/lib/as_etude.py +%%SERV%%%%ASTKDIR%%/lib/as_etude.pyc +%%SERV%%%%ASTKDIR%%/lib/as_etude.pyo %%SERV%%%%ASTKDIR%%/lib/as_exec.py %%SERV%%%%ASTKDIR%%/lib/as_exec.pyc %%SERV%%%%ASTKDIR%%/lib/as_exec.pyo %%SERV%%%%ASTKDIR%%/lib/as_job.py %%SERV%%%%ASTKDIR%%/lib/as_job.pyc %%SERV%%%%ASTKDIR%%/lib/as_job.pyo +%%SERV%%%%ASTKDIR%%/lib/as_list.py +%%SERV%%%%ASTKDIR%%/lib/as_list.pyc +%%SERV%%%%ASTKDIR%%/lib/as_list.pyo %%SERV%%%%ASTKDIR%%/lib/as_maintenance.py %%SERV%%%%ASTKDIR%%/lib/as_maintenance.pyc %%SERV%%%%ASTKDIR%%/lib/as_maintenance.pyo @@ -223,6 +229,9 @@ %%SERV%%%%ASTKDIR%%/lib/as_timer.py %%SERV%%%%ASTKDIR%%/lib/as_timer.pyc %%SERV%%%%ASTKDIR%%/lib/as_timer.pyo +%%SERV%%%%ASTKDIR%%/lib/as_utils.py +%%SERV%%%%ASTKDIR%%/lib/as_utils.pyc +%%SERV%%%%ASTKDIR%%/lib/as_utils.pyo %%SERV%%%%ASTKDIR%%/lib/astk_maintenance.py %%SERV%%%%ASTKDIR%%/lib/astk_maintenance.pyc %%SERV%%%%ASTKDIR%%/lib/astk_maintenance.pyo @@ -237,12 +246,18 @@ %%SERV%%%%ASTKDIR%%/lib/mystring.py %%SERV%%%%ASTKDIR%%/lib/mystring.pyc %%SERV%%%%ASTKDIR%%/lib/mystring.pyo +%%SERV%%%%ASTKDIR%%/lib/progress.py +%%SERV%%%%ASTKDIR%%/lib/progress.pyc +%%SERV%%%%ASTKDIR%%/lib/progress.pyo %%SERV%%%%ASTKDIR%%/lib/schema.py %%SERV%%%%ASTKDIR%%/lib/schema.pyc %%SERV%%%%ASTKDIR%%/lib/schema.pyo %%SERV%%%%ASTKDIR%%/lib/stanley_post.comm %%SERV%%%%ASTKDIR%%/lib/sub_script %%SERV%%%%ASTKDIR%%/lib/sum_tps.awk +%%SERV%%%%ASTKDIR%%/lib/user_filter.py +%%SERV%%%%ASTKDIR%%/lib/user_filter.pyc +%%SERV%%%%ASTKDIR%%/lib/user_filter.pyo %%SERV%%%%ASTKDIR%%/lib/utils.py %%SERV%%%%ASTKDIR%%/lib/utils.pyc %%SERV%%%%ASTKDIR%%/lib/utils.pyo -- cgit