From f3bfde60f0f484ea9b6f39ffa6acd4e15e9cc1a4 Mon Sep 17 00:00:00 2001
From: Tim Edwards <tim@opencircuitdesign.com>
Date: Tue, 6 Aug 2024 11:17:27 -0400
Subject: [PATCH] Change to ext2spice which should solve the problem of ports
 no longer being output in order after flattening a circuit.

---
 VERSION               | 2 +-
 ext2spice/ext2spice.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 7659510c..e4716a47 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.3.487
+8.3.488
diff --git a/ext2spice/ext2spice.c b/ext2spice/ext2spice.c
index 6ae81ed1..0edd34fc 100644
--- a/ext2spice/ext2spice.c
+++ b/ext2spice/ext2spice.c
@@ -1816,6 +1816,9 @@ topVisit(def, doStub)
 	snode = sname->efnn_node;
 	if ((!snode) || (!(snode->efnode_flags & EF_PORT))) continue;
         explicit = FALSE;
+	portorder = snode->efnode_name->efnn_port;
+	if (portorder > portmax) portmax = portorder;
+	if (portorder != -1) explicit = TRUE;
 	for (nodeName = sname; nodeName != NULL; nodeName = nodeName->efnn_next)
 	{
 	    portorder = nodeName->efnn_port;