Attachment 166945 Details for Bug 207164 – net-mgmt_etherape.diff

[patch] net-mgmt_etherape.diff

net-mgmt_etherape.diff (text/plain), 5.79 KB, created by tkato432 on 2016-02-13 18:34:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2016-02-13 18:34:10 UTC

Size: 5.79 KB

patch

obsolete

>diff -urN /usr/ports/net-mgmt/etherape/Makefile net-mgmt/etherape/Makefile
>--- /usr/ports/net-mgmt/etherape/Makefile	2015-08-24 04:03:17.040981000 +0900
>+++ net-mgmt/etherape/Makefile	2016-02-14 00:00:00.000000000 +0900
>@@ -2,15 +2,15 @@
> # $FreeBSD: head/net-mgmt/etherape/Makefile 383745 2015-04-10 17:17:25Z danfe $
> 
> 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 @@
> 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-patch:
>+	@${REINPLACE_CMD} -e \
>+		's|char \*argv)|char **argv)|' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e \
>+		's|__EXPORT__|__EXPORT_H__|' ${WRKSRC}/src/export.h
>+
> post-install:
> 	@${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 <bsd.port.mk>
>diff -urN /usr/ports/net-mgmt/etherape/distinfo net-mgmt/etherape/distinfo
>--- /usr/ports/net-mgmt/etherape/distinfo	2015-08-24 04:03:17.052979000 +0900
>+++ net-mgmt/etherape/distinfo	2016-02-14 00:00:00.000000000 +0900
>@@ -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
>diff -urN /usr/ports/net-mgmt/etherape/files/patch-src__decocde_proto.c net-mgmt/etherape/files/patch-src__decocde_proto.c
>--- /usr/ports/net-mgmt/etherape/files/patch-src__decocde_proto.c	2015-08-24 04:03:17.081994000 +0900
>+++ net-mgmt/etherape/files/patch-src__decocde_proto.c	1970-01-01 09:00:00.000000000 +0900
>@@ -1,18 +0,0 @@
>---- src/decode_proto.c.orig
>-+++ src/decode_proto.c
>-@@ -27,6 +27,15 @@
>- #include "appdata.h"
>- #include <ctype.h>
>- #include <string.h>
>-+#ifdef HAVE_SYS_TYPES_H
>-+#include <sys/types.h>
>-+#endif
>-+#ifdef HAVE_SYS_SOCKET_H
>-+#include <sys/socket.h>
>-+#endif
>-+#ifdef HAVE_NETINET_IN_H
>-+#include <netinet/in.h>
>-+#endif
>- #ifdef HAVE_ARPA_INET_H
>- #include <arpa/inet.h>
>- #endif
>diff -urN /usr/ports/net-mgmt/etherape/files/patch-src__decode_proto.c net-mgmt/etherape/files/patch-src__decode_proto.c
>--- /usr/ports/net-mgmt/etherape/files/patch-src__decode_proto.c	1970-01-01 09:00:00.000000000 +0900
>+++ net-mgmt/etherape/files/patch-src__decode_proto.c	2016-02-14 00:00:00.000000000 +0900
>@@ -0,0 +1,18 @@
>+--- src/decode_proto.c.orig	2014-02-02 18:38:16 UTC
>++++ src/decode_proto.c
>+@@ -27,6 +27,15 @@
>+ #include "appdata.h"
>+ #include <ctype.h>
>+ #include <string.h>
>++#ifdef HAVE_SYS_TYPES_H
>++#include <sys/types.h>
>++#endif
>++#ifdef HAVE_SYS_SOCKET_H
>++#include <sys/socket.h>
>++#endif
>++#ifdef HAVE_NETINET_IN_H
>++#include <netinet/in.h>
>++#endif
>+ #ifdef HAVE_ARPA_INET_H
>+ #include <arpa/inet.h>
>+ #endif
>diff -urN /usr/ports/net-mgmt/etherape/files/patch-src__diagram.c net-mgmt/etherape/files/patch-src__diagram.c
>--- /usr/ports/net-mgmt/etherape/files/patch-src__diagram.c	1970-01-01 09:00:00.000000000 +0900
>+++ net-mgmt/etherape/files/patch-src__diagram.c	2016-02-14 00:00:00.000000000 +0900
>@@ -0,0 +1,21 @@
>+--- src/diagram.c.orig	2016-01-25 20:19:16 UTC
>++++ src/diagram.c
>+@@ -21,7 +21,18 @@
>+ #include <config.h>
>+ #endif
>+ 
>++#ifdef HAVE_SYS_TYPES_H
>++#include <sys/types.h>
>++#endif
>++#ifdef HAVE_SYS_SOCKET_H
>++#include <sys/socket.h>
>++#endif
>++#ifdef HAVE_NETINET_IN_H
>++#include <netinet/in.h>
>++#endif
>++#ifdef HAVE_ARPA_INET_H
>+ #include <arpa/inet.h>
>++#endif
>+ 
>+ #include <gnome.h>
>+ #include <regex.h>
>diff -urN /usr/ports/net-mgmt/etherape/files/patch-src__names.c net-mgmt/etherape/files/patch-src__names.c
>--- /usr/ports/net-mgmt/etherape/files/patch-src__names.c	2015-08-24 04:03:17.070179000 +0900
>+++ net-mgmt/etherape/files/patch-src__names.c	2016-02-14 00:00:00.000000000 +0900
>@@ -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 <config.h>
>diff -urN /usr/ports/net-mgmt/etherape/files/patch-thread_resolve.c net-mgmt/etherape/files/patch-thread_resolve.c
>--- /usr/ports/net-mgmt/etherape/files/patch-thread_resolve.c	2015-08-24 04:03:17.119861000 +0900
>+++ net-mgmt/etherape/files/patch-thread_resolve.c	2016-02-14 00:00:00.000000000 +0900
>@@ -1,6 +1,6 @@
>---- src/thread_resolve.c.orig	Tue Apr 25 09:08:28 2006
>-+++ src/thread_resolve.c	Mon May 29 00:37:45 2006
>-@@ -167,6 +167,10 @@
>+--- 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);
>     }
>@@ -11,7 +11,7 @@
>     return NULL;
>  }
>  
>-@@ -268,9 +272,6 @@
>+@@ -279,9 +283,6 @@ thread_close(void)
>  {
>    /* thread pool shutdown */ 
>    stop_threads();
>@@ -20,4 +20,4 @@
> -  close_mutex();
>  }
>  
>- /* returns 1 if the current dns implementation has a socket wich needs a select() */
>+ const char *
>diff -urN /usr/ports/net-mgmt/etherape/pkg-plist net-mgmt/etherape/pkg-plist
>--- /usr/ports/net-mgmt/etherape/pkg-plist	2015-08-24 04:03:17.028569000 +0900
>+++ net-mgmt/etherape/pkg-plist	2016-02-14 00:00:00.000000000 +0900
>@@ -1,5 +1,4 @@
> bin/etherape
>-%%ETCDIR%%/services
> man/man1/etherape.1.gz
> share/applications/etherape.desktop
> %%DATADIR%%/glade/etherape.glade

Actions: View | Diff

Attachments on bug 207164: 166945