Index: dns/dnsdoctor/Makefile =================================================================== RCS file: /home/pcvs/ports/dns/dnsdoctor/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- dns/dnsdoctor/Makefile 14 Jul 2006 15:14:30 -0000 1.2 +++ dns/dnsdoctor/Makefile 24 Nov 2006 12:42:45 -0000 @@ -44,7 +44,7 @@ @cd ${INSTALL_WRKSRC} && \ ${RUBY} ./installer.rb ${DNSDOCTOR_TARGET} \ -DETCDIST='-dist' -DRUBY="${RUBY}" -DPREFIX="${PREFIX}" \ - -DWWWDIR="${PREFIX}/www/${PORTNAME}" + -DWWWDIR="${WWWDIR}" .if !defined(NOPORTDOCS) post-install: Index: dns/dnsdoctor/pkg-plist =================================================================== RCS file: /home/pcvs/ports/dns/dnsdoctor/pkg-plist,v retrieving revision 1.2 diff -u -r1.2 pkg-plist --- dns/dnsdoctor/pkg-plist 14 Jul 2006 15:14:30 -0000 1.2 +++ dns/dnsdoctor/pkg-plist 24 Nov 2006 12:42:45 -0000 @@ -157,34 +157,34 @@ %%PORTDOCS%%%%DOCSDIR%%/magnify-clip.png %%PORTDOCS%%%%DOCSDIR%%/poweredby_mediawiki_88x31.png %%PORTDOCS%%@dirrm %%DOCSDIR%% -%%DNSDOCTOR_CGI%%www/dnsdoctor/dnsdoctor.conf -%%DNSDOCTOR_CGI%%www/dnsdoctor/dnsdoctor.conf.in -%%DNSDOCTOR_CGI%%www/dnsdoctor/html/form.html.en -%%DNSDOCTOR_CGI%%www/dnsdoctor/html/form.html.fr -%%DNSDOCTOR_CGI%%www/dnsdoctor/img/details.png -%%DNSDOCTOR_CGI%%www/dnsdoctor/img/element.png -%%DNSDOCTOR_CGI%%www/dnsdoctor/img/fatal.png -%%DNSDOCTOR_CGI%%www/dnsdoctor/img/gear.png -%%DNSDOCTOR_CGI%%www/dnsdoctor/img/info.png -%%DNSDOCTOR_CGI%%www/dnsdoctor/img/light.png -%%DNSDOCTOR_CGI%%www/dnsdoctor/img/logo.png -%%DNSDOCTOR_CGI%%www/dnsdoctor/img/logo_l.png -%%DNSDOCTOR_CGI%%www/dnsdoctor/img/loupe.png -%%DNSDOCTOR_CGI%%www/dnsdoctor/img/notepad.png -%%DNSDOCTOR_CGI%%www/dnsdoctor/img/ok.png -%%DNSDOCTOR_CGI%%www/dnsdoctor/img/primary.png -%%DNSDOCTOR_CGI%%www/dnsdoctor/img/ref.png -%%DNSDOCTOR_CGI%%www/dnsdoctor/img/secondary.png -%%DNSDOCTOR_CGI%%www/dnsdoctor/img/warning.png -%%DNSDOCTOR_CGI%%www/dnsdoctor/img/zc-fav.png -%%DNSDOCTOR_CGI%%www/dnsdoctor/img/zone.png -%%DNSDOCTOR_CGI%%www/dnsdoctor/js/formvalidation.js -%%DNSDOCTOR_CGI%%www/dnsdoctor/js/popupmenu.js -%%DNSDOCTOR_CGI%%www/dnsdoctor/js/progress.js -%%DNSDOCTOR_CGI%%www/dnsdoctor/style/default.css -%%DNSDOCTOR_CGI%%www/dnsdoctor/style/dnsdoctor.css -%%DNSDOCTOR_CGI%%@dirrm www/dnsdoctor/html -%%DNSDOCTOR_CGI%%@dirrm www/dnsdoctor/img -%%DNSDOCTOR_CGI%%@dirrm www/dnsdoctor/js -%%DNSDOCTOR_CGI%%@dirrm www/dnsdoctor/style -%%DNSDOCTOR_CGI%%@dirrm www/dnsdoctor +%%DNSDOCTOR_CGI%%%%WWWDIR%%/dnsdoctor.conf +%%DNSDOCTOR_CGI%%%%WWWDIR%%/dnsdoctor.conf.in +%%DNSDOCTOR_CGI%%%%WWWDIR%%/html/form.html.en +%%DNSDOCTOR_CGI%%%%WWWDIR%%/html/form.html.fr +%%DNSDOCTOR_CGI%%%%WWWDIR%%/img/details.png +%%DNSDOCTOR_CGI%%%%WWWDIR%%/img/element.png +%%DNSDOCTOR_CGI%%%%WWWDIR%%/img/fatal.png +%%DNSDOCTOR_CGI%%%%WWWDIR%%/img/gear.png +%%DNSDOCTOR_CGI%%%%WWWDIR%%/img/info.png +%%DNSDOCTOR_CGI%%%%WWWDIR%%/img/light.png +%%DNSDOCTOR_CGI%%%%WWWDIR%%/img/logo.png +%%DNSDOCTOR_CGI%%%%WWWDIR%%/img/logo_l.png +%%DNSDOCTOR_CGI%%%%WWWDIR%%/img/loupe.png +%%DNSDOCTOR_CGI%%%%WWWDIR%%/img/notepad.png +%%DNSDOCTOR_CGI%%%%WWWDIR%%/img/ok.png +%%DNSDOCTOR_CGI%%%%WWWDIR%%/img/primary.png +%%DNSDOCTOR_CGI%%%%WWWDIR%%/img/ref.png +%%DNSDOCTOR_CGI%%%%WWWDIR%%/img/secondary.png +%%DNSDOCTOR_CGI%%%%WWWDIR%%/img/warning.png +%%DNSDOCTOR_CGI%%%%WWWDIR%%/img/zc-fav.png +%%DNSDOCTOR_CGI%%%%WWWDIR%%/img/zone.png +%%DNSDOCTOR_CGI%%%%WWWDIR%%/js/formvalidation.js +%%DNSDOCTOR_CGI%%%%WWWDIR%%/js/popupmenu.js +%%DNSDOCTOR_CGI%%%%WWWDIR%%/js/progress.js +%%DNSDOCTOR_CGI%%%%WWWDIR%%/style/default.css +%%DNSDOCTOR_CGI%%%%WWWDIR%%/style/dnsdoctor.css +%%DNSDOCTOR_CGI%%@dirrm %%WWWDIR%%/html +%%DNSDOCTOR_CGI%%@dirrm %%WWWDIR%%/img +%%DNSDOCTOR_CGI%%@dirrm %%WWWDIR%%/js +%%DNSDOCTOR_CGI%%@dirrm %%WWWDIR%%/style +%%DNSDOCTOR_CGI%%@dirrm %%WWWDIR%% Index: dns/zonecheck/Makefile =================================================================== RCS file: /home/pcvs/ports/dns/zonecheck/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- dns/zonecheck/Makefile 14 Jul 2006 15:13:16 -0000 1.13 +++ dns/zonecheck/Makefile 24 Nov 2006 12:42:45 -0000 @@ -48,7 +48,7 @@ @cd ${INSTALL_WRKSRC} && \ ${RUBY} ./installer.rb ${ZONECHECK_TARGET} \ -DETCDIST='-dist' -DRUBY="${RUBY}" -DPREFIX="${PREFIX}" \ - -DWWWDIR="${PREFIX}/www/${PORTNAME}" + -DWWWDIR="${WWWDIR}" .if !defined(NOPORTDOCS) post-install: Index: dns/zonecheck/pkg-plist =================================================================== RCS file: /home/pcvs/ports/dns/zonecheck/pkg-plist,v retrieving revision 1.6 diff -u -r1.6 pkg-plist --- dns/zonecheck/pkg-plist 21 Mar 2004 19:04:57 -0000 1.6 +++ dns/zonecheck/pkg-plist 24 Nov 2006 12:42:45 -0000 @@ -129,33 +129,33 @@ %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%@dirrm %%DOCSDIR%% -%%ZONECHECK_CGI%%www/zonecheck/html/batch.html.en -%%ZONECHECK_CGI%%www/zonecheck/html/batch.html.fr -%%ZONECHECK_CGI%%www/zonecheck/html/form.html.en -%%ZONECHECK_CGI%%www/zonecheck/html/form.html.fr -%%ZONECHECK_CGI%%www/zonecheck/zonecheck.conf.in -%%ZONECHECK_CGI%%www/zonecheck/img/details.png -%%ZONECHECK_CGI%%www/zonecheck/img/element.png -%%ZONECHECK_CGI%%www/zonecheck/img/fatal.png -%%ZONECHECK_CGI%%www/zonecheck/img/gear.png -%%ZONECHECK_CGI%%www/zonecheck/img/info.png -%%ZONECHECK_CGI%%www/zonecheck/img/light.png -%%ZONECHECK_CGI%%www/zonecheck/img/logo.png -%%ZONECHECK_CGI%%www/zonecheck/img/loupe.png -%%ZONECHECK_CGI%%www/zonecheck/img/notepad.png -%%ZONECHECK_CGI%%www/zonecheck/img/ok.png -%%ZONECHECK_CGI%%www/zonecheck/img/primary.png -%%ZONECHECK_CGI%%www/zonecheck/img/ref.png -%%ZONECHECK_CGI%%www/zonecheck/img/secondary.png -%%ZONECHECK_CGI%%www/zonecheck/img/warning.png -%%ZONECHECK_CGI%%www/zonecheck/img/zc-fav.png -%%ZONECHECK_CGI%%www/zonecheck/img/zone.png -%%ZONECHECK_CGI%%www/zonecheck/js/formvalidation.js -%%ZONECHECK_CGI%%www/zonecheck/js/popupmenu.js -%%ZONECHECK_CGI%%www/zonecheck/js/progress.js -%%ZONECHECK_CGI%%www/zonecheck/style/zc.css -%%ZONECHECK_CGI%%@dirrm www/zonecheck/html -%%ZONECHECK_CGI%%@dirrm www/zonecheck/img -%%ZONECHECK_CGI%%@dirrm www/zonecheck/js -%%ZONECHECK_CGI%%@dirrm www/zonecheck/style -%%ZONECHECK_CGI%%@dirrm www/zonecheck +%%ZONECHECK_CGI%%%%WWWDIR%%/html/batch.html.en +%%ZONECHECK_CGI%%%%WWWDIR%%/html/batch.html.fr +%%ZONECHECK_CGI%%%%WWWDIR%%/html/form.html.en +%%ZONECHECK_CGI%%%%WWWDIR%%/html/form.html.fr +%%ZONECHECK_CGI%%%%WWWDIR%%/zonecheck.conf.in +%%ZONECHECK_CGI%%%%WWWDIR%%/img/details.png +%%ZONECHECK_CGI%%%%WWWDIR%%/img/element.png +%%ZONECHECK_CGI%%%%WWWDIR%%/img/fatal.png +%%ZONECHECK_CGI%%%%WWWDIR%%/img/gear.png +%%ZONECHECK_CGI%%%%WWWDIR%%/img/info.png +%%ZONECHECK_CGI%%%%WWWDIR%%/img/light.png +%%ZONECHECK_CGI%%%%WWWDIR%%/img/logo.png +%%ZONECHECK_CGI%%%%WWWDIR%%/img/loupe.png +%%ZONECHECK_CGI%%%%WWWDIR%%/img/notepad.png +%%ZONECHECK_CGI%%%%WWWDIR%%/img/ok.png +%%ZONECHECK_CGI%%%%WWWDIR%%/img/primary.png +%%ZONECHECK_CGI%%%%WWWDIR%%/img/ref.png +%%ZONECHECK_CGI%%%%WWWDIR%%/img/secondary.png +%%ZONECHECK_CGI%%%%WWWDIR%%/img/warning.png +%%ZONECHECK_CGI%%%%WWWDIR%%/img/zc-fav.png +%%ZONECHECK_CGI%%%%WWWDIR%%/img/zone.png +%%ZONECHECK_CGI%%%%WWWDIR%%/js/formvalidation.js +%%ZONECHECK_CGI%%%%WWWDIR%%/js/popupmenu.js +%%ZONECHECK_CGI%%%%WWWDIR%%/js/progress.js +%%ZONECHECK_CGI%%%%WWWDIR%%/style/zc.css +%%ZONECHECK_CGI%%@dirrm %%WWWDIR%%/html +%%ZONECHECK_CGI%%@dirrm %%WWWDIR%%/img +%%ZONECHECK_CGI%%@dirrm %%WWWDIR%%/js +%%ZONECHECK_CGI%%@dirrm %%WWWDIR%%/style +%%ZONECHECK_CGI%%@dirrm %%WWWDIR%% Index: mail/exilog/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/exilog/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- mail/exilog/Makefile 19 May 2006 22:50:37 -0000 1.12 +++ mail/exilog/Makefile 24 Nov 2006 12:42:45 -0000 @@ -37,7 +37,7 @@ .endif SUB_LIST+= SERVER=${SERVER} .ifndef WITHOUT_WWWDIR -EXILOGDIR?= ${PREFIX}/www/exilog +EXILOGDIR?= ${WWWDIR} .else EXILOGDIR?= ${PREFIX}/exilog .endif Index: mail/ilohamail/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/ilohamail/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- mail/ilohamail/Makefile 25 Jul 2004 15:55:38 -0000 1.3 +++ mail/ilohamail/Makefile 24 Nov 2006 12:42:45 -0000 @@ -28,7 +28,7 @@ .endif .if !defined(WITHOUT_WWWDIR) -ILOHADIR= ${PREFIX}/www/ilohamail +ILOHADIR= ${WWWDIR} .else ILOHADIR= ${PREFIX}/ilohamail .endif Index: mail/squirrelmail/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/squirrelmail/Makefile,v retrieving revision 1.45 diff -u -r1.45 Makefile --- mail/squirrelmail/Makefile 11 Aug 2006 16:28:19 -0000 1.45 +++ mail/squirrelmail/Makefile 24 Nov 2006 12:42:45 -0000 @@ -31,7 +31,7 @@ .endif .ifndef WITHOUT_WWWDIR -SQUIRRELDIR?= ${PREFIX}/www/${PORTNAME} +SQUIRRELDIR?= ${WWWDIR} .else SQUIRRELDIR?= ${PREFIX}/${PORTNAME} .endif Index: mail/squirrelmail-change_ldappass-plugin/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/squirrelmail-change_ldappass-plugin/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- mail/squirrelmail-change_ldappass-plugin/Makefile 31 Oct 2006 13:28:34 -0000 1.3 +++ mail/squirrelmail-change_ldappass-plugin/Makefile 24 Nov 2006 12:42:45 -0000 @@ -23,7 +23,7 @@ SUB_LIST+= "SQUIRRELDIR=${SQUIRRELDIR}" .else . ifndef WITHOUT_WWWDIR -SQUIRRELDIR= ${PREFIX}/www/squirrelmail +SQUIRRELDIR= ${WWWDIR} PLIST_SUB+= SQUIRRELDIR=www/squirrelmail SUB_LIST+= "SQUIRRELDIR=www/squirrelmail" . else Index: mail/squirrelmail-compatibility-plugin/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/squirrelmail-compatibility-plugin/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- mail/squirrelmail-compatibility-plugin/Makefile 20 Mar 2006 20:38:59 -0000 1.4 +++ mail/squirrelmail-compatibility-plugin/Makefile 24 Nov 2006 12:42:45 -0000 @@ -22,7 +22,7 @@ PLIST_SUB+= SQUIRRELDIR=${SQUIRRELDIR} .else . ifndef WITHOUT_WWWDIR -SQUIRRELDIR= ${PREFIX}/www/squirrelmail +SQUIRRELDIR= ${WWWDIR} PLIST_SUB+= SQUIRRELDIR=www/squirrelmail . else SQUIRRELDIR= ${PREFIX}/squirrelmail Index: mail/squirrelmail-email_footer-plugin/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/squirrelmail-email_footer-plugin/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- mail/squirrelmail-email_footer-plugin/Makefile 20 Mar 2006 21:01:01 -0000 1.2 +++ mail/squirrelmail-email_footer-plugin/Makefile 24 Nov 2006 12:42:45 -0000 @@ -24,7 +24,7 @@ SUB_LIST+= "SQUIRRELDIR=${SQUIRRELDIR}" .else . ifndef WITHOUT_WWWDIR -SQUIRRELDIR= ${PREFIX}/www/squirrelmail +SQUIRRELDIR= ${WWWDIR} PLIST_SUB+= SQUIRRELDIR=www/squirrelmail SUB_LIST+= "SQUIRRELDIR=www/squirrelmail" . else Index: mail/squirrelmail-login_auth-plugin/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/squirrelmail-login_auth-plugin/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- mail/squirrelmail-login_auth-plugin/Makefile 15 Apr 2006 16:44:01 -0000 1.1 +++ mail/squirrelmail-login_auth-plugin/Makefile 24 Nov 2006 12:42:45 -0000 @@ -24,7 +24,7 @@ SUB_LIST+= "SQUIRRELDIR=${SQUIRRELDIR}" .else . ifndef WITHOUT_WWWDIR -SQUIRRELDIR= ${PREFIX}/www/squirrelmail +SQUIRRELDIR= ${WWWDIR} PLIST_SUB+= SQUIRRELDIR=www/squirrelmail SUB_LIST+= "SQUIRRELDIR=www/squirrelmail" . else Index: mail/squirrelmail-login_notes-plugin/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/squirrelmail-login_notes-plugin/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- mail/squirrelmail-login_notes-plugin/Makefile 8 Sep 2006 18:07:58 -0000 1.2 +++ mail/squirrelmail-login_notes-plugin/Makefile 24 Nov 2006 12:42:45 -0000 @@ -24,7 +24,7 @@ SUB_LIST+= "SQUIRRELDIR=${SQUIRRELDIR}" .else . ifndef WITHOUT_WWWDIR -SQUIRRELDIR= ${PREFIX}/www/squirrelmail +SQUIRRELDIR= ${WWWDIR} PLIST_SUB+= SQUIRRELDIR=www/squirrelmail SUB_LIST+= "SQUIRRELDIR=www/squirrelmail" . else Index: mail/squirrelmail-multilogin-plugin/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/squirrelmail-multilogin-plugin/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- mail/squirrelmail-multilogin-plugin/Makefile 13 Sep 2006 08:58:15 -0000 1.1 +++ mail/squirrelmail-multilogin-plugin/Makefile 24 Nov 2006 12:42:46 -0000 @@ -24,7 +24,7 @@ SUB_LIST+= "SQUIRRELDIR=${SQUIRRELDIR}" .else . ifndef WITHOUT_WWWDIR -SQUIRRELDIR= ${PREFIX}/www/squirrelmail +SQUIRRELDIR= ${WWWDIR} PLIST_SUB+= SQUIRRELDIR=www/squirrelmail SUB_LIST+= "SQUIRRELDIR=www/squirrelmail" . else Index: mail/squirrelmail-newuser_wiz-plugin/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/squirrelmail-newuser_wiz-plugin/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- mail/squirrelmail-newuser_wiz-plugin/Makefile 29 Jun 2006 15:34:35 -0000 1.2 +++ mail/squirrelmail-newuser_wiz-plugin/Makefile 24 Nov 2006 12:42:46 -0000 @@ -26,7 +26,7 @@ SUB_LIST+= "SQUIRRELDIR=${SQUIRRELDIR}" .else .ifndef WITHOUT_WWWDIR -SQUIRRELDIR= ${PREFIX}/www/squirrelmail +SQUIRRELDIR= ${WWWDIR} PLIST_SUB+= SQUIRRELDIR=www/squirrelmail SUB_LIST+= "SQUIRRELDIR=www/squirrelmail" .else Index: mail/squirrelmail-notes-plugin/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/squirrelmail-notes-plugin/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- mail/squirrelmail-notes-plugin/Makefile 20 Mar 2006 20:46:46 -0000 1.1 +++ mail/squirrelmail-notes-plugin/Makefile 24 Nov 2006 12:42:46 -0000 @@ -24,7 +24,7 @@ SUB_LIST+= "SQUIRRELDIR=${SQUIRRELDIR}" .else . ifndef WITHOUT_WWWDIR -SQUIRRELDIR= ${PREFIX}/www/squirrelmail +SQUIRRELDIR= ${WWWDIR} PLIST_SUB+= SQUIRRELDIR=www/squirrelmail SUB_LIST+= "SQUIRRELDIR=www/squirrelmail" . else Index: mail/squirrelmail-notify-plugin/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/squirrelmail-notify-plugin/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- mail/squirrelmail-notify-plugin/Makefile 20 Mar 2006 20:49:15 -0000 1.1 +++ mail/squirrelmail-notify-plugin/Makefile 24 Nov 2006 12:42:46 -0000 @@ -24,7 +24,7 @@ SUB_LIST+= "SQUIRRELDIR=${SQUIRRELDIR}" .else . ifndef WITHOUT_WWWDIR -SQUIRRELDIR= ${PREFIX}/www/squirrelmail +SQUIRRELDIR= ${WWWDIR} PLIST_SUB+= SQUIRRELDIR=www/squirrelmail SUB_LIST+= "SQUIRRELDIR=www/squirrelmail" . else Index: mail/squirrelmail-pupdate-plugin/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/squirrelmail-pupdate-plugin/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- mail/squirrelmail-pupdate-plugin/Makefile 4 Jul 2006 23:04:48 -0000 1.1 +++ mail/squirrelmail-pupdate-plugin/Makefile 24 Nov 2006 12:42:46 -0000 @@ -25,7 +25,7 @@ SUB_LIST+= "SQUIRRELDIR=${SQUIRRELDIR}" .else .ifndef WITHOUT_WWWDIR -SQUIRRELDIR= ${PREFIX}/www/squirrelmail +SQUIRRELDIR= ${WWWDIR} PLIST_SUB+= SQUIRRELDIR=www/squirrelmail SUB_LIST+= "SQUIRRELDIR=www/squirrelmail" .else Index: mail/squirrelmail-quota_usage-plugin/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/squirrelmail-quota_usage-plugin/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- mail/squirrelmail-quota_usage-plugin/Makefile 29 Apr 2006 21:53:41 -0000 1.2 +++ mail/squirrelmail-quota_usage-plugin/Makefile 24 Nov 2006 12:42:46 -0000 @@ -24,7 +24,7 @@ SUB_LIST+= "SQUIRRELDIR=${SQUIRRELDIR}" .else . ifndef WITHOUT_WWWDIR -SQUIRRELDIR= ${PREFIX}/www/squirrelmail +SQUIRRELDIR= ${WWWDIR} PLIST_SUB+= SQUIRRELDIR=www/squirrelmail SUB_LIST+= "SQUIRRELDIR=www/squirrelmail" . else Index: mail/squirrelmail-secure_login-plugin/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/squirrelmail-secure_login-plugin/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- mail/squirrelmail-secure_login-plugin/Makefile 26 Jun 2006 16:40:44 -0000 1.1 +++ mail/squirrelmail-secure_login-plugin/Makefile 24 Nov 2006 12:42:46 -0000 @@ -25,7 +25,7 @@ SUB_LIST+= "SQUIRRELDIR=${SQUIRRELDIR}" .else .ifndef WITHOUT_WWWDIR -SQUIRRELDIR= ${PREFIX}/www/squirrelmail +SQUIRRELDIR= ${WWWDIR} PLIST_SUB+= SQUIRRELDIR=www/squirrelmail SUB_LIST+= "SQUIRRELDIR=www/squirrelmail" .else Index: mail/squirrelmail-timeout_user-plugin/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/squirrelmail-timeout_user-plugin/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- mail/squirrelmail-timeout_user-plugin/Makefile 11 Jul 2006 14:56:17 -0000 1.1 +++ mail/squirrelmail-timeout_user-plugin/Makefile 24 Nov 2006 12:42:46 -0000 @@ -25,7 +25,7 @@ SUB_LIST+= "SQUIRRELDIR=${SQUIRRELDIR}" .else .ifndef WITHOUT_WWWDIR -SQUIRRELDIR= ${PREFIX}/www/squirrelmail +SQUIRRELDIR= ${WWWDIR} PLIST_SUB+= SQUIRRELDIR=www/squirrelmail SUB_LIST+= "SQUIRRELDIR=www/squirrelmail" .else Index: mail/squirrelmail-tmda-plugin/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/squirrelmail-tmda-plugin/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- mail/squirrelmail-tmda-plugin/Makefile 3 Oct 2006 18:02:02 -0000 1.1 +++ mail/squirrelmail-tmda-plugin/Makefile 24 Nov 2006 12:42:46 -0000 @@ -25,7 +25,7 @@ WRKSRC= ${WRKDIR}/tmdatools .ifndef WITHOUT_WWWDIR -SQUIRRELDIR?= ${PREFIX}/www/squirrelmail +SQUIRRELDIR?= ${WWWDIR} PLIST_SUB+= SQUIRRELDIR=www/squirrelmail .else SQUIRRELDIR?= ${PREFIX}/squirrelmail Index: mail/squirrelmail-vlogin-plugin/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/squirrelmail-vlogin-plugin/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- mail/squirrelmail-vlogin-plugin/Makefile 19 Nov 2006 15:42:22 -0000 1.7 +++ mail/squirrelmail-vlogin-plugin/Makefile 24 Nov 2006 12:42:46 -0000 @@ -23,7 +23,7 @@ PLIST_SUB+= SQUIRRELDIR=${SQUIRRELDIR} .else . ifndef WITHOUT_WWWDIR -SQUIRRELDIR= ${PREFIX}/www/squirrelmail +SQUIRRELDIR= ${WWWDIR} PLIST_SUB+= SQUIRRELDIR=www/squirrelmail . else SQUIRRELDIR= ${PREFIX}/squirrelmail Index: mail/squirrelmail-websearch-plugin/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/squirrelmail-websearch-plugin/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- mail/squirrelmail-websearch-plugin/Makefile 10 Aug 2006 19:48:06 -0000 1.1 +++ mail/squirrelmail-websearch-plugin/Makefile 24 Nov 2006 12:42:46 -0000 @@ -26,7 +26,7 @@ SUB_LIST+= "SQUIRRELDIR=${SQUIRRELDIR}" .else . ifndef WITHOUT_WWWDIR -SQUIRRELDIR= ${PREFIX}/www/squirrelmail +SQUIRRELDIR= ${WWWDIR} PLIST_SUB+= SQUIRRELDIR=www/squirrelmail SUB_LIST+= "SQUIRRELDIR=www/squirrelmail" . else Index: mail/squirrelmail-wetteronline-plugin/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/squirrelmail-wetteronline-plugin/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- mail/squirrelmail-wetteronline-plugin/Makefile 20 Mar 2006 20:53:26 -0000 1.1 +++ mail/squirrelmail-wetteronline-plugin/Makefile 24 Nov 2006 12:42:46 -0000 @@ -24,7 +24,7 @@ SUB_LIST+= "SQUIRRELDIR=${SQUIRRELDIR}" .else . ifndef WITHOUT_WWWDIR -SQUIRRELDIR= ${PREFIX}/www/squirrelmail +SQUIRRELDIR= ${WWWDIR} PLIST_SUB+= SQUIRRELDIR=www/squirrelmail SUB_LIST+= "SQUIRRELDIR=www/squirrelmail" . else Index: misc/nagios-base-logos/Makefile =================================================================== RCS file: /home/pcvs/ports/misc/nagios-base-logos/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- misc/nagios-base-logos/Makefile 9 Jan 2006 16:52:55 -0000 1.2 +++ misc/nagios-base-logos/Makefile 24 Nov 2006 12:42:46 -0000 @@ -17,10 +17,7 @@ NO_BUILD=yes -NAGIOSWWWDIR?= www/nagios -NAGIOS_LOGOS_DIR= ${PREFIX}/${NAGIOSWWWDIR}/images/logos - -PLIST_SUB= NAGIOSWWWDIR=${NAGIOSWWWDIR} +NAGIOS_LOGOS_DIR= ${WWWDIR}/images/logos do-install: ${MKDIR} ${NAGIOS_LOGOS_DIR} Index: misc/nagios-base-logos/pkg-plist =================================================================== RCS file: /home/pcvs/ports/misc/nagios-base-logos/pkg-plist,v retrieving revision 1.3 diff -u -r1.3 pkg-plist --- misc/nagios-base-logos/pkg-plist 22 Jan 2006 02:28:39 -0000 1.3 +++ misc/nagios-base-logos/pkg-plist 24 Nov 2006 12:42:46 -0000 @@ -1,129 +1,129 @@ -%%NAGIOSWWWDIR%%/images/logos/aix.gd2 -%%NAGIOSWWWDIR%%/images/logos/aix.gif -%%NAGIOSWWWDIR%%/images/logos/aix.jpg -%%NAGIOSWWWDIR%%/images/logos/aix.png -%%NAGIOSWWWDIR%%/images/logos/amiga.gd2 -%%NAGIOSWWWDIR%%/images/logos/amiga.gif -%%NAGIOSWWWDIR%%/images/logos/amiga.jpg -%%NAGIOSWWWDIR%%/images/logos/amiga.png -%%NAGIOSWWWDIR%%/images/logos/apple.gd2 -%%NAGIOSWWWDIR%%/images/logos/apple.gif -%%NAGIOSWWWDIR%%/images/logos/apple.jpg -%%NAGIOSWWWDIR%%/images/logos/apple.png -%%NAGIOSWWWDIR%%/images/logos/beos.gd2 -%%NAGIOSWWWDIR%%/images/logos/beos.gif -%%NAGIOSWWWDIR%%/images/logos/beos.jpg -%%NAGIOSWWWDIR%%/images/logos/beos.png -%%NAGIOSWWWDIR%%/images/logos/caldera.gd2 -%%NAGIOSWWWDIR%%/images/logos/caldera.gif -%%NAGIOSWWWDIR%%/images/logos/caldera.jpg -%%NAGIOSWWWDIR%%/images/logos/caldera.png -%%NAGIOSWWWDIR%%/images/logos/cat1900.gd2 -%%NAGIOSWWWDIR%%/images/logos/cat2900.gd2 -%%NAGIOSWWWDIR%%/images/logos/cat5000.gd2 -%%NAGIOSWWWDIR%%/images/logos/debian.gd2 -%%NAGIOSWWWDIR%%/images/logos/debian.gif -%%NAGIOSWWWDIR%%/images/logos/debian.jpg -%%NAGIOSWWWDIR%%/images/logos/debian.png -%%NAGIOSWWWDIR%%/images/logos/freebsd40.gd2 -%%NAGIOSWWWDIR%%/images/logos/freebsd40.gif -%%NAGIOSWWWDIR%%/images/logos/freebsd40.jpg -%%NAGIOSWWWDIR%%/images/logos/freebsd40.png -%%NAGIOSWWWDIR%%/images/logos/hp-printer40.gd2 -%%NAGIOSWWWDIR%%/images/logos/hp-printer40.gif -%%NAGIOSWWWDIR%%/images/logos/hp-printer40.jpg -%%NAGIOSWWWDIR%%/images/logos/hp-printer40.png -%%NAGIOSWWWDIR%%/images/logos/hpux.gd2 -%%NAGIOSWWWDIR%%/images/logos/hpux.gif -%%NAGIOSWWWDIR%%/images/logos/hpux.jpg -%%NAGIOSWWWDIR%%/images/logos/hpux.png -%%NAGIOSWWWDIR%%/images/logos/irix.gd2 -%%NAGIOSWWWDIR%%/images/logos/irix.gif -%%NAGIOSWWWDIR%%/images/logos/irix.jpg -%%NAGIOSWWWDIR%%/images/logos/irix.png -%%NAGIOSWWWDIR%%/images/logos/linux40.gd2 -%%NAGIOSWWWDIR%%/images/logos/linux40.gif -%%NAGIOSWWWDIR%%/images/logos/linux40.jpg -%%NAGIOSWWWDIR%%/images/logos/linux40.png -%%NAGIOSWWWDIR%%/images/logos/logo.gd2 -%%NAGIOSWWWDIR%%/images/logos/mac40.gd2 -%%NAGIOSWWWDIR%%/images/logos/mac40.gif -%%NAGIOSWWWDIR%%/images/logos/mac40.jpg -%%NAGIOSWWWDIR%%/images/logos/mac40.png -%%NAGIOSWWWDIR%%/images/logos/mandrake.gd2 -%%NAGIOSWWWDIR%%/images/logos/mandrake.gif -%%NAGIOSWWWDIR%%/images/logos/mandrake.jpg -%%NAGIOSWWWDIR%%/images/logos/mandrake.png -%%NAGIOSWWWDIR%%/images/logos/nagios.gd2 -%%NAGIOSWWWDIR%%/images/logos/next.gd2 -%%NAGIOSWWWDIR%%/images/logos/next.gif -%%NAGIOSWWWDIR%%/images/logos/next.jpg -%%NAGIOSWWWDIR%%/images/logos/next.png -%%NAGIOSWWWDIR%%/images/logos/ng-switch40.gd2 -%%NAGIOSWWWDIR%%/images/logos/ng-switch40.gif -%%NAGIOSWWWDIR%%/images/logos/ng-switch40.jpg -%%NAGIOSWWWDIR%%/images/logos/ng-switch40.png -%%NAGIOSWWWDIR%%/images/logos/novell40.gd2 -%%NAGIOSWWWDIR%%/images/logos/novell40.gif -%%NAGIOSWWWDIR%%/images/logos/novell40.jpg -%%NAGIOSWWWDIR%%/images/logos/novell40.png -%%NAGIOSWWWDIR%%/images/logos/openbsd.gd2 -%%NAGIOSWWWDIR%%/images/logos/openbsd.gif -%%NAGIOSWWWDIR%%/images/logos/openbsd.jpg -%%NAGIOSWWWDIR%%/images/logos/openbsd.png -%%NAGIOSWWWDIR%%/images/logos/redhat.gd2 -%%NAGIOSWWWDIR%%/images/logos/redhat.gif -%%NAGIOSWWWDIR%%/images/logos/redhat.jpg -%%NAGIOSWWWDIR%%/images/logos/redhat.png -%%NAGIOSWWWDIR%%/images/logos/router40.gd2 -%%NAGIOSWWWDIR%%/images/logos/router40.gif -%%NAGIOSWWWDIR%%/images/logos/router40.jpg -%%NAGIOSWWWDIR%%/images/logos/router40.png -%%NAGIOSWWWDIR%%/images/logos/slackware.gd2 -%%NAGIOSWWWDIR%%/images/logos/slackware.gif -%%NAGIOSWWWDIR%%/images/logos/slackware.jpg -%%NAGIOSWWWDIR%%/images/logos/slackware.png -%%NAGIOSWWWDIR%%/images/logos/stampede.gd2 -%%NAGIOSWWWDIR%%/images/logos/stampede.gif -%%NAGIOSWWWDIR%%/images/logos/stampede.jpg -%%NAGIOSWWWDIR%%/images/logos/stampede.png -%%NAGIOSWWWDIR%%/images/logos/station.gd2 -%%NAGIOSWWWDIR%%/images/logos/storm.gd2 -%%NAGIOSWWWDIR%%/images/logos/storm.gif -%%NAGIOSWWWDIR%%/images/logos/storm.jpg -%%NAGIOSWWWDIR%%/images/logos/storm.png -%%NAGIOSWWWDIR%%/images/logos/sun40.gd2 -%%NAGIOSWWWDIR%%/images/logos/sun40.gif -%%NAGIOSWWWDIR%%/images/logos/sun40.jpg -%%NAGIOSWWWDIR%%/images/logos/sun40.png -%%NAGIOSWWWDIR%%/images/logos/sunlogo.gd2 -%%NAGIOSWWWDIR%%/images/logos/sunlogo.gif -%%NAGIOSWWWDIR%%/images/logos/sunlogo.jpg -%%NAGIOSWWWDIR%%/images/logos/sunlogo.png -%%NAGIOSWWWDIR%%/images/logos/switch40.gd2 -%%NAGIOSWWWDIR%%/images/logos/switch40.gif -%%NAGIOSWWWDIR%%/images/logos/switch40.jpg -%%NAGIOSWWWDIR%%/images/logos/switch40.png -%%NAGIOSWWWDIR%%/images/logos/turbolinux.gd2 -%%NAGIOSWWWDIR%%/images/logos/turbolinux.gif -%%NAGIOSWWWDIR%%/images/logos/turbolinux.jpg -%%NAGIOSWWWDIR%%/images/logos/turbolinux.png -%%NAGIOSWWWDIR%%/images/logos/ultrapenguin.gd2 -%%NAGIOSWWWDIR%%/images/logos/ultrapenguin.gif -%%NAGIOSWWWDIR%%/images/logos/ultrapenguin.jpg -%%NAGIOSWWWDIR%%/images/logos/ultrapenguin.png -%%NAGIOSWWWDIR%%/images/logos/unicos.gd2 -%%NAGIOSWWWDIR%%/images/logos/unicos.gif -%%NAGIOSWWWDIR%%/images/logos/unicos.jpg -%%NAGIOSWWWDIR%%/images/logos/unicos.png -%%NAGIOSWWWDIR%%/images/logos/win40.gd2 -%%NAGIOSWWWDIR%%/images/logos/win40.gif -%%NAGIOSWWWDIR%%/images/logos/win40.jpg -%%NAGIOSWWWDIR%%/images/logos/win40.png -%%NAGIOSWWWDIR%%/images/logos/yellowdog.gd2 -%%NAGIOSWWWDIR%%/images/logos/yellowdog.gif -%%NAGIOSWWWDIR%%/images/logos/yellowdog.jpg -%%NAGIOSWWWDIR%%/images/logos/yellowdog.png -@dirrmtry %%NAGIOSWWWDIR%%/images/logos -@dirrmtry %%NAGIOSWWWDIR%%/images -@dirrmtry %%NAGIOSWWWDIR%% +%%WWWDIR%%/images/logos/aix.gd2 +%%WWWDIR%%/images/logos/aix.gif +%%WWWDIR%%/images/logos/aix.jpg +%%WWWDIR%%/images/logos/aix.png +%%WWWDIR%%/images/logos/amiga.gd2 +%%WWWDIR%%/images/logos/amiga.gif +%%WWWDIR%%/images/logos/amiga.jpg +%%WWWDIR%%/images/logos/amiga.png +%%WWWDIR%%/images/logos/apple.gd2 +%%WWWDIR%%/images/logos/apple.gif +%%WWWDIR%%/images/logos/apple.jpg +%%WWWDIR%%/images/logos/apple.png +%%WWWDIR%%/images/logos/beos.gd2 +%%WWWDIR%%/images/logos/beos.gif +%%WWWDIR%%/images/logos/beos.jpg +%%WWWDIR%%/images/logos/beos.png +%%WWWDIR%%/images/logos/caldera.gd2 +%%WWWDIR%%/images/logos/caldera.gif +%%WWWDIR%%/images/logos/caldera.jpg +%%WWWDIR%%/images/logos/caldera.png +%%WWWDIR%%/images/logos/cat1900.gd2 +%%WWWDIR%%/images/logos/cat2900.gd2 +%%WWWDIR%%/images/logos/cat5000.gd2 +%%WWWDIR%%/images/logos/debian.gd2 +%%WWWDIR%%/images/logos/debian.gif +%%WWWDIR%%/images/logos/debian.jpg +%%WWWDIR%%/images/logos/debian.png +%%WWWDIR%%/images/logos/freebsd40.gd2 +%%WWWDIR%%/images/logos/freebsd40.gif +%%WWWDIR%%/images/logos/freebsd40.jpg +%%WWWDIR%%/images/logos/freebsd40.png +%%WWWDIR%%/images/logos/hp-printer40.gd2 +%%WWWDIR%%/images/logos/hp-printer40.gif +%%WWWDIR%%/images/logos/hp-printer40.jpg +%%WWWDIR%%/images/logos/hp-printer40.png +%%WWWDIR%%/images/logos/hpux.gd2 +%%WWWDIR%%/images/logos/hpux.gif +%%WWWDIR%%/images/logos/hpux.jpg +%%WWWDIR%%/images/logos/hpux.png +%%WWWDIR%%/images/logos/irix.gd2 +%%WWWDIR%%/images/logos/irix.gif +%%WWWDIR%%/images/logos/irix.jpg +%%WWWDIR%%/images/logos/irix.png +%%WWWDIR%%/images/logos/linux40.gd2 +%%WWWDIR%%/images/logos/linux40.gif +%%WWWDIR%%/images/logos/linux40.jpg +%%WWWDIR%%/images/logos/linux40.png +%%WWWDIR%%/images/logos/logo.gd2 +%%WWWDIR%%/images/logos/mac40.gd2 +%%WWWDIR%%/images/logos/mac40.gif +%%WWWDIR%%/images/logos/mac40.jpg +%%WWWDIR%%/images/logos/mac40.png +%%WWWDIR%%/images/logos/mandrake.gd2 +%%WWWDIR%%/images/logos/mandrake.gif +%%WWWDIR%%/images/logos/mandrake.jpg +%%WWWDIR%%/images/logos/mandrake.png +%%WWWDIR%%/images/logos/nagios.gd2 +%%WWWDIR%%/images/logos/next.gd2 +%%WWWDIR%%/images/logos/next.gif +%%WWWDIR%%/images/logos/next.jpg +%%WWWDIR%%/images/logos/next.png +%%WWWDIR%%/images/logos/ng-switch40.gd2 +%%WWWDIR%%/images/logos/ng-switch40.gif +%%WWWDIR%%/images/logos/ng-switch40.jpg +%%WWWDIR%%/images/logos/ng-switch40.png +%%WWWDIR%%/images/logos/novell40.gd2 +%%WWWDIR%%/images/logos/novell40.gif +%%WWWDIR%%/images/logos/novell40.jpg +%%WWWDIR%%/images/logos/novell40.png +%%WWWDIR%%/images/logos/openbsd.gd2 +%%WWWDIR%%/images/logos/openbsd.gif +%%WWWDIR%%/images/logos/openbsd.jpg +%%WWWDIR%%/images/logos/openbsd.png +%%WWWDIR%%/images/logos/redhat.gd2 +%%WWWDIR%%/images/logos/redhat.gif +%%WWWDIR%%/images/logos/redhat.jpg +%%WWWDIR%%/images/logos/redhat.png +%%WWWDIR%%/images/logos/router40.gd2 +%%WWWDIR%%/images/logos/router40.gif +%%WWWDIR%%/images/logos/router40.jpg +%%WWWDIR%%/images/logos/router40.png +%%WWWDIR%%/images/logos/slackware.gd2 +%%WWWDIR%%/images/logos/slackware.gif +%%WWWDIR%%/images/logos/slackware.jpg +%%WWWDIR%%/images/logos/slackware.png +%%WWWDIR%%/images/logos/stampede.gd2 +%%WWWDIR%%/images/logos/stampede.gif +%%WWWDIR%%/images/logos/stampede.jpg +%%WWWDIR%%/images/logos/stampede.png +%%WWWDIR%%/images/logos/station.gd2 +%%WWWDIR%%/images/logos/storm.gd2 +%%WWWDIR%%/images/logos/storm.gif +%%WWWDIR%%/images/logos/storm.jpg +%%WWWDIR%%/images/logos/storm.png +%%WWWDIR%%/images/logos/sun40.gd2 +%%WWWDIR%%/images/logos/sun40.gif +%%WWWDIR%%/images/logos/sun40.jpg +%%WWWDIR%%/images/logos/sun40.png +%%WWWDIR%%/images/logos/sunlogo.gd2 +%%WWWDIR%%/images/logos/sunlogo.gif +%%WWWDIR%%/images/logos/sunlogo.jpg +%%WWWDIR%%/images/logos/sunlogo.png +%%WWWDIR%%/images/logos/switch40.gd2 +%%WWWDIR%%/images/logos/switch40.gif +%%WWWDIR%%/images/logos/switch40.jpg +%%WWWDIR%%/images/logos/switch40.png +%%WWWDIR%%/images/logos/turbolinux.gd2 +%%WWWDIR%%/images/logos/turbolinux.gif +%%WWWDIR%%/images/logos/turbolinux.jpg +%%WWWDIR%%/images/logos/turbolinux.png +%%WWWDIR%%/images/logos/ultrapenguin.gd2 +%%WWWDIR%%/images/logos/ultrapenguin.gif +%%WWWDIR%%/images/logos/ultrapenguin.jpg +%%WWWDIR%%/images/logos/ultrapenguin.png +%%WWWDIR%%/images/logos/unicos.gd2 +%%WWWDIR%%/images/logos/unicos.gif +%%WWWDIR%%/images/logos/unicos.jpg +%%WWWDIR%%/images/logos/unicos.png +%%WWWDIR%%/images/logos/win40.gd2 +%%WWWDIR%%/images/logos/win40.gif +%%WWWDIR%%/images/logos/win40.jpg +%%WWWDIR%%/images/logos/win40.png +%%WWWDIR%%/images/logos/yellowdog.gd2 +%%WWWDIR%%/images/logos/yellowdog.gif +%%WWWDIR%%/images/logos/yellowdog.jpg +%%WWWDIR%%/images/logos/yellowdog.png +@dirrmtry %%WWWDIR%%/images/logos +@dirrmtry %%WWWDIR%%/images +@dirrmtry %%WWWDIR%% Index: net-mgmt/flowviewer/Makefile =================================================================== RCS file: /home/pcvs/ports/net-mgmt/flowviewer/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- net-mgmt/flowviewer/Makefile 5 Nov 2006 07:35:20 -0000 1.2 +++ net-mgmt/flowviewer/Makefile 24 Nov 2006 12:42:46 -0000 @@ -18,7 +18,7 @@ flow-cat:${PORTSDIR}/net-mgmt/flow-tools .ifndef WITHOUT_WWWDIR -FLOWVIEWERDIR?= ${PREFIX}/www/flowviewer +FLOWVIEWERDIR?= ${WWWDIR} .else FLOWVIEWERDIR?= ${PREFIX}/flowviewer .endif Index: net-mgmt/nagios/Makefile =================================================================== RCS file: /home/pcvs/ports/net-mgmt/nagios/Makefile,v retrieving revision 1.56 diff -u -r1.56 Makefile --- net-mgmt/nagios/Makefile 18 Jul 2006 11:16:48 -0000 1.56 +++ net-mgmt/nagios/Makefile 24 Nov 2006 12:42:46 -0000 @@ -32,7 +32,6 @@ NAGIOSGROUP?= nagios NAGIOSDIR?= /var/spool/nagios -NAGIOSWWWDIR?= www/nagios NAGIOSHTMURL?= /nagios NAGIOSCGIURL?= ${NAGIOSHTMURL}/cgi-bin @@ -55,9 +54,9 @@ --with-nagios-group=${NAGIOSGROUP} \ --with-htmurl=${NAGIOSHTMURL} \ --with-cgiurl=${NAGIOSCGIURL} \ - --sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \ + --sbindir=${WWWDIR}/cgi-bin \ --libexecdir=${PREFIX}/libexec/nagios \ - --datadir=${PREFIX}/${NAGIOSWWWDIR} \ + --datadir=${WWWDIR} \ --sysconfdir=${PREFIX}/etc/nagios \ --localstatedir=${NAGIOSDIR} \ --prefix=${PREFIX} @@ -71,7 +70,6 @@ INSTALL_TARGET= install install-commandmode install-config PLIST_SUB= NAGIOSDIR=${NAGIOSDIR} \ - NAGIOSWWWDIR=${NAGIOSWWWDIR} \ NAGIOSUSER=${NAGIOSUSER} \ NAGIOSGROUP=${NAGIOSGROUP} \ NAGIOSHTMURL=${NAGIOSHTMURL} \ Index: net-mgmt/nagios/pkg-plist =================================================================== RCS file: /home/pcvs/ports/net-mgmt/nagios/pkg-plist,v retrieving revision 1.20 diff -u -r1.20 pkg-plist --- net-mgmt/nagios/pkg-plist 22 Jan 2006 02:47:18 -0000 1.20 +++ net-mgmt/nagios/pkg-plist 24 Nov 2006 12:42:46 -0000 @@ -1,4 +1,4 @@ -@exec mkdir -p %D/%%NAGIOSWWWDIR%%/ssi +@exec mkdir -p %D/%%WWWDIR%%/ssi @exec mkdir -p %%NAGIOSDIR%%/archives @exec mkdir -p %%NAGIOSDIR%%/rw @exec chmod 775 %%NAGIOSDIR%% %%NAGIOSDIR%%/archives %%NAGIOSDIR%%/rw @@ -14,289 +14,289 @@ etc/nagios/misccommands.cfg-sample etc/nagios/nagios.cfg-sample etc/nagios/resource.cfg-sample -%%NAGIOSWWWDIR%%/cgi-bin/avail.cgi -%%NAGIOSWWWDIR%%/cgi-bin/cmd.cgi -%%NAGIOSWWWDIR%%/cgi-bin/config.cgi -%%NAGIOSWWWDIR%%/cgi-bin/extinfo.cgi -%%NAGIOSWWWDIR%%/cgi-bin/histogram.cgi -%%NAGIOSWWWDIR%%/cgi-bin/history.cgi -%%NAGIOSWWWDIR%%/cgi-bin/notifications.cgi -%%NAGIOSWWWDIR%%/cgi-bin/outages.cgi -%%NAGIOSWWWDIR%%/cgi-bin/showlog.cgi -%%NAGIOSWWWDIR%%/cgi-bin/status.cgi -%%NAGIOSWWWDIR%%/cgi-bin/statusmap.cgi -%%NAGIOSWWWDIR%%/cgi-bin/statuswml.cgi -%%NAGIOSWWWDIR%%/cgi-bin/statuswrl.cgi -%%NAGIOSWWWDIR%%/cgi-bin/summary.cgi -%%NAGIOSWWWDIR%%/cgi-bin/tac.cgi -%%NAGIOSWWWDIR%%/cgi-bin/trends.cgi -%%NAGIOSWWWDIR%%/contexthelp/A1.html -%%NAGIOSWWWDIR%%/contexthelp/A2.html -%%NAGIOSWWWDIR%%/contexthelp/A3.html -%%NAGIOSWWWDIR%%/contexthelp/A4.html -%%NAGIOSWWWDIR%%/contexthelp/A5.html -%%NAGIOSWWWDIR%%/contexthelp/A6.html -%%NAGIOSWWWDIR%%/contexthelp/A7.html -%%NAGIOSWWWDIR%%/contexthelp/B1.html -%%NAGIOSWWWDIR%%/contexthelp/C1.html -%%NAGIOSWWWDIR%%/contexthelp/D1.html -%%NAGIOSWWWDIR%%/contexthelp/E1.html -%%NAGIOSWWWDIR%%/contexthelp/F1.html -%%NAGIOSWWWDIR%%/contexthelp/G1.html -%%NAGIOSWWWDIR%%/contexthelp/G2.html -%%NAGIOSWWWDIR%%/contexthelp/G3.html -%%NAGIOSWWWDIR%%/contexthelp/G4.html -%%NAGIOSWWWDIR%%/contexthelp/G5.html -%%NAGIOSWWWDIR%%/contexthelp/G6.html -%%NAGIOSWWWDIR%%/contexthelp/H1.html -%%NAGIOSWWWDIR%%/contexthelp/H2.html -%%NAGIOSWWWDIR%%/contexthelp/H3.html -%%NAGIOSWWWDIR%%/contexthelp/H4.html -%%NAGIOSWWWDIR%%/contexthelp/H5.html -%%NAGIOSWWWDIR%%/contexthelp/H6.html -%%NAGIOSWWWDIR%%/contexthelp/H7.html -%%NAGIOSWWWDIR%%/contexthelp/H8.html -%%NAGIOSWWWDIR%%/contexthelp/I1.html -%%NAGIOSWWWDIR%%/contexthelp/I2.html -%%NAGIOSWWWDIR%%/contexthelp/I3.html -%%NAGIOSWWWDIR%%/contexthelp/I4.html -%%NAGIOSWWWDIR%%/contexthelp/I5.html -%%NAGIOSWWWDIR%%/contexthelp/I6.html -%%NAGIOSWWWDIR%%/contexthelp/I7.html -%%NAGIOSWWWDIR%%/contexthelp/I8.html -%%NAGIOSWWWDIR%%/contexthelp/I9.html -%%NAGIOSWWWDIR%%/contexthelp/J1.html -%%NAGIOSWWWDIR%%/contexthelp/K1.html -%%NAGIOSWWWDIR%%/contexthelp/L1.html -%%NAGIOSWWWDIR%%/contexthelp/L10.html -%%NAGIOSWWWDIR%%/contexthelp/L11.html -%%NAGIOSWWWDIR%%/contexthelp/L12.html -%%NAGIOSWWWDIR%%/contexthelp/L13.html -%%NAGIOSWWWDIR%%/contexthelp/L2.html -%%NAGIOSWWWDIR%%/contexthelp/L3.html -%%NAGIOSWWWDIR%%/contexthelp/L4.html -%%NAGIOSWWWDIR%%/contexthelp/L5.html -%%NAGIOSWWWDIR%%/contexthelp/L6.html -%%NAGIOSWWWDIR%%/contexthelp/L7.html -%%NAGIOSWWWDIR%%/contexthelp/L8.html -%%NAGIOSWWWDIR%%/contexthelp/L9.html -%%NAGIOSWWWDIR%%/contexthelp/M1.html -%%NAGIOSWWWDIR%%/contexthelp/M2.html -%%NAGIOSWWWDIR%%/contexthelp/M3.html -%%NAGIOSWWWDIR%%/contexthelp/M4.html -%%NAGIOSWWWDIR%%/contexthelp/M5.html -%%NAGIOSWWWDIR%%/contexthelp/M6.html -%%NAGIOSWWWDIR%%/contexthelp/N1.html -%%NAGIOSWWWDIR%%/contexthelp/N2.html -%%NAGIOSWWWDIR%%/contexthelp/N3.html -%%NAGIOSWWWDIR%%/contexthelp/N4.html -%%NAGIOSWWWDIR%%/contexthelp/N5.html -%%NAGIOSWWWDIR%%/contexthelp/N6.html -%%NAGIOSWWWDIR%%/contexthelp/N7.html -%%NAGIOSWWWDIR%%/docs/about.html -%%NAGIOSWWWDIR%%/docs/adaptive.html -%%NAGIOSWWWDIR%%/docs/addons.html -%%NAGIOSWWWDIR%%/docs/beginners.html -%%NAGIOSWWWDIR%%/docs/cgiauth.html -%%NAGIOSWWWDIR%%/docs/cgiincludes.html -%%NAGIOSWWWDIR%%/docs/cgis.html -%%NAGIOSWWWDIR%%/docs/checkscheduling.html -%%NAGIOSWWWDIR%%/docs/clusters.html -%%NAGIOSWWWDIR%%/docs/commandfile.html -%%NAGIOSWWWDIR%%/docs/config.html -%%NAGIOSWWWDIR%%/docs/configcgi.html -%%NAGIOSWWWDIR%%/docs/configextinfo.html -%%NAGIOSWWWDIR%%/docs/configmain.html -%%NAGIOSWWWDIR%%/docs/configobject.html -%%NAGIOSWWWDIR%%/docs/dependencies.html -%%NAGIOSWWWDIR%%/docs/distributed.html -%%NAGIOSWWWDIR%%/docs/downtime.html -%%NAGIOSWWWDIR%%/docs/embeddedperl.html -%%NAGIOSWWWDIR%%/docs/escalations.html -%%NAGIOSWWWDIR%%/docs/eventhandlers.html -%%NAGIOSWWWDIR%%/docs/extcommands.html -%%NAGIOSWWWDIR%%/docs/flapping.html -%%NAGIOSWWWDIR%%/docs/freshness.html -%%NAGIOSWWWDIR%%/docs/funstuff.html -%%NAGIOSWWWDIR%%/docs/images/activepassive.png -%%NAGIOSWWWDIR%%/docs/images/cgi-avail-a.png -%%NAGIOSWWWDIR%%/docs/images/cgi-avail-b.png -%%NAGIOSWWWDIR%%/docs/images/cgi-cmd.png -%%NAGIOSWWWDIR%%/docs/images/cgi-config.png -%%NAGIOSWWWDIR%%/docs/images/cgi-extinfo-a.png -%%NAGIOSWWWDIR%%/docs/images/cgi-extinfo-b.png -%%NAGIOSWWWDIR%%/docs/images/cgi-extinfo-c.png -%%NAGIOSWWWDIR%%/docs/images/cgi-extinfo-d.png -%%NAGIOSWWWDIR%%/docs/images/cgi-histogram.png -%%NAGIOSWWWDIR%%/docs/images/cgi-history.png -%%NAGIOSWWWDIR%%/docs/images/cgi-notifications.png -%%NAGIOSWWWDIR%%/docs/images/cgi-outages.png -%%NAGIOSWWWDIR%%/docs/images/cgi-showlog.png -%%NAGIOSWWWDIR%%/docs/images/cgi-status-a.png -%%NAGIOSWWWDIR%%/docs/images/cgi-status-b.png -%%NAGIOSWWWDIR%%/docs/images/cgi-status-c.png -%%NAGIOSWWWDIR%%/docs/images/cgi-status-d.png -%%NAGIOSWWWDIR%%/docs/images/cgi-statusmap.png -%%NAGIOSWWWDIR%%/docs/images/cgi-statuswml.png -%%NAGIOSWWWDIR%%/docs/images/cgi-statuswrl.png -%%NAGIOSWWWDIR%%/docs/images/cgi-summary.png -%%NAGIOSWWWDIR%%/docs/images/cgi-tac.png -%%NAGIOSWWWDIR%%/docs/images/cgi-trends.png -%%NAGIOSWWWDIR%%/docs/images/checktiming.png -%%NAGIOSWWWDIR%%/docs/images/distributed.png -%%NAGIOSWWWDIR%%/docs/images/host-dependencies.png -%%NAGIOSWWWDIR%%/docs/images/indirecthostcheck.png -%%NAGIOSWWWDIR%%/docs/images/indirectsvccheck.png -%%NAGIOSWWWDIR%%/docs/images/indirectsvccheck2.png -%%NAGIOSWWWDIR%%/docs/images/interleaved1.png -%%NAGIOSWWWDIR%%/docs/images/interleaved2.png -%%NAGIOSWWWDIR%%/docs/images/interleaved3.png -%%NAGIOSWWWDIR%%/docs/images/logofullsize.png -%%NAGIOSWWWDIR%%/docs/images/mrtgstats.png -%%NAGIOSWWWDIR%%/docs/images/network-heirarchy.png -%%NAGIOSWWWDIR%%/docs/images/network-outage1.png -%%NAGIOSWWWDIR%%/docs/images/network-outage2.png -%%NAGIOSWWWDIR%%/docs/images/noninterleaved1.png -%%NAGIOSWWWDIR%%/docs/images/noninterleaved2.png -%%NAGIOSWWWDIR%%/docs/images/physical-network.png -%%NAGIOSWWWDIR%%/docs/images/plugintheory.png -%%NAGIOSWWWDIR%%/docs/images/redudancy.png -%%NAGIOSWWWDIR%%/docs/images/redundancy.png -%%NAGIOSWWWDIR%%/docs/images/service-dependencies.png -%%NAGIOSWWWDIR%%/docs/images/statetransitions.png -%%NAGIOSWWWDIR%%/docs/images/statetransitions2.png -%%NAGIOSWWWDIR%%/docs/index.html -%%NAGIOSWWWDIR%%/docs/indirectchecks.html -%%NAGIOSWWWDIR%%/docs/installing.html -%%NAGIOSWWWDIR%%/docs/installweb.html -%%NAGIOSWWWDIR%%/docs/int-snmptrap.html -%%NAGIOSWWWDIR%%/docs/int-tcpwrappers.html -%%NAGIOSWWWDIR%%/docs/macros.html -%%NAGIOSWWWDIR%%/docs/nagiostats.html -%%NAGIOSWWWDIR%%/docs/networkoutages.html -%%NAGIOSWWWDIR%%/docs/networkreachability.html -%%NAGIOSWWWDIR%%/docs/notifications.html -%%NAGIOSWWWDIR%%/docs/parallelization.html -%%NAGIOSWWWDIR%%/docs/passivechecks.html -%%NAGIOSWWWDIR%%/docs/perfdata.html -%%NAGIOSWWWDIR%%/docs/plugins.html -%%NAGIOSWWWDIR%%/docs/plugintheory.html -%%NAGIOSWWWDIR%%/docs/redundancy.html -%%NAGIOSWWWDIR%%/docs/robots.txt -%%NAGIOSWWWDIR%%/docs/security.html -%%NAGIOSWWWDIR%%/docs/stalking.html -%%NAGIOSWWWDIR%%/docs/starting.html -%%NAGIOSWWWDIR%%/docs/statetypes.html -%%NAGIOSWWWDIR%%/docs/stoprestart.html -%%NAGIOSWWWDIR%%/docs/templaterecursion.html -%%NAGIOSWWWDIR%%/docs/templatetricks.html -%%NAGIOSWWWDIR%%/docs/timeperiods.html -%%NAGIOSWWWDIR%%/docs/toc.html -%%NAGIOSWWWDIR%%/docs/tuning.html -%%NAGIOSWWWDIR%%/docs/verifyconfig.html -%%NAGIOSWWWDIR%%/docs/volatileservices.html -%%NAGIOSWWWDIR%%/docs/whatsnew.html -%%NAGIOSWWWDIR%%/docs/xodtemplate.html -%%NAGIOSWWWDIR%%/images/ack.gif -%%NAGIOSWWWDIR%%/images/action.gif -%%NAGIOSWWWDIR%%/images/command.png -%%NAGIOSWWWDIR%%/images/comment.gif -%%NAGIOSWWWDIR%%/images/contexthelp1.gif -%%NAGIOSWWWDIR%%/images/contexthelp2.gif -%%NAGIOSWWWDIR%%/images/critical.png -%%NAGIOSWWWDIR%%/images/delay.gif -%%NAGIOSWWWDIR%%/images/delete.gif -%%NAGIOSWWWDIR%%/images/detail.gif -%%NAGIOSWWWDIR%%/images/disabled.gif -%%NAGIOSWWWDIR%%/images/down.gif -%%NAGIOSWWWDIR%%/images/downtime.gif -%%NAGIOSWWWDIR%%/images/empty.gif -%%NAGIOSWWWDIR%%/images/enabled.gif -%%NAGIOSWWWDIR%%/images/extinfo.gif -%%NAGIOSWWWDIR%%/images/flapping.gif -%%NAGIOSWWWDIR%%/images/greendot.gif -%%NAGIOSWWWDIR%%/images/histogram.png -%%NAGIOSWWWDIR%%/images/history.gif -%%NAGIOSWWWDIR%%/images/hostevent.gif -%%NAGIOSWWWDIR%%/images/info.png -%%NAGIOSWWWDIR%%/images/left.gif -%%NAGIOSWWWDIR%%/images/logofullsize.jpg -%%NAGIOSWWWDIR%%/images/logos/nagios.gd2 -%%NAGIOSWWWDIR%%/images/logos/nagios.gif -%%NAGIOSWWWDIR%%/images/logos/nagiosvrml.png -%%NAGIOSWWWDIR%%/images/logos/unknown.gd2 -%%NAGIOSWWWDIR%%/images/logos/unknown.gif -%%NAGIOSWWWDIR%%/images/logrotate.png -%%NAGIOSWWWDIR%%/images/ndisabled.gif -%%NAGIOSWWWDIR%%/images/noack.gif -%%NAGIOSWWWDIR%%/images/notes.gif -%%NAGIOSWWWDIR%%/images/notify.gif -%%NAGIOSWWWDIR%%/images/orangedot.gif -%%NAGIOSWWWDIR%%/images/passiveonly.gif -%%NAGIOSWWWDIR%%/images/recovery.png -%%NAGIOSWWWDIR%%/images/redudancy.png -%%NAGIOSWWWDIR%%/images/redundancy.png -%%NAGIOSWWWDIR%%/images/restart.gif -%%NAGIOSWWWDIR%%/images/right.gif -%%NAGIOSWWWDIR%%/images/sblogo.jpg -%%NAGIOSWWWDIR%%/images/serviceevent.gif -%%NAGIOSWWWDIR%%/images/start.gif -%%NAGIOSWWWDIR%%/images/status.gif -%%NAGIOSWWWDIR%%/images/status2.gif -%%NAGIOSWWWDIR%%/images/status3.gif -%%NAGIOSWWWDIR%%/images/status4.gif -%%NAGIOSWWWDIR%%/images/stop.gif -%%NAGIOSWWWDIR%%/images/tacdisabled.jpg -%%NAGIOSWWWDIR%%/images/tacdisabled.png -%%NAGIOSWWWDIR%%/images/tacenabled.jpg -%%NAGIOSWWWDIR%%/images/tacenabled.png -%%NAGIOSWWWDIR%%/images/thermcrit.png -%%NAGIOSWWWDIR%%/images/thermok.png -%%NAGIOSWWWDIR%%/images/thermwarn.png -%%NAGIOSWWWDIR%%/images/trends.gif -%%NAGIOSWWWDIR%%/images/trendshost.png -%%NAGIOSWWWDIR%%/images/trendssvc.png -%%NAGIOSWWWDIR%%/images/unknown.png -%%NAGIOSWWWDIR%%/images/up.gif -%%NAGIOSWWWDIR%%/images/warning.png -%%NAGIOSWWWDIR%%/images/weblogo1.png -%%NAGIOSWWWDIR%%/images/zoom1.gif -%%NAGIOSWWWDIR%%/images/zoom2.gif -%%NAGIOSWWWDIR%%/index.html -%%NAGIOSWWWDIR%%/main.html -%%NAGIOSWWWDIR%%/media/critical.wav -%%NAGIOSWWWDIR%%/media/hostdown.wav -%%NAGIOSWWWDIR%%/media/warning.wav -%%NAGIOSWWWDIR%%/robots.txt -%%NAGIOSWWWDIR%%/side.html -%%NAGIOSWWWDIR%%/stylesheets/avail.css -%%NAGIOSWWWDIR%%/stylesheets/checksanity.css -%%NAGIOSWWWDIR%%/stylesheets/cmd.css -%%NAGIOSWWWDIR%%/stylesheets/common.css -%%NAGIOSWWWDIR%%/stylesheets/config.css -%%NAGIOSWWWDIR%%/stylesheets/extinfo.css -%%NAGIOSWWWDIR%%/stylesheets/histogram.css -%%NAGIOSWWWDIR%%/stylesheets/history.css -%%NAGIOSWWWDIR%%/stylesheets/ministatus.css -%%NAGIOSWWWDIR%%/stylesheets/notifications.css -%%NAGIOSWWWDIR%%/stylesheets/outages.css -%%NAGIOSWWWDIR%%/stylesheets/showlog.css -%%NAGIOSWWWDIR%%/stylesheets/status.css -%%NAGIOSWWWDIR%%/stylesheets/statusmap.css -%%NAGIOSWWWDIR%%/stylesheets/summary.css -%%NAGIOSWWWDIR%%/stylesheets/tac.css -%%NAGIOSWWWDIR%%/stylesheets/trends.css +%%WWWDIR%%/cgi-bin/avail.cgi +%%WWWDIR%%/cgi-bin/cmd.cgi +%%WWWDIR%%/cgi-bin/config.cgi +%%WWWDIR%%/cgi-bin/extinfo.cgi +%%WWWDIR%%/cgi-bin/histogram.cgi +%%WWWDIR%%/cgi-bin/history.cgi +%%WWWDIR%%/cgi-bin/notifications.cgi +%%WWWDIR%%/cgi-bin/outages.cgi +%%WWWDIR%%/cgi-bin/showlog.cgi +%%WWWDIR%%/cgi-bin/status.cgi +%%WWWDIR%%/cgi-bin/statusmap.cgi +%%WWWDIR%%/cgi-bin/statuswml.cgi +%%WWWDIR%%/cgi-bin/statuswrl.cgi +%%WWWDIR%%/cgi-bin/summary.cgi +%%WWWDIR%%/cgi-bin/tac.cgi +%%WWWDIR%%/cgi-bin/trends.cgi +%%WWWDIR%%/contexthelp/A1.html +%%WWWDIR%%/contexthelp/A2.html +%%WWWDIR%%/contexthelp/A3.html +%%WWWDIR%%/contexthelp/A4.html +%%WWWDIR%%/contexthelp/A5.html +%%WWWDIR%%/contexthelp/A6.html +%%WWWDIR%%/contexthelp/A7.html +%%WWWDIR%%/contexthelp/B1.html +%%WWWDIR%%/contexthelp/C1.html +%%WWWDIR%%/contexthelp/D1.html +%%WWWDIR%%/contexthelp/E1.html +%%WWWDIR%%/contexthelp/F1.html +%%WWWDIR%%/contexthelp/G1.html +%%WWWDIR%%/contexthelp/G2.html +%%WWWDIR%%/contexthelp/G3.html +%%WWWDIR%%/contexthelp/G4.html +%%WWWDIR%%/contexthelp/G5.html +%%WWWDIR%%/contexthelp/G6.html +%%WWWDIR%%/contexthelp/H1.html +%%WWWDIR%%/contexthelp/H2.html +%%WWWDIR%%/contexthelp/H3.html +%%WWWDIR%%/contexthelp/H4.html +%%WWWDIR%%/contexthelp/H5.html +%%WWWDIR%%/contexthelp/H6.html +%%WWWDIR%%/contexthelp/H7.html +%%WWWDIR%%/contexthelp/H8.html +%%WWWDIR%%/contexthelp/I1.html +%%WWWDIR%%/contexthelp/I2.html +%%WWWDIR%%/contexthelp/I3.html +%%WWWDIR%%/contexthelp/I4.html +%%WWWDIR%%/contexthelp/I5.html +%%WWWDIR%%/contexthelp/I6.html +%%WWWDIR%%/contexthelp/I7.html +%%WWWDIR%%/contexthelp/I8.html +%%WWWDIR%%/contexthelp/I9.html +%%WWWDIR%%/contexthelp/J1.html +%%WWWDIR%%/contexthelp/K1.html +%%WWWDIR%%/contexthelp/L1.html +%%WWWDIR%%/contexthelp/L10.html +%%WWWDIR%%/contexthelp/L11.html +%%WWWDIR%%/contexthelp/L12.html +%%WWWDIR%%/contexthelp/L13.html +%%WWWDIR%%/contexthelp/L2.html +%%WWWDIR%%/contexthelp/L3.html +%%WWWDIR%%/contexthelp/L4.html +%%WWWDIR%%/contexthelp/L5.html +%%WWWDIR%%/contexthelp/L6.html +%%WWWDIR%%/contexthelp/L7.html +%%WWWDIR%%/contexthelp/L8.html +%%WWWDIR%%/contexthelp/L9.html +%%WWWDIR%%/contexthelp/M1.html +%%WWWDIR%%/contexthelp/M2.html +%%WWWDIR%%/contexthelp/M3.html +%%WWWDIR%%/contexthelp/M4.html +%%WWWDIR%%/contexthelp/M5.html +%%WWWDIR%%/contexthelp/M6.html +%%WWWDIR%%/contexthelp/N1.html +%%WWWDIR%%/contexthelp/N2.html +%%WWWDIR%%/contexthelp/N3.html +%%WWWDIR%%/contexthelp/N4.html +%%WWWDIR%%/contexthelp/N5.html +%%WWWDIR%%/contexthelp/N6.html +%%WWWDIR%%/contexthelp/N7.html +%%WWWDIR%%/docs/about.html +%%WWWDIR%%/docs/adaptive.html +%%WWWDIR%%/docs/addons.html +%%WWWDIR%%/docs/beginners.html +%%WWWDIR%%/docs/cgiauth.html +%%WWWDIR%%/docs/cgiincludes.html +%%WWWDIR%%/docs/cgis.html +%%WWWDIR%%/docs/checkscheduling.html +%%WWWDIR%%/docs/clusters.html +%%WWWDIR%%/docs/commandfile.html +%%WWWDIR%%/docs/config.html +%%WWWDIR%%/docs/configcgi.html +%%WWWDIR%%/docs/configextinfo.html +%%WWWDIR%%/docs/configmain.html +%%WWWDIR%%/docs/configobject.html +%%WWWDIR%%/docs/dependencies.html +%%WWWDIR%%/docs/distributed.html +%%WWWDIR%%/docs/downtime.html +%%WWWDIR%%/docs/embeddedperl.html +%%WWWDIR%%/docs/escalations.html +%%WWWDIR%%/docs/eventhandlers.html +%%WWWDIR%%/docs/extcommands.html +%%WWWDIR%%/docs/flapping.html +%%WWWDIR%%/docs/freshness.html +%%WWWDIR%%/docs/funstuff.html +%%WWWDIR%%/docs/images/activepassive.png +%%WWWDIR%%/docs/images/cgi-avail-a.png +%%WWWDIR%%/docs/images/cgi-avail-b.png +%%WWWDIR%%/docs/images/cgi-cmd.png +%%WWWDIR%%/docs/images/cgi-config.png +%%WWWDIR%%/docs/images/cgi-extinfo-a.png +%%WWWDIR%%/docs/images/cgi-extinfo-b.png +%%WWWDIR%%/docs/images/cgi-extinfo-c.png +%%WWWDIR%%/docs/images/cgi-extinfo-d.png +%%WWWDIR%%/docs/images/cgi-histogram.png +%%WWWDIR%%/docs/images/cgi-history.png +%%WWWDIR%%/docs/images/cgi-notifications.png +%%WWWDIR%%/docs/images/cgi-outages.png +%%WWWDIR%%/docs/images/cgi-showlog.png +%%WWWDIR%%/docs/images/cgi-status-a.png +%%WWWDIR%%/docs/images/cgi-status-b.png +%%WWWDIR%%/docs/images/cgi-status-c.png +%%WWWDIR%%/docs/images/cgi-status-d.png +%%WWWDIR%%/docs/images/cgi-statusmap.png +%%WWWDIR%%/docs/images/cgi-statuswml.png +%%WWWDIR%%/docs/images/cgi-statuswrl.png +%%WWWDIR%%/docs/images/cgi-summary.png +%%WWWDIR%%/docs/images/cgi-tac.png +%%WWWDIR%%/docs/images/cgi-trends.png +%%WWWDIR%%/docs/images/checktiming.png +%%WWWDIR%%/docs/images/distributed.png +%%WWWDIR%%/docs/images/host-dependencies.png +%%WWWDIR%%/docs/images/indirecthostcheck.png +%%WWWDIR%%/docs/images/indirectsvccheck.png +%%WWWDIR%%/docs/images/indirectsvccheck2.png +%%WWWDIR%%/docs/images/interleaved1.png +%%WWWDIR%%/docs/images/interleaved2.png +%%WWWDIR%%/docs/images/interleaved3.png +%%WWWDIR%%/docs/images/logofullsize.png +%%WWWDIR%%/docs/images/mrtgstats.png +%%WWWDIR%%/docs/images/network-heirarchy.png +%%WWWDIR%%/docs/images/network-outage1.png +%%WWWDIR%%/docs/images/network-outage2.png +%%WWWDIR%%/docs/images/noninterleaved1.png +%%WWWDIR%%/docs/images/noninterleaved2.png +%%WWWDIR%%/docs/images/physical-network.png +%%WWWDIR%%/docs/images/plugintheory.png +%%WWWDIR%%/docs/images/redudancy.png +%%WWWDIR%%/docs/images/redundancy.png +%%WWWDIR%%/docs/images/service-dependencies.png +%%WWWDIR%%/docs/images/statetransitions.png +%%WWWDIR%%/docs/images/statetransitions2.png +%%WWWDIR%%/docs/index.html +%%WWWDIR%%/docs/indirectchecks.html +%%WWWDIR%%/docs/installing.html +%%WWWDIR%%/docs/installweb.html +%%WWWDIR%%/docs/int-snmptrap.html +%%WWWDIR%%/docs/int-tcpwrappers.html +%%WWWDIR%%/docs/macros.html +%%WWWDIR%%/docs/nagiostats.html +%%WWWDIR%%/docs/networkoutages.html +%%WWWDIR%%/docs/networkreachability.html +%%WWWDIR%%/docs/notifications.html +%%WWWDIR%%/docs/parallelization.html +%%WWWDIR%%/docs/passivechecks.html +%%WWWDIR%%/docs/perfdata.html +%%WWWDIR%%/docs/plugins.html +%%WWWDIR%%/docs/plugintheory.html +%%WWWDIR%%/docs/redundancy.html +%%WWWDIR%%/docs/robots.txt +%%WWWDIR%%/docs/security.html +%%WWWDIR%%/docs/stalking.html +%%WWWDIR%%/docs/starting.html +%%WWWDIR%%/docs/statetypes.html +%%WWWDIR%%/docs/stoprestart.html +%%WWWDIR%%/docs/templaterecursion.html +%%WWWDIR%%/docs/templatetricks.html +%%WWWDIR%%/docs/timeperiods.html +%%WWWDIR%%/docs/toc.html +%%WWWDIR%%/docs/tuning.html +%%WWWDIR%%/docs/verifyconfig.html +%%WWWDIR%%/docs/volatileservices.html +%%WWWDIR%%/docs/whatsnew.html +%%WWWDIR%%/docs/xodtemplate.html +%%WWWDIR%%/images/ack.gif +%%WWWDIR%%/images/action.gif +%%WWWDIR%%/images/command.png +%%WWWDIR%%/images/comment.gif +%%WWWDIR%%/images/contexthelp1.gif +%%WWWDIR%%/images/contexthelp2.gif +%%WWWDIR%%/images/critical.png +%%WWWDIR%%/images/delay.gif +%%WWWDIR%%/images/delete.gif +%%WWWDIR%%/images/detail.gif +%%WWWDIR%%/images/disabled.gif +%%WWWDIR%%/images/down.gif +%%WWWDIR%%/images/downtime.gif +%%WWWDIR%%/images/empty.gif +%%WWWDIR%%/images/enabled.gif +%%WWWDIR%%/images/extinfo.gif +%%WWWDIR%%/images/flapping.gif +%%WWWDIR%%/images/greendot.gif +%%WWWDIR%%/images/histogram.png +%%WWWDIR%%/images/history.gif +%%WWWDIR%%/images/hostevent.gif +%%WWWDIR%%/images/info.png +%%WWWDIR%%/images/left.gif +%%WWWDIR%%/images/logofullsize.jpg +%%WWWDIR%%/images/logos/nagios.gd2 +%%WWWDIR%%/images/logos/nagios.gif +%%WWWDIR%%/images/logos/nagiosvrml.png +%%WWWDIR%%/images/logos/unknown.gd2 +%%WWWDIR%%/images/logos/unknown.gif +%%WWWDIR%%/images/logrotate.png +%%WWWDIR%%/images/ndisabled.gif +%%WWWDIR%%/images/noack.gif +%%WWWDIR%%/images/notes.gif +%%WWWDIR%%/images/notify.gif +%%WWWDIR%%/images/orangedot.gif +%%WWWDIR%%/images/passiveonly.gif +%%WWWDIR%%/images/recovery.png +%%WWWDIR%%/images/redudancy.png +%%WWWDIR%%/images/redundancy.png +%%WWWDIR%%/images/restart.gif +%%WWWDIR%%/images/right.gif +%%WWWDIR%%/images/sblogo.jpg +%%WWWDIR%%/images/serviceevent.gif +%%WWWDIR%%/images/start.gif +%%WWWDIR%%/images/status.gif +%%WWWDIR%%/images/status2.gif +%%WWWDIR%%/images/status3.gif +%%WWWDIR%%/images/status4.gif +%%WWWDIR%%/images/stop.gif +%%WWWDIR%%/images/tacdisabled.jpg +%%WWWDIR%%/images/tacdisabled.png +%%WWWDIR%%/images/tacenabled.jpg +%%WWWDIR%%/images/tacenabled.png +%%WWWDIR%%/images/thermcrit.png +%%WWWDIR%%/images/thermok.png +%%WWWDIR%%/images/thermwarn.png +%%WWWDIR%%/images/trends.gif +%%WWWDIR%%/images/trendshost.png +%%WWWDIR%%/images/trendssvc.png +%%WWWDIR%%/images/unknown.png +%%WWWDIR%%/images/up.gif +%%WWWDIR%%/images/warning.png +%%WWWDIR%%/images/weblogo1.png +%%WWWDIR%%/images/zoom1.gif +%%WWWDIR%%/images/zoom2.gif +%%WWWDIR%%/index.html +%%WWWDIR%%/main.html +%%WWWDIR%%/media/critical.wav +%%WWWDIR%%/media/hostdown.wav +%%WWWDIR%%/media/warning.wav +%%WWWDIR%%/robots.txt +%%WWWDIR%%/side.html +%%WWWDIR%%/stylesheets/avail.css +%%WWWDIR%%/stylesheets/checksanity.css +%%WWWDIR%%/stylesheets/cmd.css +%%WWWDIR%%/stylesheets/common.css +%%WWWDIR%%/stylesheets/config.css +%%WWWDIR%%/stylesheets/extinfo.css +%%WWWDIR%%/stylesheets/histogram.css +%%WWWDIR%%/stylesheets/history.css +%%WWWDIR%%/stylesheets/ministatus.css +%%WWWDIR%%/stylesheets/notifications.css +%%WWWDIR%%/stylesheets/outages.css +%%WWWDIR%%/stylesheets/showlog.css +%%WWWDIR%%/stylesheets/status.css +%%WWWDIR%%/stylesheets/statusmap.css +%%WWWDIR%%/stylesheets/summary.css +%%WWWDIR%%/stylesheets/tac.css +%%WWWDIR%%/stylesheets/trends.css @dirrmtry etc/nagios -@dirrm %%NAGIOSWWWDIR%%/cgi-bin -@dirrm %%NAGIOSWWWDIR%%/contexthelp -@dirrm %%NAGIOSWWWDIR%%/docs/images -@dirrm %%NAGIOSWWWDIR%%/docs -@dirrm %%NAGIOSWWWDIR%%/images/logos -@dirrm %%NAGIOSWWWDIR%%/images -@dirrm %%NAGIOSWWWDIR%%/media -@dirrm %%NAGIOSWWWDIR%%/ssi -@dirrm %%NAGIOSWWWDIR%%/stylesheets -@dirrmtry %%NAGIOSWWWDIR%% +@dirrm %%WWWDIR%%/cgi-bin +@dirrm %%WWWDIR%%/contexthelp +@dirrm %%WWWDIR%%/docs/images +@dirrm %%WWWDIR%%/docs +@dirrm %%WWWDIR%%/images/logos +@dirrm %%WWWDIR%%/images +@dirrm %%WWWDIR%%/media +@dirrm %%WWWDIR%%/ssi +@dirrm %%WWWDIR%%/stylesheets +@dirrmtry %%WWWDIR%% @unexec rmdir %%NAGIOSDIR%%/archives 2>/dev/null || true @unexec rmdir %%NAGIOSDIR%%/rw 2>/dev/null || true @unexec rmdir %%NAGIOSDIR%% 2>/dev/null || true Index: net-mgmt/nagios-plugins/Makefile =================================================================== RCS file: /home/pcvs/ports/net-mgmt/nagios-plugins/Makefile,v retrieving revision 1.58 diff -u -r1.58 Makefile --- net-mgmt/nagios-plugins/Makefile 5 Nov 2006 19:21:58 -0000 1.58 +++ net-mgmt/nagios-plugins/Makefile 24 Nov 2006 12:42:46 -0000 @@ -36,14 +36,13 @@ NAGIOSDIR?= /var/spool/nagios -NAGIOSWWWDIR?= www/nagios NAGIOSHTMURL?= /nagios NAGIOSCGIURL?= ${NAGIOSHTMURL}/cgi-bin .include CONFIGURE_ARGS= --with-cgiurl=${NAGIOSCGIURL} \ - --sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \ + --sbindir=${WWWDIR}/cgi-bin \ --libexecdir=${PREFIX}/libexec/nagios \ --datadir=${PREFIX}/share/nagios \ --sysconfdir=${PREFIX}/etc/nagios \ Index: net-mgmt/nagiosgraph/Makefile =================================================================== RCS file: /home/pcvs/ports/net-mgmt/nagiosgraph/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- net-mgmt/nagiosgraph/Makefile 19 Aug 2006 03:30:40 -0000 1.2 +++ net-mgmt/nagiosgraph/Makefile 24 Nov 2006 12:42:46 -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: net-mgmt/nagiosgraph/pkg-plist =================================================================== RCS file: /home/pcvs/ports/net-mgmt/nagiosgraph/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- net-mgmt/nagiosgraph/pkg-plist 7 May 2006 12:11:56 -0000 1.1 +++ net-mgmt/nagiosgraph/pkg-plist 24 Nov 2006 12:42:46 -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%% Index: net-mgmt/nagiostat/Makefile =================================================================== RCS file: /home/pcvs/ports/net-mgmt/nagiostat/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- net-mgmt/nagiostat/Makefile 11 May 2006 22:49:40 -0000 1.4 +++ net-mgmt/nagiostat/Makefile 24 Nov 2006 12:42:46 -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: net-mgmt/nagiostat/pkg-plist =================================================================== RCS file: /home/pcvs/ports/net-mgmt/nagiostat/pkg-plist,v retrieving revision 1.2 diff -u -r1.2 pkg-plist --- net-mgmt/nagiostat/pkg-plist 1 Apr 2006 22:40:38 -0000 1.2 +++ net-mgmt/nagiostat/pkg-plist 24 Nov 2006 12:42:46 -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