Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/nagiostat/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	11 May 2006 22:49:40 -0000	1.4
+++ Makefile	21 Nov 2006 14:57:57 -0000
@@ -24,9 +24,6 @@
 NAGIOSDIR?=	/var/spool/nagios
 DOC_FILES=	README GPL.txt
 
-NAGIOSWWWDIR?=	www/nagios
-PLIST_SUB+=	NAGIOSWWWDIR=${NAGIOSWWWDIR}
-
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|%%NAGIOSTATCONFDIR%%|${PREFIX}/etc/|' \
@@ -38,9 +35,9 @@
 	@${MKDIR} ${PREFIX}/libexec/${PORTNAME}
 	@${MKDIR} ${NAGIOSDIR}/${PORTNAME}rrd
 	@${INSTALL_SCRIPT} ${WRKSRC}/nagiostat ${PREFIX}/libexec/${PORTNAME}/
-	@${LN} -fs ${PREFIX}/libexec/${PORTNAME}/nagiostat ${PREFIX}/${NAGIOSWWWDIR}/cgi-bin/nagiostat.cgi
+	@${LN} -fs ${PREFIX}/libexec/${PORTNAME}/nagiostat ${WWWDIR}/cgi-bin/nagiostat.cgi
 	@${INSTALL_DATA} ${WRKSRC}/nagiostat.conf ${PREFIX}/etc/nagiostat.conf-sample
-	@${INSTALL_DATA} ${WRKSRC}/graph.gif ${PREFIX}/${NAGIOSWWWDIR}/images/logos
+	@${INSTALL_DATA} ${WRKSRC}/graph.gif ${WWWDIR}/images/logos
 	@${MKDIR} ${PREFIX}/libexec/${PORTNAME}/html-templates/
 	@${INSTALL_DATA} ${WRKSRC}/html-templates/default.html ${PREFIX}/libexec/${PORTNAME}/html-templates/
 	@${INSTALL_DATA} ${WRKSRC}/html-templates/graphindex.html ${PREFIX}/libexec/${PORTNAME}/html-templates/
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/nagiostat/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- pkg-plist	1 Apr 2006 22:40:38 -0000	1.2
+++ pkg-plist	21 Nov 2006 14:57:57 -0000
@@ -3,11 +3,11 @@
 @exec chown nagios:nagios /var/spool/nagios/nagiostatrrd
 @unexec rmdir /var/spool/nagios/nagiostatrrd 2>/dev/null || true
 etc/nagiostat.conf-sample
-%%NAGIOSWWWDIR%%/cgi-bin/nagiostat.cgi
+%%WWWDIR%%/cgi-bin/nagiostat.cgi
 libexec/nagiostat/nagiostat
 libexec/nagiostat/html-templates/default.html
 libexec/nagiostat/html-templates/graphindex.html
-%%NAGIOSWWWDIR%%/images/logos/graph.gif
+%%WWWDIR%%/images/logos/graph.gif
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/GPL.txt
 @dirrm libexec/nagiostat/html-templates