Attachment 144475 Details for Bug 191249 – New patch against the port...

[patch] New patch against the port...

bmon.diff (text/plain), 4.27 KB, created by Michelle Sullivan on 2014-07-07 08:10:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michelle Sullivan

Created: 2014-07-07 08:10:58 UTC

Size: 4.27 KB

patch

obsolete

>diff -Nru bmon.orig/Makefile bmon/Makefile
>--- bmon.orig/Makefile	2014-07-02 18:29:20.000000000 -0500
>+++ bmon/Makefile	2014-07-07 03:08:14.000000000 -0500
>@@ -2,44 +2,30 @@
> # $FreeBSD: head/net/bmon/Makefile 347069 2014-03-04 20:46:07Z gerald $
> 
> PORTNAME=	bmon
>-PORTVERSION=	2.1.0
>-PORTREVISION=	5
>+PORTVERSION=	3.2
> CATEGORIES=	net
>-MASTER_SITES=	http://people.suug.ch/~tgr/bmon/files/
> 
>-MAINTAINER=	nistor@snickers.org
>+MAINTAINER=	michelle@sorbs.net
> COMMENT=	Portable bandwidth monitor and rate estimator
> 
>-OPTIONS_DEFINE=		DBI RRDTOOL
>-OPTIONS_DEFAULT=	DBI
>-DBI_DESC=	LibDBI output module for rsyslog
>-RRDTOOL_DESC=	Usage graphs support
>-
>-CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>-USES=		gmake
>-GNU_CONFIGURE=	YES
>-CONFIGURE_ARGS=	--disable-asound
>-MAKEFILE=	GNUmakefile
>-
>-PLIST_FILES=	sbin/bmon man/man1/bmon.1.gz
>-
>-.include <bsd.port.options.mk>
>-
>-.if ${PORT_OPTIONS:MRRDTOOL}
>-BUILD_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool
>-.else
>-CONFIGURE_ARGS+=--disable-rrd
>-.endif
>-
>-.if ${PORT_OPTIONS:MDBI}
>-LIB_DEPENDS=	libdbi.so:${PORTSDIR}/databases/libdbi
>-.else
>-CONFIGURE_ARGS+=--disable-dbi
>-.endif
>-
>-do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/src/bmon ${STAGEDIR}${PREFIX}/sbin
>-	${INSTALL_MAN} ${WRKSRC}/man/bmon.1 ${STAGEDIR}${PREFIX}/man/man1/bmon.1
>+LICENSE=	MIT
> 
>-.include <bsd.port.mk>
>+LIB_DEPENDS=	libconfuse.so:${PORTSDIR}/devel/libconfuse
>+
>+CONFLICTS_INSTALL=	bmon-*
>+
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	tgraf
>+GH_COMMIT=	b34be16
>+GH_TAGNAME=	${GH_COMMIT}
>+
>+USE_AUTOTOOLS=	autoconf autoheader automake aclocal
>+AUTOMAKE_ARGS+=	--force-missing --add-missing
>+GNU_CONFIGURE=	yes
>+
>+.include <bsd.port.pre.mk>
>+
>+post-extract:
>+	@${MKDIR} ${WRKSRC}/build-aux
>+
>+.include <bsd.port.post.mk>
>diff -Nru bmon.orig/distinfo bmon/distinfo
>--- bmon.orig/distinfo	2014-07-02 18:29:20.000000000 -0500
>+++ bmon/distinfo	2014-07-02 18:38:44.000000000 -0500
>@@ -1,2 +1,2 @@
>-SHA256 (bmon-2.1.0.tar.gz) = 36a5772fc0241298b15db3dc4fb2552dcbb43edeffd6fcea4cd8818e97ec99fe
>-SIZE (bmon-2.1.0.tar.gz) = 270287
>+SHA256 (bmon-3.2.tar.gz) = de9200f6bf2acf3e2c71628d32365153124addf15148b0ed6dbfed07ef489136
>+SIZE (bmon-3.2.tar.gz) = 57204
>diff -Nru bmon.orig/files/patch-out_xml_event.c bmon/files/patch-out_xml_event.c
>--- bmon.orig/files/patch-out_xml_event.c	2014-07-02 18:29:20.000000000 -0500
>+++ bmon/files/patch-out_xml_event.c	1969-12-31 18:00:00.000000000 -0600
>@@ -1,11 +0,0 @@
>---- src/out_xml_event.c.orig	Tue Apr  5 17:01:33 2005
>-+++ src/out_xml_event.c	Sun Jan 28 14:28:18 2007
>-@@ -127,7 +127,7 @@
>- 	.om_draw = xml_event_draw,
>- 	.om_set_opts = xml_event_set_opts,
>- 	.om_probe = xml_event_probe,
>--	.om_shutdown xml_event_shutdown,
>-+	.om_shutdown = xml_event_shutdown,
>- };
>- 
>- static void __init xml_event_init(void)
>diff -Nru bmon.orig/files/patch-src__out_db.c bmon/files/patch-src__out_db.c
>--- bmon.orig/files/patch-src__out_db.c	2014-07-02 18:29:20.000000000 -0500
>+++ bmon/files/patch-src__out_db.c	1969-12-31 18:00:00.000000000 -0600
>@@ -1,11 +0,0 @@
>---- ./src/out_db.c.orig	2008-03-24 22:44:47.000000000 -0400
>-+++ ./src/out_db.c	2008-03-24 22:45:03.000000000 -0400
>-@@ -679,7 +679,7 @@
>- 	.om_draw = db_draw,
>- 	.om_set_opts = db_set_opts,
>- 	.om_probe = db_probe,
>--	.om_shutdown db_shutdown,
>-+	.om_shutdown = db_shutdown,
>- };
>- 
>- static void __init db_init(void)
>diff -Nru bmon.orig/pkg-descr bmon/pkg-descr
>--- bmon.orig/pkg-descr	2014-07-02 18:29:20.000000000 -0500
>+++ bmon/pkg-descr	2014-07-07 02:32:16.000000000 -0500
>@@ -1,8 +1,6 @@
>-bmon is an interface bandwidth monitor using the curses library.
>-It's able to compute and draw three types of diagrams (overview,
>-graphical, and detailed). The overview diagram is a list of all
>-interfaces including the rx/tx rates of each interface. The
>-graphical diagram is a bar graph in ASCII. All diagrams are
>-continously updated.
>+bmon is a monitoring and debugging tool to capture networking related statistics
>+and prepare them visually in a human friendly way. It features various output
>+methods including an interactive curses user interface and a programmable text
>+output for scripting.
> 
> WWW: http://people.suug.ch/~tgr/bmon/
>diff -Nru bmon.orig/pkg-plist bmon/pkg-plist
>--- bmon.orig/pkg-plist	1969-12-31 18:00:00.000000000 -0600
>+++ bmon/pkg-plist	2014-06-22 06:35:25.000000000 -0500
>@@ -0,0 +1,3 @@
>+bin/bmon
>+%%ETCDIR%%.conf
>+man/man8/bmon.8.gz

Actions: View | Diff

Attachments on bug 191249: 144002 | 144360 | 144475