- Update to 0.8.0

- Add LICENSE
- Convert to new LIB_DEPENDS format
- Convert to new options helper
- Add options: DESKTOP, IPV6 and NCURSES
- Add ipv6 to CATEGORIES conditionally
- Support STAGEDIR
- Reformat pkg-descr
- Update WWW

Changes:	https://github.com/Ettercap/ettercap/releases

8 files changed, 248 insertions, 280 deletions

diff --git a/net-mgmt/ettercap/Makefile b/net-mgmt/ettercap/Makefile
index a54ede459a22..13f9adec88bd 100644
--- a/net-mgmt/ettercap/Makefile
+++ b/net-mgmt/ettercap/Makefile
@@ -2,114 +2,94 @@
 # $FreeBSD$
 
 PORTNAME=	ettercap
-PORTVERSION=	0.7.4.1
-PORTREVISION=	3
+PORTVERSION=	0.8.0
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt security
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}-Lazarus \
-		${MASTER_SITE_PACKETSTORM:S:%SUBDIR%:sniffers/ettercap:}
+MASTER_SITES=	GH \
+		GHC
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Network sniffer/interceptor/injector/logger for switched LANs
 
-LIB_DEPENDS=	net:${PORTSDIR}/net/libnet
+LICENSE=	GPLv2
 
-# GTK -> GTK2, ICONV -> UTF8
-OPTIONS_DEFINE=	DOCS GTK2 PCRE PLUGINS SSL UTF8
-OPTIONS_DEFAULT=GTK2 PCRE PLUGINS SSL UTF8
+LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+
+OPTIONS_DEFINE=	DESKTOP DOCS GTK2 IPV6 NCURSES PCRE PLUGINS SSL UTF8
+OPTIONS_DEFAULT=GTK2 NCURSES PCRE PLUGINS SSL UTF8
+OPTIONS_SUB=	yes
+DESKTOP_DESC=	Install ettercap.desktop
+NCURSES_DESC=	Ncurses interface
 PCRE_DESC=	Use PCRE in filters
 SSL_DESC=	SSH1 and SSL decryption support
 
-CFLAGS+=	${PTHREAD_CFLAGS}
-CONFIGURE_ENV=	LIBS="${LDFLAGS}"
-CONFIGURE_ARGS=	--enable-plugins
-CPPFLAGS+=	-I${LOCALBASE}/include
-GNU_CONFIGURE=	yes
-LDFLAGS+=	-L${LOCALBASE}/lib
+CMAKE_ARGS=	-DBUNDLED_LIBS=OFF \
+		-DHAVE_LIBNET=${LOCALBASE}/lib/libnet11 \
+		-DHAVE_PCAP=${LIBDIR} \
+		-DHAVE_RESOLV=${LIBDIR} \
+		-DLIBNET_INCLUDE_DIR=${LOCALBASE}/include/libnet11 \
+		-DLIBNET_LIB_DIR=${LOCALBASE}/lib/libnet11 \
+		-DLIBNET_LIBRARY=${LOCALBASE}/lib/libnet11 \
+		-DMAN_INSTALLDIR=${PREFIX}/man
+CMAKE_VERBOSE=	yes
+LDFLAGS+=	-L${LIBDIR} -L${LOCALBASE}/lib -L${LOCALBASE}/lib/libnet11 ${ICONV_LIB} -lnet -lpcap
 MAKE_JOBS_UNSAFE=	yes
-USE_AUTOTOOLS=	libltdl libtool
-USES=		bison pkgconfig
-WANT_GNOME=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}
+USES=		bison cmake:outsource iconv pkgconfig
 
 DOCS=		AUTHORS CHANGELOG README README.BINARIES README.BUGS \
 		README.GIT README.PLATFORMS THANKS TODO TODO.TESTING \
 		doc/capture doc/decoders doc/dissectors doc/threads
-MAN5=		etter.conf.5
-MAN8=		ettercap.8 ettercap_curses.8 etterfilter.8 etterlog.8
 
-LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
+GH_ACCOUNT=	Ettercap
+GH_PROJECT=	${PORTNAME}
+GH_TAGNAME=	v${PORTVERSION}
+GH_COMMIT=	99e062a
+USE_GITHUB=	yes
+
+DESKTOP_CMAKE_OFF=	-DINSTALL_DESKTOP=OFF
+DESKTOP_CMAKE_ON=	-DINSTALL_DESKTOP=ON
+DESKTOP_USES=		desktop-file-utils
+NCURSES_CMAKE_OFF=	-DENABLE_CURSES=OFF
+NCURSES_CMAKE_ON=	-DENABLE_CURSES=ON
+NCURSES_USE=		NCURSES=yes
+GTK2_CMAKE_OFF=		-DENABLE_GTK=OFF
+GTK2_CMAKE_ON=		-DENABLE_GTK=ON
+GTK2_PKGNAMESUFFIX=	-gtk2
+GTK2_USE=		GNOME=gtk20
+IPV6_CMAKE_OFF=		-DENABLE_IPV6=OFF
+IPV6_CMAKE_ON=		-DENABLE_IPV6=ON
+PCRE_CMAKE_OFF=		-DHAVE_PCRE=OFF
+PCRE_CMAKE_ON=		-DHAVE_PCRE=ON
+PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PLUGINS_BUILD_DEPENDS=	curl>=7.26.0:${PORTSDIR}/ftp/curl
+PLUGINS_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+PLUGINS_CMAKE_OFF=	-DENABLE_PLUGINS=OFF
+PLUGINS_CMAKE_ON=	-DENABLE_PLUGINS=ON
+SSL_CMAKE_OFF=		-DENABLE_SSL=OFF
+SSL_CMAKE_ON=		-DENABLE_SSL=ON
+SSL_USE=		OPENSSL=yes
+UTF8_CMAKE_OFF=		-DHAVE_UTF8=OFF
+UTF8_CMAKE_ON=		-DHAVE_UTF8=ON \
+			-DHAVE_ICONV=${ICONV_PREFIX}
+UTF8_USES=		iconv
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MGTK2}
-PKGNAMESUFFIX?=	-gtk2
-CONFIGURE_ARGS+=--enable-gtk
-USE_GNOME=	atk glib20 gtk20 pango
-.else
-CONFIGURE_ARGS+=--disable-gtk
-.endif
-
-.if ${PORT_OPTIONS:MUTF8}
-CONFIGURE_ARGS+=--with-iconv=${ICONV_PREFIX}
-USES+=		iconv
-.endif
-
-.if ${PORT_OPTIONS:MPCRE}
-LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre
-CONFIGURE_ARGS+=--with-libpcre=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=--without-libpcre
-.endif
-
 .if ${PORT_OPTIONS:MPLUGINS}
-CONFIGURE_ARGS+=--enable-plugins
+USE_LDCONFIG=	${PREFIX}/lib/ettercap
 DOCS+=		doc/plugins
-MAN8+=		ettercap_plugins.8
-PLIST_SUB+=	PLUGINS=""
-.else
-CONFIGURE_ARGS+=--disable-plugins
-PLIST_SUB+=	PLUGINS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSSL}
-CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
-USE_OPENSSL=	yes
 .else
-CONFIGURE_ARGS+=--without-openssl
+USE_LDCONFIG=	yes
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800000
-BROKEN=		does not compile on FreeBSD 7.X
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -E \
-		-e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
-		-e 's|test -f /usr/include/libnet\.h|${TRUE}|' \
-		-e 's|(LNETINC=).*|\1"`${LIBNET_CONFIG} --cflags`"|' \
-		-e 's|(LNETLIB=).*|\1"`${LIBNET_CONFIG} --libs`"|' \
-		-e '/ICONVLIB/s|-liconv|${ICONV_LIB}|' \
-			${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -E \
-		-e 's|(^pkgdatadir.+=).+|\1 ${DATADIR}|' \
-		-e '/^install-exec-am:/ s|: .*$$|:|'\
-	       		${WRKSRC}/share/Makefile.in
-# Fix objformat
-	@${REINPLACE_CMD} -E -e 's|(^.*=).*/usr/bin/objformat.*|\1"elf"|' \
-		${WRKSRC}/aclocal.m4 ${WRKSRC}/configure
-
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/share/etter.conf ${PREFIX}/etc/etter.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/share/etter.conf ${STAGEDIR}${PREFIX}/etc/etter.conf.sample
 .if !exists(${PREFIX}/etc/etter.conf)
-	${INSTALL_DATA} ${WRKSRC}/share/etter.conf ${PREFIX}/etc/etter.conf
+	${INSTALL_DATA} ${WRKSRC}/share/etter.conf ${STAGEDIR}${PREFIX}/etc/etter.conf
 .endif
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-mgmt/ettercap/distinfo b/net-mgmt/ettercap/distinfo
index 656e4e7fbf5f..89c8bdaea368 100644
--- a/net-mgmt/ettercap/distinfo
+++ b/net-mgmt/ettercap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ettercap-0.7.4.1.tar.gz) = b1110f471247cf0ac7b05bf6ddb5df12a246192b97b15d942583d0fd35cb8b52
-SIZE (ettercap-0.7.4.1.tar.gz) = 2997353
+SHA256 (ettercap-0.8.0.tar.gz) = 0533f2fb41528d2100e36523772b8c43b1ca96c4720364dbb8bc7e665a6c4da9
+SIZE (ettercap-0.8.0.tar.gz) = 7069171
diff --git a/net-mgmt/ettercap/files/patch-configure b/net-mgmt/ettercap/files/patch-configure
deleted file mode 100644
index d0b31d5afa08..000000000000
--- a/net-mgmt/ettercap/files/patch-configure
+++ /dev/null
@@ -1,146 +0,0 @@
---- configure.orig	2011-12-06 07:01:58.000000000 +0800
-+++ configure	2012-04-10 03:00:36.554106808 +0800
-@@ -15038,7 +15038,7 @@
- 
-       #include <arpa/nameser.h>
- 
--      int main()
-+      int main(int argc, char *argv[])
-       {
-          int i;
-          char *p = "\x01\x02\x03\x04";
-@@ -15285,22 +15285,23 @@
-   return 0;
- }
- _ACEOF
--for ac_lib in '' c_r pthread; do
--  if test -z "$ac_lib"; then
--    ac_res="none required"
--  else
--    ac_res=-l$ac_lib
--    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
--  fi
--  if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_search_pthread_create=$ac_res
--fi
--rm -f core conftest.err conftest.$ac_objext \
--    conftest$ac_exeext
--  if ${ac_cv_search_pthread_create+:} false; then :
--  break
--fi
--done
-+#for ac_lib in '' c_r pthread; do
-+#  if test -z "$ac_lib"; then
-+#    ac_res="none required"
-+#  else
-+#    ac_res=-l$ac_lib
-+#    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+#  fi
-+#  if ac_fn_c_try_link "$LINENO"; then :
-+#  ac_cv_search_pthread_create=$ac_res
-+#fi
-+#rm -f core conftest.err conftest.$ac_objext \
-+#    conftest$ac_exeext
-+#  if ${ac_cv_search_pthread_create+:} false; then :
-+#  break
-+#fi
-+#done
-+ac_cv_search_pthread_create=%%PTHREAD_LIBS%%
- if ${ac_cv_search_pthread_create+:} false; then :
- 
- else
-@@ -15376,10 +15377,10 @@
- fi
- 
-    elif test "$OS" = "MACOSX"; then
--      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -pthread" >&5
--$as_echo_n "checking whether $CC accepts -pthread... " >&6; }
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts %%PTHREAD_LIBS%%" >&5
-+$as_echo_n "checking whether $CC accepts %%PTHREAD_LIBS%%... " >&6; }
-       LDFLAGS_store="$LDFLAGS"
--      LDFLAGS="$LDFLAGS -pthread -fnested-functions"
-+      LDFLAGS="$LDFLAGS %%PTHREAD_LIBS%% -fnested-functions"
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -15389,11 +15390,8 @@
- main ()
- {
- 
--            int main(int argc, char **argv)
--            {
-                pthread_create(NULL, NULL, NULL, NULL);
-                return 0;
--            }
- 
-   ;
-   return 0;
-@@ -15798,13 +15796,10 @@
- main ()
- {
- 
--               int main(int argc, char **argv)
--               {
-                   char *q;
-                   char p[NS_MAXDNAME];
- 
-                   dn_expand(q, q, q, p, sizeof(p));
--               }
- 
-   ;
-   return 0;
-@@ -15900,13 +15895,10 @@
- main ()
- {
- 
--               int main(int argc, char **argv)
--               {
-                   char *q;
-                   char p[NS_MAXDNAME];
- 
-                   __dn_expand(q, q, q, p, sizeof(p));
--               }
- 
-   ;
-   return 0;
-@@ -16379,14 +16371,14 @@
-       ;;
-    no)  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
--      DEBUG_FLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
-+      DEBUG_FLAGS="-Wall"
-       ac_ec_debug=no
-       ;;
- esac
- else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
--   DEBUG_FLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
-+   DEBUG_FLAGS="-Wall"
-    ac_ec_debug=no
- 
- fi
-@@ -16536,7 +16528,7 @@
- 
-    OLDLDFLAGS="${LDFLAGS}"
-    OLDLIBS="${LIBS}"
--   LDFLAGS="$PCAPLIB"
-+   LDFLAGS="$LDFLAGS $PCAPLIB"
-    LIBS="$LIBS"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_datalink_val_to_description in -lwpcap" >&5
- $as_echo_n "checking for pcap_datalink_val_to_description in -lwpcap... " >&6; }
-@@ -16994,6 +16986,14 @@
- 
- 
- 
-+if false; then
-+  HAVE_PCRE_TRUE=
-+  HAVE_PCRE_FALSE='#'
-+else
-+  HAVE_PCRE_TRUE='#'
-+  HAVE_PCRE_FALSE=
-+fi
-+
- ac_ec_pcre=no
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpcre" >&5
diff --git a/net-mgmt/ettercap/files/patch-include-ec.h b/net-mgmt/ettercap/files/patch-include-ec.h
new file mode 100644
index 000000000000..a79e660c8459
--- /dev/null
+++ b/net-mgmt/ettercap/files/patch-include-ec.h
@@ -0,0 +1,11 @@
+--- include/ec.h.orig	2013-09-12 04:18:45.000000000 +0800
++++ include/ec.h	2013-10-22 03:14:56.006394661 +0800
+@@ -12,6 +12,8 @@
+ #include <stdbool.h>
+ #include <stdlib.h>
+ 
++#include <net/bpf.h>
++
+ #ifdef OS_WINDOWS
+    #include <windows.h>
+ #endif
diff --git a/net-mgmt/ettercap/files/patch-safe_free_mem b/net-mgmt/ettercap/files/patch-safe_free_mem
new file mode 100644
index 000000000000..817e1bbbb993
--- /dev/null
+++ b/net-mgmt/ettercap/files/patch-safe_free_mem
@@ -0,0 +1,122 @@
+From 33ac95f78e4f6f067e6bc33b8883b3b7daa896f3 Mon Sep 17 00:00:00 2001
+From: "Emilio A. Escobar" <eescobar@gmail.com>
+Date: Wed, 11 Sep 2013 16:53:57 -0400
+Subject: [PATCH] Fix for issue #344, now safe_free_mem() will be available for
+ all OS'es
+
+---
+ include/ec.h       |  3 +++
+ src/CMakeLists.txt |  1 +
+ src/ec_mem.c       | 47 +++++++++++++++++++++++++++++++++++++++++++++++
+ src/os/ec_linux.c  | 10 ----------
+ 4 files changed, 51 insertions(+), 10 deletions(-)
+ create mode 100644 src/ec_mem.c
+
+diff --git a/include/ec.h b/include/ec.h
+index 069e3f1..270860a 100644
+--- include/ec.h.orig
++++ include/ec.h
+@@ -172,6 +172,9 @@
+ /* exported by ec_main */
+ EC_API_EXTERN void clean_exit(int errcode);
+ 
++/* exported by ec_mem */
++EC_API_EXTERN void safe_free_mem(char **param, int *param_length, char *command);
++
+ 
+ #endif   /*  EC_H */
+ 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 22d021d..4754073 100644
+--- src/CMakeLists.txt.orig
++++ src/CMakeLists.txt
+@@ -1,4 +1,5 @@
+ set(EC_SRC
++	ec_mem.c
+         ec_capture.c
+         ec_checksum.c
+         ec_conf.c
+diff --git a/src/ec_mem.c b/src/ec_mem.c
+new file mode 100644
+index 0000000..b1d8d34
+--- /dev/null
++++ src/ec_mem.c
+@@ -0,0 +1,47 @@
++/*
++    ettercap -- global variables handling module
++
++    Copyright (C) ALoR & NaGA
++
++    This program is free software; you can redistribute it and/or modify
++    it under the terms of the GNU General Public License as published by
++    the Free Software Foundation; either version 2 of the License, or
++    (at your option) any later version.
++
++    This program is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++    GNU General Public License for more details.
++
++    You should have received a copy of the GNU General Public License
++    along with this program; if not, write to the Free Software
++    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++
++*/
++
++#include <ec.h>
++
++void safe_free_mem(char **param, int *param_length, char *command);
++
++
++void safe_free_mem(char **param, int *param_length, char *command)
++{
++   int k;
++
++   SAFE_FREE(command);
++        for(k= 0; k < (*param_length); ++k)
++                SAFE_FREE(param[k]);
++        SAFE_FREE(param);
++}
++
++
++
++
++
++
++
++
++/* EOF */
++
++// vim:ts=3:expandtab
++
+diff --git a/src/os/ec_linux.c b/src/os/ec_linux.c
+index e27cd2b..32a7b13 100644
+--- src/os/ec_linux.c.orig
++++ src/os/ec_linux.c
+@@ -31,7 +31,6 @@
+ static void restore_ip_forward(void);
+ u_int16 get_iface_mtu(const char *iface);
+ void disable_interface_offload(void);
+-void safe_free_mem(char **param, int *param_length, char *command);
+ 
+ /*******************************************/
+ 
+@@ -133,15 +132,6 @@ u_int16 get_iface_mtu(const char *iface)
+    return mtu;
+ }
+ 
+-void safe_free_mem(char **param, int *param_length, char *command)
+-{
+-   int k;
+-
+-   SAFE_FREE(command);
+-	for(k= 0; k < (*param_length); ++k)
+-		SAFE_FREE(param[k]);
+-	SAFE_FREE(param);
+-}
+ 
+ /*
+  * disable segmentation offload on interface
+-- 
+1.8.4
+
diff --git a/net-mgmt/ettercap/files/patch-src-ec_send.c b/net-mgmt/ettercap/files/patch-src-ec_send.c
new file mode 100644
index 000000000000..7f3334f7be31
--- /dev/null
+++ b/net-mgmt/ettercap/files/patch-src-ec_send.c
@@ -0,0 +1,11 @@
+--- src/ec_send.c.orig	2013-09-12 04:18:45.000000000 +0800
++++ src/ec_send.c	2013-10-22 03:13:55.980398663 +0800
+@@ -22,7 +22,7 @@
+ #include <ec.h>
+ 
+ #if defined(OS_DARWIN) || defined(OS_BSD)
+-   #include <net/bpf.h>
++//   #include <net/bpf.h>
+    #include <sys/ioctl.h>
+ #endif
+ 
diff --git a/net-mgmt/ettercap/pkg-descr b/net-mgmt/ettercap/pkg-descr
index a9363a278b7d..4167df413414 100644
--- a/net-mgmt/ettercap/pkg-descr
+++ b/net-mgmt/ettercap/pkg-descr
@@ -1,7 +1,6 @@
-Ettercap is a suite for man in the middle attacks on LANs. It features
-sniffing of live connections, content filtering on the fly and many other
-interesting tricks.
-It supports active and passive dissection of many protocols (even ciphered
-ones) and includes many features for network and host analysis.
+Ettercap is a suite for man in the middle attacks on LANs. It features sniffing
+of live connections, content filtering on the fly and many other interesting
+tricks. It supports active and passive dissection of many protocols (even
+ciphered ones) and includes many features for network and host analysis.
 
-WWW: http://ettercap.sourceforge.net/
+WWW: http://ettercap.github.io/ettercap/
diff --git a/net-mgmt/ettercap/pkg-plist b/net-mgmt/ettercap/pkg-plist
index a24cc5793794..ec3cf61840f4 100644
--- a/net-mgmt/ettercap/pkg-plist
+++ b/net-mgmt/ettercap/pkg-plist
@@ -1,82 +1,52 @@
 bin/ettercap
+%%DESKTOP%%bin/ettercap-pkexec
 bin/etterfilter
 bin/etterlog
 @unexec if cmp -s %D/etc/etter.conf.sample %D/etc/etter.conf; then rm -f %D/etc/etter.conf; else echo "If permanently deleting this package, %D/etc/etter.conf must be removed manually."; fi
 etc/etter.conf.sample
 @exec [ -f %B/etter.conf ] || cp %B/%f %B/etter.conf
-%%PLUGINS%%lib/ettercap/ec_arp_cop.a
 %%PLUGINS%%lib/ettercap/ec_arp_cop.so
-%%PLUGINS%%lib/ettercap/ec_autoadd.a
 %%PLUGINS%%lib/ettercap/ec_autoadd.so
-%%PLUGINS%%lib/ettercap/ec_chk_poison.a
 %%PLUGINS%%lib/ettercap/ec_chk_poison.so
-%%PLUGINS%%lib/ettercap/ec_dns_spoof.a
 %%PLUGINS%%lib/ettercap/ec_dns_spoof.so
-%%PLUGINS%%lib/ettercap/ec_dos_attack.a
 %%PLUGINS%%lib/ettercap/ec_dos_attack.so
-%%PLUGINS%%lib/ettercap/ec_dummy.a
 %%PLUGINS%%lib/ettercap/ec_dummy.so
-%%PLUGINS%%lib/ettercap/ec_find_conn.a
 %%PLUGINS%%lib/ettercap/ec_find_conn.so
-%%PLUGINS%%lib/ettercap/ec_find_ettercap.a
 %%PLUGINS%%lib/ettercap/ec_find_ettercap.so
-%%PLUGINS%%lib/ettercap/ec_find_ip.a
 %%PLUGINS%%lib/ettercap/ec_find_ip.so
-%%PLUGINS%%lib/ettercap/ec_finger.a
 %%PLUGINS%%lib/ettercap/ec_finger.so
-%%PLUGINS%%lib/ettercap/ec_finger_submit.a
 %%PLUGINS%%lib/ettercap/ec_finger_submit.so
-%%PLUGINS%%lib/ettercap/ec_gre_relay.a
+%%PLUGINS%%lib/ettercap/ec_fraggle_attack.so
 %%PLUGINS%%lib/ettercap/ec_gre_relay.so
-%%PLUGINS%%lib/ettercap/ec_gw_discover.a
 %%PLUGINS%%lib/ettercap/ec_gw_discover.so
-%%PLUGINS%%lib/ettercap/ec_isolate.a
 %%PLUGINS%%lib/ettercap/ec_isolate.so
-%%PLUGINS%%lib/ettercap/ec_link_type.a
 %%PLUGINS%%lib/ettercap/ec_link_type.so
-%%PLUGINS%%lib/ettercap/ec_pptp_chapms1.a
+%%PLUGINS%%lib/ettercap/ec_mdns_spoof.so
+%%PLUGINS%%lib/ettercap/ec_nbns_spoof.so
 %%PLUGINS%%lib/ettercap/ec_pptp_chapms1.so
-%%PLUGINS%%lib/ettercap/ec_pptp_clear.a
 %%PLUGINS%%lib/ettercap/ec_pptp_clear.so
-%%PLUGINS%%lib/ettercap/ec_pptp_pap.a
 %%PLUGINS%%lib/ettercap/ec_pptp_pap.so
-%%PLUGINS%%lib/ettercap/ec_pptp_reneg.a
 %%PLUGINS%%lib/ettercap/ec_pptp_reneg.so
-%%PLUGINS%%lib/ettercap/ec_rand_flood.a
 %%PLUGINS%%lib/ettercap/ec_rand_flood.so
-%%PLUGINS%%lib/ettercap/ec_remote_browser.a
 %%PLUGINS%%lib/ettercap/ec_remote_browser.so
-%%PLUGINS%%lib/ettercap/ec_reply_arp.a
 %%PLUGINS%%lib/ettercap/ec_reply_arp.so
-%%PLUGINS%%lib/ettercap/ec_repoison_arp.a
 %%PLUGINS%%lib/ettercap/ec_repoison_arp.so
-%%PLUGINS%%lib/ettercap/ec_scan_poisoner.a
 %%PLUGINS%%lib/ettercap/ec_scan_poisoner.so
-%%PLUGINS%%lib/ettercap/ec_search_promisc.a
 %%PLUGINS%%lib/ettercap/ec_search_promisc.so
-%%PLUGINS%%lib/ettercap/ec_smb_clear.a
 %%PLUGINS%%lib/ettercap/ec_smb_clear.so
-%%PLUGINS%%lib/ettercap/ec_smb_down.a
 %%PLUGINS%%lib/ettercap/ec_smb_down.so
-%%PLUGINS%%lib/ettercap/ec_stp_mangler.a
+%%PLUGINS%%lib/ettercap/ec_smurf_attack.so
+%%PLUGINS%%lib/ettercap/ec_sslstrip.so
 %%PLUGINS%%lib/ettercap/ec_stp_mangler.so
-%%PLUGINS%%@dirrm lib/ettercap
-%%DATADIR%%/etter.dns
-%%DATADIR%%/etter.fields
-%%DATADIR%%/etter.filter
-%%DATADIR%%/etter.filter.examples
-%%DATADIR%%/etter.filter.kill
-%%DATADIR%%/etter.filter.ssh
-%%DATADIR%%/etter.finger.mac
-%%DATADIR%%/etter.finger.os
-%%DATADIR%%/etter.mime
-%%DATADIR%%/etter.services
-%%DATADIR%%/etter.ssl.crt
-%%DATADIR%%/ettercap.png
-%%DATADIR%%/etterfilter.cnt
-%%DATADIR%%/etterfilter.tbl
-%%DATADIR%%/etterlog.dtd
-@dirrm %%DATADIR%%
+lib/libettercap.so
+man/man5/etter.conf.5.gz
+man/man8/ettercap.8.gz
+%%DESKTOP%%man/man8/ettercap-pkexec.8.gz
+man/man8/ettercap_curses.8.gz
+man/man8/etterfilter.8.gz
+man/man8/etterlog.8.gz
+%%PLUGINS%%man/man8/ettercap_plugins.8.gz
+%%DESKTOP%%share/applications/ettercap.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
 %%PORTDOCS%%%%DOCSDIR%%/README
@@ -92,4 +62,25 @@ etc/etter.conf.sample
 %%PORTDOCS%%%%DOCSDIR%%/dissectors
 %%PLUGINS%%%%PORTDOCS%%%%DOCSDIR%%/plugins
 %%PORTDOCS%%%%DOCSDIR%%/threads
+%%DATADIR%%/etter.fields
+%%DATADIR%%/etter.filter
+%%DATADIR%%/etter.filter.examples
+%%DATADIR%%/etter.filter.kill
+%%DATADIR%%/etter.filter.pcre
+%%DATADIR%%/etter.filter.ssh
+%%DATADIR%%/etter.finger.mac
+%%DATADIR%%/etter.finger.os
+%%DATADIR%%/etter.mime
+%%DATADIR%%/etter.services
+%%DATADIR%%/etter.ssl.crt
+%%DATADIR%%/ettercap.png
+%%DATADIR%%/etterfilter.cnt
+%%DATADIR%%/etterfilter.tbl
+%%DATADIR%%/etterlog.dtd
+%%DESKTOP%%share/pixmaps/ettercap.svg
+%%DESKTOP%%share/polkit-1/actions/org.pkexec.ettercap.policy
+%%DESKTOP%%@dirrmtry share/polkit-1/actions
+%%DESKTOP%%@dirrmtry share/polkit-1
+@dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PLUGINS%%@dirrm lib/ettercap