Re-arrange directory hierarchy.

Approved by:	maintainer

3 files changed, 128 insertions, 104 deletions

diff --git a/java/jsdk/Makefile b/java/jsdk/Makefile
index 38f2daf3ac42..8ed79544d262 100644
--- a/java/jsdk/Makefile
+++ b/java/jsdk/Makefile
@@ -3,7 +3,7 @@
 # Date created:		1999/05/29
 # Whom:			Kensaku Masuda <greg@greg.rim.or.jp>
 #
-# $Id: Makefile,v 1.3 1999/06/28 15:58:33 shige Exp $
+# $Id: Makefile,v 1.4 1999/06/28 18:34:03 billf Exp $
 #
 
 DISTNAME=	jsdk20-solaris2-sparc
@@ -20,7 +20,6 @@ NO_CDROM=	"Sun has a funky license for this software"
 RESTRICTED=	"no commercial use"
 
 WRKSRC=		${WRKDIR}/JSDK2.0
-NO_BUILD=	yes
 
 do-fetch:
 	@if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \
@@ -31,9 +30,15 @@ do-fetch:
 	  ${ECHO_MSG} "=========================================================="; \
 	 fi
 
+do-build:
+	@${SED} -e s,%%PREFIX%%,${PREFIX},g \
+		${WRKSRC}/bin/servletrunner > ${WRKDIR}/servletrunner
+
 do-install:
-	${MKDIR} ${PREFIX}/JSDK2.0
-	(cd ${WRKSRC} && tar -c -f - .) \
-		| (cd ${PREFIX}/JSDK2.0 && tar fx -)
+	@${MKDIR} ${PREFIX}/share/java/classes ${PREFIX}/share/java/jsdk20
+	@${INSTALL_SCRIPT} ${WRKDIR}/servletrunner ${PREFIX}/bin
+	@${INSTALL_DATA} ${WRKSRC}/lib/jsdk.jar ${PREFIX}/share/java/classes
+	@cd ${WRKSRC}; \
+	 ${CP} -R [Rde]* ${PREFIX}/share/java/jsdk20
 
 .include <bsd.port.mk>
