5 files changed, 62 insertions, 34 deletions

diff --git a/cad/astk-serveur/Makefile b/cad/astk-serveur/Makefile
index 175617708fbe..6af213b656eb 100644
--- a/cad/astk-serveur/Makefile
+++ b/cad/astk-serveur/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	astk
-PORTVERSION=	1.2.4
+DISTVERSION=	1.3.0-1
 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}-1
+DISTNAME=	${PORTNAME}-${DISTVERSION}.noarch
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT?=	Graphical interface for Code_Aster (server side)
@@ -41,14 +41,12 @@ NO_BUILD=	yes
 USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""
 
-EXTDIR=		${WRKDIR}/aster-src-${ASTER_VER}/SRC
 PKGMESSAGE=	${WRKDIR}/pkg-message
 LINSTDIR=	aster/ASTK
 inst_dir=	${PREFIX}/${LINSTDIR}
 aster_dir=	${LOCALBASE}/aster/${vaster}
-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
+S_SCRIPTS=	bin/as_exec bin/as_run bin/as_serv bin/tool_stanley lib/sub_script
+S_PYLIBS=	alamain.py as_timer.py
 C_SCRIPTS=	bin/astk bin/bsf
 tools_dir=	${aster_dir}/outils
 conf_dir=	${WRKSRC}/lib/ASTK/astkrc
@@ -56,14 +54,14 @@ conf_dir=	${WRKSRC}/lib/ASTK/astkrc
 .include <bsd.port.pre.mk>
 
 .if !defined(CLIENT_SEUL)
-WRKSRC=		${EXTDIR}/astk-${PORTVERSION}/ASTK_SERV
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}/ASTK_SERV
 PATCHDIR=	${MASTERDIR}/files
 PLIST_SUB=	ASTKDIR=${LINSTDIR}/ASTK_SERV SERV="" CLIENT="@comment "		\
 		vaster=${vaster}
 .else
-RUN_DEPENDS+=	xterm:${X_CLIENTS_PORT}	\
+RUN_DEPENDS+=	xterm:${PORTSDIR}/x11/xterm						\
 		wish${TK_VER}:${PORTSDIR}/x11-toolkits/tk${SHORT_TK_VER}
