Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/nagiosgraph/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	19 Aug 2006 03:30:40 -0000	1.2
+++ Makefile	21 Nov 2006 14:57:59 -0000
@@ -23,10 +23,6 @@
 
 PORTDOCS=	CHANGELOG INSTALL README README.map
 
-PLIST_SUB=	NAGIOSWWWDIR=${NAGIOSWWWDIR}
-
-NAGIOSWWWDIR?=	www/nagios
-
 post-patch:
 .for i in insert.pl show.cgi testcolor.cgi testentry.pl
 	${REINPLACE_CMD} -e 's!/usr/bin/perl!${PERL}!g' -e 's!/usr/local!${PREFIX}!g' -e 's!nagiosgraph\.conf!nagios/nagiosgraph/nagiosgraph.conf!g' ${WRKSRC}/$i
@@ -41,13 +37,13 @@
 	${MKDIR} ${PREFIX}/libexec/${PORTNAME}
 	${INSTALL_SCRIPT} ${WRKSRC}/insert.pl ${PREFIX}/libexec/${PORTNAME}
 
-	${MKDIR} ${PREFIX}/${NAGIOSWWWDIR}/cgi-bin/nagiosgraph
+	${MKDIR} ${WWWDIR}/cgi-bin/nagiosgraph
 .for i in show.cgi testcolor.cgi
 	${INSTALL_SCRIPT} ${WRKSRC}/$i ${PREFIX}/${NAGIOSWWWDIR}/cgi-bin/nagiosgraph
 .endfor
 
-	${MKDIR} ${PREFIX}/${NAGIOSWWWDIR}/stylesheets
-	${INSTALL_DATA} ${WRKSRC}/nagiosgraph.css ${PREFIX}/${NAGIOSWWWDIR}/stylesheets
+	${MKDIR} ${WWWDIR}/stylesheets
+	${INSTALL_DATA} ${WRKSRC}/nagiosgraph.css ${WWWDIR}/stylesheets
 
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/testentry.pl ${EXAMPLESDIR}
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/nagiosgraph/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	7 May 2006 12:11:56 -0000	1.1
+++ pkg-plist	21 Nov 2006 14:57:59 -0000
@@ -2,14 +2,14 @@
 etc/nagios/nagiosgraph/nagiosgraph.conf.example
 libexec/nagiosgraph/insert.pl
 %%EXAMPLESDIR%%/testentry.pl
-%%NAGIOSWWWDIR%%/cgi-bin/nagiosgraph/show.cgi
-%%NAGIOSWWWDIR%%/cgi-bin/nagiosgraph/testcolor.cgi
-%%NAGIOSWWWDIR%%/stylesheets/nagiosgraph.css
+%%WWWDIR%%/cgi-bin/nagiosgraph/show.cgi
+%%WWWDIR%%/cgi-bin/nagiosgraph/testcolor.cgi
+%%WWWDIR%%/stylesheets/nagiosgraph.css
 @dirrm etc/nagios/nagiosgraph
 @dirrmtry etc/nagios
 @dirrm libexec/nagiosgraph
 @dirrm %%EXAMPLESDIR%%
-@dirrm %%NAGIOSWWWDIR%%/cgi-bin/nagiosgraph
-@dirrmtry %%NAGIOSWWWDIR%%/cgi-bin
-@dirrmtry %%NAGIOSWWWDIR%%/stylesheets
-@dirrmtry %%NAGIOSWWWDIR%%
+@dirrm %%WWWDIR%%/cgi-bin/nagiosgraph
+@dirrmtry %%WWWDIR%%/cgi-bin
+@dirrmtry %%WWWDIR%%/stylesheets
+@dirrmtry %%WWWDIR%%