2 files changed, 28 insertions(+), 9 deletions(-)

M chezscheme-racket/Makefile
M chezscheme-racket/PLIST

@@ 24,10 24,29 @@ BUILD_TARGET=	build
 
 CHECK_PORTABILITY_SKIP=	src/cs/c/configure
 
+.include "../../mk/bsd.prefs.mk"
+
+# For now, we always build with threads support
+PLIST_SUBST+=		CHEZ_THREADED=t
+
 .if ${MACHINE_ARCH} == i386
-CHEZ_ARCH=	i3
+PLIST_SUBST+=		CHEZ_ARCH=i3
 .elif ${MACHINE_ARCH} == x86_64
-CHEZ_ARCH=	a6
+PLIST_SUBST+=		CHEZ_ARCH=a6
+.elif ${MACHINE_ARCH} == aarch64
+PLIST_SUBST+=		CHEZ_ARCH=arm64
+.endif
+
+.if ${OPSYS} == NetBSD
+PLIST_SUBST+=		CHEZ_OS=nb
+.elif ${OPSYS} == FreeBSD
+PLIST_SUBST+=		CHEZ_OS=fb
+.elif ${OPSYS} == OpenBSD
+PLIST_SUBST+=		CHEZ_OS=ob
+.elif ${OPSYS} == Linux
+PLIST_SUBST+=		CHEZ_OS=le
+.elif ${OPSYS} == Darwin
+PLIST_SUBST+=		CHEZ_OS=osx
 .endif
 
 post-extract:

@@ 30,12 30,12 @@ lib/csv9.5.5.5/examples/setof.ss
 lib/csv9.5.5.5/examples/socket.ss
 lib/csv9.5.5.5/examples/template.ss
 lib/csv9.5.5.5/examples/unify.ss
-lib/csv9.5.5.5/ta6nb/libkernel.a
-lib/csv9.5.5.5/ta6nb/main.o
-lib/csv9.5.5.5/ta6nb/petite.boot
-lib/csv9.5.5.5/ta6nb/revision
-lib/csv9.5.5.5/ta6nb/scheme-script.boot
-lib/csv9.5.5.5/ta6nb/scheme.boot
-lib/csv9.5.5.5/ta6nb/scheme.h
+lib/csv9.5.5.5/${CHEZ_THREADED}${CHEZ_ARCH}${CHEZ_OS}/libkernel.a
+lib/csv9.5.5.5/${CHEZ_THREADED}${CHEZ_ARCH}${CHEZ_OS}/main.o
+lib/csv9.5.5.5/${CHEZ_THREADED}${CHEZ_ARCH}${CHEZ_OS}/petite.boot
+lib/csv9.5.5.5/${CHEZ_THREADED}${CHEZ_ARCH}${CHEZ_OS}/revision
+lib/csv9.5.5.5/${CHEZ_THREADED}${CHEZ_ARCH}${CHEZ_OS}/scheme-script.boot
+lib/csv9.5.5.5/${CHEZ_THREADED}${CHEZ_ARCH}${CHEZ_OS}/scheme.boot
+lib/csv9.5.5.5/${CHEZ_THREADED}${CHEZ_ARCH}${CHEZ_OS}/scheme.h
 man/man1/petite.1
 man/man1/scheme.1