6 files changed, 54 insertions, 56 deletions

diff --git a/net-mgmt/aircrack-ng/Makefile b/net-mgmt/aircrack-ng/Makefile
index 20b25806fc20..2211fdd0de4d 100644
--- a/net-mgmt/aircrack-ng/Makefile
+++ b/net-mgmt/aircrack-ng/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	aircrack-ng
-DISTVERSION=	1.1
-PORTREVISION=	1
+DISTVERSION=	1.2b1
 CATEGORIES=	net-mgmt security
+DISTNAME=	${PORTNAME}-${DISTVERSION:C/b/-beta/}
 MASTER_SITES=	http://download.aircrack-ng.org/ \
 		http://bsd-geek.de/FreeBSD/distfiles/
 
@@ -12,7 +12,8 @@ MAINTAINER=	lme@FreeBSD.org
 COMMENT=	An 802.11 WEP and WPA-PSK keys cracking program
 
 USES=		gmake
-MAKE_ARGS+=	UNSTABLE=true			# build some extra tools
+USE_DOS2UNIX=	src/osdep/byteorder.h
+MAKE_ARGS+=	unstable=true prefix=${PREFIX}
 USE_OPENSSL=	yes
 SUB_FILES=	pkg-message
 
@@ -36,10 +37,8 @@ BROKEN=		Does not compile on sparc64-9
 
 post-patch:
 	@${REINPLACE_CMD} \
-		-e 's|= /usr/local|= ${PREFIX}|' \
 		-e 's|-I/usr/local|-I${LOCALBASE}|' \
 		-e 's|^CC[[:blank:]]*|&?|' \
-		-e 's|^RANLIB[[:blank:]]*|&?|' \
 		-e 's|^AR[[:blank:]]*|&?|' \
 			${WRKSRC}/common.mak
 # Do not install scripts (Linux-specific) and their manpages
diff --git a/net-mgmt/aircrack-ng/distinfo b/net-mgmt/aircrack-ng/distinfo
index be3808ab5bc0..6801a091c373 100644
--- a/net-mgmt/aircrack-ng/distinfo
+++ b/net-mgmt/aircrack-ng/distinfo
@@ -1,2 +1,2 @@
-SHA256 (aircrack-ng-1.1.tar.gz) = b136b549b7d2a2751c21793100075ea43b28de9af4c1969508bb95bcc92224ad
-SIZE (aircrack-ng-1.1.tar.gz) = 1453272
+SHA256 (aircrack-ng-1.2-beta1.tar.gz) = f12339ad3316ebe7615d2e863adf200465a3f4cf922046476d595caccf8a8ea5
+SIZE (aircrack-ng-1.2-beta1.tar.gz) = 3457757
diff --git a/net-mgmt/aircrack-ng/files/patch-src_osdep_byteorder.h b/net-mgmt/aircrack-ng/files/patch-src_osdep_byteorder.h
index a7606c6fb762..ac80b168046a 100644
--- a/net-mgmt/aircrack-ng/files/patch-src_osdep_byteorder.h
+++ b/net-mgmt/aircrack-ng/files/patch-src_osdep_byteorder.h
@@ -1,11 +1,11 @@
---- src/osdep/byteorder.h.orig	2011-08-28 18:26:15.000000000 +0200
-+++ src/osdep/byteorder.h	2011-08-28 18:26:25.000000000 +0200
-@@ -167,7 +167,7 @@
- 	 * Solaris

- 	 * -------

- 	 */

--	#if defined(__sparc__)

-+	#if defined(__sun) && defined(__SVR4) && defined(__sparc__)

- 	#include <sys/byteorder.h>

- 	#include <sys/types.h>

- 	#include <unistd.h>

