Attachment 177603 Details for Bug 215004 – This is a patch to the port to build iStat Server 3.

This is a patch to the port to build iStat Server 3.

istatserver-3.0p1-port.patch.txt (text/plain), 6.57 KB, created by Douglas Carmichael on 2016-12-02 14:34:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Douglas Carmichael

Created: 2016-12-02 14:34:15 UTC

Size: 6.57 KB

patch

obsolete

>diff -ruN istatd/Makefile istatserver/Makefile
>--- istatd/Makefile	2016-04-01 10:25:16.000000000 -0400
>+++ istatserver/Makefile	2016-12-02 09:06:09.762940000 -0500
>@@ -1,38 +1,43 @@
> # Created by: Babak Farrokhi <farrokhi@FreeBSD.org>
> # $FreeBSD: head/sysutils/istatd/Makefile 412349 2016-04-01 14:25:16Z mat $
> 
>-PORTNAME=	istatd
>-PORTVERSION=	0.5.8
>+PORTNAME=	istatserver
>+PORTVERSION=	3.01
> PORTREVISION=	1
> 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
> 
>-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
>+USE_RC_SUBR=    ${PORTNAME}
>+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 \
>+	${INSTALL_PROGRAM} ${WRKSRC}/src/istatserver ${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_SCRIPT} ${WRKDIR}/istatserver ${STAGEDIR}${PREFIX}/etc/rc.d
>+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/istatserver
>+	${INSTALL_DATA} ${WRKSRC}/resource/istatserver.conf \
>+		${STAGEDIR}${PREFIX}/etc/istatserver/istatserver.conf
>+	${INSTALL_DATA} ${WRKSRC}/resource/istatserver_generated.conf \
>+		${STAGEDIR}${PREFIX}/etc/istatserver/istatserver_generated.conf
>+	${INSTALL_MAN} ${WRKSRC}/resource/istatserver.1 \
> 		${STAGEDIR}${MANPREFIX}/man/man1
>-	${INSTALL_MAN} ${WRKSRC}/resource/istat.conf.5 \
>+	${INSTALL_MAN} ${WRKSRC}/resource/istatserver.conf.5 \
> 		${STAGEDIR}${MANPREFIX}/man/man5
> 
>+post-install:
>+	${CHOWN} istat ${PREFIX}/etc/istatserver
>+
>+post-deinstall:
>+	${RMDIR} ${PREFIX}/etc/istatserver
>+
> .include <bsd.port.mk>
>diff -ruN istatd/distinfo istatserver/distinfo
>--- istatd/distinfo	2014-03-03 19:43:46.000000000 -0500
>+++ istatserver/distinfo	2016-11-28 16:35:12.107697000 -0500
>@@ -1,2 +1,3 @@
>-SHA256 (istatd-0.5.8.tar.gz) = 6ef28191b4bdfc3dcf21ec21111853cc70e7d8fee7b0ced5d4e174b92637bf51
>-SIZE (istatd-0.5.8.tar.gz) = 156112
>+TIMESTAMP = 1480361225
>+SHA256 (istatserver-3.01.tar.gz) = 877afd7ae09fddea95585d7d00b5ff5ea36d7afe51ed3651c5c60d8829cf180c
>+SIZE (istatserver-3.01.tar.gz) = 197845
>diff -ruN istatd/files/istatd.in istatserver/files/istatd.in
>--- istatd/files/istatd.in	2014-01-23 19:14:07.000000000 -0500
>+++ istatserver/files/istatd.in	1969-12-31 19:00:00.000000000 -0500
>@@ -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"
>-
>diff -ruN istatd/files/istatserver.in istatserver/files/istatserver.in
>--- istatd/files/istatserver.in	1969-12-31 19:00:00.000000000 -0500
>+++ istatserver/files/istatserver.in	2016-11-28 16:35:12.109048000 -0500
>@@ -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"
>+
>diff -ruN istatd/files/patch-istat.conf istatserver/files/patch-istat.conf
>--- istatd/files/patch-istat.conf	2014-01-22 12:40:44.000000000 -0500
>+++ istatserver/files/patch-istat.conf	1969-12-31 19:00:00.000000000 -0500
>@@ -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 -ruN istatd/files/pkg-message.in istatserver/files/pkg-message.in
>--- istatd/files/pkg-message.in	2016-05-19 07:09:14.000000000 -0400
>+++ istatserver/files/pkg-message.in	2016-11-28 16:35:12.109615000 -0500
>@@ -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 -ruN istatd/pkg-descr istatserver/pkg-descr
>--- istatd/pkg-descr	2014-03-03 08:12:26.000000000 -0500
>+++ istatserver/pkg-descr	2016-11-29 06:20:01.094993000 -0500
>@@ -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/
>diff -ruN istatd/pkg-plist istatserver/pkg-plist
>--- istatd/pkg-plist	1969-12-31 19:00:00.000000000 -0500
>+++ istatserver/pkg-plist	2016-11-28 18:07:15.580995000 -0500
>@@ -0,0 +1,6 @@
>+bin/istatserver
>+etc/istatserver/istatserver.conf
>+etc/istatserver/istatserver_generated.conf
>+etc/rc.d/istatserver
>+man/man1/istatserver.1.gz
>+man/man5/istatserver.conf.5.gz

Actions: View

Attachments on bug 215004: 177603