svn commit: r311179 - in head/net-mgmt: nsca nsca-client

[Martin Matuska]

Author: mm
Date: Tue Jan 29 19:36:23 2013
New Revision: 311179
URL: http://svnweb.freebsd.org/changeset/ports/311179

Log:
  Make portlint happy
  Rename WITHOUT_* variables used for port's internal purposes
  Add conflict with nsca-2.7.* and nsca-client-2.7.*

Modified:
  head/net-mgmt/nsca-client/Makefile
  head/net-mgmt/nsca/Makefile

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

Modified: head/net-mgmt/nsca/Makefile
==============================================================================
--- head/net-mgmt/nsca/Makefile	Tue Jan 29 18:46:39 2013	(r311178)
+++ head/net-mgmt/nsca/Makefile	Tue Jan 29 19:36:23 2013	(r311179)
@@ -7,30 +7,34 @@
 
 PORTNAME=	nsca
 PORTVERSION=	2.9.1
-PORTREVISION=	1
+PORTREVISION=	2
 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)
+LICENSE=	GPLv2
+
+.if !defined(_BUILDING_NSCA_CLIENT)
 RUN_DEPENDS=	nagios:${PORTSDIR}/net-mgmt/nagios
 .endif
-LIB_DEPENDS=	mcrypt.8:${PORTSDIR}/security/libmcrypt
+LIB_DEPENDS=	mcrypt:${PORTSDIR}/security/libmcrypt
 
-.if defined(WITHOUT_SERVER) && defined(WITHOUT_CLIENT)
-IGNORE=		you cannot define WITHOUT_SERVER and WITHOUT_CLIENT
+.if !defined(_BUILDING_NSCA_CLIENT)
+LATEST_LINK=	nsca
+CONFLICTS=	nsca-2.7.*
+.else
+LATEST_LINK=	nsca-client
+CONFLICTS=	nsca-client-2.7.*
 .endif
 
-LICENSE=	GPLv2
-
 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