Date: Wed, 8 Aug 2007 15:52:28 +0300 From: "Andy Fawcett" <andy@athame.co.uk> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/115309: [maintainer-update] update sysutils/uptimed to 0.3.11 Message-ID: <1186577548.98898@ping.int.athame.co.uk> Resent-Message-ID: <200708081330.l78DU1JV010032@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 115309
>Category: ports
>Synopsis: [maintainer-update] update sysutils/uptimed to 0.3.11
>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 Aug 08 13:30:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Andy Fawcett
>Release: FreeBSD 6.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD 6.2-STABLE #1: Fri Jun 22 12:57:54 EEST 2007
root@ping.int.athame.co.uk:/usr/obj/usr/src/sys/PING
>Description:
Update sysutils/uptimed to 0.3.11
At the same time, make the startup script rc.d conformant.
>How-To-Repeat:
>Fix:
--- uptimed.diff begins here ---
diff -ruN uptimed-orig/Makefile uptimed/Makefile
--- uptimed-orig/Makefile Sun Aug 5 19:14:58 2007
+++ uptimed/Makefile Tue Aug 7 21:43:27 2007
@@ -5,7 +5,7 @@
# $FreeBSD: ports/sysutils/uptimed/Makefile,v 1.11 2006/09/01 18:41:38 miwi Exp $
PORTNAME= uptimed
-PORTVERSION= 0.3.7
+PORTVERSION= 0.3.11
CATEGORIES= sysutils
MASTER_SITES= http://podgorny.cz/uptimed/releases/
DISTNAME= ${PORTNAME}-${PORTVERSION}
@@ -16,6 +16,7 @@
PREFIX= ${LOCALBASE}
USE_LDCONFIG= yes
+USE_BZIP2= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${LOCALBASE}
USE_GMAKE= yes
@@ -23,8 +24,12 @@
MAN1= uprecords.1
MAN8= uptimed.8
+pre-configure:
+ @${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/
+ ${INSTALL_SCRIPT} ${FILESDIR}/uptimed ${PREFIX}/etc/rc.d/
if [ ! -d "${PREFIX}/www/cgi-bin/" ]; then \
${MKDIR} ${PREFIX}/www/cgi-bin; \
fi
diff -ruN uptimed-orig/distinfo uptimed/distinfo
--- uptimed-orig/distinfo Sun Aug 5 19:14:58 2007
+++ uptimed/distinfo Sun Aug 5 19:18:51 2007
@@ -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 -ruN uptimed-orig/files/patch-configure uptimed/files/patch-configure
--- uptimed-orig/files/patch-configure Sun Aug 5 19:14:58 2007
+++ uptimed/files/patch-configure Thu Jan 1 02:00:00 1970
@@ -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 -ruN uptimed-orig/files/uptimed uptimed/files/uptimed
--- uptimed-orig/files/uptimed Thu Jan 1 02:00:00 1970
+++ uptimed/files/uptimed Sun Aug 5 19:59:38 2007
@@ -0,0 +1,39 @@
+#!/bin/sh
+#
+# PROVIDE: uptimed
+# REQUIRE: DAEMON
+#
+# Add the following lines to /etc/rc.conf to enable uptimed:
+#
+# uptimed_enable="YES"
+#
+
+. /etc/rc.subr
+
+uptimed_enable=${uptimed_enable:-"NO"}
+
+name=uptimed
+rcvar=`set_rcvar`
+
+command="/usr/local/sbin/uptimed"
+uptimed_pidfile="/var/run/uptimed.pid"
+
+pidfile=${uptimed_pidfile}
+uptimed_flags="-p ${pidfile}"
+
+# start_precmd="uptimed_prestart"
+stop_postcmd="uptimed_poststop"
+
+uptimed_prestart()
+{
+ mkdir -p $(dirname $pidfile)
+}
+
+uptimed_poststop()
+{
+ rm -f $pidfile
+}
+
+
+load_rc_config ${name}
+run_rc_command "$1"
diff -ruN uptimed-orig/files/uptimed.sh.sample uptimed/files/uptimed.sh.sample
--- uptimed-orig/files/uptimed.sh.sample Sun Aug 5 19:14:58 2007
+++ uptimed/files/uptimed.sh.sample Thu Jan 1 02:00:00 1970
@@ -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 -ruN uptimed-orig/pkg-plist uptimed/pkg-plist
--- uptimed-orig/pkg-plist Sun Aug 5 19:14:58 2007
+++ uptimed/pkg-plist Tue Aug 7 21:48:57 2007
@@ -1,10 +1,10 @@
bin/uprecords
-etc/rc.d/uptimed.sh.sample
+etc/rc.d/uptimed
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
--- uptimed.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1186577548.98898>