Index: emulators/ucon64/Makefile
===================================================================
RCS file: /home/cvs/ports/emulators/ucon64/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- emulators/ucon64/Makefile	15 Dec 2021 19:38:35 -0000	1.11
+++ emulators/ucon64/Makefile	18 Dec 2021 18:50:19 -0000
@@ -18,12 +18,16 @@ MASTER_SITES =	${MASTER_SITE_SOURCEFORGE
 
 WRKSRC =	${WRKDIST}/src
 
-CONFIGURE_STYLE = gnu
+CONFIGURE_STYLE =	gnu
 
-CONFIGURE_ARGS = --disable-dload --with-libdiscmage
+CONFIGURE_ARGS =	--disable-dload --with-libdiscmage
 
-.if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "i386"
-CONFIGURE_ARGS += --disable-parallel
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
+PKG_ARGS +=		-Dcd64=1
+CONFIGURE_ARGS +=	--with-libcd64
+.else
+PKG_ARGS +=		-Dcd64=0
+CONFIGURE_ARGS +=	--disable-parallel
 .endif
 
 USE_GMAKE =	Yes
@@ -31,13 +35,23 @@ USE_GMAKE =	Yes
 NO_TEST =	Yes
 
 pre-configure:
-	@sed -i 's,-O3,,' ${WRKSRC}/Makefile \
+	@sed -i 's,-O3 ,,' ${WRKSRC}/Makefile \
+		${WRKSRC}/backup/libcd64/Makefile \
 		${WRKSRC}/libdiscmage/Makefile.in
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ucon64 ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/libdiscmage/libdiscmage.so ${PREFIX}/lib
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
+	${INSTALL_DATA} ${WRKSRC}/backup/libcd64/libcd64.so ${PREFIX}/lib
+.endif
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ucon64
 	${INSTALL_DATA} ${WRKDIST}/faq.html ${PREFIX}/share/doc/ucon64
 
 .include <bsd.port.mk>
+
+.if ${CHOSEN_COMPILER} == "base-clang"
+MAKE_FLAGS =	CC=clang
+.else
+MAKE_FLAGS =	CC=gcc
+.endif
Index: emulators/ucon64/pkg/PFRAG.cd64
===================================================================
RCS file: emulators/ucon64/pkg/PFRAG.cd64
diff -N emulators/ucon64/pkg/PFRAG.cd64
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ emulators/ucon64/pkg/PFRAG.cd64	18 Dec 2021 18:31:46 -0000
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.cd64,v 1.3 2020/12/05 16:53:26 fcambus Exp $
+@so lib/libcd64.so
Index: emulators/ucon64/pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/emulators/ucon64/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- emulators/ucon64/pkg/PLIST	5 Dec 2020 16:53:26 -0000	1.3
+++ emulators/ucon64/pkg/PLIST	18 Dec 2021 18:46:01 -0000
@@ -1,5 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.3 2020/12/05 16:53:26 fcambus Exp $
+@comment $OpenBSD: PLIST,v$
 @bin bin/ucon64
+%%cd64%%
 @so lib/libdiscmage.so
 share/doc/ucon64/
 share/doc/ucon64/faq.html