diff --git a/cad/surelog/Makefile b/cad/surelog/Makefile
index 431f375a6d9a..2915dd0247a3 100644
--- a/cad/surelog/Makefile
+++ b/cad/surelog/Makefile
@@ -1,58 +1,58 @@
 PORTNAME=	surelog
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.48
+DISTVERSION=	1.49
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	SystemVerilog 2017 Pre-processor, Parser, Elaborator, etc
 WWW=		https://github.com/chipsalliance/Surelog
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_aarch64=	compilation fails: Creating OVM precompiled package... Segmentation fault (core dumped) # update to the current revision might help but it has C++ errors
 BROKEN_armv6=	compilation fails: Creating OVM precompiled package... libunwind: personality function returned unknown result 5
 BROKEN_i386=	compilation fails: conversion function cannot be redeclared, see https://github.com/chipsalliance/Surelog/issues/3206
 
 BUILD_DEPENDS=	utf8cpp>0:devel/utf8cpp \
 		${PYTHON_PKGNAMEPREFIX}orderedmultidict>0:devel/py-orderedmultidict@${PY_FLAVOR}
 LIB_DEPENDS=	libtcmalloc.so:devel/google-perftools
 
 USES=		cmake:testing compiler:c++17-lang localbase:ldflags tcl:86,build
 USE_JAVA=	17
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	chipsalliance
 GH_PROJECT=	Surelog
 GH_TUPLE=	alainmarcel:antlr4:3143e88:antlr4/third_party/antlr4 \
 		chipsalliance:UHDM:1aaa156:UHDM/third_party/UHDM \
 			capnproto:capnproto:14f24a4:UHDM_capnproto/third_party/UHDM/third_party/capnproto \
 		google:googletest:e1ee0fa:googletest/third_party/googletest \
 		google:flatbuffers:32a6744:flatbuffers/third_party/flatbuffers
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_ARGS=	-DFREEBSD_JAVA_VERSION=${USE_JAVA} \
 		-DPython3_EXECUTABLE=${PYTHON_CMD}
 CMAKE_TESTING_ON=	SURELOG_BUILD_TESTS
 
 CONFLICTS_INSTALL=	capnproto capnproto080 uhdm # bin/uhdm-dump lib/libcapnp.so
 
 BINARY_ALIAS=	python3=${PYTHON_CMD} tclsh=${TCLSH}
 
 OPTIONS_DEFINE=	PYTHON
 OPTIONS_SUB=	yes
 
 PYTHON_USES=		python
 PYTHON_USES_OFF=	python:build
 PYTHON_CMAKE_BOOL=	SURELOG_WITH_PYTHON
 PYTHON_CMAKE_ON=	-DFREEBSD_PYTHON_DISTVERSION=${PYTHON_DISTVERSION}
 
 PORTSCOUT=	limit:^.*[0-9]\.[0-9] # prevent tags like 'show'
 
 post-install:
 	@${RMDIR} \
 		${STAGEDIR}${PREFIX}/bin/pkg/work \
 		${STAGEDIR}${PREFIX}/bin/pkg
 
 .include <bsd.port.mk>
diff --git a/cad/surelog/distinfo b/cad/surelog/distinfo
index 0c6ad084395b..1885110f4d44 100644
--- a/cad/surelog/distinfo
+++ b/cad/surelog/distinfo
@@ -1,13 +1,13 @@
-TIMESTAMP = 1678326199
-SHA256 (chipsalliance-Surelog-v1.48_GH0.tar.gz) = 4cd7335b6f4f4fdaf2240fa554f92f18d502b156ffcabe9c3ee66da765fce7b8
-SIZE (chipsalliance-Surelog-v1.48_GH0.tar.gz) = 91894912
+TIMESTAMP = 1679717954
+SHA256 (chipsalliance-Surelog-v1.49_GH0.tar.gz) = 2efda0c9b96ffa35eb4a55d7b7bf55bf5f02bbe37a354c0a3dd3f5f22630f80f
+SIZE (chipsalliance-Surelog-v1.49_GH0.tar.gz) = 91929172
 SHA256 (alainmarcel-antlr4-3143e88_GH0.tar.gz) = cc950334f511b91b9b47bc8b84b60a7f7ae85d3ab2cb7a8596a9a226a53386ce
 SIZE (alainmarcel-antlr4-3143e88_GH0.tar.gz) = 4310506
 SHA256 (chipsalliance-UHDM-1aaa156_GH0.tar.gz) = fb356d189c20e3361c30de3f73e579d60e3dbf9a32b51a580679552dc08593c0
 SIZE (chipsalliance-UHDM-1aaa156_GH0.tar.gz) = 1751813
 SHA256 (capnproto-capnproto-14f24a4_GH0.tar.gz) = 1130e78658e8b1ceb3a69a6b3a964913f22505532ab217299e5600f371922877
 SIZE (capnproto-capnproto-14f24a4_GH0.tar.gz) = 2121570
 SHA256 (google-googletest-e1ee0fa_GH0.tar.gz) = d2d59b967237e554f5d816892b4aa831ed024d3af7ffcfde1e232260a19d4501
 SIZE (google-googletest-e1ee0fa_GH0.tar.gz) = 865239
 SHA256 (google-flatbuffers-32a6744_GH0.tar.gz) = 826bb0eb96e79a909592c9fb4c4ef775d61a0b4c30e9db0249ff924830cf3cf7
 SIZE (google-flatbuffers-32a6744_GH0.tar.gz) = 2198497
