diff --git a/cad/xyce/Makefile b/cad/xyce/Makefile
index 558dca5707a6..b9e2a23955d0 100644
--- a/cad/xyce/Makefile
+++ b/cad/xyce/Makefile
@@ -1,59 +1,75 @@
 PORTNAME=	xyce
 DISTVERSION=	7.5.0
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	https://github.com/Xyce/Xyce/archive/refs/tags/
 DISTNAME=	Release-${DISTVERSION}
-DIST_SUBDIR=	xyce-${DISTVERSION}
+DIST_SUBDIR=	${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Xyce electronic simulator
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libamd.so:math/suitesparse-amd \
-		libblas.so:math/blas \
+LIB_DEPENDS=	libblas.so:math/blas \
 		libfftw3.so:math/fftw3 \
 		liblapack.so:math/lapack \
 		libtpetra.so:science/trilinos \
+		\
+		libamd.so:math/suitesparse-amd \
+		libcholmod.so:math/suitesparse-cholmod \
+		libcolamd.so:math/suitesparse-colamd \
+		libsuitesparseconfig.so:math/suitesparse-config \
 		libumfpack.so:math/suitesparse-umfpack
-TEST_DEPENDS=	git:devel/git
+TEST_DEPENDS=	git:devel/git \
+		${PYNUMPY} \
+		${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
+		# also needs pycompadre
 
-USES=		bison cmake localbase
-
-CMAKE_ON=	BUILD_SHARED_LIBS
+USES=		autoreconf bison gmake fortran libtool localbase perl5 python:test # GNU tools should be used for 7.5 and on until the cmake cbuild is declared stable
+USE_CXXSTD=	c++14 # otherwise configure fails because of c++14 features like std::conditional_t
+USE_LDCONFIG=	yes
+USE_PERL5=	test
 
 WRKSRC=		${WRKDIR}/Xyce-Release-${DISTVERSION}
 
-post-install:
-	@cd ${STAGEDIR}${PREFIX} && \
-		${RM} ${STAGEDIR}${PREFIX}/doc/README.TXT && \
-		${RMDIR} ${STAGEDIR}${PREFIX}/doc
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	LEX=/usr/bin/flex \
+		--enable-stokhos \
+		--enable-amesos \
+		--enable-shared \
+		--disable-static
+
+INSTALL_TARGET=	install-strip
+
+BINARY_ALIAS=	python=${PYTHON_CMD} # only for tests
 
 do-test:
 	# checkout tests
 	@cd ${WRKDIR} && \
 		${ECHO} "cloning git repository ..." && \
 		${RM} -rf Xyce_Regression && \
 		git clone -q https://github.com/Xyce/Xyce_Regression.git && \
 		cd Xyce_Regression && \
 		git checkout -q Release-${DISTVERSION}
 
 	# run tests
 	@cd ${TEST_WRKSRC} && ( \
 		${ECHO} "running tests ..."; \
 		eval `${WRKDIR}/Xyce_Regression/TestScripts/suggestXyceTagList.sh ${STAGEDIR}${PREFIX}/bin/Xyce` ; \
-		${WRKDIR}/Xyce_Regression/TestScripts/run_xyce_regression \
+		${SETENV} ${TEST_ENV} ${WRKDIR}/Xyce_Regression/TestScripts/run_xyce_regression \
 			--output=${WRKDIR}/Xyce_Test \
 			--xyce_test="${WRKDIR}/Xyce_Regression" \
 			--resultfile=${WRKDIR}/serial_results \
 			--taglist="$$TAGLIST" \
 			${STAGEDIR}${PREFIX}/bin/Xyce \
 	)
 	# Testssuite doesn't stop when Ctrl-C is pressed: https://github.com/Xyce/Xyce_Regression/issues/1
 
 # Trilinos build instructions for Xyce: https://xyce.sandia.gov/documentation-tutorials/building-guide/#instTrilinos
 # Xyce build instructions: https://xyce.sandia.gov/documentation-tutorials/building-guide/
 # docs are in https://xyce.sandia.gov/files/xyce/Xyce_Docs-7.5.tar.gz
 
 .include <bsd.port.mk>
diff --git a/cad/xyce/pkg-plist b/cad/xyce/pkg-plist
index 390f7b41e0f2..2f8ee5043571 100644
--- a/cad/xyce/pkg-plist
+++ b/cad/xyce/pkg-plist
@@ -1,85 +1,97 @@
 bin/Xyce
 include/N_ANP_NoiseData.h
 include/N_ANP_fwd.h
 include/N_CIR_GenCouplingSimulator.h
 include/N_CIR_Xyce.h
 include/N_DEV_ADC.h
 include/N_DEV_BJT.h
 include/N_DEV_Capacitor.h
 include/N_DEV_Configuration.h
 include/N_DEV_Const.h
 include/N_DEV_DAC.h
 include/N_DEV_Depend.h
 include/N_DEV_Device.h
 include/N_DEV_DeviceBlock.h
 include/N_DEV_DeviceEntity.h
 include/N_DEV_DeviceInstance.h
 include/N_DEV_DeviceMaster.h
 include/N_DEV_DeviceModel.h
 include/N_DEV_DeviceOptions.h
 include/N_DEV_DeviceSupport.h
 include/N_DEV_Diode.h
 include/N_DEV_ExternData.h
 include/N_DEV_ExternalSimulationData.h
 include/N_DEV_InstanceName.h
 include/N_DEV_JFET.h
 include/N_DEV_MOSFET1.h
 include/N_DEV_Message.h
 include/N_DEV_Param.h
 include/N_DEV_Pars.h
 include/N_DEV_Resistor.h
 include/N_DEV_SolverState.h
 include/N_DEV_Units.h
 include/N_DEV_VectorComputeInterface.h
 include/N_DEV_fwd.h
 include/N_ERH_Message.h
 include/N_ERH_fwd.h
 include/N_IO_CmdParse.h
 include/N_IO_ExtOutInterface.h
 include/N_IO_HangingResistor.h
 include/N_IO_OutputTypes.h
 include/N_IO_fwd.h
 include/N_LAS_Matrix.h
 include/N_LAS_MultiVector.h
 include/N_LAS_Vector.h
 include/N_LAS_fwd.h
 include/N_LOA_Loader.h
 include/N_LOA_fwd.h
 include/N_NLS_TwoLevelEnum.h
 include/N_NLS_fwd.h
 include/N_PDS_MPI.h
 include/N_PDS_Manager.h
 include/N_PDS_ParallelMachine.h
 include/N_PDS_Serial.h
 include/N_PDS_fwd.h
 include/N_TIA_TwoLevelError.h
 include/N_TIA_fwd.h
 include/N_TOP_fwd.h
 include/N_UTL_BreakPoint.h
 include/N_UTL_Diagnostic.h
 include/N_UTL_Expression.h
 include/N_UTL_ExpressionData.h
 include/N_UTL_ExpressionSymbolTable.h
 include/N_UTL_FeatureTest.h
 include/N_UTL_FormatTime.h
 include/N_UTL_Interface_Enum_Types.h
 include/N_UTL_JSON.h
 include/N_UTL_MachDepParams.h
 include/N_UTL_Marshal.h
 include/N_UTL_Math.h
 include/N_UTL_Misc.h
 include/N_UTL_NameLevelKey.h
 include/N_UTL_NetlistLocation.h
 include/N_UTL_NoCase.h
 include/N_UTL_NodeSymbols.h
 include/N_UTL_Op.h
 include/N_UTL_Pack.h
 include/N_UTL_Param.h
 include/N_UTL_ReportHandler.h
 include/N_UTL_StatMetricTraits.h
 include/N_UTL_Stats.h
 include/N_UTL_TypeIndex.h
 include/N_UTL_Xyce.h
 include/N_UTL_fwd.h
 include/Xyce_config.h
 lib/libxyce.so
+lib/libxyce.so.0
+lib/libxyce.so.0.0.0
+share/xml/adms.implicit.xml
+share/xml/html_params.xml
+share/xml/xyceAnalogFunction_nosac.xml
+share/xml/xyceBasicTemplates_nosac.xml
+share/xml/xyceBootstrapFile.xml
+share/xml/xyceHeaderFile_nosac.xml
+share/xml/xyceImplementationFile_nosac.xml
+share/xml/xyceMakefile.am.xml
+share/xml/xyceOutVarsDoc.xml
+share/xml/xyceVersion_nosac.xml