1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00

Update to 5.0.b7 and various small changes.

PR:		47869
Submitted by:	Cyrille Lefevre <cyrille.lefevre@laposte.net>
This commit is contained in:
Christian Weisgerber 2003-02-14 00:16:51 +00:00
parent 3a0e8c9f67
commit 528f5193e7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=75484
7 changed files with 32 additions and 37 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= upclient
PORTVERSION= 5.0.b6
PORTVERSION= 5.0.b7
CATEGORIES= misc
MASTER_SITES= http://uptimes.wonko.com/files/
DISTNAME= ${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
@ -19,7 +19,6 @@ MAINTAINER= cyrille.lefevre@laposte.net
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext
USE_REINPLACE= yes
USE_GMAKE= yes
ALL_TARGET= bsd
BUILD_WRKSRC= ${WRKSRC}/src
@ -74,7 +73,7 @@ install-man:
${MAN8PREFIX}/man/man8
install-sample:
@${INSTALL_DATA} -m 600 ${WRKSRC}/src/products/upclient.conf \
@${INSTALL_DATA} -g kmem -m 640 ${WRKSRC}/src/products/upclient.conf \
${PREFIX}/etc/upclient.conf.sample
install-script:

View File

@ -1 +1 @@
MD5 (upclient-5.0b6.tar.gz) = 3d4c45addb947a51deabf2205188b82e
MD5 (upclient-5.0b7.tar.gz) = ad56ed3309ce2fadae1f2c0339a4bc80

View File

@ -1,33 +1,35 @@
--- src/Makefile.orig Sat Nov 30 03:29:55 2002
+++ src/Makefile Wed Dec 18 01:29:34 2002
--- src/Makefile.orig Wed Dec 18 01:01:16 2002
+++ src/Makefile Mon Feb 3 20:18:03 2003
@@ -34,7 +34,7 @@
#
PROGRAMNAME = upclient
# UPCLIENT_VERSION = "5.0b6"
PROGRAMNAME = UpClient
# UPCLIENT_VERSION = "5.0b7"
- UPCLIENT_VERSION = `grep '\#define UPCLIENT_VERSION ' version.h | sed -e 's@\#define UPCLIENT_VERSION @@g' | tr -d '"'`
+ UPCLIENT_VERSION = `sed -n 's/"//g;/\#define UPCLIENT_VERSION /s///p' version.h`
################################################################################
+ UPCLIENT_VERSION = `sed -n 's/"//g;/\#define UPCLIENT_VERSION /s///p' version.h`
#########################################################################
binname = upclient
@@ -44,7 +44,7 @@
@@ -46,7 +46,7 @@
OPTIMIZATION_CFLAGS=-O3
# System directories
-prefix = /usr/local
+prefix = %%PREFIX%%
#prefix = /sw
#prefix = /opt/${PROGRAMNAME}
@@ -55,7 +55,7 @@
sbindir = ${exec_prefix}/sbin
#prefix = /opt/${binname}
#prefix = /tmp/upclient
@@ -59,8 +59,8 @@
datadir = ${prefix}/share
sysconfdir = ${prefix}/etc
#sysconfdir = /etc
-localstatedir = ${prefix}/var
-#localstatedir = /var
+#localstatedir = ${prefix}/var
+localstatedir = /var
destdir=
# Further Reading
# Filesystem Hierarchy Standard 2.2 May 24, 2001
@@ -82,9 +82,9 @@
@@ -90,9 +90,9 @@
## [x86] FreeBSD (4.7-RC)
## assumes gettext installed in /usr/local

View File

@ -2,7 +2,7 @@
+++ src/conf/upclient.conf Wed Dec 18 02:31:09 2002
@@ -9,7 +9,7 @@
AuthKey = <your_authkey> # Your Authorization key
AuthKey = your_authkey # Your Authorization key
-Interval = 300 # Transmit interval
+Interval = 550 # Transmit interval

View File

@ -1,5 +1,5 @@
--- src/stats-bsd.c.orig Sat Nov 30 03:27:16 2002
+++ src/stats-bsd.c Wed Dec 18 03:28:16 2002
--- src/stats-bsd.c.orig Wed Dec 18 01:01:17 2002
+++ src/stats-bsd.c Mon Feb 3 20:20:12 2003
@@ -64,6 +64,8 @@
#include "locale.h" /* gettext */
@ -67,17 +67,8 @@
}
#if !defined __MACH__ /* Mach kernel stuff is in stats-mach.c */
@@ -245,7 +245,7 @@
for (state = 0; state < CPUSTATES; state++) {
time += ctime[state] - stime[state];
- if (!(state == CPU_STATE_IDLE)) {
+ if (!(state == CP_IDLE)) {
nonidlecpu += (float)(ctime[state] - stime[state]);
}
}
@@ -258,6 +258,10 @@
@@ -259,6 +259,10 @@
/* store values for next calculation interval */
for (state = 0; state < CPUSTATES; state++)
stime[state] = ctime[state];
+#if defined DEBUG
@ -87,7 +78,7 @@
}
}
else {
@@ -268,17 +272,13 @@
@@ -269,17 +273,13 @@
cfg_SendUsage = 0;
cfg_SendIdle = 0;
}
@ -106,7 +97,7 @@
boottimesecs = initBoottime();
@@ -293,7 +293,7 @@
@@ -294,7 +294,7 @@
#endif /* DEBUG */
}
else {
@ -115,7 +106,7 @@
"getUptime() boottime.tv_sec");
}
}
@@ -306,19 +306,18 @@
@@ -307,19 +307,18 @@
double *IdlePercent, char *osname, char *osversion, char *cpu,
double *loadavg)
{

View File

@ -49,7 +49,7 @@ start)
"${config_path}."
exit 72
fi
if grep -qs "^[$ws]*AuthKey[$ws]*=[$ws]*<your_authkey>" ${config_path}
if grep -qs "^[$ws]*AuthKey[$ws]*=[$ws]*your_authkey" ${config_path}
then
logger -sp ${syslog_facility} -t ${program_file} \
"unable to start: AuthKey isn't configured in" \

View File

@ -16,5 +16,8 @@ sbin/upclient
%%PORTDOCS%%share/doc/upclient/TODO
%%PORTDOCS%%share/doc/upclient/UptimesProtocol5
share/locale/de/LC_MESSAGES/upclient.mo
share/locale/es/LC_MESSAGES/upclient.mo
share/locale/fr/LC_MESSAGES/upclient.mo
share/locale/it/LC_MESSAGES/upclient.mo
share/locale/nl/LC_MESSAGES/upclient.mo
%%PORTDOCS%%@dirrm share/doc/upclient