summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/upclient/Makefile72
-rw-r--r--net/upclient/distinfo10
-rw-r--r--net/upclient/patches/patch-aa71
-rw-r--r--net/upclient/patches/patch-ab15
-rw-r--r--net/upclient/pkg/MESSAGE5
-rw-r--r--net/upclient/pkg/PLIST4
6 files changed, 53 insertions, 124 deletions
diff --git a/net/upclient/Makefile b/net/upclient/Makefile
index fd2678cd437..a5be1f0eb42 100644
--- a/net/upclient/Makefile
+++ b/net/upclient/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2001/02/17 18:19:51 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/06/20 14:30:47 nra Exp $
#
-DISTNAME= upclient-4.09
+DISTNAME= upclient-4.2.1.23
CATEGORIES= net
-MASTER_SITES= http://www.atomicvoid.net/uptimes/ \
+MASTER_SITES= http://uptimes.atomicvoid.net/files/ \
http://www.uptimes.net/download/ \
ftp://ftp.uptimes.net/pub/uptimes/
@@ -11,70 +11,25 @@ MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://www.uptimes.net/
COMMENT= Keeps track of your server uptime, and compares it to other hosts
-ALL_TARGET= upclient
-
-.if !defined(UPCLIENT_LOGIN) || \
- !defined(UPCLIENT_PASSWORD) || \
- !defined(UPCLIENT_HOSTID)
-IS_INTERACTIVE= yes
-.endif
+ALL_TARGET= bsd
post-patch:
- ${MV} ${WRKSRC}/upchk ${WRKSRC}/upchk.bak
+ ${MV} ${WRKSRC}/scripts/upchk ${WRKSRC}/scripts/upchk.bak
${SED} \
-e 's|@PREFIX@|${PREFIX}|g' \
- >${WRKSRC}/upchk <${WRKSRC}/upchk.bak
+ >${WRKSRC}/scripts/upchk <${WRKSRC}/scripts/upchk.bak
-do-configure:
- @${ECHO} "" ; \
- ${ECHO} '******************************************************' ;\
- if [ "${UPCLIENT_LOGIN}" = "" -o \
- "${UPCLIENT_PASSWORD}" = "" -o \
- "${UPCLIENT_HOSTID}" = "" ]; then \
- ${ECHO} "" ; \
- ${ECHO} 'See http://www.uptimes.net/ for more information!' ; \
- ${ECHO} "" ; \
- fi ; \
- if [ "${UPCLIENT_LOGIN}" = "" ]; then \
- ${ECHO} -n "Upclient login: " ; \
- read UPCLIENT_LOGIN ; \
- else \
- UPCLIENT_LOGIN=${UPCLIENT_LOGIN} ; \
- fi ; \
- if [ "${UPCLIENT_PASSWORD}" = "" ]; then \
- ${ECHO} -n "Upclient password: " ; \
- read UPCLIENT_PASSWORD ; \
- else \
- UPCLIENT_PASSWORD=${UPCLIENT_PASSWORD} ; \
- fi ; \
- if [ "${UPCLIENT_HOSTID}" = "" ]; then \
- ${ECHO} -n "Upclient host-id: " ; \
- read UPCLIENT_HOSTID ; \
- else \
- UPCLIENT_HOSTID=${UPCLIENT_HOSTID} ; \
- fi ; \
- ${ECHO} "" ; \
- ${ECHO} Configuring with: ; \
- ${ECHO} UPCLIENT_LOGIN=$$UPCLIENT_LOGIN ; \
- ${ECHO} UPCLIENT_PASSWORD=$$UPCLIENT_PASSWORD ; \
- ${ECHO} UPCLIENT_HOSTID=$$UPCLIENT_HOSTID ; \
- ${MV} ${WRKSRC}/config.h ${WRKSRC}/config.h.BAK ; \
- ${SED} \
- -e "s/@UPCLIENT_LOGIN@/$$UPCLIENT_LOGIN/" \
- -e "s/@UPCLIENT_PASSWORD@/$$UPCLIENT_PASSWORD/" \
- -e "s/@UPCLIENT_HOSTID@/$$UPCLIENT_HOSTID/" \
- <${WRKSRC}/config.h.BAK >${WRKSRC}/config.h ; \
- ${ECHO} "" ; \
- ${ECHO} '******************************************************' ;\
- ${ECHO} ""
+do-build:
+ cd ${WRKSRC}/src && ${MAKE} ${ALL_TARGET}
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/upclient ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/upclient ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/upclient
${INSTALL_DATA} ${WRKSRC}/AUTHORS ${PREFIX}/share/doc/upclient
${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/upclient
${INSTALL_DATA} ${WRKSRC}/HISTORY ${PREFIX}/share/doc/upclient
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/upclient
+ ${INSTALL_DATA} ${WRKSRC}/conf/upclient.conf ${PREFIX}/etc
${SED} \
-e 's|@PREFIX@|${PREFIX}|g' \
-e 's|@INSTALL@|${INSTALL}|g' \
@@ -82,11 +37,4 @@ do-install:
${FILESDIR}/upclient.sh >${PREFIX}/etc/rc.d/upclient
${CHMOD} +x ${PREFIX}/etc/rc.d/upclient
-pre-package:
- @${ECHO} '********************************************************' ;\
- ${ECHO} "* Please remember that the upclient binary package has" ; \
- ${ECHO} "* your login, password and hostid compiled in. Make sure" ; \
- ${ECHO} "* you know what you're doing with the binary pkg!" ; \
- ${ECHO} '********************************************************' ;\
-
.include "../../mk/bsd.pkg.mk"
diff --git a/net/upclient/distinfo b/net/upclient/distinfo
index 86cc422ff99..6746362b6af 100644
--- a/net/upclient/distinfo
+++ b/net/upclient/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 11:23:38 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/06/20 14:30:47 nra Exp $
-SHA1 (upclient-4.09.tar.gz) = cc1b8a0172f705b317e328e4e937964b79cb7a69
-Size (upclient-4.09.tar.gz) = 15454 bytes
-SHA1 (patch-aa) = 7bbce119c4e84b8b16294d10871eb2c83d31c55c
-SHA1 (patch-ab) = 55347f85a97c7a910f0085ac4cdb2447b14039dc
+SHA1 (upclient-4.2.1.23.tar.gz) = c6595959c6a5058b03ab7096a6bf9c0dbfa4285a
+Size (upclient-4.2.1.23.tar.gz) = 29386 bytes
+SHA1 (patch-aa) = 47d96e13578a22cd18cf4d8232b9aab42d3ced35
+SHA1 (patch-ab) = dd1e318cee6e27fcf433b2123cf8f3f6ed8eb548
diff --git a/net/upclient/patches/patch-aa b/net/upclient/patches/patch-aa
index 3c01c11963e..ce57cf4e443 100644
--- a/net/upclient/patches/patch-aa
+++ b/net/upclient/patches/patch-aa
@@ -1,45 +1,26 @@
-$NetBSD: patch-aa,v 1.2 2000/01/21 01:35:43 hubertf Exp $
-
---- 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"
-
-
-
+--- src/options.c Sat Jun 16 14:15:04 2001
++++ src/options.c Tue Jun 19 10:48:25 2001
+@@ -298,8 +298,11 @@
+ if(!(fp = fopen("/etc/"CONFIGFILE, "r"))) {
+ /* Failed, now try to open config file in /usr/local/etc */
+ if(!(fp = fopen("/usr/local/etc/"CONFIGFILE, "r"))) {
+- printf("Error: couldn't open config file %s for reading in:\n- current directory\n- /etc\n- /usr/local/etc\n", CONFIGFILE);
+- exit(-1);
++ /* Failed, now try to open config file in /usr/pkg/etc */
++ if (!(fp = fopen("/usr/pkg/etc/"CONFIGFILE, "r"))) {
++ printf("Error: couldn't open config file %s for reading in:\n- current directory\n- /etc\n- /usr/local/etc\n- /usr/pkg/etc\n", CONFIGFILE);
++ exit(-1);
++ }
+ }
+ }
+ }
+--- src/stats-bsd.c Sat Jun 16 14:12:53 2001
++++ src/stats-bsd.c Tue Jun 19 10:47:04 2001
+@@ -21,6 +21,7 @@
+ #include <sys/dkstat.h>
+ #include <sys/sysctl.h>
+ #include <sys/utsname.h>
++#include <sys/sched.h>
+
+ /**
+ * @desc Get statistics
diff --git a/net/upclient/patches/patch-ab b/net/upclient/patches/patch-ab
index d3600040ca1..9386b5bb39b 100644
--- a/net/upclient/patches/patch-ab
+++ b/net/upclient/patches/patch-ab
@@ -1,18 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2000/01/21 01:35:43 hubertf Exp $
+$NetBSD: patch-ab,v 1.3 2001/06/20 14:30:48 nra Exp $
---- upchk.BAK Fri Jan 21 01:03:10 2000
-+++ upchk Fri Jan 21 01:03:36 2000
-@@ -24,11 +24,11 @@
+--- scripts/upchk.orig Tue Jun 19 11:15:24 2001
++++ scripts/upchk Tue Jun 19 11:15:51 2001
+@@ -24,7 +24,7 @@
#
# change this to the full path AND name of your upclient executable:
--upclient="/home/mydir/upclient"
+-upclient="/usr/local/sbin/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/pkg/MESSAGE b/net/upclient/pkg/MESSAGE
index 01ea137b3e2..a01bc67a629 100644
--- a/net/upclient/pkg/MESSAGE
+++ b/net/upclient/pkg/MESSAGE
@@ -1,7 +1,10 @@
======================================================================
-$NetBSD: MESSAGE,v 1.4 2001/01/29 11:34:38 wiz Exp $
+$NetBSD: MESSAGE,v 1.5 2001/06/20 14:30:49 nra Exp $
To start the Uptime Client, run the ${PREFIX}/etc/rc.d/upclient
script either manually or via /etc/rc.local.
+Register your server at http://www.uptimes.net/, then edit
+${LOCALBASE}/etc/upclient.conf to add your assigned AuthKey.
+
======================================================================
diff --git a/net/upclient/pkg/PLIST b/net/upclient/pkg/PLIST
index 7600a74af91..4278957505c 100644
--- a/net/upclient/pkg/PLIST
+++ b/net/upclient/pkg/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2001/01/26 04:45:33 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/06/20 14:30:49 nra Exp $
bin/upclient
etc/rc.d/upclient
+etc/upclient.conf
share/doc/upclient/AUTHORS
share/doc/upclient/COPYING
share/doc/upclient/HISTORY
share/doc/upclient/README
+@dirrm share/doc/upclient