--- src/cpp/session/CMakeLists.txt.orig	2022-02-16 19:26:03 UTC
+++ src/cpp/session/CMakeLists.txt
@@ -55,20 +55,21 @@ endif()
 # install pandoc
 # - by default, we use quarto + quarto's bundled pandoc
 # - if quarto is not enabled, use pandoc fallback
-if(QUARTO_ENABLED)
-   set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}/bin")
-elseif(EXISTS "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}")
-   set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}")
-else()
-   set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_DIR}/pandoc/${PANDOC_VERSION}")
-endif()
+#if(QUARTO_ENABLED)
+#   set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}/bin")
+#elseif(EXISTS "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}")
+#   set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}")
+#else()
+#   set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_DIR}/pandoc/${PANDOC_VERSION}")
+#endif()
 
 
 # validate our dependencies exist
 foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR
             RSTUDIO_DEPENDENCIES_MATHJAX_DIR
-            RSTUDIO_DEPENDENCIES_PANDOC_DIR
-            RSTUDIO_DEPENDENCIES_QUARTO_DIR)
+            #RSTUDIO_DEPENDENCIES_PANDOC_DIR
+            RSTUDIO_DEPENDENCIES_QUARTO_DIR
+            )
 
  
    # skip quarto if not enabled
@@ -95,19 +96,19 @@ foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
 endforeach()
 
 # verify libclang is installed (Windows only)
-if(WIN32)
-   set(LIBCLANG_VERSION "5.0.2")
-   set(LIBCLANG_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/${LIBCLANG_VERSION}")
-   if(NOT EXISTS "${LIBCLANG_DIR}")
-      message(FATAL_ERROR "libclang ${LIBCLANG_VERSION} not found  (re-run install-dependencies script to install)")
-   endif()
+#if(WIN32)
+#   set(LIBCLANG_VERSION "5.0.2")
+#   set(LIBCLANG_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/${LIBCLANG_VERSION}")
+#   if(NOT EXISTS "${LIBCLANG_DIR}")
+#      message(FATAL_ERROR "libclang ${LIBCLANG_VERSION} not found  (re-run install-dependencies script to install)")
+#   endif()
+#
+#   set(LIBCLANG_HEADERS_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers")
+#   if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}")
+#      message(FATAL_ERROR "libclang builtin-headers not found  (re-run install-dependencies script to install)")
+#   endif()
+#endif()
 
-   set(LIBCLANG_HEADERS_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers")
-   if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}")
-      message(FATAL_ERROR "libclang builtin-headers not found  (re-run install-dependencies script to install)")
-   endif()
-endif()
-
 # include files
 file(GLOB_RECURSE SESSION_HEADER_FILES "*.h*")
 
@@ -528,6 +529,9 @@ else()
 
 endif()
 
+# additional libraries
+target_link_libraries(rsession -L${FREEBSD_LIBDIR} -linotify -lprocstat)
+
 # skip libR RPATH at development time
 if(RSTUDIO_DEVELOPMENT OR RSTUDIO_RUN_IN_PLACE)
    set_target_properties(rsession PROPERTIES SKIP_BUILD_RPATH TRUE)
@@ -688,10 +692,10 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNAT
                DESTINATION "${RSTUDIO_INSTALL_BIN}"
                USE_SOURCE_PERMISSIONS)
       endif()
-   else()
-      install(DIRECTORY "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}/"
-              DESTINATION "${RSTUDIO_INSTALL_BIN}/pandoc"
-              USE_SOURCE_PERMISSIONS)
+   #else()
+      #install(DIRECTORY "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}/"
+      #        DESTINATION "${RSTUDIO_INSTALL_BIN}/pandoc"
+      #        USE_SOURCE_PERMISSIONS)
    endif()
 
    # install embedded packages
@@ -732,18 +736,18 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNAT
       DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
 
    # install libclang
-   if(WIN32)
-      file(GLOB LIBCLANG_32_FILES "${LIBCLANG_DIR}/x86/*")
-      install(PROGRAMS ${LIBCLANG_32_FILES}
-              DESTINATION  ${RSTUDIO_INSTALL_BIN}/rsclang/x86)
-      file(GLOB LIBCLANG_64_FILES "${LIBCLANG_DIR}/x86_64/*")
-      install(PROGRAMS ${LIBCLANG_64_FILES}
-              DESTINATION  ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64)
-
-      # install libclang builtin-headers
-      install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers"
-              DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang")
-   endif()
+#   if(WIN32)
+#      file(GLOB LIBCLANG_32_FILES "${LIBCLANG_DIR}/x86/*")
+#      install(PROGRAMS ${LIBCLANG_32_FILES}
+#              DESTINATION  ${RSTUDIO_INSTALL_BIN}/rsclang/x86)
+#      file(GLOB LIBCLANG_64_FILES "${LIBCLANG_DIR}/x86_64/*")
+#      install(PROGRAMS ${LIBCLANG_64_FILES}
+#              DESTINATION  ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64)
+#
+#      # install libclang builtin-headers
+#      install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers"
+#              DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang")
+#   endif()
 
    # install winpty on windows
    if(WIN32)