adding a message + Makefile beautification

2 files changed, 41 insertions, 25 deletions

diff --git a/net/xymon/MESSAGE b/net/xymon/MESSAGE
new file mode 100644
index 00000000000..4e44a03047f
--- /dev/null
+++ b/net/xymon/MESSAGE
@@ -0,0 +1,14 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2010/04/14 19:50:48 spz Exp $
+
+Please note that the
+${SECCGIDIR}
+directory has been created with all permissions removed for security
+reasons. Check what the scripts do and enable those that are useful to you
+and of acceptable security impact.
+
+Please also note that anything beyond the xymon front page (eg cpu reports,
+which contain top output) are a privacy concern and also a potential
+excessive information disclosure concern, so you may want to restrict
+access to authenticated users.
+===========================================================================
diff --git a/net/xymon/Makefile b/net/xymon/Makefile
index d757707d376..c8e3571fc01 100644
--- a/net/xymon/Makefile
+++ b/net/xymon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/02/18 06:41:34 spz Exp $
+# $NetBSD: Makefile,v 1.3 2010/04/14 19:50:48 spz Exp $
 #
 
 DISTNAME=		xymon-4.3.0-beta2
@@ -38,6 +38,7 @@ PKG_GECOS.${BBUSER}=	Xymon monitor
 PKG_HOME.${BBUSER}=	${BBHOME}
 
 PKG_GROUPS_VARS+=	BBGROUP
+PKG_GROUPS_VARS+=	APACHE_GROUP
 PKG_USERS_VARS+=	BBUSER
 
 # startup and config
@@ -74,18 +75,19 @@ BUILD_DEFS+=		VARBASE
 BUILD_DEFS+=		BBHOSTURL
 BUILD_DEFS+=		BBSERVERNAME
 BUILD_DEFS+=		BBSERVERIP
-BUILD_DEFS+=		APACHE_GROUP
 
-FILES_SUBST+=		EXAMPLEDIR=${EXAMPLEDIR:Q}
+FILES_SUBST+=		EXAMPLEDIR=${EXAMPLEDIR}
 FILES_SUBST+=		BBHOME=${BBHOME:Q}
-FILES_SUBST+=		BBLOGDIR=${BBLOGDIR:Q}
+FILES_SUBST+=		BBLOGDIR=${BBLOGDIR}
 FILES_SUBST+=		BBVAR=${BBVAR:Q}
-FILES_SUBST+=		XYBINDIR=${XYBINDIR:Q}
-FILES_SUBST+=		XYETCDIR=${XYETCDIR:Q}
-FILES_SUBST+=		XYEXTDIR=${XYEXTDIR:Q}
-FILES_SUBST+=		XYTMPDIR=${XYTMPDIR:Q}
-FILES_SUBST+=		XYWEBDIR=${XYWEBDIR:Q}
-FILES_SUBST+=		XYWWWDIR=${XYWWWDIR:Q}
+FILES_SUBST+=		XYBINDIR=${XYBINDIR}
+FILES_SUBST+=		XYETCDIR=${XYETCDIR}
+FILES_SUBST+=		XYEXTDIR=${XYEXTDIR}
+FILES_SUBST+=		XYTMPDIR=${XYTMPDIR}
+FILES_SUBST+=		XYWEBDIR=${XYWEBDIR}
+FILES_SUBST+=		XYWWWDIR=${XYWWWDIR}
+
+MESSAGE_SUBST+=		SECCGIDIR=${SECCGIDIR}
 
 EVAL_PREFIX+=		PREFIX.fping=fping
 
@@ -109,28 +111,28 @@ CONFIGURE_ENV+=		BBHOSTNAME=${BBSERVERNAME:Q}
 CONFIGURE_ENV+=		BBHOSTIP=${BBSERVERIP:Q}
 CONFIGURE_ENV+=		BBUSER=${BBUSER:Q}
 CONFIGURE_ENV+=		BBHOME=${BBHOME:Q}
-CONFIGURE_ENV+=		BBTOPDIR=${BBTOPDIR:Q}
+CONFIGURE_ENV+=		BBTOPDIR=${BBTOPDIR}
 CONFIGURE_ENV+=		BBHOSTURL=${BBHOSTURL:Q}
-CONFIGURE_ENV+=		CGIDIR=${CGIDIR:Q}
+CONFIGURE_ENV+=		CGIDIR=${CGIDIR}
 CONFIGURE_ENV+=		BBCGIURL=${BBCGIURL:Q}
-CONFIGURE_ENV+=		SECURECGIDIR=${SECCGIDIR:Q}
+CONFIGURE_ENV+=		SECURECGIDIR=${SECCGIDIR}
 CONFIGURE_ENV+=		SECUREBBCGIURL=${SECUREBBCGIURL:Q}
-CONFIGURE_ENV+=		HTTPDGID=${APACHE_GROUP:Q}
-CONFIGURE_ENV+=		BBLOGDIR=${BBLOGDIR:Q}
+CONFIGURE_ENV+=		HTTPDGID=${APACHE_GROUP}
+CONFIGURE_ENV+=		BBLOGDIR=${BBLOGDIR}
 CONFIGURE_ENV+=		BBVAR=${BBVAR:Q}
 CONFIGURE_ENV+=		INSTALLROOT=${DESTDIR}
-CONFIGURE_ENV+=		INSTALLBINDIR=${XYBINDIR:Q}
-CONFIGURE_ENV+=		INSTALLETCDIR=${XYETCDIR:Q}
-CONFIGURE_ENV+=		INSTALLEXADIR=${EXAMPLEDIR:Q}
-CONFIGURE_ENV+=		INSTALLEXTDIR=${XYEXTDIR:Q}
-CONFIGURE_ENV+=		INSTALLTMPDIR=${XYTMPDIR:Q}
-CONFIGURE_ENV+=		INSTALLWEBDIR=${XYWEBDIR:Q}
-CONFIGURE_ENV+=		INSTALLWWWDIR=${XYWWWDIR:Q}
+CONFIGURE_ENV+=		INSTALLBINDIR=${XYBINDIR}
+CONFIGURE_ENV+=		INSTALLETCDIR=${XYETCDIR}
+CONFIGURE_ENV+=		INSTALLEXADIR=${EXAMPLEDIR}
+CONFIGURE_ENV+=		INSTALLEXTDIR=${XYEXTDIR}
+CONFIGURE_ENV+=		INSTALLTMPDIR=${XYTMPDIR}
+CONFIGURE_ENV+=		INSTALLWEBDIR=${XYWEBDIR}
+CONFIGURE_ENV+=		INSTALLWWWDIR=${XYWWWDIR}
 CONFIGURE_ENV+=		MANROOT=${PREFIX}/${PKGMANDIR}/
 
 SUBST_CLASSES+=		bashpath
 SUBST_FILES.bashpath=	hobbitd/hobbitreports.sh.DIST
-SUBST_SED.bashpath=	-e 's,/bin/bash,'${BASH}','
+SUBST_SED.bashpath=	-e 's,/bin/bash,'${BASH:Q}','
 SUBST_STAGE.bashpath=	post-patch
 
 USE_TOOLS+=	awk:run		cat:run		cp:run
@@ -152,7 +154,7 @@ OWN_DIRS_PERMS+=	${XYTMPDIR} ${BBUSER} ${BBGROUP} 0755
 OWN_DIRS_PERMS+=	${BBVAR} ${BBUSER} ${BBGROUP} 0755
 VAR_SUBDIRS=		acks data disabled download hist histlogs hostdata rrd
 .for dir in ${VAR_SUBDIRS}
-OWN_DIRS_PERMS+=        ${BBVAR}/${dir} ${BBUSER} ${BBGROUP} 0755
+OWN_DIRS_PERMS+=	${BBVAR}/${dir} ${BBUSER} ${BBGROUP} 0755
 .endfor
 
 OWN_DIRS_PERMS+=	${XYWWWDIR} ${BBUSER} ${BBGROUP} 0755
@@ -176,7 +178,7 @@ CONF_FILES_PERMS+=	${EXAMPLEDIR}/${file} ${PKG_SYSCONFDIR.xymon}/${file} ${BBUSE
 .endfor
 
 MAKE_ENV+=		MAKE=${MAKE_PROGRAM:Q}
-MAKE_ENV+=		PKGDIR=${PREFIX:Q}
+MAKE_ENV+=		PKGDIR=${PREFIX}
 MAKE_ENV+=		INSTALLROOT=${DESTDIR}
 MAKE_ENV+=		PKGBUILD=y
 MAKE_ENV+=		${TOOLS_ENV}