Make this package match reality (V4.07).

A big THANKS to who told me that our client is upto date some weeks ago...

3 files changed, 61 insertions, 61 deletions

diff --git a/net/upclient/patches/patch-aa b/net/upclient/patches/patch-aa
index a8f3e0b0d88..3c01c11963e 100644
--- a/net/upclient/patches/patch-aa
+++ b/net/upclient/patches/patch-aa
@@ -1,36 +1,45 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/04/06 20:10:00 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2000/01/21 01:35:43 hubertf Exp $
 
---- Makefile.orig	Sat Apr  3 11:47:04 1999
-+++ Makefile	Sun Apr  4 06:31:51 1999
-@@ -1,7 +1,7 @@
- # Uptime Client Makefile
- 
- # Location of config file (for example /etc/upclient.conf)
--CONFIGFILE = upclient.conf
-+CONFIGFILE = ${PREFIX}/etc/upclient.conf
- 
- 
- ################
-@@ -13,7 +13,7 @@
- 	@echo "You must specify the system which you want to compile for:"
- 	@echo ""
- 	@echo "make linux		Linux"
--	@echo "make freebsd		FreeBSD"
-+	@echo "make bsd		FreeBSD, NetBSD, OpenBSD, BSDi
- 	@echo "make solaris		Solaris"
- 	@echo ""
- 
-@@ -24,11 +24,11 @@
- 		CFLAGS='-DLINUX -DCONFIGFILE=\"$(CONFIGFILE)\"' \
- 		upclient
- 
--freebsd:
-+bsd:
- 	$(MAKE) CC=gcc \
- 		LDFLAGS= \
- 		OBJECTS= \
--		CFLAGS='-DFREEBSD -DCONFIGFILE=\"$(CONFIGFILE)\"' \
-+		CFLAGS='-DxxxBSD -DCONFIGFILE=\"$(CONFIGFILE)\"' \
- 		upclient
- 
- solaris:
+--- config.h.orig	Mon Jan 10 21:35:01 2000
++++ config.h	Fri Jan 21 01:36:24 2000
+@@ -16,7 +16,11 @@
+  * Ultrix   --> #define PLATFORM_CODE  3
+  * Solaris  --> #define PLATFORM_CODE  4
+  */
++#ifdef __NetBSD__
++#define PLATFORM_CODE		 1
++#else
+ #define PLATFORM_CODE		-1
++#endif
+ 
+ #if   (PLATFORM_CODE == 0)
+ #	define PLATFORM_LINUX
+@@ -49,8 +53,8 @@
+  * If you haven't registered yourself yet, go to
+  * http://www.uptimes.net/register.html
+  */
+-#define LOGINNAME		"Enter your loginname here"
+-#define PASSWORD		"Enter your password here"
++#define LOGINNAME		"@UPCLIENT_LOGIN@"
++#define PASSWORD		"@UPCLIENT_PASSWORD@"
+ 
+ 
+ 
+@@ -61,7 +65,7 @@
+  * column on http://www.uptimes.net/hosts.html.
+  * If your host isn't in the list, click "add host"
+  */
+-#define HOSTID			0
++#define HOSTID			@UPCLIENT_HOSTID@
+ 
+ 
+ 
+@@ -125,7 +129,7 @@
+  *
+  * Where should the client write it's pidfile?
+  */
+-#define PIDFILE			"<path-to>/upclient.pid"
++#define PIDFILE			"/var/run/upclient.pid"
+ 
+ 
+ 
diff --git a/net/upclient/patches/patch-ab b/net/upclient/patches/patch-ab
index ed7243ece1b..d3600040ca1 100644
--- a/net/upclient/patches/patch-ab
+++ b/net/upclient/patches/patch-ab
@@ -1,13 +1,18 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/04/06 20:10:00 hubertf Exp $
+$NetBSD: patch-ab,v 1.2 2000/01/21 01:35:43 hubertf Exp $
 
---- upclient.c.orig	Sat Apr  3 16:25:30 1999
-+++ upclient.c	Sun Apr  4 06:23:31 1999
-@@ -193,7 +193,7 @@
- 	return 1;
- }
- 
--#ifdef FREEBSD
-+#ifdef xxxBSD
- int getUptime (uptime)
- 	unsigned long *uptime;
- {
+--- upchk.BAK	Fri Jan 21 01:03:10 2000
++++ upchk	Fri Jan 21 01:03:36 2000
+@@ -24,11 +24,11 @@
+ #
+ 
+ # change this to the full path AND name of your upclient executable:
+-upclient="/home/mydir/upclient"
++upclient="@PREFIX@/bin/upclient"
+ 
+ # change this to the name of your upclient's pidfile (as defined in
+ # config.h of the upclient distribution)
+-pidfile="/home/mydir/upclient.pid"
++pidfile="/var/run/upclient.pid"
+ 
+ ########## you probably don't need to change anything below here ##########
+ 
diff --git a/net/upclient/patches/patch-ac b/net/upclient/patches/patch-ac
deleted file mode 100644
index 36ccb2065f4..00000000000
--- a/net/upclient/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/04/06 20:10:00 hubertf Exp $
-
---- upclient.h.orig	Sat Apr  3 12:16:00 1999
-+++ upclient.h	Sun Apr  4 06:23:36 1999
-@@ -30,7 +30,8 @@
- #include <sys/types.h>
- #include <sys/utsname.h>
- 
--#ifdef FREEBSD
-+#ifdef xxxBSD
-+#include <sys/param.h>
- #include <sys/sysctl.h>
- #endif
-