Index: Mk/bsd.options.mk
===================================================================
--- Mk/bsd.options.mk
+++ Mk/bsd.options.mk
@@ -436,6 +436,9 @@
 PORT_OPTIONS:=	${PORT_OPTIONS:O:u}
 
 _REALLY_ALL_POSSIBLE_OPTIONS:=	${COMPLETE_OPTIONS_LIST} ${_ALL_EXCLUDE}
+.for _a in ${ALL_ARCHS}
+_REALLY_ALL_POSSIBLE_OPTIONS:=	${_REALLY_ALL_POSSIBLE_OPTIONS} ${OPTIONS_DEFINE_${_a}}
+.endfor
 _REALLY_ALL_POSSIBLE_OPTIONS:=	${_REALLY_ALL_POSSIBLE_OPTIONS:O:u}
 
 # Handle PORTDOCS and PORTEXAMPLES
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -1121,6 +1121,11 @@
 # Get the default maintainer
 MAINTAINER?=	ports@FreeBSD.org
 
+# Keep sync'ed with TARGETS from /usr/src/Makefile
+# DO NOT REMOVE archs from this list without making sure it is not used
+# anywhere in the tree.
+ALL_ARCHS=	amd64 arm arm64 i386 mips powerpc riscv
+
 # Get the architecture
 .if !defined(ARCH)
 ARCH!=	${UNAME} -p
Index: lang/siod/Makefile
===================================================================
--- lang/siod/Makefile
+++ lang/siod/Makefile
@@ -56,11 +56,6 @@
 .include <bsd.port.options.mk>
 MODULES+=	${SELECTED_OPTIONS:NDOCS:tl}
 
-# XXX This should not be necessary:
-.if ${ARCH} != i386
-PLIST_SUB+=	SQL_ORACLE="@comment "
-.endif
-
 do-configure:
 	${MKDIR} ${WRKSRC}/lib
 	${LN} -sf ${FILESDIR}/BSDmakefile.lib ${WRKSRC}/lib/BSDmakefile