5 files changed, 30 insertions, 22 deletions

diff --git a/devel/uppaal/Makefile b/devel/uppaal/Makefile
index 4ea8b0b3ad3a..d37369ebee3e 100644
--- a/devel/uppaal/Makefile
+++ b/devel/uppaal/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	uppaal
-PORTVERSION=	4.0.6
-PORTREVISION=	2
+PORTVERSION=	4.0.7
 CATEGORIES=	devel java linux
+DISTNAME=	uppaal-${PORTVERSION}-aca
 
 MAINTAINER=	timbob@bigpond.com
 COMMENT=	Tool environment for modeling and verifying timed automata
@@ -16,13 +16,14 @@ COMMENT=	Tool environment for modeling and verifying timed automata
 USE_ZIP=	yes
 USE_LINUX=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 JAVA_RUN=	yes
 
+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/registration.php?id=0&subid=0
+DOWNLOAD_URL=	http://www.it.uu.se/research/group/darts/uppaal/download.shtml
 NO_BUILD=	yes
 
 MAN1=		uppaal.1
@@ -63,7 +64,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/uppaal ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/uppaal/distinfo b/devel/uppaal/distinfo
index db27ba68238f..951259cc7a3f 100644
--- a/devel/uppaal/distinfo
+++ b/devel/uppaal/distinfo
@@ -1,3 +1,3 @@
-MD5 (uppaal-4.0.6.zip) = d4feef3db9dc6b23b3aada01f32efbb8
-SHA256 (uppaal-4.0.6.zip) = 043e3e0930519f1e59edf3ebe541c4a4ac7db3ebbfff2d0aa34514ac8014da8e
-SIZE (uppaal-4.0.6.zip) = 6992522
+MD5 (uppaal-4.0.7-aca.zip) = 20efdc9456c5934270ef6301bb1b88ea
+SHA256 (uppaal-4.0.7-aca.zip) = fa2a7419ff2896bc89d6fa1ace005c22e58bcaef80da672755c970f5a1b3434c
+SIZE (uppaal-4.0.7-aca.zip) = 4968952
diff --git a/devel/uppaal/files/patch-uppaal b/devel/uppaal/files/patch-uppaal
deleted file mode 100644
index 6cc70c47b1aa..000000000000
--- a/devel/uppaal/files/patch-uppaal
+++ /dev/null
@@ -1,11 +0,0 @@
---- uppaal.orig	Wed Sep 13 21:41:07 2006
-+++ uppaal	Wed Sep 13 21:41:21 2006
-@@ -6,7 +6,7 @@
- 
- HERE=`dirname $0`
- JAR=$HERE/uppaal.jar
--ENGINE=$HERE/bin-`uname`
-+ENGINE=$HERE/bin-Linux
- if [ "$DISPLAY" = ":0.0" -o "$DISPLAY" = ":0" ]; then 
-   java -jar $JAR -enginePath $ENGINE $* 
- else
diff --git a/devel/uppaal/files/uppaal.in b/devel/uppaal/files/uppaal.in
index 975a015617f6..bea45f45a734 100644
--- a/devel/uppaal/files/uppaal.in
+++ b/devel/uppaal/files/uppaal.in
@@ -1,11 +1,29 @@
 #!/bin/sh 
 
+# Default options if needed.
+JAVA_DEF=""
+
+# Force language if LANG is defined.
+if [ ! -z "$LANG" ]; then
+  LANGLANG=${LANG##*_}
+  JAVA_DEF="$JAVA_DEF -Duser.language=${LANGLANG%%.*}"
+fi
+
+# Fix splash option if no splash is asked (Java 6).
+for opt in $* ; do
+  if [ "$opt" = "--no-splash" ]; then
+    JAVA_DEF="$JAVA_DEF -splash:/dev/null"
+    break
+  fi
+done
+
 JAR=%%JAVASHAREDIR%%/%%PORTNAME%%/uppaal.jar
 ENGINE=%%JAVASHAREDIR%%/%%PORTNAME%%
 
+# No antialias if remote execution (better performance).
 if [ "$DISPLAY" = ":0.0" -o "$DISPLAY" = ":0" ]; then 
-  java -jar $JAR -enginePath $ENGINE $* 
+  java $JAVA_DEF -jar "$JAR" -enginePath "$ENGINE" $* 
 else
-  java -jar $JAR -enginePath $ENGINE -antialias off $* 
+  java $JAVA_DEF -splash:/dev/null -jar "$JAR" --enginePath "$ENGINE" --antialias off $* 
 fi
 
diff --git a/devel/uppaal/pkg-plist b/devel/uppaal/pkg-plist
index 48f8f9385e74..b712042240c9 100644
--- a/devel/uppaal/pkg-plist
+++ b/devel/uppaal/pkg-plist
@@ -27,5 +27,5 @@ bin/verifyta
 @dirrm %%EXAMPLESDIR%%
 @dirrm %%JAVASHAREDIR%%/%%PORTNAME%%/lib
 @dirrm %%JAVASHAREDIR%%/%%PORTNAME%%
-%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%