diff --git a/10.9-libcxx/stable/main/finkinfo/devel/cunit1.info b/10.9-libcxx/stable/main/finkinfo/devel/cunit1.info
index 7228312df94..f67839da039 100644
--- a/10.9-libcxx/stable/main/finkinfo/devel/cunit1.info
+++ b/10.9-libcxx/stable/main/finkinfo/devel/cunit1.info
@@ -10,8 +10,6 @@ Homepage: http://cunit.sourceforge.net
 Source: mirror:sourceforge:cunit/CUnit-2.1-3.tar.bz2
 Source-Checksum: SHA256(f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214)
 
-PatchScript: perl -pi -e 's|LDFLAGS="\$LDFLAGS -L\${PWD}/CUnit/Sources"||' configure.in
-
 BuildDependsOnly: true
 Depends: %N-shlibs (= %v-%r)
 BuildDepends: autoconf2.6, automake1.15-core, libtool2 (>= 2.4.2-4)
@@ -21,6 +19,11 @@ NoSetLDFLAGS: true
 
 ConfigureParams: --disable-static --disable-dependency-tracking
 
+PatchScript: <<
+	perl -pi -e 's|LDFLAGS="\$LDFLAGS -L\${PWD}/CUnit/Sources"||' configure.in
+	perl -pi -e 's|(AM_INIT_AUTOMAKE)|AC_CONFIG_AUX_DIR([build-aux])\nAC_CONFIG_MACRO_DIRS([m4])\n$1|' configure.in
+<<
+
 CompileScript: <<
 	libtoolize --force
 	aclocal-1.15 --force
diff --git a/10.9-libcxx/stable/main/finkinfo/libs/libpaper1.info b/10.9-libcxx/stable/main/finkinfo/libs/libpaper1.info
index c3bcfcbea31..a8b6bf51309 100644
--- a/10.9-libcxx/stable/main/finkinfo/libs/libpaper1.info
+++ b/10.9-libcxx/stable/main/finkinfo/libs/libpaper1.info
@@ -18,7 +18,7 @@ Source-Checksum: SHA256(c8bb946ec93d3c2c72bbb1d7257e90172a22a44a07a07fb6b802a5bb
 SourceDirectory: libpaper-%v
 
 PatchFile: %n.patch
-PatchFile-MD5: ea68d95f876dc070d614cf7122ba82b7
+PatchFile-MD5: 0dbc856314291afe8f1a4103e407c300
 ConfigureParams: <<
 	--mandir=%p/share/man \
 	--enable-dependency-tracking \
diff --git a/10.9-libcxx/stable/main/finkinfo/libs/libpaper1.patch b/10.9-libcxx/stable/main/finkinfo/libs/libpaper1.patch
index ebc37beafd6..72379284e54 100644
--- a/10.9-libcxx/stable/main/finkinfo/libs/libpaper1.patch
+++ b/10.9-libcxx/stable/main/finkinfo/libs/libpaper1.patch
@@ -8,15 +8,16 @@ diff -Nurd -x'*~' libpaper-1.1.24.orig/Makefile.am libpaper-1.1.24/Makefile.am
  
 diff -Nurd -x'*~' libpaper-1.1.24.orig/configure.ac libpaper-1.1.24/configure.ac
 --- libpaper-1.1.24.orig/configure.ac	2006-03-19 12:13:05.000000000 -0500
-+++ libpaper-1.1.24/configure.ac	2015-02-16 03:29:06.000000000 -0500
-@@ -5,6 +5,7 @@
++++ libpaper-1.1.24/configure.ac	2023-01-02 13:29:06.000000000 -0500
+@@ -2,6 +2,8 @@
+ 
+ AC_INIT([libpaper], [1.1.27])
+ AC_CONFIG_SRCDIR([configure.ac])
++AC_CONFIG_AUX_DIR([build-aux])
++AC_CONFIG_MACRO_DIR([m4])
  AM_INIT_AUTOMAKE([no-define])
  AM_CONFIG_HEADER(config.h)
  AM_MAINTAINER_MODE
-+AC_CONFIG_MACRO_DIR([m4])
- 
- dnl Check for standard build environment
- dnl ====================================
 diff -Nurd -x'*~' libpaper-1.1.24.orig/lib/Makefile.am libpaper-1.1.24/lib/Makefile.am
 --- libpaper-1.1.24.orig/lib/Makefile.am	2006-01-07 16:17:55.000000000 -0500
 +++ libpaper-1.1.24/lib/Makefile.am	2015-02-16 03:38:06.000000000 -0500
diff --git a/10.9-libcxx/stable/main/finkinfo/utils/watchman.info b/10.9-libcxx/stable/main/finkinfo/utils/watchman.info
index 14fc759eb2f..da1605f1bf5 100644
--- a/10.9-libcxx/stable/main/finkinfo/utils/watchman.info
+++ b/10.9-libcxx/stable/main/finkinfo/utils/watchman.info
@@ -19,12 +19,20 @@ SourceRename: %n-%v.tar.gz
 BuildDepends: autoconf2.6, automake1.15-core, libpcre1, libtool2, pkgconfig
 Depends: libpcre1-shlibs
 
+SetCXXFlags: -Wno-invalid-offsetof -Wno-deprecated-declarations
+
 ConfigureParams: <<
 	--enable-silent-rules \
 	--enable-conffile=%p/etc/watchman.json \
 	--disable-cppclient
 <<
 
+PatchScript: <<
+	perl -pi -e 's|(AC_CONFIG_MACRO_DIR)|AC_CONFIG_AUX_DIR([build-aux])\n$1|' configure.ac
+	perl -pi -e 's|(uint32_t total)( = )|$1 [[gnu::unused]]$2|' json.cpp
+	perl -pi -e 's|(sprintf\()(seq)(, )|snprintf($2, sizeof($2), |' thirdparty/jansson/dump.cpp
+<<
+
 CompileScript: <<
 	libtoolize --no-warn -i -f
 	aclocal-1.15
@@ -42,4 +50,10 @@ InstallScript: <<
 	rm -r %i/lib
 <<
 
+DescPort: <<
+	Disabled/cleared critical warnings with XCode 14 on
+	-Wunused-but-set-variable (`total`), -Winvalid-offsetof (`object`).
+	-Wdeprecated-declarations (`sprintf`, `FSEventStreamScheduleWithRunLoop`).
+<<
+
 DocFiles: README.markdown LICENSE