Index: head/science/rdkit/Makefile
===================================================================
--- head/science/rdkit/Makefile	(revision 567855)
+++ head/science/rdkit/Makefile	(revision 567856)
@@ -1,68 +1,76 @@
 # $FreeBSD$
 
 PORTNAME=	rdkit
 DISTVERSIONPREFIX=	Release_
 DISTVERSION=	2020_09_5
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Collection of cheminformatics and machine-learning software
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 BUILD_DEPENDS=	catch>0:devel/catch \
 		flex:textproc/flex \
 		rapidjson>=0:devel/rapidjson
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libcoordgen.so:science/coordgenlibs \
 		libfreetype.so:print/freetype2 \
 		libmaeparser.so:science/maeparser
 
 USES=		bison:build cmake compiler:c++11-lang eigen:3 python:3.6+
 USE_GITHUB=	yes
 GH_TUPLE=	rareylab:RingDecomposerLib:v1.1.3_rdkit:RingDecomposerLib/External/RingFamilies/RingDecomposerLib
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	RDK_INSTALL_INTREE RDK_USE_FLEXBISON \
 		RDK_INSTALL_STATIC_LIBS RDK_SWIG_STATIC RDK_PGSQL_STATIC \
 		RDK_OPTIMIZE_NATIVE \
 		RDK_BUILD_CPP_TESTS
-CMAKE_ARGS=	-DFREEBSD_DOCSDIR:PATH=${DOCSDIR} -DCATCH_DIR=${LOCALBASE}/include/catch2
+CMAKE_ARGS=	-DCATCH_DIR=${LOCALBASE}/include/catch2
 
 DATADIR=	${PREFIX}/share/RDKit
 DOCSDIR=	${PREFIX}/share/doc/RDKit
 
 PLIST_SUB=	SHLIB_VER=${PORTVERSION}
 
-OPTIONS_DEFINE=		PYTHON DOCS
+OPTIONS_DEFINE=		DOCS PGSQL PYTHON
 OPTIONS_DEFAULT=	PYTHON
 OPTIONS_SUB=		yes
+
+DOCS_CMAKE_BOOL=	FREEBSD_INSTALL_DOCS
+DOCS_CMAKE_ON=		-DFREEBSD_DOCSDIR:PATH=${DOCSDIR}
+
+PGSQL_USES=		pgsql
+PGSQL_DESC=		Build the PostgreSQL cartridge
+PGSQL_CMAKE_BOOL=	RDK_BUILD_PGSQL
 
 PYTHON_CMAKE_BOOL=	RDK_BUILD_PYTHON_WRAPPERS
 PYTHON_BUILD_DEPENDS=	${PYNUMPY}
 PYTHON_LIB_DEPENDS=	${PY_BOOST}
 PYTHON_RUN_DEPENDS=	${PYNUMPY} \
 			${PY_PILLOW} \
 			${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR}
 
 PORTDOCS=	*
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH:Marm*} || ${ARCH} == i386 || ${ARCH:Mmips*el*} || ${ARCH} == riscv
 PLIST_SUB+=	LITTLE_ENDIAN=""
 .else
 PLIST_SUB+=	LITTLE_ENDIAN="@comment "
 .endif
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/External/rapidjson-1.1.0
 	@cd ${WRKSRC}/External/rapidjson-1.1.0 && ${LN} -s ${LOCALBASE}/include/rapidjson include
 
 post-stage: # https://github.com/rdkit/rdkit/issues/2094
 	#@${MKDIR} ${STAGEDIR}${PREFIX}/lib/cmake
 	#@${MV} ${STAGEDIR}${PREFIX}/lib/*.cmake ${STAGEDIR}${PREFIX}/lib/cmake
 
 .include <bsd.port.mk>
Index: head/science/rdkit/files/patch-CMakeLists.txt
===================================================================
--- head/science/rdkit/files/patch-CMakeLists.txt	(revision 567855)
+++ head/science/rdkit/files/patch-CMakeLists.txt	(revision 567856)
@@ -1,21 +1,29 @@
---- CMakeLists.txt.orig	2020-12-12 08:00:55 UTC
+--- CMakeLists.txt.orig	2021-03-01 16:43:06 UTC
 +++ CMakeLists.txt
-@@ -68,7 +68,7 @@ if(NOT MSVC)
+@@ -68,8 +68,8 @@ if(NOT MSVC)
    if(RDK_OPTIMIZE_POPCNT)
      if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64")
        message("RDK_OPTIMIZE_POPCNT is not available on aarch64")
 -    elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "ppc64le")
-+    elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(ppc64|powerpc64)")
 -      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mpopcntb")
++    elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(ppc64|powerpc64)")
 +      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mpopcntd")
      else()
        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mpopcnt")
-@@ -460,7 +460,7 @@ if(NOT RDK_INSTALL_INTREE)
+     endif()
+@@ -459,12 +459,14 @@ if(NOT RDK_INSTALL_INTREE)
+       COMPONENT data
        PATTERN ".svn" EXCLUDE
        )
++  if (FREEBSD_INSTALL_DOCS)
    install(DIRECTORY Docs DESTINATION
 -      ${RDKit_ShareDir}
 +      ${FREEBSD_DOCSDIR}
        COMPONENT docs
        PATTERN ".svn" EXCLUDE
        PATTERN "_build" EXCLUDE
+       )
++  endif()
+   install(DIRECTORY Contrib DESTINATION
+       ${RDKit_ShareDir}
+       COMPONENT extras