3 files changed, 14 insertions, 23 deletions

diff --git a/net-mgmt/aircrack-ng/Makefile b/net-mgmt/aircrack-ng/Makefile
index e76c8a6d43e1..2549e846e4cc 100644
--- a/net-mgmt/aircrack-ng/Makefile
+++ b/net-mgmt/aircrack-ng/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aircrack-ng
-DISTVERSION=	1.2-rc1
-PORTREVISION=	1
+DISTVERSION=	1.2-rc2
 CATEGORIES=	net-mgmt security
 MASTER_SITES=	http://download.aircrack-ng.org/ \
 		http://bsd-geek.de/FreeBSD/distfiles/
@@ -18,28 +17,26 @@ USES=		cpe dos2unix gmake
 CPE_VERSION=	${DISTVERSION:C/-.*//}
 CPE_UPDATE=	${DISTVERSION:C/^[^-]*$//:C/.*-//}
 DOS2UNIX_FILES=	src/osdep/byteorder.h
-MAKE_ARGS=	unstable=true libnl=false prefix=${PREFIX}
+MAKE_ARGS=	experimental=true libnl=false prefix=${PREFIX}
+INSTALL_TARGET=	strip install
 USE_OPENSSL=	yes
 
-BIN_FILES=	airdecloak-ng buddy-ng aircrack-ng airdecap-ng ivstools \
-		makeivs-ng packetforge-ng wpaclean kstats
-SBIN_FILES=	airtun-ng besside-ng airbase-ng easside-ng airodump-ng \
-		aireplay-ng wesside-ng airserv-ng tkiptun-ng
-
-OPTIONS_DEFINE=	SQLITE
+OPTIONS_DEFINE=	PCRE SQLITE
+OPTIONS_DEFAULT=PCRE SQLITE
 OPTIONS_SUB=	yes
+
+PCRE_DESC=	Use Perl Compatible Regular Expressions for wesside
+PCRE_MAKE_ARGS=	pcre=true
+PCRE_LIB_DEPENDS=   libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_USES=	pkgconfig
+
 SQLITE_DESC=	Use SQLite for storing pre-computed key tables
 SQLITE_USE=	SQLITE=yes
-SQLITE_MAKE_ARGS=	SQLITE=true
-SQLITE_CFLAGS=	-I${LOCALBASE}/include
-SQLITE_VARS=	BIN_FILES+=airolib-ng
+SQLITE_MAKE_ARGS=	sqlite=true
 
 post-patch:
 	@${REINPLACE_CMD} \
-		-e 's|-I/usr/local|-I${LOCALBASE}|' \
 		-e 's|share/\(man/man[1-9]\)|\1|' \
-		-e 's|^CC[[:blank:]]*|&?|' \
-		-e 's|^AR[[:blank:]]*|&?|' \
 			${WRKSRC}/common.mak
 # Do not install scripts (Linux-specific) and their manpages
 	@${REINPLACE_CMD} \
@@ -49,8 +46,4 @@ post-patch:
 		-E 's/air(driver|mon)-ng\.1 //' \
 			${WRKSRC}/manpages/Makefile
 
-post-install:
-	@${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 a7a0dcc56e1e..081f60e1ac9a 100644
--- a/net-mgmt/aircrack-ng/distinfo
+++ b/net-mgmt/aircrack-ng/distinfo
@@ -1,2 +1,2 @@
-SHA256 (aircrack-ng-1.2-rc1.tar.gz) = cf3134521e1c3d7aed4e384e3e5e7b6959e2d485bd1554474608a3a9328e35fd
-SIZE (aircrack-ng-1.2-rc1.tar.gz) = 2046476
+SHA256 (aircrack-ng-1.2-rc2.tar.gz) = ba5b3eda44254efc5b7c9f776eb756f7cc323ad5d0813c101e92edb483d157e9
+SIZE (aircrack-ng-1.2-rc2.tar.gz) = 2046531
diff --git a/net-mgmt/aircrack-ng/pkg-plist b/net-mgmt/aircrack-ng/pkg-plist
index 4984f39c4e6d..6255191685ee 100644
--- a/net-mgmt/aircrack-ng/pkg-plist
+++ b/net-mgmt/aircrack-ng/pkg-plist
@@ -20,10 +20,8 @@ man/man1/makeivs-ng.1.gz
 man/man1/packetforge-ng.1.gz
 man/man1/wpaclean.1.gz
 man/man8/airbase-ng.8.gz
-man/man8/airdriver-ng.8.gz
 man/man8/aireplay-ng.8.gz
 man/man8/airmon-ng.8.gz
-man/man8/airmon-zc.8.gz
 man/man8/airodump-ng-oui-update.8.gz
 man/man8/airodump-ng.8.gz
 man/man8/airserv-ng.8.gz