6 files changed, 46 insertions, 80 deletions

diff --git a/sysutils/uptimed/Makefile b/sysutils/uptimed/Makefile
index 74067fdbc948..35ac0b1c1a96 100644
--- a/sysutils/uptimed/Makefile
+++ b/sysutils/uptimed/Makefile
@@ -5,29 +5,28 @@
 # $FreeBSD$
 
 PORTNAME=	uptimed
-PORTVERSION=	0.3.7
+PORTVERSION=	0.3.11
 CATEGORIES=	sysutils
 MASTER_SITES=	http://podgorny.cz/uptimed/releases/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	andy@athame.co.uk
 COMMENT=	Rob Kaper's uptime daemon
 
-PREFIX=		${LOCALBASE}
-
+USE_RC_SUBR=	${PORTNAME}
 USE_LDCONFIG=	yes
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${LOCALBASE}
 USE_GMAKE=	yes
 
 MAN1=		uprecords.1
 MAN8=		uptimed.8
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/lib/sendmail|/usr/sbin/sendmail|' ${WRKSRC}/etc/uptimed.conf-dist
+	@${REINPLACE_CMD} -e 's|/var/run/uptimed|/var/run/uptimed.pid|' ${WRKSRC}/etc/uptimed.conf-dist
+
 post-install:
-	${INSTALL_SCRIPT}	${FILESDIR}/uptimed.sh.sample ${PREFIX}/etc/rc.d/
-	if [ ! -d "${PREFIX}/www/cgi-bin/" ]; then \
-	    ${MKDIR} ${PREFIX}/www/cgi-bin; \
-	fi
+	${MKDIR} ${PREFIX}/www/cgi-bin
 	${INSTALL_PROGRAM}	${PREFIX}/bin/uprecords ${PREFIX}/www/cgi-bin/uprecords.cgi
 	${INSTALL_DATA}		${WRKSRC}/sample-cgi/* ${PREFIX}/www/cgi-bin/
 
diff --git a/sysutils/uptimed/distinfo b/sysutils/uptimed/distinfo
index 9189385022a6..0f6645e65033 100644
--- a/sysutils/uptimed/distinfo
+++ b/sysutils/uptimed/distinfo
@@ -1,3 +1,3 @@
-MD5 (uptimed-0.3.7.tar.gz) = dc68d7a0c8efe44646a23a4440c958c3
-SHA256 (uptimed-0.3.7.tar.gz) = 85557d9ab6d367672f2099b069daf657017c750c6f6784ce3e18e9f348fcf87a
-SIZE (uptimed-0.3.7.tar.gz) = 313640
+MD5 (uptimed-0.3.11.tar.bz2) = a67e69143a7441c081844eb392d10990
+SHA256 (uptimed-0.3.11.tar.bz2) = e240f3c8400669086a3274e0801951a6fc3251828b5588391818424a1d59e109
+SIZE (uptimed-0.3.11.tar.bz2) = 238337
diff --git a/sysutils/uptimed/files/patch-configure b/sysutils/uptimed/files/patch-configure
deleted file mode 100644
index 762881e7bc40..000000000000
--- a/sysutils/uptimed/files/patch-configure
+++ /dev/null
@@ -1,50 +0,0 @@
---- configure-src	Tue Jan 30 07:10:52 2007
-+++ configure	Tue Jan 30 07:13:01 2007
-@@ -157,9 +157,9 @@
- 
- 
- 
--tagnames=`echo "$tagnames,CXX" | sed 's/^,//'`
-+#tagnames=`echo "$tagnames,CXX" | sed 's/^,//'`
- 
--tagnames=`echo "$tagnames,F77" | sed 's/^,//'`
-+#tagnames=`echo "$tagnames,F77" | sed 's/^,//'`
- 
- if expr a : '\(a\)' >/dev/null 2>&1; then
-   as_expr=expr
-@@ -6568,7 +6568,7 @@
- 
- freebsd*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
--  version_type=freebsd-$objformat
-+  version_type=freebsd-elf
-   case $version_type in
-     freebsd-elf*)
-       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-@@ -10099,7 +10099,7 @@
- 
- freebsd*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
--  version_type=freebsd-$objformat
-+  version_type=freebsd-elf
-   case $version_type in
-     freebsd-elf*)
-       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-@@ -13063,7 +13063,7 @@
- 
- freebsd*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
--  version_type=freebsd-$objformat
-+  version_type=freebsd-elf
-   case $version_type in
-     freebsd-elf*)
-       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-@@ -15326,7 +15326,7 @@
- 
- freebsd*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
--  version_type=freebsd-$objformat
-+  version_type=freebsd-elf
-   case $version_type in
-     freebsd-elf*)
-       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
diff --git a/sysutils/uptimed/files/uptimed.in b/sysutils/uptimed/files/uptimed.in
new file mode 100644
index 000000000000..553026fd7f68
--- /dev/null
+++ b/sysutils/uptimed/files/uptimed.in
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# PROVIDE: uptimed
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf to enable uptimed:
+#
+# uptimed_enable="YES"
+#
+
+. %%RC_SUBR%%
+
+name="uptimed"
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/${name}
+stop_postcmd="uptimed_poststop"
+
+uptimed_poststop()
+{
+    rm -f $pidfile
+}
+
+load_rc_config ${name}
+
+: ${uptimed_enable="NO"}
+: ${uptimed_pidfile="/var/run/${name}.pid"}
+
+pidfile=${uptimed_pidfile}
+uptimed_flags="-p ${pidfile}"
+
+run_rc_command "$1"
diff --git a/sysutils/uptimed/files/uptimed.sh.sample b/sysutils/uptimed/files/uptimed.sh.sample
deleted file mode 100644
index 2cfb02696751..000000000000
--- a/sysutils/uptimed/files/uptimed.sh.sample
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-case "$1" in
-start)
-	echo -n ' uptimed'
-	/usr/local/sbin/uptimed
-	;;
-stop)
-	;;
-restart)
-	;;
-*)
-	echo "Usage: ${0##*/}: { start | stop | restart }" 2>&1
-	exit 65
-	;;
-esac
diff --git a/sysutils/uptimed/pkg-plist b/sysutils/uptimed/pkg-plist
index 1be01dd7f034..5d49b5875451 100644
--- a/sysutils/uptimed/pkg-plist
+++ b/sysutils/uptimed/pkg-plist
@@ -1,10 +1,9 @@
 bin/uprecords
-etc/rc.d/uptimed.sh.sample
 etc/uptimed.conf-dist
 lib/libuptimed.a
 lib/libuptimed.la
-lib/libuptimed
-lib/libuptimed.0
+lib/libuptimed.so
+lib/libuptimed.so.0
 sbin/uptimed
 www/cgi-bin/uprecords.cgi
 www/cgi-bin/uprecords.conf