9 files changed, 239 insertions, 263 deletions

diff --git a/net-mgmt/ettercap/Makefile b/net-mgmt/ettercap/Makefile
index 55471b6f4034..ba8f95e71370 100644
--- a/net-mgmt/ettercap/Makefile
+++ b/net-mgmt/ettercap/Makefile
@@ -6,69 +6,131 @@
 #
 
 PORTNAME=	ettercap
-PORTVERSION=	0.6.b
-PORTREVISION=	2
+PORTVERSION=	0.7.1
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED} \
 		${MASTER_SITE_PACKETSTORM:S:%SUBDIR%:sniffers/ettercap:}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-NG-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A network sniffer/interceptor/injector/logger for switched LANs
 
+BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet-devel
+.if !defined(WITHOUT_PCRE)
+LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
+.endif
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
+.if !defined(WITHOUT_GTK)
+USE_GNOME=	glib20 atk pango gtk20
+PKGNAMESUFFIX=	-gtk2
+.endif
+.if !defined(WITHOUT_ICONV)
+USE_ICONV=	yes
+.endif
+.if !defined(WITHOUT_PLUGINS)
+USE_LIBLTDL=	yes
+.endif
 .if !defined(WITHOUT_SSL)
 USE_OPENSSL=	yes
 .endif
-GNU_CONFIGURE=	yes
-WANT_GNOME=	yes
 
-MAN8=		ettercap.8
+MAN5=		etter.conf.5
+MAN8=		ettercap.8 ettercap_curses.8 etterfilter.8 etterlog.8
+DOCS=		AUTHORS CHANGELOG README README.BINARIES README.BUGS \
+		README.CVS README.PLATFORMS THANKS TODO TODO.TESTING \
+		doc/capture doc/decoders doc/dissectors doc/threads
+.if !defined(WITHOUT_PLUGINS)
+MAN8+=		ettercap_plugins.8
+DOCS+=		doc/plugins
+.endif
 
 .include <bsd.port.pre.mk>
 
 CFLAGS+=		${PTHREAD_CFLAGS}
+CPPFLAGS+=		-I${LOCALBASE}/include
+LDFLAGS+=		-L${LOCALBASE}/lib
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS+=	--enable-plugins --with-libnet=${LOCALBASE}
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
-CONFIGURE_TARGET=	-build=${ARCH}-portbld-freebsd${OSREL}
-.if defined(WITHOUT_SSL)
-CONFIGURE_ARGS=		--without-openssl
-PLIST_SUB+=		SSL="@comment "
-.else
-CONFIGURE_ARGS=		--with-openssl=${OPENSSLBASE}
-PLIST_SUB+=		SSL=""
+.if ${OSVERSION} < 502111
+BUILD_DEPENDS+=		${LOCALBASE}/lib/libpcap.a:${PORTSDIR}/net/libpcap
+CONFIGURE_ARGS+=	--with-libpcap=${LOCALBASE}
 .endif
-.if ${HAVE_GNOME:Mgtk20}!=""
-USE_GNOME+=		gtk20
-PKGNAMESUFFIX=		-gnome
+
+.if !defined(WITHOUT_GTK)
+CONFIGURE_ARGS+=	--enable-gtk
 .else
 CONFIGURE_ARGS+=	--disable-gtk
 .endif
-CONFIGURE_ENV=		WGET_PATH=""
-
-ALL_TARGET=		all plug-ins
-
-INSTALL_TARGET=		install plug-ins_install
-.if !defined(NOPORTDOCS)
-INSTALL_TARGET+=	install-doc
+.if !defined(WITHOUT_ICONV)
+CONFIGURE_ARGS+=	--with-iconv=${LOCALBASE}
+.endif
+.if !defined(WITHOUT_PCRE)
+CONFIGURE_ARGS+=	--with-libpcre=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=	--without-libpcre
+.endif
+.if !defined(WITHOUT_PLUGINS)
+PLIST_SUB+=		PLUGINS=""
+CONFIGURE_ARGS+=	--enable-plugins
+.else
+CONFIGURE_ARGS+=	--disable-plugins
+PLIST_SUB+=		PLUGINS="@comment "
+.endif
+.if !defined(WITHOUT_SSL)
+CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
+.else
+CONFIGURE_ARGS+=	--without-openssl
 .endif
 
-post-extract:
-	@${MV} -f ${WRKSRC}/share/lc-converter.c ${WRKSRC}
+pre-everything::
+.if !defined(WITHOUT_GTK) || !defined(WITHOUT_ICONV) || \
+	!defined(WITHOUT_PCRE) || !defined(WITHOUT_PLUGINS) || \
+	!defined(WITHOUT_SSL)
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "You may use the following build option(s):"
+	@${ECHO_MSG} ""
+.if !defined(WITHOUT_GTK)
+	@${ECHO_MSG} "WITHOUT_GTK=yes		builds without GTK2+ GUI"
+.endif
+.if !defined(WITHOUT_ICONV)
+	@${ECHO_MSG} "WITHOUT_ICONV=yes	builds without support for UTF-8"
+.endif
+.if !defined(WITHOUT_PCRE)
+	@${ECHO_MSG} "WITHOUT_PCRE=yes	builds without support for perl regexps in filters"
+.endif
+.if !defined(WITHOUT_PLUGINS)
+	@${ECHO_MSG} "WITHOUT_PLUGINS=yes	builds without ettercap plugins"
+.endif
+.if !defined(WITHOUT_SSL)
+	@${ECHO_MSG} "WITHOUT_SSL=yes		builds without support for SSH1 and SSL decryption"
+.endif
+	@${ECHO_MSG} ""
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -E -e 's|(^DATADIR.+=).+|\1 ${DATADIR}|; \
-		s|(^DOCDIR.+=).+|\1 ${DOCSDIR}|' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|@prefix@\/share\/@PROG@|${DATADIR}|; \
-		s|@prefix@\/doc\/@PROG@-@VERSION@|${DOCSDIR}|' \
-		${WRKSRC}/ettercap.8.in
-
-post-build:
-	${CC} ${CFLAGS} -o ${WRKSRC}/lc-converter ${WRKSRC}/lc-converter.c
+	@${REINPLACE_CMD} -E -e 's|(^pkgdatadir.+=).+|\1 ${DATADIR}|' \
+		${WRKSRC}/share/Makefile.in
 
-post-install::
-	${INSTALL_PROGRAM} ${WRKSRC}/lc-converter ${PREFIX}/bin
+post-install:
+	@${INSTALL_DATA} ${WRKSRC}/share/etter.conf \
+		${PREFIX}/etc/etter.conf.sample
+.if !exists(${PREFIX}/etc/etter.conf)
+	@${INSTALL_DATA} ${WRKSRC}/share/etter.conf ${PREFIX}/etc/etter.conf
+.endif
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for i in ${DOCS}
+	@${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
+.endfor
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/net-mgmt/ettercap/distinfo b/net-mgmt/ettercap/distinfo
index 20ec79dbc71b..c9a2780b11c0 100644
--- a/net-mgmt/ettercap/distinfo
+++ b/net-mgmt/ettercap/distinfo
@@ -1,2 +1,2 @@
-MD5 (ettercap-0.6.b.tar.gz) = f665cf82347a91f216184537f8f2c4bd
-SIZE (ettercap-0.6.b.tar.gz) = 689038
+MD5 (ettercap-NG-0.7.1.tar.gz) = a78b914b9863668f962c9bd7b8733fc1
+SIZE (ettercap-NG-0.7.1.tar.gz) = 1112490
diff --git a/net-mgmt/ettercap/files/patch-aa b/net-mgmt/ettercap/files/patch-aa
deleted file mode 100644
index c38436d908ad..000000000000
--- a/net-mgmt/ettercap/files/patch-aa
+++ /dev/null
@@ -1,46 +0,0 @@
---- Makefile.in.orig	Thu Jun 27 19:27:33 2002
-+++ Makefile.in	Wed Jul 17 17:06:29 2002
-@@ -25,10 +25,10 @@
- DOC      = COPYING README README.PLUGINS README.WIN32 CHANGELOG HISTORY \
-            AUTHORS TODO TODO.WIN32 THANKS KNOWN-BUGS PORTINGS INSTALL \
-            ./plugins/H01_zaratan/ZARATAN.HOWTO ./plugins/H09_roper/ROPER.HOWTO \
--	   ./plugins/H03_hydra1/HYDRA.HOWTO    
-+	   ./plugins/H03_hydra1/HYDRA.HOWTO ./plugins/confusion/CONFUSION.HOWTO
- 
- DEBUG    = @DEBUG@
--CFLAG    = @E_CFLAGS@
-+CFLAG    = @CFLAGS@
- COPTS    = -I. -Isrc/include @COPTS@ @GTK_CFLAGS@
- 
- PROG     = @PROG@
-@@ -74,12 +74,7 @@
- 	$(INSTALL) -m 644 ./etter.filter.ssh $(DESTDIR)$(DATADIR)
- 	$(INSTALL) -m 644 ./etter.passive.os.fp $(DESTDIR)$(DATADIR)
- 	$(INSTALL) -m 644 ./etter.ssl.crt $(DESTDIR)$(DATADIR)
--	$(INSTALL) -d $(DESTDIR)$(DOCDIR)
--	$(INSTALL) -m 644 $(DOC) $(DESTDIR)$(DOCDIR)
--	$(INSTALL) -m 644 ./THANKS $(DESTDIR)$(DATADIR)
--	$(INSTALL) -m 644 ./AUTHORS $(DESTDIR)$(DATADIR)
- 	-$(INSTALL) -m 644 ./share/[a-z]* $(DESTDIR)$(DATADIR)
--	-$(INSTALL) -m 644 ./docs/[a-z]*/[a-z]* $(DESTDIR)$(DOCDIR)
- 	$(INSTALL) -d $(DESTDIR)$(MANDIR)/man8
- 	$(INSTALL) -m 644 $(PROG).8 $(DESTDIR)$(MANDIR)/man8/$(PROG).8
- 	@echo
-@@ -88,6 +83,17 @@
- 	@echo "@SB@ $(PROG)@EB@     installed in @SB@$(DESTDIR)$(BINDIR) @EB@"
- 	@echo "@SB@ shared files@EB@ installed in @SB@$(DESTDIR)$(DATADIR) @EB@"
- 	@echo "@SB@ man pages@EB@    installed in @SB@$(DESTDIR)$(MANDIR)/man8/ @EB@"
-+	@echo
-+	@echo "=============================================================="
-+	@echo
-+
-+install-doc:
-+	$(INSTALL) -d $(DESTDIR)$(DOCDIR)
-+	$(INSTALL) -m 644 $(DOC) $(DESTDIR)$(DOCDIR)
-+	-$(INSTALL) -m 644 ./docs/development/[a-z]* $(DESTDIR)$(DOCDIR)
-+	@echo
-+	@echo "=============================================================="
-+	@echo
- 	@echo "@SB@ DOCS@EB@         installed in @SB@$(DESTDIR)$(DOCDIR) @EB@"
- 	@echo
- 	@echo "=============================================================="
diff --git a/net-mgmt/ettercap/files/patch-ab b/net-mgmt/ettercap/files/patch-ab
index 1d1b7a831774..77db4c590bf0 100644
--- a/net-mgmt/ettercap/files/patch-ab
+++ b/net-mgmt/ettercap/files/patch-ab
@@ -1,64 +1,17 @@
 --- configure.orig	Fri Jun 14 18:53:14 2002
 +++ configure	Wed Jul 17 17:09:18 2002
-@@ -3924,27 +3924,27 @@
- if test "${ac_cv_path_WGET_PATH+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  case $WGET_PATH in
--  [\\/]* | ?:[\\/]*)
-+#  case $WGET_PATH in
-+#  [\\/]* | ?:[\\/]*)
-   ac_cv_path_WGET_PATH="$WGET_PATH" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_path_WGET_PATH="$as_dir/$ac_word$ac_exec_ext"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
-+#  ;;
-+#  *)
-+#  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+#for as_dir in $PATH
-+#do
-+#  IFS=$as_save_IFS
-+#  test -z "$as_dir" && as_dir=.
-+#  for ac_exec_ext in '' $ac_executable_extensions; do
-+#  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+#    ac_cv_path_WGET_PATH="$as_dir/$ac_word$ac_exec_ext"
-+#    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+#    break 2
-+#  fi
-+#done
-+#done
- 
--  ;;
--esac
-+#  ;;
-+#esac
- fi
- WGET_PATH=$ac_cv_path_WGET_PATH
- 
-@@ -6676,8 +6676,8 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+@@ -27504,8 +27504,8 @@
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
  if test "$ac_cv_search_pthread_create" = no; then
--  for ac_lib in pthread; do
+-  for ac_lib in c_r pthread; do
 -    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+#  for ac_lib in pthread; do
++#  for ac_lib in c_r pthread; do
 +    LIBS="%%PTHREAD_LIBS%%  $ac_func_search_save_LIBS"
      cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -6713,7 +6713,7 @@
+ _ACEOF
+@@ -27550,7 +27550,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -67,54 +20,83 @@
  break
  else
    echo "$as_me: failed program was:" >&5
-@@ -6721,7 +6721,7 @@
- 
+@@ -27559,7 +27559,7 @@
  fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
 -  done
 +#  done
  fi
  LIBS=$ac_func_search_save_LIBS
  fi
-@@ -9720,14 +9720,14 @@
+@@ -27699,10 +27699,10 @@
+ fi
+ 
+    elif test "$OS" != "MACOSX" -a "$OS" != "WINDOWS"; then
+-      echo "$as_me:$LINENO: checking whether $CC accepts -pthread" >&5
+-echo $ECHO_N "checking whether $CC accepts -pthread... $ECHO_C" >&6
++      echo "$as_me:$LINENO: checking whether $CC accepts %%PTHREAD_LIBS%%" >&5
++echo $ECHO_N "checking whether $CC accepts %%PTHREAD_LIBS%%... $ECHO_C" >&6
+       LDFLAGS_store="$LDFLAGS"
+-      LDFLAGS="$LDFLAGS -pthread"
++      LDFLAGS="$LDFLAGS %%PTHREAD_LIBS%%"
+       cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -30441,14 +30441,14 @@
        ;;
-    no)  echo "$as_me:$LINENO: result: no." >&5
- echo "${ECHO_T}no." >&6
--      E_CFLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
-+#      E_CFLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
-       ac_cv_ec_debug=no
+    no)  echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+-      DEBUG_FLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
++      DEBUG_FLAGS="-Wall"
+       ac_ec_debug=no
        ;;
  esac
  else
-   echo "$as_me:$LINENO: result: no. disabled by default." >&5
- echo "${ECHO_T}no. disabled by default." >&6
--   E_CFLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
-+#   E_CFLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
-    ac_cv_ec_debug=no
+   echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+-   DEBUG_FLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
++   DEBUG_FLAGS="-Wall"
+    ac_ec_debug=no
  
  fi;
-@@ -10149,6 +10149,8 @@
-    if test $ac_cv_ec_ssh = "yes"; then
-       CYGWINLIB="$CYGWINLIB cygcrypto.dll cygssl.dll"
-       echo "Dissector_ssh" >> ./src/ec_add.def
-+   else
-+      PLUGINS_SOURCES=`echo $PLUGINS_SOURCES | sed 's/.\/plugins\/H03_hydra1\/H03_hydra1.c//g'`
-    fi
+@@ -30935,7 +30935,7 @@
  
+    OLDLDFLAGS="${LDFLAGS}"
+    OLDLIBS="${LIBS}"
+-   LDFLAGS="$PCAPLIB"
++   LDFLAGS="$LDFLAGS $PCAPLIB"
+    LIBS="$LIBS"
  
-@@ -10302,9 +10304,15 @@
- if test "$ac_cv_ec_plugin" = "yes"; then
+ echo "$as_me:$LINENO: checking for pcap_datalink_val_to_description in -lpcap" >&5
+@@ -31271,6 +31271,16 @@
  
-    PLUGINS=`ls ./plugins | grep -v Make | grep -v CVS | awk ' { printf "%s ", $1 } '`
-+   if test $ac_cv_ec_ssh = "no"; then
-+      PLUGINS=`echo $PLUGINS | sed 's/H03_hydra1//g'`
-+   fi
  
  
-    makeplug=`ls ./plugins | grep -v Make | grep -v CVS | awk '{ printf("plugins/%s/Makefile ", $1) }'`
-+   if test $ac_cv_ec_ssh = "no"; then
-+      makeplug=`echo $makeplug | sed 's/plugins\/H03_hydra1\/Makefile//g'`
-+   fi
-    makeplug="plugins/Makefile $makeplug"
-    MAKEPLUG="1"
- else
++if false; then
++  HAVE_PCRE_TRUE=
++  HAVE_PCRE_FALSE='#'
++else
++  HAVE_PCRE_TRUE='#'
++  HAVE_PCRE_FALSE=
++fi
++
++
++
+ 
+ ac_ec_pcre=no
+ 
+@@ -32817,6 +32827,13 @@
+   { { echo "$as_me:$LINENO: error: conditional \"OPENSSL\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+ echo "$as_me: error: conditional \"OPENSSL\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${HAVE_PCRE_TRUE}" && test -z "${HAVE_PCRE_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"HAVE_PCRE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"HAVE_PCRE\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
diff --git a/net-mgmt/ettercap/files/patch-plugins::H03_hydra1::Makefile.in b/net-mgmt/ettercap/files/patch-plugins::H03_hydra1::Makefile.in
deleted file mode 100644
index fe888fe1146b..000000000000
--- a/net-mgmt/ettercap/files/patch-plugins::H03_hydra1::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/H03_hydra1/Makefile.in.orig	Sun May  4 18:58:02 2003
-+++ plugins/H03_hydra1/Makefile.in	Sun May  4 18:58:37 2003
-@@ -3,7 +3,7 @@
- DEFS     = @PICFLAG@ @DEFS@ -D@OS@
- 
- CFLAG    = @CFLAGS@
--COPTS    = -I../..
-+COPTS    = -I../.. @COPTS@
- 
- PROG     = H03_hydra1
- 
diff --git a/net-mgmt/ettercap/files/patch-plugins::Makefile.in b/net-mgmt/ettercap/files/patch-plugins::Makefile.in
deleted file mode 100644
index efc2b4ff39dd..000000000000
--- a/net-mgmt/ettercap/files/patch-plugins::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/Makefile.in.orig	Sun May  4 01:59:51 2003
-+++ plugins/Makefile.in	Sun May  4 02:00:18 2003
-@@ -13,7 +13,7 @@
- 	make -C $$plug; \
- 	done
- 
--install: plugins
-+install:
- 	for plug in $(PLUGINS); do \
- 	$(INSTALL) -d $(DESTDIR)$(PLUGDIR) ; \
- 	$(INSTALL) -m 700 ./$$plug/ec_$$plug.so $(DESTDIR)$(PLUGDIR) ; \
diff --git a/net-mgmt/ettercap/files/patch-share::Makefile.in b/net-mgmt/ettercap/files/patch-share::Makefile.in
new file mode 100644
index 000000000000..02b8e5164a3a
--- /dev/null
+++ b/net-mgmt/ettercap/files/patch-share::Makefile.in
@@ -0,0 +1,11 @@
+--- share/Makefile.in.orig	Thu Oct  7 21:05:28 2004
++++ share/Makefile.in	Thu Oct  7 21:35:57 2004
+@@ -416,7 +416,7 @@
+ 
+ install-data-am: install-pkgdataDATA
+ 
+-install-exec-am: install-sysconfDATA
++install-exec-am:
+ 
+ install-info: install-info-am
+ 
diff --git a/net-mgmt/ettercap/pkg-descr b/net-mgmt/ettercap/pkg-descr
index 1bf720a2f554..56593f6dc5ff 100644
--- a/net-mgmt/ettercap/pkg-descr
+++ b/net-mgmt/ettercap/pkg-descr
@@ -1,17 +1,7 @@
-Ettercap is a network sniffer/interceptor/logger for switched LAN.
-It uses ARP poisoning and the man-in-the-middle technique to sniff all
-the connections between two host.
-
-It's possible to sniff in three modes:
-
-   + IP Based, the packets are filtered on IP source and dest
-   + MAC Based, packets filtered on mac address, useful to sniff
-     connections through gateway
-   + ARP based, uses arp poisoning to sniff in switched lan.
-
-Ettercap also supports character injection and plugins.
+Ettercap is a suite for man in the middle attacks on LAN. 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 feature for network and host analysis.
 
 WWW: http://ettercap.sourceforge.net/
-
-- George Reid
-greid@ukug.uk.freebsd.org
diff --git a/net-mgmt/ettercap/pkg-plist b/net-mgmt/ettercap/pkg-plist
index 52567c8358cb..f234f25c1207 100644
--- a/net-mgmt/ettercap/pkg-plist
+++ b/net-mgmt/ettercap/pkg-plist
@@ -1,67 +1,66 @@
-bin/lc-converter
-lib/ettercap/ec_H00_lurker.so
-lib/ettercap/ec_H01_zaratan.so
-lib/ettercap/ec_H02_troll.so
-%%SSL%%lib/ettercap/ec_H03_hydra1.so
-lib/ettercap/ec_H04_hydra2.so
-lib/ettercap/ec_H05_hydra3.so
-lib/ettercap/ec_H06_hydra4.so
-lib/ettercap/ec_H07_hydra5.so
-lib/ettercap/ec_H08_hydra6.so
-lib/ettercap/ec_H09_roper.so
-lib/ettercap/ec_H10_phantom.so
-lib/ettercap/ec_H12_giant1.so
-lib/ettercap/ec_H13_giant2.so
-lib/ettercap/ec_H20_dwarf.so
-lib/ettercap/ec_H30_thief.so
-lib/ettercap/ec_H99_dummy.so
-lib/ettercap/ec_arpcop.so
-lib/ettercap/ec_banshee.so
-lib/ettercap/ec_basilisk.so
-lib/ettercap/ec_beholder.so
-lib/ettercap/ec_confusion.so
-lib/ettercap/ec_dummy.so
-lib/ettercap/ec_golem.so
-lib/ettercap/ec_hunter.so
-lib/ettercap/ec_imp.so
-lib/ettercap/ec_lamia.so
-lib/ettercap/ec_leech.so
-lib/ettercap/ec_ooze.so
-lib/ettercap/ec_phantom.so
-lib/ettercap/ec_shadow.so
-lib/ettercap/ec_spectre.so
-lib/ettercap/ec_triton.so
-@dirrm lib/ettercap
-sbin/ettercap
-%%DATADIR%%/etter.conf
+bin/ettercap
+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.so
+%%PLUGINS%%lib/ettercap/ec_autoadd.so
+%%PLUGINS%%lib/ettercap/ec_chk_poison.so
+%%PLUGINS%%lib/ettercap/ec_dns_spoof.so
+%%PLUGINS%%lib/ettercap/ec_dos_attack.so
+%%PLUGINS%%lib/ettercap/ec_dummy.so
+%%PLUGINS%%lib/ettercap/ec_find_conn.so
+%%PLUGINS%%lib/ettercap/ec_find_ettercap.so
+%%PLUGINS%%lib/ettercap/ec_find_ip.so
+%%PLUGINS%%lib/ettercap/ec_finger.so
+%%PLUGINS%%lib/ettercap/ec_finger_submit.so
+%%PLUGINS%%lib/ettercap/ec_gre_relay.so
+%%PLUGINS%%lib/ettercap/ec_gw_discover.so
+%%PLUGINS%%lib/ettercap/ec_isolate.so
+%%PLUGINS%%lib/ettercap/ec_link_type.so
+%%PLUGINS%%lib/ettercap/ec_pptp_chapms1.so
+%%PLUGINS%%lib/ettercap/ec_pptp_clear.so
+%%PLUGINS%%lib/ettercap/ec_pptp_pap.so
+%%PLUGINS%%lib/ettercap/ec_pptp_reneg.so
+%%PLUGINS%%lib/ettercap/ec_rand_flood.so
+%%PLUGINS%%lib/ettercap/ec_remote_browser.so
+%%PLUGINS%%lib/ettercap/ec_reply_arp.so
+%%PLUGINS%%lib/ettercap/ec_scan_poisoner.so
+%%PLUGINS%%lib/ettercap/ec_search_promisc.so
+%%PLUGINS%%lib/ettercap/ec_smb_clear.so
+%%PLUGINS%%lib/ettercap/ec_smb_down.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.passive.os.fp
+%%DATADIR%%/etter.services
 %%DATADIR%%/etter.ssl.crt
-%%DATADIR%%/mac-fingerprints
-%%DATADIR%%/nmap-os-fingerprints
-%%DATADIR%%/services
+%%DATADIR%%/ettercap.png
+%%DATADIR%%/etterfilter.cnt
+%%DATADIR%%/etterfilter.tbl
+%%DATADIR%%/etterlog.dtd
 @dirrm %%DATADIR%%
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/CONFUSION.HOWTO
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/HISTORY
-%%PORTDOCS%%%%DOCSDIR%%/HYDRA.HOWTO
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/KNOWN-BUGS
-%%PORTDOCS%%%%DOCSDIR%%/PORTINGS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.PLUGINS
-%%PORTDOCS%%%%DOCSDIR%%/README.WIN32
-%%PORTDOCS%%%%DOCSDIR%%/ROPER.HOWTO
+%%PORTDOCS%%%%DOCSDIR%%/README.BINARIES
+%%PORTDOCS%%%%DOCSDIR%%/README.BUGS
+%%PORTDOCS%%%%DOCSDIR%%/README.CVS
+%%PORTDOCS%%%%DOCSDIR%%/README.PLATFORMS
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/TODO.WIN32
-%%PORTDOCS%%%%DOCSDIR%%/ZARATAN.HOWTO
-%%PORTDOCS%%%%DOCSDIR%%/debug.txt
-%%PORTDOCS%%%%DOCSDIR%%/errors.txt
-%%PORTDOCS%%%%DOCSDIR%%/threads.txt
+%%PORTDOCS%%%%DOCSDIR%%/TODO.TESTING
+%%PORTDOCS%%%%DOCSDIR%%/capture
+%%PORTDOCS%%%%DOCSDIR%%/decoders
+%%PORTDOCS%%%%DOCSDIR%%/dissectors
+%%PLUGINS%%%%PORTDOCS%%%%DOCSDIR%%/plugins
+%%PORTDOCS%%%%DOCSDIR%%/threads
 %%PORTDOCS%%@dirrm %%DOCSDIR%%