Index: devel/uppaal/Makefile
===================================================================
--- devel/uppaal/Makefile
+++ devel/uppaal/Makefile
@@ -2,61 +2,65 @@
 # $FreeBSD$
 
 PORTNAME=	uppaal
-PORTVERSION=	4.0.10
+DISTVERSION=	4.1.23
+DISTNAME=	${PORTNAME}64-${DISTVERSIONFULL}
 CATEGORIES=	devel java linux
 MASTER_SITES=	# empty
-DISTNAME=	uppaal-${PORTVERSION}-aca
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	Tool environment for modeling and verifying timed automata
 
-USES=		zip
-USE_LINUX=	yes
+LICENSE=	UPPAAL
+LICENSE_NAME=	UPPAAL License Agreement
+LICENSE_TEXT=	See: https://www.it.uu.se/research/group/darts/uppaal/download.shtml
+LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell no-auto-accept
+
+# I've not tried USES=linux:c6.
+USES=		linux:c7 zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
+JAVA_VERSION=	1.7+
 JAVA_RUN=	yes
+JAVA_OS=	linux
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-SUB_FILES=	uppaal verifyta
-SUB_LIST+=	PORTNAME=${PORTNAME}
-PLIST_SUB+=	PORTNAME=${PORTNAME}
-DOWNLOAD_URL=	http://www.it.uu.se/research/group/darts/uppaal/download.shtml
 NO_BUILD=	yes
+SUB_FILES=	verifyta
+SUB_LIST=	PORTNAME=${PORTNAME}
 
-MAN1=		uppaal.1
-MANCOMPRESSED=	no
+WRKSRC=		${WRKDIR}/${PORTNAME}64-${PORTVERSION}
 
-RESTRICTED=	Downloading requires completion of a license agreement
+PLIST_SUB=	PORTNAME=${PORTNAME}
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 .include <bsd.port.pre.mk>
 
-LINUX_SYSCTL=	${ECHO_CMD} `${SYSCTL} -n compat.linux.osrelease 2>/dev/null`
-LINUX_OSRELEASE=	${LINUX_SYSCTL}
-
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE=	please download ${DISTNAME}${EXTRACT_SUFX} into\
-${DISTDIR}/${DIST_SUBDIR} from ${DOWNLOAD_URL} and re-run make
+IGNORE=		may not be redistributed because of licensing reasons. Please visit https://www.it.uu.se/research/group/darts/uppaal/download.shtml to accept their license and download ${DISTFILES} into ${DISTDIR}
 .endif
 
 post-patch:
-	${BRANDELF} -t Linux ${WRKSRC}/bin-Linux/server
-	${MV} ${WRKSRC}/bin-Linux/server ${WRKSRC}/bin-Linux/server.exe
-	${BRANDELF} -t Linux ${WRKSRC}/bin-Linux/verifyta
+	@${MV} ${WRKSRC}/bin-Linux ${WRKSRC}/bin-FreeBSD
+	${REINPLACE_CMD} 's|java|${JAVA}|g' ${WRKSRC}/uppaal
 
+.for file in ld-linux.so
+	${BRANDELF} -t Linux ${WRKSRC}/bin-FreeBSD/${file}
+.endfor
+
 do-install:
