diff --git a/cad/openroad/Makefile b/cad/openroad/Makefile
index d424e81bbc36..d892f8e8043c 100644
--- a/cad/openroad/Makefile
+++ b/cad/openroad/Makefile
@@ -1,59 +1,59 @@
 PORTNAME=	openroad
-DISTVERSION=	2021_03_09
-DISTVERSIONSUFFIX=	_stable
-PORTREVISION=	1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.0
+PORTEPOCH=	1
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	ASIC physical design tool
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	C++ issue on i386, should be resolved in the next update
 
 BUILD_DEPENDS=	base64:converters/base64 \
 		boost-libs>0:devel/boost-libs \
 		coin-or-lemon>0:math/lemon \
 		swig:devel/swig
 LIB_DEPENDS=	libcudd.so:math/cudd \
 		libfmt.so:devel/libfmt \
 		libspdlog.so:devel/spdlog
 
-USES=		bison compiler:c++17-lang cmake eigen:3 qt:5 localbase:ldflags tcl:86 # the code asks for tcl-87, but build fails: https://github.com/The-OpenROAD-Project/OpenROAD/issues/508
+USES=		bison compiler:c++17-lang cmake eigen:3 qt:5 localbase:ldflags python:3.7+,build tcl:86 # the code asks for tcl-87, but build fails: https://github.com/The-OpenROAD-Project/OpenROAD/issues/508
 USE_QT=		core gui widgets buildtools_build qmake_build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	The-OpenROAD-Project
 GH_PROJECT=	OpenROAD
-GH_TUPLE=	The-OpenROAD-Project:OpenSTA:181a9f2:The_OpenROAD_Project_OpenSTA/src/sta
+GH_TUPLE=	The-OpenROAD-Project:OpenSTA:be0d38e:The_OpenROAD_Project_OpenSTA/src/sta
 
 CMAKE_OFF=	BUILD_PYTHON FREEBSD_BUILD_TESTS
 CMAKE_ON=	BUILD_TCL
 CMAKE_ARGS=	-DFREEBSD_TCL_VER=${TCL_VER:S/.//} -DFREEBSD_TCL_INCLUDEDIR=${TCL_INCLUDEDIR}
 
 CXXFLAGS+=	-I${LOCALBASE}/include/eigen3
 
-BINARY_ALIAS=	tclsh=${TCLSH}
+BINARY_ALIAS=	python3=${PYTHON_CMD} tclsh=${TCLSH}
 
 PLIST_FILES=	bin/openroad \
 		bin/sta
 
 post-patch: # override the TCL version to be the same as USES=tcl sets
 	@${FIND} ${WRKSRC} -name FindTCL.cmake \
 		| ${XARGS} ${REINPLACE_CMD} -e ' \
 			s|set(TCL_POSSIBLE_NAMES |set(TCL_POSSIBLE_NAMES tcl$${FREEBSD_TCL_VER} |; \
 			s|PATHS $${TCL_LIB_PARENT1}|PATHS $${FREEBSD_TCL_INCLUDEDIR} $${TCL_LIB_PARENT1}|'
 
 post-install: # unnecessarily installs bundled OpenSTA project: https://github.com/The-OpenROAD-Project/OpenROAD/issues/597
 	${RM} -r ${STAGEDIR}${PREFIX}/include/sta ${STAGEDIR}${PREFIX}/lib/libOpenSTA.a
 
 do-test: # some tests are known to fail
 	@${MKDIR} ${WRKSRC}/build/src
 	@[ -f ${WRKSRC}/build/src/openroad ] || ${LN} ${STAGEDIR}${PREFIX}/bin/openroad ${WRKSRC}/build/src/openroad
 	@${ECHO} "==> Unit tests"
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} test/regression
 	@${ECHO} "==> Flow tests"
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} test/regression flow
 
 .include <bsd.port.mk>
diff --git a/cad/openroad/distinfo b/cad/openroad/distinfo
index 2fddfba1be13..7a7093820308 100644
--- a/cad/openroad/distinfo
+++ b/cad/openroad/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1615434359
-SHA256 (The-OpenROAD-Project-OpenROAD-2021_03_09_stable_GH0.tar.gz) = 0e872d1c607f7bc62d1516e93ae5f69d16d62771504be4a0d30e6016bc110233
-SIZE (The-OpenROAD-Project-OpenROAD-2021_03_09_stable_GH0.tar.gz) = 175470490
-SHA256 (The-OpenROAD-Project-OpenSTA-181a9f2_GH0.tar.gz) = da9764be47bd6e895a19fb48daeea1052e8aeee9778e940ccd2b55c6aaa9b7d6
-SIZE (The-OpenROAD-Project-OpenSTA-181a9f2_GH0.tar.gz) = 4895949
+TIMESTAMP = 1627018650
+SHA256 (The-OpenROAD-Project-OpenROAD-v2.0_GH0.tar.gz) = 5926af338ba2adcda5e5e73b50feb9e4d98838aebf31fe91763dc74cf87cfbdc
+SIZE (The-OpenROAD-Project-OpenROAD-v2.0_GH0.tar.gz) = 222297114
+SHA256 (The-OpenROAD-Project-OpenSTA-be0d38e_GH0.tar.gz) = 301e8499ade5fd1a1db7c9565295f4b0fbffc70bd9a8ef439a5c48804480b34c
+SIZE (The-OpenROAD-Project-OpenSTA-be0d38e_GH0.tar.gz) = 4898566
diff --git a/cad/openroad/files/patch-src_CMakeLists.txt b/cad/openroad/files/patch-src_CMakeLists.txt
index 26c4f8703886..c5fe75299e5f 100644
--- a/cad/openroad/files/patch-src_CMakeLists.txt
+++ b/cad/openroad/files/patch-src_CMakeLists.txt
@@ -1,11 +1,11 @@
---- src/CMakeLists.txt.orig	2021-03-09 18:14:44 UTC
+--- src/CMakeLists.txt.orig	2021-07-16 21:09:30 UTC
 +++ src/CMakeLists.txt
