From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Sep 14 00:20:32 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1F41816A492 for ; Thu, 14 Sep 2006 00:20:32 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3F09F43D9D for ; Thu, 14 Sep 2006 00:20:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k8E0KEUl049386 for ; Thu, 14 Sep 2006 00:20:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k8E0KEiO049385; Thu, 14 Sep 2006 00:20:14 GMT (envelope-from gnats) Resent-Date: Thu, 14 Sep 2006 00:20:14 GMT Resent-Message-Id: <200609140020.k8E0KEiO049385@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 [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D7EF16A403 for ; Thu, 14 Sep 2006 00:17:00 +0000 (UTC) (envelope-from tbourke@triptrop.cse.unsw.edu.au) Received: from tone.orchestra.cse.unsw.EDU.AU (tone.orchestra.cse.unsw.EDU.AU [129.94.242.59]) by mx1.FreeBSD.org (Postfix) with ESMTP id 78BFE43D45 for ; Thu, 14 Sep 2006 00:16:59 +0000 (GMT) (envelope-from tbourke@triptrop.cse.unsw.edu.au) Received: From triptrop.cse.unsw.edu.au ([129.94.175.153]) (for ) By tone With Smtp ; Thu, 14 Sep 2006 10:16:57 +1000 Received: from triptrop.cse.unsw.edu.au (localhost [127.0.0.1]) by triptrop.cse.unsw.edu.au (8.13.6/8.13.6) with ESMTP id k8E0GEJh041728 for ; Thu, 14 Sep 2006 10:16:14 +1000 (EST) (envelope-from tbourke@triptrop.cse.unsw.edu.au) Received: (from tbourke@localhost) by triptrop.cse.unsw.edu.au (8.13.6/8.13.6/Submit) id k8E0GDoZ041727; Thu, 14 Sep 2006 10:16:13 +1000 (EST) (envelope-from tbourke) Message-Id: <200609140016.k8E0GDoZ041727@triptrop.cse.unsw.edu.au> Date: Thu, 14 Sep 2006 10:16:13 +1000 (EST) From: Timothy Bourke To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/103246: Update port: devel/uppaal X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Timothy Bourke List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Sep 2006 00:20:32 -0000 >Number: 103246 >Category: ports >Synopsis: Update port: devel/uppaal >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: Thu Sep 14 00:20:13 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Timothy Bourke >Release: FreeBSD 6.1-RELEASE-p6 i386 >Organization: n/a >Environment: System: FreeBSD triptrop 6.1-RELEASE-p6 FreeBSD 6.1-RELEASE-p6 #14: Thu Sep 7 08:51:53 EST 2006 tbourke@triptrop:/usr/obj/usr/src/sys/TP_R52 i386 >Description: Uppaal 3.4.11 --> 4.0.2 >How-To-Repeat: >Fix: --- uppaal.diff begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/devel/uppaal/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- Makefile 8 Dec 2005 14:02:20 -0000 1.2 +++ Makefile 14 Sep 2006 00:14:45 -0000 @@ -2,13 +2,12 @@ # Date created: 16 August 2005 # Whom: Timothy Bourke # -# $FreeBSD: ports/devel/uppaal/Makefile,v 1.2 2005/12/08 14:02:20 vs Exp $ +# $FreeBSD$ # 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,24 @@ 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} 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 do-fetch: -.if ! exists (${DISTDIR}/${DIST_SUBDIR}/uppaal.zip) -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 +.if ! exists (${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}) +IGNORE=Please download ${DISTNAME}${EXTRACT_SUFX} into ${DISTDIR}/${DIST_SUBDIR} .endif post-patch: @@ -54,17 +43,18 @@ ${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 Index: distinfo =================================================================== RCS file: /home/ncvs/ports/devel/uppaal/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- distinfo 16 Nov 2005 09:25:51 -0000 1.1 +++ distinfo 14 Sep 2006 00:14:45 -0000 @@ -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 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/devel/uppaal/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- pkg-plist 16 Nov 2005 09:25:51 -0000 1.1 +++ pkg-plist 14 Sep 2006 00:14:45 -0000 @@ -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%% Index: files/patch-uppaal =================================================================== RCS file: /home/ncvs/ports/devel/uppaal/files/patch-uppaal,v retrieving revision 1.1 diff -u -r1.1 patch-uppaal --- files/patch-uppaal 16 Nov 2005 09:25:52 -0000 1.1 +++ files/patch-uppaal 14 Sep 2006 00:14:45 -0000 @@ -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 Index: files/uppaal.in =================================================================== RCS file: /home/ncvs/ports/devel/uppaal/files/uppaal.in,v retrieving revision 1.1 diff -u -r1.1 uppaal.in --- files/uppaal.in 16 Nov 2005 09:25:52 -0000 1.1 +++ files/uppaal.in 14 Sep 2006 00:14:45 -0000 @@ -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 $* --- uppaal.diff ends here --- --- LEGAL.diff begins here --- Index: LEGAL =================================================================== RCS file: /home/ncvs/ports/LEGAL,v retrieving revision 1.496 diff -u -r1.496 LEGAL --- LEGAL 11 Sep 2006 18:06:11 -0000 1.496 +++ LEGAL 14 Sep 2006 00:06:39 -0000 @@ -599,7 +599,7 @@ only uDrawGraph-* graphics/uDrawGraph binary under GNU LGPL without accompanying source -uppaal.zip devel/uppaal Downloading requires completion +uppaal-4.0.2.zip devel/uppaal Downloading requires completion of a license agreement upsmon* sysutils/upsmon Redistribute only with original source code --- LEGAL.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: