diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile
index d7f0adeb1ae..2b95ff60757 100644
--- a/net/ettercap/Makefile
+++ b/net/ettercap/Makefile
@@ -1,44 +1,57 @@
-# $OpenBSD: Makefile,v 1.37 2007/09/15 22:36:53 merdely Exp $
+# $OpenBSD: Makefile,v 1.38 2008/04/23 20:49:46 okan Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	multi-purpose sniffer/interceptor/logger
 
-VER=		0.6.b
-DISTNAME=	ettercap-${VER}
-PKGNAME=	${DISTNAME}p5
+VER=		0.7.3
+DISTNAME=	ettercap-NG-${VER}
+PKGNAME=	ettercap-${VER}
 CATEGORIES=	net
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ettercap/}
 
 HOMEPAGE=	http://ettercap.sourceforge.net/
 
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ettercap/} \
-		${MASTER_SITE_PACKETSTORM:=sniffers/ettercap/}
-
-# GPL
+# GPLv2
 PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
-WANTLIB=		pthread c crypto des form ncurses ssl
+WANTLIB+=	c crypto form menu ncurses panel pcap pthread ssl z
 
-FLAVORS=		no_x11
+LIB_DEPENDS=	lib/libnet-1.1/net.=11:libnet-1.1*:net/libnet/1.1 \
+		ltdl::devel/libtool,-ltdl \
+		pcre::devel/pcre
+
+FLAVORS=	no_x11
 FLAVOR?=
 
-CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+=	--enable-https
+USE_LIBTOOL=	Yes
+LIBTOOL_FLAGS=	--tag=disable-static
+CONFIGURE_STYLE= autoconf
+AUTOCONF_VERSION= 2.59
+CONFIGURE_ARGS+= --with-libnet=${LOCALBASE} \
+		 --with-libpcre=${LOCALBASE}
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .if ${FLAVOR:L:Mno_x11}
-CONFIGURE_ARGS+=	--enable-gtk=no
+CONFIGURE_ARGS+= --enable-gtk=no
 .else
-LIB_DEPENDS=	gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2
-WANTLIB+=		X11 Xext Xrender atk-1.0 fontconfig z \
-			freetype glib-2.0 gmodule-2.0 glitz png \
-			gobject-2.0 m pango-1.0 pangocairo-1.0 \
-			pangoft2-1.0 cairo
+LIB_DEPENDS+=	gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2
+WANTLIB+=	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi \
+		Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig \
+		freetype glib-2.0 glitz gmodule-2.0 gthread-2.0 \
+		gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 png
 MODULES=	devel/gettext
 USE_X11=	Yes
 .endif
 
 NO_REGRESS=	Yes
 
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ettercap
+	${INSTALL_DATA} ${WRKINST}${SYSCONFDIR}/etter.conf \
+	    ${PREFIX}/share/examples/ettercap
+
 .include <bsd.port.mk>
diff --git a/net/ettercap/distinfo b/net/ettercap/distinfo
index f9d8e18ef83..d976e2fd89f 100644
--- a/net/ettercap/distinfo
+++ b/net/ettercap/distinfo
@@ -1,5 +1,5 @@
-MD5 (ettercap-0.6.b.tar.gz) = 9mXPgjR6kfIWGEU3+PLEvQ==
-RMD160 (ettercap-0.6.b.tar.gz) = BSQGFrmP3xxEhoN8a4/3FhiKtIs=
-SHA1 (ettercap-0.6.b.tar.gz) = jMG7/mHolGIN7vdM/wuMpaC55ig=
-SHA256 (ettercap-0.6.b.tar.gz) = K2sNGvW4r2PrXt9wUv3J9GxVtve2B8h3KxiSfLSB7Pk=
-SIZE (ettercap-0.6.b.tar.gz) = 689038
+MD5 (ettercap-NG-0.7.3.tar.gz) = KPsVzQJBYsVSSYiP4bl4IA==
+RMD160 (ettercap-NG-0.7.3.tar.gz) = 9ObA2HsgZLN3Xpr2DzRXUnN0JhY=
+SHA1 (ettercap-NG-0.7.3.tar.gz) = eiw/hIyk85wH/d6w1jCGQSZbxP8=
+SHA256 (ettercap-NG-0.7.3.tar.gz) = x0I5BS1iVlwTqC+bvyF6T9zOSzSUnjYbU7s/KOMWhUM=
+SIZE (ettercap-NG-0.7.3.tar.gz) = 1138643
diff --git a/net/ettercap/patches/patch-Makefile_in b/net/ettercap/patches/patch-Makefile_in
deleted file mode 100644
index 0bc6c4a0b5f..00000000000
--- a/net/ettercap/patches/patch-Makefile_in
+++ /dev/null
@@ -1,59 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.12 2003/01/29 02:02:51 margarida Exp $
---- Makefile.in.orig	Wed Jan 22 15:00:38 2003
-+++ Makefile.in	Wed Jan 29 00:04:30 2003
-@@ -28,13 +28,13 @@ DOC      = COPYING README README.PLUGINS
- 	   ./plugins/H03_hydra1/HYDRA.HOWTO    
- 
- DEBUG    = @DEBUG@
--CFLAG    = @E_CFLAGS@
-+CFLAGS   += @E_CFLAGS@
- COPTS    = -I. -Isrc/include @COPTS@ @GTK_CFLAGS@
- 
- PROG     = @PROG@
- VERSION  = @VERSION@
- 
--ALLOPT   = $(DEBUG) $(CFLAG) $(COPTS)
-+ALLOPT   = $(DEBUG) $(CFLAGS) $(COPTS)
- 
- 
- .c.o:
-@@ -63,7 +63,7 @@ src/include/ec_install_path.h:
- 
- @INCLUDE_DEPEND@
- 
--install: @PROG@ strip
-+install: @PROG@ strip plug-ins_install
- 	$(INSTALL) -d $(DESTDIR)$(BINDIR)
- 	$(INSTALL) -m 700 $(PROG) $(DESTDIR)$(BINDIR)
- 	$(INSTALL) -d $(DESTDIR)$(DATADIR)
-@@ -82,16 +82,6 @@ install: @PROG@ strip
- 	-$(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
--	@echo "=============================================================="
--	@echo
--	@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 "@SB@ DOCS@EB@         installed in @SB@$(DESTDIR)$(DOCDIR) @EB@"
--	@echo
--	@echo "=============================================================="
--	@echo
- 
- plug-ins: src/include/ec_install_path.h
- 	@if test "@MAKEPLUG@" = "0"; then \
-@@ -114,13 +104,6 @@ plug-ins_install:
- 		false ; \
- 	fi
- 	@cd plugins && make install DESTDIR=$(DESTDIR) && cd ..
--	@echo
--	@echo "=============================================================="
--	@echo
--	@echo "@SB@ PLUGINS@EB@     installed in @SB@$(DESTDIR)$(PLUGDIR) @EB@"
--	@echo
--	@echo "=============================================================="
--	@echo
- 
- complete_install: install plug-ins_install
- 
diff --git a/net/ettercap/patches/patch-configure b/net/ettercap/patches/patch-configure
deleted file mode 100644
index eaa3dab2aea..00000000000
--- a/net/ettercap/patches/patch-configure
+++ /dev/null
@@ -1,39 +0,0 @@
-$OpenBSD: patch-configure,v 1.14 2005/11/26 21:17:54 kurt Exp $
---- configure.orig	Thu Jul 10 04:25:31 2003
-+++ configure	Sat Nov 26 10:55:41 2005
-@@ -10037,7 +10037,7 @@ echo $ECHO_N "checking for gcc option to
-          DLLEXPORTS="dlltool -e ./src/$PROG.exp -l ./$PROG.a -D $PROG.exe -d ./src/ec_cygwin.def"
-          EXPFILE="./src/$PROG.exp"
-       else
--         LIBS="$LIBS -rdynamic"
-+         LIBS="$LIBS -Wl,--export-dynamic"
-          PICFLAG="-fPIC -DPIC -shared"
-       fi
- 
-@@ -10105,7 +10105,7 @@ if test $check_ssh -ne 0; then
- 
-    if test -f $ssl_path/include/openssl/ssl.h; then
-       COPTS="$COPTS -I$ssl_path/include"
--      LIBS="$LIBS -L$ssl_path/lib -lssl -lcrypto"
-+      LIBS="$LIBS -L$ssl_path/lib -lssl -lcrypto -ldes"
-       cat >>confdefs.h <<\_ACEOF
- #define HAVE_OPENSSL 1
- _ACEOF
-@@ -10115,7 +10115,7 @@ _ACEOF
- echo "${ECHO_T}yes" >&6
-    elif test -f $ssl_path/ssl/include/openssl/ssl.h; then
-       COPTS="$COPTS -I$ssl_path/ssl/include"
--      LIBS="$LIBS -L$ssl_path/ssl/lib -lssl -lcrypto"
-+      LIBS="$LIBS -L$ssl_path/ssl/lib -lssl -lcrypto -ldes"
-       cat >>confdefs.h <<\_ACEOF
- #define HAVE_OPENSSL 1
- _ACEOF
-@@ -10124,7 +10124,7 @@ _ACEOF
-       echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-    elif test -f /usr/include/openssl/ssl.h; then
--      LIBS="$LIBS -lssl -lcrypto"
-+      LIBS="$LIBS -lssl -lcrypto -ldes"
-       cat >>confdefs.h <<\_ACEOF
- #define HAVE_OPENSSL 1
- _ACEOF
diff --git a/net/ettercap/patches/patch-configure_in b/net/ettercap/patches/patch-configure_in
new file mode 100644
index 00000000000..7e9c143b25d
--- /dev/null
+++ b/net/ettercap/patches/patch-configure_in
@@ -0,0 +1,82 @@
+$OpenBSD: patch-configure_in,v 1.1 2008/04/23 20:49:46 okan Exp $
+--- configure.in.orig	Thu Jan 13 04:24:28 2005
++++ configure.in	Thu Apr 10 02:03:36 2008
+@@ -272,7 +272,9 @@ AC_SEARCH_LIBS(gzopen,c z,,AC_MSG_ERROR(not found.))
+ dnl
+ dnl  Do we have dn_expand ?
+ dnl
+-EC_RESOLVE_CHECK()
++HAVE_DN_EXPAND_TRUE='#'
++HAVE_DN_EXPAND_FALSE=
++ac_ec_dns=no
+ 
+ dnl ===============================
+ dnl   Check for non standard libs
+@@ -328,17 +330,17 @@ AC_ARG_ENABLE(debug, AC_HELP_STRING(--enable-debug,cre
+ [ case "$enableval" in
+    yes)
+       AC_DEFINE(DEBUG, 1)
+-      DEBUG_FLAGS="-g -ggdb -Wmissing-prototypes -Wno-uninitialized -Werror -Wformat-security -Wsign-compare -Wall"
++      DEBUG_FLAGS="-g -ggdb -Wmissing-prototypes -Wno-uninitialized -Wformat-security -Wsign-compare -Wall"
+       AC_MSG_RESULT(yes)
+       ac_ec_debug=yes
+       ;;
+    no)  AC_MSG_RESULT(no)
+-      DEBUG_FLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
++      DEBUG_FLAGS="-Wall"
+       ac_ec_debug=no
+       ;;
+ esac ],
+    AC_MSG_RESULT(no)
+-   DEBUG_FLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
++   DEBUG_FLAGS="-Wall"
+    ac_ec_debug=no
+ )
+ 
+@@ -447,15 +449,6 @@ AC_ARG_WITH(libpcap, AC_HELP_STRING(--with-libpcap=DIR
+   AC_MSG_RESULT(yes) ]
+ )
+ 
+-if test "$OS" = "WINDOWS"; then
+-   EC_CHECK_FUNC(wpcap, pcap_datalink_val_to_description, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required]))
+-   EC_CHECK_FUNC(packet, PacketInitPacket, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required]))
+-   AC_CHECK_LIB(ws2_32, ntohs,, AC_MSG_ERROR([Incorrect ws2_32 version.]))
+-   AC_CHECK_LIB(iphlpapi, main)
+-else
+-   EC_CHECK_FUNC(pcap, pcap_datalink_val_to_description, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required]))
+-fi
+-
+ dnl ---------
+ dnl  libnet
+ dnl ---------
+@@ -483,6 +476,13 @@ AC_ARG_WITH(libnet, AC_HELP_STRING(--with-libnet=DIR,u
+         LNETLIB="-L$withval/lib -L$withval/src -lnet"
+         ac_ec_libnet=$withval
+         AC_MSG_RESULT($withval)
++     elif test -f $withval/include/libnet-1.1/libnet.h; then
++        owd=`pwd`
++        if cd $withval; then withval=`pwd`; cd $owd; fi
++        LNETINC="-I$withval/include/libnet-1.1"
++        LNETLIB="-L$withval/lib/libnet-1.1 -lnet"
++        ac_ec_libnet=$withval
++        AC_MSG_RESULT($withval)
+      else
+         AC_MSG_RESULT(no)
+         AC_MSG_ERROR([libnet.h not found in $withval])
+@@ -500,7 +500,6 @@ AC_ARG_WITH(libnet, AC_HELP_STRING(--with-libnet=DIR,u
+ ]
+ )
+ 
+-EC_CHECK_FUNC(net, libnet_adv_free_packet, $LNETLIB, $LIBS,, AC_MSG_ERROR([Incorrect libnet version. libnet >= 1.1.2.1 required]))
+ 
+ dnl ------------------
+ dnl Checks for openssl
+@@ -793,7 +792,7 @@ AC_ARG_ENABLE(gtk, AC_HELP_STRING(--enable-gtk,enable 
+ dnl -----------------------
+ dnl  set up the final vars
+ dnl -----------------------
+-EC_CFLAGS="$DEBUG_FLAGS $PCAPINC $LNETINC $SSLINC $PCREINC $ICONVINC"
++EC_CFLAGS="$CFLAGS $DEBUG_FLAGS $PCAPINC $LNETINC $SSLINC $PCREINC $ICONVINC"
+ EC_LIBS="$LIBS $PCAPLIB $LNETLIB $SSLLIB $PCRELIB $NCURSLIB $GTK_LIBS $ICONVLIB"
+ 
+ AC_SUBST(EC_CFLAGS)
diff --git a/net/ettercap/patches/patch-include_ec_stdint_h b/net/ettercap/patches/patch-include_ec_stdint_h
new file mode 100644
index 00000000000..fca533c37fa
--- /dev/null
+++ b/net/ettercap/patches/patch-include_ec_stdint_h
@@ -0,0 +1,12 @@
+$OpenBSD: patch-include_ec_stdint_h,v 1.1 2008/04/23 20:49:46 okan Exp $
+--- include/ec_stdint.h.orig	Mon Mar 24 15:17:58 2008
++++ include/ec_stdint.h	Mon Mar 24 15:22:33 2008
+@@ -26,7 +26,7 @@
+ 	typedef uint32_t  u_int32;
+ 	typedef uint64_t  u_int64;
+ 
+-   #ifdef OS_BSD_OPEN
++   #if defined OS_BSD_OPEN && !defined HAVE_STDINT_H
+       #define INT8_MAX     CHAR_MAX
+       #define UINT8_MAX    UCHAR_MAX
+       #define INT16_MAX    SHRT_MAX
diff --git a/net/ettercap/patches/patch-plugins_Makefile_in b/net/ettercap/patches/patch-plugins_Makefile_in
deleted file mode 100644
index 14b56b17e8f..00000000000
--- a/net/ettercap/patches/patch-plugins_Makefile_in
+++ /dev/null
@@ -1,25 +0,0 @@
-$OpenBSD: patch-plugins_Makefile_in,v 1.1 2003/01/29 02:02:51 margarida Exp $
---- plugins/Makefile.in.orig	Tue Jan 28 19:47:55 2003
-+++ plugins/Makefile.in	Tue Jan 28 19:51:07 2003
-@@ -10,7 +10,7 @@ all: plugins
- 
- plugins:
- 	for plug in $(PLUGINS); do \
--	make -C $$plug; \
-+	cd $$plug && make ; cd .. ; \
- 	done
- 
- install: plugins
-@@ -22,10 +22,10 @@ install: plugins
- clean:
- 	rm -f *.bak
- 	for plug in $(PLUGINS); do \
--	make clean -C $$plug; \
-+	cd $$plug && make clean ; cd .. ; \
- 	done
- 
- distclean:
- 	for plug in $(PLUGINS); do \
--	make distclean -C $$plug; \
-+	cd $$plug && make distclean ; cd .. ; \
- 	done
diff --git a/net/ettercap/patches/patch-share_etter_conf b/net/ettercap/patches/patch-share_etter_conf
new file mode 100644
index 00000000000..86092a0f27b
--- /dev/null
+++ b/net/ettercap/patches/patch-share_etter_conf
@@ -0,0 +1,14 @@
+$OpenBSD: patch-share_etter_conf,v 1.1 2008/04/23 20:49:46 okan Exp $
+--- share/etter.conf.orig	Mon Mar 24 18:19:12 2008
++++ share/etter.conf	Mon Mar 24 18:19:28 2008
+@@ -14,8 +14,8 @@
+ ############################################################################
+ 
+ [privs]
+-ec_uid = 65534                # nobody is the default
+-ec_gid = 65534                # nobody is the default
++ec_uid = 32767                # nobody is the default
++ec_gid = 32767                # nobody is the default
+ 
+ [mitm]
+ arp_storm_delay = 10          # milliseconds
diff --git a/net/ettercap/patches/patch-src_ec_capture_c b/net/ettercap/patches/patch-src_ec_capture_c
new file mode 100644
index 00000000000..28eb173b57a
--- /dev/null
+++ b/net/ettercap/patches/patch-src_ec_capture_c
@@ -0,0 +1,26 @@
+$OpenBSD: patch-src_ec_capture_c,v 1.1 2008/04/23 20:49:46 okan Exp $
+--- src/ec_capture.c.orig	Mon Mar 24 14:29:44 2008
++++ src/ec_capture.c	Mon Mar 24 14:31:05 2008
+@@ -211,8 +211,8 @@ void capture_init(void)
+    /* set the right dlt type for the iface */
+    GBL_PCAP->dlt = pcap_datalink(pd);
+      
+-   DEBUG_MSG("capture_init: %s [%d]", pcap_datalink_val_to_description(GBL_PCAP->dlt), GBL_PCAP->dlt);
+-   USER_MSG("(%s)\n\n", pcap_datalink_val_to_description(GBL_PCAP->dlt));
++   DEBUG_MSG("capture_init: [%d]", GBL_PCAP->dlt);
++   USER_MSG("\n\n");
+  
+    /* check that the bridge type is the same as the main iface */
+    if (GBL_SNIFF->type == SM_BRIDGED && pcap_datalink(pb) != GBL_PCAP->dlt)
+@@ -221,9 +221,9 @@ void capture_init(void)
+    /* check if we support this media */
+    if (get_decoder(LINK_LAYER, GBL_PCAP->dlt) == NULL) {
+       if (GBL_OPTIONS->read)
+-         FATAL_ERROR("Dump file not supported (%s)", pcap_datalink_val_to_description(GBL_PCAP->dlt));
++         FATAL_ERROR("Dump file not supported");
+       else
+-         FATAL_ERROR("Inteface \"%s\" not supported (%s)", GBL_OPTIONS->iface, pcap_datalink_val_to_description(GBL_PCAP->dlt));
++         FATAL_ERROR("Inteface \"%s\" not supported", GBL_OPTIONS->iface);
+    }
+    
+    /* set the alignment for the buffer */
diff --git a/net/ettercap/patches/patch-src_ec_dissector_ssh_c b/net/ettercap/patches/patch-src_ec_dissector_ssh_c
deleted file mode 100644
index bac6e500cd9..00000000000
--- a/net/ettercap/patches/patch-src_ec_dissector_ssh_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_ec_dissector_ssh_c,v 1.3 2003/11/02 00:38:32 margarida Exp $
---- src/ec_dissector_ssh.c.orig	2003-08-03 02:13:37.000000000 +0100
-+++ src/ec_dissector_ssh.c	2003-08-03 02:13:58.000000000 +0100
-@@ -37,6 +37,7 @@
-    #define NS_PUT32 PUTLONG
- #endif
- 
-+#include <des.h>
- #include <openssl/ssl.h>
- #include <openssl/rand.h>
- #include <ctype.h>
diff --git a/net/ettercap/patches/patch-src_ec_main_c b/net/ettercap/patches/patch-src_ec_main_c
deleted file mode 100644
index 41d932de6b4..00000000000
--- a/net/ettercap/patches/patch-src_ec_main_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_ec_main_c,v 1.3 2003/11/02 00:38:32 margarida Exp $
---- src/ec_main.c.orig	2003-07-10 09:25:32.000000000 +0100
-+++ src/ec_main.c	2003-11-02 00:29:08.000000000 +0000
-@@ -559,7 +559,7 @@ void Main_Check_NewRelease(void)
-          {
-             char wget[100];
-             snprintf(wget, sizeof(wget), "http://%s/download/ettercap-%s.tar.gz", host, latest);
--            if ( execl( WGET_PATH, "wget", wget, NULL) == -1 )
-+            if ( execl( WGET_PATH, "wget", wget, (void *)NULL) == -1 )
-                Error_msg("Cannot execute wget ! Auto update cannot download the file...\n");
-          }
-       }
diff --git a/net/ettercap/patches/patch-src_ec_plugins_c b/net/ettercap/patches/patch-src_ec_plugins_c
deleted file mode 100644
index 29fb2396eb3..00000000000
--- a/net/ettercap/patches/patch-src_ec_plugins_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_ec_plugins_c,v 1.3 2003/06/18 14:19:39 avsm Exp $
---- src/ec_plugins.c.orig	Fri Sep  6 09:57:31 2002
-+++ src/ec_plugins.c	Wed Jun 18 15:10:25 2003
-@@ -50,7 +50,7 @@
-    #define RTLD_NOW DL_LAZY
- #endif
- 
--#if defined(OPENBSD) || defined(MACOSX)
-+#if defined(OPENBSD) && !defined(__ELF__) || defined(MACOSX)
-    #define SYM_PREFIX "_"     // for the symbols loaded with dlsym
- #else
-    #define SYM_PREFIX ""
diff --git a/net/ettercap/patches/patch-src_interface_console_ec_simple_c b/net/ettercap/patches/patch-src_interface_console_ec_simple_c
deleted file mode 100644
index a75a47d7317..00000000000
--- a/net/ettercap/patches/patch-src_interface_console_ec_simple_c
+++ /dev/null
@@ -1,30 +0,0 @@
-$OpenBSD: patch-src_interface_console_ec_simple_c,v 1.1 2003/01/29 02:02:51 margarida Exp $
---- src/interface/console/ec_simple.c.orig	Tue Jan 28 19:11:31 2003
-+++ src/interface/console/ec_simple.c	Tue Jan 28 19:13:32 2003
-@@ -139,7 +139,7 @@ void Simple_CreateCertFile(void)
- 
-    if ( !fork() )
-    {
--      if ( execl( OPENSSL_PATH, "openssl", "genrsa", "-out", CERT_FILE, "1024", NULL) == -1)
-+      if ( execl( OPENSSL_PATH, "openssl", "genrsa", "-out", CERT_FILE, "1024", (void *)NULL) == -1)
-          Error_msg("Could not launch openssl --> " OPENSSL_PATH);
-    }
-    else
-@@ -147,7 +147,7 @@ void Simple_CreateCertFile(void)
- 
-    if ( !fork() )
-    {
--      if ( execl( OPENSSL_PATH, "openssl", "req", "-new", "-key", CERT_FILE, "-out", CERT_FILE ".csr", NULL) == -1)
-+      if ( execl( OPENSSL_PATH, "openssl", "req", "-new", "-key", CERT_FILE, "-out", CERT_FILE ".csr", (void *)NULL) == -1)
-          Error_msg("Could not launch openssl --> " OPENSSL_PATH);
-    }
-    else
-@@ -155,7 +155,7 @@ void Simple_CreateCertFile(void)
- 
-    if ( !fork() )
-    {
--      if ( execl( OPENSSL_PATH, "openssl", "x509", "-req", "-days", "365", "-in", CERT_FILE ".csr", "-signkey", CERT_FILE, "-out", CERT_FILE ".new", NULL) == -1)
-+      if ( execl( OPENSSL_PATH, "openssl", "x509", "-req", "-days", "365", "-in", CERT_FILE ".csr", "-signkey", CERT_FILE, "-out", CERT_FILE ".new", (void *)NULL) == -1)
-          Error_msg("Could not launch openssl --> " OPENSSL_PATH);
-    }
-    else
diff --git a/net/ettercap/patches/patch-src_interface_gtk_ec_gtk_factory_c b/net/ettercap/patches/patch-src_interface_gtk_ec_gtk_factory_c
deleted file mode 100644
index 934009eb5b7..00000000000
--- a/net/ettercap/patches/patch-src_interface_gtk_ec_gtk_factory_c
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_interface_gtk_ec_gtk_factory_c,v 1.2 2003/11/02 00:38:32 margarida Exp $
---- src/interface/gtk/ec_gtk_factory.c.orig	2003-08-03 02:23:22.000000000 +0100
-+++ src/interface/gtk/ec_gtk_factory.c	2003-08-03 02:25:38.000000000 +0100
-@@ -654,7 +654,7 @@ int Ginterface_Factory_UDP(u_char *buf)
-    {
-       UDP_header *udp;
-       IP_header *ip;
--      u_char tmp[8*50 + 5];
-+      u_char tmp[1500];
-       u_char payload[8*50];
-       int datalen;
- 
-@@ -768,7 +768,7 @@ int Ginterface_Factory_RAW(u_char *buf)
-    if (finished == -8)
-    {
-       IP_header *ip;
--      u_char tmp[14*50 + 5];
-+      u_char tmp[1500];
-       u_char payload[14*50];
-       int datalen;
- 
diff --git a/net/ettercap/patches/patch-src_interface_ncurses_ec_interface_factory_c b/net/ettercap/patches/patch-src_interface_ncurses_ec_interface_factory_c
deleted file mode 100644
index 9f80e7eae3c..00000000000
--- a/net/ettercap/patches/patch-src_interface_ncurses_ec_interface_factory_c
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_interface_ncurses_ec_interface_factory_c,v 1.2 2003/11/02 00:38:32 margarida Exp $
---- src/interface/ncurses/ec_interface_factory.c.orig	2003-08-03 02:32:33.000000000 +0100
-+++ src/interface/ncurses/ec_interface_factory.c	2003-08-03 02:32:44.000000000 +0100
-@@ -501,7 +501,7 @@ int Interface_Factory_UDP(u_char *buf)
-    {
-       UDP_header *udp;
-       IP_header *ip;
--      u_char tmp[8*50 + 5];
-+      u_char tmp[1500];
-       u_char payload[8*50];
-       int datalen;
- 
-@@ -609,7 +609,7 @@ int Interface_Factory_RAW(u_char *buf)
-    if (finished == 2)
-    {
-       IP_header *ip;
--      u_char tmp[14*50 + 5];
-+      u_char tmp[1500];
-       u_char payload[14*50];
-       int datalen;
- 
diff --git a/net/ettercap/patches/patch-src_interfaces_gtk_ec_gtk_conf_c b/net/ettercap/patches/patch-src_interfaces_gtk_ec_gtk_conf_c
new file mode 100644
index 00000000000..2fa0ee84f35
--- /dev/null
+++ b/net/ettercap/patches/patch-src_interfaces_gtk_ec_gtk_conf_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_interfaces_gtk_ec_gtk_conf_c,v 1.1 2008/04/23 20:49:46 okan Exp $
+--- src/interfaces/gtk/ec_gtk_conf.c.orig	Wed Apr  9 14:30:55 2008
++++ src/interfaces/gtk/ec_gtk_conf.c	Wed Apr  9 14:32:31 2008
+@@ -66,7 +66,7 @@ short gtkui_conf_get(char *name) {
+ void gtkui_conf_read(void) {
+    FILE *fd;
+    char *path;
+-   char line[50], name[30];
++   char line[100], name[30];
+    short value;
+ 
+ #ifdef OS_WINDOWS
diff --git a/net/ettercap/pkg/PFRAG.shared b/net/ettercap/pkg/PFRAG.shared
deleted file mode 100644
index dd57ccdbab0..00000000000
--- a/net/ettercap/pkg/PFRAG.shared
+++ /dev/null
@@ -1,33 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1 2003/05/13 09:00:25 margarida Exp $
-lib/ettercap/ec_H00_lurker.so
-lib/ettercap/ec_H01_zaratan.so
-lib/ettercap/ec_H02_troll.so
-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
diff --git a/net/ettercap/pkg/PLIST b/net/ettercap/pkg/PLIST
index ce95084ab45..c88899c5908 100644
--- a/net/ettercap/pkg/PLIST
+++ b/net/ettercap/pkg/PLIST
@@ -1,40 +1,86 @@
-@comment $OpenBSD: PLIST,v 1.14 2004/09/15 18:17:40 espie Exp $
+@comment $OpenBSD: PLIST,v 1.15 2008/04/23 20:49:46 okan Exp $
+bin/ettercap
+bin/etterfilter
+bin/etterlog
 lib/ettercap/
+@comment lib/ettercap/ec_arp_cop.la
+lib/ettercap/ec_arp_cop.so
+@comment lib/ettercap/ec_autoadd.la
+lib/ettercap/ec_autoadd.so
+@comment lib/ettercap/ec_chk_poison.la
+lib/ettercap/ec_chk_poison.so
+@comment lib/ettercap/ec_dns_spoof.la
+lib/ettercap/ec_dns_spoof.so
+@comment lib/ettercap/ec_dos_attack.la
+lib/ettercap/ec_dos_attack.so
+@comment lib/ettercap/ec_dummy.la
+lib/ettercap/ec_dummy.so
+@comment lib/ettercap/ec_find_conn.la
+lib/ettercap/ec_find_conn.so
+@comment lib/ettercap/ec_find_ettercap.la
+lib/ettercap/ec_find_ettercap.so
+@comment lib/ettercap/ec_find_ip.la
+lib/ettercap/ec_find_ip.so
+@comment lib/ettercap/ec_finger.la
+lib/ettercap/ec_finger.so
+@comment lib/ettercap/ec_finger_submit.la
+lib/ettercap/ec_finger_submit.so
+@comment lib/ettercap/ec_gre_relay.la
+lib/ettercap/ec_gre_relay.so
+@comment lib/ettercap/ec_gw_discover.la
+lib/ettercap/ec_gw_discover.so
+@comment lib/ettercap/ec_isolate.la
+lib/ettercap/ec_isolate.so
+@comment lib/ettercap/ec_link_type.la
+lib/ettercap/ec_link_type.so
+@comment lib/ettercap/ec_pptp_chapms1.la
+lib/ettercap/ec_pptp_chapms1.so
+@comment lib/ettercap/ec_pptp_clear.la
+lib/ettercap/ec_pptp_clear.so
+@comment lib/ettercap/ec_pptp_pap.la
+lib/ettercap/ec_pptp_pap.so
+@comment lib/ettercap/ec_pptp_reneg.la
+lib/ettercap/ec_pptp_reneg.so
+@comment lib/ettercap/ec_rand_flood.la
+lib/ettercap/ec_rand_flood.so
+@comment lib/ettercap/ec_remote_browser.la
+lib/ettercap/ec_remote_browser.so
+@comment lib/ettercap/ec_reply_arp.la
+lib/ettercap/ec_reply_arp.so
+@comment lib/ettercap/ec_repoison_arp.la
+lib/ettercap/ec_repoison_arp.so
+@comment lib/ettercap/ec_scan_poisoner.la
+lib/ettercap/ec_scan_poisoner.so
+@comment lib/ettercap/ec_search_promisc.la
+lib/ettercap/ec_search_promisc.so
+@comment lib/ettercap/ec_smb_clear.la
+lib/ettercap/ec_smb_clear.so
+@comment lib/ettercap/ec_smb_down.la
+lib/ettercap/ec_smb_down.so
+@comment lib/ettercap/ec_stp_mangler.la
+lib/ettercap/ec_stp_mangler.so
+@man man/man5/etter.conf.5
 @man man/man8/ettercap.8
-sbin/ettercap
-share/doc/ettercap/
-share/doc/ettercap/AUTHORS
-share/doc/ettercap/CHANGELOG
-share/doc/ettercap/COPYING
-share/doc/ettercap/HISTORY
-share/doc/ettercap/HYDRA.HOWTO
-share/doc/ettercap/INSTALL
-share/doc/ettercap/KNOWN-BUGS
-share/doc/ettercap/PORTINGS
-share/doc/ettercap/README
-share/doc/ettercap/README.PLUGINS
-share/doc/ettercap/README.WIN32
-share/doc/ettercap/ROPER.HOWTO
-share/doc/ettercap/THANKS
-share/doc/ettercap/TODO
-share/doc/ettercap/TODO.WIN32
-share/doc/ettercap/ZARATAN.HOWTO
-share/doc/ettercap/debug.txt
-share/doc/ettercap/errors.txt
-share/doc/ettercap/ettercap.fr.8.in
-share/doc/ettercap/threads.txt
+@man man/man8/ettercap_curses.8
+@man man/man8/ettercap_plugins.8
+@man man/man8/etterfilter.8
+@man man/man8/etterlog.8
 share/ettercap/
-share/ettercap/AUTHORS
-share/ettercap/THANKS
-share/ettercap/etter.conf
 share/ettercap/etter.dns
+share/ettercap/etter.fields
 share/ettercap/etter.filter
+share/ettercap/etter.filter.examples
+share/ettercap/etter.filter.kill
 share/ettercap/etter.filter.ssh
+share/ettercap/etter.finger.mac
+share/ettercap/etter.finger.os
 share/ettercap/etter.mime
-share/ettercap/etter.passive.os.fp
+share/ettercap/etter.services
 share/ettercap/etter.ssl.crt
-share/ettercap/lc-converter.c
-share/ettercap/mac-fingerprints
-share/ettercap/nmap-os-fingerprints
-share/ettercap/services
-%%SHARED%%
+share/ettercap/ettercap.png
+share/ettercap/etterfilter.cnt
+share/ettercap/etterfilter.tbl
+share/ettercap/etterlog.dtd
+share/examples/ettercap/
+share/examples/ettercap/etter.conf
+@sample ${SYSCONFDIR}/etter.conf