diff --git a/x11/xforward/Makefile b/x11/xforward/Makefile
index 9c2ff4cc8813..e058f1aba42a 100644
--- a/x11/xforward/Makefile
+++ b/x11/xforward/Makefile
@@ -1,32 +1,26 @@
 PORTNAME=	xforward
 PORTVERSION=	1.0
 PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://komquats.com/distfiles/ \
 		http://people.freebsd.org/~cy/distfiles/
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Provide user-level X forwarding service
 
 LICENSE_FILE=	${WRKSRC}/NOTICE
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libexpat.so:textproc/expat2 \
 		libfreetype.so:print/freetype2
 
 USES=		motif xorg
 USE_XORG=	x11 xt xaw xmu xt xext sm ice xft xau xcb xdmcp xrender
 
 MAKE_ARGS=	PREFIX=${PREFIX} LOCALBASE=${LOCALBASE}
 NO_WRKSUBDIR=	yes
 PLIST_FILES=	bin/xforward man/man1/xforward.1.gz
 
-OPTIONS_DEFINE=		STATIC
-
-STATIC_ALL_TARGET=	all-static
-STATIC_INSTALL_TARGET=	install-static
-STATIC_PLIST_FILES=	bin/xforward-static
-
 .include <bsd.port.mk>
diff --git a/x11/xforward/files/patch-Makefile b/x11/xforward/files/patch-Makefile
index 6579b005b3df..dc9586307749 100644
--- a/x11/xforward/files/patch-Makefile
+++ b/x11/xforward/files/patch-Makefile
@@ -1,60 +1,41 @@
---- Makefile.orig	1993-06-05 02:32:01 UTC
-+++ Makefile
-@@ -18,18 +18,20 @@
+--- Makefile.orig	1993-06-04 19:32:01.000000000 -0700
++++ Makefile	2023-02-11 06:30:12.418352000 -0800
+@@ -18,18 +18,19 @@
  # MANDIR is where the manual page will be installed.
  
  DESTDIR=
 -BINDIR=/usr/local/bin
 -MANDIR=/usr/local/man/man1
 +BINDIR=${PREFIX}/bin
 +MANDIR=${PREFIX}/man/man1
  
  # Where to find things
  # INCFLAGS lists directories to search for header files
  # LDFLAGS lists directories to search for libraries
  # LIBS lists the necessary libraries (Motif, Xt, X11)
  
 -INCFLAGS= -I/usr/lib/DXM/lib -I/usr/lib/DXM/lib/Xt
 -LDFLAGS= -L/usr/lib/DXM/lib/Xm -L/usr/lib/DXM/lib/Xt
 -LIBS= -lXm -lXt -lX11
 +INCFLAGS= -I${LOCALBASE}/include
 +LDFLAGS= -L${LOCALBASE}/lib
 +LIBS= -lXm -lXt -lX11 -lXext
-+LIBS_STATIC= -lXm -lXmu -lXt -lXext -lSM -lICE -lpng16 -lz -lm -ljpeg -lXft -lfontconfig -lexpat -lfreetype -lbz2 -lX11 -lXau -lxcb -lXdmcp -lXau -lXft -lXrender -lXp
  
 +
  CFLAGS= ${INCFLAGS} -O
  
  # For CenterLine CodeCenter
-@@ -39,20 +41,30 @@ SRCS= xforward.c
- AUXFILES= README NOTICE Makefile xforward.1
- 
- PROGS = xforward
-+PROGS_STATIC = xforward-static
- 
-+all-static: all ${PROGS_STATIC}
-+
- all: ${PROGS}
- 
- xforward:	xforward.o
+@@ -46,11 +47,12 @@
  	cc ${LDFLAGS} xforward.o -o xforward ${LIBS}
  
-+xforward-static:	xforward.o
-+	cc ${LDFLAGS} -static xforward.o -o xforward-static ${LIBS_STATIC}
-+
  xforward.o:	xforward.c
- 	cc -c ${CFLAGS} xforward.c
+-	cc -c ${CFLAGS} xforward.c
++	cc -c -Wno-int-conversion ${CFLAGS} xforward.c
  
  install: ${PROGS}
  	install -c xforward ${DESTDIR}${BINDIR}/xforward
  	install -c xforward.1 ${DESTDIR}${MANDIR}/xforward.1
-+
-+install-static: install ${PROGS_STATIC}
-+	install -c xforward-static ${DESTDIR}${BINDIR}/xforward-static
 +
  clean: 	;
--	rm -f *~ *.o core ${PROGS}
-+	rm -f *~ *.o core ${PROGS} ${PROGS_STATIC}
+ 	rm -f *~ *.o core ${PROGS}
  
- center:
- 	#load ${LDFLAGS} ${LIBS}