diff options
author | ohauer <ohauer@FreeBSD.org> | 2014-05-31 05:36:33 +0800 |
---|---|---|
committer | ohauer <ohauer@FreeBSD.org> | 2014-05-31 05:36:33 +0800 |
commit | 1272a8ec85390315987b158442ccbdd8e758a71a (patch) | |
tree | 54cd915f0535c8c962205418e5dd45c05f13b4e5 /net-mgmt | |
parent | 9936c3246bb93ac14882cf627bd3d9b95b053056 (diff) | |
download | freebsd-ports-gnome-1272a8ec85390315987b158442ccbdd8e758a71a.tar.gz freebsd-ports-gnome-1272a8ec85390315987b158442ccbdd8e758a71a.tar.zst freebsd-ports-gnome-1272a8ec85390315987b158442ccbdd8e758a71a.zip |
- update to 0.31
- add stage support
- use @sample macro
Changes:
Mon Dec 23rd 2013 - Bug fix from Colin Stolley.
Writing past end of a buffer.
Fri May 24th 2013 - Steve Rader (the author) died.
We miss him. http://www.news.wisc.edu/21829
From README:
Currently, cnagios is not being actively maintained.
We continue to accept simple patches from the community.
PR: ports/189198
Submitted by: ohauer
Approved by: Alexander <alexander.4mail@gmail.com> (maintainer)
Diffstat (limited to 'net-mgmt')
-rw-r--r-- | net-mgmt/cnagios/Makefile | 18 | ||||
-rw-r--r-- | net-mgmt/cnagios/distinfo | 4 | ||||
-rw-r--r-- | net-mgmt/cnagios/files/patch-Makefile.in | 33 | ||||
-rw-r--r-- | net-mgmt/cnagios/pkg-plist | 13 |
4 files changed, 26 insertions, 42 deletions
diff --git a/net-mgmt/cnagios/Makefile b/net-mgmt/cnagios/Makefile index 997ac0c40db0..e432c72cdb27 100644 --- a/net-mgmt/cnagios/Makefile +++ b/net-mgmt/cnagios/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cnagios -PORTVERSION= 0.30 +PORTVERSION= 0.31 CATEGORIES= net-mgmt MASTER_SITES= ftp://noc.hep.wisc.edu/src/cnagios/ \ ftp://noc.hep.wisc.edu/src/cnagios/old-versions/ @@ -24,18 +24,8 @@ CONFIGURE_ARGS= --with-etc-dir="${ETCDIR}" \ USES= perl5 ALL_TARGET= cnagios -MAN1= cnagios.1 - -NO_STAGE= yes -post-install: - @if [ ! -f ${ETCDIR}/cnagiosrc ]; then \ - ${CP} -p ${ETCDIR}/cnagiosrc.sample ${ETCDIR}/cnagiosrc ; \ - fi - @if [ ! -f ${ETCDIR}/cnagios.help ]; then \ - ${CP} -p ${ETCDIR}/cnagios.help.sample ${ETCDIR}/cnagios.help ; \ - fi - @if [ ! -f ${ETCDIR}/cnagios.pl ]; then \ - ${CP} -p ${ETCDIR}/cnagios.pl.sample ${ETCDIR}/cnagios.pl ; \ - fi +post-patch: +# check in next relase if version match, and adjust/remove the next line + ${REINPLACE_CMD} -e 's/0.30/${PORTVERSION}/' ${WRKSRC}/version.h .include <bsd.port.mk> diff --git a/net-mgmt/cnagios/distinfo b/net-mgmt/cnagios/distinfo index 901e374bbeb1..f0f09b8795a2 100644 --- a/net-mgmt/cnagios/distinfo +++ b/net-mgmt/cnagios/distinfo @@ -1,2 +1,2 @@ -SHA256 (cnagios-0.30.tar.gz) = a07774a0eb3b459192a658102024d874d1ff76f9f1f7fe8f206ecb0036ff1438 -SIZE (cnagios-0.30.tar.gz) = 81813 +SHA256 (cnagios-0.31.tar.gz) = 26c1658f53bae66b9cb4d615c002a051343cd42dcd0adeb180390d2f6069ab52 +SIZE (cnagios-0.31.tar.gz) = 82058 diff --git a/net-mgmt/cnagios/files/patch-Makefile.in b/net-mgmt/cnagios/files/patch-Makefile.in index 689b03fbbae7..c1ab23f7bf08 100644 --- a/net-mgmt/cnagios/files/patch-Makefile.in +++ b/net-mgmt/cnagios/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2011-03-28 17:45:52.000000000 +0200 -+++ Makefile.in 2012-05-25 19:38:11.948782413 +0200 -@@ -27,39 +27,20 @@ +--- ./Makefile.in.orig 2013-03-28 22:35:00.000000000 +0100 ++++ ./Makefile.in 2014-05-01 14:23:32.000000000 +0200 +@@ -27,39 +27,11 @@ install: @@ -8,12 +8,12 @@ - echo mv @prefix@/bin/cnagios @prefix@/bin/cnagios.OLD ; \ - mv @prefix@/bin/cnagios @prefix@/bin/cnagios.OLD ; \ - fi - @echo installing cnagios in @prefix@/bin - @$(INSTALL) -c -m 755 cnagios @prefix@/bin/cnagios - - @echo installing cnagios.1 in @prefix@/man/man1 - @$(INSTALL) -c -m 755 cnagios.1 @prefix@/man/man1/cnagios.1 - +- @echo installing cnagios in @prefix@/bin +- @$(INSTALL) -c -m 755 cnagios @prefix@/bin/cnagios +- +- @echo installing cnagios.1 in @prefix@/man/man1 +- @$(INSTALL) -c -m 755 cnagios.1 @prefix@/man/man1/cnagios.1 +- - @if [ ! -f @NAGIOS_ETC_DIR@/cnagiosrc ]; then \ - echo installing cnagiosrc in @NAGIOS_ETC_DIR@ ; \ - $(INSTALL) -c -m 644 cnagiosrc @NAGIOS_ETC_DIR@/cnagiosrc ; \ @@ -21,9 +21,7 @@ - echo installing cnagiosrc as @NAGIOS_ETC_DIR@/cnagiosrc.NEW ; \ - $(INSTALL) -c -m 644 cnagiosrc @NAGIOS_ETC_DIR@/cnagiosrc.NEW ; \ - fi -+ echo installing cnagiosrc.sample in @NAGIOS_ETC_DIR@ -+ $(INSTALL) -c -m 644 cnagiosrc @NAGIOS_ETC_DIR@/cnagiosrc.sample - +- - @if [ ! -f @NAGIOS_ETC_DIR@/cnagios.help ]; then \ - echo installing cnagios.help in @NAGIOS_ETC_DIR@ ; \ - $(INSTALL) -c -m 644 cnagios.help @NAGIOS_ETC_DIR@/cnagios.help ; \ @@ -31,9 +29,7 @@ - echo installing cnagios.help as @NAGIOS_ETC_DIR@/cnagios.help.NEW ; \ - $(INSTALL) -c -m 644 cnagios.help @NAGIOS_ETC_DIR@/cnagios.help.NEW ; \ - fi -+ echo installing cnagios.help.sample in @NAGIOS_ETC_DIR@ -+ $(INSTALL) -c -m 644 cnagios.help @NAGIOS_ETC_DIR@/cnagios.help.sample - +- - @if [ ! -f @NAGIOS_ETC_DIR@/cnagios.pl ]; then \ - echo installing cnagios.pl in @NAGIOS_ETC_DIR@ ; \ - $(INSTALL) -c -m 644 cnagios.pl @NAGIOS_ETC_DIR@/cnagios.pl ; \ @@ -41,8 +37,11 @@ - echo installing cnagios.pl as @NAGIOS_ETC_DIR@/cnagios.pl.NEW ; \ - $(INSTALL) -c -m 644 cnagios.pl @NAGIOS_ETC_DIR@/cnagios.pl.NEW ; \ - fi -+ echo installing cnagios.pl in @NAGIOS_ETC_DIR@ -+ $(INSTALL) -c -m 644 cnagios.pl @NAGIOS_ETC_DIR@/cnagios.pl.sample ++ $(INSTALL) -c -m 755 cnagios $(DESTDIR)@prefix@/bin/cnagios ++ $(INSTALL) -c -m 444 cnagios.1 $(DESTDIR)@prefix@/man/man1/cnagios.1 ++ $(INSTALL) -c -m 644 cnagiosrc $(DESTDIR)@NAGIOS_ETC_DIR@/cnagiosrc.sample ++ $(INSTALL) -c -m 644 cnagios.help $(DESTDIR)@NAGIOS_ETC_DIR@/cnagios.help.sample ++ $(INSTALL) -c -m 644 cnagios.pl $(DESTDIR)@NAGIOS_ETC_DIR@/cnagios.pl.sample install2: @if [ -f /usr/local/bin/cnagios ]; then \ diff --git a/net-mgmt/cnagios/pkg-plist b/net-mgmt/cnagios/pkg-plist index 5cdeb895ac4d..5ac794a5a8cb 100644 --- a/net-mgmt/cnagios/pkg-plist +++ b/net-mgmt/cnagios/pkg-plist @@ -1,10 +1,5 @@ bin/cnagios -@unexec if cmp -s %D/%%ETCDIR%%/cnagiosrc.sample %D/%%ETCDIR%%/cnagiosrc; then rm -f %D/%%ETCDIR%%/cnagiosrc; fi -%%ETCDIR%%/cnagiosrc.sample -@exec if [ ! -f %D/%%ETCDIR%%/cnagiosrc ] ; then cp -p %D/%F %B/cnagiosrc; fi -@unexec if cmp -s %D/%%ETCDIR%%/cnagios.help.sample %D/%%ETCDIR%%/cnagios.help; then rm -f %D/%%ETCDIR%%/cnagios.help; fi -%%ETCDIR%%/cnagios.help.sample -@exec if [ ! -f %D/%%ETCDIR%%/cnagios.help ] ; then cp -p %D/%F %B/cnagios.help; fi -@unexec if cmp -s %D/%%ETCDIR%%/cnagios.pl.sample %D/%%ETCDIR%%/cnagios.pl; then rm -f %D/%%ETCDIR%%/cnagios.pl; fi -%%ETCDIR%%/cnagios.pl.sample -@exec if [ ! -f %D/%%ETCDIR%%/cnagios.pl ] ; then cp -p %D/%F %B/cnagios.pl; fi +@sample %%ETCDIR%%/cnagios.help.sample +@sample %%ETCDIR%%/cnagios.pl.sample +@sample %%ETCDIR%%/cnagiosrc.sample +man/man1/cnagios.1.gz |