Update to 4.2.1.21

PR: 24108
Submitted by: MAINTAINER

5 files changed, 22 insertions, 16 deletions

diff --git a/misc/upclient/Makefile b/misc/upclient/Makefile
index d8b33ce91f9e..36666efa09d1 100644
--- a/misc/upclient/Makefile
+++ b/misc/upclient/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	upclient
-PORTVERSION=	4.2.1.19
+PORTVERSION=	4.2.1.21
 CATEGORIES=	misc
-MASTER_SITES=	ftp://ftp.uptimes.net/pub/uptimes/ \
-		http://www.uptimes.net/download/ \
-		http://uptimes.atomicvoid.net/
+MASTER_SITES=	http://uptimes.atomicvoid.net/files/ \
+		ftp://ftp.uptimes.net/pub/uptimes/ \
+		http://www.uptimes.net/download/
 
 MAINTAINER=	clefevre@citeweb.net
 
diff --git a/misc/upclient/distinfo b/misc/upclient/distinfo
index f00db859371e..4bde50c22634 100644
--- a/misc/upclient/distinfo
+++ b/misc/upclient/distinfo
@@ -1 +1 @@
-MD5 (upclient-4.2.1.19.tar.gz) = c832a7885de2a20e2427bddfacd09d37
+MD5 (upclient-4.2.1.21.tar.gz) = 5b6ceecabb36921bbcf7dd6eebdb73c2
diff --git a/misc/upclient/files/patch-ab b/misc/upclient/files/patch-ab
index b423a9795820..1f1af4045616 100644
--- a/misc/upclient/files/patch-ab
+++ b/misc/upclient/files/patch-ab
@@ -1,6 +1,6 @@
---- upclient.conf.orig	Mon Dec 18 14:19:35 2000
-+++ upclient.conf	Sat Dec 30 00:37:19 2000
-@@ -4,7 +4,7 @@
+--- upclient.conf.orig	Wed Dec 27 00:48:16 2000
++++ upclient.conf	Sat Dec 30 06:11:27 2000
+@@ -4,11 +4,11 @@
  # upclient.conf
  #
  
@@ -8,4 +8,9 @@
 +PidFile = /var/run/upclient.pid		# Location of pid file
  
  AuthKey = <your_authkey>		# Your Authorization key
- Interval = 120				# Transmit interval
+ 
+-Interval	= 120			# Transmit interval
++Interval	= 550			# Transmit interval
+ UptimeServer	= data.uptimes.net	# Uptimes Project's data server
+ 
+ SendIdleTime	= 1			# Send your idle time
diff --git a/misc/upclient/files/patch-options.c b/misc/upclient/files/patch-options.c
index 6adf0f6e35a6..c6773e9241af 100644
--- a/misc/upclient/files/patch-options.c
+++ b/misc/upclient/files/patch-options.c
@@ -1,5 +1,5 @@
---- src/options.c.orig	Mon Dec 18 02:20:24 2000
-+++ src/options.c	Sat Dec 30 02:48:01 2000
+--- src/options.c.orig	Wed Dec 27 00:41:53 2000
++++ src/options.c	Sat Dec 30 06:09:57 2000
 @@ -23,11 +23,7 @@
  int  cfg_proxyport				= 8080;
  char cfg_proxyuser[PROXYUSER_MAXLEN+1]		= "";
@@ -12,15 +12,15 @@
  #if defined(PLATFORM_UNIXWARE)
  int  cfg_sendload	= 0;
  #else
-@@ -99,11 +95,7 @@
-   else if(strcmp(key, "PidFile") == 0)
+@@ -124,11 +120,7 @@
      strcpy(cfg_pidfile, value);
-   else if(strcmp(key, "SendIdleTime") == 0)
+   }
+   else if(strcmp(key, "SendIdleTime") == 0) {
 -#if defined(PLATFORM_BSD)
 -    ;
 -#else
      cfg_sendidle = atol(value);
 -#endif
-   else if(strcmp(key, "SendLoadAvg") == 0)
+   }
+   else if(strcmp(key, "SendLoadAvg") == 0) {
  #if defined(PLATFORM_UNIXWARE)
-     ;
diff --git a/misc/upclient/pkg-message b/misc/upclient/pkg-message
index d223b08fe0b2..0e97ac3c3267 100644
--- a/misc/upclient/pkg-message
+++ b/misc/upclient/pkg-message
@@ -19,6 +19,7 @@ You will also have to edit /usr/local/etc/upclient.conf:
 	(WWW: http://www.uptimes.net/bottom.html?show=hosts).
 
   - Interval is the amount of time between each update.
+	(WWW: http://www.uptimes.net/stuff/protocol.html)
 
     Don't set this higher than 10 minutes, or else your host
     won't appear in the list.