7 files changed, 125 insertions, 48 deletions

diff --git a/cad/astk-client/Makefile b/cad/astk-client/Makefile
index ae36352f6151..47199cba31d7 100644
--- a/cad/astk-client/Makefile
+++ b/cad/astk-client/Makefile
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	astk
-PORTREVISION=	1
 
 COMMENT=	Graphical interface for Code_Aster (client side)
 
diff --git a/cad/astk-serveur/Makefile b/cad/astk-serveur/Makefile
index 8ad9207acd81..7f693d8de88e 100644
--- a/cad/astk-serveur/Makefile
+++ b/cad/astk-serveur/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	astk
-PORTVERSION=	1.0.21
-PORTREVISION=	1
+PORTVERSION=	1.1.1
 CATEGORIES=	cad tk84
 MASTER_SITES=	http://www.code-aster.org/FICHIERS/
 .if !defined(CLIENT_SEUL)
@@ -15,7 +14,7 @@ PKGNAMESUFFIX=	-serveur
 .else
 PKGNAMESUFFIX=	-client
 .endif
-DISTNAME=	aster-src-${ASTER_VER}
+DISTNAME=	aster-src-${ASTER_VER}-8
 EXTRACT_SUFX=	.tar
 
 MAINTAINER=	ports@FreeBSD.org
@@ -35,7 +34,7 @@ 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=	${LOCALBASE}/lib/Tktable${TKTAB_VER}:${PORTSDIR}/x11-toolkits/tktable	\
+RUN_DEPENDS=	wish${TK_VER}:${PORTSDIR}/x11-toolkits/tk${SHORT_TK_VER}	\
 		${SHELL_INSTALL_ASTER}:${PORTSDIR}/shells/${SHIADEP}
 .if defined(WITH_PBS) && !defined(CLIENT_SEUL)
 RUN_DEPENDS+=	${LOCALBASE}bin/pbs_tclsh:misc/pbs
@@ -48,7 +47,8 @@ NO_BUILD=	yes
 USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""
 
-EXTDIR=		${WRKDIR}/aster-${ASTER_VER}.src
+EXTDIR=		${WRKDIR}/aster-src-${ASTER_VER}
+PKGMESSAGE=	${WRKDIR}/pkg-message
 .if !defined(CLIENT_SEUL)
 WRKSRC=		${EXTDIR}/ASTK_SERV
 PATCHDIR=	${MASTERDIR}/files
@@ -56,18 +56,22 @@ PLIST_SUB=	SERV="" CLIENT="@comment " vaster=${vaster}
 .else
 WRKSRC=		${EXTDIR}/ASTK_CLIENT
 PATCHDIR=	${MASTERDIR}/files.client
-PLIST_SUB=	SERV="@comment " CLIENT="" vaster=""
-PKGMESSAGE=	${PKGDIR}/pkg-message.client
+PLIST_SUB=	SERV="@comment " CLIENT="" vaster=""		\
+		BWidget_DIR=ASTK/ASTK_CLIENT/share/BWidget-${BWidget_VER}
 .endif
+FILESDIR=	${PATCHDIR}
 
 SLAVEDIRS=	cad/astk-client
 
 TK_VER?=	8.4
 TCL_VER?=	${TK_VER}
