Index: branches/2018Q1/security/snort3/Makefile
===================================================================
--- branches/2018Q1/security/snort3/Makefile	(revision 460648)
+++ branches/2018Q1/security/snort3/Makefile	(revision 460649)
@@ -1,52 +1,58 @@
 # Created by: Mark Felder <feld@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	snort
 DISTVERSION=	3.0.0-a4.242
 PORTREVISION=	1
 CATEGORIES=	security
 PKGNAMESUFFIX=	3
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Lightweight network intrusion detection system
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	daq>=2.2.2:net/daq \
 		bash>0:shells/bash
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libdnet.so:net/libdnet \
 		libpcap.so:net/libpcap \
 		libluajit-5.1.so:lang/luajit \
 		libhwloc.so:devel/hwloc
 RUN_DEPENDS=	daq>=2.2.2:net/daq
 
 USES=		cmake compiler:c++11-lang cpe libtool pathfix pkgconfig ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	snortadmin
 GH_PROJECT=	snort3
 GH_TAGNAME=	BUILD_242
 
 OPTIONS_DEFINE=		DEBUG DOCS LRGPCAP
 
 OPTIONS_SUB=		yes
 
 LRGPCAP_DESC=		Pcaps larger than 2GB
 DEBUG_DESC=		Enable debugging symbols+core dumps
 
 DEBUG_CONFIGURE_ENABLE=	debug debug-msgs
 DEBUG_CONFIGURE_DISABLE=	corefiles
 DEBUG_MAKE_ENV=		DONTSTRIP="yes"
 LRGPCAP_CONFIGURE_ENABLE=	large-pcap
 
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1004000
+EXTRA_PATCHES=	${PATCHDIR}/freebsd103_patch-src_memory_memory__allocator.h
+.endif
+
 .include <bsd.port.options.mk>
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include
 
 CONFLICTS=	snort-2*
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: branches/2018Q1/security/snort3/files/freebsd103_patch-src_memory_memory__allocator.h
===================================================================
--- branches/2018Q1/security/snort3/files/freebsd103_patch-src_memory_memory__allocator.h	(nonexistent)
+++ branches/2018Q1/security/snort3/files/freebsd103_patch-src_memory_memory__allocator.h	(revision 460649)
@@ -0,0 +1,14 @@
+--- src/memory/memory_allocator.h.orig	2018-02-01 22:21:37 UTC
++++ src/memory/memory_allocator.h
+@@ -34,4 +34,11 @@ struct MemoryAllocator
+ 
+ } // namespace memory
+ 
++// Fix for FreeBSD 10.3's broken toolchain
++typedef struct {
++    long long __max_align1 __aligned(_Alignof(long long));
++    long double __max_align2 __aligned(_Alignof(long double));
++} max_align_t;
++
++
+ #endif

Property changes on: branches/2018Q1/security/snort3/files/freebsd103_patch-src_memory_memory__allocator.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2018Q1
===================================================================
--- branches/2018Q1	(revision 460648)
+++ branches/2018Q1	(revision 460649)

Property changes on: branches/2018Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r460648