svn commit: r319149 - in head/net-mgmt/xymon-server: . files
Steve Wills
swills at FreeBSD.org
Mon May 27 02:14:00 UTC 2013
Author: swills
Date: Mon May 27 02:13:58 2013
New Revision: 319149
URL: http://svnweb.freebsd.org/changeset/ports/319149
Log:
- Update to 4.3.11
- Proper usage of USERS and GROUPS
PR: ports/178322
Submitted by: Mark Felder <feld at feld.me> (maintainer)
Deleted:
head/net-mgmt/xymon-server/files/patch-build-Makefile.rules
head/net-mgmt/xymon-server/files/patch-xymond-client-freebsd.c
head/net-mgmt/xymon-server/files/patch-xymonnet-Makefile
Modified:
head/net-mgmt/xymon-server/Makefile
head/net-mgmt/xymon-server/distinfo (contents, props changed)
head/net-mgmt/xymon-server/pkg-plist (contents, props changed)
Modified: head/net-mgmt/xymon-server/Makefile
==============================================================================
--- head/net-mgmt/xymon-server/Makefile Mon May 27 01:56:56 2013 (r319148)
+++ head/net-mgmt/xymon-server/Makefile Mon May 27 02:13:58 2013 (r319149)
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= xymon
-PORTVERSION= 4.3.10
-PORTREVISION= 3
+PORTVERSION= 4.3.11
CATEGORIES= net-mgmt www
MASTER_SITES= SF/xymon/Xymon/${PORTVERSION}
PKGNAMESUFFIX= -server${PKGNAMESUFFIX2}
@@ -16,9 +15,12 @@ LICENSE= GPLv2
BUILD_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool
LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
pcre:${PORTSDIR}/devel/pcre
-RUN_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool
+RUN_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool \
+ fping:${PORTSDIR}/net/fping \
+ mtr:${PORTSDIR}/net/mtr-nox11
-MAKE_JOBS_UNSAFE= yes
+USERS= xymon
+GROUPS= xymon
# Options
XYMONUSER?= xymon
@@ -27,6 +29,7 @@ XYMONHOSTIP?= 127.0.0.1
USE_GMAKE= yes
USE_OPENSSL= yes
+MAKE_JOBS_UNSAFE= yes
CONFIGURE_ENV= MAKE=gmake
MAKE_ENV+= XYMONUSER="${XYMONUSER}"
MAKE_ENV+= XYMONHOSTNAME="${XYMONHOSTNAME}"
@@ -79,18 +82,18 @@ LIB_DEPENDS+= netsnmp.30:${PORTSDIR}/net
post-patch:
${REINPLACE_CMD} -e 's|!/bin/bash|!/usr/local/bin/bash|' \
${WRKSRC}/xymond/xymonreports.sh.DIST
+ ${REINPLACE_CMD} -e 's|web-build client|web-build|' ${WRKSRC}/build/Makefile.rules
+ ${REINPLACE_CMD} -e 's|install-docs install-client|install-docs|' ${WRKSRC}/build/Makefile.rules
+ ${REINPLACE_CMD} -e 's|$(INSTALLETCDIR)/protocols.cfg|$(INSTALLETCDIR)/protocols.cfg.DIST|' ${WRKSRC}/xymonnet/Makefile
+ ${REINPLACE_CMD} -e 's|TRACEROUTE="traceroute"|TRACEROUTE="mtr -c 2 -n --report"|' ${WRKSRC}/xymond/etcfiles/xymonserver.cfg.DIST
+ ${REINPLACE_CMD} -e 's|FPING="@FPING@"|FPING="fping"|' ${WRKSRC}/xymond/etcfiles/xymonserver.cfg.DIST
# Configure script is interactive
do-configure:
${CP} ${FILESDIR}/Makefile ${WRKSRC}/
-pre-install:
- if ! pw groupshow ${XYMONUSER}; then pw groupadd ${XYMONUSER} -g 280; fi
- if ! pw usershow ${XYMONUSER}; then pw useradd ${XYMONUSER} -g ${XYMONUSER} -u 280 \
- -h - -d ${WWWDIR} -s /usr/sbin/nologin -c "Xymon Monitor"; fi
-
post-install:
- -${MKDIR} ${WWWDIR}/server/etc
+ ${MKDIR} ${WWWDIR}/server/etc
${INSTALL_SCRIPT} ${WRKSRC}/build/upgrade430.sh ${WWWDIR}/server/bin/
${INSTALL_PROGRAM} ${WRKSRC}/build/renamevars ${WWWDIR}/server/bin/
.for i in ${FIXME1}
Modified: head/net-mgmt/xymon-server/distinfo
==============================================================================
--- head/net-mgmt/xymon-server/distinfo Mon May 27 01:56:56 2013 (r319148)
+++ head/net-mgmt/xymon-server/distinfo Mon May 27 02:13:58 2013 (r319149)
@@ -1,2 +1,2 @@
-SHA256 (repacked/xymon-4.3.10.tar.gz) = 06b519cbe94b93a4b1ea5601d55e58f3ad8304acf555cf3d11ba04cee47455c1
-SIZE (repacked/xymon-4.3.10.tar.gz) = 2754807
+SHA256 (repacked/xymon-4.3.11.tar.gz) = d36f4ea320816375377d97784b7f0e04b8df3dfd19f75a2f1ff4b9f86e6829ee
+SIZE (repacked/xymon-4.3.11.tar.gz) = 2760418
Modified: head/net-mgmt/xymon-server/pkg-plist
==============================================================================
--- head/net-mgmt/xymon-server/pkg-plist Mon May 27 01:56:56 2013 (r319148)
+++ head/net-mgmt/xymon-server/pkg-plist Mon May 27 02:13:58 2013 (r319149)
@@ -1,6 +1,3 @@
- at exec if ! pw groupshow %%XYMONUSER%% 2>/dev/null; then pw groupadd %%XYMONUSER%% -g 280; fi
- at exec if ! pw usershow %%XYMONUSER%% 2>/dev/null; then pw useradd %%XYMONUSER%% -g %%XYMONUSER%% -u 280 -h - -d %%WWWDIR%% -s /usr/sbin/nologin -c "Xymon Monitor"; fi
- at unexec if pw usershow %%XYMONUSER%%; then pw userdel %%XYMONUSER%%; fi
%%WWWDIR%%/cgi-bin/appfeed-critical.sh
%%WWWDIR%%/cgi-bin/appfeed.sh
%%WWWDIR%%/cgi-bin/certreport.sh
@@ -385,38 +382,22 @@
%%WWWDIR%%/server/www/menu/xymonmenu-blue.css
%%WWWDIR%%/server/www/menu/xymonmenu-grey.css
%%WWWDIR%%/server/xymon.sh
- at exec mkdir %D/%%WWWDIR%%/data
- at exec mkdir %D/%%WWWDIR%%/data/acks
- at exec mkdir %D/%%WWWDIR%%/data/data
- at exec mkdir %D/%%WWWDIR%%/data/disabled
- at exec mkdir %D/%%WWWDIR%%/data/hist
- at exec mkdir %D/%%WWWDIR%%/data/histlogs
- at exec mkdir %D/%%WWWDIR%%/data/hostdata
- at exec mkdir %D/%%WWWDIR%%/data/logs
- at exec mkdir %D/%%WWWDIR%%/data/rrd
- at exec mkdir %D/%%WWWDIR%%/server/download
- at exec mkdir %D/%%WWWDIR%%/server/tmp
- at exec mkdir %D/%%WWWDIR%%/server/www/html
- at exec mkdir %D/%%WWWDIR%%/server/www/notes
- at exec mkdir %D/%%WWWDIR%%/server/www/rep
- at exec mkdir %D/%%WWWDIR%%/server/www/snap
- at exec mkdir %D/%%WWWDIR%%/server/www/wml
- at exec chown %%XYMONUSER%% %D/%%WWWDIR%%/data
- at exec chown %%XYMONUSER%% %D/%%WWWDIR%%/data/acks
- at exec chown %%XYMONUSER%% %D/%%WWWDIR%%/data/data
- at exec chown %%XYMONUSER%% %D/%%WWWDIR%%/data/disabled
- at exec chown %%XYMONUSER%% %D/%%WWWDIR%%/data/hist
- at exec chown %%XYMONUSER%% %D/%%WWWDIR%%/data/histlogs
- at exec chown %%XYMONUSER%% %D/%%WWWDIR%%/data/hostdata
- at exec chown %%XYMONUSER%% %D/%%WWWDIR%%/data/logs
- at exec chown %%XYMONUSER%% %D/%%WWWDIR%%/data/rrd
- at exec chown %%XYMONUSER%% %D/%%WWWDIR%%/server/download
- at exec chown %%XYMONUSER%% %D/%%WWWDIR%%/server/tmp
- at exec chown %%XYMONUSER%% %D/%%WWWDIR%%/server/www/html
- at exec chown %%XYMONUSER%% %D/%%WWWDIR%%/server/www/notes
- at exec chown %%XYMONUSER%% %D/%%WWWDIR%%/server/www/rep
- at exec chown %%XYMONUSER%% %D/%%WWWDIR%%/server/www/snap
- at exec chown %%XYMONUSER%% %D/%%WWWDIR%%/server/www/wml
+ at exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/data
+ at exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/data/acks
+ at exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/data/data
+ at exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/data/disabled
+ at exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/data/hist
+ at exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/data/histlogs
+ at exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/data/hostdata
+ at exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/data/logs
+ at exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/data/rrd
+ at exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/server/download
+ at exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/server/tmp
+ at exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/server/www/html
+ at exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/server/www/notes
+ at exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/server/www/rep
+ at exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/server/www/snap
+ at exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/server/www/wml
@dirrm %%WWWDIR%%/server/www/wml
@dirrm %%WWWDIR%%/server/www/snap
@dirrm %%WWWDIR%%/server/www/rep
@@ -450,8 +431,5 @@
@dirrm %%WWWDIR%%/cgi-secure
@dirrm %%WWWDIR%%/cgi-bin
@dirrmtry %%WWWDIR%%
- at exec mkdir -p %%VARBASE%%/log/xymon
- at exec chown %%XYMONUSER%% %%VARBASE%%/log/xymon
- at cwd %%VARBASE%%
- at dirrmtry log/xymon
- at cwd
+ at exec install -d -o %%XYMONUSER%% -p %%VARBASE%%/log/xymon
+ at dirrmtry %%VARBASE%%/log/xymon
More information about the svn-ports-head
mailing list