svn commit: r311182 - in head/net-mgmt: . nsca27 nsca27-client nsca27/files

[Martin Matuska]

Author: mm
Date: Tue Jan 29 19:49:38 2013
New Revision: 311182
URL: http://svnweb.freebsd.org/changeset/ports/311182

Log:
  Fork the nsca27 and nsca27-ports for users having problems with nsca 2.9.x

Added:
  head/net-mgmt/nsca27/
     - copied from r271527, head/net-mgmt/nsca/
  head/net-mgmt/nsca27-client/
     - copied from r311178, head/net-mgmt/nsca-client/
Modified:
  head/net-mgmt/Makefile
  head/net-mgmt/nsca27-client/Makefile
  head/net-mgmt/nsca27/Makefile   (contents, props changed)
  head/net-mgmt/nsca27/files/nsca.in   (contents, props changed)
Directory Properties:
  head/net-mgmt/nsca27/distinfo   (props changed)
  head/net-mgmt/nsca27/files/pkg-message.client.in   (props changed)
  head/net-mgmt/nsca27/files/pkg-message.in   (props changed)
  head/net-mgmt/nsca27/pkg-descr   (props changed)
  head/net-mgmt/nsca27/pkg-plist   (props changed)

Modified: head/net-mgmt/Makefile
==============================================================================
--- head/net-mgmt/Makefile	Tue Jan 29 19:46:33 2013	(r311181)
+++ head/net-mgmt/Makefile	Tue Jan 29 19:49:38 2013	(r311182)
@@ -186,6 +186,8 @@
     SUBDIR += nrpep
     SUBDIR += nsca
     SUBDIR += nsca-client
+    SUBDIR += nsca27
+    SUBDIR += nsca27-client
     SUBDIR += nstreams
     SUBDIR += observium
     SUBDIR += ocsinventory-agent

Modified: head/net-mgmt/nsca27-client/Makefile
==============================================================================
--- head/net-mgmt/nsca-client/Makefile	Tue Jan 29 18:46:39 2013	(r311178)
+++ head/net-mgmt/nsca27-client/Makefile	Tue Jan 29 19:49:38 2013	(r311182)
@@ -7,8 +7,11 @@
 
 PKGNAMESUFFIX=	-client
 
-MASTERDIR=	${.CURDIR}/../nsca
+MAINTAINER=	mm at FreeBSD.org
 
-WITHOUT_SERVER=	yes
+LICENSE=	GPLv2
+
+_BUILDING_NSCA_CLIENT=	yes
+MASTERDIR=	${.CURDIR}/../nsca27
 
 .include "${MASTERDIR}/Makefile"

Modified: head/net-mgmt/nsca27/Makefile
==============================================================================
--- head/net-mgmt/nsca/Makefile	Wed Mar 23 15:53:22 2011	(r271527)
+++ head/net-mgmt/nsca27/Makefile	Tue Jan 29 19:49:38 2013	(r311182)
@@ -7,30 +7,34 @@
 
 PORTNAME=	nsca
 PORTVERSION=	2.7.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/nagios/nsca-2.x/nsca-${PORTVERSION}
 
 MAINTAINER=	mm at FreeBSD.org
 COMMENT=	Nagios Service Check Acceptor
 
-.if !defined(WITHOUT_SERVER)
-RUN_DEPENDS=	nagios:${PORTSDIR}/net-mgmt/nagios
-.endif
-LIB_DEPENDS=	mcrypt.8:${PORTSDIR}/security/libmcrypt
+LICENSE=	GPLv2
 
-.if defined(WITHOUT_SERVER) && defined(WITHOUT_CLIENT)
-IGNORE=		you cannot define WITHOUT_SERVER and WITHOUT_CLIENT
+.if !defined(_BUILDING_NSCA_CLIENT)
+#RUN_DEPENDS=	nagios:${PORTSDIR}/net-mgmt/nagios
 .endif
+LIB_DEPENDS=	mcrypt:${PORTSDIR}/security/libmcrypt
 
-LICENSE=	GPLv2
+.if !defined(_BUILDING_NSCA_CLIENT)
+LATEST_LINK=	nsca27
+CONFLICTS=	nsca-2.9.*
+.else
+LATEST_LINK=	nsca27-client
+CONFLICTS=	nsca-client-2.9.*
+.endif
 
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --localstatedir=/var/spool/nagios
 DOCSDIR?=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 
-.if !defined(WITHOUT_SERVER)
+.if !defined(_BUILDING_NSCA_CLIENT)
 USE_RC_SUBR=	nsca
 PLIST_SUB+=	SERVER=""
 WITHOUT_CLIENT=	yes
@@ -42,7 +46,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message.client
 SUB_FILES+=	pkg-message.client
 .endif
 
-.if !defined(WITHOUT_CLIENT)
+.if !defined(_BUILDING_NSCA_CLIENT)
 PLIST_SUB+=	CLIENT=""
 .else
 PLIST_SUB+=	CLIENT="@comment "
@@ -51,12 +55,11 @@ PLIST_SUB+=	CLIENT="@comment "
 DOCS=		Changelog LEGAL README SECURITY
 
 do-install:
-.if !defined(WITHOUT_CLIENT)
+.if defined(_BUILDING_NSCA_CLIENT)
 	${INSTALL_PROGRAM} ${WRKSRC}/src/send_nsca ${PREFIX}/sbin/send_nsca
 	${MKDIR} ${PREFIX}/etc/nagios
 	${INSTALL_DATA} ${WRKSRC}/sample-config/send_nsca.cfg ${PREFIX}/etc/nagios/send_nsca.cfg-sample
-.endif
-.if !defined(WITHOUT_SERVER)
+.else
 	${INSTALL_PROGRAM} ${WRKSRC}/src/nsca ${PREFIX}/sbin/nsca
 	${MKDIR} ${PREFIX}/etc/nagios
 	${INSTALL_DATA} ${WRKSRC}/sample-config/nsca.cfg ${PREFIX}/etc/nagios/nsca.cfg-sample

Modified: head/net-mgmt/nsca27/files/nsca.in
==============================================================================
--- head/net-mgmt/nsca/files/nsca.in	Wed Mar 23 15:53:22 2011	(r271527)
+++ head/net-mgmt/nsca27/files/nsca.in	Tue Jan 29 19:49:38 2013	(r311182)
@@ -1,4 +1,6 @@
 #!/bin/sh
+
+# $FreeBSD$
 #
 # PROVIDE: nsca
 # REQUIRE: nagios
@@ -15,7 +17,7 @@
 . /etc/rc.subr
 
 name="nsca"
-rcvar=`set_rcvar`
+rcvar=nsca_enable
 
 command="%%PREFIX%%/sbin/nsca"
 pidfile="/var/run/nsca.pid"