From owner-svn-ports-all@FreeBSD.ORG Fri Jul 25 20:12:12 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 14939EE5; Fri, 25 Jul 2014 20:12:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 00F4A2947; Fri, 25 Jul 2014 20:12:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6PKCBTX045818; Fri, 25 Jul 2014 20:12:11 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6PKCBhj045816; Fri, 25 Jul 2014 20:12:11 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201407252012.s6PKCBhj045816@svn.freebsd.org> From: Dmitry Marakasov Date: Fri, 25 Jul 2014 20:12:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362927 - head/sysutils/ganglia-monitor-core X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jul 2014 20:12:12 -0000 Author: amdmi3 Date: Fri Jul 25 20:12:11 2014 New Revision: 362927 URL: http://svnweb.freebsd.org/changeset/ports/362927 QAT: https://qat.redports.org/buildarchive/r362927/ Log: - Stagify - Switch to USES=libtool, drop .la files Modified: head/sysutils/ganglia-monitor-core/Makefile head/sysutils/ganglia-monitor-core/pkg-plist Modified: head/sysutils/ganglia-monitor-core/Makefile ============================================================================== --- head/sysutils/ganglia-monitor-core/Makefile Fri Jul 25 20:09:16 2014 (r362926) +++ head/sysutils/ganglia-monitor-core/Makefile Fri Jul 25 20:12:11 2014 (r362927) @@ -2,7 +2,7 @@ PORTNAME= monitor-core PORTVERSION= 3.4.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils net parallel MASTER_SITES= SF/ganglia/ganglia%20monitoring%20core/${PORTVERSION} PKGNAMEPREFIX= ganglia- @@ -25,9 +25,8 @@ OPTIONS_DEFINE= GMETAD OPTIONS_DEFAULT= GMETAD GMETAD_DESC= include gmetad -USES= pkgconfig +USES= libtool pkgconfig USE_PYTHON= yes -USE_AUTOTOOLS= libtool LIBTOOLFILES= configure libmetrics/configure GNU_CONFIGURE= yes @@ -60,7 +59,6 @@ IGNORE= the variable GMOND_CONF must po GMOND_CONF= ${WRKDIR}/gmond.conf .endif -NO_STAGE= yes .include USE_RC_SUBR= gmond @@ -78,12 +76,6 @@ SUB_LIST+= GMETAD="\#" USE_LDCONFIG= yes -MAN1= gmetric.1 gmond.1 gstat.1 -.if ${PORT_OPTIONS:MGMETAD} -MAN1+= gmetad.1 gmetad.py.1 -.endif -MAN5= gmond.conf.5 - CONF_DIR= ${PREFIX}/etc FIX_CONF_FILES= README \ @@ -112,26 +104,25 @@ MODULES= modcpu.so \ post-patch: ${REINPLACE_CMD} -e "s|/etc/ganglia/\(gm[a-z]*d.conf\)|${PREFIX}/etc/\1|g" \ - ${FIX_CONF_FILES:S|^|${WRKSRC}/|} + ${FIX_CONF_FILES:S|^|${WRKSRC}/|} ${REINPLACE_CMD} -e "s|%%GMONDCONFDIR%%|gmond.conf.d|g" \ - ${FIX_GMOND_CONF_DIR:S|^|${WRKSRC}/|} + ${FIX_GMOND_CONF_DIR:S|^|${WRKSRC}/|} ${REINPLACE_CMD} -e "s|nobody|ganglia|g" \ - ${FIX_USER_FILES:S|^|${WRKSRC}/|} + ${FIX_USER_FILES:S|^|${WRKSRC}/|} post-build: ${WRKSRC}/gmond/gmond -t > ${WRKDIR}/gmond.conf post-install: .if ${PORT_OPTIONS:MGMETAD} - ${INSTALL_SCRIPT} ${FILESDIR}/gmetasnap.sh ${PREFIX}/sbin/gmetasnap - ${INSTALL_MAN} ${WRKSRC}/mans/gmetad.1 ${MANPREFIX}/man/man1 - ${INSTALL_DATA} ${GMETAD_CONF} ${PREFIX}/etc/gmetad.conf.sample -.endif - ${INSTALL_MAN} ${WRKSRC}/mans/gmetric.1 ${MANPREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/mans/gmond.1 ${MANPREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/gmond/gmond.conf.5 ${MANPREFIX}/man/man5 - ${INSTALL_MAN} ${WRKSRC}/mans/gstat.1 ${MANPREFIX}/man/man1 - ${INSTALL_DATA} ${GMOND_CONF} ${PREFIX}/etc/gmond.conf.sample - ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + ${INSTALL_SCRIPT} ${FILESDIR}/gmetasnap.sh ${STAGEDIR}${PREFIX}/sbin/gmetasnap + ${INSTALL_MAN} ${WRKSRC}/mans/gmetad.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_DATA} ${GMETAD_CONF} ${STAGEDIR}${PREFIX}/etc/gmetad.conf.sample +.endif + ${INSTALL_MAN} ${WRKSRC}/mans/gmetric.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/mans/gmond.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/gmond/gmond.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5 + ${INSTALL_MAN} ${WRKSRC}/mans/gstat.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_DATA} ${GMOND_CONF} ${STAGEDIR}${PREFIX}/etc/gmond.conf.sample .include Modified: head/sysutils/ganglia-monitor-core/pkg-plist ============================================================================== --- head/sysutils/ganglia-monitor-core/pkg-plist Fri Jul 25 20:09:16 2014 (r362926) +++ head/sysutils/ganglia-monitor-core/pkg-plist Fri Jul 25 20:12:11 2014 (r362927) @@ -14,10 +14,9 @@ include/gm_metric.h include/gm_msg.h include/gm_protocol.h include/gm_value.h -lib/libganglia-%%PORTVERSION%%.so lib/libganglia-%%PORTVERSION%%.so.0 +lib/libganglia-%%PORTVERSION%%.so.0.0.0 lib/libganglia.a -lib/libganglia.la lib/libganglia.so lib/ganglia/modcpu.so lib/ganglia/moddisk.so @@ -28,6 +27,12 @@ lib/ganglia/modnet.so lib/ganglia/modproc.so lib/ganglia/modpython.so lib/ganglia/modsys.so +man/man1/gmetric.1.gz +%%GMETAD%%man/man1/gmetad.1.gz +%%GMETAD%%man/man1/gmetad.py.1.gz +man/man1/gmond.1.gz +man/man1/gstat.1.gz +man/man5/gmond.conf.5.gz %%GMETAD%%sbin/gmetad %%GMETAD%%sbin/gmetasnap sbin/gmond