From jgh@FreeBSD.org  Thu Mar  7 08:34:54 2013
Return-Path: <jgh@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id 57703DDA;
	Thu,  7 Mar 2013 08:34:54 +0000 (UTC)
	(envelope-from jgh@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87])
	by mx1.freebsd.org (Postfix) with ESMTP id 4A7A391E;
	Thu,  7 Mar 2013 08:34:54 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r278Ys2q020751;
	Thu, 7 Mar 2013 08:34:54 GMT
	(envelope-from jgh@freefall.freebsd.org)
Received: (from jgh@localhost)
	by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r278Ys7l020746;
	Thu, 7 Mar 2013 08:34:54 GMT
	(envelope-from jgh)
Message-Id: <201303070834.r278Ys7l020746@freefall.freebsd.org>
Date: Thu, 7 Mar 2013 08:34:54 GMT
From: Jason Helfman <jgh@FreeBSD.org>
Reply-To: Jason Helfman <jgh@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: bapt@FreeBSD.org
Subject: [patch] net-mgmt/zenoss: convert bsd.zenoss.mk to USES framework
X-Send-Pr-Version: 3.114
X-GNATS-Notify: zenoss@experts-exchange.com

>Number:         176723
>Category:       ports
>Synopsis:       [patch] net-mgmt/zenoss: convert bsd.zenoss.mk to USES framework
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jgh
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 07 08:40:00 UTC 2013
>Closed-Date:    Wed Mar 20 06:29:55 UTC 2013
>Last-Modified:  Wed Mar 20 06:30:00 UTC 2013
>Originator:     Jason Helfman
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r247807: Mon Mar 4 19:35:47 UTC 2013 peter@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL amd64


	
>Description:
Remove Mk/bsd.zenoss.mk in favor of Mk/Uses/zenoss.mk (copied from Mk/bsd.zenoss.mk)
Trim historical headers in zenpacks
Drop unnecessary processing of pre/post in zenpacks in favor of USES=zenoss

>How-To-Repeat:

>Fix:

Index: Mk/Uses/zenoss.mk
===================================================================
--- Mk/Uses/zenoss.mk	(working copy)
+++ Mk/Uses/zenoss.mk	(working copy)
@@ -1,6 +1,3 @@
-#-*- mode: makefile; tab-width: 4; -*-
-# ex:ts=4
-#
 # $FreeBSD$
 #
 # bsd.zenoss.mk - Support for Zenoss ports and Zenpacks.
@@ -8,8 +5,12 @@
 # For FreeBSD committers:
 # Please send all suggested changes to the maintainer instead of committing
 # them yourself.
+#
+# MAINTAINER: zenoss@experts-exchange.com
+#
 
-bsd_zenoss_mk_MAINTAINER=	zenoss@experts-exchange.com
+.if !defined(_INCLUDE_ZENOSS_MK)
+_INCLUDE_ZENOSS_MK=    yes
 
 BUILD_DEPENDS+=	zenoss>=3.1.0:${PORTSDIR}/net-mgmt/zenoss
 RUN_DEPENDS+=	zenoss>=3.1.0:${PORTSDIR}/net-mgmt/zenoss
@@ -71,3 +72,5 @@
 	${INSTALL_DATA} ${WRKSRC}/dist/${ZPACK} ${ZPACKHOME}
 	@${CAT} ${PKGMESSAGE}
 .endif
+
+.endif
Index: Mk/bsd.zenoss.mk
===================================================================
--- Mk/bsd.zenoss.mk	(revision 313565)
+++ Mk/bsd.zenoss.mk	(working copy)
@@ -1,73 +0,0 @@
-#-*- mode: makefile; tab-width: 4; -*-
-# ex:ts=4
-#
-# $FreeBSD$
-#
-# bsd.zenoss.mk - Support for Zenoss ports and Zenpacks.
-#
-# For FreeBSD committers:
-# Please send all suggested changes to the maintainer instead of committing
-# them yourself.
-
-bsd_zenoss_mk_MAINTAINER=	zenoss@experts-exchange.com
-
-BUILD_DEPENDS+=	zenoss>=3.1.0:${PORTSDIR}/net-mgmt/zenoss
-RUN_DEPENDS+=	zenoss>=3.1.0:${PORTSDIR}/net-mgmt/zenoss
-
-FETCH_ARGS?=	-o - > ${DISTDIR}/${DISTFILES}
-
-PKGNAMEPREFIX:=	zenpack-${ZPACKGROUP}-
-
-.if !defined(ZPACKGROUP)
-IGNORE=			will not work with undefined ZPACKGROUP (ex: core,community,etc)
-.endif
-ZENHOME=		${LOCALBASE}/zenoss
-ZENHOME_REL=		${ZENHOME:S,${LOCALBASE}/,,}
-ZPACKHOME=		${LOCALBASE}/zenoss/ZenPack
-ZPACKPREFIX?=	ZenPacks.zenoss.
-ZPACK?=	${ZPACKPREFIX}${PORTNAME}-${PORTVERSION}-${PYTHON_VERSION:S/thon//}.egg
-PLIST_SUB+=		ZPACK=${ZPACK}
-SUB_LIST+=		ZENHOME=${ZENHOME} \
-				ZPACK=${ZPACK} \
-				ZPACKHOME=${ZPACKHOME} \
-				ZPACKPREFIX=${ZPACKPREFIX} \
-				PORTNAME=${PORTNAME}
-SUB_FILES+=		pkg-message pkg-deinstall
-
-SHAREOWN=		zenoss
-SHAREGRP=		zenoss
-
-# zenoss provides its own python 2.6 - we build against that for
-# application compatibility
-PYTHON_VERSION=	python2.6
-PYTHON_CMD=		${ZENHOME}/bin/python
-PYSETUP=		./setup.py
-
-MAKE_ENV+=		ZENHOME=${ZENHOME} \
-				INSTANCE_HOME=${ZENHOME} \
-				PYTHONPATH=${ZENHOME}/lib/python \
-				PATH=${ZENHOME}/bin:${PATH} \
-				PYTHONDONTWRITEBYTECODE=yes
-
-.if !defined(UID)
-UID!=		/usr/bin/id -u
-.endif
-
-.if !target(do-build)
-do-build:
-. if ${UID} != 0 && !defined(INSTALL_AS_USER)
-	@${ECHO_MSG} "===>  Switching to root credentials for '${.TARGET}' target"
-	@cd ${.CURDIR} && \
-		${SU_CMD} "${MAKE} ${__softMAKEFLAGS} ${.TARGET}"
-	@${ECHO_MSG} "===>  Returning to user credentials"
-. else
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} bdist_egg
-. endif
-.endif
-
-.if !target(do-install)
-do-install:
-	${MKDIR} ${ZPACKHOME}
-	${INSTALL_DATA} ${WRKSRC}/dist/${ZPACK} ${ZPACKHOME}
-	@${CAT} ${PKGMESSAGE}
-.endif
Index: net-mgmt/zenpack-apachemonitor/Makefile
===================================================================
--- net-mgmt/zenpack-apachemonitor/Makefile	(revision 313565)
+++ net-mgmt/zenpack-apachemonitor/Makefile	(working copy)
@@ -12,6 +12,7 @@
 
 PLIST_FILES=	zenoss/ZenPack/${ZPACK}
 PLIST_DIRS=	zenoss/ZenPack
+USES=		zenoss
 
 BROKEN=	fails to fetch
 
@@ -19,6 +20,4 @@
 ZPACKGROUP=	core
 WRKSRC=		${WRKDIR}/tags/zenoss-3.1.0/zenpacks/${ZPACKPREFIX}${PORTNAME}/
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.zenoss.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: net-mgmt/zenpack-checkping/Makefile
===================================================================
--- net-mgmt/zenpack-checkping/Makefile	(revision 313565)
+++ net-mgmt/zenpack-checkping/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: CheckPing
-# Date created:    08 June 2011
-# Whom:      Zenoss <zenoss@experts-exchange.com>
-#
+# Created by: Zenoss <zenoss@experts-exchange.com>
 # $FreeBSD$
-#
 
 PORTNAME=	CheckPing
 PORTVERSION=	1.0
@@ -16,12 +12,11 @@
 
 PLIST_FILES=	zenoss/ZenPack/${ZPACK}
 PLIST_DIRS=	zenoss/ZenPack
+USES=		zenoss
 
 ZPACKPREFIX=	ZenPacks.Nagios.
 ZPACKGROUP=	community
 WRKSRC=	${WRKDIR}/zenoss-${ZPACKPREFIX}${PORTNAME}-${TAG}
 TAG=            0088e17
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.zenoss.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: net-mgmt/zenpack-dellmon/Makefile
===================================================================
--- net-mgmt/zenpack-dellmon/Makefile	(revision 313565)
+++ net-mgmt/zenpack-dellmon/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: DellMon
-# Date created:    13 May 2011
-# Whom:      Zenoss <zenoss@experts-exchange.com>
-#
+# Created by: Zenoss <zenoss@experts-exchange.com>
 # $FreeBSD$
