Attachment #166945 for bug #207164

View | Details | Raw Unified | Return to bug 207164
Collapse All | Expand All




# $FreeBSD: head/net-mgmt/etherape/Makefile 383745 2015-04-10 17:17:25Z danfe $

PORTNAME=	etherape
PORTVERSION=	0.9.14
PORTREVISION=	2
CATEGORIES=	net-mgmt gnome
MASTER_SITES=	SF

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Graphical network traffic monitor tool modeled after Etherman

LICENSE=	GPLv2+
LICENSE_FILE=	${WRKSRC}/COPYING

USES=		gettext gmake iconv pathfix pkgconfig
USE_GNOME=	gnomedocutils libglade2 libgnomeui

INSTALLS_OMF=	yes

CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

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} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
.for f in AUTHORS ChangeLog NEWS
	${ICONV_CMD} -f latin1 -t utf-8 ${WRKSRC}/${f} > \
		${STAGEDIR}${DOCSDIR}/${f}
.endfor

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)net-mgmt/etherape/distinfo (-2 / +2 lines)
1	SHA256 (etherape-0.9.13.tar.gz) = 2a3d2a28b824ce4797529bb90d19a213d80e70f5b3f0cc5f455379aac31c09f7	1	SHA256 (etherape-0.9.14.tar.gz) = 7447435ef64e569d8e10b6a0525806c01f527e76ae9eed5c84821f545f357ade
2	SIZE (etherape-0.9.13.tar.gz) = 1399211	2	SIZE (etherape-0.9.14.tar.gz) = 1438255




--- 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




--- 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




--- 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>

Lines 1-4 Link Here

(-)net-mgmt/etherape/files/patch-src__names.c (-1 / +1 lines)
1	--- src/names.c.orig	1	--- src/names.c.orig 2014-02-02 11:30:03 UTC
2	+++ src/names.c	2	+++ src/names.c
3	@@ -21,7 +21,18 @@	3	@@ -21,7 +21,18 @@
4	#include <config.h>	4	#include <config.h>

Lines 1-6 Link Here

(-)net-mgmt/etherape/files/patch-thread_resolve.c (-5 / +5 lines)
1	--- src/thread_resolve.c.orig Tue Apr 25 09:08:28 2006	1	--- src/thread_resolve.c.orig 2015-06-06 07:18:29 UTC
2	+++ src/thread_resolve.c Mon May 29 00:37:45 2006	2	+++ src/thread_resolve.c
3	@@ -167,6 +167,10 @@	3	@@ -161,6 +161,10 @@ thread_pool_routine(void *dt)
4		4
5	pthread_mutex_unlock(&resolvemtx);	5	pthread_mutex_unlock(&resolvemtx);
6	}	6	}
Lines 11-17 Link Here
11	return NULL;	11	return NULL;
12	}	12	}
13		13
14	@@ -268,9 +272,6 @@	14	@@ -279,9 +283,6 @@ thread_close(void)
15	{	15	{
16	/* thread pool shutdown */	16	/* thread pool shutdown */
17	stop_threads();	17	stop_threads();
Lines 20-23 Link Here
20	- close_mutex();	20	- close_mutex();
21	}	21	}
22		22
23	/* returns 1 if the current dns implementation has a socket wich needs a select() */	23	const char *

Lines 1-5 Link Here

(-)net-mgmt/etherape/pkg-plist (-1 lines)
1	bin/etherape	1	bin/etherape
2	%%ETCDIR%%/services
3	man/man1/etherape.1.gz	2	man/man1/etherape.1.gz
4	share/applications/etherape.desktop	3	share/applications/etherape.desktop
5	%%DATADIR%%/glade/etherape.glade	4	%%DATADIR%%/glade/etherape.glade

Return to bug 207164

Lines 2-16 Link Here

(-)net-mgmt/etherape/Makefile (-10 / +12 lines)
2	# $FreeBSD: head/net-mgmt/etherape/Makefile 383745 2015-04-10 17:17:25Z danfe $	2	# $FreeBSD: head/net-mgmt/etherape/Makefile 383745 2015-04-10 17:17:25Z danfe $
3		3
4	PORTNAME= etherape	4	PORTNAME= etherape
5	PORTVERSION= 0.9.13	5	PORTVERSION= 0.9.14
6	PORTREVISION= 2
7	CATEGORIES= net-mgmt gnome	6	CATEGORIES= net-mgmt gnome
8	MASTER_SITES= SF	7	MASTER_SITES= SF
9		8
10	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
11	COMMENT= Graphical network traffic monitor tool modeled after Etherman	10	COMMENT= Graphical network traffic monitor tool modeled after Etherman
12		11
13	LICENSE= GPLv2	12	LICENSE= GPLv2+
		13	LICENSE_FILE= ${WRKSRC}/COPYING
14		14
15	USES= gettext gmake iconv pathfix pkgconfig	15	USES= gettext gmake iconv pathfix pkgconfig
16	USE_GNOME= gnomedocutils libglade2 libgnomeui	16	USE_GNOME= gnomedocutils libglade2 libgnomeui
Lines 18-35 Link Here
18	INSTALLS_OMF= yes	18	INSTALLS_OMF= yes
19		19
20	CPPFLAGS+= -I${LOCALBASE}/include	20	CPPFLAGS+= -I${LOCALBASE}/include
21	LDFLAGS+= -L${LOCALBASE}/lib -export-dynamic # XXX: G_MODULE_EXPORT?	21	LDFLAGS+= -L${LOCALBASE}/lib
22		22
23	PORTDOCS= *	23	PORTDOCS= AUTHORS ChangeLog FAQ NEWS README README.bugs TODO
24		24
25	OPTIONS_DEFINE= DOCS	25	OPTIONS_DEFINE= DOCS
26		26
		27	post-patch:
		28	@${REINPLACE_CMD} -e \
		29	's\|char \argv)\|char *argv)\|' ${WRKSRC}/configure
		30	@${REINPLACE_CMD} -e \
		31	's\|__EXPORT__\|__EXPORT_H__\|' ${WRKSRC}/src/export.h
		32
27	post-install:	33	post-install:
28	@${MKDIR} ${STAGEDIR}${DOCSDIR}	34	@${MKDIR} ${STAGEDIR}${DOCSDIR}
29	cd ${WRKSRC} && ${INSTALL_DATA} FAQ README* TODO ${STAGEDIR}${DOCSDIR}	35	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
30	.for f in AUTHORS ChangeLog NEWS
31	${ICONV_CMD} -f latin1 -t utf-8 ${WRKSRC}/${f} > \
32	${STAGEDIR}${DOCSDIR}/${f}
33	.endfor
34		36
35	.include <bsd.port.mk>	37	.include <bsd.port.mk>

Lines 1-18 Link Here

(-)net-mgmt/etherape/files/patch-src__decocde_proto.c (-18 lines)
1	--- src/decode_proto.c.orig
2	+++ src/decode_proto.c
3	@@ -27,6 +27,15 @@
4	#include "appdata.h"
5	#include <ctype.h>
6	#include <string.h>
7	+#ifdef HAVE_SYS_TYPES_H
8	+#include <sys/types.h>
9	+#endif
10	+#ifdef HAVE_SYS_SOCKET_H
11	+#include <sys/socket.h>
12	+#endif
13	+#ifdef HAVE_NETINET_IN_H
14	+#include <netinet/in.h>
15	+#endif
16	#ifdef HAVE_ARPA_INET_H
17	#include <arpa/inet.h>
18	#endif

Line 0 Link Here

(-)net-mgmt/etherape/files/patch-src__decode_proto.c (+18 lines)
	1	--- src/decode_proto.c.orig 2014-02-02 18:38:16 UTC
	2	+++ src/decode_proto.c
	3	@@ -27,6 +27,15 @@
	4	#include "appdata.h"
	5	#include <ctype.h>
	6	#include <string.h>
	7	+#ifdef HAVE_SYS_TYPES_H
	8	+#include <sys/types.h>
	9	+#endif
	10	+#ifdef HAVE_SYS_SOCKET_H
	11	+#include <sys/socket.h>
	12	+#endif
	13	+#ifdef HAVE_NETINET_IN_H
	14	+#include <netinet/in.h>
	15	+#endif
	16	#ifdef HAVE_ARPA_INET_H
	17	#include <arpa/inet.h>
	18	#endif

Line 0 Link Here

(-)net-mgmt/etherape/files/patch-src__diagram.c (+21 lines)
	1	--- src/diagram.c.orig 2016-01-25 20:19:16 UTC
	2	+++ src/diagram.c
	3	@@ -21,7 +21,18 @@
	4	#include <config.h>
	5	#endif
	6
	7	+#ifdef HAVE_SYS_TYPES_H
	8	+#include <sys/types.h>
	9	+#endif
	10	+#ifdef HAVE_SYS_SOCKET_H
	11	+#include <sys/socket.h>
	12	+#endif
	13	+#ifdef HAVE_NETINET_IN_H
	14	+#include <netinet/in.h>
	15	+#endif
	16	+#ifdef HAVE_ARPA_INET_H
	17	#include <arpa/inet.h>
	18	+#endif
	19
	20	#include <gnome.h>
	21	#include <regex.h>