-@@ -57,7 +57,7 @@ if (TCL_READLINE_H)
-   message(STATUS "TCL readline header: ${TCL_READLINE_H}")
+@@ -64,7 +64,7 @@ if (BUILD_TCLX AND TCLX_H)
+   message(STATUS "TclX header: ${TCLX_H}")
  endif()
  
 -find_package(SWIG 3.0 REQUIRED)
 +find_package(SWIG REQUIRED)
  include(UseSWIG)
  
  find_package(Boost REQUIRED)
diff --git a/cad/openroad/files/patch-src_OpenDB_src_db_CMakeLists.txt b/cad/openroad/files/patch-src_OpenDB_src_db_CMakeLists.txt
index 68b644bb3f94..4ba87720d6ff 100644
--- a/cad/openroad/files/patch-src_OpenDB_src_db_CMakeLists.txt
+++ b/cad/openroad/files/patch-src_OpenDB_src_db_CMakeLists.txt
@@ -1,9 +1,11 @@
---- src/OpenDB/src/db/CMakeLists.txt.orig	2021-03-11 04:05:57 UTC
+--- src/OpenDB/src/db/CMakeLists.txt.orig	2021-07-16 21:09:30 UTC
 +++ src/OpenDB/src/db/CMakeLists.txt
-@@ -138,5 +138,5 @@ target_link_libraries(opendb
+@@ -141,7 +141,7 @@ target_link_libraries(opendb
          zlib 
          zutil
-         utility
+         utl
 -        tcl
 +        tcl${FREEBSD_TCL_VER}
  )
+ 
+ messages(
diff --git a/cad/openroad/files/patch-src_OpenDB_src_swig_tcl_CMakeLists.txt b/cad/openroad/files/patch-src_OpenDB_src_swig_tcl_CMakeLists.txt
index 8c99a3958aa7..feb38bf60ef5 100644
--- a/cad/openroad/files/patch-src_OpenDB_src_swig_tcl_CMakeLists.txt
+++ b/cad/openroad/files/patch-src_OpenDB_src_swig_tcl_CMakeLists.txt
@@ -1,11 +1,11 @@
---- src/OpenDB/src/swig/tcl/CMakeLists.txt.orig	2021-03-11 17:45:34 UTC
+--- src/OpenDB/src/swig/tcl/CMakeLists.txt.orig	2021-07-16 21:09:30 UTC
 +++ src/OpenDB/src/swig/tcl/CMakeLists.txt
-@@ -15,7 +15,7 @@ target_link_libraries(opendbtcl
+@@ -16,7 +16,7 @@ target_link_libraries(opendbtcl
      PUBLIC
          opendb
-         utility
+         utl
 -        tcl
 +        tcl${FREEBSD_TCL_VER}
          cdl
- 	Boost::boost
- )
+         opendb_swig_common
+         Boost::boost
diff --git a/cad/openroad/files/patch-src_gui_src_scriptWidget.cpp b/cad/openroad/files/patch-src_gui_src_scriptWidget.cpp
deleted file mode 100644
index 9a4f7f7b8e50..000000000000
--- a/cad/openroad/files/patch-src_gui_src_scriptWidget.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gui/src/scriptWidget.cpp.orig	2021-03-09 18:14:44 UTC
-+++ src/gui/src/scriptWidget.cpp
-@@ -42,6 +42,8 @@
- #include <QTimer>
- #include <QVBoxLayout>
- 
-+#include <sys/errno.h> // for EINVAL
-+
- #include "openroad/OpenRoad.hh"
- #include "spdlog/formatter.h"
- #include "spdlog/sinks/base_sink.h"
diff --git a/cad/openroad/files/patch-src_flute3_etc_MakeDatVar.tcl b/cad/openroad/files/patch-src_stt_etc_MakeDatVar.tcl
similarity index 76%
rename from cad/openroad/files/patch-src_flute3_etc_MakeDatVar.tcl
rename to cad/openroad/files/patch-src_stt_etc_MakeDatVar.tcl
index 895392f0bde5..131f33a91821 100644
--- a/cad/openroad/files/patch-src_flute3_etc_MakeDatVar.tcl
+++ b/cad/openroad/files/patch-src_stt_etc_MakeDatVar.tcl
@@ -1,11 +1,11 @@
---- src/flute3/etc/MakeDatVar.tcl.orig	2021-03-11 03:51:07 UTC
-+++ src/flute3/etc/MakeDatVar.tcl
+--- src/stt/etc/MakeDatVar.tcl.orig	2021-07-23 05:46:52 UTC
++++ src/stt/etc/MakeDatVar.tcl
 @@ -32,7 +32,7 @@ close $var_stream
  set b64_file "[file rootname $dat_file].b64"
  set b64_file2 "[file rootname $dat_file].tr"
  
 -exec base64 -i $dat_file > $b64_file
 +exec base64 $dat_file > $b64_file
  # strip trailing \n from base64 file
  exec tr -d "\n" <$b64_file >$b64_file2
  exec cat < $b64_file2 >> $var_file