+SHORT_TK_VER=	${TK_VER:S/.//}
+BWidget_VER=	1.7.0
 
-TKTAB_VER?=	2.8
-ASTER_VER=	7.2.0-2
-vaster=		STA${ASTER_VER}
+ASTER_VER=	7.3.0
+vaster=		STA${ASTER_VER:S/.0//}
+
+GIBI=		gibi2000
 
 .if defined(WITH_ZSH)
 SHIA=		zsh
@@ -112,7 +116,7 @@ unames!=	${UNAME} -s
 unamesm!=	${UNAME} -sm
 v_ifdef=	${unames:U}
 SHELL_INSTALL_ASTER=	${LOCALBASE}/bin/${SHIA}
-gzip!=		dirname `${WHICH} ${GZIP_CMD}`
+gzip!=		${DIRNAME} `${WHICH} ${GZIP_CMD}`
 
 .if defined(LANG) && ${LANG:Mfr*} != ""
 ASTK_LANG=	FR
@@ -134,25 +138,21 @@ post-extract:
 post-patch:
 .if !defined(CLIENT_SEUL)
 .for scripts in ${S_SCRIPTS}
-	@${REINPLACE_CMD} -e "s#SHELL_EXECUTION#${SHELL_INSTALL_ASTER}#g"	\
+	@${REINPLACE_CMD} -e "s#SHELL_EXECUTION#${SHELL_INSTALL_ASTER}#"	\
 	-e "s#HOME_ASTK#${inst_dir}#"						\
-	-e "s#HOME_TKTABLE#${LOCALBASE}/lib/Tktable${TKTAB_VER}#"		\
 	-e "s#HOME_TCL_TK#${LOCALBASE}#"					\
-	-e "s#TCLSH_BIN#tclsh${TCL_VER}#"					\
-	-e "s#WISH_BIN#wish${TK_VER}#" ${WRKSRC}/${scripts}
+	-e "s#TCLSH_BIN#tclsh${TCL_VER}#" ${WRKSRC}/${scripts}
 .endfor
 	@${REINPLACE_CMD} -e "s#IFDEF#${v_ifdef}#g"				\
 	-e "s#/aster#${aster_dir}#g"						\
 	-e "s#EDITOR#${WITH_ED}#g"						\
-	-e "s#TCL_TK_VERSION#${TK_VER}#g"					\
-	-e "s#HOME_PYTHON#${python_dir}#g"					\
 	-e "s#/bin/sh#${SHELL_INSTALL_ASTER}#g"					\
 	-e "s#NODE#${SERVER_NAME}#"						\
 	-e "s#%%vaster%%#${vaster}#"						\
 	-e "s#LOCALBASE#${LOCALBASE}#"						\
 	-e "s|#%%v_ifdef%%|${v_ifdef}|" ${WRKSRC}/conf/config
 	@${RM} ${WRKSRC}/conf/config.orig
-	@${CP} ${WRKSRC}/conf/config.NEW7 ${WRKSRC}/conf/config.${vaster}
+	@${CP} ${WRKSRC}/conf/config.version ${WRKSRC}/conf/config.${vaster}
 	@${REINPLACE_CMD} -e "s#/aster#${aster_dir}#"				\
 	-e "s#/NEW7##"								\
 	-e "s#ans debug binairies#and debug binaries#"				\
@@ -175,14 +175,13 @@ post-patch:
 .else
 # CLIENT_SEUL
 .for scripts in ${C_SCRIPTS}
-	@${REINPLACE_CMD} -e "s#SHELL_EXECUTION#${SHELL_INSTALL_ASTER}#g"	\
+	@${REINPLACE_CMD} -e "s#SHELL_EXECUTION#${SHELL_INSTALL_ASTER}#"	\
 	-e "s#HOME_ASTK#${inst_dir}#"						\
-	-e "s#HOME_TKTABLE#${LOCALBASE}/lib/Tktable${TKTAB_VER}#"		\
 	-e "s#HOME_TCL_TK#${LOCALBASE}#"					\
-	-e "s#TCLSH_BIN#tclsh${TCL_VER}#"					\
 	-e "s#WISH_BIN#wish${TK_VER}#" ${WRKSRC}/${scripts}
 .endfor
-	@${REINPLACE_CMD} -e "s#HOME_ASTK#${inst_dir}#g"			\
+	@${REINPLACE_CMD} -e "s#HOME_ASTK#${inst_dir}#"				\
+		-e "s#GIBI#${GIBI}#"		\
 		-e "s#TOOLS_DIR#${tools_dir}#" ${conf_dir}/outils
 	@${REINPLACE_CMD} -e "s#HOME_ASTK#${inst_dir}#"				\
 		-e "s#HOME_XTERM#${X11BASE}/bin#"				\
@@ -208,9 +207,10 @@ do-install:
 
 post-install:
 	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE} | ${SED} -e "s#%%inst_dir%%#${inst_dir}#"		\
-			-e "s#%%tools_dir%%#${tools_dir}#"			\
-			-e "s#%%ASTER_VER%%#${vaster}#"
+	@${SED} -e "s#%%inst_dir%%#${inst_dir}#;s#%%tools_dir%%#${tools_dir}#"	\
+		-e "s#%%ASTER_VER%%#${vaster}#"					\
+		${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
 .include <bsd.port.post.mk>
diff --git a/cad/astk-serveur/distinfo b/cad/astk-serveur/distinfo
index cad25c7feb7e..9ad950016892 100644
--- a/cad/astk-serveur/distinfo
+++ b/cad/astk-serveur/distinfo
@@ -1,2 +1,2 @@
-MD5 (aster-src-7.2.0-2.tar) = 3c7163dffba0fa70c6b136480c05712e
-SIZE (aster-src-7.2.0-2.tar) = 17879040
+MD5 (aster-src-7.3.0-8.tar) = 7e23ef1a94bf6f93c155454b5feb5ef6
+SIZE (aster-src-7.3.0-8.tar) = 18841600
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 d9f38408d7d6..3c0fa02454c6 100644
--- a/cad/astk-serveur/files.client/patch-lib::ASTK::astkrc::outils
+++ b/cad/astk-serveur/files.client/patch-lib::ASTK::astkrc::outils
@@ -1,26 +1,21 @@
---- lib/ASTK/astkrc/outils.orig	Mon Jun 23 08:42:59 2003
-+++ lib/ASTK/astkrc/outils	Wed Oct  8 23:45:12 2003
-@@ -13,3 +13,23 @@
- ext : comm com0 com1 com2
+--- ./lib/ASTK/astkrc/outils.orig	Fri Nov 28 11:21:00 2003
++++ ./lib/ASTK/astkrc/outils	Thu May 20 23:17:34 2004
+@@ -19,7 +19,7 @@
  dist : on
  #
-+nom : Gmsh
-+cmde : TOOLS_DIR/gmsh (@F)
-+ext : geo pos
-+dist : on
-+#
-+nom : Gibi
-+cmde : TOOLS_DIR/gibi (@F)
-+ext : dgibi
-+dist : on
-+#
-+nom : Grace
-+cmde : TOOLS_DIR/xmgrace (@F)
-+ext : dat
-+dist : on
+ nom : Gibi
+-cmde : TOOLS_DIR/gibi.x (@F)
++cmde : TOOLS_DIR/GIBI (@F)
+ ext : datg dgibi
+ dist : on
+ #
+@@ -27,4 +27,9 @@
+ cmde : TOOLS_DIR/xmgrace (@F)
+ ext : dat
+ dist : on
 +#
 +nom : Stanley
 +cmde : TOOLS_DIR/../bibpyt/Stanley/stanley.py
 +ext : _VIDE
 +dist : off
-+#
+ #
diff --git a/cad/astk-serveur/pkg-message.client b/cad/astk-serveur/files.client/pkg-message.in
index ee9e50b3a203..ee9e50b3a203 100644
--- a/cad/astk-serveur/pkg-message.client
+++ b/cad/astk-serveur/files.client/pkg-message.in
diff --git a/cad/astk-serveur/pkg-message b/cad/astk-serveur/files/pkg-message.in
index 8f6746fa1833..8f6746fa1833 100644
--- a/cad/astk-serveur/pkg-message
+++ b/cad/astk-serveur/files/pkg-message.in
diff --git a/cad/astk-serveur/pkg-plist b/cad/astk-serveur/pkg-plist
index 64bf20bd8d2b..0388fcbc5378 100644
--- a/cad/astk-serveur/pkg-plist
+++ b/cad/astk-serveur/pkg-plist
@@ -22,9 +22,11 @@
 %%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/HELP/ENG/item_110.txt
 %%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/HELP/ENG/item_111.txt
 %%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/HELP/ENG/item_190.txt
+%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/HELP/ENG/item_323.txt
 %%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/HELP/FR/item_110.txt
 %%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/HELP/FR/item_111.txt
 %%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/HELP/FR/item_190.txt
+%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/HELP/FR/item_323.txt
 %%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/RELNOTES
 %%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/TODO
 %%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/aide.tcl
@@ -42,6 +44,7 @@
 %%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/ihm_execution.tcl
 %%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/ihm_liste.tcl
 %%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/ihm_main.tcl
+%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/ihm_menu.tcl
 %%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/ihm_outils.tcl
 %%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/ihm_rex.tcl
 %%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/ihm_satellite.tcl
@@ -54,6 +57,83 @@
 %%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/tools.tcl
 %%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/unites_logiques.tcl
 %%CLIENT%%ASTK/ASTK_CLIENT/lib/BSF/bsf.tcl
+%%CLIENT%%%%BWidget_DIR%%/CHANGES.txt
+%%CLIENT%%%%BWidget_DIR%%/ChangeLog
+%%CLIENT%%%%BWidget_DIR%%/LICENSE.txt
+%%CLIENT%%%%BWidget_DIR%%/README.txt
+%%CLIENT%%%%BWidget_DIR%%/aclocal.m4
+%%CLIENT%%%%BWidget_DIR%%/arrow.tcl
+%%CLIENT%%%%BWidget_DIR%%/bitmap.tcl
+%%CLIENT%%%%BWidget_DIR%%/button.tcl
+%%CLIENT%%%%BWidget_DIR%%/buttonbox.tcl
+%%CLIENT%%%%BWidget_DIR%%/color.tcl
+%%CLIENT%%%%BWidget_DIR%%/combobox.tcl
+%%CLIENT%%%%BWidget_DIR%%/dialog.tcl
+%%CLIENT%%%%BWidget_DIR%%/dragsite.tcl
+%%CLIENT%%%%BWidget_DIR%%/dropsite.tcl
+%%CLIENT%%%%BWidget_DIR%%/dynhelp.tcl
+%%CLIENT%%%%BWidget_DIR%%/entry.tcl
+%%CLIENT%%%%BWidget_DIR%%/font.tcl
+%%CLIENT%%%%BWidget_DIR%%/images/bold.gif
+%%CLIENT%%%%BWidget_DIR%%/images/copy.gif
+%%CLIENT%%%%BWidget_DIR%%/images/cut.gif
+%%CLIENT%%%%BWidget_DIR%%/images/dragfile.gif
+%%CLIENT%%%%BWidget_DIR%%/images/dragicon.gif
+%%CLIENT%%%%BWidget_DIR%%/images/error.gif
+%%CLIENT%%%%BWidget_DIR%%/images/file.gif
+%%CLIENT%%%%BWidget_DIR%%/images/folder.gif
+%%CLIENT%%%%BWidget_DIR%%/images/hourglass.gif
+%%CLIENT%%%%BWidget_DIR%%/images/info.gif
+%%CLIENT%%%%BWidget_DIR%%/images/italic.gif
+%%CLIENT%%%%BWidget_DIR%%/images/minus.xbm
+%%CLIENT%%%%BWidget_DIR%%/images/new.gif
+%%CLIENT%%%%BWidget_DIR%%/images/opcopy.xbm
+%%CLIENT%%%%BWidget_DIR%%/images/open.gif
+%%CLIENT%%%%BWidget_DIR%%/images/openfold.gif
+%%CLIENT%%%%BWidget_DIR%%/images/oplink.xbm
+%%CLIENT%%%%BWidget_DIR%%/images/opmove.xbm
+%%CLIENT%%%%BWidget_DIR%%/images/overstrike.gif
+%%CLIENT%%%%BWidget_DIR%%/images/palette.gif
+%%CLIENT%%%%BWidget_DIR%%/images/passwd.gif
+%%CLIENT%%%%BWidget_DIR%%/images/paste.gif
+%%CLIENT%%%%BWidget_DIR%%/images/plus.xbm
+%%CLIENT%%%%BWidget_DIR%%/images/print.gif
+%%CLIENT%%%%BWidget_DIR%%/images/question.gif
+%%CLIENT%%%%BWidget_DIR%%/images/redo.gif
+%%CLIENT%%%%BWidget_DIR%%/images/save.gif
+%%CLIENT%%%%BWidget_DIR%%/images/target.xbm
+%%CLIENT%%%%BWidget_DIR%%/images/underline.gif
+%%CLIENT%%%%BWidget_DIR%%/images/undo.gif
+%%CLIENT%%%%BWidget_DIR%%/images/warning.gif
+%%CLIENT%%%%BWidget_DIR%%/init.tcl
+%%CLIENT%%%%BWidget_DIR%%/label.tcl
+%%CLIENT%%%%BWidget_DIR%%/labelentry.tcl
+%%CLIENT%%%%BWidget_DIR%%/labelframe.tcl
+%%CLIENT%%%%BWidget_DIR%%/lang/de.rc
+%%CLIENT%%%%BWidget_DIR%%/lang/en.rc
+%%CLIENT%%%%BWidget_DIR%%/lang/es.rc
+%%CLIENT%%%%BWidget_DIR%%/lang/fr.rc
+%%CLIENT%%%%BWidget_DIR%%/listbox.tcl
+%%CLIENT%%%%BWidget_DIR%%/mainframe.tcl
+%%CLIENT%%%%BWidget_DIR%%/messagedlg.tcl
+%%CLIENT%%%%BWidget_DIR%%/notebook.tcl
+%%CLIENT%%%%BWidget_DIR%%/pagesmgr.tcl
+%%CLIENT%%%%BWidget_DIR%%/panedw.tcl
+%%CLIENT%%%%BWidget_DIR%%/passwddlg.tcl
+%%CLIENT%%%%BWidget_DIR%%/pkgIndex.tcl
+%%CLIENT%%%%BWidget_DIR%%/progressbar.tcl
+%%CLIENT%%%%BWidget_DIR%%/progressdlg.tcl
+%%CLIENT%%%%BWidget_DIR%%/scrollframe.tcl
+%%CLIENT%%%%BWidget_DIR%%/scrollview.tcl
+%%CLIENT%%%%BWidget_DIR%%/scrollw.tcl
+%%CLIENT%%%%BWidget_DIR%%/separator.tcl
+%%CLIENT%%%%BWidget_DIR%%/spinbox.tcl
+%%CLIENT%%%%BWidget_DIR%%/titleframe.tcl
+%%CLIENT%%%%BWidget_DIR%%/tree.tcl
+%%CLIENT%%%%BWidget_DIR%%/utils.tcl
+%%CLIENT%%%%BWidget_DIR%%/widget.tcl
+%%CLIENT%%%%BWidget_DIR%%/wizard.tcl
+%%CLIENT%%%%BWidget_DIR%%/xpm2image.tcl
 %%CLIENT%%ASTK/ASTK_CLIENT/share/appli.tcl
 %%CLIENT%%ASTK/ASTK_CLIENT/share/config.tcl
 %%CLIENT%%ASTK/ASTK_CLIENT/share/file_funct.tcl
@@ -107,7 +187,7 @@
 %%SERV%%ASTK/ASTK_SERV/bin/tool_stanley
 %%SERV%%ASTK/ASTK_SERV/conf/config
 %%SERV%%ASTK/ASTK_SERV/conf/config.%%vaster%%
-%%SERV%%ASTK/ASTK_SERV/conf/config.NEW7
+%%SERV%%ASTK/ASTK_SERV/conf/config.version
 %%SERV%%ASTK/ASTK_SERV/lib/astk2run_aster.tcl
 %%SERV%%ASTK/ASTK_SERV/lib/stanley_post.comm
 %%SERV%%ASTK/ASTK_SERV/lib/sub_script
@@ -123,6 +203,9 @@
 %%CLIENT%%@dirrm ASTK/ASTK_CLIENT/lib/BSF
 %%CLIENT%%@dirrm ASTK/ASTK_CLIENT/lib
 %%CLIENT%%@dirrm ASTK/ASTK_CLIENT/share/icons
+%%CLIENT%%@dirrm %%BWidget_DIR%%/images
+%%CLIENT%%@dirrm %%BWidget_DIR%%/lang
+%%CLIENT%%@dirrm %%BWidget_DIR%%
 %%CLIENT%%@dirrm ASTK/ASTK_CLIENT/share
 %%CLIENT%%@dirrm ASTK/ASTK_CLIENT
 %%SERV%%@dirrm ASTK/ASTK_SERV/bin