Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/shells/wapsh/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- Makefile	19 Jun 2006 20:06:57 -0000	1.16
+++ Makefile	21 Nov 2006 14:50:58 -0000
@@ -21,8 +21,6 @@
 
 WWWOWN?=	www
 WWWGRP?=	www
-WWWDIR?=	www/${PORTNAME}
-DATADIR=	${PREFIX}/${WWWDIR}
 SUB_FILES=	pkg-message
 
 USERGUIDEDOCS=	Image10.jpg Image11.jpg Image12.jpg Image13.jpg \
@@ -80,11 +78,11 @@
 	fi
 .endfor
 
-	${MKDIR} ${DATADIR}
+	${MKDIR} ${WWWDIR}
 .for H in ${HTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/htdocs/$H ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/htdocs/$H ${WWWDIR}
 .endfor
-	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${DATADIR}
+	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}/admin_guide
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/shells/wapsh/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- pkg-plist	8 Apr 2006 18:58:52 -0000	1.6
+++ pkg-plist	21 Nov 2006 14:50:58 -0000
@@ -8,23 +8,23 @@
 @unexec if cmp -s %D/etc/wapsh/loginhosts %D/etc/wapsh/loginhosts.dist; then rm -f %D/etc/wapsh/loginhosts; fi
 etc/wapsh/loginhosts.dist
 @exec [ -f %B/loginhosts ] || cp %B/%f %B/loginhosts
-%%DATADIR%%/command.php
-%%DATADIR%%/command_html.inc
-%%DATADIR%%/command_wml.inc
-%%DATADIR%%/common.inc
-%%DATADIR%%/common_html.inc
-%%DATADIR%%/common_wml.inc
-%%DATADIR%%/controls_wml.php
-%%DATADIR%%/displayfuncs.inc
-%%DATADIR%%/getloginhosts.inc
-%%DATADIR%%/history_edit_wml.php
-%%DATADIR%%/history_html.php
-%%DATADIR%%/history_wml.php
-%%DATADIR%%/index.html
-%%DATADIR%%/login_html.php
-%%DATADIR%%/login_wml.php
-%%DATADIR%%/scroll_wml.php
-%%DATADIR%%/shortcuts_wml.php
+%%WWWDIR%%/command.php
+%%WWWDIR%%/command_html.inc
+%%WWWDIR%%/command_wml.inc
+%%WWWDIR%%/common.inc
+%%WWWDIR%%/common_html.inc
+%%WWWDIR%%/common_wml.inc
+%%WWWDIR%%/controls_wml.php
+%%WWWDIR%%/displayfuncs.inc
+%%WWWDIR%%/getloginhosts.inc
+%%WWWDIR%%/history_edit_wml.php
+%%WWWDIR%%/history_html.php
+%%WWWDIR%%/history_wml.php
+%%WWWDIR%%/index.html
+%%WWWDIR%%/login_html.php
+%%WWWDIR%%/login_wml.php
+%%WWWDIR%%/scroll_wml.php
+%%WWWDIR%%/shortcuts_wml.php
 %%PORTDOCS%%%%DOCSDIR%%/Image1.jpg
 %%PORTDOCS%%%%DOCSDIR%%/Image2.jpg
 %%PORTDOCS%%%%DOCSDIR%%/Image3.jpg
@@ -94,5 +94,5 @@
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/implementation_notes
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/user_guide
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%
+@dirrm %%WWWDIR%%
 @dirrmtry www/data