-WRKSRC=		${EXTDIR}/astk-${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/share/BWidget-${BWidget_VER}
@@ -77,8 +75,8 @@ TCL_VER?=	${TK_VER}
 SHORT_TK_VER=	${TK_VER:S/.//}
 BWidget_VER=	1.7.0
 
-ASTER_VER=	8.1.0
-vaster=		STA${ASTER_VER:S/.0//}
+ASTER_VER=	8.2.0
+vaster=		STA${ASTER_VER:R}
 
 GIBI=		gibi2000
 
@@ -142,15 +140,12 @@ ASTK_LANG=	FR
 ASTK_LANG=	ENG
 .endif
 
-post-extract:
-	@(cd ${EXTDIR} && \
-	${TAR} xfz ${EXTDIR}/astk-${PORTVERSION}-1.noarch.tar.gz)
-
 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}/lib/as_exec.py.orig ${WRKSRC}/lib/as_system.py.orig
+	@${RM} ${WRKSRC}/conf/config.orig ${WRKSRC}/bin/as_exec.orig		\
+		${WRKSRC}/bin/as_serv.orig ${WRKSRC}/lib/as_config.py.orig	\
+		${WRKSRC}/lib/as_exec.py.orig ${WRKSRC}/lib/as_system.py.orig	\
+		${WRKSRC}/conf/aster_profile.sh.orig
 .else
 	@${RM} ${WRKSRC}/lib/ASTK/init.tcl.orig	${WRKSRC}/lib/ASTK/astkrc/outils.orig	\
 		${WRKSRC}/share/tkselecteur.tcl.orig
@@ -177,7 +172,8 @@ do-configure:
 	-e "s#LOCALBASE#${LOCALBASE}#"						\
 	-e "s#%%v_ifdef%%#${v_ifdef}#" ${WRKSRC}/conf/config
 .for libs in ${S_PYLIBS}
-	@${REINPLACE_CMD} -e "s#/opt/aster/NEW7#${aster_dir}#" ${WRKSRC}/lib/${libs}
+	@${REINPLACE_CMD} -e "s#/opt/aster/NEW8#${aster_dir}#"			\
+		-e "s#/opt/aster/ASTK#${inst_dir}#" ${WRKSRC}/lib/${libs}
 . endfor
 . if defined(WITH_PBS)
 	@${REINPLACE_CMD} -e "s|batch : non|batch : oui|"			\
diff --git a/cad/astk-serveur/distinfo b/cad/astk-serveur/distinfo
index 773fac70f3e6..e4c081830952 100644
--- a/cad/astk-serveur/distinfo
+++ b/cad/astk-serveur/distinfo
@@ -1,3 +1,3 @@
-MD5 (aster-full-src-8.1.0-1.tar.gz) = 5a4d773cc374c7d1d553c650732f1bb5
-SHA256 (aster-full-src-8.1.0-1.tar.gz) = bcfc2cf118b71181b6c4628c95cb36cd808dfeb0e406556dc520e1e1c6b61e61
-SIZE (aster-full-src-8.1.0-1.tar.gz) = 94334932
+MD5 (astk-1.3.0-1.noarch.tar.gz) = 1f1d7bfa735b4bd6f66ab2cc3e30968a
+SHA256 (astk-1.3.0-1.noarch.tar.gz) = 1a20330818ac5747b5c0f88a94d76daabbca1230f5e7f02ada532328609e0f34
+SIZE (astk-1.3.0-1.noarch.tar.gz) = 374950
diff --git a/cad/astk-serveur/files/patch-conf_aster_profile.sh b/cad/astk-serveur/files/patch-conf_aster_profile.sh
new file mode 100644
index 000000000000..05167d5e81b0
--- /dev/null
+++ b/cad/astk-serveur/files/patch-conf_aster_profile.sh
@@ -0,0 +1,16 @@
+--- conf/aster_profile.sh.orig	Thu Oct 27 18:32:14 2005
++++ conf/aster_profile.sh	Wed Jan 11 22:08:53 2006
+@@ -15,6 +15,13 @@
+ # unlimit corefile size
+ ulimit -c unlimited
+ 
++# Might be useful to fix errors on 64 bits platforms
++# See <http://www.code-aster.org/forum/read.php?f=11&i=1603&t=1574>
++HOME_MED=?HOME_MED?
++export HOME_MED
++HOME_HDF=?HOME_HDF?
++export HOME_HDF
++
+ # optional settings
+ # DO NOT EDIT FOLLOWING LINE !
+ #?OPT_ENV?
diff --git a/cad/astk-serveur/files/patch-lib__as_exec.py b/cad/astk-serveur/files/patch-lib__as_exec.py
index 4abe073a54be..54085bfcf8ab 100644
--- a/cad/astk-serveur/files/patch-lib__as_exec.py
+++ b/cad/astk-serveur/files/patch-lib__as_exec.py
@@ -1,11 +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 @@
+--- ./lib/as_exec.py.orig	Thu Oct 20 17:52:32 2005
++++ ./lib/as_exec.py	Tue Jan 10 22:21:37 2006
+@@ -402,7 +402,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,
+       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/pkg-plist b/cad/astk-serveur/pkg-plist
index c33c7d2c9050..f52a60c71669 100644
--- a/cad/astk-serveur/pkg-plist
+++ b/cad/astk-serveur/pkg-plist
@@ -16,7 +16,6 @@
 %%CLIENT%%%%ASTKDIR%%/lib/ASTK/DOC/sdd_outils.txt
 %%CLIENT%%%%ASTKDIR%%/lib/ASTK/DOC/sdd_print.txt
 %%CLIENT%%%%ASTKDIR%%/lib/ASTK/DOC/sdd_profil.txt
-%%CLIENT%%%%ASTKDIR%%/lib/ASTK/DOC/sdd_rex.txt
 %%CLIENT%%%%ASTKDIR%%/lib/ASTK/DOC/sdd_sel.txt
 %%CLIENT%%%%ASTKDIR%%/lib/ASTK/HELP/ENG/item_110.txt
 %%CLIENT%%%%ASTKDIR%%/lib/ASTK/HELP/ENG/item_111.txt
@@ -178,19 +177,18 @@
 %%CLIENT%%%%ASTKDIR%%/share/remote_tools.tcl
 %%CLIENT%%%%ASTKDIR%%/share/tkselecteur.tcl
 %%SERV%%%%ASTKDIR%%/GPL.txt
-%%SERV%%%%ASTKDIR%%/bin/as_actu
-%%SERV%%%%ASTKDIR%%/bin/as_del
-%%SERV%%%%ASTKDIR%%/bin/as_edit
 %%SERV%%%%ASTKDIR%%/bin/as_exec
-%%SERV%%%%ASTKDIR%%/bin/as_info
 %%SERV%%%%ASTKDIR%%/bin/as_run
 %%SERV%%%%ASTKDIR%%/bin/as_serv
-%%SERV%%%%ASTKDIR%%/bin/as_tail
 %%SERV%%%%ASTKDIR%%/bin/tool_stanley
+%%SERV%%%%ASTKDIR%%/conf/.mysql_connect_REX
 %%SERV%%%%ASTKDIR%%/conf/aster_profile.sh
 %%SERV%%%%ASTKDIR%%/conf/config
 %%SERV%%%%ASTKDIR%%/conf/config_nodename
 %%SERV%%%%ASTKDIR%%/lib/HELP_as_run.txt
+%%SERV%%%%ASTKDIR%%/lib/alamain.py
+%%SERV%%%%ASTKDIR%%/lib/alamain.pyc
+%%SERV%%%%ASTKDIR%%/lib/alamain.pyo
 %%SERV%%%%ASTKDIR%%/lib/as_build.py
 %%SERV%%%%ASTKDIR%%/lib/as_build.pyc
 %%SERV%%%%ASTKDIR%%/lib/as_build.pyo
@@ -200,6 +198,9 @@
 %%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_maintenance.py
 %%SERV%%%%ASTKDIR%%/lib/as_maintenance.pyc
 %%SERV%%%%ASTKDIR%%/lib/as_maintenance.pyo
@@ -209,6 +210,9 @@
 %%SERV%%%%ASTKDIR%%/lib/as_profil.py
 %%SERV%%%%ASTKDIR%%/lib/as_profil.pyc
 %%SERV%%%%ASTKDIR%%/lib/as_profil.pyo
+%%SERV%%%%ASTKDIR%%/lib/as_rex.py
+%%SERV%%%%ASTKDIR%%/lib/as_rex.pyc
+%%SERV%%%%ASTKDIR%%/lib/as_rex.pyo
 %%SERV%%%%ASTKDIR%%/lib/as_run.py
 %%SERV%%%%ASTKDIR%%/lib/as_run.pyc
 %%SERV%%%%ASTKDIR%%/lib/as_run.pyo
@@ -219,6 +223,18 @@
 %%SERV%%%%ASTKDIR%%/lib/as_timer.pyc
 %%SERV%%%%ASTKDIR%%/lib/as_timer.pyo
 %%SERV%%%%ASTKDIR%%/lib/astk2run_aster.tcl
+%%SERV%%%%ASTKDIR%%/lib/histor.py
+%%SERV%%%%ASTKDIR%%/lib/histor.pyc
+%%SERV%%%%ASTKDIR%%/lib/histor.pyo
+%%SERV%%%%ASTKDIR%%/lib/myconnect.py
+%%SERV%%%%ASTKDIR%%/lib/myconnect.pyc
+%%SERV%%%%ASTKDIR%%/lib/myconnect.pyo
+%%SERV%%%%ASTKDIR%%/lib/mystring.py
+%%SERV%%%%ASTKDIR%%/lib/mystring.pyc
+%%SERV%%%%ASTKDIR%%/lib/mystring.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