>Number:         17795
>Category:       pkg
>Synopsis:       lang/kaffe PLIST fix
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Aug 01 03:03:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Julien T. Letessier
>Release:        Zoularis/Solaris8
>Organization:
Sun Labs Europe
>Environment:
SunOS mikdemia 5.8 Generic_108528-15 sun4u sparc SUNW,Ultra-Enterprise
>Description:
kaffe's PLIST contains hard-coded i386 paths.
>How-To-Repeat:

>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/kaffe/Makefile,v
retrieving revision 1.39
diff -u -r1.39 Makefile
--- Makefile	2002/07/27 21:26:21	1.39
+++ Makefile	2002/08/01 09:54:08
@@ -32,6 +32,7 @@
 CONFIGURE_ENV+=		VM_LIBS="-lc"
 .endif
 
+PLIST_SUBST+=		LOWER_ARCH=${LOWER_ARCH}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/license.terms \


Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/lang/kaffe/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- PLIST	2002/07/27 21:26:21	1.2
+++ PLIST	2002/08/01 09:54:17
@@ -14,36 +14,36 @@
 java/kaffe/include/kaffe/native.h
 java/kaffe/lib/kjc.jar
 java/kaffe/lib/tools.jar
-java/kaffe/jre/lib/i386/libnative-1.0.7.so
-java/kaffe/jre/lib/i386/libnative.so
-java/kaffe/jre/lib/i386/libnative.la
-java/kaffe/jre/lib/i386/libio-1.0.7.so
-java/kaffe/jre/lib/i386/libio.so
-java/kaffe/jre/lib/i386/libio.la
-java/kaffe/jre/lib/i386/libnet-1.0.7.so
-java/kaffe/jre/lib/i386/libnet.so
-java/kaffe/jre/lib/i386/libnet.la
-java/kaffe/jre/lib/i386/libzip-1.0.7.so
-java/kaffe/jre/lib/i386/libzip.so
-java/kaffe/jre/lib/i386/libzip.la
-java/kaffe/jre/lib/i386/libmath-1.0.7.so
-java/kaffe/jre/lib/i386/libmath.so
-java/kaffe/jre/lib/i386/libmath.la
-java/kaffe/jre/lib/i386/libsecurity-1.0.7.so
-java/kaffe/jre/lib/i386/libsecurity.so
-java/kaffe/jre/lib/i386/libsecurity.la
-java/kaffe/jre/lib/i386/libmanagement-1.0.7.so
-java/kaffe/jre/lib/i386/libmanagement.so
-java/kaffe/jre/lib/i386/libmanagement.la
-java/kaffe/jre/lib/i386/libawt-1.0.7.so
-java/kaffe/jre/lib/i386/libawt.so
-java/kaffe/jre/lib/i386/libawt.la
-java/kaffe/jre/lib/i386/libmicrosoft-1.0.7.so
-java/kaffe/jre/lib/i386/libmicrosoft.so
-java/kaffe/jre/lib/i386/libmicrosoft.la
-java/kaffe/jre/lib/i386/libkaffevm-1.0.7.so
-java/kaffe/jre/lib/i386/libkaffevm.so
-java/kaffe/jre/lib/i386/libkaffevm.la
+java/kaffe/jre/lib/${LOWER_ARCH}/libnative-1.0.7.so
+java/kaffe/jre/lib/${LOWER_ARCH}/libnative.so
+java/kaffe/jre/lib/${LOWER_ARCH}/libnative.la
+java/kaffe/jre/lib/${LOWER_ARCH}/libio-1.0.7.so
+java/kaffe/jre/lib/${LOWER_ARCH}/libio.so
+java/kaffe/jre/lib/${LOWER_ARCH}/libio.la
+java/kaffe/jre/lib/${LOWER_ARCH}/libnet-1.0.7.so
+java/kaffe/jre/lib/${LOWER_ARCH}/libnet.so
+java/kaffe/jre/lib/${LOWER_ARCH}/libnet.la
+java/kaffe/jre/lib/${LOWER_ARCH}/libzip-1.0.7.so
+java/kaffe/jre/lib/${LOWER_ARCH}/libzip.so
+java/kaffe/jre/lib/${LOWER_ARCH}/libzip.la
+java/kaffe/jre/lib/${LOWER_ARCH}/libmath-1.0.7.so
+java/kaffe/jre/lib/${LOWER_ARCH}/libmath.so
+java/kaffe/jre/lib/${LOWER_ARCH}/libmath.la
+java/kaffe/jre/lib/${LOWER_ARCH}/libsecurity-1.0.7.so
+java/kaffe/jre/lib/${LOWER_ARCH}/libsecurity.so
+java/kaffe/jre/lib/${LOWER_ARCH}/libsecurity.la
+java/kaffe/jre/lib/${LOWER_ARCH}/libmanagement-1.0.7.so
+java/kaffe/jre/lib/${LOWER_ARCH}/libmanagement.so
+java/kaffe/jre/lib/${LOWER_ARCH}/libmanagement.la
+java/kaffe/jre/lib/${LOWER_ARCH}/libawt-1.0.7.so
+java/kaffe/jre/lib/${LOWER_ARCH}/libawt.so
+java/kaffe/jre/lib/${LOWER_ARCH}/libawt.la
+java/kaffe/jre/lib/${LOWER_ARCH}/libmicrosoft-1.0.7.so
+java/kaffe/jre/lib/${LOWER_ARCH}/libmicrosoft.so
+java/kaffe/jre/lib/${LOWER_ARCH}/libmicrosoft.la
+java/kaffe/jre/lib/${LOWER_ARCH}/libkaffevm-1.0.7.so
+java/kaffe/jre/lib/${LOWER_ARCH}/libkaffevm.so
+java/kaffe/jre/lib/${LOWER_ARCH}/libkaffevm.la
 java/kaffe/jre/lib/security/java.security
 java/kaffe/jre/lib/rt.jar
 java/kaffe/jre/lib/comm.jar
@@ -78,7 +78,7 @@
 @dirrm java/kaffe/man/man1
 @dirrm java/kaffe/man
 @dirrm java/kaffe/jre/lib/security
-@dirrm java/kaffe/jre/lib/i386
+@dirrm java/kaffe/jre/lib/${LOWER_ARCH}
 @dirrm java/kaffe/jre/lib
 @dirrm java/kaffe/jre/bin
 @dirrm java/kaffe/jre

>Release-Note:
>Audit-Trail:
>Unformatted: