Fix: - Update to 2.1.1

	Submitted by: Chris Rees <utisoft_at_gmail.com> (maintainer)



-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.--lG24FdvsMNYzlXwVTqmhbGc3Dn4pu2iIeOpD2W6W7gQkHcUh
Content-Type: text/plain; name="monitorix-2.1.1.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="monitorix-2.1.1.diff"

Index: Makefile
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/sysutils/monitorix/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	29 Mar 2011 02:40:12 -0000	1.4
+++ Makefile	14 Apr 2011 08:58:51 -0000
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	monitorix
-PORTVERSION=	2.1.0
-PORTREVISION=	1
+PORTVERSION=	2.1.1
+PORTREVISION?=	0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.monitorix.org/ \
 		http://www.bayofrum.net/dist/${PORTNAME}/
@@ -76,17 +76,23 @@
 	@${ECHO_MSG} ""
 
 post-patch:
-# Set FreeBSD path for perl in shebang
+# Set FreeBSD path for perl in shebang and absolute sysctl so as not to break
+# in cgi-bin
 .for f in monitorix.cgi monitorix.conf monitorix reports/send_reports
-	@${REINPLACE_CMD} -e "1s|^\(#!\).*|\1${PERL}|" ${WRKSRC}/${f}
+	@${REINPLACE_CMD} -e "1s|^\(#!\).*|\1${PERL}|" \
+		-e 's|"\(sysctl\)|"/sbin/\1|' \
+		${WRKSRC}/${f}
 .endfor
 # eth0 doesn't exist in FreeBSD! Also let's set our own paths.
+# No iptables, so we'll disable PORT_GRAPH
 	@${REINPLACE_CMD} \
 		-e 's|\($$BASE_DIR = "\)[^"]*|\1${WWWDIR}/|' \
 		-e 's|\($$BASE_LIB = "\)[^"]*|\1${DATADIR}/|' \
 		-e 's|\($$BASE_CGI = "\)[^"]*|\1${CGIPATH}/|' \
+		-e 's|\($$SECURE_LOG= "\)[^"]*|\1/var/log/auth.log|' \
 		-e "s|/var/lib/milter-greylist/db/|/var/milter-greylist/|" \
 		-e "s|eth0|lo0|g" \
+		-e 's|\("port"[^Y]*\)Y|\1N|' \
 			${WRKSRC}/monitorix.conf
 
 do-install:
Index: distinfo
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/sysutils/monitorix/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	28 Mar 2011 02:45:01 -0000	1.3
+++ distinfo	14 Apr 2011 08:58:51 -0000
@@ -1,2 +1,2 @@
-SHA256 (monitorix-2.1.0.tar.gz) = 647b36ac80f15a805eecb68fc507334ebcbb0cb1fe7efd381eed6a7cf3bc0210
-SIZE (monitorix-2.1.0.tar.gz) = 85689
+SHA256 (monitorix-2.1.1.tar.gz) = 2419593ae00d2a083e7f5258bfab840b48c87be799e8186a599c0a28f4508e33
+SIZE (monitorix-2.1.1.tar.gz) = 86289