From 44b269e037d41c312e2f7fed8fa6b349067cde74 Mon Sep 17 00:00:00 2001
From: Tim Edwards <tim@opencircuitdesign.com>
Date: Mon, 8 May 2023 09:51:13 -0400
Subject: [PATCH] Modified the handling of substrate ports so that an existing
 port number for a substrate port does not get reassigned, which will cause
 port ordering issues.

---
 VERSION           | 2 +-
 extflat/EFbuild.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 0003b29f..f70928e1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.3.397
+8.3.398
diff --git a/extflat/EFbuild.c b/extflat/EFbuild.c
index 9095f7ae..021f5343 100644
--- a/extflat/EFbuild.c
+++ b/extflat/EFbuild.c
@@ -1263,7 +1263,8 @@ efBuildDevNode(def, name, isSubsNode)
 	{
 	    /* This node is declared to be an implicit port */
 	    nn->efnn_node->efnode_flags |= EF_SUBS_PORT;
-	    nn->efnn_port = -1;
+	    if (isNewNode == TRUE)
+		nn->efnn_port = -1;
 	    def->def_flags |= DEF_SUBSNODES;
 	}
 	nn->efnn_node->efnode_flags |= EF_SUBS_NODE;