Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 6 Oct 2012 22:10:56 +0000 (UTC)
From:      Florian Smeets <flo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r305413 - in head/sysutils: munin-common munin-master munin-master/files munin-node
Message-ID:  <201210062210.q96MAup2051388@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: flo
Date: Sat Oct  6 22:10:55 2012
New Revision: 305413
URL: http://svn.freebsd.org/changeset/ports/305413

Log:
  - update to 2.0.7
  - move USERS and GROUPS from munin-common/Makefile to munin.mk, otherwise they
    cannot be used in the Makefiles of munin-master and munin-node where they are
    required. This fixes permissions on certain directories. [1]
  - VERSION.node file should be updated after the pkg-install script runs, because
    it requires the version of the previously installed version not the currently
    installed one. [2]
  
  PR:		ports/172260 [1]
  Reported by:	Haruo Shiba <shiba@logic-design.co.jp> [1]
  		tdb [2]

Deleted:
  head/sysutils/munin-master/files/patch-bug1251
Modified:
  head/sysutils/munin-common/Makefile
  head/sysutils/munin-common/distinfo
  head/sysutils/munin-common/munin.mk
  head/sysutils/munin-master/Makefile
  head/sysutils/munin-node/Makefile
  head/sysutils/munin-node/pkg-plist

Modified: head/sysutils/munin-common/Makefile
==============================================================================
--- head/sysutils/munin-common/Makefile	Sat Oct  6 22:04:05 2012	(r305412)
+++ head/sysutils/munin-common/Makefile	Sat Oct  6 22:10:55 2012	(r305413)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	munin-common
-# Date created:                         10 February 2010
-# Whom:                                 Sean Rees <sean@rees.us>
-#
+# Created by: Sean Rees <sean@rees.us>
 # $FreeBSD$
-#
 
 PORTNAME=	munin
 PORTVERSION=	${MUNIN_VERSION}
@@ -24,9 +20,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVER
 
 .include "${.CURDIR}/../munin-common/munin.mk"
 
-USERS=		${MUNIN_USER}
-GROUPS=		${MUNIN_GROUP}
-
 ALL_TARGET=	build-common-prime
 INSTALL_TARGET=	install-common
 

Modified: head/sysutils/munin-common/distinfo
==============================================================================
--- head/sysutils/munin-common/distinfo	Sat Oct  6 22:04:05 2012	(r305412)
+++ head/sysutils/munin-common/distinfo	Sat Oct  6 22:10:55 2012	(r305413)
@@ -1,2 +1,2 @@
-SHA256 (munin-2.0.6.tar.gz) = ff99a3c36156adb6b867bb684ec508a857728336c0b81a93955bbcc9d5045ea6
-SIZE (munin-2.0.6.tar.gz) = 1325754
+SHA256 (munin-2.0.7.tar.gz) = 3daf42722ebd74a6269aa290b9f5821e2206df7b0fd6a39876863ff1a9b50c2e
+SIZE (munin-2.0.7.tar.gz) = 1326773

Modified: head/sysutils/munin-common/munin.mk
==============================================================================
--- head/sysutils/munin-common/munin.mk	Sat Oct  6 22:04:05 2012	(r305412)
+++ head/sysutils/munin-common/munin.mk	Sat Oct  6 22:10:55 2012	(r305413)
@@ -1,4 +1,4 @@
-MUNIN_VERSION=	2.0.6
+MUNIN_VERSION=	2.0.7
 MUNIN_SITES=	SF/${PORTNAME}/stable/${PORTVERSION}
 MUNIN_DISTINFO=	${PORTSDIR}/sysutils/munin-common/distinfo
 MUNIN_PATCHES=	${PORTSDIR}/sysutils/munin-common/files/patch-Makefile \
@@ -25,6 +25,6 @@ MUNIN_DIRS=	BINDIR=${PREFIX}/bin \
 MAKE_ARGS=	${MUNIN_DIRS} \
 		BASH=${LOCALBASE}/bin/bash \
 		PERL=${PERL} PERLLIB=${PREFIX}/${SITE_PERL_REL}
-MUNIN_USER=	munin
-MUNIN_GROUP=	munin
-PLIST_SUB=	${MUNIN_DIRS} USER=${MUNIN_USER} GROUP=${MUNIN_GROUP}
+USERS=		munin
+GROUPS=		munin
+PLIST_SUB=	${MUNIN_DIRS} USER=${USERS} GROUP=${GROUPS}

Modified: head/sysutils/munin-master/Makefile
==============================================================================
--- head/sysutils/munin-master/Makefile	Sat Oct  6 22:04:05 2012	(r305412)
+++ head/sysutils/munin-master/Makefile	Sat Oct  6 22:10:55 2012	(r305413)
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	munin-master
-# Date created:				25 Januar 2004
-# Whom:					Lupe Christoph <lupe@lupe-christoph.de>
-#
+# Created by: Lupe Christoph <lupe@lupe-christoph.de>
 # $FreeBSD$
-#
 
 PORTNAME=	munin
 PORTVERSION=	${MUNIN_VERSION}
-PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MUNIN_SITES}
 PKGNAMESUFFIX=	-master

Modified: head/sysutils/munin-node/Makefile
==============================================================================
--- head/sysutils/munin-node/Makefile	Sat Oct  6 22:04:05 2012	(r305412)
+++ head/sysutils/munin-node/Makefile	Sat Oct  6 22:10:55 2012	(r305413)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	munin-node
-# Date created:				25 Januar 2004
-# Whom:					Lupe Christoph <lupe@lupe-christoph.de>
-#
+# Created by: Lupe Christoph <lupe@lupe-christoph.de>
 # $FreeBSD$
-#
 
 PORTNAME=	munin
 PORTVERSION=	${MUNIN_VERSION}
@@ -111,9 +107,9 @@ post-install:
 	@(cd ${WRKSRC}/build/doc && for man in ${MAN8}; do \
 		${INSTALL_MAN} -C $$man ${PREFIX}/man/man8; \
 	done)
-	@${ECHO} ${PORTVERSION} > ${PREFIX}/etc/munin/VERSION.node
 	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${ECHO} ${PORTVERSION} > ${PREFIX}/etc/munin/VERSION.node
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

Modified: head/sysutils/munin-node/pkg-plist
==============================================================================
--- head/sysutils/munin-node/pkg-plist	Sat Oct  6 22:04:05 2012	(r305412)
+++ head/sysutils/munin-node/pkg-plist	Sat Oct  6 22:10:55 2012	(r305413)
@@ -1,6 +1,5 @@
 @stopdaemon munin-node
 bin/munindoc
-%%ETCDIR%%/VERSION.node
 @unexec if cmp -s %D/%%ETCDIR%%/munin-node.conf.sample %D/%%ETCDIR%%/munin-node.conf ; then rm -f %D/%%ETCDIR%%/munin-node.conf ; fi
 %%ETCDIR%%/munin-node.conf.sample
 @exec if [ ! -f %D/%%ETCDIR%%/munin-node.conf ] ; then cp -p %D/%%ETCDIR%%/munin-node.conf.sample %D/%%ETCDIR%%/munin-node.conf ; fi



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210062210.q96MAup2051388>