4 files changed, 36 insertions, 22 deletions

diff --git a/net-mgmt/ettercap/Makefile b/net-mgmt/ettercap/Makefile
index 3d99ee0bd24a..530581b9d35b 100644
--- a/net-mgmt/ettercap/Makefile
+++ b/net-mgmt/ettercap/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=       ettercap
-PORTVERSION=	0.2.4
+PORTVERSION=	0.3.1
 CATEGORIES=     net
 MASTER_SITES=   http://ettercap.sourceforge.net/download/
 
-MAINTAINER=	greid@ukug.uk.freebsd.org
+MAINTAINER=	greid@FreeBSD.org
 
 GNU_CONFIGURE=	yes
 
@@ -18,6 +18,8 @@ GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install install-doc
 .endif
 
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
+
 MAN8=		ettercap.8
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/ettercap/distinfo b/net-mgmt/ettercap/distinfo
index 441ef39696f0..9f206eafedc9 100644
--- a/net-mgmt/ettercap/distinfo
+++ b/net-mgmt/ettercap/distinfo
@@ -1 +1 @@
-MD5 (ettercap-0.2.4.tar.gz) = 26fceaafde5a9a17477ccff465fc074c
+MD5 (ettercap-0.3.1.tar.gz) = 990c41f21faf81a30ac8708bb819ce2f
diff --git a/net-mgmt/ettercap/files/patch-aa b/net-mgmt/ettercap/files/patch-aa
index 69e654f6b695..eb9a151df316 100644
--- a/net-mgmt/ettercap/files/patch-aa
+++ b/net-mgmt/ettercap/files/patch-aa
@@ -1,26 +1,35 @@
---- Makefile.in.orig	Fri Mar  9 03:49:52 2001
-+++ Makefile.in	Fri Mar  9 22:45:22 2001
-@@ -12,7 +12,7 @@
- 
+--- Makefile.in.orig	Thu Apr  5 23:55:42 2001
++++ Makefile.in	Thu Apr  5 23:57:01 2001
+@@ -13,7 +13,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@
-@@ -39,11 +39,12 @@
- install: @PROG@ strip
- 	$(INSTALL) -d $(DESTDIR)$(BINDIR)
+@@ -42,12 +42,15 @@
  	$(INSTALL) -m 700 $(PROG) $(DESTDIR)$(BINDIR)
+ 	$(INSTALL) -d $(DESTDIR)$(SHAREDIR)
+ 	$(INSTALL) -m 644 ./share/* $(DESTDIR)$(SHAREDIR)
 -	$(INSTALL) -d $(DESTDIR)$(DOCDIR)
 -	$(INSTALL) -m 644 $(DOC) $(DESTDIR)$(DOCDIR)
  	$(INSTALL) -d $(DESTDIR)$(MANDIR)/man8
  	$(INSTALL) -m 644 $(PROG).8 $(DESTDIR)$(MANDIR)/man8/$(PROG).8
  
+ 
 +install-doc:
 +	$(INSTALL) -d $(DESTDIR)$(DOCDIR)
 +	$(INSTALL) -m 644 $(DOC) $(DESTDIR)$(DOCDIR)
- 
++
++
  plug-ins:
  	cd plugins && make && cd ..
+ 	cp -f ./plugins/*/ec_*.so ./
+@@ -98,4 +101,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
diff --git a/net-mgmt/ettercap/pkg-plist b/net-mgmt/ettercap/pkg-plist
index c02fe670111b..ef69bfb78bc3 100644
--- a/net-mgmt/ettercap/pkg-plist
+++ b/net-mgmt/ettercap/pkg-plist
@@ -1,12 +1,15 @@
 bin/ettercap
-%%PORTDOCS%%share/doc/ettercap-0.2.4/AUTHORS
-%%PORTDOCS%%share/doc/ettercap-0.2.4/CHANGELOG
-%%PORTDOCS%%share/doc/ettercap-0.2.4/COPYING
-%%PORTDOCS%%share/doc/ettercap-0.2.4/HISTORY
-%%PORTDOCS%%share/doc/ettercap-0.2.4/KNOWN-BUGS
-%%PORTDOCS%%share/doc/ettercap-0.2.4/PORTINGS
-%%PORTDOCS%%share/doc/ettercap-0.2.4/README
-%%PORTDOCS%%share/doc/ettercap-0.2.4/README.PLUGINS
-%%PORTDOCS%%share/doc/ettercap-0.2.4/THANKS
-%%PORTDOCS%%share/doc/ettercap-0.2.4/TODO
-%%PORTDOCS%%@dirrm share/doc/ettercap-0.2.4
+share/ettercap/mac-fingerprints
+share/ettercap/nmap-os-fingerprints
+@dirrm share/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.PLUGINS
+%%PORTDOCS%%share/doc/ettercap-%%PORTVERSION%%/THANKS
+%%PORTDOCS%%share/doc/ettercap-%%PORTVERSION%%/TODO
+%%PORTDOCS%%@dirrm share/doc/ettercap-%%PORTVERSION%%