diff --git a/cad/surelog/pkg-plist b/cad/surelog/pkg-plist
index 48d660292574..022be4238094 100644
--- a/cad/surelog/pkg-plist
+++ b/cad/surelog/pkg-plist
@@ -1,379 +1,380 @@
 bin/roundtrip
 bin/surelog
 bin/uhdm-cmp
 bin/uhdm-dump
 bin/uhdm-hier
 cmake/Surelog-%%CMAKE_BUILD_TYPE%%.cmake
 cmake/Surelog.cmake
-cmake/SurelogConfig.cmake
 include/Surelog/API/PythonAPI.h
 include/Surelog/API/SLAPI.h
 include/Surelog/API/Surelog.h
 include/Surelog/CommandLine/CommandLineParser.h
 include/Surelog/Common/ClockingBlockHolder.h
 include/Surelog/Common/Containers.h
 include/Surelog/Common/FileSystem.h
 include/Surelog/Common/NodeId.h
 include/Surelog/Common/PathId.h
 include/Surelog/Common/PlatformFileSystem.h
 include/Surelog/Common/PortNetHolder.h
 include/Surelog/Common/RTTI.h
 include/Surelog/Common/SymbolId.h
 include/Surelog/Config/Config.h
 include/Surelog/Config/ConfigSet.h
 include/Surelog/Design/BindStmt.h
 include/Surelog/Design/ClockingBlock.h
 include/Surelog/Design/DataType.h
 include/Surelog/Design/DefParam.h
 include/Surelog/Design/Design.h
 include/Surelog/Design/DesignComponent.h
 include/Surelog/Design/DesignElement.h
 include/Surelog/Design/DummyType.h
 include/Surelog/Design/Enum.h
 include/Surelog/Design/FileCNodeId.h
 include/Surelog/Design/FileContent.h
 include/Surelog/Design/Function.h
 include/Surelog/Design/Instance.h
 include/Surelog/Design/LetStmt.h
 include/Surelog/Design/ModPort.h
 include/Surelog/Design/ModuleDefinition.h
 include/Surelog/Design/ModuleInstance.h
 include/Surelog/Design/Netlist.h
 include/Surelog/Design/ParamAssign.h
 include/Surelog/Design/Parameter.h
 include/Surelog/Design/Scope.h
 include/Surelog/Design/Signal.h
 include/Surelog/Design/SimpleType.h
 include/Surelog/Design/Statement.h
 include/Surelog/Design/Struct.h
 include/Surelog/Design/Task.h
 include/Surelog/Design/TfPortItem.h
 include/Surelog/Design/TimeInfo.h
 include/Surelog/Design/Union.h
 include/Surelog/Design/VObject.h
 include/Surelog/Design/ValuedComponentI.h
 include/Surelog/DesignCompile/CompileHelper.h
 include/Surelog/ErrorReporting/Error.h
 include/Surelog/ErrorReporting/ErrorContainer.h
 include/Surelog/ErrorReporting/ErrorDefinition.h
 include/Surelog/ErrorReporting/Location.h
 include/Surelog/ErrorReporting/LogListener.h
 include/Surelog/ErrorReporting/Report.h
 include/Surelog/ErrorReporting/Waiver.h
 include/Surelog/Expression/ExprBuilder.h
 include/Surelog/Expression/Value.h
 include/Surelog/Library/Library.h
 include/Surelog/Library/LibrarySet.h
 include/Surelog/Package/Package.h
 include/Surelog/SourceCompile/AstListener.h
 include/Surelog/SourceCompile/AstTraceListener.h
 include/Surelog/SourceCompile/SymbolTable.h
 include/Surelog/SourceCompile/VObjectTypes.h
 include/Surelog/Testbench/ClassDefinition.h
 include/Surelog/Testbench/ClassObject.h
 include/Surelog/Testbench/Constraint.h
 include/Surelog/Testbench/CoverGroupDefinition.h
 include/Surelog/Testbench/FunctionMethod.h
 include/Surelog/Testbench/Program.h
 include/Surelog/Testbench/Property.h
 include/Surelog/Testbench/TaskMethod.h
 include/Surelog/Testbench/TypeDef.h
 include/Surelog/Testbench/Variable.h
 include/Surelog/surelog.h
 include/uhdm/BaseClass.h
 include/uhdm/ElaboratorListener.h
 include/uhdm/ExprEval.h
 include/uhdm/NumUtils.h
 include/uhdm/RTTI.h
 include/uhdm/Serializer.h
 include/uhdm/SymbolFactory.h
 include/uhdm/SymbolId.h
 include/uhdm/SynthSubset.h
 include/uhdm/UhdmAdjuster.h
 include/uhdm/UhdmLint.h
 include/uhdm/UhdmListener.h
 include/uhdm/VpiListener.h
 include/uhdm/VpiListenerTracer.h
 include/uhdm/actual_group.h
 include/uhdm/alias_stmt.h
 include/uhdm/always.h
 include/uhdm/any_pattern.h
 include/uhdm/array_expr.h
 include/uhdm/array_net.h
 include/uhdm/array_typespec.h
 include/uhdm/array_var.h
 include/uhdm/assert_stmt.h
 include/uhdm/assertion.h
 include/uhdm/assign_stmt.h
 include/uhdm/assignment.h
 include/uhdm/assume.h
 include/uhdm/atomic_stmt.h
 include/uhdm/attribute.h
 include/uhdm/begin.h
 include/uhdm/bit_select.h
 include/uhdm/bit_typespec.h
 include/uhdm/bit_var.h
 include/uhdm/break_stmt.h
 include/uhdm/byte_typespec.h
 include/uhdm/byte_var.h
 include/uhdm/case_item.h
 include/uhdm/case_property.h
 include/uhdm/case_property_item.h
 include/uhdm/case_stmt.h
 include/uhdm/chandle_typespec.h
 include/uhdm/chandle_var.h
 include/uhdm/checker_decl.h
 include/uhdm/checker_inst.h
 include/uhdm/checker_inst_port.h
 include/uhdm/checker_port.h
 include/uhdm/class_defn.h
 include/uhdm/class_hierarchy.txt
 include/uhdm/class_obj.h
 include/uhdm/class_typespec.h
 include/uhdm/class_var.h
 include/uhdm/clocked_property.h
 include/uhdm/clocked_seq.h
 include/uhdm/clocking_block.h
 include/uhdm/clocking_io_decl.h
 include/uhdm/clone_tree.h
 include/uhdm/concurrent_assertions.h
 include/uhdm/constant.h
 include/uhdm/constr_foreach.h
 include/uhdm/constr_if.h
 include/uhdm/constr_if_else.h
 include/uhdm/constraint.h
 include/uhdm/constraint_expr.h
 include/uhdm/constraint_item_group.h
 include/uhdm/constraint_ordering.h
 include/uhdm/cont_assign.h
 include/uhdm/cont_assign_bit.h
 include/uhdm/containers.h
 include/uhdm/continue_stmt.h
 include/uhdm/cover.h
 include/uhdm/deassign.h
 include/uhdm/def_param.h
 include/uhdm/delay_control.h
 include/uhdm/delay_term.h
 include/uhdm/design.h
 include/uhdm/disable.h
 include/uhdm/disable_fork.h
 include/uhdm/disables.h
 include/uhdm/dist_item.h
 include/uhdm/distribution.h
 include/uhdm/do_while.h
 include/uhdm/enum_const.h
 include/uhdm/enum_net.h
 include/uhdm/enum_struct_packed_net_group.h
 include/uhdm/enum_struct_union_packed_array_typespec_group.h
 include/uhdm/enum_struct_union_packed_var_group.h
 include/uhdm/enum_typespec.h
 include/uhdm/enum_var.h
 include/uhdm/event_control.h
 include/uhdm/event_stmt.h
 include/uhdm/event_typespec.h
 include/uhdm/expect_stmt.h
 include/uhdm/expr.h
 include/uhdm/expr_constr_group.h
 include/uhdm/expr_dist.h
 include/uhdm/expr_interf_expr_group.h
 include/uhdm/expr_range_group.h
 include/uhdm/expr_ref_obj_group.h
 include/uhdm/expr_sequence_inst_group.h
 include/uhdm/expr_sequence_inst_named_event_group.h
 include/uhdm/expr_tchk_term_group.h
 include/uhdm/expr_typespec_group.h
 include/uhdm/extends.h
 include/uhdm/final_stmt.h
 include/uhdm/for_stmt.h
 include/uhdm/force.h
 include/uhdm/foreach_stmt.h
 include/uhdm/forever_stmt.h
 include/uhdm/fork_stmt.h
 include/uhdm/func_call.h
 include/uhdm/function.h
 include/uhdm/gate.h
 include/uhdm/gate_array.h
 include/uhdm/gen_scope.h
 include/uhdm/gen_scope_array.h
 include/uhdm/gen_var.h
 include/uhdm/hier_path.h
 include/uhdm/if_else.h
 include/uhdm/if_stmt.h
 include/uhdm/immediate_assert.h
 include/uhdm/immediate_assume.h
 include/uhdm/immediate_cover.h
 include/uhdm/implication.h
 include/uhdm/import_typespec.h
 include/uhdm/include_file_info.h
 include/uhdm/indexed_part_select.h
 include/uhdm/initial.h
 include/uhdm/instance.h
 include/uhdm/instance_array.h
 include/uhdm/instance_item.h
 include/uhdm/int_typespec.h
 include/uhdm/int_var.h
 include/uhdm/integer_net.h
 include/uhdm/integer_typespec.h
 include/uhdm/integer_var.h
 include/uhdm/interf_prog_mod_group.h
 include/uhdm/interface_array.h
 include/uhdm/interface_expr.h
 include/uhdm/interface_inst.h
 include/uhdm/interface_tf_decl.h
 include/uhdm/interface_typespec.h
 include/uhdm/io_decl.h
 include/uhdm/let_decl.h
 include/uhdm/let_expr.h
 include/uhdm/logic_net.h
 include/uhdm/logic_typespec.h
 include/uhdm/logic_var.h
 include/uhdm/long_int_typespec.h
 include/uhdm/long_int_var.h
 include/uhdm/method_func_call.h
 include/uhdm/method_func_task_call_group.h
 include/uhdm/method_task_call.h
 include/uhdm/mod_path.h
 include/uhdm/modport.h
 include/uhdm/module_array.h
 include/uhdm/module_inst.h
 include/uhdm/module_typespec.h
 include/uhdm/multiclock_sequence_expr.h
 include/uhdm/named_begin.h
 include/uhdm/named_event.h
 include/uhdm/named_event_array.h
 include/uhdm/named_event_sequence_expr_group.h
 include/uhdm/named_fork.h
 include/uhdm/net.h
 include/uhdm/net_bit.h
 include/uhdm/net_drivers.h
 include/uhdm/net_loads.h
 include/uhdm/nets.h
 include/uhdm/nets_vars_ref_obj_group.h
 include/uhdm/null_stmt.h
 include/uhdm/operand_group.h
 include/uhdm/operation.h
 include/uhdm/ordered_wait.h
 include/uhdm/package.h
 include/uhdm/packed_array_net.h
 include/uhdm/packed_array_typespec.h
 include/uhdm/packed_array_var.h
 include/uhdm/param_assign.h
 include/uhdm/parameter.h
 include/uhdm/parameters.h
 include/uhdm/part_select.h
 include/uhdm/path_term.h
 include/uhdm/pattern.h
 include/uhdm/pattern_expr_group.h
 include/uhdm/port.h
 include/uhdm/port_bit.h
 include/uhdm/ports.h
 include/uhdm/prim_term.h
 include/uhdm/primitive.h
 include/uhdm/primitive_array.h
 include/uhdm/process_stmt.h
 include/uhdm/program.h
 include/uhdm/program_array.h
 include/uhdm/prop_formal_decl.h
 include/uhdm/property_decl.h
 include/uhdm/property_expr_group.h
 include/uhdm/property_expr_named_event_group.h
 include/uhdm/property_inst.h
 include/uhdm/property_inst_spec_group.h
 include/uhdm/property_spec.h
 include/uhdm/property_typespec.h
 include/uhdm/range.h
 include/uhdm/real_typespec.h
 include/uhdm/real_var.h
 include/uhdm/ref_obj.h
 include/uhdm/ref_obj_interf_net_var_group.h
 include/uhdm/ref_var.h
 include/uhdm/reg.h
 include/uhdm/reg_array.h
 include/uhdm/%%CMAKE_BUILD_TYPE%%.h
 include/uhdm/repeat.h
 include/uhdm/repeat_control.h
 include/uhdm/restrict.h
 include/uhdm/return_stmt.h
 include/uhdm/scope.h
 include/uhdm/seq_formal_decl.h
 include/uhdm/sequence_decl.h
 include/uhdm/sequence_expr_group.h
 include/uhdm/sequence_expr_multiclock_group.h
 include/uhdm/sequence_inst.h
 include/uhdm/sequence_typespec.h
 include/uhdm/short_int_typespec.h
 include/uhdm/short_int_var.h
 include/uhdm/short_real_typespec.h
 include/uhdm/short_real_var.h
 include/uhdm/simple_expr.h
 include/uhdm/simple_expr_use_group.h
 include/uhdm/soft_disable.h
 include/uhdm/spec_param.h
 include/uhdm/stmt.h
 include/uhdm/string_typespec.h
 include/uhdm/string_var.h
 include/uhdm/struct_net.h
 include/uhdm/struct_pattern.h
 include/uhdm/struct_typespec.h
 include/uhdm/struct_var.h
 include/uhdm/sv_vpi_user.h
 include/uhdm/switch_array.h
 include/uhdm/switch_tran.h
 include/uhdm/sys_func_call.h
 include/uhdm/sys_func_task_call_group.h
 include/uhdm/sys_task_call.h
 include/uhdm/table_entry.h
 include/uhdm/tagged_pattern.h
 include/uhdm/task.h
 include/uhdm/task_call.h
 include/uhdm/task_func.h
 include/uhdm/task_func_named_begin_fork_group.h
 include/uhdm/tchk.h
 include/uhdm/tchk_term.h
 include/uhdm/tf_call.h
 include/uhdm/tf_call_args.h
 include/uhdm/thread_obj.h
 include/uhdm/time_net.h
 include/uhdm/time_typespec.h
 include/uhdm/time_var.h
 include/uhdm/type_parameter.h
 include/uhdm/typespec.h
 include/uhdm/typespec_member.h
 include/uhdm/udp.h
 include/uhdm/udp_array.h
 include/uhdm/udp_defn.h
 include/uhdm/uhdm.h
 include/uhdm/uhdm_forward_decl.h
 include/uhdm/uhdm_types.h
 include/uhdm/uhdm_vpi_user.h
 include/uhdm/union_typespec.h
 include/uhdm/union_var.h
 include/uhdm/unsupported_expr.h
 include/uhdm/unsupported_stmt.h
 include/uhdm/unsupported_typespec.h
 include/uhdm/user_systf.h
 include/uhdm/var_bit.h
 include/uhdm/var_select.h
 include/uhdm/variable_drivers_group.h
 include/uhdm/variable_loads_group.h
 include/uhdm/variables.h
 include/uhdm/variables_operation_group.h
 include/uhdm/vhpi_user.h
 include/uhdm/virtual_interface_var.h
 include/uhdm/void_typespec.h
 include/uhdm/vpi_uhdm.h
 include/uhdm/vpi_user.h
 include/uhdm/vpi_visitor.h
 include/uhdm/wait_fork.h
 include/uhdm/wait_stmt.h
 include/uhdm/waits.h
 include/uhdm/while_stmt.h
+lib/cmake/SurelogConfig.cmake
 lib/libcapnp.so
 lib/libcapnp.so.0.8.0
 lib/libkj.so
 lib/libkj.so.0.8.0
+lib/libsurelog.so
 lib/libuhdm.so
 lib/surelog/libantlr4-runtime.a
 lib/surelog/libflatbuffers.a
-lib/surelog/libsurelog.a
 lib/uhdm/UHDM.capnp
+libdata/pkgconfig/Surelog.pc