From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Apr 28 11:50:12 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 7A9E616A401 for ; Fri, 28 Apr 2006 11:50:12 +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 00A2643D45 for ; Fri, 28 Apr 2006 11:50:12 +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 k3SBoBvh043432 for ; Fri, 28 Apr 2006 11:50:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k3SBoBDj043431; Fri, 28 Apr 2006 11:50:11 GMT (envelope-from gnats) Resent-Date: Fri, 28 Apr 2006 11:50:11 GMT Resent-Message-Id: <200604281150.k3SBoBDj043431@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, nivit@email.it (Nicola Vitale) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9E32816A403 for ; Fri, 28 Apr 2006 11:46:23 +0000 (UTC) (envelope-from nivit@email.it) Received: from vsmtp3.tin.it (vsmtp3alice.tin.it [212.216.176.143]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C21F43D45 for ; Fri, 28 Apr 2006 11:46:23 +0000 (GMT) (envelope-from nivit@email.it) Received: from arancino (87.0.60.206) by vsmtp3.tin.it (7.2.072.1) id 44474970008A2177 for FreeBSD-gnats-submit@freebsd.org; Fri, 28 Apr 2006 13:47:41 +0200 Received: (qmail 14965 invoked by uid 0); 28 Apr 2006 11:42:26 -0000 Message-Id: <20060428114226.14964.qmail@arancino> Date: 28 Apr 2006 11:42:26 -0000 From: nivit@email.it (Nicola Vitale) To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/96461: [MAINTAINER] graphics/mapyrus: fix SUB_PLIST, javawrapper usage 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: Fri, 28 Apr 2006 11:50:12 -0000 >Number: 96461 >Category: ports >Synopsis: [MAINTAINER] graphics/mapyrus: fix SUB_PLIST, javawrapper usage >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: Fri Apr 28 11:50:11 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Nicola Vitale >Release: FreeBSD 6.1-RC i386 >Organization: >Environment: System: FreeBSD arancino.domo.sva 6.1-RC FreeBSD 6.1-RC #4: Sat Apr 15 10:17:24 CEST 2006 >Description: Fix SUB_PLIST and javawrapper usage (thanks to H. Quiroz for these suggestions) Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- mapyrus-0.606.patch begins here --- diff -ruN --exclude=CVS /usr/ports/graphics/mapyrus/Makefile /usr/ports/graphics/mapyrus.fix.javawrapper/Makefile --- /usr/ports/graphics/mapyrus/Makefile Fri Apr 28 05:16:02 2006 +++ /usr/ports/graphics/mapyrus.fix.javawrapper/Makefile Fri Apr 28 13:23:22 2006 @@ -18,11 +18,12 @@ NO_WRKSUBDIR= yes USE_JAVA= yes +JAVA_VERSION= 1.4+ USE_ZIP= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} SUB_FILES= ${PORTNAME} pkg-message -SUB_LIST= JAVA=${JAVA} DATADIR=${DATADIR} MAPYRUSJAR=${MAPYRUSJAR} +SUB_LIST= MAPYRUSJAR=${MAPYRUSJAR} MAPYRUSJAR= ${PORTNAME}.jar MAPYRUSDOCS= ${PORTNAME}.pdf diff -ruN --exclude=CVS /usr/ports/graphics/mapyrus/files/mapyrus.in /usr/ports/graphics/mapyrus.fix.javawrapper/files/mapyrus.in --- /usr/ports/graphics/mapyrus/files/mapyrus.in Fri Apr 28 05:16:02 2006 +++ /usr/ports/graphics/mapyrus.fix.javawrapper/files/mapyrus.in Fri Apr 28 13:20:08 2006 @@ -1,3 +1,5 @@ #!/bin/sh # $FreeBSD: ports/graphics/mapyrus/files/mapyrus.in,v 1.1 2006/04/28 03:16:02 ijliao Exp $ -%%JAVA%% -jar %%DATADIR%%/%%MAPYRUSJAR%% $@ +JAVA_VERSION="%%JAVA_VERSION%%" \ + exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/%%MAPYRUSJAR%%" "$@" + diff -ruN --exclude=CVS /usr/ports/graphics/mapyrus/files/pkg-message.in /usr/ports/graphics/mapyrus.fix.javawrapper/files/pkg-message.in --- /usr/ports/graphics/mapyrus/files/pkg-message.in Tue Apr 25 15:04:25 2006 +++ /usr/ports/graphics/mapyrus.fix.javawrapper/files/pkg-message.in Fri Apr 28 12:58:06 2006 @@ -2,7 +2,7 @@ Start Mapyrus from a terminal window with a command like: -%%JAVA%% -classpath %%DATADIR%%/%%MAPYRUSJAR%% org.mapyrus.Mapyrus myfile.mapyrus +java -classpath %%DATADIR%%/%%MAPYRUSJAR%% org.mapyrus.Mapyrus myfile.mapyrus or simply: --- mapyrus-0.606.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: