cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to nload 0.7.4, from Brad, maintainer had similar diff

Browse Source 
additional tweaks from me:
- fix docs/Makefile.in to allow SEPARATE_BUILD
- no need to mirror, upstream has old versions now
- add a patch from upstream to avoid junk after the interface name
This commit is contained in:
sthen 2012-02-19 14:03:37 +00:00
parent 45f76d1b23
commit 940a0e8ed5
4 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/nload/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.2 2011/06/15 15:19:05 sthen Exp $ # $OpenBSD: Makefile,v 1.3 2012/02/19 14:03:37 sthen Exp $
COMMENT= network traffic and bandwidth usage in real time COMMENT= network traffic and bandwidth usage in real time
DISTNAME= nload-0.7.3 DISTNAME= nload-0.7.4
CATEGORIES= net CATEGORIES= net
HOMEPAGE= http://www.roland-riegel.de/nload/ HOMEPAGE= http://www.roland-riegel.de/nload/
@ -14,10 +14,10 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://www.roland-riegel.de/nload/ \ MASTER_SITES= ${HOMEPAGE}
http://x61.com.ar/nload/
CONFIGURE_STYLE= gnu CONFIGURE_STYLE= gnu
SEPARATE_BUILD= simple
WANTLIB= c form m ncurses stdc++ WANTLIB= c form m ncurses stdc++

10
net/nload/distinfo
View File

@ -1,5 +1,5 @@
MD5 (nload-0.7.3.tar.gz) = m5fDf+FHTx2kLyZf6tJAgQ== MD5 (nload-0.7.4.tar.gz) = PHM8Uo8kTKWk92vxhXKcOQ==
RMD160 (nload-0.7.3.tar.gz) = meYm+ByR4DBMMaCNLyPV3T2hQJI= RMD160 (nload-0.7.4.tar.gz) = d+sZnuc/3EWyWw4kbCunP6bv53k=
SHA1 (nload-0.7.3.tar.gz) = 6ZWz+w+xtaSLWxfFcammMKPS0Eg= SHA1 (nload-0.7.4.tar.gz) = uwoWjJPFiK1P1eOmU7NiC3mtoeg=
SHA256 (nload-0.7.3.tar.gz) = TcjouACY7OHRjO6sVbgQNs5NVgYfJDQrbNQL5e2olCI= SHA256 (nload-0.7.4.tar.gz) = wcBR5xVeJiQ9Vpvl2Zx0TYYg5l+op+Be/PhNAdnUaeU=
SIZE (nload-0.7.3.tar.gz) = 150887 SIZE (nload-0.7.4.tar.gz) = 151005

12
net/nload/patches/patch-docs_Makefile_in
View File

@ -1,11 +1,13 @@
$OpenBSD: patch-docs_Makefile_in,v 1.1.1.1 2011/06/13 20:15:45 landry Exp $ $OpenBSD: patch-docs_Makefile_in,v 1.2 2012/02/19 14:03:37 sthen Exp $
--- docs/Makefile.in.orig Sun Jun 12 13:18:42 2011 --- docs/Makefile.in.orig Mon Feb 6 09:53:59 2012
+++ docs/Makefile.in Mon Jun 13 13:23:16 2011 +++ docs/Makefile.in Sat Feb 18 16:03:17 2012
@@ -328,7 +328,6 @@ uninstall-am: @@ -327,8 +327,7 @@ uninstall-am:
install: install:
$(mkinstalldirs) $(DESTDIR)$(mandir)/man1 $(mkinstalldirs) $(DESTDIR)$(mandir)/man1
$(INSTALL_DATA) $(top_srcdir)/docs/$(PACKAGE).1 $(DESTDIR)$(mandir)/man1 - $(INSTALL_DATA) $(top_srcdir)/docs/$(PACKAGE).1 $(DESTDIR)$(mandir)/man1
- gzip -f $(DESTDIR)$(mandir)/man1/$(PACKAGE).1 - gzip -f $(DESTDIR)$(mandir)/man1/$(PACKAGE).1
+ $(INSTALL_DATA) $(top_builddir)/docs/$(PACKAGE).1 $(DESTDIR)$(mandir)/man1
uninstall: uninstall:
rm $(DESTDIR)$(mandir)/man1/$(PACKAGE).1.gz rm $(DESTDIR)$(mandir)/man1/$(PACKAGE).1.gz

15
net/nload/patches/patch-src_devreader-bsd_cpp Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_devreader-bsd_cpp,v 1.1 2012/02/19 14:03:37 sthen Exp $
Don't include garbage after the interface name. From upstream.
--- src/devreader-bsd.cpp.orig Sun Feb 19 13:57:42 2012
+++ src/devreader-bsd.cpp Sun Feb 19 13:57:54 2012
@@ -91,7 +91,7 @@ list<string> DevReaderBsd::findAllDevices()
if(sdl->sdl_family != AF_LINK)
continue;
- interfaceNames.push_back(string(sdl->sdl_data));
+ interfaceNames.push_back(string(sdl->sdl_data, sdl->sdl_nlen));
}
free(buf);