Index: head/devel/upp/Makefile
===================================================================
--- head/devel/upp/Makefile	(revision 561223)
+++ head/devel/upp/Makefile	(revision 561224)
@@ -1,110 +1,114 @@
 # Created by: Matthias Sund <m.sund@arcor.de>
 # $FreeBSD$
 
 PORTNAME=	upp
-DISTVERSION=	14429
+DISTVERSION=	15260
 CATEGORIES=	devel x11-toolkits
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2020.1/
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2020.2/
 DISTNAME=	${PORTNAME}-posix-${PORTVERSION}
 
 MAINTAINER=	m.sund@arcor.de
 COMMENT=	Ultimate++, a BSD-licensed, cross-platform, C/C++ RAD suite
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/uppsrc/Core/Copying
 
-BROKEN=		fails to link
 BROKEN_powerpc=		Does not compile on ${ARCH}: error Unknown CPU architecture
 BROKEN_powerpc64=	Does not compile on ${ARCH}: error Unknown CPU architecture
 BROKEN_sparc64=		Does not compile on ${ARCH}
 
 USES=		compiler:c++14-lang pkgconfig:both tar:xz
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 MACRO_FLAGS=	-DflagBSD -Dflag${OPSYS:tu}
 
 PORTDATA=	bazaar examples reference tutorial uppsrc
 
 OPTIONS_DEFINE=	MYSQL OPENGL PGSQL SDL UDC USEMALLOC
 OPTIONS_DEFAULT=	IDE UDC UMK
 OPTIONS_MULTI=	BUILD
 OPTIONS_MULTI_BUILD=	IDE UMK
 BUILD_DESC=	Build/install
 IDE_DESC=	Build/install TheIDE (integrated development environment)
 IDE_DESKTOP_ENTRIES=	"TheIDE" "IDE for cross-platform C++ development" \
 		"${DATADIR}/uppsrc/ide/theide-48.png" "theide" \
 		"Development;IDE;GTK;" false
 IDE_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libnotify.so:devel/libnotify \
 		libpng.so:graphics/png
 IDE_PLIST_FILES=	bin/theide ${MANPREFIX}/man/man1/theide.1.gz
 IDE_USES=	gnome xorg
 IDE_USE=	XORG=x11 GNOME=cairo,gdkpixbuf2,gtk30
 UDC_DESC=	Install spelling dictionaries (*.udc files)
 UDC_VARS=	PORTDATA+=*.udc
 UMK_DESC=	Build/install UMK (U++ MaKe command line utility)
 UMK_PLIST_FILES=	bin/umk ${MANPREFIX}/man/man1/umk.1.gz
 USEMALLOC_DESC=	Compile without U++ heap allocator
 USEMALLOC_VARS=	MACRO_FLAGS+=-DflagUSEMALLOC
 # SDL/OPENGL/MYSQL/PGSQL dependencies are only for run-time for use by executables built by the IDE
 SDL_USES=	sdl
 SDL_USE=	SDL=sdl
 OPENGL_USES=	gl
 OPENGL_USE=	GL=gl,glu
 MYSQL_USES=	mysql
 PGSQL_USES=	pgsql
 LLD_UNSAFE=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
 # Disable some warnings for Clang
 CXXFLAGS+=	-Wno-logical-op-parentheses
 .endif
 
 CXXFLAGS_i386+=	-msse2
 
 post-patch: .SILENT
 	${REINPLACE_CMD} -e '/^CXX[[:blank:]]*=/d ; \
 		/^LDFLAGS[[:blank:]]*=/d ; /^LIBPATH[[:blank:]]*=/d ; \
 		/^Macro[[:blank:]]*=/s|-DflagLINUX|${MACRO_FLAGS}| ; \
 		/^CFLAGS[[:blank:]]*=/s|= -O3|+=| ; \
 		/^CXXFLAGS[[:blank:]]*=/s|= -O3|+=| ; \
 		/^OutDir_/s|-Linux|| ; \
 		s|-ldl|-lexecinfo|' \
 		${WRKSRC}/Makefile \
-		${WRKSRC}/uMakefile
+		${WRKSRC}/umkMakefile
 	${REINPLACE_CMD} -i '' -E '/^OutDir_/s|-Gui|| ; \
 		s/[[:blank:]]?`pkg-config --(cflags|libs) (freetype2|xcb|expat|xinerama|xrender|xft|xdmcp|xext)`//g' \
 		${WRKSRC}/Makefile
 # Add ${DATADIR} as an additional path to search for *.upp files
 # on first TheIDE launch before automatic configuration of assemblies
 	${REINPLACE_CMD} -e '/Scan(GetHomeDirFile("\*"/s|$$|\${.newline}		Scan("${DATADIR}/uppsrc");\${.newline}		Scan("${DATADIR}/*");|' \
 		${WRKSRC}/uppsrc/ide/Install.cpp
 
 do-build:
 
 do-build-IDE-on:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 		${MAKE_FLAGS} Makefile ${_MAKE_JOBS} OutFile="theide")
 
 do-build-UMK-on:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
-		${MAKE_FLAGS} uMakefile ${_MAKE_JOBS} OutFile="umk")
+		${MAKE_FLAGS} umkMakefile ${_MAKE_JOBS} OutFile="umk")
 
 do-install:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR} \
 		"-not ( -type d -empty ) -o -name '*.orig'")
-	(cd ${STAGEDIR}${DATADIR} && ${RMDIR} uppsrc/ide/SrcUpdater uppsrc/Web)
+	(cd ${STAGEDIR}${DATADIR} && ${RMDIR} uppsrc/ide/SrcUpdater uppsrc/Web \
+		bazaar/plugin/sundials/src/nvector/mpiplusx \
+		bazaar/plugin/sundials/src/nvector/openmp \
+		bazaar/plugin/sundials/src/nvector/parallel \
+		bazaar/plugin/sundials/src/nvector/pthreads \
+		bazaar/plugin/sundials/src/sunlinsol/klu)
 
 do-install-IDE-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/theide ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/uppsrc/ide/theide.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 do-install-UMK-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/umk ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/uppsrc/umk/umk.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.post.mk>
Index: head/devel/upp/distinfo
===================================================================
--- head/devel/upp/distinfo	(revision 561223)
+++ head/devel/upp/distinfo	(revision 561224)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1588515745
-SHA256 (upp-posix-14429.tar.xz) = 9f67329e64b85ef499463f7aef6afa88da8026a5a078b7a95b0129fa66fa5bf2
-SIZE (upp-posix-14429.tar.xz) = 65677844
+TIMESTAMP = 1602841898
+SHA256 (upp-posix-15260.tar.xz) = 3d5c4db9b6f06c7eba738baad1bd2bf516c5e08791bd49e48c5c05e052aa95bb
+SIZE (upp-posix-15260.tar.xz) = 81138948