From a67a6f8d1ce45c230522661e85ed76473a130740 Mon Sep 17 00:00:00 2001
From: thierry <thierry@FreeBSD.org>
Date: Mon, 24 Jan 2005 21:26:06 +0000
Subject: Upgrade to 1.2.1.

---
 cad/astk-serveur/Makefile                              |  7 +++----
 cad/astk-serveur/distinfo                              |  4 ++--
 .../files.client/patch-lib::ASTK::tools.tcl            | 18 ------------------
 3 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 100644 cad/astk-serveur/files.client/patch-lib::ASTK::tools.tcl

(limited to 'cad')

diff --git a/cad/astk-serveur/Makefile b/cad/astk-serveur/Makefile
index 69ea4b294008..3f694644879e 100644
--- a/cad/astk-serveur/Makefile
+++ b/cad/astk-serveur/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	astk
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.code-aster.org/FICHIERS/
 .if !defined(CLIENT_SEUL)
@@ -14,8 +14,7 @@ PKGNAMESUFFIX=	-serveur
 .else
 PKGNAMESUFFIX=	-client
 .endif
-DISTNAME=	aster-full-src-${ASTER_VER}-3
-EXTRACT_SUFX=	.tar
+DISTNAME=	aster-full-src-${ASTER_VER}-4
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT?=	Graphical interface for Code_Aster (server side)
@@ -153,7 +152,7 @@ post-patch:
 		${WRKSRC}/bin/as_serv.orig
 .else
 	@${RM} ${WRKSRC}/lib/ASTK/init.tcl.orig	${WRKSRC}/lib/ASTK/astkrc/outils.orig	\
-		${WRKSRC}/share/tkselecteur.tcl.orig ${WRKSRC}/lib/ASTK/tools.tcl.orig
+		${WRKSRC}/share/tkselecteur.tcl.orig
 .endif
 
 do-configure:
diff --git a/cad/astk-serveur/distinfo b/cad/astk-serveur/distinfo
index 36bb0aadc2e4..d88019d17835 100644
--- a/cad/astk-serveur/distinfo
+++ b/cad/astk-serveur/distinfo
@@ -1,2 +1,2 @@
-MD5 (aster-full-src-7.4.0-3.tar) = 0d756794a176f2e1b92412382373a629
-SIZE (aster-full-src-7.4.0-3.tar) = 87232678
+MD5 (aster-full-src-7.4.0-4.tar.gz) = a685292db713eb846c2cdff9164d6c0b
+SIZE (aster-full-src-7.4.0-4.tar.gz) = 95276818
diff --git a/cad/astk-serveur/files.client/patch-lib::ASTK::tools.tcl b/cad/astk-serveur/files.client/patch-lib::ASTK::tools.tcl
deleted file mode 100644
index b208c310f061..000000000000
--- a/cad/astk-serveur/files.client/patch-lib::ASTK::tools.tcl
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./lib/ASTK/tools.tcl.orig	Mon Dec  6 09:48:47 2004
-+++ ./lib/ASTK/tools.tcl	Sun Jan 16 00:43:35 2005
-@@ -51,12 +51,12 @@
-    if { $sortie } {
- # vérifie que les commandes distantes fonctionnent
-       init_config
--      if { $config(-1,remote_shell_protocol) == "" || $config(-1,remote_shell_protocol) == "RSH" } {
-+      if { $astk::config(-1,remote_shell_protocol) == "" || $astk::config(-1,remote_shell_protocol) == "RSH" } {
-          set cmd "rsh -n -l $astk::config(-1,login) $astk::config(-1,nom_complet) echo hello"
--      } elseif { $config(-1,remote_shell_protocol) == "SSH" } {
-+      } elseif { $astk::config(-1,remote_shell_protocol) == "SSH" } {
-          set cmd "ssh -n -l $astk::config(-1,login) $astk::config(-1,nom_complet) echo hello"
-       } else {
--         ashare::mess erreur 49 $config(-1,remote_shell_protocol)
-+         ashare::mess erreur 49 $astk::config(-1,remote_shell_protocol)
-          # le premier appel à rexec_cmd échouera
-          cmd="echo ERROR"
-       }
-- 
cgit