Index: x11/emwm/Makefile
===================================================================
RCS file: /cvs/ports/x11/emwm/Makefile,v
diff -u -p -u -p -r1.3 Makefile
--- x11/emwm/Makefile	30 Oct 2025 21:34:15 -0000	1.3
+++ x11/emwm/Makefile	28 Aug 2026 00:31:17 -0000
@@ -1,31 +1,48 @@
-COMMENT =	enhanced motif window manager (MWM fork)
+COMMENT=	enhanced motif window manager (MWM fork)
 
-V =		1.3
-DISTNAME =	emwm-src-${V}
-PKGNAME =	emwm-${V}
-REVISION =	0
+V=		2.1
+DISTNAME=	emwm-src-${V}
+PKGNAME=	emwm-${V}
 
-CATEGORIES =	x11
-HOMEPAGE =	https://fastestcode.org/emwm.html
+CATEGORIES=	x11
+HOMEPAGE=	https://fastestcode.org/emwm.html
 
-# LGPL v2.1
-PERMIT_PACKAGE = Yes
+SITES=		https://fastestcode.org/dl/
+EXTRACT_SUFX=	.tar.xz
 
-SITES =		https://fastestcode.org/dl/
-EXTRACT_SUFX =	.tar.xz
+# LGPL v2.1
+PERMIT_PACKAGE=	Yes
 
 WANTLIB += X11 Xext Xinerama Xm Xrandr Xt c m
 
-LIB_DEPENDS =	x11/motif
+LIB_DEPENDS=	x11/motif
 
-MAKE_FLAGS =	RCDIR=${PREFIX}/lib/X11 \
-		CFLAGS="${CFLAGS}"
+WRKDIST=	${WRKDIR}/emwm-src-${V}
 
-FAKE_FLAGS =	PREFIX=${WRKINST}${PREFIX} \
-		APPLRESDIR=${WRKINST}${PREFIX}/lib/X11/app-defaults \
-		MANDIR=${WRKINST}${PREFIX}/man \
-		RCDIR=${WRKINST}${PREFIX}/lib/X11
+MAKE_ENV=	CC='${CC}' \
+		CFLAGS='${CFLAGS}' \
+		LDFLAGS='${LDFLAGS}'
+
+MAKE_FLAGS=	PREFIX='${PREFIX}' \
+		MANDIR='${PREFIX}/man' \
+		RCDIR='${PREFIX}/lib/X11' \
+		APPLRESDIR='${PREFIX}/lib/X11/app-defaults' \
+		INCDIRS='-I${X11BASE}/include -I${LOCALBASE}/include' \
+		LIBDIRS='-L${X11BASE}/lib -L${LOCALBASE}/lib'
+
+do-build:
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+		${MAKE_PROGRAM} ${MAKE_FLAGS} OpenBSD
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/src/emwm ${PREFIX}/bin/emwm
+	${INSTALL_MAN} ${WRKSRC}/src/emwm.1 ${PREFIX}/man/man1/emwm.1
+	${INSTALL_MAN} ${WRKSRC}/src/emwmrc.4 ${PREFIX}/man/man4/emwmrc.4
+	${INSTALL_DATA} ${WRKSRC}/src/Emwm.ad \
+		${PREFIX}/lib/X11/app-defaults/Emwm
+	${INSTALL_DATA} ${WRKSRC}/src/system.emwmrc \
+		${PREFIX}/lib/X11/system.emwmrc
 
-NO_TEST =	Yes
+NO_TEST=	Yes
 
 .include <bsd.port.mk>