-#
 
 PORTNAME=	DellMon
 PORTVERSION=	2.4
@@ -17,11 +13,10 @@
 
 PLIST_FILES=	zenoss/ZenPack/${ZPACK}
 PLIST_DIRS=	zenoss/ZenPack
+USES=		zenoss
 
 ZPACKGROUP=	community
 WRKSRC=		${WRKDIR}/epuzanov-${ZPACKPREFIX}${PORTNAME}-a4ae347
 ZPACKPREFIX=    ZenPacks.community.
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.zenoss.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: net-mgmt/zenpack-dellmonitor/Makefile
===================================================================
--- net-mgmt/zenpack-dellmonitor/Makefile	(revision 313565)
+++ net-mgmt/zenpack-dellmonitor/Makefile	(working copy)
@@ -12,6 +12,7 @@
 
 PLIST_FILES=	zenoss/ZenPack/${ZPACK}
 PLIST_DIRS=	zenoss/ZenPack
+USES=		zenoss
 
 BROKEN=		fails to fetch
 
@@ -19,6 +20,4 @@
 ZPACKGROUP=	core
 WRKSRC=	        ${WRKDIR}/tags/zenoss-3.1.0/zenpacks/${ZPACKPREFIX}${PORTNAME}/
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.zenoss.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: net-mgmt/zenpack-deviceadvdetail/Makefile
===================================================================
--- net-mgmt/zenpack-deviceadvdetail/Makefile	(revision 313565)
+++ net-mgmt/zenpack-deviceadvdetail/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection Makefile for: deviceAdvDetail
-# Date created:    11 May 2011
-# Whom:      Zenoss <zenoss@experts-exchange.com>
-#
+# Created by: Zenoss <zenoss@experts-exchange.com>
 # $FreeBSD$
-#
 
 PORTNAME=	deviceAdvDetail
 PORTVERSION=	2.7.3
@@ -16,6 +12,7 @@
 
 PLIST_FILES=	zenoss/ZenPack/${ZPACK}
 PLIST_DIRS=	zenoss/ZenPack
+USES=		zenoss
 
 ZPACKGROUP=	community
 WRKSRC=	${WRKDIR}/epuzanov-${ZPACKPREFIX}${PORTNAME}-cfbd596
