Bring into line with the new java world order.

Only package left to do is jakarta, which will be done as part of an upgrade
to jakarta-3.1 tonight or tomorrow.

Also, look for a swing package to be committed tonight or tomorrow -- if we
can't have JDK 1.2 right now, we can at least have swing...

2 files changed, 106 insertions, 107 deletions

diff --git a/www/spfc/Makefile b/www/spfc/Makefile
index 191b0381e70..f25199c0448 100644
--- a/www/spfc/Makefile
+++ b/www/spfc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/01/18 18:05:29 jwise Exp $
+# $NetBSD: Makefile,v 1.2 2000/05/09 21:02:35 jwise Exp $
 
 DISTNAME=	spfc-0.2.0
 CATEGORIES=	www
@@ -15,17 +15,16 @@ DEPENDS+=	jsdk-2.0:../../www/jsdk20
 USE_JAVA=
 USE_GMAKE=
 NO_CONFIGURE=
-NO_MTREE=
-MAKE_ENV+=	CLASSPATH=${CLASSPATH}:${JSDK_HOME}/lib/jsdk.jar
+MAKE_ENV+=	CLASSPATH=${CLASSPATH}:${PREFIX}/lib/jsdk.jar
 WRKSRC=		${WRKDIR}/spfc-0.2.0/src/
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/../bin/spfc.jar ${JSDK_HOME}/lib
-	${MKDIR} ${JSDK_HOME}/doc/spfc
+	${INSTALL_DATA} ${WRKSRC}/../bin/spfc.jar ${PREFIX}/lib/java
+	${MKDIR} ${PREFIX}/share/doc/java/spfc
 	(cd ${WRKSRC}/../docs ; ${GTAR} pcf - .) | \
-		(cd ${JSDK_HOME}/doc/spfc ; ${GTAR} pxvf -)
+		(cd ${PREFIX}/share/doc/java/spfc ; ${GTAR} pxvf -)
 
 .include "../../mk/bsd.pkg.mk"
