ports/67980: maint. update: uptimec

[Radim Kolar]

>Number:         67980
>Category:       ports
>Synopsis:       maint. update: uptimec
>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:   Tue Jun 15 17:10:21 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Radim Kolar
>Release:        FreeBSD 5.2.1-RELEASE-p6 i386
>Organization:
Sanatana Dharma
>Environment:
System: FreeBSD sanatana.dharma 5.2.1-RELEASE-p6 FreeBSD 5.2.1-RELEASE-p6 #7: Mon May 10 17:15:51 CEST 2004 root at asura.bsd:/usr/src/sys/i386/compile/UP i386
>Description:
Updated to 0.2p2
added USE_RC_SUBR=yes and fixed rc scripts
     - unbreaks freebsd4
     reported by Randy Pratt <rpratt1950 at earthlink.net>
     hint by Pav Lucistnik <pav at FreeBSD.org>
     honor prefix in rc script
>How-To-Repeat:
>Fix:
diff -Naur /usr/ports/sysutils/uptimec/Makefile uptimec/Makefile
--- /usr/ports/sysutils/uptimec/Makefile	Fri Apr  9 11:50:24 2004
+++ uptimec/Makefile	Mon Jun 14 20:19:43 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	uptimec
-PORTVERSION=	0.2
+PORTVERSION=	0.2p2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.mrEriksson.net/downloads/ \
 		ftp://ftp.mrEriksson.net/pub/uptimec/
@@ -17,20 +17,28 @@
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
+USE_RC_SUBR=	yes
 
 PLIST_FILES=	sbin/uptimec etc/uptimecrc.sample etc/rc.d/uptimec.sh
 PORTDOCS=	README COPYING ChangeLog INSTALL protocol.txt
 
+RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
+
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/uptimec ${PREFIX}/sbin
 		${INSTALL_DATA} ${MASTERDIR}/files/uptimecrc.sample ${PREFIX}/etc
-		${INSTALL_SCRIPT} ${MASTERDIR}/files/uptimec.sh ${PREFIX}/etc/rc.d
+		${INSTALL_SCRIPT} ${WRKSRC}/uptimec.sh ${PREFIX}/etc/rc.d
 .if !defined(NOPORTDOCS)
 		${MKDIR} ${DOCSDIR}
 .for i in ${PORTDOCS}
 		${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
+
+post-extract:
+	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+	${FILESDIR}/uptimec.sh > ${WRKSRC}/uptimec.sh
+
 
 post-install:
 	@${SED} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${PKGMESSAGE}
diff -Naur /usr/ports/sysutils/uptimec/distinfo uptimec/distinfo
--- /usr/ports/sysutils/uptimec/distinfo	Fri Apr  9 11:50:24 2004
+++ uptimec/distinfo	Mon Jun 14 20:19:55 2004
@@ -1,2 +1,2 @@
-MD5 (uptimec-0.2.tar.gz) = 42289c40bf7dc8e1110bc70ed8d664f7
-SIZE (uptimec-0.2.tar.gz) = 73195
+MD5 (uptimec-0.2p2.tar.gz) = 944d05c4c227c3cd2d1eae4d6e4d532a
+SIZE (uptimec-0.2p2.tar.gz) = 81879
diff -Naur /usr/ports/sysutils/uptimec/files/uptimec.sh uptimec/files/uptimec.sh
--- /usr/ports/sysutils/uptimec/files/uptimec.sh	Fri Apr  9 11:50:24 2004
+++ uptimec/files/uptimec.sh	Mon Jun 14 20:06:23 2004
@@ -14,13 +14,13 @@
 #uptimec_enable="NO"
 #
 
-. /etc/rc.subr
+. %%RC_SUBR%%
 
 name=uptimec
 rcvar=`set_rcvar`
 
-command=/usr/local/sbin/uptimec
-required_files=/usr/local/etc/uptimecrc
+command=%%PREFIX%%/sbin/uptimec
+required_files=%%PREFIX%%/etc/uptimecrc
 
 # default to enable
 uptimec_enable=${uptimec_enable:-"YES"}
>Release-Note:
>Audit-Trail:
>Unformatted: