ports/150050: [PATCH] www/drraw: update to 2.2b2

[Andriy Gapon]

>Number:         150050
>Category:       ports
>Synopsis:       [PATCH] www/drraw: update to 2.2b2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 27 19:40:04 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Andriy Gapon
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD trant 9.0-CURRENT FreeBSD 9.0-CURRENT #1 r211758+b3e4939-dirty: Tue Aug 24 22:37:03 EEST
>Description:
- Update to 2.2b2

Port maintainer (ports at christianserving.org) is cc'd.

Note that although the version is desgnated as beta ('b'), it was released more than
a year ago and my testing shows that it works without problems while adding
some new useful features.

The extra patch for zoom zupport is taken from here:
http://pero.blogs.aprilmayjune.org/2009/09/16/collectd-drrawcgi-zoom-into-your-graphs-like-you-used-to-with-cacti/

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- drraw-2.2b2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/www/drraw.orig/Makefile /usr/ports/www/drraw/Makefile
--- /usr/ports/www/drraw.orig/Makefile	2010-03-28 09:44:41.000000000 +0300
+++ /usr/ports/www/drraw/Makefile	2010-08-27 22:32:51.901591048 +0300
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	drraw
-PORTVERSION=	2.1.3
-PORTREVISION=	2
+PORTVERSION=	2.2b2
 CATEGORIES=	www
 MASTER_SITES=	http://web.taranis.org/drraw/dist/ \
 		http://christianserving.org/ports/mail/imapsync/
@@ -17,11 +16,13 @@
 
 RUN_DEPENDS+=	${SITE_PERL}/RRDp.pm:${PORTSDIR}/databases/rrdtool
 
+OPTIONS=	ZOOM_PATCH	"Zoom support using jQuery via external patch"	off
+
 USE_PERL5_RUN=	yes
 
 NO_BUILD=	yes
 
-PORTDOCS=	CHANGES INSTALL LICENSE README.EVENTS WISHLIST
+PORTDOCS=	CHANGES INSTALL LICENSE README.EVENTS
 
 CONFDIR?=	etc
 DATADIRS?=	"/var/db/rrdtool" => "[Label1] "
@@ -30,6 +31,13 @@
 
 PLIST_SUB+=	CONFDIR=${CONFDIR}
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_ZOOM_PATCH)
+PATCH_SITES=	http://pero.blogs.aprilmayjune.org/files/2009/09/
+PATCHFILES=	drraw.cgi.zoom_patch
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%CONFDIR%%|${PREFIX}/${CONFDIR}|g' ${WRKSRC}/drraw.cgi
 
@@ -64,4 +72,4 @@
 		${CP} -p ${PREFIX}/etc/drraw.conf-dist ${PREFIX}/etc/drraw.conf; \
 	fi
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/www/drraw.orig/distinfo /usr/ports/www/drraw/distinfo
--- /usr/ports/www/drraw.orig/distinfo	2007-06-22 09:30:21.000000000 +0300
+++ /usr/ports/www/drraw/distinfo	2010-08-27 22:30:22.438740523 +0300
@@ -1,3 +1,6 @@
-MD5 (drraw-2.1.3.tar.gz) = 99466034678b46784fcd4463882b6c8a
-SHA256 (drraw-2.1.3.tar.gz) = c3290781426f81327632b4b0da80360882438f3d44cca81fdeaa3f9b22c3674e
-SIZE (drraw-2.1.3.tar.gz) = 45970
+MD5 (drraw-2.2b2.tar.gz) = 704ac58d2b8d0141e38897b1fe86d8a0
+SHA256 (drraw-2.2b2.tar.gz) = 1583bb15673d48794a71fa12c3447f89046a1ff0ad89d414b5b25013b7751a91
+SIZE (drraw-2.2b2.tar.gz) = 53447
+MD5 (drraw.cgi.zoom_patch) = 08664351e5bcec22ba02ddce8086483e
+SHA256 (drraw.cgi.zoom_patch) = 9930deb7f6a1b0dfe5a005fd918b49ea62020a5a109c7ef68fd7ac8a82fddaa2
+SIZE (drraw.cgi.zoom_patch) = 5733
diff -ruN --exclude=CVS /usr/ports/www/drraw.orig/files/patch-drraw.conf /usr/ports/www/drraw/files/patch-drraw.conf
--- /usr/ports/www/drraw.orig/files/patch-drraw.conf	2006-09-13 13:35:59.000000000 +0300
+++ /usr/ports/www/drraw/files/patch-drraw.conf	2010-08-27 22:37:11.752383114 +0300
@@ -1,9 +1,10 @@
 --- drraw.conf.orig	Sat Nov 13 14:01:22 2004
 +++ drraw.conf	Mon Jul 24 13:39:49 2006
-@@ -21,8 +21,7 @@
+@@ -21,9 +21,8 @@
  # Directories where Round Robin Databases may be found
  # They will be searched recursively for files matching *.rrd (Round Robin
  # Database files) and *.evt (Event files).
+ # NOTE: Specify directory paths without any trailing slash
 -%datadirs = ('/here/are/some/files'  => '[Label1] ',
 -             '/here/are/other/files' => '[Label2] ',
 +%datadirs = (%%DATADIRS%%
--- drraw-2.2b2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: