Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/www/drraw/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile	13 Sep 2006 10:35:59 -0000	1.1
+++ Makefile	21 Nov 2006 20:14:47 -0000
@@ -22,13 +22,12 @@
 
 PORTDOCS=	CHANGES INSTALL LICENSE README.EVENTS WISHLIST
 
-WWWDIR?=	www
 CONFDIR?=	etc
 DATADIRS?=	"/var/db/rrdtool" => "[Label1] "
 SAVEDDIR?=	/var/db/${PORTNAME}/saved
 TMPDIR?=	/var/db/${PORTNAME}/tmp
 
-PLIST_SUB+=	WWWDIR=${WWWDIR} CONFDIR=${CONFDIR}
+PLIST_SUB+=	CONFDIR=${CONFDIR}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%CONFDIR%%|${PREFIX}/${CONFDIR}|g' ${WRKSRC}/drraw.cgi
@@ -43,12 +42,12 @@
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/drraw.conf-dist ${PREFIX}/${CONFDIR}
 
-	${MKDIR} ${PREFIX}/${WWWDIR}/${PORTNAME}
-	${INSTALL_SCRIPT} ${WRKSRC}/drraw.cgi ${PREFIX}/${WWWDIR}/${PORTNAME}
+	${MKDIR} ${WWWDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/drraw.cgi ${WWWDIR}
 
-	${MKDIR} ${PREFIX}/${WWWDIR}/${PORTNAME}/icons
+	${MKDIR} ${WWWDIR}/icons
 .for theFile in bomb.gif folder.gif folder.open.gif generic.gif link.gif text.gif unknown.gif
-	${INSTALL_DATA} ${WRKSRC}/icons/${theFile} ${PREFIX}/${WWWDIR}/${PORTNAME}/icons
+	${INSTALL_DATA} ${WRKSRC}/icons/${theFile} ${WWWDIR}/icons
 .endfor
 
 .if !defined(NOPORTDOCS)
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/www/drraw/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	13 Sep 2006 10:35:59 -0000	1.1
+++ pkg-plist	21 Nov 2006 20:14:47 -0000
@@ -2,13 +2,13 @@
 @unexec if cmp -s %D/%%CONFDIR%%/drraw.conf-dist %D/%%CONFDIR%%/drraw.conf; then rm -f %D/%%CONFDIR%%/drraw.conf; fi
 %%CONFDIR%%/drraw.conf-dist
 @exec if [ ! -f %D/%%CONFDIR%%/drraw.conf ]; then cp -p %D/%F %B/drraw.conf; fi
-%%WWWDIR%%/drraw/drraw.cgi
-%%WWWDIR%%/drraw/icons/bomb.gif
-%%WWWDIR%%/drraw/icons/folder.gif
-%%WWWDIR%%/drraw/icons/folder.open.gif
-%%WWWDIR%%/drraw/icons/generic.gif
-%%WWWDIR%%/drraw/icons/link.gif
-%%WWWDIR%%/drraw/icons/text.gif
-%%WWWDIR%%/drraw/icons/unknown.gif
-@dirrm %%WWWDIR%%/drraw/icons
-@dirrm %%WWWDIR%%/drraw
+%%WWWDIR%%/drraw.cgi
+%%WWWDIR%%/icons/bomb.gif
+%%WWWDIR%%/icons/folder.gif
+%%WWWDIR%%/icons/folder.open.gif
+%%WWWDIR%%/icons/generic.gif
+%%WWWDIR%%/icons/link.gif
+%%WWWDIR%%/icons/text.gif
+%%WWWDIR%%/icons/unknown.gif
+@dirrm %%WWWDIR%%/icons
+@dirrm %%WWWDIR%%