1) Update to 0.6.4

2) Respect CFLAGS

PR:		34944 (1)
Submitted by:	Kirby Kuehl <kkuehl@cisco.com> (1)

5 files changed, 31 insertions, 14 deletions

diff --git a/net-mgmt/ettercap/Makefile b/net-mgmt/ettercap/Makefile
index f960d130208b..5ae8ccc5c12d 100644
--- a/net-mgmt/ettercap/Makefile
+++ b/net-mgmt/ettercap/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ettercap
-PORTVERSION=	0.6.3.1
+PORTVERSION=	0.6.4
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-mgmt/ettercap/distinfo b/net-mgmt/ettercap/distinfo
index db8b3c496497..c9ecde658b73 100644
--- a/net-mgmt/ettercap/distinfo
+++ b/net-mgmt/ettercap/distinfo
@@ -1 +1 @@
-MD5 (ettercap-0.6.3.1.tar.gz) = 080cb7ddccd7a20a614d2ff673ced6e4
+MD5 (ettercap-0.6.4.tar.gz) = 59506bf2e51e0742e7ed7ed758b648a1
diff --git a/net-mgmt/ettercap/files/patch-aa b/net-mgmt/ettercap/files/patch-aa
index 3f1979bb967a..978070ebd4d6 100644
--- a/net-mgmt/ettercap/files/patch-aa
+++ b/net-mgmt/ettercap/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Sun Dec 30 22:44:42 2001
-+++ Makefile.in	Sun Dec 30 22:48:42 2001
-@@ -60,9 +60,6 @@
+--- Makefile.in.orig	Thu Feb 14 08:46:36 2002
++++ Makefile.in	Thu Feb 14 08:47:08 2002
+@@ -62,9 +62,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)
@@ -10,20 +10,15 @@
  	$(INSTALL) -d $(DESTDIR)$(MANDIR)/man8
  	$(INSTALL) -m 644 $(PROG).8 $(DESTDIR)$(MANDIR)/man8/$(PROG).8
  	@echo
-@@ -76,6 +73,10 @@
+@@ -77,7 +74,10 @@
+ 	@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:
+ plug-ins: path
  	cd plugins && make && cd ..
  	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-mgmt/ettercap/files/patch-ab b/net-mgmt/ettercap/files/patch-ab
new file mode 100644
index 000000000000..9b737c5acbc3
--- /dev/null
+++ b/net-mgmt/ettercap/files/patch-ab
@@ -0,0 +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
+ 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
+ 		;;
+ esac
+ else
+   echo "$as_me:6473: 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
+ 
+ fi;
diff --git a/net-mgmt/ettercap/pkg-plist b/net-mgmt/ettercap/pkg-plist
index ffd828e7ad62..6cb1b6462ced 100644
--- a/net-mgmt/ettercap/pkg-plist
+++ b/net-mgmt/ettercap/pkg-plist
@@ -2,6 +2,7 @@ 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
@@ -10,9 +11,11 @@ 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