5 files changed, 50 insertions, 43 deletions

diff --git a/net-mgmt/ettercap/Makefile b/net-mgmt/ettercap/Makefile
index 5ae8ccc5c12d..ffed31d2049a 100644
--- a/net-mgmt/ettercap/Makefile
+++ b/net-mgmt/ettercap/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ettercap
-PORTVERSION=	0.6.4
+PORTVERSION=	0.6.7
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-mgmt/ettercap/distinfo b/net-mgmt/ettercap/distinfo
index c9ecde658b73..5ca3899f184e 100644
--- a/net-mgmt/ettercap/distinfo
+++ b/net-mgmt/ettercap/distinfo
@@ -1 +1 @@
-MD5 (ettercap-0.6.4.tar.gz) = 59506bf2e51e0742e7ed7ed758b648a1
+MD5 (ettercap-0.6.7.tar.gz) = 0a4796e9cfab826f27ddfef479c37a62
diff --git a/net-mgmt/ettercap/files/patch-aa b/net-mgmt/ettercap/files/patch-aa
index 978070ebd4d6..0e8d4b4087e3 100644
--- a/net-mgmt/ettercap/files/patch-aa
+++ b/net-mgmt/ettercap/files/patch-aa
@@ -1,24 +1,25 @@
---- Makefile.in.orig	Thu Feb 14 08:46:36 2002
-+++ Makefile.in	Thu Feb 14 08:47:08 2002
-@@ -62,9 +62,6 @@
+--- Makefile.in.orig	Thu Jun 27 19:27:33 2002
++++ Makefile.in	Wed Jul 17 17:06:29 2002
+@@ -70,10 +70,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 ./docs/[a-z]*/[a-z]* $(DESTDIR)$(DOCDIR)
+ 	-$(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
-@@ -77,7 +74,10 @@
+@@ -86,6 +83,11 @@
  	@echo
  	@echo "=============================================================="
  	@echo
--
++
 +install-doc:
 +	$(INSTALL) -d $(DESTDIR)$(DOCDIR)
 +	$(INSTALL) -m 644 $(DOC) $(DESTDIR)$(DOCDIR)
-+	$(INSTALL) -m 644 ./docs/[a-z]*/[a-z]* $(DESTDIR)$(DOCDIR)
- plug-ins: path
- 	cd plugins && make && cd ..
- 	cp -f ./plugins/[a-zH]*/ec_*.so ./
++	-$(INSTALL) -m 644 ./docs/[a-z]*/[a-z]* $(DESTDIR)$(DOCDIR)
+ 
+ plug-ins: src/include/ec_install_path.h
+ 	@if test "@MAKEPLUG@" = "0"; then \
diff --git a/net-mgmt/ettercap/files/patch-ab b/net-mgmt/ettercap/files/patch-ab
index 9b737c5acbc3..d74dd04de9cd 100644
--- a/net-mgmt/ettercap/files/patch-ab
+++ b/net-mgmt/ettercap/files/patch-ab
@@ -1,19 +1,19 @@
---- configure.orig	Fri Feb 15 01:30:05 2002
-+++ configure	Fri Feb 15 01:30:53 2002
-@@ -6465,14 +6465,14 @@
- 		;;
- 	no)  echo "$as_me:6466: result: no." >&5
+--- configure.orig	Fri Jun 14 18:53:14 2002
++++ configure	Wed Jul 17 17:09:18 2002
+@@ -8554,14 +8554,14 @@
+       ;;
+    no)  echo "$as_me:$LINENO: result: no." >&5
  echo "${ECHO_T}no." >&6
--		CFLAGS="-O3 -funroll-loops -fomit-frame-pointer -Wall"
-+#		CFLAGS="-O3 -funroll-loops -fomit-frame-pointer -Wall"
- 		ac_cv_ec_debug=no
- 		;;
+-      E_CFLAGS="-O3 -funroll-loops -fomit-frame-pointer -Wall"
++#      E_CFLAGS="-O3 -funroll-loops -fomit-frame-pointer -Wall"
+       ac_cv_ec_debug=no
+       ;;
  esac
  else
-   echo "$as_me:6473: result: no. disabled by default." >&5
+   echo "$as_me:$LINENO: result: no. disabled by default." >&5
  echo "${ECHO_T}no. disabled by default." >&6
--	CFLAGS="-O3 -funroll-loops -fomit-frame-pointer -Wall"
-+#	CFLAGS="-O3 -funroll-loops -fomit-frame-pointer -Wall"
- 	ac_cv_ec_debug=no
+-   E_CFLAGS="-O3 -funroll-loops -fomit-frame-pointer -Wall"
++#   E_CFLAGS="-O3 -funroll-loops -fomit-frame-pointer -Wall"
+    ac_cv_ec_debug=no
  
  fi;
diff --git a/net-mgmt/ettercap/pkg-plist b/net-mgmt/ettercap/pkg-plist
index 6cb1b6462ced..54b61479a6e8 100644
--- a/net-mgmt/ettercap/pkg-plist
+++ b/net-mgmt/ettercap/pkg-plist
@@ -1,26 +1,32 @@
+%%PORTDOCS%%share/doc/ettercap/AUTHORS
+%%PORTDOCS%%share/doc/ettercap/CHANGELOG
+%%PORTDOCS%%share/doc/ettercap/COPYING
+%%PORTDOCS%%share/doc/ettercap/HISTORY
+%%PORTDOCS%%share/doc/ettercap/INSTALL
+%%PORTDOCS%%share/doc/ettercap/KNOWN-BUGS
+%%PORTDOCS%%share/doc/ettercap/PORTINGS
+%%PORTDOCS%%share/doc/ettercap/README
+%%PORTDOCS%%share/doc/ettercap/README.PLUGINS
+%%PORTDOCS%%share/doc/ettercap/README.WIN32
+%%PORTDOCS%%share/doc/ettercap/ROPER.HOWTO
+%%PORTDOCS%%share/doc/ettercap/THANKS
+%%PORTDOCS%%share/doc/ettercap/TODO
+%%PORTDOCS%%share/doc/ettercap/TODO.WIN32
+%%PORTDOCS%%share/doc/ettercap/ZARATAN.HOWTO
+%%PORTDOCS%%share/doc/ettercap/debug.txt
+%%PORTDOCS%%share/doc/ettercap/errors.txt
+%%PORTDOCS%%share/doc/ettercap/ettercap.fr.8.in
+%%PORTDOCS%%share/doc/ettercap/threads.txt
 sbin/ettercap
-share/doc/ettercap/COPYING
-share/doc/ettercap/README
-share/doc/ettercap/README.PLUGINS
-share/doc/ettercap/README.WIN32
-share/doc/ettercap/CHANGELOG
-share/doc/ettercap/HISTORY
-share/doc/ettercap/AUTHORS
-share/doc/ettercap/TODO
-share/doc/ettercap/THANKS
-share/doc/ettercap/KNOWN-BUGS
-share/doc/ettercap/PORTINGS
-share/doc/ettercap/INSTALL
-share/doc/ettercap/ZARATAN.HOWTO
-share/doc/ettercap/ettercap.fr.8.in
-share/ettercap/mac-fingerprints
-share/ettercap/nmap-os-fingerprints
-share/ettercap/etter.mime
 share/ettercap/etter.conf
 share/ettercap/etter.dns
 share/ettercap/etter.filter
 share/ettercap/etter.filter.ssh
+share/ettercap/etter.mime
 share/ettercap/etter.passive.os.fp
 share/ettercap/etter.ssl.crt
-@dirrm share/doc/ettercap
+share/ettercap/mac-fingerprints
+share/ettercap/nmap-os-fingerprints
+share/ettercap/services
 @dirrm share/ettercap
+%%PORTDOCS%%@dirrm share/doc/ettercap