4 files changed, 40 insertions, 45 deletions

diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile
index 56a6b2a93684..f960d130208b 100644
--- a/net/ettercap/Makefile
+++ b/net/ettercap/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ettercap
-PORTVERSION=	0.5.2
+PORTVERSION=	0.6.3.1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/ettercap/distinfo b/net/ettercap/distinfo
index b03011819c50..db8b3c496497 100644
--- a/net/ettercap/distinfo
+++ b/net/ettercap/distinfo
@@ -1 +1 @@
-MD5 (ettercap-0.5.2.tar.gz) = bdf3ed18bd076d74d2134e3b6dd45ce3
+MD5 (ettercap-0.6.3.1.tar.gz) = 080cb7ddccd7a20a614d2ff673ced6e4
diff --git a/net/ettercap/files/patch-aa b/net/ettercap/files/patch-aa
index 88b734fd9826..3f1979bb967a 100644
--- a/net/ettercap/files/patch-aa
+++ b/net/ettercap/files/patch-aa
@@ -1,34 +1,29 @@
---- Makefile.in.orig	Tue Jul 10 01:28:52 2001
-+++ Makefile.in	Tue Jul 10 01:28:26 2001
-@@ -17,7 +17,7 @@
- BINDIR   = @bindir@
- MANDIR   = @mandir@
- SHAREDIR = ${prefix}/share/@PROG@
--DOCDIR   = ${prefix}/doc/@PROG@-@VERSION@
-+DOCDIR   = ${prefix}/share/doc/@PROG@-@VERSION@
- DOC      = COPYING README README.PLUGINS CHANGELOG HISTORY AUTHORS TODO THANKS KNOWN-BUGS PORTINGS
- 
- DEBUG    = @DEBUG@
-@@ -53,12 +53,13 @@
- 	$(INSTALL) -m 644 ./etter.conf $(DESTDIR)$(SHAREDIR)
- 	$(INSTALL) -m 644 ./etter.filter $(DESTDIR)$(SHAREDIR)
- 	$(INSTALL) -m 644 ./etter.ssl.crt $(DESTDIR)$(SHAREDIR)
+--- Makefile.in.orig	Sun Dec 30 22:44:42 2001
++++ Makefile.in	Sun Dec 30 22:48:42 2001
+@@ -60,9 +60,6 @@
+ 	$(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/*/* $(DESTDIR)$(DOCDIR)
+-	$(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
+@@ -76,6 +73,10 @@
+ 	@echo "=============================================================="
+ 	@echo
  
 +install-doc:
 +	$(INSTALL) -d $(DESTDIR)$(DOCDIR)
 +	$(INSTALL) -m 644 $(DOC) $(DESTDIR)$(DOCDIR)
-+	$(INSTALL) -m 644 ./docs/*/* $(DESTDIR)$(DOCDIR)
- 
++	$(INSTALL) -m 644 ./docs/[a-z]*/[a-z]* $(DESTDIR)$(DOCDIR)
  plug-ins:
  	cd plugins && make && cd ..
-@@ -112,4 +113,4 @@
- 
- targz: distro
- 	mv $(PROG)-$(VERSION).tar.gz $(PROG)-$(VERSION)-@SERIAL@.tar.gz
--	chmod 644 $(PROG)-$(VERSION)-@SERIAL@.tar.gz
-+	chmod 644 $(PROG)-$(VERSION)-@SERIAL@.tar.gz
+ 	cp -f ./plugins/[a-zH]*/ec_*.so ./
+@@ -158,4 +159,4 @@
+ 	@rm -f ettercap
+ 	@shtool tarball -o $(PROG)-$(VERSION)-@SERIAL@.tar.gz -c 'gzip -9' -e '\.o,\.prj,\.gz,\.bak,\.so,\.log,CVS' ./ etter.*
+ 	@chmod 644 $(PROG)-$(VERSION)-@SERIAL@.tar.gz
+-	@ls -Hs $(PROG)-$(VERSION)-@SERIAL@.tar.gz
++	@ls -Hs $(PROG)-$(VERSION)-@SERIAL@.tar.gz
diff --git a/net/ettercap/pkg-plist b/net/ettercap/pkg-plist
index 46cfb04575e7..ffd828e7ad62 100644
--- a/net/ettercap/pkg-plist
+++ b/net/ettercap/pkg-plist
@@ -1,23 +1,23 @@
-bin/ettercap
-%%PORTDOCS%%share/doc/ettercap-%%PORTVERSION%%/AUTHORS
-%%PORTDOCS%%share/doc/ettercap-%%PORTVERSION%%/CHANGELOG
-%%PORTDOCS%%share/doc/ettercap-%%PORTVERSION%%/COPYING
-%%PORTDOCS%%share/doc/ettercap-%%PORTVERSION%%/HISTORY
-%%PORTDOCS%%share/doc/ettercap-%%PORTVERSION%%/KNOWN-BUGS
-%%PORTDOCS%%share/doc/ettercap-%%PORTVERSION%%/PORTINGS
-%%PORTDOCS%%share/doc/ettercap-%%PORTVERSION%%/README
-%%PORTDOCS%%share/doc/ettercap-%%PORTVERSION%%/README.fr
-%%PORTDOCS%%share/doc/ettercap-%%PORTVERSION%%/README.it
-%%PORTDOCS%%share/doc/ettercap-%%PORTVERSION%%/README.PLUGINS
-%%PORTDOCS%%share/doc/ettercap-%%PORTVERSION%%/README.PLUGINS.fr
-%%PORTDOCS%%share/doc/ettercap-%%PORTVERSION%%/README.PLUGINS.it
-%%PORTDOCS%%share/doc/ettercap-%%PORTVERSION%%/THANKS
-%%PORTDOCS%%share/doc/ettercap-%%PORTVERSION%%/TODO
-%%PORTDOCS%%share/doc/ettercap-%%PORTVERSION%%/ettercap.fr.8.in
+sbin/ettercap
+share/doc/ettercap/COPYING
+share/doc/ettercap/README
+share/doc/ettercap/README.PLUGINS
+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/ettercap.fr.8.in
+share/ettercap/mac-fingerprints
+share/ettercap/nmap-os-fingerprints
 share/ettercap/etter.conf
+share/ettercap/etter.dns
 share/ettercap/etter.filter
+share/ettercap/etter.filter.ssh
+share/ettercap/etter.passive.os.fp
 share/ettercap/etter.ssl.crt
-share/ettercap/mac-fingerprints
-share/ettercap/nmap-os-fingerprints
+@dirrm share/doc/ettercap
 @dirrm share/ettercap
-%%PORTDOCS%%@dirrm share/doc/ettercap-%%PORTVERSION%%