Attachment 197426 Details for Bug 231632 – Patched updated - Remove 'MANPAGES=' and update pkg-message

[patch] Patched updated - Remove 'MANPAGES=' and update pkg-message

tuptime-3.4.0-v2.diff (text/plain), 4.04 KB, created by Ricardo Fraile on 2018-09-24 09:10:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ricardo Fraile

Created: 2018-09-24 09:10:31 UTC

Size: 4.04 KB

patch

obsolete

>diff -eNwbur tuptime/Makefile tuptime-new/Makefile
>--- tuptime/Makefile	2018-09-24 07:59:38.078515000 +0000
>+++ tuptime-new/Makefile	2018-09-24 08:17:51.838060000 +0000
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/sysutils/tuptime/Makefile 470610 2018-05-22 13:15:13Z mat $
> 
> PORTNAME=	tuptime
>-DISTVERSION=	3.3.3
>+DISTVERSION=	3.4.0
> CATEGORIES=	sysutils
> 
> MAINTAINER=	jeremy@smart-serv.net
>@@ -18,17 +18,14 @@
> NO_BUILD=	yes
> NO_ARCH=	yes
> USE_RC_SUBR=	${PORTNAME}
>-SHEBANG_FILES=	${WRKSRC}/src/tuptime ${WRKSRC}/scripts/*
>+SHEBANG_FILES=	${WRKSRC}/src/tuptime
> SUB_FILES=	pkg-message
> 
> PLIST_FILES=	bin/tuptime \
>-		${EXAMPLESDIR}/db-tuptime-migrate.sh \
>-		${EXAMPLESDIR}/db-tuptime-migrate-3.0-to-3.1.sh
>+		man/man1/tuptime.1.gz
> 
> do-install:
>-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
> 	${INSTALL_SCRIPT} ${WRKSRC}/src/tuptime ${STAGEDIR}${PREFIX}/bin/tuptime
>-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/db-tuptime-migrate.sh ${STAGEDIR}${EXAMPLESDIR}/db-tuptime-migrate.sh
>-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/db-tuptime-migrate-3.0-to-3.1.sh ${STAGEDIR}${EXAMPLESDIR}/db-tuptime-migrate-3.0-to-3.1.sh
>+	${INSTALL_MAN} ${WRKSRC}/src/man/tuptime.1 ${STAGEDIR}${MANPREFIX}/man/man1
> 
> .include <bsd.port.mk>
>diff -eNwbur tuptime/distinfo tuptime-new/distinfo
>--- tuptime/distinfo	2018-09-24 07:59:38.078799000 +0000
>+++ tuptime-new/distinfo	2018-09-24 08:02:21.809518000 +0000
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1519352885
>-SHA256 (rfrail3-tuptime-3.3.3_GH0.tar.gz) = be4dc5207859eeb0e6cfef206db5dd62b553e69ac0641c7203278cdd61c95bea
>-SIZE (rfrail3-tuptime-3.3.3_GH0.tar.gz) = 35348
>+TIMESTAMP = 1537724492
>+SHA256 (rfrail3-tuptime-3.4.0_GH0.tar.gz) = 9f917daed6d3a6f592072a3165d99c7b41fc4e8ed6e2e4fbc4ab670fb0c1c82b
>+SIZE (rfrail3-tuptime-3.4.0_GH0.tar.gz) = 43003
>diff -eNwbur tuptime/distinfo.orig tuptime-new/distinfo.orig
>--- tuptime/distinfo.orig	1970-01-01 00:00:00.000000000 +0000
>+++ tuptime-new/distinfo.orig	2018-02-23 02:43:06.000000000 +0000
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1519352885
>+SHA256 (rfrail3-tuptime-3.3.3_GH0.tar.gz) = be4dc5207859eeb0e6cfef206db5dd62b553e69ac0641c7203278cdd61c95bea
>+SIZE (rfrail3-tuptime-3.3.3_GH0.tar.gz) = 35348
>diff -eNwbur tuptime/files/pkg-message.in tuptime-new/files/pkg-message.in
>--- tuptime/files/pkg-message.in	2018-09-24 07:59:38.079359000 +0000
>+++ tuptime-new/files/pkg-message.in	2018-09-24 08:38:32.565422000 +0000
>@@ -1,12 +1,13 @@
> ======================================================================
> 
>-tuptime requires the following be added to /etc/crontab:
>+tuptime requires execution at startup and shutdown on rc.d, please
>+add to /etc/rc.conf:
> 
>-	*/5 * * * * root %%PREFIX%%/bin/tuptime -x > /dev/null
>+	tuptime_enable="YES"
> 
>-If you are upgrading from an older version you need to run the following scripts:
>+tuptime requires a scheduled execution on cron, please add to
>+/etc/crontab:
> 
>-	%%EXAMPLESDIR%%/db-tuptime-migrate.sh
>-	%%EXAMPLESDIR%%/db-tuptime-migrate-3.0-to-3.1.sh
>+	*/5 * * * * root %%PREFIX%%/bin/tuptime -x > /dev/null
> 
> ======================================================================
>diff -eNwbur tuptime/files/tuptime.in tuptime-new/files/tuptime.in
>--- tuptime/files/tuptime.in	2018-09-24 07:59:38.079662000 +0000
>+++ tuptime-new/files/tuptime.in	2018-09-24 08:02:21.809746000 +0000
>@@ -1,32 +1,38 @@
> #!/bin/sh
> #
>-# $FreeBSD: head/sysutils/tuptime/files/tuptime.in 400493 2015-10-30 08:35:56Z danfe $
>-#
> # PROVIDE: tuptime
>+# REQUIRE: DAEMON
> # KEYWORD: nojail shutdown
> 
> . /etc/rc.subr
> 
> name="tuptime"
> rcvar=tuptime_enable
>-
>-command="%%PREFIX%%/bin/tuptime"
>+tuptime_user="tuptime"
> 
> start_cmd="${name}_start"
> stop_cmd="${name}_stop"
> 
>+export PATH=$PATH:/usr/local/bin/
>+
> tuptime_start()
> {
> 	command_args="-x"
>-
>-	$command $command_args
>+	if /usr/sbin/pw usershow "${tuptime_user}" >/dev/null 2>&1; then
>+		su -m ${tuptime_user} -c "$name $command_args"
>+	else
>+		$name $command_args
>+	fi
> }
> 
> tuptime_stop()
> {
> 	command_args="-xg"
>-
>-	$command $command_args
>+	if /usr/sbin/pw usershow "${tuptime_user}" >/dev/null 2>&1; then
>+		su -m ${tuptime_user} -c "$name $command_args"
>+	else
>+		$name $command_args
>+	fi
> }
> 
> load_rc_config $name

Actions: View | Diff

Attachments on bug 231632: 197398 | 197426