svn commit: r355917 - in head/net-mgmt/cnagios: . files

Olli Hauer ohauer at FreeBSD.org
Fri May 30 21:36:34 UTC 2014 

Author: ohauer
Date: Fri May 30 21:36:33 2014
New Revision: 355917
URL: http://svnweb.freebsd.org/changeset/ports/355917
QAT: https://qat.redports.org/buildarchive/r355917/

Log:
  - 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 at gmail.com> (maintainer)

Modified:
  head/net-mgmt/cnagios/Makefile
  head/net-mgmt/cnagios/distinfo
  head/net-mgmt/cnagios/files/patch-Makefile.in
  head/net-mgmt/cnagios/pkg-plist

Modified: head/net-mgmt/cnagios/Makefile
==============================================================================
--- head/net-mgmt/cnagios/Makefile	Fri May 30 21:32:38 2014	(r355916)
+++ head/net-mgmt/cnagios/Makefile	Fri May 30 21:36:33 2014	(r355917)
@@ -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>

Modified: head/net-mgmt/cnagios/distinfo
==============================================================================
--- head/net-mgmt/cnagios/distinfo	Fri May 30 21:32:38 2014	(r355916)
+++ head/net-mgmt/cnagios/distinfo	Fri May 30 21:36:33 2014	(r355917)
@@ -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

Modified: head/net-mgmt/cnagios/files/patch-Makefile.in
==============================================================================
--- head/net-mgmt/cnagios/files/patch-Makefile.in	Fri May 30 21:32:38 2014	(r355916)
+++ head/net-mgmt/cnagios/files/patch-Makefile.in	Fri May 30 21:36:33 2014	(r355917)
@@ -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 \

Modified: head/net-mgmt/cnagios/pkg-plist
==============================================================================
--- head/net-mgmt/cnagios/pkg-plist	Fri May 30 21:32:38 2014	(r355916)
+++ head/net-mgmt/cnagios/pkg-plist	Fri May 30 21:36:33 2014	(r355917)
@@ -1,10 +1,5 @@
 bin/cnagios
- at unexec if cmp -s %D/%%ETCDIR%%/cnagiosrc.sample %D/%%ETCDIR%%/cnagiosrc; then rm -f %D/%%ETCDIR%%/cnagiosrc; fi
-%%ETCDIR%%/cnagiosrc.sample
- at exec if [ ! -f %D/%%ETCDIR%%/cnagiosrc ] ; then cp -p %D/%F %B/cnagiosrc; fi
- at 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
- at exec if [ ! -f %D/%%ETCDIR%%/cnagios.help ] ; then cp -p %D/%F %B/cnagios.help; fi
- at 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
- at exec if [ ! -f %D/%%ETCDIR%%/cnagios.pl ] ; then cp -p %D/%F %B/cnagios.pl; fi
+ at sample %%ETCDIR%%/cnagios.help.sample
+ at sample %%ETCDIR%%/cnagios.pl.sample
+ at sample %%ETCDIR%%/cnagiosrc.sample
+man/man1/cnagios.1.gz

More information about the svn-ports-all mailing list