Index: head/sysutils/tw_cli/Makefile
===================================================================
--- head/sysutils/tw_cli/Makefile	(revision 488800)
+++ head/sysutils/tw_cli/Makefile	(revision 488801)
@@ -1,45 +1,45 @@
 # $FreeBSD$
 
 PORTNAME=	tw_cli
 PORTVERSION=	9.5.5
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/
 DISTNAME=	CLI_freebsd-from_the_10-2-2-1_9-5-5-1_codesets
 DIST_SUBDIR=	3dm2
 
 MAINTAINER=	jpaetzel@FreeBSD.org
 COMMENT=	3ware storage controllers management CLI
 
 LICENSE=	tw_cli
 LICENSE_NAME=	BROADCOM
 LICENSE_TEXT=	Source recipient must acknowledge license.\
 		Reproduction or redistribution prohibited.\
 		See https://www.broadcom.com/cs/Satellite?pagename=AVG2/Utilities/EulaMsg
 LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept
 
+ONLY_FOR_ARCHS=	amd64 i386
+
 USES=		zip
 
-ONLY_FOR_ARCHS=		amd64 i386
-
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
-
 SUB_FILES=	407.status-3ware-raid
 PORTDOCS=	tw_cli.8.html
 PLIST_FILES=	etc/periodic/daily/407.status-3ware-raid\
 		man/man8/tw_cli.8.gz sbin/tw_cli
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${ARCH:S,i386,x86,:S,amd64,x86_64,}/tw_cli\
 		${STAGEDIR}${PREFIX}/sbin/tw_cli
 	${INSTALL_MAN} ${WRKSRC}/tw_cli.8.nroff\
 		${STAGEDIR}${MAN8PREFIX}/man/man8/tw_cli.8
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily
 	${INSTALL_SCRIPT} ${WRKDIR}/407.status-3ware-raid \
 		${STAGEDIR}${PREFIX}/etc/periodic/daily/
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/sysutils/tw_cli/files/407.status-3ware-raid.in
===================================================================
--- head/sysutils/tw_cli/files/407.status-3ware-raid.in	(revision 488800)
+++ head/sysutils/tw_cli/files/407.status-3ware-raid.in	(revision 488801)
@@ -1,92 +1,92 @@
 #!/bin/sh
 #
 # Shows status of 3ware RAID controllers: twa(4), twe(4)
 #
 # Authors: Bjoern A. Zeeb, Dmitry Frolov
 #
 # $FreeBSD$
 #
 
 # If there is a global system configuration file, suck it in.
 #
 if [ -r /etc/defaults/periodic.conf ]
 then
     . /etc/defaults/periodic.conf
     source_periodic_confs
 fi
 
 # Defaults.
 : ${daily_status_3ware_raid_enable:=NO}
 # Alarms persist between "tw_cli alarms" invocation?
 # Set to YES for twa(4) and to NO for twe(4).
 : ${daily_status_3ware_raid_persist_alarms:=YES}
 
 tw_cli=${tw_cli:-%%PREFIX%%/sbin/tw_cli}
 logdir=${logdir:-/var/log}
 
 case "$daily_status_3ware_raid_enable" in
     [Yy][Ee][Ss])
 	echo
 	echo 'Checking status of 3ware RAID controllers:'
 
 	rc=0
 
 	# Checking each controller.
 	for ctrl in `${tw_cli} info | awk '/^c/ { print $1 }'`
 	     do
 	     	echo ""
 		echo "Controller ${ctrl}:"
 		ctrl_log=${logdir}/3ware_raid_${ctrl}
 		if test ! -f ${ctrl_log}.today; then
 			touch ${ctrl_log}.today
 		fi
 		mv -f ${ctrl_log}.today ${ctrl_log}.yesterday
 		${tw_cli} info ${ctrl} > ${ctrl_log}.today
 		lines=`wc -l ${ctrl_log}.today | awk '{ print $1 }'`
-		diff -u -$lines ${ctrl_log}.yesterday ${ctrl_log}.today
+		diff -U $lines ${ctrl_log}.yesterday ${ctrl_log}.today
 		raid_rc=$?
 		if test $raid_rc -eq 0; then
 			cat  ${ctrl_log}.today
 		fi
 		[ $rc -eq 0 ] && [ $raid_rc -ne 0 ] && rc=3
 	     done
 
 	# Checking alarms.
 	echo "Alarms (most recent first):"
 	alarms_log=${logdir}/3ware_raid_alarms
 	case "$daily_status_3ware_raid_persist_alarms" in
 	[Yy][Ee][Ss])
 		if test ! -f ${alarms_log}.today; then
 			touch ${alarms_log}.today
 		fi
 		mv -f ${alarms_log}.today ${alarms_log}.yesterday
 		${tw_cli} alarms > ${alarms_log}.today
 		cmp -zs ${alarms_log}.yesterday ${alarms_log}.today
 		raid_rc=$?
 		if test $raid_rc -ne 0; then
 			diff -u ${alarms_log}.yesterday ${alarms_log}.today | \
 				grep -v '^-\|^$'
 		fi
 		;;
 	*)
 		raid_rc=0
 		${tw_cli} alarms > ${alarms_log}.today
 		lines=`wc -l ${alarms_log}.today | awk '{ print $1 }'`
 		if test $lines -gt 4; then
 			cat ${alarms_log}.today
 			raid_rc=1
 		fi
 		;;
 	esac
 	if test $raid_rc -eq 0; then
 		echo "  No new alarms."
 	fi
 	[ $rc -eq 0 ] && [ $raid_rc -ne 0 ] && rc=3
 	;;
 
     *)  rc=0;;
 esac
 
 exit $rc
 
 # end