Attachment 132446 Details for Bug 176723 – file.diff

[patch] file.diff

file.diff (text/plain), 11.12 KB, created by Jason Helfman on 2013-03-07 08:40:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Helfman

Created: 2013-03-07 08:40:00 UTC

Size: 11.12 KB

patch

obsolete

>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>

Actions: View | Diff

Attachments on bug 176723: 132446