2 files changed, 133 insertions, 130 deletions

diff --git a/misc/nagios-base-logos/Makefile b/misc/nagios-base-logos/Makefile
index 589be9298e1a..9c241cd62977 100644
--- a/misc/nagios-base-logos/Makefile
+++ b/misc/nagios-base-logos/Makefile
@@ -17,7 +17,10 @@ COMMENT=	A collection of basic OS and device logos for Nagios
 
 NO_BUILD=yes
 
-NAGIOS_LOGOS_DIR=	${PREFIX}/share/nagios/images/logos
+NAGIOSWWWDIR?=		www/nagios
+NAGIOS_LOGOS_DIR=	${PREFIX}/${NAGIOSWWWDIR}/images/logos
+
+PLIST_SUB=	NAGIOSWWWDIR=${NAGIOSWWWDIR}
 
 do-install:
 	${MKDIR} ${NAGIOS_LOGOS_DIR}
diff --git a/misc/nagios-base-logos/pkg-plist b/misc/nagios-base-logos/pkg-plist
index d8218a794f53..4342c468b446 100644
--- a/misc/nagios-base-logos/pkg-plist
+++ b/misc/nagios-base-logos/pkg-plist
@@ -1,129 +1,129 @@
-share/nagios/images/logos/aix.gd2
-share/nagios/images/logos/aix.gif
-share/nagios/images/logos/aix.jpg
-share/nagios/images/logos/aix.png
-share/nagios/images/logos/amiga.gd2
-share/nagios/images/logos/amiga.gif
-share/nagios/images/logos/amiga.jpg
-share/nagios/images/logos/amiga.png
-share/nagios/images/logos/apple.gd2
-share/nagios/images/logos/apple.gif
-share/nagios/images/logos/apple.jpg
-share/nagios/images/logos/apple.png
-share/nagios/images/logos/beos.gd2
-share/nagios/images/logos/beos.gif
-share/nagios/images/logos/beos.jpg
-share/nagios/images/logos/beos.png
-share/nagios/images/logos/caldera.gd2
-share/nagios/images/logos/caldera.gif
-share/nagios/images/logos/caldera.jpg
-share/nagios/images/logos/caldera.png
-share/nagios/images/logos/cat1900.gd2
-share/nagios/images/logos/cat2900.gd2
-share/nagios/images/logos/cat5000.gd2
-share/nagios/images/logos/debian.gd2
-share/nagios/images/logos/debian.gif
-share/nagios/images/logos/debian.jpg
-share/nagios/images/logos/debian.png
-share/nagios/images/logos/freebsd40.gd2
-share/nagios/images/logos/freebsd40.gif
-share/nagios/images/logos/freebsd40.jpg
-share/nagios/images/logos/freebsd40.png
-share/nagios/images/logos/hp-printer40.gd2
-share/nagios/images/logos/hp-printer40.gif
-share/nagios/images/logos/hp-printer40.jpg
-share/nagios/images/logos/hp-printer40.png
-share/nagios/images/logos/hpux.gd2
-share/nagios/images/logos/hpux.gif
-share/nagios/images/logos/hpux.jpg
-share/nagios/images/logos/hpux.png
-share/nagios/images/logos/irix.gd2
-share/nagios/images/logos/irix.gif
-share/nagios/images/logos/irix.jpg
-share/nagios/images/logos/irix.png
-share/nagios/images/logos/linux40.gd2
-share/nagios/images/logos/linux40.gif
-share/nagios/images/logos/linux40.jpg
-share/nagios/images/logos/linux40.png
-share/nagios/images/logos/logo.gd2
-share/nagios/images/logos/mac40.gd2
-share/nagios/images/logos/mac40.gif
-share/nagios/images/logos/mac40.jpg
-share/nagios/images/logos/mac40.png
-share/nagios/images/logos/mandrake.gd2
-share/nagios/images/logos/mandrake.gif
-share/nagios/images/logos/mandrake.jpg
-share/nagios/images/logos/mandrake.png
-share/nagios/images/logos/nagios.gd2
-share/nagios/images/logos/next.gd2
-share/nagios/images/logos/next.gif
-share/nagios/images/logos/next.jpg
-share/nagios/images/logos/next.png
-share/nagios/images/logos/ng-switch40.gd2
-share/nagios/images/logos/ng-switch40.gif
-share/nagios/images/logos/ng-switch40.jpg
-share/nagios/images/logos/ng-switch40.png
-share/nagios/images/logos/novell40.gd2
-share/nagios/images/logos/novell40.gif
-share/nagios/images/logos/novell40.jpg
-share/nagios/images/logos/novell40.png
-share/nagios/images/logos/openbsd.gd2
-share/nagios/images/logos/openbsd.gif
-share/nagios/images/logos/openbsd.jpg
-share/nagios/images/logos/openbsd.png
-share/nagios/images/logos/redhat.gd2
-share/nagios/images/logos/redhat.gif
-share/nagios/images/logos/redhat.jpg
-share/nagios/images/logos/redhat.png
-share/nagios/images/logos/router40.gd2
-share/nagios/images/logos/router40.gif
-share/nagios/images/logos/router40.jpg
-share/nagios/images/logos/router40.png
-share/nagios/images/logos/slackware.gd2
-share/nagios/images/logos/slackware.gif
-share/nagios/images/logos/slackware.jpg
-share/nagios/images/logos/slackware.png
-share/nagios/images/logos/stampede.gd2
-share/nagios/images/logos/stampede.gif
-share/nagios/images/logos/stampede.jpg
-share/nagios/images/logos/stampede.png
-share/nagios/images/logos/station.gd2
-share/nagios/images/logos/storm.gd2
-share/nagios/images/logos/storm.gif
-share/nagios/images/logos/storm.jpg
-share/nagios/images/logos/storm.png
-share/nagios/images/logos/sun40.gd2
-share/nagios/images/logos/sun40.gif
-share/nagios/images/logos/sun40.jpg
-share/nagios/images/logos/sun40.png
-share/nagios/images/logos/sunlogo.gd2
-share/nagios/images/logos/sunlogo.gif
-share/nagios/images/logos/sunlogo.jpg
-share/nagios/images/logos/sunlogo.png
-share/nagios/images/logos/switch40.gd2
-share/nagios/images/logos/switch40.gif
-share/nagios/images/logos/switch40.jpg
-share/nagios/images/logos/switch40.png
-share/nagios/images/logos/turbolinux.gd2
-share/nagios/images/logos/turbolinux.gif
-share/nagios/images/logos/turbolinux.jpg
-share/nagios/images/logos/turbolinux.png
-share/nagios/images/logos/ultrapenguin.gd2
-share/nagios/images/logos/ultrapenguin.gif
-share/nagios/images/logos/ultrapenguin.jpg
-share/nagios/images/logos/ultrapenguin.png
-share/nagios/images/logos/unicos.gd2
-share/nagios/images/logos/unicos.gif
-share/nagios/images/logos/unicos.jpg
-share/nagios/images/logos/unicos.png
-share/nagios/images/logos/win40.gd2
-share/nagios/images/logos/win40.gif
-share/nagios/images/logos/win40.jpg
-share/nagios/images/logos/win40.png
-share/nagios/images/logos/yellowdog.gd2
-share/nagios/images/logos/yellowdog.gif
-share/nagios/images/logos/yellowdog.jpg
-share/nagios/images/logos/yellowdog.png
-@unexec rmdir %D/share/nagios/images/logos 2>/dev/null || true
-@unexec rmdir %D/share/nagios/images 2>/dev/null || true
-@unexec rmdir %D/share/nagios 2>/dev/null || true
+%%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
+@unexec rmdir %D/%%NAGIOSWWWDIR%%/images/logos 2>/dev/null || true
+@unexec rmdir %D/%%NAGIOSWWWDIR%%/images 2>/dev/null || true
+@unexec rmdir %D/%%NAGIOSWWWDIR%% 2>/dev/null || true