Index: x11/emwm/distinfo
===================================================================
RCS file: /cvs/ports/x11/emwm/distinfo,v
diff -u -p -u -p -r1.2 distinfo
--- x11/emwm/distinfo	8 May 2025 14:18:13 -0000	1.2
+++ x11/emwm/distinfo	28 Aug 2026 00:31:17 -0000
@@ -1,2 +1,2 @@
-SHA256 (emwm-src-1.3.tar.xz) = Y58/q4P/a0scnHnKRr9iBIVevoNC7gUqIUiUJVQQuM0=
-SIZE (emwm-src-1.3.tar.xz) = 337648
+SHA256 (emwm-src-2.1.tar.xz) = 1EDIKgHP92ZwxLstR6cy4k/+7fh7uM+iMMYgk34K+Es=
+SIZE (emwm-src-2.1.tar.xz) = 298340
Index: x11/emwm/patches/patch-mf_Makefile_OpenBSD
===================================================================
RCS file: x11/emwm/patches/patch-mf_Makefile_OpenBSD
diff -N x11/emwm/patches/patch-mf_Makefile_OpenBSD
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ x11/emwm/patches/patch-mf_Makefile_OpenBSD	28 Aug 2026 00:31:17 -0000
@@ -0,0 +1,19 @@
+Preserve compiler flags supplied by the ports framework.  Avoid adding
+the platform definitions twice; common.mf already appends them.
+
+Index: mf/Makefile.OpenBSD
+--- mf/Makefile.OpenBSD.orig
++++ mf/Makefile.OpenBSD
+@@ -8,10 +8,10 @@ APPLRESDIR = /usr/X11R6/lib/X11/app-defaults
+ INCDIRS = -I/usr/X11R6/include -I/usr/local/include
+ LIBDIRS = -L/usr/X11R6/lib -L/usr/local/lib
+ 
+-CFLAGS = -O2 -Wall $(INCDIRS)
++CFLAGS += -Wall
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) $(DEFINES) $(INCDIRS) -c -o $(@D)/$(@F) $<
++	$(CC) $(CFLAGS) $(INCDIRS) -c -o $(@D)/$(@F) $<
+ 
+ include common.mf
+ 
Index: x11/emwm/pkg/DESCR
===================================================================
RCS file: /cvs/ports/x11/emwm/pkg/DESCR,v
diff -u -p -u -p -r1.1.1.1 DESCR
--- x11/emwm/pkg/DESCR	23 Aug 2024 05:58:19 -0000	1.1.1.1
+++ x11/emwm/pkg/DESCR	28 Aug 2026 00:31:17 -0000
@@ -3,5 +3,5 @@ The idea behind this is to provide compa
 extensions and applications, without changing the way the window
 manager looks and behaves. This includes support for multi-monitor
 setups through Xinerama/Xrandr, UTF-8 support with Xft fonts, and
-overall better compatibility with software that requires Extended
-Window Manager Hints.
+multiple workspaces with configurable backdrops. It also provides better
+compatibility with software that requires Extended Window Manager Hints.
Index: x11/emwm/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/emwm/pkg/PLIST,v
diff -u -p -u -p -r1.1.1.1 PLIST
--- x11/emwm/pkg/PLIST	23 Aug 2024 05:58:19 -0000	1.1.1.1
+++ x11/emwm/pkg/PLIST	28 Aug 2026 00:31:17 -0000
@@ -3,3 +3,4 @@ lib/X11/app-defaults/Emwm
 lib/X11/system.emwmrc
 @man man/man1/emwm.1
 @man man/man4/emwmrc.4
+share/doc/pkg-readmes/${PKGSTEM}
Index: x11/emwm/pkg/README
===================================================================
RCS file: x11/emwm/pkg/README
diff -N x11/emwm/pkg/README
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ x11/emwm/pkg/README	28 Aug 2026 00:31:17 -0000
@@ -0,0 +1,12 @@
++-------------------------------------------------------------------------------
+| Running ${PKGSTEM} on OpenBSD
++-------------------------------------------------------------------------------
+
+EMWM 2.x restored workspace management.  Configuration files copied from
+EMWM 1.x do not contain the corresponding workspace menu and key bindings.
+
+Users with an existing ~/.emwmrc should compare it with:
+
+	${PREFIX}/lib/X11/system.emwmrc
+
+See emwmrc(4) for the available workspace functions and binding syntax.