- Upgrade ASTK to 1.5.5-1;

- Use aster's distfiles.

3 files changed, 47 insertions, 22 deletions

diff --git a/cad/astk-serveur/Makefile b/cad/astk-serveur/Makefile
index 43e019b7c82c..f86d6f54f3af 100644
--- a/cad/astk-serveur/Makefile
+++ b/cad/astk-serveur/Makefile
@@ -6,15 +6,17 @@
 #
 
 PORTNAME=	astk
-DISTVERSION=	1.5.2-1
+DISTVERSIONPREFIX=	full-src-
+DISTVERSION=	1.5.5-1
 DISTVERSIONSUFFIX=	.noarch
 CATEGORIES=	cad
-MASTER_SITES=	http://www.code-aster.org/FICHIERS/
+MASTER_SITES=	http://www.code-aster.org/V2/IMG/gz/
 .if !defined(CLIENT_SEUL)
 PKGNAMESUFFIX=	-serveur
 .else
 PKGNAMESUFFIX=	-client
 .endif
+DISTNAME=	aster-${DISTVERSIONPREFIX}${ASTER_DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT?=	Graphical interface for Code_Aster (server side)
@@ -37,12 +39,15 @@ USE_PYTHON=	yes
 NO_BUILD=	yes
 REINPLACE_ARGS=	-i ""
 
+ASTER_DISTVERSION=	${ASTER_VER}-2
+EXTRACT_WRKSRC=	${WRKDIR}/aster-${DISTVERSIONPREFIX}${ASTER_DISTVERSION:S/-/./:R}/SRC
+
 PKGMESSAGE=	${WRKDIR}/pkg-message
 LINSTDIR=	aster/ASTK
 inst_dir=	${PREFIX}/${LINSTDIR}
 aster_dir=	${LOCALBASE}/aster/${vaster}
 S_SCRIPTS=	bin/as_exec bin/as_run bin/as_serv bin/as_exec_special lib/sub_script
-S_PYLIBS=	alamain.py as_timer.py
+S_PYLIBS=	alamain.py as_config.py as_timer.py as_devtools.py user_filter.py
 C_SCRIPTS=	bin/astk bin/bsf
 tools_dir=	${aster_dir}/outils
 conf_dir=	${WRKSRC}/lib/ASTK/astkrc
@@ -80,7 +85,7 @@ TCL_VER?=	${TK_VER}
 SHORT_TK_VER=	${TK_VER:S/.//}
 BWidget_VER=	1.7.0
 
-ASTER_VER=	9.1.0
+ASTER_VER=	9.2.0
 vaster=		STA${ASTER_VER:R}
 
 GIBI=		gibi2003
@@ -115,9 +120,17 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/emacs:${PORTSDIR}/editors/emacs
 . elif exists(${LOCALBASE}/bin/xemacs)
 WITH_ED=	xemacs
 RUN_DEPENDS+=	${LOCALBASE}/bin/xemacs:${PORTSDIR}/editors/xemacs
-. else
+. elif exists(${LOCALBASE}/bin/gedit)
+WITH_ED=	gedit
+RUN_DEPENDS+=	${LOCALBASE}/bin/gedit:${PORTSDIR}/editors/gedit
+. elif exists(${LOCALBASE}/bin/kwrite)
+WITH_ED=	kwrite
+RUN_DEPENDS+=	${X11BASE}/bin/kwrite:${PORTSDIR}/x11/kdebase3
+. elif exists(${LOCALBASE}/bin/xedit)
 WITH_ED=	xedit
-RUN_DEPENDS+=	${X11BASE}/bin/xedit:${X_CLIENTS_PORT}
+RUN_DEPENDS+=	${X11BASE}/bin/xedit:${PORTSDIR}/x11/xedit
+. else
+WITH_ED=	vi
 . endif
 .endif
 
@@ -141,23 +154,27 @@ ASTK_LANG=	FR
 ASTK_LANG=	ENG
 .endif
 
+post-extract:
+	(cd ${WRKDIR} &&	\
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${EXTRACT_WRKSRC}/${PORTNAME}-${DISTVERSION}${DISTVERSIONSUFFIX}${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS})
+
 pre-configure:
 	${RM} ${PATCH2RM:C|^|${WRKSRC}/|:C|$|.orig|}
 
 do-configure:
 .if !defined(CLIENT_SEUL)
 . if ${SHIA} == "zsh"
-	@${REINPLACE_CMD} -e 's|#set -o SH_WORD_SPLIT|set -o SH_WORD_SPLIT|'	\
+	${REINPLACE_CMD} -e 's|#set -o SH_WORD_SPLIT|set -o SH_WORD_SPLIT|'	\
 		${WRKSRC}/bin/as_serv
 . endif
-	@${REINPLACE_CMD} -e 's#?PYTHON_EXE?#${PYTHON_CMD}#'			\
+	${REINPLACE_CMD} -e 's#?PYTHON_EXE?#${PYTHON_CMD}#'			\
 		-e 's#?MAXCMDLEN?#16384#' ${WRKSRC}/bin/as_run
 . for scripts in ${S_SCRIPTS}
-	@${REINPLACE_CMD} -e "s#?SHELL_EXECUTION?#${SHELL_INSTALL_ASTER}#"	\
+	${REINPLACE_CMD} -e "s#?SHELL_EXECUTION?#${SHELL_INSTALL_ASTER}#"	\
 	-e "s#?ASTER_ROOT?#${PREFIX}/aster#;s#?HOME_ASTK?#${inst_dir}#"		\
 		${WRKSRC}/${scripts}
 . endfor
-	@${REINPLACE_CMD} -e "s#?IFDEF?#${v_ifdef}#g"				\
+	${REINPLACE_CMD} -e "s#?IFDEF?#${v_ifdef}#g"				\
 	-e "s#?ASTER_ROOT?#${LOCALBASE}/aster#g"				\
 	-e "s#?EDITOR?#${WITH_ED}#g"						\
 	-e "s#?NODE?#${HOST_NAME}#"						\
@@ -166,41 +183,42 @@ 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/NEW8#${aster_dir}#"			\
+	${REINPLACE_CMD} -e "s#/opt/aster/NEW9#${aster_dir}#"			\
+		-e "s#/opt/aster#${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|"			\
+	${REINPLACE_CMD} -e "s|batch : non|batch : oui|"			\
 		${WRKSRC}/conf/config
 . endif
-	@${REINPLACE_CMD} -e 's|?HOME_PYTHON?|${PYTHONBASE}|'			\
+	${REINPLACE_CMD} -e 's|?HOME_PYTHON?|${PYTHONBASE}|'			\
 		-e 's|?ASTER_ROOT?|${aster_dir}|'				\
 		-e 's|?HOME_MED?|${LOCALBASE}|'					\
 		-e 's|?HOME_HDF?|${LOCALBASE}|' ${WRKSRC}/conf/aster_profile.sh
 .else
 # CLIENT_SEUL
 . for scripts in ${C_SCRIPTS}
-	@${REINPLACE_CMD} -e "s#?SHELL_EXECUTION?#${SHELL_INSTALL_ASTER}#"	\
+	${REINPLACE_CMD} -e "s#?SHELL_EXECUTION?#${SHELL_INSTALL_ASTER}#"	\
 	-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}#"					\
+	${REINPLACE_CMD} -e "s#GIBI#${GIBI}#"					\
 		-e "s#?vaster?#${vaster}#"					\
 		-e "s#?TOOLS_DIR?#${tools_dir}#" ${conf_dir}/outils
-	@${REINPLACE_CMD} -e "s#?HOME_ASTK?#${inst_dir}#"			\
+	${REINPLACE_CMD} -e "s#?HOME_ASTK?#${inst_dir}#"			\
 		-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#"			\
+	${REINPLACE_CMD} -e "s#?XTERM?#${X11BASE}/bin/xterm#"			\
 		-e "s#?ASTER_VERSION?#${ASTER_VER}#"				\
 		-e "s#langue : ENG#langue : ${ASTK_LANG}#"			\
 		-e "s#?DOMAIN_NAME?#${DOMAIN_NAME}#"				\
 		-e "s#?EDITOR?#${WITH_ED}#" ${conf_dir}/prefs
-	@${REINPLACE_CMD} -e "s#%%LOCALBASE%%#${LOCALBASE}#g"			\
+	${REINPLACE_CMD} -e "s#%%LOCALBASE%%#${LOCALBASE}#g"			\
 		${WRKSRC}/share/tkselecteur.tcl
-	@${REINPLACE_CMD} -e "s#%%unamesm%%#${unamesm}#"			\
+	${REINPLACE_CMD} -e "s#%%unamesm%%#${unamesm}#"			\
 		${WRKSRC}/lib/ASTK/init.tcl
 .endif
 
diff --git a/cad/astk-serveur/distinfo b/cad/astk-serveur/distinfo
index bb1fc33bf401..5c35c82565f5 100644
--- a/cad/astk-serveur/distinfo
+++ b/cad/astk-serveur/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (aster-full-src-9.2.0-2.noarch.tar.gz) = b0e3de37a3ce0f2c843855c9a5eef7ca
+SHA256 (aster-full-src-9.2.0-2.noarch.tar.gz) = fc43b758681ffb0dd7cfdbe30e92f9b840f0394732c11b815b0170bd38d48ec6
+SIZE (aster-full-src-9.2.0-2.noarch.tar.gz) = 117727246
diff --git a/cad/astk-serveur/pkg-plist b/cad/astk-serveur/pkg-plist
index 456b8fa903a0..48c1a1f88c3e 100644
--- a/cad/astk-serveur/pkg-plist
+++ b/cad/astk-serveur/pkg-plist
@@ -196,6 +196,9 @@
 %%SERV%%%%ASTKDIR%%/lib/as_config.py
 %%SERV%%%%ASTKDIR%%/lib/as_config.pyc
 %%SERV%%%%ASTKDIR%%/lib/as_config.pyo
+%%SERV%%%%ASTKDIR%%/lib/as_devtools.py
+%%SERV%%%%ASTKDIR%%/lib/as_devtools.pyc
+%%SERV%%%%ASTKDIR%%/lib/as_devtools.pyo
 %%SERV%%%%ASTKDIR%%/lib/as_etude.py
 %%SERV%%%%ASTKDIR%%/lib/as_etude.pyc
 %%SERV%%%%ASTKDIR%%/lib/as_etude.pyo
@@ -220,6 +223,7 @@
 %%SERV%%%%ASTKDIR%%/lib/as_rex.py
 %%SERV%%%%ASTKDIR%%/lib/as_rex.pyc
 %%SERV%%%%ASTKDIR%%/lib/as_rex.pyo
+%%SERV%%%%ASTKDIR%%/lib/as_run.extensions
 %%SERV%%%%ASTKDIR%%/lib/as_run.py
 %%SERV%%%%ASTKDIR%%/lib/as_run.pyc
 %%SERV%%%%ASTKDIR%%/lib/as_run.pyo
@@ -249,6 +253,9 @@
 %%SERV%%%%ASTKDIR%%/lib/progress.py
 %%SERV%%%%ASTKDIR%%/lib/progress.pyc
 %%SERV%%%%ASTKDIR%%/lib/progress.pyo
+%%SERV%%%%ASTKDIR%%/lib/sample_extension.py
+%%SERV%%%%ASTKDIR%%/lib/sample_extension.pyc
+%%SERV%%%%ASTKDIR%%/lib/sample_extension.pyo
 %%SERV%%%%ASTKDIR%%/lib/schema.py
 %%SERV%%%%ASTKDIR%%/lib/schema.pyc
 %%SERV%%%%ASTKDIR%%/lib/schema.pyo