From owner-svn-ports-all@FreeBSD.ORG Tue Nov 19 11:48:32 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D801D12E; Tue, 19 Nov 2013 11:48:32 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B88D22A2F; Tue, 19 Nov 2013 11:48:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAJBmWxi083480; Tue, 19 Nov 2013 11:48:32 GMT (envelope-from uqs@svn.freebsd.org) Received: (from uqs@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAJBmWhL083474; Tue, 19 Nov 2013 11:48:32 GMT (envelope-from uqs@svn.freebsd.org) Message-Id: <201311191148.rAJBmWhL083474@svn.freebsd.org> From: Ulrich Spoerlein Date: Tue, 19 Nov 2013 11:48:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334304 - head/sysutils/symon 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.16 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: Tue, 19 Nov 2013 11:48:33 -0000 Author: uqs Date: Tue Nov 19 11:48:31 2013 New Revision: 334304 URL: http://svnweb.freebsd.org/changeset/ports/334304 Log: Update symon to 2.86 - add stage support - use USER framework - fix build on 10.x, by disabling the mbuf stats module Approved by: mentor (beat) Deleted: head/sysutils/symon/pkg-install Modified: head/sysutils/symon/Makefile head/sysutils/symon/distinfo head/sysutils/symon/pkg-plist Modified: head/sysutils/symon/Makefile ============================================================================== --- head/sysutils/symon/Makefile Tue Nov 19 11:16:35 2013 (r334303) +++ head/sysutils/symon/Makefile Tue Nov 19 11:48:31 2013 (r334304) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= symon -PORTVERSION= 2.85 -PORTREVISION= 1 +PORTVERSION= 2.86 CATEGORIES= sysutils MASTER_SITES= http://wpd.home.xs4all.nl/symon/philes/ \ ${MASTER_SITE_LOCAL} @@ -18,6 +17,8 @@ USES= perl5 USE_PERL5= build MAKE_JOBS_UNSAFE= yes +USERS= _symon + # Synonym for WITHOUT_SYMUX .if defined(WITHOUT_RRD) WITHOUT_SYMUX= yes @@ -34,7 +35,6 @@ IGNORE= you have defined both WITHOUT_SY SUBDIR= lib .if !defined(WITHOUT_SYMON) SUBDIR+= symon -MAN8+= symon.8 PLIST_SUB+= SYMON="" USE_RC_SUBR+= symon .else @@ -42,7 +42,6 @@ PLIST_SUB+= SYMON="@comment " .endif .if !defined(WITHOUT_SYMUX) SUBDIR+= symux -MAN8+= symux.8 PLIST_SUB+= SYMUX="" USE_RC_SUBR+= symux .else @@ -50,23 +49,18 @@ PLIST_SUB+= SYMUX="@comment " .endif SUBDIR+= client -MAKE_ARGS+= SUBDIR="${SUBDIR}" RRDDIR="${LOCALBASE}" +MAKE_ARGS+= SUBDIR="${SUBDIR}" RRDDIR="${LOCALBASE}" \ + SYSCONFDIR="${PREFIX}/etc" PREFIX="${STAGEDIR}/${PREFIX}" -NO_STAGE= yes .include post-extract: @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} -.if ${OSVERSION} < 700000 +# We need to teach symon about mbstat changes/removal in r253351 and r253361. +.if ${OSVERSION} > 1000000 post-patch: - @${REINPLACE_CMD} 's/^LIBS+=/LIBS= -pthread /' ${WRKSRC}/symux/Makefile + @${RM} ${WRKSRC}/platform/FreeBSD/sm_mbuf.c .endif -pre-install: - @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL - -post-install: - @${CAT} ${PKGMESSAGE} - .include Modified: head/sysutils/symon/distinfo ============================================================================== --- head/sysutils/symon/distinfo Tue Nov 19 11:16:35 2013 (r334303) +++ head/sysutils/symon/distinfo Tue Nov 19 11:48:31 2013 (r334304) @@ -1,2 +1,2 @@ -SHA256 (symon-2.85.tar.gz) = 547329a1efbc2408298256d31a005db23869117ccf6249c052ef662b3ee12d35 -SIZE (symon-2.85.tar.gz) = 106011 +SHA256 (symon-2.86.tar.gz) = c36457e53e91cbb478cb57d96bf40c718a8582e0b19bd4cba247002b7a6068b3 +SIZE (symon-2.86.tar.gz) = 106791 Modified: head/sysutils/symon/pkg-plist ============================================================================== --- head/sysutils/symon/pkg-plist Tue Nov 19 11:16:35 2013 (r334303) +++ head/sysutils/symon/pkg-plist Tue Nov 19 11:48:31 2013 (r334304) @@ -1,5 +1,7 @@ %%SYMON%%bin/symon +%%SYMON%%man/man8/symon.8.gz %%SYMUX%%bin/symux +%%SYMUX%%man/man8/symux.8.gz %%SYMON%%%%EXAMPLESDIR%%/symon.conf %%SYMUX%%%%EXAMPLESDIR%%/symux.conf %%SYMON%%%%DATADIR%%/c_config.sh