aboutsummaryrefslogtreecommitdiff
path: root/cad/astk-serveur
diff options
context:
space:
mode:
authorThierry Thomas <thierry@FreeBSD.org>2014-03-18 21:09:03 +0000
committerThierry Thomas <thierry@FreeBSD.org>2014-03-18 21:09:03 +0000
commit55e6556d123a5c0c057d2c0a9b645123225b50a6 (patch)
treebee32239c442ebaba930b9099409230b15af97f7 /cad/astk-serveur
parent05ca91af7888bf367bebfb82ca89564b7df77038 (diff)
downloadports-55e6556d123a5c0c057d2c0a9b645123225b50a6.tar.gz
ports-55e6556d123a5c0c057d2c0a9b645123225b50a6.zip
Notes
Diffstat (limited to 'cad/astk-serveur')
-rw-r--r--cad/astk-serveur/Makefile50
-rw-r--r--cad/astk-serveur/files.client/pkg-message.in14
-rw-r--r--cad/astk-serveur/files/patch-etc_asrun27
-rw-r--r--cad/astk-serveur/files/pkg-message.in4
-rw-r--r--cad/astk-serveur/pkg-plist12
5 files changed, 42 insertions, 65 deletions
diff --git a/cad/astk-serveur/Makefile b/cad/astk-serveur/Makefile
index cee15de429d4..d951cb460177 100644
--- a/cad/astk-serveur/Makefile
+++ b/cad/astk-serveur/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= astk
-PORTVERSION= 1.11.0
+DISTVERSION= 1.13.3-2
CATEGORIES= cad
.if !defined(CLIENT_SEUL)
PKGNAMESUFFIX= -serveur
@@ -13,8 +13,9 @@ PKGNAMESUFFIX= -client
MAINTAINER= ports@FreeBSD.org
COMMENT?= Graphical interface for Code_Aster (server side)
+LICENSE= GPLv2
+
#-----------------------------------------------------------------------
-NO_STAGE= yes
# You may define these options:
#
# - WITH_ZSH or WITH_BASH or WITH_KSH: select a shell among
@@ -29,11 +30,9 @@ NO_STAGE= yes
RUN_DEPENDS+= ${SHELL_INSTALL_ASTER}:${PORTSDIR}/shells/${SHIADEP}
-LICENSE= GPLv2
-
.if !defined(CLIENT_SEUL)
USE_PYTHON= yes
-USES+= tk:build
+USES+= tk:build gettext
.else
USES+= tk
.endif
@@ -42,6 +41,8 @@ REINPLACE_ARGS= -i ""
EXTRACT_WRKSRC= ${WRKDIR}/aster-${DISTVERSIONPREFIX}${ASTER_DISTVERSION:S/-/./:R}/SRC
+SUB_FILES= pkg-message
+SUB_LIST= inst_dir=${inst_dir} tools_dir=${tools_dir}
PKGMESSAGE= ${WRKDIR}/pkg-message
LINSTDIR= aster/ASTK
inst_dir= ${PREFIX}/${LINSTDIR}
@@ -59,7 +60,7 @@ conf_dir= ${WRKSRC}/etc/astkrc
.include <bsd.port.pre.mk>
.if !defined(CLIENT_SEUL)
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/ASTK_SERV
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}/ASTK_SERV
PATCHDIR= ${MASTERDIR}/files
PLIST_SUB= ASTKDIR=${LINSTDIR}/ASTK_SERV SERV="" CLIENT="@comment " \
vaster=${vaster}
@@ -87,7 +88,7 @@ RUN_DEPENDS+= xterm:${PORTSDIR}/x11/xterm \
${LOCALBASE}/lib/${TKPNG}/pkgIndex.tcl:${PORTSDIR}/graphics/tkpng
TKPNG_VER= 0.9
TKPNG= tkpng${TKPNG_VER}
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/ASTK_CLIENT
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}/ASTK_CLIENT
PATCHDIR= ${MASTERDIR}/files.client
PLIST_SUB= ASTKDIR=${LINSTDIR}/ASTK_CLIENT SERV="@comment " CLIENT="" vaster="" \
BWidget_DIR=${LINSTDIR}/ASTK_CLIENT/lib/BWidget-${BWidget_VER}
@@ -140,7 +141,7 @@ WITH_ED= gedit
RUN_DEPENDS+= ${LOCALBASE}/bin/gedit:${PORTSDIR}/editors/gedit
. elif exists(${LOCALBASE}/bin/kwrite)
WITH_ED= kwrite
-RUN_DEPENDS+= ${LOCALBASE}/bin/kwrite:${PORTSDIR}/x11/kdebase3
+RUN_DEPENDS+= ${LOCALBASE}/bin/kwrite:${PORTSDIR}/editors/kate
. elif exists(${LOCALBASE}/bin/xedit)
WITH_ED= xedit
RUN_DEPENDS+= ${LOCALBASE}/bin/xedit:${PORTSDIR}/x11/xedit
@@ -265,31 +266,22 @@ do-configure:
.endif
do-install:
- ${MKDIR} ${inst_dir}
- ${CP} -R ${WRKSRC} ${inst_dir}
+ ${MKDIR} ${STAGEDIR}${inst_dir}
+ ${CP} -R ${WRKSRC} ${STAGEDIR}${inst_dir}
.if !defined(CLIENT_SEUL)
- ${MKDIR} ${ETCDIR}
- ${CP} -R ${WRKSRC}/etc/* ${ETCDIR}
- ${RM} -rf ${inst_dir}/ASTK_SERV/etc
-. for rep in asrun share/codeaster/asrun/examples unittest
- @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${inst_dir}/ASTK_SERV/${rep}
- @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${inst_dir}/ASTK_SERV/${rep}
-. endfor
- @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${ETCDIR}/plugins
- @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${ETCDIR}/plugins
+ ${MKDIR} ${STAGEDIR}${ETCDIR}
+ ${CP} -R ${WRKSRC}/etc/* ${STAGEDIR}${ETCDIR}
+ ${RM} -rf ${STAGEDIR}${inst_dir}/ASTK_SERV/etc
+ (cd ${STAGEDIR}${PREFIX} \
+ && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
+ -d ${PREFIX} -f aster)
+ (cd ${STAGEDIR}${PREFIX} \
+ && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
+ -d ${PREFIX} -f aster)
. if defined(WITH_MPI)
- ${ECHO_CMD} "localhost" > ${PREFIX}/aster/aster-mpihosts
+ ${ECHO_CMD} "localhost" > ${STAGEDIR}${PREFIX}/aster/aster-mpihosts
. endif
.endif
-post-install:
- @${ECHO_MSG}
- @${SED} -e "s|%%ETCDIR%%|${ETCDIR}|" \
- -e "s|%%inst_dir%%|${inst_dir}|" \
- -e "s|%%tools_dir%%|${tools_dir}|" \
- ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
- @${CAT} ${PKGMESSAGE}
- @${ECHO_MSG}
-
.include "${.CURDIR}/../../french/aster/bsd.aster.mk"
.include <bsd.port.post.mk>
diff --git a/cad/astk-serveur/files.client/pkg-message.in b/cad/astk-serveur/files.client/pkg-message.in
index 358f0a81182a..ab3d138e90c1 100644
--- a/cad/astk-serveur/files.client/pkg-message.in
+++ b/cad/astk-serveur/files.client/pkg-message.in
@@ -1,18 +1,18 @@
-Des fichiers de configuration standards ont été préparés dans le répertoire
+Des fichiers de configuration standards ont été préparés dans le répertoire
%%inst_dir%%/ASTK_CLIENT/etc/astkrc/.
-Veuillez les vérifier, et n'oubliez pas d'installer la partie serveur
-sur la machine où Code_Aster a été installé.
+Veuillez les vérifier, et n'oubliez pas d'installer la partie serveur
+sur la machine où Code_Aster a été installé.
-Pour lancer ASTK, entrez :
+Pour lancer ASTK, entrez :
%%tools_dir%%/astk
-une fois Code_Aster installé sur cette machine, sinon :
+une fois Code_Aster installé sur cette machine, sinon :
%%inst_dir%%/ASTK_CLIENT/bin/astk
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
+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
+ASTK lance xterm avec -display : il ne faut donc pas lancer Xorg avec
-nolisten tcp
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
diff --git a/cad/astk-serveur/files/patch-etc_asrun b/cad/astk-serveur/files/patch-etc_asrun
index 4da8462ea5f1..dc56e101bcfc 100644
--- a/cad/astk-serveur/files/patch-etc_asrun
+++ b/cad/astk-serveur/files/patch-etc_asrun
@@ -1,5 +1,5 @@
---- etc/asrun.orig 2011-12-20 13:33:00.000000000 +0100
-+++ etc/asrun 2012-01-02 22:07:53.000000000 +0100
+--- etc/asrun.orig 2014-03-05 09:28:59.000000000 +0100
++++ etc/asrun 2014-03-17 15:46:25.000000000 +0100
@@ -110,6 +110,10 @@
# shared folders = for which remote copy is never necessary (comma separated)
shared_folders :
@@ -11,26 +11,7 @@
# choose True to create symbolic links instead of copying executable and catalogs
symlink : True
-@@ -176,12 +180,12 @@
- # batch_kil : to delete jobs
-
- # --- batch configuration (see examples below)
--batch_nom : SunGE
--batch_ini : /opt/SunGE6.0/default/common/settings.sh
--batch_sub : /opt/SunGE6.0/bin/lx24-x86/qsub
--batch_jid : JOB_ID
--batch_job : /opt/SunGE6.0/bin/lx24-x86/qstat
--batch_kil : /opt/SunGE6.0/bin/lx24-x86/qdel
-+#batch_nom : SunGE
-+#batch_ini : /opt/SunGE6.0/default/common/settings.sh
-+#batch_sub : /opt/SunGE6.0/bin/lx24-x86/qsub
-+#batch_jid : JOB_ID
-+#batch_job : /opt/SunGE6.0/bin/lx24-x86/qstat
-+#batch_kil : /opt/SunGE6.0/bin/lx24-x86/qdel
-
- # --- Sun Grid Engine example
- #batch_nom : SunGE
-@@ -200,28 +204,28 @@
+@@ -195,28 +199,28 @@
#batch_kil : /usr/share/lsf/6.2/linux2.6-glibc2.3-ia64/bin/bkill
# --- PBS example
@@ -67,7 +48,7 @@
# shell command to get processor id
# LAM/MPI : echo $LAMRANK
-@@ -250,8 +254,11 @@
+@@ -245,8 +249,11 @@
# ps commands : uncomment lines corresponding to your platform
#ps_cpu : /bin/ps -e --width=512 -ocputime -ocommand
#ps_pid : /bin/ps -e --width=512 -opid -ocommand
diff --git a/cad/astk-serveur/files/pkg-message.in b/cad/astk-serveur/files/pkg-message.in
index 347923a024b6..e2be2f50f80c 100644
--- a/cad/astk-serveur/files/pkg-message.in
+++ b/cad/astk-serveur/files/pkg-message.in
@@ -1,6 +1,6 @@
-Des fichiers de configuration standards ont été préparés :
+Des fichiers de configuration standards ont été préparés :
%%ETCDIR%%/
-Veuillez les vérifier, et n'oubliez pas d'installer la partie cliente sur vos
+Veuillez les vérifier, et n'oubliez pas d'installer la partie cliente sur vos
stations.
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
diff --git a/cad/astk-serveur/pkg-plist b/cad/astk-serveur/pkg-plist
index 5b5cb51fb813..209a63887acf 100644
--- a/cad/astk-serveur/pkg-plist
+++ b/cad/astk-serveur/pkg-plist
@@ -439,6 +439,7 @@
%%SERV%%%%ASTKDIR%%/i18n/locale/fr/LC_MESSAGES/asrun.mo
%%SERV%%%%ASTKDIR%%/i18n/messages.pot
%%SERV%%%%ASTKDIR%%/share/codeaster/GPL.txt
+%%SERV%%%%ASTKDIR%%/share/codeaster/asrun/data/as_rex_prof
%%SERV%%%%ASTKDIR%%/share/codeaster/asrun/data/convbase.comm
%%SERV%%%%ASTKDIR%%/share/codeaster/asrun/data/meshtool.comm
%%SERV%%%%ASTKDIR%%/share/codeaster/asrun/data/mpirun_template
@@ -476,9 +477,6 @@
%%SERV%%%%ASTKDIR%%/unittest/065_system.py
%%SERV%%%%ASTKDIR%%/unittest/065_system.pyc
%%SERV%%%%ASTKDIR%%/unittest/065_system.pyo
-%%SERV%%%%ASTKDIR%%/unittest/080_agla.py
-%%SERV%%%%ASTKDIR%%/unittest/080_agla.pyc
-%%SERV%%%%ASTKDIR%%/unittest/080_agla.pyo
%%SERV%%%%ASTKDIR%%/unittest/090_devel.py
%%SERV%%%%ASTKDIR%%/unittest/090_devel.pyc
%%SERV%%%%ASTKDIR%%/unittest/090_devel.pyo
@@ -551,6 +549,12 @@
%%SERV%%%%ETCDIR%%/plugins/__init__.py
%%SERV%%%%ETCDIR%%/plugins/__init__.pyc
%%SERV%%%%ETCDIR%%/plugins/__init__.pyo
+%%SERV%%%%ETCDIR%%/plugins/aster4_calcul.py
+%%SERV%%%%ETCDIR%%/plugins/aster4_calcul.pyc
+%%SERV%%%%ETCDIR%%/plugins/aster4_calcul.pyo
+%%SERV%%%%ETCDIR%%/plugins/ivanoe.py
+%%SERV%%%%ETCDIR%%/plugins/ivanoe.pyc
+%%SERV%%%%ETCDIR%%/plugins/ivanoe.pyo
%%SERV%%%%ETCDIR%%/plugins/sge_pe.py
%%SERV%%%%ETCDIR%%/plugins/sge_pe.pyc
%%SERV%%%%ETCDIR%%/plugins/sge_pe.pyo
@@ -558,7 +562,7 @@
%%SERV%%%%ETCDIR%%/profile.sh
%%SERV%%@dirrm %%ETCDIR%%/plugins
%%SERV%%@dirrm %%ETCDIR%%
-@dirrmtry aster/etc
+%%SERV%%@dirrmtry aster/etc
%%CLIENT%%@dirrm %%BWidget_DIR%%/images
%%CLIENT%%@dirrm %%BWidget_DIR%%/lang
%%CLIENT%%@dirrm %%BWidget_DIR%%