From f7b4fef6e2e9862ef79c5dae3e6f2d27bfdd4326 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zo=C3=AB=20Knox?= <zoe@pixin.net>
Date: Wed, 26 May 2021 18:05:05 -0400
Subject: [PATCH] Switched to FreeBSD branch stable/12 (#54)

* Test rebase to stable/12 branch
* Fix CocoaDemo Framework paths (#52)
---
 Makefile              | 2 +-
 examples/app/Makefile | 4 ++--
 version               | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 7bf892aa2fd2..407705ab2d6a 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ BUILDROOT := ${OBJPREFIX}/buildroot
 AIRYX_VERSION != head -1 ${TOPDIR}/version
 AIRYX_CODENAME != tail -1 ${TOPDIR}/version
 OSRELEASE := 12.2
-FREEBSD_BRANCH := releng/${OSRELEASE}
+FREEBSD_BRANCH := stable/${OSRELEASE:R}
 MKINCDIR := -m/usr/share/mk -m${TOPDIR}/mk
 CORES := 4
 
diff --git a/examples/app/Makefile b/examples/app/Makefile
index 979aa099b06a..2984faa019a9 100644
--- a/examples/app/Makefile
+++ b/examples/app/Makefile
@@ -28,8 +28,8 @@ SRCS=main.m MyView.m
 MK_DEBUG_FILES=no
 RESOURCES=rsc helium.jpg CocoaDemo.png
 SLF=/System/Library/Frameworks
-FRAMEWORKS=${SLF}/AppKit/AppKit ${SLF}/CoreGraphics ${SLF}/Onyx2D ${SLF}/OpenGL \
-	${SLF}/Foundation/Foundation ${SLF}/CoreFoundation ${SLF}/DBusKit/DBusKit
+FRAMEWORKS=${SLF}/AppKit ${SLF}/CoreGraphics ${SLF}/Onyx2D ${SLF}/OpenGL \
+	${SLF}/Foundation ${SLF}/CoreFoundation ${SLF}/DBusKit
 LDFLAGS+=-L/usr/local/lib -lGL
 
 build: all
diff --git a/version b/version
index 3d8a88ee550d..a42fea2f32cb 100644
--- a/version
+++ b/version
@@ -1,2 +1,2 @@
-0.2.2
+0.2.3pre
 Atomic