From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Dec 13 10:00:17 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 82D161065670 for ; Sat, 13 Dec 2008 10:00:15 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 591958FC13 for ; Sat, 13 Dec 2008 10:00:15 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id mBDA05xs096432 for ; Sat, 13 Dec 2008 10:00:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id mBDA059I096431; Sat, 13 Dec 2008 10:00:05 GMT (envelope-from gnats) Resent-Date: Sat, 13 Dec 2008 10:00:05 GMT Resent-Message-Id: <200812131000.mBDA059I096431@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Timothy Bourke Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA17E1065670 for ; Sat, 13 Dec 2008 09:50:02 +0000 (UTC) (envelope-from tbourke@triptrop.cse.unsw.edu.au) Received: from mail.netspace.net.au (mail-out2.netspace.net.au [203.10.110.72]) by mx1.freebsd.org (Postfix) with ESMTP id 201F68FC12 for ; Sat, 13 Dec 2008 09:50:02 +0000 (UTC) (envelope-from tbourke@triptrop.cse.unsw.edu.au) Received: from triptrop.cse.unsw.edu.au (dsl-220-253-70-14.NSW.netspace.net.au [220.253.70.14]) by mail.netspace.net.au (Postfix) with ESMTP id 733A2697D6 for ; Sat, 13 Dec 2008 20:29:58 +1100 (EST) Received: from triptrop.cse.unsw.edu.au (localhost [127.0.0.1]) by triptrop.cse.unsw.edu.au (8.14.3/8.14.2) with ESMTP id mBD9Tcvp024377 for ; Sat, 13 Dec 2008 20:29:38 +1100 (EST) (envelope-from tbourke@triptrop.cse.unsw.edu.au) Received: (from tbourke@localhost) by triptrop.cse.unsw.edu.au (8.14.3/8.13.6/Submit) id mBD9Tai3024376; Sat, 13 Dec 2008 20:29:36 +1100 (EST) (envelope-from tbourke) Message-Id: <200812130929.mBD9Tai3024376@triptrop.cse.unsw.edu.au> Date: Sat, 13 Dec 2008 20:29:36 +1100 (EST) From: Timothy Bourke To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/129607: [MAINTAINER] devel/uppaal: 4.0.6 -> 4.0.7 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Dec 2008 10:00:17 -0000 >Number: 129607 >Category: ports >Synopsis: [MAINTAINER] devel/uppaal: 4.0.6 -> 4.0.7 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Dec 13 10:00:04 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Timothy Bourke >Release: FreeBSD 6.4-RELEASE i386 >Organization: >Environment: System: FreeBSD triptrop 6.4-RELEASE FreeBSD 6.4-RELEASE #6: Sun Nov 30 20:46:29 EST 2008 >Description: [DESCRIBE CHANGES] Removed file(s): - files/patch-uppaal Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- uppaal-4.0.7.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/devel/uppaal/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- Makefile 6 Jun 2008 13:21:57 -0000 1.8 +++ Makefile 13 Dec 2008 09:26:13 -0000 @@ -2,13 +2,13 @@ # Date created: 16 August 2005 # Whom: Timothy Bourke # -# $FreeBSD: ports/devel/uppaal/Makefile,v 1.8 2008/06/06 13:21:57 edwin Exp $ +# $FreeBSD$ # 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 @@ 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 @@ ${INSTALL_SCRIPT} ${WRKDIR}/uppaal ${PREFIX}/bin .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR} .endif .include Index: distinfo =================================================================== RCS file: /home/ncvs/ports/devel/uppaal/distinfo,v retrieving revision 1.3 diff -u -r1.3 distinfo --- distinfo 11 Apr 2007 20:11:50 -0000 1.3 +++ distinfo 13 Dec 2008 09:26:13 -0000 @@ -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 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/devel/uppaal/pkg-plist,v retrieving revision 1.2 diff -u -r1.2 pkg-plist --- pkg-plist 15 Sep 2006 09:07:16 -0000 1.2 +++ pkg-plist 13 Dec 2008 09:26:13 -0000 @@ -27,5 +27,5 @@ @dirrm %%EXAMPLESDIR%% @dirrm %%JAVASHAREDIR%%/%%PORTNAME%%/lib @dirrm %%JAVASHAREDIR%%/%%PORTNAME%% -%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/readme.txt %%PORTDOCS%%@dirrm %%DOCSDIR%% Index: files/patch-uppaal =================================================================== RCS file: files/patch-uppaal diff -N files/patch-uppaal --- files/patch-uppaal 15 Sep 2006 09:07:16 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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 Index: files/uppaal.in =================================================================== RCS file: /home/ncvs/ports/devel/uppaal/files/uppaal.in,v retrieving revision 1.2 diff -u -r1.2 uppaal.in --- files/uppaal.in 15 Sep 2006 09:07:16 -0000 1.2 +++ files/uppaal.in 13 Dec 2008 09:26:13 -0000 @@ -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 --- uppaal-4.0.7.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: