- Unbreak on big-endian architectures [1]

- Use correct DISTVERSION [1]
- Style improvements [1]
- Update to 1.2-beta3

Submitted by:	danfe [1]

6 files changed, 59 insertions, 20 deletions

diff --git a/net-mgmt/aircrack-ng/Makefile b/net-mgmt/aircrack-ng/Makefile
index f0bb4055b29e..19a5f529b90f 100644
--- a/net-mgmt/aircrack-ng/Makefile
+++ b/net-mgmt/aircrack-ng/Makefile
@@ -2,22 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	aircrack-ng
-DISTVERSION=	1.2b2
-PORTREVISION=	2
+DISTVERSION=	1.2-beta3
 CATEGORIES=	net-mgmt security
 MASTER_SITES=	http://download.aircrack-ng.org/ \
 		http://bsd-geek.de/FreeBSD/distfiles/
-DISTNAME=	${PORTNAME}-${DISTVERSION:C/b/-beta/}
 
 MAINTAINER=	lme@FreeBSD.org
-COMMENT=	An 802.11 WEP and WPA-PSK keys cracking program
+COMMENT=	802.11 WEP and WPA-PSK keys cracking program
 
 LICENSE=	GPLv2 BSD3CLAUSE APACHE20
 LICENSE_COMB=	dual
 
 USES=		gmake dos2unix
 DOS2UNIX_FILES=	src/osdep/byteorder.h
-MAKE_ARGS+=	unstable=true prefix=${PREFIX}
+MAKE_ARGS=	unstable=true libnl=false prefix=${PREFIX}
 USE_OPENSSL=	yes
 SUB_FILES=	pkg-message
 
@@ -38,13 +36,6 @@ MAKE_ARGS+=	SQLITE=true
 BIN_FILES+=	airolib-ng
 .endif
 
-.if ${ARCH} == "powerpc"
-BROKEN=		Does not compile on powerpc
-.endif
-.if ${ARCH} == "sparc64" && ${OSVERSION} > 900000
-BROKEN=		Does not compile on sparc64-9
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|-I/usr/local|-I${LOCALBASE}|' \
@@ -62,12 +53,9 @@ post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|-lpthread|${PTHREAD_LIBS}|' \
 			${WRKSRC}/src/Makefile
+
 post-install:
-.for f in ${BIN_FILES}
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/$f
-.endfor
-.for f in ${SBIN_FILES}
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/$f
-.endfor
+	@${STRIP_CMD} ${BIN_FILES:S,^,${STAGEDIR}${PREFIX}/bin/,} \
+		${SBIN_FILES:S,^,${STAGEDIR}${PREFIX}/sbin/,}
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/aircrack-ng/distinfo b/net-mgmt/aircrack-ng/distinfo
index ddf8bd4f9838..f7e5a5448e95 100644
--- a/net-mgmt/aircrack-ng/distinfo
+++ b/net-mgmt/aircrack-ng/distinfo
@@ -1,2 +1,2 @@
-SHA256 (aircrack-ng-1.2-beta2.tar.gz) = ef7181f15462767249fde88219a503f27a7aee6f98b38e7e7d33a7b32880fbde
-SIZE (aircrack-ng-1.2-beta2.tar.gz) = 3447205
+SHA256 (aircrack-ng-1.2-beta3.tar.gz) = 2d22ae13360d466ffff1699cb1300ce5f807ffe9762314bb60ee49d9d2efe98d
+SIZE (aircrack-ng-1.2-beta3.tar.gz) = 2053021
diff --git a/net-mgmt/aircrack-ng/files/patch-src_crypto.h b/net-mgmt/aircrack-ng/files/patch-src_crypto.h
new file mode 100644
index 000000000000..98605413c096
--- /dev/null
+++ b/net-mgmt/aircrack-ng/files/patch-src_crypto.h
@@ -0,0 +1,10 @@
+--- src/crypto.h.orig	2014-04-01 19:15:06.228646731 +0200
++++ src/crypto.h	2014-04-01 19:16:22.960640528 +0200
+@@ -35,6 +35,7 @@
+ #ifndef _CRYPTO_H
+ #define _CRYPTO_H
+ 
++#include <sys/types.h>
+ #ifndef uint8
+ #define uint8  unsigned char
+ #endif
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 ac80b168046a..f8b0c5d3caa1 100644
--- a/net-mgmt/aircrack-ng/files/patch-src_osdep_byteorder.h
+++ b/net-mgmt/aircrack-ng/files/patch-src_osdep_byteorder.h
@@ -9,3 +9,14 @@
  	#include <sys/byteorder.h>
  	#include <sys/types.h>
  	#include <unistd.h>
+@@ -223,7 +223,9 @@
+ 
+ 	// FreeBSD
+ 	#ifdef __FreeBSD__
+-		#include <machine/endian.h>
++		#undef ushort
++		#undef uint
++		#include <sys/types.h>
+ 	#endif
+ 
+ 	// XXX: Is there anything to include on OpenBSD/NetBSD/DragonFlyBSD/...?
diff --git a/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_platform.h b/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_platform.h
new file mode 100644
index 000000000000..8dbfba04d03d
--- /dev/null
+++ b/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_platform.h
@@ -0,0 +1,11 @@
+--- src/osdep/radiotap/platform.h.orig	2014-04-01 19:18:03.439632822 +0200
++++ src/osdep/radiotap/platform.h	2014-04-01 19:18:19.900626663 +0200
+@@ -3,7 +3,7 @@
+ #ifndef _BSD_SOURCE
+ #define _BSD_SOURCE
+ #endif
+-#include <endian.h>
++#include <machine/endian.h>
+ 
+ #define le16_to_cpu		le16toh
+ #define le32_to_cpu		le32toh
diff --git a/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_radiotap.c b/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_radiotap.c
new file mode 100644
index 000000000000..694c47da927d
--- /dev/null
+++ b/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_radiotap.c
@@ -0,0 +1,19 @@
+--- src/osdep/radiotap/radiotap.c.orig	2014-04-01 19:20:56.379623336 +0200
++++ src/osdep/radiotap/radiotap.c	2014-04-01 19:22:54.880614337 +0200
+@@ -19,6 +19,16 @@
+ 	#include "../byteorder.h"
+ #endif
+ 
++#ifdef _BSD_SOURCE
++#if __BYTE_ORDER == __LITTLE_ENDIAN
++#define le16toh(x) (x)
++#define le32toh(x) (x)
++#else
++#define le32toh(x) bswap_32 (x)
++#endif
++#endif
++
++
+ /* function prototypes and related defs are in radiotap_iter.h */
+ 
+ static const struct radiotap_align_size rtap_namespace_sizes[] = {