-	${MKDIR} ${JAVASHAREDIR}/${PORTNAME}/lib
-	${INSTALL_PROGRAM} ${WRKSRC}/bin-Linux/* ${JAVASHAREDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/uppaal.jar ${JAVASHAREDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/lib/*.jar ${JAVASHAREDIR}/${PORTNAME}/lib
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/demo/* ${EXAMPLESDIR}
-	${INSTALL_MAN} ${WRKSRC}/man/man1/uppaal.1 ${PREFIX}/man/man1
-	${INSTALL_SCRIPT} ${WRKDIR}/verifyta ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKDIR}/uppaal ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR}
-.endif
+#	@${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}/lib
+#	${INSTALL_PROGRAM} ${WRKSRC}/bin-FreeBSD/* ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}
+#	${INSTALL_DATA} ${WRKSRC}/uppaal.jar ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}
+#	${INSTALL_DATA} ${WRKSRC}/lib/*.jar ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}/lib
+#	${INSTALL_MAN} ${WRKSRC}/man/man1/uppaal.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+#	${INSTALL_SCRIPT} ${WRKSRC}/verifyta ${STAGEDIR}${PREFIX}/bin
+#	${INSTALL_SCRIPT} ${WRKSRC}/uppaal ${STAGEDIR}${PREFIX}/bin
+
+#post-install-DOCS-on:
+#	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+#	${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}
+#
+#post-install-EXAMPLES-on:
+#	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+#	${INSTALL_DATA} ${WRKSRC}/demo/* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.post.mk>
Index: devel/uppaal/distinfo
===================================================================
--- devel/uppaal/distinfo
+++ devel/uppaal/distinfo
@@ -1,2 +1,3 @@
-SHA256 (uppaal-4.0.10-aca.zip) = 0b37a67d41e65f28d751ba879544281fbfb2a470404f929eb40ecc7735af716c
-SIZE (uppaal-4.0.10-aca.zip) = 5537915
+TIMESTAMP = 1574526718
+SHA256 (uppaal64-4.1.23.zip) = 07f88e782740bf31b08069f10b429ddb7c59d0c3d58cc749b5fbcd6af090ab52
+SIZE (uppaal64-4.1.23.zip) = 22367327
Index: devel/uppaal/pkg-descr
===================================================================
--- devel/uppaal/pkg-descr
+++ devel/uppaal/pkg-descr
@@ -6,4 +6,4 @@
 Information Technology at Uppsala University, Sweden and the
 Department of Computer Science at Aalborg University in Denmark.
 
-WWW: http://www.uppaal.com/
+WWW: https://www.it.uu.se/research/group/darts/uppaal/index.shtml
Index: devel/uppaal/pkg-plist
===================================================================
--- devel/uppaal/pkg-plist
+++ devel/uppaal/pkg-plist
@@ -1,5 +1,20 @@
-bin/uppaal
+bin/%%PORTNAME%%
 bin/verifyta
+man/man1/%%PORTNAME%%.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/2doors.q
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/2doors.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bridge.q
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bridge.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/deadlock.q
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fischer.q
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fischer.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fischer_symmetry.q
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fischer_symmetry.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interrupt.q
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interrupt.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/train-gate.q
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/train-gate.xml
 %%JAVASHAREDIR%%/%%PORTNAME%%/lib/editor.jar
 %%JAVASHAREDIR%%/%%PORTNAME%%/lib/jdom.jar
 %%JAVASHAREDIR%%/%%PORTNAME%%/lib/jh.jar
@@ -7,22 +22,6 @@
 %%JAVASHAREDIR%%/%%PORTNAME%%/lib/model.jar
 %%JAVASHAREDIR%%/%%PORTNAME%%/lib/swixml.jar
 %%JAVASHAREDIR%%/%%PORTNAME%%/server.exe
+%%JAVASHAREDIR%%/%%PORTNAME%%/socketserver
+%%JAVASHAREDIR%%/%%PORTNAME%%/%%PORTNAME%%.jar
 %%JAVASHAREDIR%%/%%PORTNAME%%/verifyta
-%%JAVASHAREDIR%%/%%PORTNAME%%/uppaal.jar
-%%EXAMPLESDIR%%/2doors.xml
-%%EXAMPLESDIR%%/2doors.q
-%%EXAMPLESDIR%%/bridge.xml
-%%EXAMPLESDIR%%/bridge.q
-%%EXAMPLESDIR%%/fischer.xml
-%%EXAMPLESDIR%%/fischer.q
-%%EXAMPLESDIR%%/fischer_symmetry.xml
-%%EXAMPLESDIR%%/fischer_symmetry.q
-%%EXAMPLESDIR%%/interrupt.xml
-%%EXAMPLESDIR%%/interrupt.q
-%%EXAMPLESDIR%%/train-gate.xml
-%%EXAMPLESDIR%%/train-gate.q
-@dirrm %%EXAMPLESDIR%%
-@dirrm %%JAVASHAREDIR%%/%%PORTNAME%%/lib
-@dirrm %%JAVASHAREDIR%%/%%PORTNAME%%
-%%PORTDOCS%%%%DOCSDIR%%/readme.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%