Index: external/libcurl/Makefile.autosetup
===================================================================
--- external/libcurl/Makefile.autosetup
+++ external/libcurl/Makefile.autosetup
@@ -85,6 +85,7 @@
 	vtls_scache.c \
 	openssl.c \
 	keylog.c \
+	curl_memrchr.c \
 	hostcheck.c \
 	vauth.c \
 	vquic.c \
Index: external/libcurl/curl_config.h
===================================================================
--- external/libcurl/curl_config.h
+++ external/libcurl/curl_config.h
@@ -455,7 +455,9 @@
 /* #undef HAVE_MACH_ABSOLUTE_TIME */
 
 /* Define to 1 if you have the memrchr function or macro. */
+#if !defined(__APPLE__)
 #define HAVE_MEMRCHR 1
+#endif
 
 /* Define to 1 if you have the MSG_NOSIGNAL flag. */
 #define HAVE_MSG_NOSIGNAL 1
Index: libpkg/pkg.h.in
===================================================================
--- libpkg/pkg.h.in
+++ libpkg/pkg.h.in
@@ -48,6 +48,12 @@
 #include <stdlib.h>
 #include <pkg/vec.h>
 
+#if defined(__APPLE__)
+#define st_mtim st_mtimespec
+#define st_atim st_atimespec
+#define st_ctim st_ctimespec
+#endif
+
 /* The expected name of the pkg(8) binary executable. */
 #ifndef PKG_EXEC_NAME
 #define PKG_EXEC_NAME	"pkg"
Index: libpkg/private/pkg.h
===================================================================
--- libpkg/private/pkg.h
+++ libpkg/private/pkg.h
@@ -633,7 +633,8 @@
     return (a);
 }
 
-#define SQL_ARG(x) _Generic((x), \
+#if !defined(__APPLE__)
+  #define SQL_ARG(x) _Generic((x), \
         const char *: make_text_arg, \
         char *:       make_text_arg, \
         int64_t:      make_int64_arg, \
@@ -643,6 +644,19 @@
         u_int:        (sql_arg_t(*)(int64_t))make_int64_arg, \
         u_short:      (sql_arg_t(*)(int64_t))make_int64_arg \
     )(x)
+#else
+  #define SQL_ARG(x) _Generic((x), \
+        const char *: make_text_arg, \
+        char *:       make_text_arg, \
+        int64_t:      make_int64_arg, \
+        long:         (sql_arg_t(*)(int64_t))make_int64_arg, \
+        u_long:       (sql_arg_t(*)(int64_t))make_int64_arg, \
+        int:          (sql_arg_t(*)(int64_t))make_int64_arg, \
+        bool:         (sql_arg_t(*)(int64_t))make_int64_arg, \
+        u_int:        (sql_arg_t(*)(int64_t))make_int64_arg, \
+        u_short:      (sql_arg_t(*)(int64_t))make_int64_arg \
+    )(x)
+#endif
 
 /**
  * rc script actions