Index: head/sysutils/munin-common/Makefile =================================================================== --- head/sysutils/munin-common/Makefile (revision 424765) +++ head/sysutils/munin-common/Makefile (revision 424766) @@ -1,30 +1,28 @@ # Created by: Sean Rees # $FreeBSD$ PORTNAME= munin PORTVERSION= ${MUNIN_VERSION} -PORTREVISION= 2 CATEGORIES= sysutils perl5 MASTER_SITES= ${MUNIN_SITES} PKGNAMESUFFIX= -common MAINTAINER= mat@FreeBSD.org COMMENT= Common components between a munin node and server BUILD_DEPENDS= p5-Module-Build>=0:devel/p5-Module-Build \ p5-Net-SSLeay>=0:security/p5-Net-SSLeay RUN_DEPENDS= p5-Net-SSLeay>=0:security/p5-Net-SSLeay USES= gmake perl5 cpe -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/} .include "${.CURDIR}/../munin-common/munin.mk" ALL_TARGET= build-common-prime INSTALL_TARGET= install-common NO_ARCH= yes post-install: ${MKDIR} ${STAGEDIR}${LOGDIR} ${STAGEDIR}${STATEDIR} ${STAGEDIR}${SPOOLDIR} ${STAGEDIR}${DBDIR} .include Index: head/sysutils/munin-common/distinfo =================================================================== --- head/sysutils/munin-common/distinfo (revision 424765) +++ head/sysutils/munin-common/distinfo (revision 424766) @@ -1,2 +1,3 @@ -SHA256 (munin-2.0.25.tar.gz) = 6832bc5839d03639e4309178d9370697fc8a80a83d9b6653953f40161e949694 -SIZE (munin-2.0.25.tar.gz) = 1337586 +TIMESTAMP = 1477576389 +SHA256 (munin-2.0.26.tar.gz) = fb5fff319820e63b1107528e8302f0e0f1a29a710a3af1b8e281cc6c3c34bb84 +SIZE (munin-2.0.26.tar.gz) = 1338865 Index: head/sysutils/munin-common/munin.mk =================================================================== --- head/sysutils/munin-common/munin.mk (revision 424765) +++ head/sysutils/munin-common/munin.mk (revision 424766) @@ -1,36 +1,36 @@ -MUNIN_VERSION= 2.0.25 -MUNIN_SITES= SF/${PORTNAME}/stable/${MUNIN_VERSION} +MUNIN_VERSION= 2.0.26 +MUNIN_SITES= http://downloads.munin-monitoring.org/munin/stable/${MUNIN_VERSION}/ DISTINFO_FILE= ${PORTSDIR}/sysutils/munin-common/distinfo PATCHDIR= ${.CURDIR}/../../sysutils/munin-common/files -PORTSCOUT= limit:^2\.0\. +PORTSCOUT= limitw:1,even DBDIR?= /var/${PORTNAME} DBDIRNODE?= /var/${PORTNAME} LOGDIR?= /var/log/${PORTNAME} STATEDIR?= /var/run/${PORTNAME} SPOOLDIR?= /var/spool/${PORTNAME} MUNIN_DIRS= BINDIR=${PREFIX}/bin \ CGIDIR=${PREFIX}/www/cgi-bin \ CONFDIR=${ETCDIR} \ DBDIR=${DBDIR} \ DBDIRNODE=${DBDIRNODE} \ DOCDIR=${DOCSDIR} \ HTMLDIR=${WWWDIR} \ LIBDIR=${DATADIR} \ LOGDIR=${LOGDIR} \ MANDIR=${MANPREFIX}/man \ SBINDIR=${PREFIX}/sbin \ STATEDIR=${STATEDIR} \ SPOOLDIR=${SPOOLDIR} MAKE_ARGS= ${MUNIN_DIRS} \ BASH=${LOCALBASE}/bin/bash \ PERL=${PERL} PERLLIB=${PREFIX}/${SITE_PERL_REL} USERS= munin GROUPS= munin PLIST_SUB= ${MUNIN_DIRS} USER=${USERS} GROUP=${GROUPS} SUB_LIST= ${MUNIN_DIRS} USER=${USERS} GROUP=${GROUPS} CPE_VENDOR= munin-monitoring MAKE_JOBS_UNSAFE= Try to use things before making thems. Index: head/sysutils/munin-master/Makefile =================================================================== --- head/sysutils/munin-master/Makefile (revision 424765) +++ head/sysutils/munin-master/Makefile (revision 424766) @@ -1,66 +1,65 @@ # Created by: Lupe Christoph # $FreeBSD$ PORTNAME= munin PORTVERSION= ${MUNIN_VERSION} -PORTREVISION= 5 CATEGORIES= sysutils perl5 MASTER_SITES= ${MUNIN_SITES} PKGNAMESUFFIX= -master MAINTAINER= mat@FreeBSD.org COMMENT= Collector part of Munin BUILD_DEPENDS= p5-Module-Build>=0:devel/p5-Module-Build \ munin-common>=0:sysutils/munin-common \ rrdtool>=0:databases/rrdtool \ p5-Storable>=0:devel/p5-Storable \ p5-CGI>=0:www/p5-CGI \ p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \ p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \ p5-Getopt-Long>=0:devel/p5-Getopt-Long \ p5-HTML-Template>=0:www/p5-HTML-Template \ p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6 \ p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \ p5-Net-SSLeay>=0:security/p5-Net-SSLeay \ p5-Params-Validate>=0:devel/p5-Params-Validate \ p5-Text-Balanced>=0:textproc/p5-Text-Balanced RUN_DEPENDS= munin-common>=0:sysutils/munin-common \ rrdtool>=0:databases/rrdtool \ p5-CGI>=0:www/p5-CGI \ p5-Storable>=0:devel/p5-Storable \ p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \ p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \ p5-Getopt-Long>=0:devel/p5-Getopt-Long \ p5-HTML-Template>=0:www/p5-HTML-Template \ p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6 \ p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \ p5-Net-SSLeay>=0:security/p5-Net-SSLeay \ p5-Params-Validate>=0:devel/p5-Params-Validate \ p5-Text-Balanced>=0:textproc/p5-Text-Balanced \ p5-URI>=0:net/p5-URI \ p5-Date-Manip>=0:devel/p5-Date-Manip \ p5-FCGI>=0:www/p5-FCGI USES= gmake perl5 cpe PKGMESSAGE= ${WRKDIR}/pkg-message .include "${.CURDIR}/../munin-common/munin.mk" ALL_TARGET= infiles build-master build-man INSTALL_TARGET= install-master-prime NO_ARCH= yes SUB_FILES= pkg-message PLIST_SUB+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} post-install: (cd ${WRKSRC}/build/doc; \ ${INSTALL_MAN} munin.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5; \ ${INSTALL_MAN} munin-cron.8 munin-graph.8 munin-html.8 munin-limits.8 munin-update.8 ${STAGEDIR}${MAN8PREFIX}/man/man8; \ ) (cd ${STAGEDIR}${ETCDIR}; for i in `find . -type f`; do mv $$i $$i.sample; done) ${MV} ${STAGEDIR}${WWWDIR}/.htaccess ${STAGEDIR}${WWWDIR}/.htaccess.sample .include Index: head/sysutils/munin-node/Makefile =================================================================== --- head/sysutils/munin-node/Makefile (revision 424765) +++ head/sysutils/munin-node/Makefile (revision 424766) @@ -1,89 +1,88 @@ # Created by: Lupe Christoph # $FreeBSD$ PORTNAME= munin PORTVERSION= ${MUNIN_VERSION} -PORTREVISION= 8 CATEGORIES= sysutils perl5 MASTER_SITES= ${MUNIN_SITES} PKGNAMESUFFIX= -node MAINTAINER= mat@FreeBSD.org COMMENT= Node-specific part of Munin BUILD_DEPENDS= p5-Module-Build>=0:devel/p5-Module-Build \ p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \ munin-common>=0:sysutils/munin-common \ p5-Net-Server>=0:net/p5-Net-Server \ bash:shells/bash RUN_DEPENDS= p5-Cache-Cache>=0:devel/p5-Cache-Cache \ p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \ munin-common>=0:sysutils/munin-common \ p5-Net-Server>=0:net/p5-Net-Server \ p5-Net-CIDR>=0:net-mgmt/p5-Net-CIDR \ p5-libwww>=0:www/p5-libwww \ bash:shells/bash USES= gmake perl5 shebangfix cpe PKGMESSAGE= ${WRKDIR}/pkg-message REINPLACE_ARGS= -i "" SHEBANG_FILES= node/sbin/munin-node node/sbin/munin-sched \ node/sbin/munin-run node/sbin/munin-node-configure .include "${.CURDIR}/../munin-common/munin.mk" ALL_TARGET= build-node build-plugins build/node/_bin/munin-async build/node/_bin/munin-asyncd INSTALL_TARGET= install-node-prime install-async-prime install-plugins-prime NO_ARCH= yes OPTIONS_DEFINE= SNMP PERL JAVA OPTIONS_DEFAULT= SNMP PERL OPTIONS_SUB= yes SNMP_DESC= Include SNMP plugins PERL_DESC= Include all Perl modules (adds dependencies) JAVA_DESC= Include JAVA plugins SNMP_BUILD_DEPENDS= p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP SNMP_RUN_DEPENDS= p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP PERL_RUN_DEPENDS= p5-DBD-Pg>=0:databases/p5-DBD-Pg \ p5-Net-DNS>=0:dns/p5-Net-DNS \ p5-XML-Parser>=0:textproc/p5-XML-Parser \ p5-XML-LibXML>=0:textproc/p5-XML-LibXML JAVA_USE= java=yes JAVA_INSTALL_TARGET= install-plugins-java JAVA_BUILD= yes JAVA_RUN= yes SUB_FILES= pkg-message plugins.conf USE_RC_SUBR= munin-asyncd munin-node munin-sched post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/node/sbin/munin-node \ ${WRKSRC}/node/sbin/munin-node-configure \ ${WRKSRC}/node/sbin/munin-run @${REINPLACE_CMD} \ -e 's|^\(BASH[[:space:]]*:=\).*|\1 ${bash_CMD}|' \ -e 's|^\(JAVARUN[[:space:]]*:=\).*|\1 ${java_CMD}|' \ -e 's|^\(PERL[[:space:]]*:=\).*|\1 ${perl_CMD}|' \ -e 's|^\(PYTHON[[:space:]]*:=\).*|\1 ${python_CMD}|' \ -e 's|^\(RUBY[[:space:]]*:=\).*|\1 ${ruby_CMD}|' \ ${WRKSRC}/Makefile.config @${FIND} ${WRKSRC}/node/sbin -type f -name "*.orig" -delete post-install: ${MKDIR} ${STAGEDIR}${DBDIR}/plugin-state ${STAGEDIR}${SPOOLDIR}/async ${INSTALL_SCRIPT} ${.CURDIR}/plugins/* ${STAGEDIR}${DATADIR}/plugins/ ${INSTALL_DATA} ${WRKSRC}/build/node/munin-node.conf \ ${STAGEDIR}${ETCDIR}/munin-node.conf.sample ${INSTALL_DATA} ${WRKDIR}/plugins.conf \ ${STAGEDIR}${ETCDIR}/plugin-conf.d/plugins.conf.sample (cd ${WRKSRC}/node/blib/bindoc; \ ${INSTALL_MAN} munin-node-configure.1 munin-node.1 munin-run.1 munin-sched.1 munindoc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1; \ ) (cd ${WRKSRC}/build/doc; \ ${INSTALL_MAN} munin-node.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5; \ ${INSTALL_MAN} munin.8 ${STAGEDIR}${MAN8PREFIX}/man/man8; \ ) .include