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
author: Babak Farrokhi <farrokhi@FreeBSD.org> 2017-01-09 16:40:01 +0000
committer: Babak Farrokhi <farrokhi@FreeBSD.org> 2017-01-09 16:40:01 +0000
commit: 0274aab9394f67aa6134db3261f7797d04fc9388 (patch)
tree: 844aa1c1162dd58004e8448421c37eaa24114a52
parent: 4d76d4228d33e49a70d4826f87e7c6f35704ddc3 (diff)
download: freebsd-ports-0274aab9394f67aa6134db3261f7797d04fc9388.zip
14 files changed, 64 insertions, 76 deletions
diff --git a/GIDs b/GIDs
index c21f44bb84f8..8fd788a7908d 100644
--- a/GIDs
+++ b/GIDs
@@ -837,7 +837,7 @@ graylog:*:848:
 # free: 893
 # free: 894
 # free: 895
-# free: 896
+istat:*:896:
 znc:*:897:
 ufdb:*:898:
 guacamole:*:899:
diff --git a/MOVED b/MOVED
index 4cca14e34900..749c71641b46 100644
--- a/MOVED
+++ b/MOVED
@@ -8975,3 +8975,4 @@ devel/rubygem-actionview|devel/rubygem-actionview4|2017-01-08|Rename to match ou
 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
diff --git a/UIDs b/UIDs
index 77eb8794173a..5244049b03b4 100644
--- a/UIDs
+++ b/UIDs
@@ -842,7 +842,7 @@ graylog:*:848:848::0:0:Graylog user:/nonexistent:/usr/sbin/nologin
 # 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
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 67e5f799a4a3..5d02af3d4bb1 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -470,7 +470,7 @@
     SUBDIR += isc-cron
     SUBDIR += isomaster
     SUBDIR += isomd5sum
-    SUBDIR += istatd
+    SUBDIR += istatserver
     SUBDIR += jadm
     SUBDIR += jail-primer
     SUBDIR += jail2
diff --git a/sysutils/istatd/Makefile b/sysutils/istatd/Makefile
deleted file mode 100644
index 9b0f74257b1a..000000000000
--- a/sysutils/istatd/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Created by: Babak Farrokhi <farrokhi@FreeBSD.org>
-# $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 <bsd.port.mk>
diff --git a/sysutils/istatd/distinfo b/sysutils/istatd/distinfo
deleted file mode 100644
index 0ddabb189466..000000000000
--- a/sysutils/istatd/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (istatd-0.5.8.tar.gz) = 6ef28191b4bdfc3dcf21ec21111853cc70e7d8fee7b0ced5d4e174b92637bf51
-SIZE (istatd-0.5.8.tar.gz) = 156112
diff --git a/sysutils/istatd/files/patch-istat.conf b/sysutils/istatd/files/patch-istat.conf
deleted file mode 100644
index 979251bde475..000000000000
--- a/sysutils/istatd/files/patch-istat.conf
+++ /dev/null
@@ -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 )
diff --git a/sysutils/istatd/pkg-descr b/sysutils/istatd/pkg-descr
deleted file mode 100644
index 33c43a22a5c0..000000000000
--- a/sysutils/istatd/pkg-descr
+++ /dev/null
@@ -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/
diff --git a/sysutils/istatserver/Makefile b/sysutils/istatserver/Makefile
new file mode 100644
index 000000000000..ec5cc4da3052
--- /dev/null
+++ b/sysutils/istatserver/Makefile
@@ -0,0 +1,38 @@
+# Created by: Babak Farrokhi <farrokhi@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	istatserver
+PORTVERSION=	3.01
+CATEGORIES=	sysutils
+MASTER_SITES=	https://s3.amazonaws.com/bjango/files/istatserverlinux/
+
+MAINTAINER=	farrokhi@FreeBSD.org
+COMMENT=	Daemon for iStat iPhone application
+
+LICENSE=	BSD3CLAUSE
+
+LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
+		libsqlite3.so:databases/sqlite3
+
+GNU_CONFIGURE=	yes
+USE_RC_SUBR=	${PORTNAME}
+
+USERS=	istat
+GROUPS=	istat
+
+SUB_FILES=	pkg-message
+
+do-install:
+	${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 <bsd.port.mk>
diff --git a/sysutils/istatserver/distinfo b/sysutils/istatserver/distinfo
new file mode 100644
index 000000000000..29f90e0285fa
--- /dev/null
+++ b/sysutils/istatserver/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1483867105
+SHA256 (istatserver-3.01.tar.gz) = 877afd7ae09fddea95585d7d00b5ff5ea36d7afe51ed3651c5c60d8829cf180c
+SIZE (istatserver-3.01.tar.gz) = 197845
diff --git a/sysutils/istatd/files/istatd.in b/sysutils/istatserver/files/istatserver.in
index 73b7be928235..f1bac571b524 100644
--- a/sysutils/istatd/files/istatd.in
+++ b/sysutils/istatserver/files/istatserver.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# PROVIDE: istatd
+# PROVIDE: istatserver
 # REQUIRE: LOGIN
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
@@ -12,17 +12,17 @@
 
 . /etc/rc.subr
 
-name="istatd"
-rcvar=istatd_enable
+name="istatserver"
+rcvar=istatserver_enable
 
 command=%%PREFIX%%/bin/${name}
 
 load_rc_config $name
 
-: ${istatd_enable="NO"}
-: ${istatd_config="%%PREFIX%%/etc/istat.conf"}
+: ${istatserver_enable="NO"}
+: ${istatserver_config="%%PREFIX%%/etc/istatserver/istatserver.conf"}
 
-command_args="-d -c $istatd_config"
+command_args="-d -c $istatserver_config"
 
 run_rc_command "$1"
 
diff --git a/sysutils/istatd/files/pkg-message.in b/sysutils/istatserver/files/pkg-message.in
index 7340e84f2e9d..f181f859262e 100644
--- a/sysutils/istatd/files/pkg-message.in
+++ b/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.
 
 ================================================================================
diff --git a/sysutils/istatserver/pkg-descr b/sysutils/istatserver/pkg-descr
new file mode 100644
index 000000000000..384fe5072756
--- /dev/null
+++ b/sysutils/istatserver/pkg-descr
@@ -0,0 +1,5 @@
+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.
diff --git a/sysutils/istatserver/pkg-plist b/sysutils/istatserver/pkg-plist
new file mode 100644
index 000000000000..2ce2a11e6519
--- /dev/null
+++ b/sysutils/istatserver/pkg-plist
@@ -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
author	Babak Farrokhi <farrokhi@FreeBSD.org>	2017-01-09 16:40:01 +0000
committer	Babak Farrokhi <farrokhi@FreeBSD.org>	2017-01-09 16:40:01 +0000
commit	0274aab9394f67aa6134db3261f7797d04fc9388 (patch)
tree	844aa1c1162dd58004e8448421c37eaa24114a52
parent	4d76d4228d33e49a70d4826f87e7c6f35704ddc3 (diff)
download	freebsd-ports-0274aab9394f67aa6134db3261f7797d04fc9388.zip