Index: ports/security/libargon2/Makefile
===================================================================
--- ports.orig/security/libargon2/Makefile
+++ ports/security/libargon2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libargon2
 PORTVERSION=	20171227
+PORTREVISION=	1
 CATEGORIES=	security devel
 
 MAINTAINER=	hsw@bitmark.com
@@ -22,6 +23,23 @@ MAKE_JOBS_UNSAFE=	yes
 LIBARGON2=	libargon2.so.0
 MAKE_ARGS+=	SO_LDFLAGS="-shared -Wl,-soname=${LIBARGON2}"
 
+OPTIONS_DEFINE_i386=	AVX
+OPTIONS_DEFINE_amd64=	${OPTIONS_DEFINE_i386}
+
+AVX_DESC=	Support Advanced Vector Extensions (AVX)
+
+.if defined(BATCH) || defined(PACKAGE_BUILDING)
+OPTIONS_DEFAULT_i386=
+OPTIONS_DEFAULT_amd64=
+.endif
+
+.include <bsd.port.options.mk>
+
+.if ! ${PORT_OPTIONS:MAVX}
+# prevents use of the AVX optimised code
+MAKE_ARGS+=	OPTTARGET=core2
+.endif
+
 # remove multiarch as this is only for Linux
 SUBST=		s/@HOST_MULTIARCH@//g;
 SUBST+=		s/@UPSTREAM_VER@/${PORTVERSION}/g;