svn commit: r340263 - in head/net-mgmt: nsca nsca-client nsca27 nsca27-client

[Martin Matuska]

Author: mm
Date: Sun Jan 19 11:35:27 2014
New Revision: 340263
URL: http://svnweb.freebsd.org/changeset/ports/340263
QAT: https://qat.redports.org/buildarchive/r340263/

Log:
  Add STAGE support to net-mgmt/nsca and net-mgmt/nsca27

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

Modified: head/net-mgmt/nsca-client/Makefile
==============================================================================
--- head/net-mgmt/nsca-client/Makefile	Sun Jan 19 11:24:24 2014	(r340262)
+++ head/net-mgmt/nsca-client/Makefile	Sun Jan 19 11:35:27 2014	(r340263)
@@ -10,5 +10,4 @@ LICENSE=	GPLv2
 _BUILDING_NSCA_CLIENT=	yes
 MASTERDIR=	${.CURDIR}/../nsca
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"

Modified: head/net-mgmt/nsca/Makefile
==============================================================================
--- head/net-mgmt/nsca/Makefile	Sun Jan 19 11:24:24 2014	(r340262)
+++ head/net-mgmt/nsca/Makefile	Sun Jan 19 11:35:27 2014	(r340263)
@@ -49,22 +49,21 @@ PLIST_SUB+=	CLIENT="@comment "
 
 DOCS=		Changelog LEGAL README SECURITY
 
-NO_STAGE=	yes
 do-install:
 .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
+	${INSTALL_PROGRAM} ${WRKSRC}/src/send_nsca ${STAGEDIR}${PREFIX}/sbin/send_nsca
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/nagios
+	${INSTALL_DATA} ${WRKSRC}/sample-config/send_nsca.cfg ${STAGEDIR}${PREFIX}/etc/nagios/send_nsca.cfg-sample
 .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
+	${INSTALL_PROGRAM} ${WRKSRC}/src/nsca ${STAGEDIR}${PREFIX}/sbin/nsca
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/nagios
+	${INSTALL_DATA} ${WRKSRC}/sample-config/nsca.cfg ${STAGEDIR}${PREFIX}/etc/nagios/nsca.cfg-sample
 .endif
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
 

Modified: head/net-mgmt/nsca27-client/Makefile
==============================================================================
--- head/net-mgmt/nsca27-client/Makefile	Sun Jan 19 11:24:24 2014	(r340262)
+++ head/net-mgmt/nsca27-client/Makefile	Sun Jan 19 11:35:27 2014	(r340263)
@@ -10,5 +10,4 @@ LICENSE=	GPLv2
 _BUILDING_NSCA_CLIENT=	yes
 MASTERDIR=	${.CURDIR}/../nsca27
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"

Modified: head/net-mgmt/nsca27/Makefile
==============================================================================
--- head/net-mgmt/nsca27/Makefile	Sun Jan 19 11:24:24 2014	(r340262)
+++ head/net-mgmt/nsca27/Makefile	Sun Jan 19 11:35:27 2014	(r340263)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nsca
 PORTVERSION=	2.7.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/nagios/nsca-2.x/nsca-${PORTVERSION}
 
@@ -42,7 +42,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message.client
 SUB_FILES+=	pkg-message.client
 .endif
 
-.if !defined(_BUILDING_NSCA_CLIENT)
+.if defined(_BUILDING_NSCA_CLIENT)
 PLIST_SUB+=	CLIENT=""
 .else
 PLIST_SUB+=	CLIENT="@comment "
@@ -50,22 +50,21 @@ PLIST_SUB+=	CLIENT="@comment "
 
 DOCS=		Changelog LEGAL README SECURITY
 
-NO_STAGE=	yes
 do-install:
 .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
+	${INSTALL_PROGRAM} ${WRKSRC}/src/send_nsca ${STAGEDIR}${PREFIX}/sbin/send_nsca
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/nagios
+	${INSTALL_DATA} ${WRKSRC}/sample-config/send_nsca.cfg ${STAGEDIR}${PREFIX}/etc/nagios/send_nsca.cfg-sample
 .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
+	${INSTALL_PROGRAM} ${WRKSRC}/src/nsca ${STAGEDIR}${PREFIX}/sbin/nsca
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/nagios
+	${INSTALL_DATA} ${WRKSRC}/sample-config/nsca.cfg ${STAGEDIR}${PREFIX}/etc/nagios/nsca.cfg-sample
 .endif
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}