Index: lang/go/Makefile
===================================================================
--- lang/go/Makefile
+++ lang/go/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	go
 PORTVERSION=	1.10.3
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	lang
 MASTER_SITES=	https://golang.org/dl/
@@ -15,6 +16,14 @@
 
 BUILD_DEPENDS=	go14>=1.4:lang/go14
 
+FLAVORS=	${FLAVORS_${ARCH}}
+FLAVORS_i386=	default nosse2
+FLAVOR?=	${FLAVORS:[1]}
+
+nosse2_CONFLICTS_INSTALL=	${PORTNAME}
+nosse2_PKGNAMESUFFIX=		-nosse2
+default_CONFLICTS_INSTALL=	${PORTNAME}-nosse2
+
 USES=		shebangfix
 SHEBANG_LANG=	sh perl
 SHEBANG_FILES=	src/*.bash \
@@ -32,9 +41,6 @@
 WRKSRC=		${WRKDIR}/go
 ONLY_FOR_ARCHS=	i386 amd64 armv6 armv7
 
-OPTIONS_DEFINE=	GO387
-GO387_DESC=	Do not generate code with SSE2 (for old x86 CPU)
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386
@@ -47,7 +53,7 @@
 IGNORE=		unknown arch ${ARCH}
 .endif
 
-.if ${PORT_OPTIONS:MGO387}
+.if ${FLAVOR} == nosse2
 GO386=387
 .endif