From owner-svn-ports-all@freebsd.org Mon Jan 9 16:40:03 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5D3A1CA7B95; Mon, 9 Jan 2017 16:40:03 +0000 (UTC) (envelope-from farrokhi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 21BC61A62; Mon, 9 Jan 2017 16:40:03 +0000 (UTC) (envelope-from farrokhi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v09Ge235070260; Mon, 9 Jan 2017 16:40:02 GMT (envelope-from farrokhi@FreeBSD.org) Received: (from farrokhi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v09Ge1A0070250; Mon, 9 Jan 2017 16:40:01 GMT (envelope-from farrokhi@FreeBSD.org) Message-Id: <201701091640.v09Ge1A0070250@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: farrokhi set sender to farrokhi@FreeBSD.org using -f From: Babak Farrokhi Date: Mon, 9 Jan 2017 16:40:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r430976 - in head: . sysutils sysutils/istatd sysutils/istatserver sysutils/istatserver/files 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.23 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: Mon, 09 Jan 2017 16:40:03 -0000 Author: farrokhi Date: Mon Jan 9 16:40:01 2017 New Revision: 430976 URL: https://svnweb.freebsd.org/changeset/ports/430976 Log: Rename sysutils/istatd to sysutils/istatserver and update to 3.01 PR: 215004 Reported by: dcarmich@dcarmichael.net Reviewed by: bapt Approved by: bapt MFH: 2017Q1 Differential Revision: https://reviews.freebsd.org/D9092 Added: head/sysutils/istatserver/ - copied from r430975, head/sysutils/istatd/ head/sysutils/istatserver/files/istatserver.in (contents, props changed) head/sysutils/istatserver/pkg-plist (contents, props changed) Deleted: head/sysutils/istatd/ head/sysutils/istatserver/files/istatd.in head/sysutils/istatserver/files/patch-istat.conf Modified: head/GIDs head/MOVED head/UIDs head/sysutils/Makefile head/sysutils/istatserver/Makefile head/sysutils/istatserver/distinfo head/sysutils/istatserver/files/pkg-message.in head/sysutils/istatserver/pkg-descr Modified: head/GIDs ============================================================================== --- head/GIDs Mon Jan 9 16:25:19 2017 (r430975) +++ head/GIDs Mon Jan 9 16:40:01 2017 (r430976) @@ -837,7 +837,7 @@ graylog:*:848: # free: 893 # free: 894 # free: 895 -# free: 896 +istat:*:896: znc:*:897: ufdb:*:898: guacamole:*:899: Modified: head/MOVED ============================================================================== --- head/MOVED Mon Jan 9 16:25:19 2017 (r430975) +++ head/MOVED Mon Jan 9 16:40:01 2017 (r430976) @@ -8975,3 +8975,4 @@ devel/rubygem-actionview|devel/rubygem-a devel/rubygem-rdoc3|devel/rubygem-rdoc|2017-01-08|Has expired: Older version no longer required devel/rubygem-activejob|devel/rubygem-activejob4|2017-01-08|Rename to match our Rails ports naming www/httpie|www/py-httpie|2017-01-09|Renamed to match upstream (PyPI) name +sysutils/istatd|sysutils/istatserver|2017-01-09|Project was renamed Modified: head/UIDs ============================================================================== --- head/UIDs Mon Jan 9 16:25:19 2017 (r430975) +++ head/UIDs Mon Jan 9 16:40:01 2017 (r430976) @@ -842,7 +842,7 @@ graylog:*:848:848::0:0:Graylog user:/non # free: 893 # free: 894 # free: 895 -# free: 896 +istat:*:896:896::0:0:istatserver user:/nonexistent:/usr/sbin/nologin znc:*:897:897::0:0:ZNC User:/nonexistent:/usr/sbin/nologin ufdb:*:898:898::0:0:ufdb user:/nonexistent:/usr/sbin/nologin guacamole:*:899:899::0:0:Guacamole user:/nonexistent:/usr/sbin/nologin Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Mon Jan 9 16:25:19 2017 (r430975) +++ head/sysutils/Makefile Mon Jan 9 16:40:01 2017 (r430976) @@ -470,7 +470,7 @@ SUBDIR += isc-cron SUBDIR += isomaster SUBDIR += isomd5sum - SUBDIR += istatd + SUBDIR += istatserver SUBDIR += jadm SUBDIR += jail-primer SUBDIR += jail2 Modified: head/sysutils/istatserver/Makefile ============================================================================== --- head/sysutils/istatd/Makefile Mon Jan 9 16:25:19 2017 (r430975) +++ head/sysutils/istatserver/Makefile Mon Jan 9 16:40:01 2017 (r430976) @@ -1,38 +1,38 @@ # Created by: Babak Farrokhi # $FreeBSD$ -PORTNAME= istatd -PORTVERSION= 0.5.8 -PORTREVISION= 1 +PORTNAME= istatserver +PORTVERSION= 3.01 CATEGORIES= sysutils -MASTER_SITES= GHC +MASTER_SITES= https://s3.amazonaws.com/bjango/files/istatserverlinux/ MAINTAINER= farrokhi@FreeBSD.org COMMENT= Daemon for iStat iPhone application -LICENSE= BSD3CLAUSE +LICENSE= BSD3CLAUSE -LIB_DEPENDS= libxml2.so:textproc/libxml2 - -USE_GITHUB= yes -GH_ACCOUNT= tiwilliam +LIB_DEPENDS= libxml2.so:textproc/libxml2 \ + libsqlite3.so:databases/sqlite3 GNU_CONFIGURE= yes USE_RC_SUBR= ${PORTNAME} -PLIST_FILES= bin/istatd etc/istat.conf-dist man/man1/istatd.1.gz \ - man/man5/istat.conf.5.gz +USERS= istat +GROUPS= istat SUB_FILES= pkg-message do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/istatd ${STAGEDIR}${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKDIR}/istatd ${STAGEDIR}${PREFIX}/etc/rc.d - ${INSTALL_DATA} ${WRKSRC}/resource/istat.conf \ - ${STAGEDIR}${PREFIX}/etc/istat.conf-dist - ${INSTALL_MAN} ${WRKSRC}/resource/istatd.1 \ - ${STAGEDIR}${MANPREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/resource/istat.conf.5 \ - ${STAGEDIR}${MANPREFIX}/man/man5 + ${INSTALL_PROGRAM} ${WRKSRC}/src/istatserver ${STAGEDIR}${PREFIX}/bin + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/istatserver + ${INSTALL_DATA} ${WRKSRC}/resource/istatserver.conf \ + ${STAGEDIR}${PREFIX}/etc/istatserver/istatserver.conf.sample + ${INSTALL_DATA} ${WRKSRC}/resource/istatserver_generated.conf \ + ${STAGEDIR}${PREFIX}/etc/istatserver/istatserver_generated.conf.sample + ${CHOWN} -R ${USERS} ${STAGEDIR}${PREFIX}/etc/istatserver + ${INSTALL_MAN} ${WRKSRC}/resource/istatserver.1 \ + ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/resource/istatserver.conf.5 \ + ${STAGEDIR}${MANPREFIX}/man/man5 .include Modified: head/sysutils/istatserver/distinfo ============================================================================== --- head/sysutils/istatd/distinfo Mon Jan 9 16:25:19 2017 (r430975) +++ head/sysutils/istatserver/distinfo Mon Jan 9 16:40:01 2017 (r430976) @@ -1,2 +1,3 @@ -SHA256 (istatd-0.5.8.tar.gz) = 6ef28191b4bdfc3dcf21ec21111853cc70e7d8fee7b0ced5d4e174b92637bf51 -SIZE (istatd-0.5.8.tar.gz) = 156112 +TIMESTAMP = 1483867105 +SHA256 (istatserver-3.01.tar.gz) = 877afd7ae09fddea95585d7d00b5ff5ea36d7afe51ed3651c5c60d8829cf180c +SIZE (istatserver-3.01.tar.gz) = 197845 Added: head/sysutils/istatserver/files/istatserver.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/istatserver/files/istatserver.in Mon Jan 9 16:40:01 2017 (r430976) @@ -0,0 +1,28 @@ +#!/bin/sh + +# PROVIDE: istatserver +# REQUIRE: LOGIN +# +# Add the following lines to /etc/rc.conf.local or /etc/rc.conf +# to enable this service: +# +# istatd_enable (bool): Set to NO by default. +# Set it to YES to enable istatd. +# + +. /etc/rc.subr + +name="istatserver" +rcvar=istatserver_enable + +command=%%PREFIX%%/bin/${name} + +load_rc_config $name + +: ${istatserver_enable="NO"} +: ${istatserver_config="%%PREFIX%%/etc/istatserver/istatserver.conf"} + +command_args="-d -c $istatserver_config" + +run_rc_command "$1" + Modified: head/sysutils/istatserver/files/pkg-message.in ============================================================================== --- head/sysutils/istatd/files/pkg-message.in Mon Jan 9 16:25:19 2017 (r430975) +++ head/sysutils/istatserver/files/pkg-message.in Mon Jan 9 16:40:01 2017 (r430976) @@ -1,6 +1,7 @@ ================================================================================ -Please copy %%PREFIX%%/etc/istat.conf-dist to %%PREFIX%%/etc/istat.conf and -change necessary variables before starting the daemon. +%%PREFIX%%/etc/istatserver/istatserver.conf is the daemon's configuration file. +Please edit the "server_code" framework with a unique numeric code for your +server. ================================================================================ Modified: head/sysutils/istatserver/pkg-descr ============================================================================== --- head/sysutils/istatd/pkg-descr Mon Jan 9 16:25:19 2017 (r430975) +++ head/sysutils/istatserver/pkg-descr Mon Jan 9 16:40:01 2017 (r430976) @@ -1,7 +1,5 @@ -istatd is a daemon serving statistics to your iStat iPhone application -from Linux, Solaris & FreeBSD. istatd collects data such as CPU, memory, +istatserver is a daemon serving statistics to your iStat iPhone application +from Linux, Solaris & FreeBSD. istatserver collects data such as CPU, memory, network and disk usage and keeps the history. Once connecting from the iPhone and entering the lock code this data will be sent to the iPhone and shown in fancy graphs. - -WWW: http://code.google.com/p/istatd/ Added: head/sysutils/istatserver/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/istatserver/pkg-plist Mon Jan 9 16:40:01 2017 (r430976) @@ -0,0 +1,5 @@ +bin/istatserver +@sample etc/istatserver/istatserver.conf.sample +@sample etc/istatserver/istatserver_generated.conf.sample +man/man1/istatserver.1.gz +man/man5/istatserver.conf.5.gz