+--- src/osdep/byteorder.h.orig	2013-03-04 18:32:55.000000000 +0100
++++ src/osdep/byteorder.h	2013-09-29 13:48:25.382520852 +0200
+@@ -181,7 +181,7 @@
+ 	 * Solaris
+ 	 * -------
+ 	 */
+-	#if defined(__sparc__) && defined(__sun__)
++	#if defined(__sparc__) && defined(__SVR4) && defined(__sun__)
+ 	#include <sys/byteorder.h>
+ 	#include <sys/types.h>
+ 	#include <unistd.h>
diff --git a/net-mgmt/aircrack-ng/files/patch-src_osdep_freebsd.c b/net-mgmt/aircrack-ng/files/patch-src_osdep_freebsd.c
index bd1640118a59..29ba88bb4a34 100644
--- a/net-mgmt/aircrack-ng/files/patch-src_osdep_freebsd.c
+++ b/net-mgmt/aircrack-ng/files/patch-src_osdep_freebsd.c
@@ -1,6 +1,6 @@
---- src/osdep/freebsd.c.orig	2008-02-26 19:12:19.000000000 +0100
-+++ src/osdep/freebsd.c	2011-09-29 20:35:48.000000000 +0200
-@@ -53,7 +53,9 @@
+--- src/osdep/freebsd.c.orig	2011-09-25 00:05:54.000000000 +0200
++++ src/osdep/freebsd.c	2013-09-29 13:49:18.588462319 +0200
+@@ -53,7 +53,9 @@ struct priv_fbsd {
  	unsigned char			pf_buf[4096];
  	unsigned char			*pf_next;
  	int				pf_totlen;
@@ -10,7 +10,7 @@
  
  	/* setchan */
  	int				pf_s;
-@@ -280,13 +282,16 @@
+@@ -280,13 +282,16 @@ static int fbsd_read(struct wif *wi, uns
  static int fbsd_write(struct wif *wi, unsigned char *h80211, int len,
  		      struct tx_info *ti)
  {
@@ -27,7 +27,7 @@
  	iov[0].iov_base = &pf->pf_txparams;
  	iov[0].iov_len = pf->pf_txparams.ibp_len;
  
-@@ -294,12 +299,19 @@
+@@ -294,12 +299,19 @@ static int fbsd_write(struct wif *wi, un
          iov[1].iov_len = len;
  
  	rc = writev(pf->pf_fd, iov, 2);
@@ -47,7 +47,7 @@
  }
  
  static int fbsd_set_channel(struct wif *wi, int chan)
-@@ -389,7 +401,7 @@
+@@ -389,7 +401,7 @@ static int do_fbsd_open(struct wif *wi, 
  
          memset(&ifr, 0, sizeof(ifr));
          strcpy(ifr.ifr_name, iface);
@@ -56,7 +56,7 @@
          if (ioctl(s, SIOCSIFMEDIA, &ifr) == -1)
  		goto close_sock;
  
-@@ -542,13 +554,17 @@
+@@ -542,13 +554,17 @@ static struct wif *fbsd_open(char *iface
  	/* setup private state */
  	pf = wi_priv(wi);
  	pf->pf_fd = fd;
diff --git a/net-mgmt/aircrack-ng/files/pkg-message.in b/net-mgmt/aircrack-ng/files/pkg-message.in
index c8153182f3ec..2c3a60d508f9 100644
--- a/net-mgmt/aircrack-ng/files/pkg-message.in
+++ b/net-mgmt/aircrack-ng/files/pkg-message.in
@@ -1,23 +1,10 @@
 ==============================================================================
 
-Note for FreeBSD 7.x:
-
-Contrary to Linux, it is not necessary to use airmon-ng to enable the monitor
-mode of your wireless card.  So do not care about what the manpages say about
-airmon-ng, airodump-ng sets monitor mode automatically.
-
-To return from monitor mode, issue the following command:
-
-	ifconfig ${INTERFACE} -mediaopt monitor
-
-
-Note for FreeBSD 8.x
-
 Due to the addition of virtual access points (VAP) in FreeBSD 8 you need to
 create a new wlan device in monitor mode to use with airodump-ng. To do so,
 issue the following command:
 	ifconfig ${VAP_INTERFACE} create wlandev ${INTERFACE} wlanmode monitor
 
-For aireplay-ng you need FreeBSD >= 7.0.
+Then run airodump-ng(1) with the newly created interface ${VAP_INTERFACE}.
 
 ==============================================================================
diff --git a/net-mgmt/aircrack-ng/pkg-plist b/net-mgmt/aircrack-ng/pkg-plist
index 08836a0fbfc2..fd3d314692a0 100644
--- a/net-mgmt/aircrack-ng/pkg-plist
+++ b/net-mgmt/aircrack-ng/pkg-plist
@@ -7,28 +7,40 @@ bin/ivstools
 bin/kstats
 bin/makeivs-ng
 bin/packetforge-ng
-man/man1/airbase-ng.1.gz
-man/man1/aircrack-ng.1.gz
-man/man1/airdecap-ng.1.gz
-man/man1/airdecloak-ng.1.gz
-man/man1/aireplay-ng.1.gz
-man/man1/airodump-ng.1.gz
-%%SQLITE%%man/man1/airolib-ng.1.gz
-man/man1/airserv-ng.1.gz
-man/man1/airtun-ng.1.gz
-man/man1/buddy-ng.1.gz
-man/man1/easside-ng.1.gz
-man/man1/ivstools.1.gz
-man/man1/kstats.1.gz
-man/man1/makeivs-ng.1.gz
-man/man1/packetforge-ng.1.gz
-man/man1/tkiptun-ng.1.gz
-man/man1/wesside-ng.1.gz
+bin/wpaclean
 sbin/airbase-ng
 sbin/aireplay-ng
 sbin/airodump-ng
 sbin/airserv-ng
 sbin/airtun-ng
+sbin/besside-ng
 sbin/easside-ng
 sbin/tkiptun-ng
 sbin/wesside-ng
+share/man/man1/aircrack-ng.1
+share/man/man1/airdecap-ng.1
+share/man/man1/airdecloak-ng.1
+%%SQLITE%%share/man/man1/airolib-ng.1
+share/man/man1/besside-ng-crawler.1
+share/man/man1/buddy-ng.1
+share/man/man1/ivstools.1
+share/man/man1/kstats.1
+share/man/man1/makeivs-ng.1
+share/man/man1/packetforge-ng.1
+share/man/man1/wpaclean.1
+share/man/man8/airbase-ng.8
+share/man/man8/airdriver-ng.8
+share/man/man8/aireplay-ng.8
+share/man/man8/airmon-ng.8
+share/man/man8/airmon-zc.8
+share/man/man8/airodump-ng-oui-update.8
+share/man/man8/airodump-ng.8
+share/man/man8/airserv-ng.8
+share/man/man8/airtun-ng.8
+share/man/man8/besside-ng.8
+share/man/man8/easside-ng.8
+share/man/man8/tkiptun-ng.8
+share/man/man8/wesside-ng.8
+@dirrmtry share/man/man8
+@dirrmtry share/man/man1
+@dirrmtry share/man