From owner-svn-ports-all@freebsd.org Mon Mar 7 17:47:42 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7624BAC30A4; Mon, 7 Mar 2016 17:47:42 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4A1E4861; Mon, 7 Mar 2016 17:47:42 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u27Hlf1P007589; Mon, 7 Mar 2016 17:47:41 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u27Hlecj007582; Mon, 7 Mar 2016 17:47:40 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201603071747.u27Hlecj007582@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Mon, 7 Mar 2016 17:47:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r410531 - in head/net-mgmt/etherape: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2016 17:47:42 -0000 Author: mat Date: Mon Mar 7 17:47:40 2016 New Revision: 410531 URL: https://svnweb.freebsd.org/changeset/ports/410531 Log: Update to 0.9.14 PR: 207164 Submitted by: tkato432 yahoo com Sponsored by: Absolight Added: head/net-mgmt/etherape/files/patch-src_decode__proto.c (contents, props changed) - copied, changed from r410521, head/net-mgmt/etherape/files/patch-src__decocde_proto.c head/net-mgmt/etherape/files/patch-src_diagram.c (contents, props changed) - copied, changed from r410521, head/net-mgmt/etherape/files/patch-src__names.c head/net-mgmt/etherape/files/patch-src_names.c (contents, props changed) - copied, changed from r410521, head/net-mgmt/etherape/files/patch-src__names.c head/net-mgmt/etherape/files/patch-src_thread__resolve.c (contents, props changed) Deleted: head/net-mgmt/etherape/files/patch-src__decocde_proto.c head/net-mgmt/etherape/files/patch-src__names.c head/net-mgmt/etherape/files/patch-thread_resolve.c Modified: head/net-mgmt/etherape/Makefile head/net-mgmt/etherape/distinfo head/net-mgmt/etherape/pkg-plist Modified: head/net-mgmt/etherape/Makefile ============================================================================== --- head/net-mgmt/etherape/Makefile Mon Mar 7 17:24:10 2016 (r410530) +++ head/net-mgmt/etherape/Makefile Mon Mar 7 17:47:40 2016 (r410531) @@ -2,15 +2,15 @@ # $FreeBSD$ PORTNAME= etherape -PORTVERSION= 0.9.13 -PORTREVISION= 2 +PORTVERSION= 0.9.14 CATEGORIES= net-mgmt gnome MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Graphical network traffic monitor tool modeled after Etherman -LICENSE= GPLv2 +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING USES= gettext gmake iconv pathfix pkgconfig USE_GNOME= gnomedocutils libglade2 libgnomeui @@ -18,18 +18,20 @@ GNU_CONFIGURE= yes INSTALLS_OMF= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -export-dynamic # XXX: G_MODULE_EXPORT? +LDFLAGS+= -L${LOCALBASE}/lib -PORTDOCS= * +PORTDOCS= AUTHORS ChangeLog FAQ NEWS README README.bugs TODO OPTIONS_DEFINE= DOCS -post-install: +post-patch: + @${REINPLACE_CMD} -e \ + 's|char \*argv)|char **argv)|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + 's|__EXPORT__|__EXPORT_H__|' ${WRKSRC}/src/export.h + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} FAQ README* TODO ${STAGEDIR}${DOCSDIR} -.for f in AUTHORS ChangeLog NEWS - ${ICONV_CMD} -f latin1 -t utf-8 ${WRKSRC}/${f} > \ - ${STAGEDIR}${DOCSDIR}/${f} -.endfor + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include Modified: head/net-mgmt/etherape/distinfo ============================================================================== --- head/net-mgmt/etherape/distinfo Mon Mar 7 17:24:10 2016 (r410530) +++ head/net-mgmt/etherape/distinfo Mon Mar 7 17:47:40 2016 (r410531) @@ -1,2 +1,2 @@ -SHA256 (etherape-0.9.13.tar.gz) = 2a3d2a28b824ce4797529bb90d19a213d80e70f5b3f0cc5f455379aac31c09f7 -SIZE (etherape-0.9.13.tar.gz) = 1399211 +SHA256 (etherape-0.9.14.tar.gz) = 7447435ef64e569d8e10b6a0525806c01f527e76ae9eed5c84821f545f357ade +SIZE (etherape-0.9.14.tar.gz) = 1438255 Copied and modified: head/net-mgmt/etherape/files/patch-src_decode__proto.c (from r410521, head/net-mgmt/etherape/files/patch-src__decocde_proto.c) ============================================================================== --- head/net-mgmt/etherape/files/patch-src__decocde_proto.c Mon Mar 7 13:38:59 2016 (r410521, copy source) +++ head/net-mgmt/etherape/files/patch-src_decode__proto.c Mon Mar 7 17:47:40 2016 (r410531) @@ -1,4 +1,4 @@ ---- src/decode_proto.c.orig +--- src/decode_proto.c.orig 2014-02-02 18:38:16 UTC +++ src/decode_proto.c @@ -27,6 +27,15 @@ #include "appdata.h" Copied and modified: head/net-mgmt/etherape/files/patch-src_diagram.c (from r410521, head/net-mgmt/etherape/files/patch-src__names.c) ============================================================================== --- head/net-mgmt/etherape/files/patch-src__names.c Mon Mar 7 13:38:59 2016 (r410521, copy source) +++ head/net-mgmt/etherape/files/patch-src_diagram.c Mon Mar 7 17:47:40 2016 (r410531) @@ -1,5 +1,5 @@ ---- src/names.c.orig -+++ src/names.c +--- src/diagram.c.orig 2016-01-25 20:19:16 UTC ++++ src/diagram.c @@ -21,7 +21,18 @@ #include #endif @@ -11,11 +11,11 @@ +#include +#endif +#ifdef HAVE_NETINET_IN_H - #include ++#include +#endif +#ifdef HAVE_ARPA_INET_H -+#include + #include +#endif - #ifdef HAVE_UNISTD_H - #include - #endif + + #include + #include Copied and modified: head/net-mgmt/etherape/files/patch-src_names.c (from r410521, head/net-mgmt/etherape/files/patch-src__names.c) ============================================================================== --- head/net-mgmt/etherape/files/patch-src__names.c Mon Mar 7 13:38:59 2016 (r410521, copy source) +++ head/net-mgmt/etherape/files/patch-src_names.c Mon Mar 7 17:47:40 2016 (r410531) @@ -1,4 +1,4 @@ ---- src/names.c.orig +--- src/names.c.orig 2014-02-02 11:30:03 UTC +++ src/names.c @@ -21,7 +21,18 @@ #include Added: head/net-mgmt/etherape/files/patch-src_thread__resolve.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/etherape/files/patch-src_thread__resolve.c Mon Mar 7 17:47:40 2016 (r410531) @@ -0,0 +1,23 @@ +--- src/thread_resolve.c.orig 2015-06-06 07:18:29 UTC ++++ src/thread_resolve.c +@@ -161,6 +161,10 @@ thread_pool_routine(void *dt) + + pthread_mutex_unlock(&resolvemtx); + } ++ ++ /* close mutex */ ++ close_mutex(); ++ + return NULL; + } + +@@ -279,9 +283,6 @@ thread_close(void) + { + /* thread pool shutdown */ + stop_threads(); +- +- /* close mutex */ +- close_mutex(); + } + + const char * Modified: head/net-mgmt/etherape/pkg-plist ============================================================================== --- head/net-mgmt/etherape/pkg-plist Mon Mar 7 17:24:10 2016 (r410530) +++ head/net-mgmt/etherape/pkg-plist Mon Mar 7 17:47:40 2016 (r410531) @@ -1,5 +1,4 @@ bin/etherape -%%ETCDIR%%/services man/man1/etherape.1.gz share/applications/etherape.desktop %%DATADIR%%/glade/etherape.glade