summaryrefslogtreecommitdiffstats
path: root/cad/astk-serveur
diff options
context:
space:
mode:
Diffstat (limited to 'cad/astk-serveur')
-rw-r--r--cad/astk-serveur/Makefile11
-rw-r--r--cad/astk-serveur/distinfo4
-rw-r--r--cad/astk-serveur/files.client/patch-lib::ASTK::astkrc::outils2
-rw-r--r--cad/astk-serveur/files/patch-conf::config21
-rw-r--r--cad/astk-serveur/files/patch-lib__as_exec.py11
-rw-r--r--cad/astk-serveur/files/patch-lib__as_system.py11
-rw-r--r--cad/astk-serveur/pkg-plist2
7 files changed, 49 insertions, 13 deletions
diff --git a/cad/astk-serveur/Makefile b/cad/astk-serveur/Makefile
index c6c397a..1756177 100644
--- a/cad/astk-serveur/Makefile
+++ b/cad/astk-serveur/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= astk
-PORTVERSION= 1.2.3
+PORTVERSION= 1.2.4
CATEGORIES= cad
MASTER_SITES= http://www.code-aster.org/FICHIERS/
.if !defined(CLIENT_SEUL)
@@ -14,7 +14,7 @@ PKGNAMESUFFIX= -serveur
.else
PKGNAMESUFFIX= -client
.endif
-DISTNAME= aster-full-src-${ASTER_VER}-6
+DISTNAME= aster-full-src-${ASTER_VER}-1
MAINTAINER= ports@FreeBSD.org
COMMENT?= Graphical interface for Code_Aster (server side)
@@ -50,7 +50,7 @@ S_SCRIPTS= bin/as_actu bin/as_del bin/as_edit bin/as_exec bin/as_info \
bin/as_serv bin/as_tail bin/tool_stanley lib/sub_script
S_PYLIBS= as_config.py as_system.py
C_SCRIPTS= bin/astk bin/bsf
-tools_dir= ${LOCALBASE}/aster/outils
+tools_dir= ${aster_dir}/outils
conf_dir= ${WRKSRC}/lib/ASTK/astkrc
.include <bsd.port.pre.mk>
@@ -77,7 +77,7 @@ TCL_VER?= ${TK_VER}
SHORT_TK_VER= ${TK_VER:S/.//}
BWidget_VER= 1.7.0
-ASTER_VER= 7.4.0
+ASTER_VER= 8.1.0
vaster= STA${ASTER_VER:S/.0//}
GIBI= gibi2000
@@ -149,7 +149,8 @@ post-extract:
post-patch:
.if !defined(CLIENT_SEUL)
@${RM} ${WRKSRC}/conf/config.orig ${WRKSRC}/bin/as_exec.orig \
- ${WRKSRC}/bin/as_serv.orig ${WRKSRC}/lib/as_config.py.orig
+ ${WRKSRC}/bin/as_serv.orig ${WRKSRC}/lib/as_config.py.orig \
+ ${WRKSRC}/lib/as_exec.py.orig ${WRKSRC}/lib/as_system.py.orig
.else
@${RM} ${WRKSRC}/lib/ASTK/init.tcl.orig ${WRKSRC}/lib/ASTK/astkrc/outils.orig \
${WRKSRC}/share/tkselecteur.tcl.orig
diff --git a/cad/astk-serveur/distinfo b/cad/astk-serveur/distinfo
index d67558c..40f5112 100644
--- a/cad/astk-serveur/distinfo
+++ b/cad/astk-serveur/distinfo
@@ -1,2 +1,2 @@
-MD5 (aster-full-src-7.4.0-6.tar.gz) = 7ac835a222b7044feee1054e786749df
-SIZE (aster-full-src-7.4.0-6.tar.gz) = 99082661
+MD5 (aster-full-src-8.1.0-1.tar.gz) = 5a4d773cc374c7d1d553c650732f1bb5
+SIZE (aster-full-src-8.1.0-1.tar.gz) = 94334932
diff --git a/cad/astk-serveur/files.client/patch-lib::ASTK::astkrc::outils b/cad/astk-serveur/files.client/patch-lib::ASTK::astkrc::outils
index 4f4955b..afe966e 100644
--- a/cad/astk-serveur/files.client/patch-lib::ASTK::astkrc::outils
+++ b/cad/astk-serveur/files.client/patch-lib::ASTK::astkrc::outils
@@ -15,7 +15,7 @@
dist : on
+#
+nom : Stanley
-+cmde : ?TOOLS_DIR?/../?vaster?/bibpyt/Stanley/stanley.py
++cmde : ?TOOLS_DIR?/../../?vaster?/bibpyt/Stanley/stanley.py
+ext : _VIDE
+dist : off
#
diff --git a/cad/astk-serveur/files/patch-conf::config b/cad/astk-serveur/files/patch-conf::config
index 3fcd224..c58a4b3 100644
--- a/cad/astk-serveur/files/patch-conf::config
+++ b/cad/astk-serveur/files/patch-conf::config
@@ -1,6 +1,17 @@
--- conf/config.orig Fri Jan 7 09:10:16 2005
-+++ conf/config Sun Jan 9 22:15:57 2005
-@@ -68,6 +68,7 @@
++++ conf/config Sat Jul 2 20:44:10 2005
+@@ -49,6 +49,10 @@
+ # temporary directory for Aster executions
+ rep_trav : /tmp
+
++# directories for tests
++rep_test : /tmp
++resu_test : /tmp
++
+ # choose True to create symbolic links instead of copying executable and catalogs
+ symlink : True
+
+@@ -68,6 +72,7 @@
# for each version a config.VVV file must be created.
# DO NOT EDIT FOLLOWING LINE !
#?vers : VVV?
@@ -8,7 +19,7 @@
#-------------------------------------------------------------------------------
# ----- batch/interactive configuration
-@@ -106,12 +107,12 @@
+@@ -106,12 +111,12 @@
# batch_job : to display information about jobs
# batch_kil : to delete jobs
# --- Sun Grid Engine example
@@ -27,7 +38,7 @@
# --- LSF example
#batch_nom : LSF
-@@ -122,18 +123,21 @@
+@@ -122,18 +127,21 @@
#batch_kil : /usr/opt/lsf/4.2/alpha5/bin/bkill
# --- PBS example
@@ -54,7 +65,7 @@
# TRU64 :
#?TRU64?ps_cpu : /bin/ps -e -ocputime -ocommand
#?TRU64?ps_pid : /bin/ps -e -opid -ocommand
-@@ -157,6 +161,7 @@
+@@ -157,6 +165,7 @@
# GDB :
#?P_LINUX?cmd_post : gdb -batch --command=@D @E @C
#?P_LINUX?cmd_dbg : ddd --debugger gdb --command=@D @E @C
diff --git a/cad/astk-serveur/files/patch-lib__as_exec.py b/cad/astk-serveur/files/patch-lib__as_exec.py
new file mode 100644
index 0000000..4abe073
--- /dev/null
+++ b/cad/astk-serveur/files/patch-lib__as_exec.py
@@ -0,0 +1,11 @@
+--- ./lib/as_exec.py.orig Tue Jun 28 12:56:13 2005
++++ ./lib/as_exec.py Sat Jul 2 22:34:46 2005
+@@ -397,7 +397,7 @@
+ --- Results :
+ """)
+ info_start=( nbtest, time.strftime('%c'),
+- os.path.join(REPREF,conf['SRCTEST'][0]), ', '.join(reptest), resutest,
++ os.path.join(REPREF,conf['SRCTEST'][0]), reptest, resutest,
+ prof['version'][0], exetmp, cmdetmp, eletmp,
+ nbmaxnook, cpresok, facmtps )
+ print summary % info_start
diff --git a/cad/astk-serveur/files/patch-lib__as_system.py b/cad/astk-serveur/files/patch-lib__as_system.py
new file mode 100644
index 0000000..2437cbb
--- /dev/null
+++ b/cad/astk-serveur/files/patch-lib__as_system.py
@@ -0,0 +1,11 @@
+--- ./lib/as_system.py.orig Tue Jun 28 12:56:13 2005
++++ ./lib/as_system.py Sun Jul 3 18:02:43 2005
+@@ -597,7 +597,7 @@
+ self._mess(_('error getting environment'), '<E>_ABNORMAL_ABORT')
+ return
+ # read profile and dump modified environment
+- iret, out = self.Shell('sh -c "source '+profile+' ; env"')
++ iret, out = self.Shell('sh -c ". '+profile+' ; env"')
+ env_prof = env2dict(out)
+ if iret<>0:
+ self._mess(_('error reading profile : %s') % profile,
diff --git a/cad/astk-serveur/pkg-plist b/cad/astk-serveur/pkg-plist
index 010a86b..c33c7d2 100644
--- a/cad/astk-serveur/pkg-plist
+++ b/cad/astk-serveur/pkg-plist
@@ -46,6 +46,7 @@
%%CLIENT%%%%ASTKDIR%%/lib/ASTK/ihm_menu.tcl
%%CLIENT%%%%ASTKDIR%%/lib/ASTK/ihm_outils.tcl
%%CLIENT%%%%ASTKDIR%%/lib/ASTK/ihm_rex.tcl
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/ihm_salome.tcl
%%CLIENT%%%%ASTKDIR%%/lib/ASTK/ihm_satellite.tcl
%%CLIENT%%%%ASTKDIR%%/lib/ASTK/ihm_status.tcl
%%CLIENT%%%%ASTKDIR%%/lib/ASTK/init.tcl
@@ -162,6 +163,7 @@
%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_printS.gif
%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_refreshB.gif
%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_refreshS.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_salome.gif
%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_save.gif
%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_upB.gif
%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_upS.gif
OpenPOWER on IntegriCloud