diff -ruN pircbot.bak/Makefile pircbot/Makefile
--- pircbot.bak/Makefile	Mon Aug 11 01:25:23 2003
+++ pircbot/Makefile	Mon Aug 11 01:45:43 2003
@@ -20,20 +20,20 @@
 USE_JAVA=	1.1+
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/pircbot.jar ${PREFIX}/share/java/classes
+	${INSTALL_DATA} ${WRKSRC}/pircbot.jar ${JAVAJARDIR}
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/pircbot
-	(cd ${WRKSRC}/javadocs && ${TAR} -cf - . | ${TAR} -xf - -C ${PREFIX}/share/doc/pircbot)
+	${MKDIR} ${DOCSDIR}
+	(cd ${WRKSRC}/javadocs && ${TAR} -cf - . | ${TAR} -xf - -C ${DOCSDIR})
 .endif
 
 post-install:
 	@echo "    ---------------------------------------------------------------"
-	@echo "    To use pircbot add ${PREFIX}/share/java/classes/pircbot.jar to"
+	@echo "    To use pircbot add ${JAVAJARDIR}/pircbot.jar to"
 	@echo "    your classpath. A short tutorial can be found here:"
 	@echo "        http://www.jibble.org/pircbot.php"
 .if !defined(NOPORTDOCS)
 	@echo "    pircbot javadoc documentation has also been installed in:"
-	@echo "        ${PREFIX}/share/doc/pircbot"
+	@echo "        ${DOCSDIR}"
 .endif
 	@echo "    ---------------------------------------------------------------"
 
diff -ruN pircbot.bak/pkg-plist pircbot/pkg-plist
--- pircbot.bak/pkg-plist	Mon Aug 11 01:26:47 2003
+++ pircbot/pkg-plist	Mon Aug 11 01:47:02 2003
@@ -1,49 +1,49 @@
 share/java/classes/pircbot.jar
-%%PORTDOCS%%share/doc/pircbot/constant-values.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/class-use/NickAlreadyInUseException.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/class-use/DccChat.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/class-use/DccFileTransfer.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/class-use/DccManager.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/class-use/IdentServer.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/class-use/InputThread.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/class-use/IrcException.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/class-use/OutputThread.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/class-use/PircBot.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/class-use/Queue.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/class-use/Colors.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/class-use/ReplyConstants.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/class-use/User.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/package-use.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/package-frame.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/package-summary.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/package-tree.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/DccChat.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/DccFileTransfer.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/DccManager.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/IdentServer.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/InputThread.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/OutputThread.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/PircBot.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/Queue.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/IrcException.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/NickAlreadyInUseException.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/Colors.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/ReplyConstants.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/User.html
-%%PORTDOCS%%share/doc/pircbot/overview-tree.html
-%%PORTDOCS%%share/doc/pircbot/index-all.html
-%%PORTDOCS%%share/doc/pircbot/deprecated-list.html
-%%PORTDOCS%%share/doc/pircbot/allclasses-frame.html
-%%PORTDOCS%%share/doc/pircbot/allclasses-noframe.html
-%%PORTDOCS%%share/doc/pircbot/index.html
-%%PORTDOCS%%share/doc/pircbot/packages.html
-%%PORTDOCS%%share/doc/pircbot/serialized-form.html
-%%PORTDOCS%%share/doc/pircbot/package-list
-%%PORTDOCS%%share/doc/pircbot/help-doc.html
-%%PORTDOCS%%share/doc/pircbot/pircbot-style.css
-%%PORTDOCS%%share/doc/pircbot/stylesheet.css
-%%PORTDOCS%%@dirrm share/doc/pircbot/org/jibble/pircbot/class-use
-%%PORTDOCS%%@dirrm share/doc/pircbot/org/jibble/pircbot
-%%PORTDOCS%%@dirrm share/doc/pircbot/org/jibble
-%%PORTDOCS%%@dirrm share/doc/pircbot/org
-%%PORTDOCS%%@dirrm share/doc/pircbot
+%%DOCSDIR%%/constant-values.html
+%%DOCSDIR%%/org/jibble/pircbot/class-use/NickAlreadyInUseException.html
+%%DOCSDIR%%/org/jibble/pircbot/class-use/DccChat.html
+%%DOCSDIR%%/org/jibble/pircbot/class-use/DccFileTransfer.html
+%%DOCSDIR%%/org/jibble/pircbot/class-use/DccManager.html
+%%DOCSDIR%%/org/jibble/pircbot/class-use/IdentServer.html
+%%DOCSDIR%%/org/jibble/pircbot/class-use/InputThread.html
+%%DOCSDIR%%/org/jibble/pircbot/class-use/IrcException.html
+%%DOCSDIR%%/org/jibble/pircbot/class-use/OutputThread.html
+%%DOCSDIR%%/org/jibble/pircbot/class-use/PircBot.html
+%%DOCSDIR%%/org/jibble/pircbot/class-use/Queue.html
+%%DOCSDIR%%/org/jibble/pircbot/class-use/Colors.html
+%%DOCSDIR%%/org/jibble/pircbot/class-use/ReplyConstants.html
+%%DOCSDIR%%/org/jibble/pircbot/class-use/User.html
+%%DOCSDIR%%/org/jibble/pircbot/package-use.html
+%%DOCSDIR%%/org/jibble/pircbot/package-frame.html
+%%DOCSDIR%%/org/jibble/pircbot/package-summary.html
+%%DOCSDIR%%/org/jibble/pircbot/package-tree.html
+%%DOCSDIR%%/org/jibble/pircbot/DccChat.html
+%%DOCSDIR%%/org/jibble/pircbot/DccFileTransfer.html
+%%DOCSDIR%%/org/jibble/pircbot/DccManager.html
+%%DOCSDIR%%/org/jibble/pircbot/IdentServer.html
+%%DOCSDIR%%/org/jibble/pircbot/InputThread.html
+%%DOCSDIR%%/org/jibble/pircbot/OutputThread.html
+%%DOCSDIR%%/org/jibble/pircbot/PircBot.html
+%%DOCSDIR%%/org/jibble/pircbot/Queue.html
+%%DOCSDIR%%/org/jibble/pircbot/IrcException.html
+%%DOCSDIR%%/org/jibble/pircbot/NickAlreadyInUseException.html
+%%DOCSDIR%%/org/jibble/pircbot/Colors.html
+%%DOCSDIR%%/org/jibble/pircbot/ReplyConstants.html
+%%DOCSDIR%%/org/jibble/pircbot/User.html
+%%DOCSDIR%%/overview-tree.html
+%%DOCSDIR%%/index-all.html
+%%DOCSDIR%%/deprecated-list.html
+%%DOCSDIR%%/allclasses-frame.html
+%%DOCSDIR%%/allclasses-noframe.html
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/packages.html
+%%DOCSDIR%%/serialized-form.html
+%%DOCSDIR%%/package-list
+%%DOCSDIR%%/help-doc.html
+%%DOCSDIR%%/pircbot-style.css
+%%DOCSDIR%%/stylesheet.css
+@dirrm %%DOCSDIR%%/org/jibble/pircbot/class-use
+@dirrm %%DOCSDIR%%/org/jibble/pircbot
+@dirrm %%DOCSDIR%%/org/jibble
+@dirrm %%DOCSDIR%%/org
+@dirrm %%DOCSDIR%%