ports/58398: [PATCH] java/openjit: fix severely broken pkg-plist

[Palle Girgensohn]

>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: