Make sure sablevm-classpath do not install jni.h (since it is provided by

sablevm) as noted by Gary Duzan in PR pkg/30137

Fix PLIST issues, to properly deintall
Fix AWK snippets for print-PLIST
Bump PKGREVISION for sablevm and sablevm-classpath

5 files changed, 33 insertions, 4 deletions

diff --git a/lang/sablevm-classpath/Makefile b/lang/sablevm-classpath/Makefile
index 6e552d970b2..e4ee39923ea 100644
--- a/lang/sablevm-classpath/Makefile
+++ b/lang/sablevm-classpath/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2006/04/15 22:09:56 tonio Exp $
+# $NetBSD: Makefile,v 1.9 2006/04/17 12:21:14 tonio Exp $
 #
 
 .include "Makefile.common"
+PKGREVISION=	1
 
 INFO_FILES=		# PLIST
 
diff --git a/lang/sablevm-classpath/PLIST b/lang/sablevm-classpath/PLIST
index 6aea0607cb5..839c51c0407 100644
--- a/lang/sablevm-classpath/PLIST
+++ b/lang/sablevm-classpath/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.8 2006/04/15 22:09:56 tonio Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/04/17 12:21:14 tonio Exp $
 java/sablevm/include/jawt.h
 java/sablevm/include/jawt_md.h
-java/sablevm/include/jni.h
 java/sablevm/include/jni_md.h
 java/sablevm/lib/sablevm-classpath/libjavaio.la
 java/sablevm/lib/sablevm-classpath/libjavalang.la
@@ -18,9 +17,13 @@ java/sablevm/lib/security/classpath.security
 java/sablevm/share/sablevm-classpath/libclasspath.jar
 java/sablevm/share/sablevm-classpath/resources.jar
 @dirrm java/sablevm/share/sablevm-classpath
+@dirrm java/sablevm/share
 @dirrm java/sablevm/lib/security
 @dirrm java/sablevm/lib/sablevm/lib
 @dirrm java/sablevm/lib/sablevm/jre/lib
 @dirrm java/sablevm/lib/sablevm/jre
+@dirrm java/sablevm/lib/sablevm
 @dirrm java/sablevm/lib/sablevm-classpath
+@dirrm java/sablevm/lib
 @dirrm java/sablevm/include
+@dirrm java/sablevm
diff --git a/lang/sablevm-classpath/distinfo b/lang/sablevm-classpath/distinfo
index fe9f29c7be5..1181ebdc351 100644
--- a/lang/sablevm-classpath/distinfo
+++ b/lang/sablevm-classpath/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.4 2006/04/15 22:09:56 tonio Exp $
+$NetBSD: distinfo,v 1.5 2006/04/17 12:21:14 tonio Exp $
 
 SHA1 (sablevm-classpath-1.13.tar.gz) = dda68e9e9fb54de1baca2d892446c09ce1cc19e1
 RMD160 (sablevm-classpath-1.13.tar.gz) = e6e7b5f57698c0bb419af6c7080c0c0e66ab0171
 Size (sablevm-classpath-1.13.tar.gz) = 6803379 bytes
 SHA1 (patch-aa) = b8b0a1e8f3a21cb6e26700714f146b44c2bafe71
 SHA1 (patch-ab) = f1ebd89f5f66170d769e678cd55792d806ebbeab
+SHA1 (patch-ac) = 59fd252a65c92a9f318ba4140227da855fb1e3c4
+SHA1 (patch-ad) = 1287035dbc2861e7b9a4ddbda2898cc58363ce75
diff --git a/lang/sablevm-classpath/patches/patch-ac b/lang/sablevm-classpath/patches/patch-ac
new file mode 100644
index 00000000000..0f745596ca7
--- /dev/null
+++ b/lang/sablevm-classpath/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2006/04/17 12:21:14 tonio Exp $
+
+--- include/Makefile.in.orig	2005-12-07 20:07:19.000000000 +0100
++++ include/Makefile.in
+@@ -265,7 +265,7 @@ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+ vm_classes = @vm_classes@
+-include_HEADERS = jni.h jni_md.h jawt.h jawt_md.h
++include_HEADERS = jni_md.h jawt.h jawt_md.h
+ DISTCLEANFILES = jni_md.h
+ ARG_JNI_JAVAH = -jni
+ ARG_CLASSPATH_JAVAH = -bootclasspath
diff --git a/lang/sablevm-classpath/patches/patch-ad b/lang/sablevm-classpath/patches/patch-ad
new file mode 100644
index 00000000000..54ff1c5af1a
--- /dev/null
+++ b/lang/sablevm-classpath/patches/patch-ad
@@ -0,0 +1,10 @@
+$NetBSD: patch-ad,v 1.1 2006/04/17 12:21:14 tonio Exp $
+
+--- include/Makefile.am.orig	2005-12-07 18:55:04.000000000 +0100
++++ include/Makefile.am
+@@ -1,4 +1,4 @@
+-include_HEADERS = jni.h jni_md.h jawt.h jawt_md.h
++include_HEADERS = jni_md.h jawt.h jawt_md.h
+ 
+ DISTCLEANFILES = jni_md.h
+