- Update to 0.7.1

- Pass maintainership to submitter
- While here, fix build WITH_GTK and fix some identation

PR:		138005
Submitted by:	Ayumi M <ayu@commun.jp>

4 files changed, 33 insertions, 22 deletions

diff --git a/security/yersinia/Makefile b/security/yersinia/Makefile
index 1f71d620114d..f7a94309d6c0 100644
--- a/security/yersinia/Makefile
+++ b/security/yersinia/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	yersinia
-PORTVERSION=	0.7
-PORTREVISION=	2
+PORTVERSION=	0.7.1
 CATEGORIES=	security
 MASTER_SITES=	http://www.yersinia.net/download/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ayu@commun.jp
 COMMENT=	Layer 2 vulnerability scanner (switches, spanning tree, 802.1q ...)
 
 BUILD_DEPENDS=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
@@ -26,7 +25,7 @@ USE_GNOME+=	pkgconfig gtk20
 PKGNAMESUFFIX=	-gtk
 CONFLICTS=	yersinia-[0-9]*
 .else
-CONFIGURE_ARGS+= --disable-gtk
+CONFIGURE_ARGS+=	--disable-gtk
 CONFLICTS=	yersinia-gtk-[0-9]*
 .endif
 GNU_CONFIGURE=	yes
@@ -43,7 +42,7 @@ post-patch:
 		${WRKSRC}/src/Makefile.in
 
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/src/yersinia ${PREFIX}/sbin/
-		${INSTALL_MAN} ${WRKSRC}/yersinia.8 ${PREFIX}/man/man8/
+	${INSTALL_PROGRAM} ${WRKSRC}/src/yersinia ${PREFIX}/sbin/
+	${INSTALL_MAN} ${WRKSRC}/yersinia.8 ${MAN8PREFIX}/man/man8/
 
 .include <bsd.port.mk>
diff --git a/security/yersinia/distinfo b/security/yersinia/distinfo
index e47873971c0e..4ef4bf5d446d 100644
--- a/security/yersinia/distinfo
+++ b/security/yersinia/distinfo
@@ -1,3 +1,3 @@
-MD5 (yersinia-0.7.tar.gz) = 66ae43c5571ceb695e9307b2a4f3c5c3
-SHA256 (yersinia-0.7.tar.gz) = 0a82b904991ee1ecbbeb0a19ca3c3261f4014170a5c50a7fcd5be9af5e30a029
-SIZE (yersinia-0.7.tar.gz) = 322812
+MD5 (yersinia-0.7.1.tar.gz) = dd3b79a625482961fe4e8bd96edff179
+SHA256 (yersinia-0.7.1.tar.gz) = 9c473c49bba9b5271ca1cc6fb5d64314bff675772f597837341f58dc93351a17
+SIZE (yersinia-0.7.1.tar.gz) = 318396
diff --git a/security/yersinia/files/patch-configure b/security/yersinia/files/patch-configure
index 7f22632cd561..f4e1547b61f2 100644
--- a/security/yersinia/files/patch-configure
+++ b/security/yersinia/files/patch-configure
@@ -1,6 +1,6 @@
---- ./configure.orig	Sun Jun 18 12:24:36 2006
-+++ ./configure	Fri Sep 29 15:04:21 2006
-@@ -2971,7 +2971,8 @@
+--- configure.orig	2007-01-27 04:22:30.000000000 +0900
++++ configure	2009-08-19 22:35:11.000000000 +0900
+@@ -3470,7 +3470,8 @@
  
  
  if test -n "$GCC"; then
@@ -10,7 +10,7 @@
  else
       { echo "$as_me:$LINENO: WARNING: Ouch!! Only gcc is supported..." >&5
  echo "$as_me: WARNING: Ouch!! Only gcc is supported..." >&2;}
-@@ -3817,7 +3818,7 @@
+@@ -4462,7 +4463,7 @@
            echo  $pcap_dir
            echo  $dir
            echo; echo please wipe out all unused pcap installations
@@ -19,12 +19,14 @@
         else
            pcap_dir="$dir"
         fi
-@@ -3997,62 +3998,8 @@
+@@ -4636,64 +4637,8 @@
  
+ fi
  
- 
--echo "$as_me:$LINENO: checking for a complete set of libnet headers" >&5
--echo $ECHO_N "checking for a complete set of libnet headers... $ECHO_C" >&6
+-
+-
+-{ echo "$as_me:$LINENO: checking for a complete set of libnet headers" >&5
+-echo $ECHO_N "checking for a complete set of libnet headers... $ECHO_C" >&6; }
 -
 -possible_dirs="`eval echo -n ${includedir}` \
 -	       /usr/include /usr/include/libnet \
@@ -34,13 +36,13 @@
 -possible_libnet_config_dirs="/usr /usr/local /opt"
 -
 -
--# Check whether --with-libnet-includes or --without-libnet-includes was given.
+-# Check whether --with-libnet-includes was given.
 -if test "${with_libnet_includes+set}" = set; then
--  withval="$with_libnet_includes"
--  LIBNET_DIR=$withval LIBNET_CONFIG_DIR=$withval
+-  withval=$with_libnet_includes; LIBNET_DIR=$withval LIBNET_CONFIG_DIR=$withval
 -else
 -  LIBNET_DIR=$possible_dirs LIBNET_CONFIG_DIR=$possible_libnet_config_dirs
--fi;
+-fi
+-
 -
 -libnet_dir=""
 -for dir in $LIBNET_DIR ; do
@@ -84,7 +86,7 @@
  
  if test "$LIBNET_LINK" != "-L/usr/lib" ; then
    LIBS="$LIBS $LIBNET_LINK"
-@@ -4067,7 +4014,7 @@
+@@ -4708,7 +4653,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
diff --git a/security/yersinia/files/patch-src-protocols.h b/security/yersinia/files/patch-src-protocols.h
new file mode 100644
index 000000000000..ccedef0d2edb
--- /dev/null
+++ b/security/yersinia/files/patch-src-protocols.h
@@ -0,0 +1,10 @@
+--- src/protocols.h.orig	2006-07-16 16:37:31.000000000 +0400
++++ src/protocols.h	2009-08-27 18:30:35.000000000 +0400
+@@ -26,6 +26,7 @@
+ #define __PROTOCOLS_H__
+ 
+ #include <pcap.h>
++#include <sys/socket.h>
+ #include <net/if.h>
+ 
+ #ifdef SOLARIS