diff --git a/java/jsdk/files/patch-aa b/java/jsdk/files/patch-aa
new file mode 100644
index 000000000000..6f33ea8615a1
--- /dev/null
+++ b/java/jsdk/files/patch-aa
@@ -0,0 +1,45 @@
+--- bin/servletrunner.orig	Wed Apr 22 04:32:48 1998
++++ bin/servletrunner	Wed Jun 30 22:34:20 1999
+@@ -54,7 +54,7 @@
+     fi
+     if [ -z "$JAVA_HOME" ]
+     then
+-	JAVA_HOME=/usr/local/jdk1.1
++	JAVA_HOME=/usr/local/jdk1.1.8
+     fi
+ fi
+ 
+@@ -66,31 +66,12 @@
+     error "Cannot find the Java runtime. Please set JAVA_HOME."
+ fi
+ 
+-# If JSDK_HOME not specified then determine default location of JSDK
+-# from directory out of which this script was executed. Otherwise,
+-# JSDK_HOME must be set manually.
+-
+-d=`dirname $0`
+-if [ -n "$d" ]
+-  then
+-    JSDK_HOME=`cd $d/.. >/dev/null 2>&1 && pwd`
+-fi
+-if [ -z "$JSDK_HOME" ]
+-  then
+-    error "Cannot find the JSDK. Please set JSDK_HOME."
+-fi
+-
+-if [ ! -d "$JSDK_HOME" ]
+-then
+-    error "JSDK_HOME ($JSDK_HOME) must be a directory."
+-fi
+-
+ # Add JSDK classes to default class path.
+ 
+-CLASSPATH=$JSDK_HOME/classes:$JSDK_HOME/lib/jsdk.jar:$CLASSPATH
++CLASSPATH=%%PREFIX%%/share/java/classes/jsdk.jar:$CLASSPATH
+ export CLASSPATH
+ 
+ # Start server and pass any arguments specified on command line.
+ 
+-cd $JSDK_HOME
++cd %%PREFIX%%/share/java/classes
+ $JAVA_HOME/bin/java sun.servlet.http.HttpServer $*
diff --git a/java/jsdk/pkg-plist b/java/jsdk/pkg-plist
index 8a9012bacf4a..e33d71e3ee67 100644
--- a/java/jsdk/pkg-plist
+++ b/java/jsdk/pkg-plist
@@ -1,99 +1,73 @@
-JSDK2.0/README
-JSDK2.0/bin/servletrunner
-JSDK2.0/doc/apidoc/AllNames.html
-JSDK2.0/doc/apidoc/Package-javax.servlet.html
-JSDK2.0/doc/apidoc/Package-javax.servlet.http.html
-JSDK2.0/doc/apidoc/images/OpenBookIcon.gif
-JSDK2.0/doc/apidoc/images/blue-ball-small.gif
-JSDK2.0/doc/apidoc/images/blue-ball.gif
-JSDK2.0/doc/apidoc/images/class-index.gif
-JSDK2.0/doc/apidoc/images/constructor-index.gif
-JSDK2.0/doc/apidoc/images/constructors.gif
-JSDK2.0/doc/apidoc/images/cyan-ball-small.gif
-JSDK2.0/doc/apidoc/images/cyan-ball.gif
-JSDK2.0/doc/apidoc/images/error-index.gif
-JSDK2.0/doc/apidoc/images/exception-index.gif
-JSDK2.0/doc/apidoc/images/green-ball-small.gif
-JSDK2.0/doc/apidoc/images/green-ball.gif
-JSDK2.0/doc/apidoc/images/interface-index.gif
-JSDK2.0/doc/apidoc/images/java.awt/GridBagEx.gif
-JSDK2.0/doc/apidoc/images/magenta-ball-small.gif
-JSDK2.0/doc/apidoc/images/magenta-ball.gif
-JSDK2.0/doc/apidoc/images/method-index.gif
-JSDK2.0/doc/apidoc/images/methods.gif
-JSDK2.0/doc/apidoc/images/package-index.gif
-JSDK2.0/doc/apidoc/images/red-ball-small.gif
-JSDK2.0/doc/apidoc/images/red-ball.gif
-JSDK2.0/doc/apidoc/images/variable-index.gif
-JSDK2.0/doc/apidoc/images/variables.gif
-JSDK2.0/doc/apidoc/images/yellow-ball-small.gif
-JSDK2.0/doc/apidoc/images/yellow-ball.gif
-JSDK2.0/doc/apidoc/javax.servlet.GenericServlet.html
-JSDK2.0/doc/apidoc/javax.servlet.Servlet.html
-JSDK2.0/doc/apidoc/javax.servlet.ServletConfig.html
-JSDK2.0/doc/apidoc/javax.servlet.ServletContext.html
-JSDK2.0/doc/apidoc/javax.servlet.ServletException.html
-JSDK2.0/doc/apidoc/javax.servlet.ServletInputStream.html
-JSDK2.0/doc/apidoc/javax.servlet.ServletOutputStream.html
-JSDK2.0/doc/apidoc/javax.servlet.ServletRequest.html
-JSDK2.0/doc/apidoc/javax.servlet.ServletResponse.html
-JSDK2.0/doc/apidoc/javax.servlet.SingleThreadModel.html
-JSDK2.0/doc/apidoc/javax.servlet.UnavailableException.html
-JSDK2.0/doc/apidoc/javax.servlet.http.Cookie.html
-JSDK2.0/doc/apidoc/javax.servlet.http.HttpServlet.html
-JSDK2.0/doc/apidoc/javax.servlet.http.HttpServletRequest.html
-JSDK2.0/doc/apidoc/javax.servlet.http.HttpServletResponse.html
-JSDK2.0/doc/apidoc/javax.servlet.http.HttpSession.html
-JSDK2.0/doc/apidoc/javax.servlet.http.HttpSessionBindingEvent.html
-JSDK2.0/doc/apidoc/javax.servlet.http.HttpSessionBindingListener.html
-JSDK2.0/doc/apidoc/javax.servlet.http.HttpSessionContext.html
-JSDK2.0/doc/apidoc/javax.servlet.http.HttpUtils.html
-JSDK2.0/doc/apidoc/packages.html
-JSDK2.0/doc/apidoc/tree.html
-JSDK2.0/doc/images/banner.gif
-JSDK2.0/doc/images/survey-reply.gif
-JSDK2.0/doc/servlet_tutorial.html
-JSDK2.0/examples/JdcSurvey.html
-JSDK2.0/examples/SessionServlet.class
-JSDK2.0/examples/SessionServlet.java
-JSDK2.0/examples/SimpleServlet.class
-JSDK2.0/examples/SimpleServlet.java
-JSDK2.0/examples/SnoopServlet.class
-JSDK2.0/examples/SnoopServlet.java
-JSDK2.0/examples/SurveyServlet.class
-JSDK2.0/examples/SurveyServlet.java
-JSDK2.0/examples/servlet.properties
-JSDK2.0/lib/jsdk.jar
-JSDK2.0/src/javax/servlet/GenericServlet.java
-JSDK2.0/src/javax/servlet/Servlet.java
-JSDK2.0/src/javax/servlet/ServletConfig.java
-JSDK2.0/src/javax/servlet/ServletContext.java
-JSDK2.0/src/javax/servlet/ServletException.java
-JSDK2.0/src/javax/servlet/ServletInputStream.java
-JSDK2.0/src/javax/servlet/ServletOutputStream.java
-JSDK2.0/src/javax/servlet/ServletRequest.java
-JSDK2.0/src/javax/servlet/ServletResponse.java
-JSDK2.0/src/javax/servlet/SingleThreadModel.java
-JSDK2.0/src/javax/servlet/UnavailableException.java
-JSDK2.0/src/javax/servlet/http/Cookie.java
-JSDK2.0/src/javax/servlet/http/HttpServlet.java
-JSDK2.0/src/javax/servlet/http/HttpServletRequest.java
-JSDK2.0/src/javax/servlet/http/HttpServletResponse.java
-JSDK2.0/src/javax/servlet/http/HttpSession.java
-JSDK2.0/src/javax/servlet/http/HttpSessionBindingEvent.java
-JSDK2.0/src/javax/servlet/http/HttpSessionBindingListener.java
-JSDK2.0/src/javax/servlet/http/HttpSessionContext.java
-JSDK2.0/src/javax/servlet/http/HttpUtils.java
-@dirrm JSDK2.0/bin
-@dirrm JSDK2.0/doc/apidoc/images/java.awt
-@dirrm JSDK2.0/doc/apidoc/images
-@dirrm JSDK2.0/doc/apidoc
-@dirrm JSDK2.0/doc/images
-@dirrm JSDK2.0/doc
-@dirrm JSDK2.0/examples
-@dirrm JSDK2.0/lib
-@dirrm JSDK2.0/src/javax/servlet/http
-@dirrm JSDK2.0/src/javax/servlet
-@dirrm JSDK2.0/src/javax
-@dirrm JSDK2.0/src
-@dirrm JSDK2.0
+bin/servletrunner
+share/java/classes/jsdk.jar
+share/java/jsdk20/README
+share/java/jsdk20/doc/apidoc/AllNames.html
+share/java/jsdk20/doc/apidoc/Package-javax.servlet.html
+share/java/jsdk20/doc/apidoc/Package-javax.servlet.http.html
+share/java/jsdk20/doc/apidoc/images/OpenBookIcon.gif
+share/java/jsdk20/doc/apidoc/images/blue-ball-small.gif
+share/java/jsdk20/doc/apidoc/images/blue-ball.gif
+share/java/jsdk20/doc/apidoc/images/class-index.gif
+share/java/jsdk20/doc/apidoc/images/constructor-index.gif
+share/java/jsdk20/doc/apidoc/images/constructors.gif
+share/java/jsdk20/doc/apidoc/images/cyan-ball-small.gif
+share/java/jsdk20/doc/apidoc/images/cyan-ball.gif
+share/java/jsdk20/doc/apidoc/images/error-index.gif
+share/java/jsdk20/doc/apidoc/images/exception-index.gif
+share/java/jsdk20/doc/apidoc/images/green-ball-small.gif
+share/java/jsdk20/doc/apidoc/images/green-ball.gif
+share/java/jsdk20/doc/apidoc/images/interface-index.gif
+share/java/jsdk20/doc/apidoc/images/java.awt/GridBagEx.gif
+share/java/jsdk20/doc/apidoc/images/magenta-ball-small.gif
+share/java/jsdk20/doc/apidoc/images/magenta-ball.gif
+share/java/jsdk20/doc/apidoc/images/method-index.gif
+share/java/jsdk20/doc/apidoc/images/methods.gif
+share/java/jsdk20/doc/apidoc/images/package-index.gif
+share/java/jsdk20/doc/apidoc/images/red-ball-small.gif
+share/java/jsdk20/doc/apidoc/images/red-ball.gif
+share/java/jsdk20/doc/apidoc/images/variable-index.gif
+share/java/jsdk20/doc/apidoc/images/variables.gif
+share/java/jsdk20/doc/apidoc/images/yellow-ball-small.gif
+share/java/jsdk20/doc/apidoc/images/yellow-ball.gif
+share/java/jsdk20/doc/apidoc/javax.servlet.GenericServlet.html
+share/java/jsdk20/doc/apidoc/javax.servlet.Servlet.html
+share/java/jsdk20/doc/apidoc/javax.servlet.ServletConfig.html
+share/java/jsdk20/doc/apidoc/javax.servlet.ServletContext.html
+share/java/jsdk20/doc/apidoc/javax.servlet.ServletException.html
+share/java/jsdk20/doc/apidoc/javax.servlet.ServletInputStream.html
+share/java/jsdk20/doc/apidoc/javax.servlet.ServletOutputStream.html
+share/java/jsdk20/doc/apidoc/javax.servlet.ServletRequest.html
+share/java/jsdk20/doc/apidoc/javax.servlet.ServletResponse.html
+share/java/jsdk20/doc/apidoc/javax.servlet.SingleThreadModel.html
+share/java/jsdk20/doc/apidoc/javax.servlet.UnavailableException.html
+share/java/jsdk20/doc/apidoc/javax.servlet.http.Cookie.html
+share/java/jsdk20/doc/apidoc/javax.servlet.http.HttpServlet.html
+share/java/jsdk20/doc/apidoc/javax.servlet.http.HttpServletRequest.html
+share/java/jsdk20/doc/apidoc/javax.servlet.http.HttpServletResponse.html
+share/java/jsdk20/doc/apidoc/javax.servlet.http.HttpSession.html
+share/java/jsdk20/doc/apidoc/javax.servlet.http.HttpSessionBindingEvent.html
+share/java/jsdk20/doc/apidoc/javax.servlet.http.HttpSessionBindingListener.html
+share/java/jsdk20/doc/apidoc/javax.servlet.http.HttpSessionContext.html
+share/java/jsdk20/doc/apidoc/javax.servlet.http.HttpUtils.html
+share/java/jsdk20/doc/apidoc/packages.html
+share/java/jsdk20/doc/apidoc/tree.html
+share/java/jsdk20/doc/images/banner.gif
+share/java/jsdk20/doc/images/survey-reply.gif
+share/java/jsdk20/doc/servlet_tutorial.html
+share/java/jsdk20/examples/JdcSurvey.html
+share/java/jsdk20/examples/SessionServlet.class
+share/java/jsdk20/examples/SessionServlet.java
+share/java/jsdk20/examples/SimpleServlet.class
+share/java/jsdk20/examples/SimpleServlet.java
+share/java/jsdk20/examples/SnoopServlet.class
+share/java/jsdk20/examples/SnoopServlet.java
+share/java/jsdk20/examples/SurveyServlet.class
+share/java/jsdk20/examples/SurveyServlet.java
+share/java/jsdk20/examples/servlet.properties
+@dirrm share/java/jsdk20/doc/apidoc/images/java.awt
+@dirrm share/java/jsdk20/doc/apidoc/images
+@dirrm share/java/jsdk20/doc/apidoc
+@dirrm share/java/jsdk20/doc/images
+@dirrm share/java/jsdk20/doc
+@dirrm share/java/jsdk20/examples
+@dirrm share/java/jsdk20