@@ -23,6 +20,4 @@
 ZPACK=	${ZPACKPREFIX}${PORTNAME}-2.7-${PYTHON_VERSION:S/thon//}.egg
 ZPACKPREFIX=	ZenPacks.community.
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.zenoss.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: net-mgmt/zenpack-devicesearch/Makefile
===================================================================
--- net-mgmt/zenpack-devicesearch/Makefile	(revision 313565)
+++ net-mgmt/zenpack-devicesearch/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: DeviceSearch
-# Date created:    26 May 2011
-# Whom:      Zenoss <zenoss@experts-exchange.com>
-#
+# Created by: Zenoss <zenoss@experts-exchange.com>
 # $FreeBSD$
-#
 
 PORTNAME=	DeviceSearch
 PORTVERSION=	1.0.0
@@ -15,9 +11,8 @@
 
 PLIST_FILES=	zenoss/ZenPack/${ZPACK}
 PLIST_DIRS=	zenoss/ZenPack
+USES=		zenoss
 
 ZPACKGROUP=	core
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.zenoss.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: net-mgmt/zenpack-graphportlet/Makefile
===================================================================
--- net-mgmt/zenpack-graphportlet/Makefile	(revision 313565)
+++ net-mgmt/zenpack-graphportlet/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: ShowGraphPortlet
-# Date created:    12 May 2011
-# Whom:      Zenoss <zenoss@experts-exchange.com>
-#
+# Created by: Zenoss <zenoss@experts-exchange.com>
 # $FreeBSD$
-#
 
 PORTNAME=	ShowGraphPortlet
 PORTVERSION=	1.03
@@ -16,12 +12,11 @@
 
 PLIST_FILES=	zenoss/ZenPack/${ZPACK}
 PLIST_DIRS=	zenoss/ZenPack
+USES=		zenoss
 
 ZPACKGROUP=	community
 ZPACKPREFIX=	ZenPacks.SCC.
 WRKSRC=         ${WRKDIR}/zenoss-${ZPACKPREFIX}${PORTNAME}-${TAG}
 TAG=            0cf7678
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.zenoss.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: net-mgmt/zenpack-interfacegraphs/Makefile
===================================================================
--- net-mgmt/zenpack-interfacegraphs/Makefile	(revision 313565)
+++ net-mgmt/zenpack-interfacegraphs/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: InterfaceGraphs
-# Date created:    26 May 2011
-# Whom:      Zenoss <zenoss@experts-exchange.com>
-#
+# Create by: Zenoss <zenoss@experts-exchange.com>
 # $FreeBSD$
-#
 
 PORTNAME=	InterfaceGraphs
 PORTVERSION=	1.0
@@ -16,12 +12,11 @@
 
 PLIST_FILES=	zenoss/ZenPack/${ZPACK}
 PLIST_DIRS=	zenoss/ZenPack
+USES=		zenoss
 
 ZPACKGROUP=	community
 ZPACKPREFIX=	ZenPacks.community.
 WRKSRC=  ${WRKDIR}/zenoss-${ZPACKPREFIX}${PORTNAME}-${TAG}
 TAG= 7ed2d7d
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.zenoss.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: net-mgmt/zenpack-libvirt/Makefile
===================================================================
--- net-mgmt/zenpack-libvirt/Makefile	(revision 313565)
+++ net-mgmt/zenpack-libvirt/Makefile	(working copy)
@@ -17,12 +17,11 @@
 
 PLIST_FILES=	zenoss/ZenPack/${ZPACK}
 PLIST_DIRS=	zenoss/ZenPack
+USES=		zenoss
 
 ZPACKPREFIX=	ZenPacks.community.
 ZPACKGROUP=	community
 WRKSRC=  ${WRKDIR}/zenoss-${ZPACKPREFIX}${PORTNAME}-${TAG}
 TAG=  4113cfe
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.zenoss.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: net-mgmt/zenpack-macreport/Makefile
===================================================================
--- net-mgmt/zenpack-macreport/Makefile	(revision 313565)
+++ net-mgmt/zenpack-macreport/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: MACReport
-# Date created:    13 May 2011
-# Whom:      Zenoss <zenoss@experts-exchange.com>
-#
+# Created by: Zenoss <zenoss@experts-exchange.com>
 # $FreeBSD$
-#
 
 PORTNAME=	MACReport
 PORTVERSION=	1.0.1
@@ -16,6 +12,7 @@
 
 PLIST_FILES=	zenoss/ZenPack/${ZPACK}
 PLIST_DIRS=	zenoss/ZenPack
+USES=		zenoss
 
 USE_ZIP=	yes
 ZPACKGROUP=	community
@@ -24,6 +21,4 @@
 
 ZPACKPREFIX=	ZenPacks.sodonnell.
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.zenoss.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: net-mgmt/zenpack-ntpmonitor/Makefile
===================================================================
--- net-mgmt/zenpack-ntpmonitor/Makefile	(revision 313565)
+++ net-mgmt/zenpack-ntpmonitor/Makefile	(working copy)
@@ -12,6 +12,7 @@
 
 PLIST_FILES=	zenoss/ZenPack/${ZPACK}
 PLIST_DIRS=	zenoss/ZenPack
+USES=		zenoss
 
 BROKEN=		fails to fetch
 
@@ -19,6 +20,4 @@
 ZPACKGROUP=	core
 WRKSRC=	${WRKDIR}/tags/zenoss-3.1.0/zenpacks/${ZPACKPREFIX}${PORTNAME}/
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.zenoss.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Thu Mar 7 08:40:09 UTC 2013 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176723 
Responsible-Changed-From-To: freebsd-ports-bugs->jgh 
Responsible-Changed-By: jgh 
Responsible-Changed-When: Thu Mar 7 08:41:24 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176723 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: zenoss@experts-exchange.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/176723: [patch] net-mgmt/zenoss: convert bsd.zenoss.mk to USES framework
Date: Thu, 7 Mar 2013 08:40:08 UT

 Maintainer of net-mgmt/zenoss,
 
 Please note that PR ports/176723 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/176723
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
State-Changed-From-To: feedback->open 
State-Changed-By: jgh 
State-Changed-When: Wed Mar 20 06:29:32 UTC 2013 
State-Changed-Why:  
maintainer timeout (14 days) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176723 
State-Changed-From-To: open->closed 
State-Changed-By: jgh 
State-Changed-When: Wed Mar 20 06:29:54 UTC 2013 
State-Changed-Why:  
Committed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176723 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/176723: commit references a PR
Date: Wed, 20 Mar 2013 06:28:54 +0000 (UTC)

 Author: jgh
 Date: Wed Mar 20 06:28:43 2013
 New Revision: 314713
 URL: http://svnweb.freebsd.org/changeset/ports/314713
 
 Log:
   - Add New USES macro to handle support for Zenoss ports and Zenpacks:
       USES= zenoss
   -trim historical headers
   
   Convert net-mgmt/zenpack family to new framework
   
   PR:		176723
   Approved by:	maintainer timeout ( 14 days )
 
 Added:
   head/Mk/Uses/zenoss.mk
      - copied, changed from r313565, head/Mk/bsd.zenoss.mk
 Deleted:
   head/Mk/bsd.zenoss.mk
 Modified:
   head/CHANGES
   head/net-mgmt/zenpack-apachemonitor/Makefile
   head/net-mgmt/zenpack-checkping/Makefile
   head/net-mgmt/zenpack-dellmon/Makefile
   head/net-mgmt/zenpack-dellmonitor/Makefile
   head/net-mgmt/zenpack-deviceadvdetail/Makefile
   head/net-mgmt/zenpack-devicesearch/Makefile
   head/net-mgmt/zenpack-graphportlet/Makefile
   head/net-mgmt/zenpack-interfacegraphs/Makefile
   head/net-mgmt/zenpack-libvirt/Makefile
   head/net-mgmt/zenpack-macreport/Makefile
   head/net-mgmt/zenpack-ntpmonitor/Makefile
 
 Modified: head/CHANGES
 ==============================================================================
 --- head/CHANGES	Wed Mar 20 05:49:00 2013	(r314712)
 +++ head/CHANGES	Wed Mar 20 06:28:43 2013	(r314713)
 @@ -10,6 +10,13 @@ in the release notes and/or placed into 
  
  All ports committers are allowed to commit to this file.
  
 +20130320:
 +AUTHOR: jgh@FreeBSD.org
 +
 +  * New USES macro to handle support for Zenoss ports and Zenpacks:
 +
 +    USES= zenoss
 +
  20130319:
  AUTHOR: makc@FreeBSD.org
  
 
 Copied and modified: head/Mk/Uses/zenoss.mk (from r313565, head/Mk/bsd.zenoss.mk)
 ==============================================================================
 --- head/Mk/bsd.zenoss.mk	Thu Mar  7 06:20:38 2013	(r313565, copy source)
 +++ head/Mk/Uses/zenoss.mk	Wed Mar 20 06:28:43 2013	(r314713)
 @@ -1,6 +1,3 @@
 -#-*- mode: makefile; tab-width: 4; -*-
 -# ex:ts=4
 -#
  # $FreeBSD$
  #
  # bsd.zenoss.mk - Support for Zenoss ports and Zenpacks.
 @@ -8,8 +5,19 @@
  # For FreeBSD committers:
  # Please send all suggested changes to the maintainer instead of committing
  # them yourself.
 +#
 +# MAINTAINER: zenoss@experts-exchange.com
 +#
 +# Feature:      zenoss
 +# Usage:        USES=zenoss
 +# Valid ARGS:   does not require args
  
 -bsd_zenoss_mk_MAINTAINER=	zenoss@experts-exchange.com
 +.if !defined(_INCLUDE_ZENOSS_MK)
 +_INCLUDE_ZENOSS_MK=    yes
 +
 +.if defined(zenoss_ARGS)
 +IGNORE= USES=zenoss does not require args
 +.endif
  
  BUILD_DEPENDS+=	zenoss>=3.1.0:${PORTSDIR}/net-mgmt/zenoss
  RUN_DEPENDS+=	zenoss>=3.1.0:${PORTSDIR}/net-mgmt/zenoss
 @@ -71,3 +79,5 @@ do-install:
  	${INSTALL_DATA} ${WRKSRC}/dist/${ZPACK} ${ZPACKHOME}
  	@${CAT} ${PKGMESSAGE}
  .endif
 +
 +.endif
 
 Modified: head/net-mgmt/zenpack-apachemonitor/Makefile
 ==============================================================================
 --- head/net-mgmt/zenpack-apachemonitor/Makefile	Wed Mar 20 05:49:00 2013	(r314712)
 +++ head/net-mgmt/zenpack-apachemonitor/Makefile	Wed Mar 20 06:28:43 2013	(r314713)
 @@ -12,6 +12,7 @@ COMMENT=	Provides performance monitoring
  
  PLIST_FILES=	zenoss/ZenPack/${ZPACK}
  PLIST_DIRS=	zenoss/ZenPack
 +USES=		zenoss
  
  BROKEN=	fails to fetch
  
 @@ -19,6 +20,4 @@ USE_ZIP=	yes
  ZPACKGROUP=	core
  WRKSRC=		${WRKDIR}/tags/zenoss-3.1.0/zenpacks/${ZPACKPREFIX}${PORTNAME}/
  
 -.include <bsd.port.pre.mk>
 -.include "${PORTSDIR}/Mk/bsd.zenoss.mk"
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 
 Modified: head/net-mgmt/zenpack-checkping/Makefile
 ==============================================================================
 --- head/net-mgmt/zenpack-checkping/Makefile	Wed Mar 20 05:49:00 2013	(r314712)
 +++ head/net-mgmt/zenpack-checkping/Makefile	Wed Mar 20 06:28:43 2013	(r314713)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for: CheckPing
 -# Date created:    08 June 2011
 -# Whom:      Zenoss <zenoss@experts-exchange.com>
 -#
 +# Created by: Zenoss <zenoss@experts-exchange.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	CheckPing
  PORTVERSION=	1.0
 @@ -16,12 +12,11 @@ COMMENT=	Provides nagios ping check for 
  
  PLIST_FILES=	zenoss/ZenPack/${ZPACK}
  PLIST_DIRS=	zenoss/ZenPack
 +USES=		zenoss
  
  ZPACKPREFIX=	ZenPacks.Nagios.
  ZPACKGROUP=	community
  WRKSRC=	${WRKDIR}/zenoss-${ZPACKPREFIX}${PORTNAME}-${TAG}
  TAG=            0088e17
  
 -.include <bsd.port.pre.mk>
 -.include "${PORTSDIR}/Mk/bsd.zenoss.mk"
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 
 Modified: head/net-mgmt/zenpack-dellmon/Makefile
 ==============================================================================
 --- head/net-mgmt/zenpack-dellmon/Makefile	Wed Mar 20 05:49:00 2013	(r314712)
 +++ head/net-mgmt/zenpack-dellmon/Makefile	Wed Mar 20 06:28:43 2013	(r314713)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for: DellMon
 -# Date created:    13 May 2011
 -# Whom:      Zenoss <zenoss@experts-exchange.com>
 -#
 +# Created by: Zenoss <zenoss@experts-exchange.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	DellMon
  PORTVERSION=	2.4
 @@ -17,11 +13,10 @@ COMMENT=	Provides additional monitoring 
  
  PLIST_FILES=	zenoss/ZenPack/${ZPACK}
  PLIST_DIRS=	zenoss/ZenPack
 +USES=		zenoss
  
  ZPACKGROUP=	community
  WRKSRC=		${WRKDIR}/epuzanov-${ZPACKPREFIX}${PORTNAME}-a4ae347
  ZPACKPREFIX=    ZenPacks.community.
  
 -.include <bsd.port.pre.mk>
 -.include "${PORTSDIR}/Mk/bsd.zenoss.mk"
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 
 Modified: head/net-mgmt/zenpack-dellmonitor/Makefile
 ==============================================================================
 --- head/net-mgmt/zenpack-dellmonitor/Makefile	Wed Mar 20 05:49:00 2013	(r314712)
 +++ head/net-mgmt/zenpack-dellmonitor/Makefile	Wed Mar 20 06:28:43 2013	(r314713)
 @@ -12,6 +12,7 @@ COMMENT=	Provides Zenoss monitoring opti
  
  PLIST_FILES=	zenoss/ZenPack/${ZPACK}
  PLIST_DIRS=	zenoss/ZenPack
 +USES=		zenoss
  
  BROKEN=		fails to fetch
  
 @@ -19,6 +20,4 @@ USE_ZIP=	yes
  ZPACKGROUP=	core
  WRKSRC=	        ${WRKDIR}/tags/zenoss-3.1.0/zenpacks/${ZPACKPREFIX}${PORTNAME}/
  
 -.include <bsd.port.pre.mk>
 -.include "${PORTSDIR}/Mk/bsd.zenoss.mk"
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 
 Modified: head/net-mgmt/zenpack-deviceadvdetail/Makefile
 ==============================================================================
 --- head/net-mgmt/zenpack-deviceadvdetail/Makefile	Wed Mar 20 05:49:00 2013	(r314712)
 +++ head/net-mgmt/zenpack-deviceadvdetail/Makefile	Wed Mar 20 06:28:43 2013	(r314713)
 @@ -1,9 +1,5 @@
 -# New ports collection Makefile for: deviceAdvDetail
 -# Date created:    11 May 2011
 -# Whom:      Zenoss <zenoss@experts-exchange.com>
 -#
 +# Created by: Zenoss <zenoss@experts-exchange.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	deviceAdvDetail
  PORTVERSION=	2.7.3
 @@ -16,6 +12,7 @@ COMMENT=	Provides additional hardware de
  
  PLIST_FILES=	zenoss/ZenPack/${ZPACK}
  PLIST_DIRS=	zenoss/ZenPack
 +USES=		zenoss
  
  ZPACKGROUP=	community
  WRKSRC=	${WRKDIR}/epuzanov-${ZPACKPREFIX}${PORTNAME}-cfbd596
 @@ -23,6 +20,4 @@ WRKSRC=	${WRKDIR}/epuzanov-${ZPACKPREFIX
  ZPACK=	${ZPACKPREFIX}${PORTNAME}-2.7-${PYTHON_VERSION:S/thon//}.egg
  ZPACKPREFIX=	ZenPacks.community.
  
 -.include <bsd.port.pre.mk>
 -.include "${PORTSDIR}/Mk/bsd.zenoss.mk"
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 
 Modified: head/net-mgmt/zenpack-devicesearch/Makefile
 ==============================================================================
 --- head/net-mgmt/zenpack-devicesearch/Makefile	Wed Mar 20 05:49:00 2013	(r314712)
 +++ head/net-mgmt/zenpack-devicesearch/Makefile	Wed Mar 20 06:28:43 2013	(r314713)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for: DeviceSearch
 -# Date created:    26 May 2011
 -# Whom:      Zenoss <zenoss@experts-exchange.com>
 -#
 +# Created by: Zenoss <zenoss@experts-exchange.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	DeviceSearch
  PORTVERSION=	1.0.0
 @@ -15,9 +11,8 @@ COMMENT=	Provides the ability to quickly
  
  PLIST_FILES=	zenoss/ZenPack/${ZPACK}
  PLIST_DIRS=	zenoss/ZenPack
 +USES=		zenoss
  
  ZPACKGROUP=	core
  
 -.include <bsd.port.pre.mk>
 -.include "${PORTSDIR}/Mk/bsd.zenoss.mk"
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 
 Modified: head/net-mgmt/zenpack-graphportlet/Makefile
 ==============================================================================
 --- head/net-mgmt/zenpack-graphportlet/Makefile	Wed Mar 20 05:49:00 2013	(r314712)
 +++ head/net-mgmt/zenpack-graphportlet/Makefile	Wed Mar 20 06:28:43 2013	(r314713)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for: ShowGraphPortlet
 -# Date created:    12 May 2011
 -# Whom:      Zenoss <zenoss@experts-exchange.com>
 -#
 +# Created by: Zenoss <zenoss@experts-exchange.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	ShowGraphPortlet
  PORTVERSION=	1.03
 @@ -16,12 +12,11 @@ COMMENT=	Enables users to show any graph
  
  PLIST_FILES=	zenoss/ZenPack/${ZPACK}
  PLIST_DIRS=	zenoss/ZenPack
 +USES=		zenoss
  
  ZPACKGROUP=	community
  ZPACKPREFIX=	ZenPacks.SCC.
  WRKSRC=         ${WRKDIR}/zenoss-${ZPACKPREFIX}${PORTNAME}-${TAG}
  TAG=            0cf7678
  
 -.include <bsd.port.pre.mk>
 -.include "${PORTSDIR}/Mk/bsd.zenoss.mk"
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 
 Modified: head/net-mgmt/zenpack-interfacegraphs/Makefile
 ==============================================================================
 --- head/net-mgmt/zenpack-interfacegraphs/Makefile	Wed Mar 20 05:49:00 2013	(r314712)
 +++ head/net-mgmt/zenpack-interfacegraphs/Makefile	Wed Mar 20 06:28:43 2013	(r314713)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for: InterfaceGraphs
 -# Date created:    26 May 2011
 -# Whom:      Zenoss <zenoss@experts-exchange.com>
 -#
 +# Created by: Zenoss <zenoss@experts-exchange.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	InterfaceGraphs
  PORTVERSION=	1.0
 @@ -16,12 +12,11 @@ COMMENT=	Provides a link that graphs all
  
  PLIST_FILES=	zenoss/ZenPack/${ZPACK}
  PLIST_DIRS=	zenoss/ZenPack
 +USES=		zenoss
  
  ZPACKGROUP=	community
  ZPACKPREFIX=	ZenPacks.community.
  WRKSRC=  ${WRKDIR}/zenoss-${ZPACKPREFIX}${PORTNAME}-${TAG}
  TAG= 7ed2d7d
  
 -.include <bsd.port.pre.mk>
 -.include "${PORTSDIR}/Mk/bsd.zenoss.mk"
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 
 Modified: head/net-mgmt/zenpack-libvirt/Makefile
 ==============================================================================
 --- head/net-mgmt/zenpack-libvirt/Makefile	Wed Mar 20 05:49:00 2013	(r314712)
 +++ head/net-mgmt/zenpack-libvirt/Makefile	Wed Mar 20 06:28:43 2013	(r314713)
 @@ -17,12 +17,11 @@ RUN_DEPENDS=	libvirt>=0.9.1:${PORTSDIR}/
  
  PLIST_FILES=	zenoss/ZenPack/${ZPACK}
  PLIST_DIRS=	zenoss/ZenPack
 +USES=		zenoss
  
  ZPACKPREFIX=	ZenPacks.community.
  ZPACKGROUP=	community
  WRKSRC=  ${WRKDIR}/zenoss-${ZPACKPREFIX}${PORTNAME}-${TAG}
  TAG=  4113cfe
  
 -.include <bsd.port.pre.mk>
 -.include "${PORTSDIR}/Mk/bsd.zenoss.mk"
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 
 Modified: head/net-mgmt/zenpack-macreport/Makefile
 ==============================================================================
 --- head/net-mgmt/zenpack-macreport/Makefile	Wed Mar 20 05:49:00 2013	(r314712)
 +++ head/net-mgmt/zenpack-macreport/Makefile	Wed Mar 20 06:28:43 2013	(r314713)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for: MACReport
 -# Date created:    13 May 2011
 -# Whom:      Zenoss <zenoss@experts-exchange.com>
 -#
 +# Created by: Zenoss <zenoss@experts-exchange.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	MACReport
  PORTVERSION=	1.0.1
 @@ -16,6 +12,7 @@ COMMENT=	Lists MAC address and the Devic
  
  PLIST_FILES=	zenoss/ZenPack/${ZPACK}
  PLIST_DIRS=	zenoss/ZenPack
 +USES=		zenoss
  
  USE_ZIP=	yes
  ZPACKGROUP=	community
 @@ -24,6 +21,4 @@ TAG=	b345f53
  
  ZPACKPREFIX=	ZenPacks.sodonnell.
  
 -.include <bsd.port.pre.mk>
 -.include "${PORTSDIR}/Mk/bsd.zenoss.mk"
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 
 Modified: head/net-mgmt/zenpack-ntpmonitor/Makefile
 ==============================================================================
 --- head/net-mgmt/zenpack-ntpmonitor/Makefile	Wed Mar 20 05:49:00 2013	(r314712)
 +++ head/net-mgmt/zenpack-ntpmonitor/Makefile	Wed Mar 20 06:28:43 2013	(r314713)
 @@ -12,6 +12,7 @@ COMMENT=	Monitors the offset between sys
  
  PLIST_FILES=	zenoss/ZenPack/${ZPACK}
  PLIST_DIRS=	zenoss/ZenPack
 +USES=		zenoss
  
  BROKEN=		fails to fetch
  
 @@ -19,6 +20,4 @@ USE_ZIP=	yes
  ZPACKGROUP=	core
  WRKSRC=	${WRKDIR}/tags/zenoss-3.1.0/zenpacks/${ZPACKPREFIX}${PORTNAME}/
  
 -.include <bsd.port.pre.mk>
 -.include "${PORTSDIR}/Mk/bsd.zenoss.mk"
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
