Index: Makefile
===================================================================
--- Makefile	(revision 522215)
+++ Makefile	(working copy)
@@ -44,7 +44,13 @@
 		ssltap strsclnt symkeyutil vfychain vfyserv
 
 OPTIONS_DEFINE=	DEBUG
+OPTIONS_DEFINE_powerpc64=	VSX
 
+VSX_DESC=	Enable VSX and crypto (POWER8 and newer)
+
+VSX_CFLAGS=	-mcrypto -mvsx
+VSX_USES=	compiler:c11
+
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MDEBUG}
@@ -54,10 +60,6 @@
 BINS=		${DIST}/${OPSYS}${OSREL}_DBG.OBJ
 .endif
 
-.if ${ARCH} == powerpc64
-USES+=		compiler:c++11-lang # -mcrypto -mvsx
-.endif
-
 .if ${OPSYS} == FreeBSD && ${ARCH} == amd64
 USE_BINUTILS=	# intel-gcm.s
 CC+=	-B${LOCALBASE}/bin
Index: files/patch-bug1602386
===================================================================
--- files/patch-bug1602386	(revision 522215)
+++ files/patch-bug1602386	(working copy)
@@ -4,15 +4,12 @@
 
 --- lib/freebl/Makefile.orig	2019-12-04 01:03:31.000000000 +0100
 +++ lib/freebl/Makefile	2019-12-11 16:48:47.959791000 +0100
-@@ -788,5 +788,7 @@
+@@ -788,5 +788,1 @@
  endif
- 
- ifeq ($(CPU_ARCH),ppc)
+-
+-ifeq ($(CPU_ARCH),ppc)
 -$(OBJDIR)/$(PROG_PREFIX)gcm-ppc$(OBJ_SUFFIX): CFLAGS += -mcrypto -maltivec
-+$(OBJDIR)/$(PROG_PREFIX)gcm-ppc$(OBJ_SUFFIX): CFLAGS += -mcrypto -maltivec -mvsx
-+$(OBJDIR)/$(PROG_PREFIX)gcm$(OBJ_SUFFIX): CFLAGS += -mcrypto -maltivec -mvsx
-+$(OBJDIR)/$(PROG_PREFIX)rijndael$(OBJ_SUFFIX): CFLAGS += -mcrypto -maltivec -mvsx
- endif
+-endif
 --- lib/freebl/blinit.c.orig	2019-12-11 17:45:06.930646000 +0100
 +++ lib/freebl/blinit.c	2019-12-11 17:50:04.797680000 +0100
 @@ -393,7 +393,12 @@
Index: files/patch-lib_freebl_gcm.h
===================================================================
--- files/patch-lib_freebl_gcm.h	(nonexistent)
+++ files/patch-lib_freebl_gcm.h	(working copy)
@@ -0,0 +1,26 @@
+--- lib/freebl/gcm.h.orig	2019-12-04 01:03:31.000000000 +0100
++++ lib/freebl/gcm.h	2020-01-07 23:15:04.826777000 +0100
+@@ -31,7 +31,6 @@
+ #endif
+ 
+ #ifdef __powerpc64__
+-#include "altivec-types.h"
+ 
+ /* The ghash freebl test tries to use this in C++, and gcc defines conflict. */
+ #ifdef __cplusplus
+@@ -41,12 +40,11 @@
+ #endif
+ 
+ /*
+- * PPC CRYPTO requires at least gcc 5 or clang. The LE check is purely
+- * because it's only been tested on LE. If you're interested in BE,
+- * please send a patch.
++ * PPC CRYPTO requires at least gcc 5 or clang.
+  */
+ #if (defined(__clang__) || (defined(__GNUC__) && __GNUC__ >= 5)) && \
+-    defined(IS_LITTLE_ENDIAN)
++    defined(__VSX__) && defined(__CRYPTO__)
++#include "altivec-types.h"
+ #define USE_PPC_CRYPTO
+ #endif
+ 

Property changes on: files/patch-lib_freebl_gcm.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