Index: GIDs =================================================================== --- GIDs +++ GIDs @@ -837,7 +837,7 @@ # free: 893 # free: 894 # free: 895 -# free: 896 +istat:*:896: znc:*:897: ufdb:*:898: guacamole:*:899: Index: MOVED =================================================================== --- MOVED +++ MOVED @@ -8971,3 +8971,4 @@ databases/rubygem-activemodel||2017-01-07|Has expired: Upstream support ended math/libproj4|math/proj.4|2017-01-07|Project was renamed math/proj.4||2017-01-07|math/libproj4 was already duplicated as graphics/proj +sysutils/istatd|sysutils/istatserver|2017-01-08|Project was renamed Index: UIDs =================================================================== --- UIDs +++ UIDs @@ -842,7 +842,7 @@ # 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 Index: sysutils/Makefile =================================================================== --- sysutils/Makefile +++ sysutils/Makefile @@ -470,7 +470,7 @@ SUBDIR += isc-cron SUBDIR += isomaster SUBDIR += isomd5sum - SUBDIR += istatd + SUBDIR += istatserver SUBDIR += jadm SUBDIR += jail-primer SUBDIR += jail2 Index: sysutils/istatd/Makefile =================================================================== --- sysutils/istatd/Makefile +++ sysutils/istatd/Makefile @@ -1,38 +0,0 @@ -# Created by: Babak Farrokhi -# $FreeBSD$ - -PORTNAME= istatd -PORTVERSION= 0.5.8 -PORTREVISION= 1 -CATEGORIES= sysutils -MASTER_SITES= GHC - -MAINTAINER= farrokhi@FreeBSD.org -COMMENT= Daemon for iStat iPhone application - -LICENSE= BSD3CLAUSE - -LIB_DEPENDS= libxml2.so:textproc/libxml2 - -USE_GITHUB= yes -GH_ACCOUNT= tiwilliam - -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 - -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 - -.include Index: sysutils/istatd/distinfo =================================================================== --- sysutils/istatd/distinfo +++ sysutils/istatd/distinfo @@ -1,2 +0,0 @@ -SHA256 (istatd-0.5.8.tar.gz) = 6ef28191b4bdfc3dcf21ec21111853cc70e7d8fee7b0ced5d4e174b92637bf51 -SIZE (istatd-0.5.8.tar.gz) = 156112 Index: sysutils/istatd/files/istatd.in =================================================================== --- sysutils/istatd/files/istatd.in +++ sysutils/istatd/files/istatd.in @@ -1,28 +0,0 @@ -#!/bin/sh - -# PROVIDE: istatd -# 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="istatd" -rcvar=istatd_enable - -command=%%PREFIX%%/bin/${name} - -load_rc_config $name - -: ${istatd_enable="NO"} -: ${istatd_config="%%PREFIX%%/etc/istat.conf"} - -command_args="-d -c $istatd_config" - -run_rc_command "$1" - Index: sysutils/istatd/files/patch-istat.conf =================================================================== --- sysutils/istatd/files/patch-istat.conf +++ sysutils/istatd/files/patch-istat.conf @@ -1,18 +0,0 @@ ---- resource/istat.conf.orig -+++ resource/istat.conf -@@ -5,11 +5,11 @@ - # network_addr 127.0.0.1 - # network_port 5109 - server_code 12345 --# server_user istat --# server_group istat -+server_user nobody -+server_group nobody - # server_socket /tmp/istatd.sock --# server_pid /var/run/istat/istatd.pid --# cache_dir /var/cache/istat -+server_pid /var/run/istatd.pid -+cache_dir /var/db/istatd - - # Note: Only support for one network interface, limited by client. - monitor_net ( eth0 ) Index: sysutils/istatd/files/pkg-message.in =================================================================== --- sysutils/istatd/files/pkg-message.in +++ sysutils/istatd/files/pkg-message.in @@ -1,6 +0,0 @@ -================================================================================ - -Please copy %%PREFIX%%/etc/istat.conf-dist to %%PREFIX%%/etc/istat.conf and -change necessary variables before starting the daemon. - -================================================================================ Index: sysutils/istatd/pkg-descr =================================================================== --- sysutils/istatd/pkg-descr +++ sysutils/istatd/pkg-descr @@ -1,7 +0,0 @@ -istatd is a daemon serving statistics to your iStat iPhone application -from Linux, Solaris & FreeBSD. istatd 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/ Index: sysutils/istatserver/Makefile =================================================================== --- sysutils/istatserver/Makefile +++ sysutils/istatserver/Makefile @@ -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 Index: sysutils/istatserver/distinfo =================================================================== --- sysutils/istatserver/distinfo +++ sysutils/istatserver/distinfo @@ -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 Index: sysutils/istatserver/files/istatserver.in =================================================================== --- /dev/null +++ sysutils/istatserver/files/istatserver.in @@ -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" + Index: sysutils/istatserver/files/pkg-message.in =================================================================== --- sysutils/istatserver/files/pkg-message.in +++ sysutils/istatserver/files/pkg-message.in @@ -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. ================================================================================ Index: sysutils/istatserver/pkg-descr =================================================================== --- sysutils/istatserver/pkg-descr +++ sysutils/istatserver/pkg-descr @@ -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/ Index: sysutils/istatserver/pkg-plist =================================================================== --- /dev/null +++ sysutils/istatserver/pkg-plist @@ -0,0 +1,5 @@ +bin/istatserver +etc/istatserver/istatserver.conf.sample +etc/istatserver/istatserver_generated.conf.sample +man/man1/istatserver.1.gz +man/man5/istatserver.conf.5.gz