Begin unification of install paths for java based packages. Scheme is:

      * binaries which are not JVM dependent go in ${PREFIX}/bin

      * jar/zip/etc files for use by java programs go in
	${PREFIX}/lib/java

      * examples for java packages go in ${PREFIX}/share/examples/java

      * documentation for java packages go in ${PREFIX}/share/doc/java

JVMs go in their own directories, right now ${PREFIX}/{java,kaffe}, which
is necessary so that multiple JVMs can be installed concurrently, and so
that the miriad packages which count on ${JAVA_HOME} pointing to a JVM
install will DTRT.

Most java packages already use something similar or can be adapted easily.
Java packages such as Jakarta with large amounts of private java will need
to be addressed separately.

2 files changed, 40 insertions, 39 deletions

diff --git a/databases/jdbc-postgresql/Makefile b/databases/jdbc-postgresql/Makefile
index 841f05f869a..b24d64d1943 100644
--- a/databases/jdbc-postgresql/Makefile
+++ b/databases/jdbc-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/01/19 05:36:13 jwise Exp $
+# $NetBSD: Makefile,v 1.2 2000/05/09 18:30:12 jwise Exp $
 #
 
 DISTNAME=		postgresql-6.5.3
@@ -29,15 +29,16 @@ MAKE_ENV+=		CLASSPATH=${CLASSPATH}:.
 HELP_FILES=		README README_6.3 Implementation CHANGELOG
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/postgresql.jar ${PREFIX}/lib
-	${MKDIR} ${PREFIX}/share/examples/jdbc-postgresql
-	${INSTALL_DATA} ${WRKSRC}/example/*.java ${PREFIX}/share/examples/jdbc-postgresql
-	${MKDIR} ${PREFIX}/share/doc/jdbc-postgresql
-	${MKDIR} ${PREFIX}/share/doc/jdbc-postgresql/api
+	${MKDIR} ${PREFIX}/lib/java
+	${INSTALL_DATA} ${WRKSRC}/postgresql.jar ${PREFIX}/lib/java
+	${MKDIR} ${PREFIX}/share/examples/java/jdbc-postgresql
+	${INSTALL_DATA} ${WRKSRC}/example/*.java ${PREFIX}/share/examples/java/jdbc-postgresql
+	${MKDIR} ${PREFIX}/share/doc/java/jdbc-postgresql
+	${MKDIR} ${PREFIX}/share/doc/java/jdbc-postgresql/api
 .for X in ${HELP_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${X} ${PREFIX}/share/doc/jdbc-postgresql
+	${INSTALL_DATA} ${WRKSRC}/${X} ${PREFIX}/share/doc/java/jdbc-postgresql
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/*.html ${PREFIX}/share/doc/jdbc-postgresql/api
+	${INSTALL_DATA} ${WRKSRC}/*.html ${PREFIX}/share/doc/java/jdbc-postgresql/api
 
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/databases/jdbc-postgresql/pkg/PLIST b/databases/jdbc-postgresql/pkg/PLIST
index 6e775cfb18e..315a767f1c8 100644
--- a/databases/jdbc-postgresql/pkg/PLIST
+++ b/databases/jdbc-postgresql/pkg/PLIST
@@ -1,31 +1,31 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/01/19 05:36:13 jwise Exp $
-lib/postgresql.jar
-share/doc/jdbc-postgresql/README
-share/doc/jdbc-postgresql/README_6.3
-share/doc/jdbc-postgresql/Implementation
-share/doc/jdbc-postgresql/CHANGELOG
-share/examples/jdbc-postgresql/ImageViewer.java
-share/examples/jdbc-postgresql/basic.java
-share/examples/jdbc-postgresql/blobtest.java
-share/examples/jdbc-postgresql/datestyle.java
-share/examples/jdbc-postgresql/metadata.java
-share/examples/jdbc-postgresql/psql.java
-share/examples/jdbc-postgresql/threadsafe.java
-share/doc/jdbc-postgresql/api/AllNames.html
-share/doc/jdbc-postgresql/api/Package-postgresql.fastpath.html
-share/doc/jdbc-postgresql/api/Package-postgresql.html
-share/doc/jdbc-postgresql/api/Package-postgresql.largeobject.html
-share/doc/jdbc-postgresql/api/packages.html
-share/doc/jdbc-postgresql/api/postgresql.Connection.html
-share/doc/jdbc-postgresql/api/postgresql.Driver.html
-share/doc/jdbc-postgresql/api/postgresql.Field.html
-share/doc/jdbc-postgresql/api/postgresql.PG_Stream.html
-share/doc/jdbc-postgresql/api/postgresql.ResultSet.html
-share/doc/jdbc-postgresql/api/postgresql.fastpath.Fastpath.html
-share/doc/jdbc-postgresql/api/postgresql.fastpath.FastpathArg.html
-share/doc/jdbc-postgresql/api/postgresql.largeobject.LargeObject.html
-share/doc/jdbc-postgresql/api/postgresql.largeobject.LargeObjectManager.html
-share/doc/jdbc-postgresql/api/tree.html
-@dirrm share/doc/jdbc-postgresql/api
-@dirrm share/doc/jdbc-postgresql
-@dirrm share/examples/jdbc-postgresql
+@comment $NetBSD: PLIST,v 1.2 2000/05/09 18:30:13 jwise Exp $
+lib/java/postgresql.jar
+share/doc/java/jdbc-postgresql/README
+share/doc/java/jdbc-postgresql/README_6.3
+share/doc/java/jdbc-postgresql/Implementation
+share/doc/java/jdbc-postgresql/CHANGELOG
+share/examples/java/jdbc-postgresql/ImageViewer.java
+share/examples/java/jdbc-postgresql/basic.java
+share/examples/java/jdbc-postgresql/blobtest.java
+share/examples/java/jdbc-postgresql/datestyle.java
+share/examples/java/jdbc-postgresql/metadata.java
+share/examples/java/jdbc-postgresql/psql.java
+share/examples/java/jdbc-postgresql/threadsafe.java
+share/doc/java/jdbc-postgresql/api/AllNames.html
+share/doc/java/jdbc-postgresql/api/Package-postgresql.fastpath.html
+share/doc/java/jdbc-postgresql/api/Package-postgresql.html
+share/doc/java/jdbc-postgresql/api/Package-postgresql.largeobject.html
+share/doc/java/jdbc-postgresql/api/packages.html
+share/doc/java/jdbc-postgresql/api/postgresql.Connection.html
+share/doc/java/jdbc-postgresql/api/postgresql.Driver.html
+share/doc/java/jdbc-postgresql/api/postgresql.Field.html
+share/doc/java/jdbc-postgresql/api/postgresql.PG_Stream.html
+share/doc/java/jdbc-postgresql/api/postgresql.ResultSet.html
+share/doc/java/jdbc-postgresql/api/postgresql.fastpath.Fastpath.html
+share/doc/java/jdbc-postgresql/api/postgresql.fastpath.FastpathArg.html
+share/doc/java/jdbc-postgresql/api/postgresql.largeobject.LargeObject.html
+share/doc/java/jdbc-postgresql/api/postgresql.largeobject.LargeObjectManager.html
+share/doc/java/jdbc-postgresql/api/tree.html
+@dirrm share/doc/java/jdbc-postgresql/api
+@dirrm share/doc/java/jdbc-postgresql
+@dirrm share/examples/java/jdbc-postgresql