From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Oct 22 14:50:27 2003 Return-Path: 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 C50FB16A4B3 for ; Wed, 22 Oct 2003 14:50:27 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5CCD043F3F for ; Wed, 22 Oct 2003 14:50:24 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h9MLoOFY084846 for ; Wed, 22 Oct 2003 14:50:24 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h9MLoM3B084816; Wed, 22 Oct 2003 14:50:22 -0700 (PDT) (envelope-from gnats) Resent-Date: Wed, 22 Oct 2003 14:50:22 -0700 (PDT) Resent-Message-Id: <200310222150.h9MLoM3B084816@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, Palle Girgensohn Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8CF7416A4B3; Wed, 22 Oct 2003 14:45:47 -0700 (PDT) Received: from amsfep11-int.chello.nl (amsfep11-int.chello.nl [213.46.243.20]) by mx1.FreeBSD.org (Postfix) with ESMTP id E0FBF43FAF; Wed, 22 Oct 2003 14:45:45 -0700 (PDT) (envelope-from girgen@smtp.chello.se) Received: from palle.girgensohn.se ([213.89.138.245]) by amsfep11-int.chello.nlESMTP <20031022213623.GQKW13165.amsfep11-int.chello.nl@palle.girgensohn.se>; Wed, 22 Oct 2003 23:36:23 +0200 Received: from palle.girgensohn.se (localhost [127.0.0.1]) by palle.girgensohn.se (8.12.9/8.12.9) with ESMTP id h9MLaM5f052983; Wed, 22 Oct 2003 23:36:22 +0200 (CEST) (envelope-from girgen@palle.girgensohn.se) Received: (from girgen@localhost) by palle.girgensohn.se (8.12.9/8.12.9/Submit) id h9MLaGql052982; Wed, 22 Oct 2003 23:36:17 +0200 (CEST) (envelope-from girgen) Message-Id: <200310222136.h9MLaGql052982@palle.girgensohn.se> Date: Wed, 22 Oct 2003 23:36:17 +0200 (CEST) From: Palle Girgensohn To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: glewis@FreeBSD.org Subject: ports/58398: [PATCH] java/openjit: fix severely broken pkg-plist X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Oct 2003 21:50:27 -0000 X-List-Received-Date: Wed, 22 Oct 2003 21:50:27 -0000 X-List-Received-Date: Wed, 22 Oct 2003 21:50:27 -0000 >Number: 58398 >Category: ports >Synopsis: [PATCH] java/openjit: fix severely broken pkg-plist >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Oct 22 14:50:21 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Palle Girgensohn >Release: FreeBSD 4.8-STABLE i386 >Organization: Ping Pong AB >Environment: System: FreeBSD palle.girgensohn.se 4.8-STABLE FreeBSD 4.8-STABLE #2: Sat Aug 16 19:56:39 CEST 2003 >Description: The package list for openjit is not working, since the variables in it are not in PLIST_SUB. Generated with FreeBSD Port Tools 0.50 >How-To-Repeat: >Fix: --- openjit-1.1.16.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/java/openjit/Makefile,v retrieving revision 1.7 diff -u -u -r1.7 Makefile --- Makefile 17 Oct 2003 06:35:53 -0000 1.7 +++ Makefile 22 Oct 2003 21:12:39 -0000 @@ -38,8 +38,12 @@ CPIO?= /usr/bin/cpio +PLIST_SUB+= JAVADIR=${JAVA_HOME:S,${PREFIX}/,,} .if defined(WITH_JDK11) JAVALIBDIR= ${PREFIX}/lib/OpenJIT +PLIST_SUB+= JAVA2="@comment " JAVA11="" +.else +PLIST_SUB+= JAVA11="@comment " JAVA2="" .endif post-configure: Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/java/openjit/pkg-plist,v retrieving revision 1.2 diff -u -u -r1.2 pkg-plist --- pkg-plist 17 Oct 2003 06:35:53 -0000 1.2 +++ pkg-plist 22 Oct 2003 21:02:56 -0000 @@ -1,33 +1,33 @@ -%%JAVA11:%%lib/OpenJIT/OpenJIT.jar -%%JAVA11:%%lib/OpenJIT/libOpenJIT.so -%%JAVA2:%%%%JAVADIR%%/jre/lib/i386/libOpenJIT.so -%%JAVA2:%%%%JAVADIR%%/jre/classes/org/OpenJIT/BCinfo.class -%%JAVA2:%%%%JAVADIR%%/jre/classes/org/OpenJIT/Compile.class -%%JAVA2:%%%%JAVADIR%%/jre/classes/org/OpenJIT/CompilerError.class -%%JAVA2:%%%%JAVADIR%%/jre/classes/org/OpenJIT/Constants.class -%%JAVA2:%%%%JAVADIR%%/jre/classes/org/OpenJIT/ConvertRTL.class -%%JAVA2:%%%%JAVADIR%%/jre/classes/org/OpenJIT/Debug.class -%%JAVA2:%%%%JAVADIR%%/jre/classes/org/OpenJIT/ExceptionHandler.class -%%JAVA2:%%%%JAVADIR%%/jre/classes/org/OpenJIT/ILnode.class -%%JAVA2:%%%%JAVADIR%%/jre/classes/org/OpenJIT/InlineInfo.class -%%JAVA2:%%%%JAVADIR%%/jre/classes/org/OpenJIT/LinkageInfo.class -%%JAVA2:%%%%JAVADIR%%/jre/classes/org/OpenJIT/LinkedList.class -%%JAVA2:%%%%JAVADIR%%/jre/classes/org/OpenJIT/OpenJITLoader.class -%%JAVA2:%%%%JAVADIR%%/jre/classes/org/OpenJIT/OptimizeRTL.class -%%JAVA2:%%%%JAVADIR%%/jre/classes/org/OpenJIT/PCList.class -%%JAVA2:%%%%JAVADIR%%/jre/classes/org/OpenJIT/PCReloc.class -%%JAVA2:%%%%JAVADIR%%/jre/classes/org/OpenJIT/ParseBytecode.class -%%JAVA2:%%%%JAVADIR%%/jre/classes/org/OpenJIT/Select.class -%%JAVA2:%%%%JAVADIR%%/jre/classes/org/OpenJIT/SubrNode.class -%%JAVA2:%%%%JAVADIR%%/jre/classes/org/OpenJIT/SubrNodeList.class -%%JAVA2:%%%%JAVADIR%%/jre/classes/org/OpenJIT/Var.class -%%JAVA2:%%%%JAVADIR%%/jre/classes/org/OpenJIT/X86.class -%%JAVA2:%%%%JAVADIR%%/jre/classes/org/OpenJIT/X86code.class -%%JAVA2:%%%%JAVADIR%%/jre/classes/org/OpenJIT/X86reg.class +%%JAVA11%%lib/OpenJIT/OpenJIT.jar +%%JAVA11%%lib/OpenJIT/libOpenJIT.so +%%JAVA2%%%%JAVADIR%%/jre/lib/i386/libOpenJIT.so +%%JAVA2%%%%JAVADIR%%/jre/classes/org/OpenJIT/BCinfo.class +%%JAVA2%%%%JAVADIR%%/jre/classes/org/OpenJIT/Compile.class +%%JAVA2%%%%JAVADIR%%/jre/classes/org/OpenJIT/CompilerError.class +%%JAVA2%%%%JAVADIR%%/jre/classes/org/OpenJIT/Constants.class +%%JAVA2%%%%JAVADIR%%/jre/classes/org/OpenJIT/ConvertRTL.class +%%JAVA2%%%%JAVADIR%%/jre/classes/org/OpenJIT/Debug.class +%%JAVA2%%%%JAVADIR%%/jre/classes/org/OpenJIT/ExceptionHandler.class +%%JAVA2%%%%JAVADIR%%/jre/classes/org/OpenJIT/ILnode.class +%%JAVA2%%%%JAVADIR%%/jre/classes/org/OpenJIT/InlineInfo.class +%%JAVA2%%%%JAVADIR%%/jre/classes/org/OpenJIT/LinkageInfo.class +%%JAVA2%%%%JAVADIR%%/jre/classes/org/OpenJIT/LinkedList.class +%%JAVA2%%%%JAVADIR%%/jre/classes/org/OpenJIT/OpenJITLoader.class +%%JAVA2%%%%JAVADIR%%/jre/classes/org/OpenJIT/OptimizeRTL.class +%%JAVA2%%%%JAVADIR%%/jre/classes/org/OpenJIT/PCList.class +%%JAVA2%%%%JAVADIR%%/jre/classes/org/OpenJIT/PCReloc.class +%%JAVA2%%%%JAVADIR%%/jre/classes/org/OpenJIT/ParseBytecode.class +%%JAVA2%%%%JAVADIR%%/jre/classes/org/OpenJIT/Select.class +%%JAVA2%%%%JAVADIR%%/jre/classes/org/OpenJIT/SubrNode.class +%%JAVA2%%%%JAVADIR%%/jre/classes/org/OpenJIT/SubrNodeList.class +%%JAVA2%%%%JAVADIR%%/jre/classes/org/OpenJIT/Var.class +%%JAVA2%%%%JAVADIR%%/jre/classes/org/OpenJIT/X86.class +%%JAVA2%%%%JAVADIR%%/jre/classes/org/OpenJIT/X86code.class +%%JAVA2%%%%JAVADIR%%/jre/classes/org/OpenJIT/X86reg.class %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%@dirrm %%DOCSDIR%% -%%JAVA11:%%@dirrm lib/OpenJIT -%%JAVA2:%%@dirrm %%JAVADIR%%/jre/classes/org/OpenJIT -%%JAVA2:%%@dirrm %%JAVADIR%%/jre/classes/org -%%JAVA2:%%@dirrm %%JAVADIR%%/jre/classes +%%JAVA11%%@dirrm lib/OpenJIT +%%JAVA2%%@dirrm %%JAVADIR%%/jre/classes/org/OpenJIT +%%JAVA2%%@dirrm %%JAVADIR%%/jre/classes/org +%%JAVA2%%@dirrm %%JAVADIR%%/jre/classes --- openjit-1.1.16.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: