[97924] trunk/dports/net
dports at macports.org
dports at macports.org
Thu Sep 20 01:31:07 PDT 2012
Revision: 97924
http://trac.macports.org//changeset/97924
Author: dports at macports.org
Date: 2012-09-20 01:31:07 -0700 (Thu, 20 Sep 2012)
Log Message:
-----------
xymon: rename to xymon-client; update to 4.3.10 (#36180)
Modified Paths:
--------------
trunk/dports/net/xymon/Portfile
trunk/dports/net/xymon-client/Portfile
trunk/dports/net/xymon-client/files/patch-build-Makefile.Darwin.diff
Added Paths:
-----------
trunk/dports/net/xymon-client/
Removed Paths:
-------------
trunk/dports/net/xymon/files/
trunk/dports/net/xymon-client/files/patch-build-Makefile.rules.diff
trunk/dports/net/xymon-client/files/patch-client-xymonclient-darwin.sh.diff
trunk/dports/net/xymon-client/files/patch-lib-Makefile.diff
Modified: trunk/dports/net/xymon/Portfile
===================================================================
--- trunk/dports/net/xymon/Portfile 2012-09-20 07:40:42 UTC (rev 97923)
+++ trunk/dports/net/xymon/Portfile 2012-09-20 08:31:07 UTC (rev 97924)
@@ -7,134 +7,18 @@
conflicts xymon-server
epoch 1
version 4.3.7
-revision 2
+revision 3
+
+replaced_by xymon-client
+PortGroup obsolete 1.0
+
categories net
platforms darwin
-license GPL-2
-maintainers free.fr:fclaire
-description Xymon network monitor Client
+description Xymon network monitor Client (obsolete port)
long_description Xymon is a system for monitoring of hosts and networks, \
- inspired by the Big Brother system. It provides real-time \
- monitoring, an easy web-interface, historical data, \
- availability reports and performance graphs. \
- Xymon was previously known as \"Hobbit\".
+ inspired by the Big Brother system. This port is a \
+ stub and has been replaced by the ${replaced_by} port.
homepage http://www.xymon.com/
-master_sites sourceforge:project/xymon/Xymon/${version}
-
-checksums sha1 29339157a1a6155d134ed1ad9985391d43034ee8 \
- rmd160 9547eac47a5893f978cace54b5761e9cabe75941
-
-depends_lib port:rrdtool \
- port:fping \
- port:pcre \
- port:libpng \
- port:openssl \
- port:openldap
-
-universal_variant no
-
-patchfiles patch-build-Makefile.rules.diff \
- patch-build-Makefile.Darwin.diff \
- patch-lib-Makefile.diff \
- patch-client-xymonclient-darwin.sh.diff
-
-if {"darwin" == ${os.platform} && ${os.major} > 8} {
- set xymonuser _xymon
-} else {
- set xymonuser xymon
-}
-set xymongroup ${xymonuser}
-set xytopdir ${prefix}/lib/${name}
-set xyetcdir ${xytopdir}/client/etc
-set xylogdir ${xytopdir}/client/logs
-set xytmpdir ${xytopdir}/client/tmp
-set xyvardir ${xytopdir}/data
-set xywebdir ${xytopdir}/web
-set xywwwdir ${xytopdir}/www
-
-configure.cmd ./configure.client
-configure.args-append --rrdinclude ${prefix}/include \
- --rrdlib ${prefix}/lib \
- --pcreinclude ${prefix}/include \
- --pcrelib ${prefix}/lib \
- --sslinclude ${prefix}/include \
- --ssllib ${prefix}/lib \
- --ldapinclude ${prefix}/include \
- --ldaplib ${prefix}/lib \
- --fping ${prefix}/sbin/fping
-configure.env-append ENABLESSL=y \
- XYMONUSER=${xymonuser} \
- XYMONTOPDIR=${xytopdir} \
- XYMONHOSTIP=127.0.0.1 \
- XYMONHOSTOS=${os.platform} \
- MANROOT=${prefix}/share/man \
- INSTALLBINDIR=${xytopdir}/client/bin \
- INSTALLETCDIR=${xyetcdir} \
- INSTALLEXTDIR=${xytopdir}/client/ext \
- INSTALLTMPDIR=${xytmpdir} \
- INSTALLWEBDIR=${xywebdir} \
- INSTALLWWWDIR=${xywwwdir} \
- XYMONVAR=${xyvardir} \
- CC=${configure.cc} \
- CXX=${configure.cxx} \
- CPP=${configure.cpp}
-
-build.args-append CC=${configure.cc} \
- CXX=${configure.cxx} \
- CPP=${configure.cpp}
-
-destroot.env-append INSTALLROOT=${destroot}
-destroot.keepdirs ${destroot}${xytopdir} \
- ${destroot}${xylogdir} \
- ${destroot}${xytmpdir} \
- ${destroot}${xyvardir}/logs \
- ${destroot}${xyvardir} \
- ${destroot}${xywebdir}
-
-startupitem.create yes
-startupitem.start "sudo su ${xymonuser} -c \"${xytopdir}/client/runclient.sh start\""
-startupitem.stop "sudo su ${xymonuser} -c \"${xytopdir}/client/runclient.sh stop\""
-startupitem.restart "sudo su ${xymonuser} -c \"${xytopdir}/client/runclient.sh restart\""
-#startupitem.pidfile auto ${xylogdir}/clientlaunch.*.pid
-startupitem.pidfile none
-
-add_users ${xymonuser} group=${xymongroup} realname=Xymon\ User home=${xytopdir} shell=/bin/bash
-
-post-destroot {
- xinstall -d -o ${xymonuser} -g ${xymongroup} ${destroot}${xylogdir}
- xinstall -d -o ${xymonuser} -g ${xymongroup} ${destroot}${xytmpdir}
- # Adding a suffix to config files
- foreach f { clientlaunch.cfg localclient.cfg xymonclient.cfg } {
- move ${destroot}${xyetcdir}/${f} ${destroot}${xyetcdir}/${f}.${version}
- }
-}
-
-post-activate {
- # If not already present we put default config files
- foreach f { clientlaunch.cfg localclient.cfg xymonclient.cfg } {
- if {![file exists ${xyetcdir}/${f}]} {
- file copy ${xyetcdir}/${f}.${version} ${xyetcdir}/${f}
- }
- }
-}
-
-notes "\nSet your Xymon server's IP address with the following command:
- $ sudo vi ${xyetcdir}/xymonclient.cfg
-
-If you wish your xymon client to report logfiles to your xymon server
-you need to add the user ${xymonuser} to the admin group like this:
- $ sudo dscl . -append /Groups/admin GroupMembership ${xymonuser}
-
-You can start,stop and restart the xymon client with:
- $ sudo -u ${xymonuser} ${xytopdir}/client/runclient.sh \[start|stop|restart\]
-"
-
-use_parallel_build no
-
-livecheck.type regex
-livecheck.url http://sourceforge.net/projects/${name}/files/
-livecheck.regex ${name}-(\[0-9.\]+)\\.tar.gz
-
Modified: trunk/dports/net/xymon-client/Portfile
===================================================================
--- trunk/dports/net/xymon/Portfile 2012-09-19 22:45:02 UTC (rev 97915)
+++ trunk/dports/net/xymon-client/Portfile 2012-09-20 08:31:07 UTC (rev 97924)
@@ -3,11 +3,10 @@
PortSystem 1.0
-name xymon
+name xymon-client
+set shortname xymon
conflicts xymon-server
-epoch 1
-version 4.3.7
-revision 2
+version 4.3.10
categories net
platforms darwin
license GPL-2
@@ -23,9 +22,11 @@
homepage http://www.xymon.com/
master_sites sourceforge:project/xymon/Xymon/${version}
+distname ${shortname}-${version}
+dist_subdir ${shortname}
-checksums sha1 29339157a1a6155d134ed1ad9985391d43034ee8 \
- rmd160 9547eac47a5893f978cace54b5761e9cabe75941
+checksums sha1 d37765da5741adc4282e081e3ad59862eb22353f \
+ rmd160 df5e01ab4528bc1146cdf784bbf69616f743bfa1
depends_lib port:rrdtool \
port:fping \
@@ -36,10 +37,7 @@
universal_variant no
-patchfiles patch-build-Makefile.rules.diff \
- patch-build-Makefile.Darwin.diff \
- patch-lib-Makefile.diff \
- patch-client-xymonclient-darwin.sh.diff
+patchfiles patch-build-Makefile.Darwin.diff
if {"darwin" == ${os.platform} && ${os.major} > 8} {
set xymonuser _xymon
@@ -47,7 +45,7 @@
set xymonuser xymon
}
set xymongroup ${xymonuser}
-set xytopdir ${prefix}/lib/${name}
+set xytopdir ${prefix}/lib/${shortname}
set xyetcdir ${xytopdir}/client/etc
set xylogdir ${xytopdir}/client/logs
set xytmpdir ${xytopdir}/client/tmp
@@ -135,6 +133,6 @@
use_parallel_build no
livecheck.type regex
-livecheck.url http://sourceforge.net/projects/${name}/files/
-livecheck.regex ${name}-(\[0-9.\]+)\\.tar.gz
+livecheck.url http://sourceforge.net/projects/${shortname}/files/
+livecheck.regex ${shortname}-(\[0-9.\]+)\\.tar.gz
Modified: trunk/dports/net/xymon-client/files/patch-build-Makefile.Darwin.diff
===================================================================
--- trunk/dports/net/xymon/files/patch-build-Makefile.Darwin.diff 2012-09-19 22:45:02 UTC (rev 97915)
+++ trunk/dports/net/xymon-client/files/patch-build-Makefile.Darwin.diff 2012-09-20 08:31:07 UTC (rev 97924)
@@ -1,11 +1,11 @@
---- build/Makefile.Darwin.orig 2011-09-30 16:44:05.000000000 +0200
-+++ build/Makefile.Darwin 2011-09-30 16:44:15.000000000 +0200
+--- build/Makefile.Darwin.orig 2012-09-13 10:32:39.000000000 +0200
++++ build/Makefile.Darwin 2012-09-13 10:32:50.000000000 +0200
@@ -7,7 +7,7 @@
NETLIBS =
# Compile flags for normal build
-CC = gcc
+#CC = gcc
- CFLAGS = -g -O -Wall -Wno-unused -D_REENTRANT -DBIND_8_COMPAT=1 $(LFSDEF) $(OSDEF)
-
- # Compile flags for debugging
+ GCCVER := $(shell gcc -dumpversion|cut -d. -f1)
+ ifeq ($(GCCVER),4)
+ CFLAGS = -g -O -Wall -Wno-unused -Wno-pointer-sign -D_REENTRANT -DBIND_8_COMPAT=1 $(LFSDEF) $(OSDEF)
Deleted: trunk/dports/net/xymon-client/files/patch-build-Makefile.rules.diff
===================================================================
--- trunk/dports/net/xymon/files/patch-build-Makefile.rules.diff 2012-09-19 22:45:02 UTC (rev 97915)
+++ trunk/dports/net/xymon-client/files/patch-build-Makefile.rules.diff 2012-09-20 08:31:07 UTC (rev 97924)
@@ -1,11 +0,0 @@
---- build/Makefile.rules.orig 2010-04-08 06:26:27.000000000 +0200
-+++ build/Makefile.rules 2010-04-08 06:26:38.000000000 +0200
-@@ -8,7 +8,7 @@
- # Build targets
- #####################
-
--CFLAGS += -I. -I$(BUILDTOPDIR)/include
-+CFLAGS += -I$(BUILDTOPDIR)/include
-
- ifeq ($(CLIENTONLY),yes)
- BUILDTARGETS = client
Deleted: trunk/dports/net/xymon-client/files/patch-client-xymonclient-darwin.sh.diff
===================================================================
--- trunk/dports/net/xymon/files/patch-client-xymonclient-darwin.sh.diff 2012-09-19 22:45:02 UTC (rev 97915)
+++ trunk/dports/net/xymon-client/files/patch-client-xymonclient-darwin.sh.diff 2012-09-20 08:31:07 UTC (rev 97924)
@@ -1,18 +0,0 @@
---- client/xymonclient-darwin.sh.orig 2010-08-06 11:29:52.000000000 +0200
-+++ client/xymonclient-darwin.sh 2010-08-06 11:57:09.000000000 +0200
-@@ -44,12 +44,12 @@
- ps -ax -ww -o pid,ppid,user,start,state,pri,pcpu,time,pmem,rss,vsz,command
-
- # $TOP must be set, the install utility should do that for us if it exists.
--if test "$TOP" != ""
-+if test "$TOP" != "" -a "$AWK" != ""
- then
-- if test -x "$TOP"
-+ if test -x "$TOP" -a -x "$AWK"
- then
- echo "[top]"
-- $TOP -l 1 -n 20
-+ $TOP -l 2 -n 20 -o cpu | $AWK '/^Processes:/ {toprun++} toprun == 2'
- fi
- fi
-
Deleted: trunk/dports/net/xymon-client/files/patch-lib-Makefile.diff
===================================================================
--- trunk/dports/net/xymon/files/patch-lib-Makefile.diff 2012-09-19 22:45:02 UTC (rev 97915)
+++ trunk/dports/net/xymon-client/files/patch-lib-Makefile.diff 2012-09-20 08:31:07 UTC (rev 97924)
@@ -1,11 +0,0 @@
---- lib/Makefile.orig 2010-04-08 06:28:03.000000000 +0200
-+++ lib/Makefile 2010-04-08 06:28:13.000000000 +0200
-@@ -9,7 +9,7 @@
- endif
-
-
--CFLAGS += -I. -I../include
-+CFLAGS += -I../include
-
- all: test-endianness libbbgen.a hobbitclient.a loadhosts stackio availability md5 sha1 rmd160 locator
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120920/a2f21355/attachment-0001.html>
More information about the macports-changes
mailing list