ports/65294: portupdate: uptimec 0.2

[Radim Kolar]

>Number:         65294
>Category:       ports
>Synopsis:       portupdate: uptimec 0.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 07 09:30:22 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Radim Kolar
>Release:        FreeBSD 5.2.1-RELEASE-p3 i386
>Organization:
Sanatana Dharma
>Environment:
System: FreeBSD asura.bsd 5.2.1-RELEASE-p3 FreeBSD 5.2.1-RELEASE-p3 #6: Mon Apr 5 17:41:24 CEST 2004 root at asura.bsd:/usr/src/sys/i386/compile/UP i386
>Description:
Here comes a new version of uptimec client. It has my patches merged.
1) Alternate server port patch -P <portnum> or PORT= in uptimecrc
2) DNS failure retry patch - people with dialups can use this client now.
>How-To-Repeat:
>Fix:
diff -Naur /usr/ports/sysutils/uptimec/Makefile uptimec/Makefile
--- /usr/ports/sysutils/uptimec/Makefile	Tue Apr  6 15:13:58 2004
+++ uptimec/Makefile	Wed Apr  7 11:09:15 2004
@@ -6,24 +6,20 @@
 #
 
 PORTNAME=	uptimec
-PORTVERSION=	0.1
+PORTVERSION=	0.2
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.mrEriksson.net/downloads/
+MASTER_SITES=	http://www.mrEriksson.net/downloads/ \
+		ftp://ftp.mrEriksson.net/pub/uptimec/
 
 MAINTAINER=	hsn at netmag.cz
 COMMENT=	Client for Uptime Project
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	257
-USE_REINPLACE=	yes
 
 PLIST_FILES=	sbin/uptimec etc/uptimecrc.sample etc/rc.d/uptimec.sh
 PORTDOCS=	README COPYING ChangeLog INSTALL protocol.txt
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|CC =|CC ?=|g' ${WRKSRC}/Makefile
-
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/uptimec ${PREFIX}/sbin
 		${INSTALL_DATA} ${MASTERDIR}/files/uptimecrc.sample ${PREFIX}/etc
@@ -37,6 +33,5 @@
 
 post-install:
 	@${SED} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${PKGMESSAGE}
-	${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff -Naur /usr/ports/sysutils/uptimec/distinfo uptimec/distinfo
--- /usr/ports/sysutils/uptimec/distinfo	Tue Apr  6 15:13:58 2004
+++ uptimec/distinfo	Wed Apr  7 10:50:14 2004
@@ -1,2 +1,2 @@
-MD5 (uptimec-0.1.tar.gz) = 7f266a6afbe1c7b50ee335d497e8bd1f
-SIZE (uptimec-0.1.tar.gz) = 44173
+MD5 (uptimec-0.2.tar.gz) = 42289c40bf7dc8e1110bc70ed8d664f7
+SIZE (uptimec-0.2.tar.gz) = 73195
diff -Naur /usr/ports/sysutils/uptimec/files/uptimec.sh uptimec/files/uptimec.sh
--- /usr/ports/sysutils/uptimec/files/uptimec.sh	Tue Apr  6 15:13:58 2004
+++ uptimec/files/uptimec.sh	Wed Apr  7 10:55:07 2004
@@ -7,10 +7,11 @@
 # REQUIRE: LOGIN
 # KEYWORD: FreeBSD shutdown
 
+# Uptimec is enabled by default, if you have configuration file
 #
-# Add the following line to /etc/rc.conf to enable uptimec:
+# Add the following line to /etc/rc.conf to disable uptimec:
 #
-#uptimec_enable="YES"
+#uptimec_enable="NO"
 #
 
 . /etc/rc.subr
@@ -33,11 +34,15 @@
     hostid=`awk -F '( |\t)*=( |\t)*' '/^HOSTID/ { print $2;exit 0;}' $required_files`
     password=`awk -F '( |\t)*=( |\t)*' '/^PASSWORD/ { print $2;exit 0;}' $required_files`
     server=`awk -F '( |\t)*=( |\t)*' '/^SERVER/ { print $2;exit 0;}' $required_files`
+    port=`awk -F '( |\t)*=( |\t)*' '/^PORT/ { print $2;exit 0;}' $required_files`
     if [ -z "$hostid" -o -z "$password" ]; then
 	exit 0;
     fi
     if [ -n "$server" ]; then
 	uptimec_flags="-s $server"
+    fi
+    if [ -n "$port" ]; then
+	uptimec_flags="$uptimec_flags -P $port"
     fi	
     uptimec_flags="$uptimec_flags -i $hostid -p $password" 	
 else
diff -Naur /usr/ports/sysutils/uptimec/files/uptimecrc.sample uptimec/files/uptimecrc.sample
--- /usr/ports/sysutils/uptimec/files/uptimecrc.sample	Tue Apr  6 15:13:58 2004
+++ uptimec/files/uptimecrc.sample	Wed Apr  7 10:50:57 2004
@@ -2,3 +2,4 @@
 HOSTID=2345
 PASSWORD=blabla
 #SERVER=uptimes.mreriksson.net
+#PORT=2050
\ No newline at end of file
>Release-Note:
>Audit-Trail:
>Unformatted: