- Update to 4.0.2

PR:		ports/103246
Submitted by:	Timothy Bourke <timbob at bigpond.com> (maintainer)

5 files changed, 46 insertions, 50 deletions

diff --git a/devel/uppaal/Makefile b/devel/uppaal/Makefile
index c2ab0d19a233..aee34347fa0e 100644
--- a/devel/uppaal/Makefile
+++ b/devel/uppaal/Makefile
@@ -6,9 +6,8 @@
 #
 
 PORTNAME=	uppaal
-PORTVERSION=	3.4.11
+PORTVERSION=	4.0.2
 CATEGORIES=	devel java linux
-DISTNAME=	${PORTNAME}
 
 MAINTAINER=	timbob@bigpond.com
 COMMENT=	Tool environment for modeling and verifying timed automata
@@ -16,34 +15,26 @@ COMMENT=	Tool environment for modeling and verifying timed automata
 USE_ZIP=	yes
 USE_LINUX=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 JAVA_RUN=	yes
 
 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
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 MAN1=		uppaal.1
 MANCOMPRESSED=	no
 
-RESTRICTED=	"Downloading requires completion of a license agreement"
+RESTRICTED=	Downloading requires completion of a license agreement
 
 .include <bsd.port.pre.mk>
 
-do-fetch:
-.if ! exists (${DISTDIR}/${DIST_SUBDIR}/uppaal.zip)
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
 ECHO_MSG=/usr/bin/printf
-IGNORE=	:\n\n\
-------------------------------------------------------------------\n\
-Downloading this software requires completion of a licence\n\
-agreement, which may be found at: http://www.uppaal.com\n\
-\n\
-Please download the _latest_ version of 'uppaal.zip' into\n\
-${DISTDIR}/${DIST_SUBDIR}\n\
-\n
-IGNORE+=------------------------------------------------------------------\n\n
+IGNORE=Please download ${DISTNAME}${EXTRACT_SUFX} into\
+${DISTDIR}/${DIST_SUBDIR} from:\n\t${DOWNLOAD_URL}\n
 .endif
 
 post-patch:
@@ -54,17 +45,18 @@ post-patch:
 	${BRANDELF} -t Linux ${WRKSRC}/bin-Linux/verifyta
 
 do-install:
-	${MKDIR} ${DOCSDIR}
 	${MKDIR} ${JAVASHAREDIR}/${PORTNAME}/lib
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/License-ASF ${DOCSDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin-Linux/* ${JAVASHAREDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/uppaal2k.jar ${JAVASHAREDIR}/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/uppaal.jar ${JAVASHAREDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/lib/*.jar ${JAVASHAREDIR}/${PORTNAME}/lib
-	${MKDIR} ${JAVASHAREDIR}/${PORTNAME}/demo
-	${INSTALL_DATA} ${WRKSRC}/demo/* ${JAVASHAREDIR}/${PORTNAME}/demo
+	${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 ${DOCSDIR}
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/uppaal/distinfo b/devel/uppaal/distinfo
index 6596f6409a05..1aa95268493b 100644
--- a/devel/uppaal/distinfo
+++ b/devel/uppaal/distinfo
@@ -1,2 +1,3 @@
-MD5 (uppaal.zip) = 2358ab2a7cf8a575015066a144bc7603
-SIZE (uppaal.zip) = 8535802
+MD5 (uppaal-4.0.2.zip) = 6698f31403a6543d850e43d4a85025f4
+SHA256 (uppaal-4.0.2.zip) = b415a981415499d7a587915f28451f95445d345c7fa91f4c19f390d8e766c6ff
+SIZE (uppaal-4.0.2.zip) = 6996650
diff --git a/devel/uppaal/files/patch-uppaal b/devel/uppaal/files/patch-uppaal
index 2a2206a78330..6cc70c47b1aa 100644
--- a/devel/uppaal/files/patch-uppaal
+++ b/devel/uppaal/files/patch-uppaal
@@ -1,11 +1,11 @@
---- uppaal.orig	Tue Aug 16 10:56:11 2005
-+++ uppaal	Tue Aug 16 10:56:19 2005
+--- 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/uppaal2k.jar
+ JAR=$HERE/uppaal.jar
 -ENGINE=$HERE/bin-`uname`
 +ENGINE=$HERE/bin-Linux
- if [ "$DISPLAY" = ":0.0" ]; then 
+ 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 38b4140a480d..975a015617f6 100644
--- a/devel/uppaal/files/uppaal.in
+++ b/devel/uppaal/files/uppaal.in
@@ -1,12 +1,9 @@
 #!/bin/sh 
 
-JAR=%%JAVASHAREDIR%%/%%PORTNAME%%/uppaal2k.jar
+JAR=%%JAVASHAREDIR%%/%%PORTNAME%%/uppaal.jar
 ENGINE=%%JAVASHAREDIR%%/%%PORTNAME%%
 
-DISPSERV=$(expr "$DISPLAY" : '^\(.*\):.*')
-if [ -z "$DISPSERV" ]; then DISPSERV=$(hostname); fi
-
-if [ "$DISPSERV" = "$(hostname)" ]; then
+if [ "$DISPLAY" = ":0.0" -o "$DISPLAY" = ":0" ]; then 
   java -jar $JAR -enginePath $ENGINE $* 
 else
   java -jar $JAR -enginePath $ENGINE -antialias off $* 
diff --git a/devel/uppaal/pkg-plist b/devel/uppaal/pkg-plist
index bc7c7629fd17..48f8f9385e74 100644
--- a/devel/uppaal/pkg-plist
+++ b/devel/uppaal/pkg-plist
@@ -1,25 +1,31 @@
 bin/uppaal
 bin/verifyta
-%%JAVASHAREDIR%%/%%PORTNAME%%/uppaal2k.jar
-%%JAVASHAREDIR%%/%%PORTNAME%%/lib/jhbasic.jar
+%%JAVASHAREDIR%%/%%PORTNAME%%/lib/editor.jar
+%%JAVASHAREDIR%%/%%PORTNAME%%/lib/jdom.jar
+%%JAVASHAREDIR%%/%%PORTNAME%%/lib/jh.jar
 %%JAVASHAREDIR%%/%%PORTNAME%%/lib/jlfgr-1_0.jar
-%%JAVASHAREDIR%%/%%PORTNAME%%/lib/xalan.jar
-%%JAVASHAREDIR%%/%%PORTNAME%%/lib/xercesImpl.jar
-%%JAVASHAREDIR%%/%%PORTNAME%%/lib/xmlParserAPIs.jar
+%%JAVASHAREDIR%%/%%PORTNAME%%/lib/jsr173_1.0_api.jar
+%%JAVASHAREDIR%%/%%PORTNAME%%/lib/jsr173_1.0_ri.jar
+%%JAVASHAREDIR%%/%%PORTNAME%%/lib/model.jar
+%%JAVASHAREDIR%%/%%PORTNAME%%/lib/swixml.jar
 %%JAVASHAREDIR%%/%%PORTNAME%%/server.exe
 %%JAVASHAREDIR%%/%%PORTNAME%%/socketserver.exe
 %%JAVASHAREDIR%%/%%PORTNAME%%/verifyta
-%%JAVASHAREDIR%%/%%PORTNAME%%/demo/2doors.xml
-%%JAVASHAREDIR%%/%%PORTNAME%%/demo/2doors.q
-%%JAVASHAREDIR%%/%%PORTNAME%%/demo/bridge.xml
-%%JAVASHAREDIR%%/%%PORTNAME%%/demo/bridge.q
-%%JAVASHAREDIR%%/%%PORTNAME%%/demo/fischer.xml
-%%JAVASHAREDIR%%/%%PORTNAME%%/demo/fischer.q
-%%JAVASHAREDIR%%/%%PORTNAME%%/demo/train-gate.xml
-%%JAVASHAREDIR%%/%%PORTNAME%%/demo/train-gate.q
-%%DOCSDIR%%/README
-%%DOCSDIR%%/License-ASF
-@dirrm %%JAVASHAREDIR%%/%%PORTNAME%%/demo
+%%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%%
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%