-JSDK_HOME=	${JAVA_HOME}/jsdk
-BUILD_DEFS+=	JSDK_HOME
-PREFIX:=	${JSDK_HOME}
+
+# This must be after the include of bsd.pkg.mk
+CLASSPATH:=${CLASSPATH}:${PREFIX}/lib/java/jsdk.jar:.
diff --git a/www/spfc/pkg/PLIST b/www/spfc/pkg/PLIST
index 64e60341e5e..1bf19467f85 100644
--- a/www/spfc/pkg/PLIST
+++ b/www/spfc/pkg/PLIST
@@ -1,98 +1,98 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/01/18 18:05:29 jwise Exp $
-lib/spfc.jar
-doc/spfc/api/images/blue-ball-small.gif
-doc/spfc/api/images/blue-ball.gif
-doc/spfc/api/images/class-index.gif
-doc/spfc/api/images/constructor-index.gif
-doc/spfc/api/images/constructors.gif
-doc/spfc/api/images/cyan-ball-small.gif
-doc/spfc/api/images/cyan-ball.gif
-doc/spfc/api/images/error-index.gif
-doc/spfc/api/images/exception-index.gif
-doc/spfc/api/images/green-ball-small.gif
-doc/spfc/api/images/green-ball.gif
-doc/spfc/api/images/interface-index.gif
-doc/spfc/api/images/magenta-ball-small.gif
-doc/spfc/api/images/magenta-ball.gif
-doc/spfc/api/images/method-index.gif
-doc/spfc/api/images/methods.gif
-doc/spfc/api/images/package-index.gif
-doc/spfc/api/images/red-ball-small.gif
-doc/spfc/api/images/red-ball.gif
-doc/spfc/api/images/variable-index.gif
-doc/spfc/api/images/variables.gif
-doc/spfc/api/images/yellow-ball-small.gif
-doc/spfc/api/images/yellow-ball.gif
-doc/spfc/api/AllNames.html
-doc/spfc/api/Package-org.apache.spfc.html
-doc/spfc/api/Package-org.apache.spfc.util.html
-doc/spfc/api/index.html
-doc/spfc/api/org.apache.spfc.AbstractButton.html
-doc/spfc/api/org.apache.spfc.ActionAdapter.html
-doc/spfc/api/org.apache.spfc.ActionEvent.html
-doc/spfc/api/org.apache.spfc.ActionListener.html
-doc/spfc/api/org.apache.spfc.Button.html
-doc/spfc/api/org.apache.spfc.ButtonGroup.html
-doc/spfc/api/org.apache.spfc.Cell.html
-doc/spfc/api/org.apache.spfc.CheckBox.html
-doc/spfc/api/org.apache.spfc.Client.html
-doc/spfc/api/org.apache.spfc.Component.html
-doc/spfc/api/org.apache.spfc.Container.html
-doc/spfc/api/org.apache.spfc.FlowLayout.html
-doc/spfc/api/org.apache.spfc.Form.html
-doc/spfc/api/org.apache.spfc.GridBagConstraints.html
-doc/spfc/api/org.apache.spfc.GridBagLayout.html
-doc/spfc/api/org.apache.spfc.Header.html
-doc/spfc/api/org.apache.spfc.LayoutManager.html
-doc/spfc/api/org.apache.spfc.Link.html
-doc/spfc/api/org.apache.spfc.NavigationComponent.html
-doc/spfc/api/org.apache.spfc.NetObject.html
-doc/spfc/api/tree.html
-doc/spfc/api/packages.html
-doc/spfc/api/org.apache.spfc.NetPage.html
-doc/spfc/api/org.apache.spfc.Page.html
-doc/spfc/api/org.apache.spfc.RadioButton.html
-doc/spfc/api/org.apache.spfc.RequestListener.html
-doc/spfc/api/org.apache.spfc.Row.html
-doc/spfc/api/org.apache.spfc.Servlet.html
-doc/spfc/api/org.apache.spfc.Table.html
-doc/spfc/api/org.apache.spfc.TableStyle.html
-doc/spfc/api/org.apache.spfc.Text.html
-doc/spfc/api/org.apache.spfc.TextField.html
-doc/spfc/api/org.apache.spfc.ToggleButton.html
-doc/spfc/api/org.apache.spfc.Wizard.html
-doc/spfc/api/org.apache.spfc.WizardNode.html
-doc/spfc/api/org.apache.spfc.util.ActionProducerAdapter.html
-doc/spfc/api/org.apache.spfc.util.EmptyEnumeration.html
-doc/spfc/api/org.apache.spfc.Sendable.html
-doc/spfc/api/org.apache.spfc.DefaultRequestListener.html
-doc/spfc/api/org.apache.spfc.URLRequestListener.html
-doc/spfc/.htaccess
-doc/spfc/common.css
-doc/spfc/index.html
-doc/spfc/design/brainstorming/index.html
-doc/spfc/design/index.html
-doc/spfc/design/objectmodel/objectmodel.gif
-doc/spfc/design/objectmodel/objectmodel.vsd
-doc/spfc/design/objectmodel/overview.flo
-doc/spfc/design/objectmodel/overview.gif
-doc/spfc/history/index.html
-doc/spfc/links/index.html
-doc/spfc/problems/index.html
-doc/spfc/resources/index.html
-doc/spfc/system/complete.flo
-doc/spfc/system/complete.gif
-doc/spfc/system/index.html
-doc/spfc/system/simple.flo
-doc/spfc/system/simple.gif
-@dirrm doc/spfc/system
-@dirrm doc/spfc/resources
-@dirrm doc/spfc/problems
-@dirrm doc/spfc/links
-@dirrm doc/spfc/history
-@dirrm doc/spfc/design/objectmodel
-@dirrm doc/spfc/design/brainstorming
-@dirrm doc/spfc/design
-@dirrm doc/spfc/api/images
-@dirrm doc/spfc/api
-@dirrm doc/spfc
+@comment $NetBSD: PLIST,v 1.2 2000/05/09 21:02:36 jwise Exp $
+lib/java/spfc.jar
+share/doc/java/spfc/api/images/blue-ball-small.gif
+share/doc/java/spfc/api/images/blue-ball.gif
+share/doc/java/spfc/api/images/class-index.gif
+share/doc/java/spfc/api/images/constructor-index.gif
+share/doc/java/spfc/api/images/constructors.gif
+share/doc/java/spfc/api/images/cyan-ball-small.gif
+share/doc/java/spfc/api/images/cyan-ball.gif
+share/doc/java/spfc/api/images/error-index.gif
+share/doc/java/spfc/api/images/exception-index.gif
+share/doc/java/spfc/api/images/green-ball-small.gif
+share/doc/java/spfc/api/images/green-ball.gif
+share/doc/java/spfc/api/images/interface-index.gif
+share/doc/java/spfc/api/images/magenta-ball-small.gif
+share/doc/java/spfc/api/images/magenta-ball.gif
+share/doc/java/spfc/api/images/method-index.gif
+share/doc/java/spfc/api/images/methods.gif
+share/doc/java/spfc/api/images/package-index.gif
+share/doc/java/spfc/api/images/red-ball-small.gif
+share/doc/java/spfc/api/images/red-ball.gif
+share/doc/java/spfc/api/images/variable-index.gif
+share/doc/java/spfc/api/images/variables.gif
+share/doc/java/spfc/api/images/yellow-ball-small.gif
+share/doc/java/spfc/api/images/yellow-ball.gif
+share/doc/java/spfc/api/AllNames.html
+share/doc/java/spfc/api/Package-org.apache.spfc.html
+share/doc/java/spfc/api/Package-org.apache.spfc.util.html
+share/doc/java/spfc/api/index.html
+share/doc/java/spfc/api/org.apache.spfc.AbstractButton.html
+share/doc/java/spfc/api/org.apache.spfc.ActionAdapter.html
+share/doc/java/spfc/api/org.apache.spfc.ActionEvent.html
+share/doc/java/spfc/api/org.apache.spfc.ActionListener.html
+share/doc/java/spfc/api/org.apache.spfc.Button.html
+share/doc/java/spfc/api/org.apache.spfc.ButtonGroup.html
+share/doc/java/spfc/api/org.apache.spfc.Cell.html
+share/doc/java/spfc/api/org.apache.spfc.CheckBox.html
+share/doc/java/spfc/api/org.apache.spfc.Client.html
+share/doc/java/spfc/api/org.apache.spfc.Component.html
+share/doc/java/spfc/api/org.apache.spfc.Container.html
+share/doc/java/spfc/api/org.apache.spfc.FlowLayout.html
+share/doc/java/spfc/api/org.apache.spfc.Form.html
+share/doc/java/spfc/api/org.apache.spfc.GridBagConstraints.html
+share/doc/java/spfc/api/org.apache.spfc.GridBagLayout.html
+share/doc/java/spfc/api/org.apache.spfc.Header.html
+share/doc/java/spfc/api/org.apache.spfc.LayoutManager.html
+share/doc/java/spfc/api/org.apache.spfc.Link.html
+share/doc/java/spfc/api/org.apache.spfc.NavigationComponent.html
+share/doc/java/spfc/api/org.apache.spfc.NetObject.html
+share/doc/java/spfc/api/tree.html
+share/doc/java/spfc/api/packages.html
+share/doc/java/spfc/api/org.apache.spfc.NetPage.html
+share/doc/java/spfc/api/org.apache.spfc.Page.html
+share/doc/java/spfc/api/org.apache.spfc.RadioButton.html
+share/doc/java/spfc/api/org.apache.spfc.RequestListener.html
+share/doc/java/spfc/api/org.apache.spfc.Row.html
+share/doc/java/spfc/api/org.apache.spfc.Servlet.html
+share/doc/java/spfc/api/org.apache.spfc.Table.html
+share/doc/java/spfc/api/org.apache.spfc.TableStyle.html
+share/doc/java/spfc/api/org.apache.spfc.Text.html
+share/doc/java/spfc/api/org.apache.spfc.TextField.html
+share/doc/java/spfc/api/org.apache.spfc.ToggleButton.html
+share/doc/java/spfc/api/org.apache.spfc.Wizard.html
+share/doc/java/spfc/api/org.apache.spfc.WizardNode.html
+share/doc/java/spfc/api/org.apache.spfc.util.ActionProducerAdapter.html
+share/doc/java/spfc/api/org.apache.spfc.util.EmptyEnumeration.html
+share/doc/java/spfc/api/org.apache.spfc.Sendable.html
+share/doc/java/spfc/api/org.apache.spfc.DefaultRequestListener.html
+share/doc/java/spfc/api/org.apache.spfc.URLRequestListener.html
+share/doc/java/spfc/.htaccess
+share/doc/java/spfc/common.css
+share/doc/java/spfc/index.html
+share/doc/java/spfc/design/brainstorming/index.html
+share/doc/java/spfc/design/index.html
+share/doc/java/spfc/design/objectmodel/objectmodel.gif
+share/doc/java/spfc/design/objectmodel/objectmodel.vsd
+share/doc/java/spfc/design/objectmodel/overview.flo
+share/doc/java/spfc/design/objectmodel/overview.gif
+share/doc/java/spfc/history/index.html
+share/doc/java/spfc/links/index.html
+share/doc/java/spfc/problems/index.html
+share/doc/java/spfc/resources/index.html
+share/doc/java/spfc/system/complete.flo
+share/doc/java/spfc/system/complete.gif
+share/doc/java/spfc/system/index.html
+share/doc/java/spfc/system/simple.flo
+share/doc/java/spfc/system/simple.gif
+@dirrm share/doc/java/spfc/system
+@dirrm share/doc/java/spfc/resources
+@dirrm share/doc/java/spfc/problems
+@dirrm share/doc/java/spfc/links
+@dirrm share/doc/java/spfc/history
+@dirrm share/doc/java/spfc/design/objectmodel
+@dirrm share/doc/java/spfc/design/brainstorming
+@dirrm share/doc/java/spfc/design
+@dirrm share/doc/java/spfc/api/images
+@dirrm share/doc/java/spfc/api
+@dirrm share/doc/java/spfc