diff --git a/graphics/epstool/Makefile b/graphics/epstool/Makefile
index 12fedbe5bab0..dbcaded6b159 100644
--- a/graphics/epstool/Makefile
+++ b/graphics/epstool/Makefile
@@ -1,45 +1,44 @@
 PORTNAME=	epstool
 PORTVERSION=	3.09
 PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.ghostgum.com.au/download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Create or extract preview bitmaps in EPS files
 WWW=		http://www.ghostgum.com.au/software/epstool.htm
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
-USES=		ghostscript:run gmake
+USES=		dos2unix ghostscript:run gmake
 MAKEFILE=	makefile
 MAKE_ARGS=	CC="${CC}" \
 		CCAUX="${CC}" \
 		CLINK="${CC} ${LDFLAGS}" \
 		EPSLIB="" \
 		GSCDEBUG="" \
 		GTKCFLAGS="" \
 		GTKLIBS="" \
 		LIBPNGCFLAGS="" \
 		LIBPNGLIBS="" \
 		LINK="${CC} ${LDFLAGS}" \
 		MAKE="${MAKE_CMD}"
-ALL_TARGET=	${PORTNAME}
 
 PLIST_FILES=	bin/epstool \
 		share/man/man1/epstool.1.gz
 
 PORTDOCS=	epstool.htm gsview.css
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/epstool ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/epstool.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/epstool.htm ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/gsview.css ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/epstool/files/patch-src_common.mak b/graphics/epstool/files/patch-src_common.mak
new file mode 100644
index 000000000000..6dd2b507469b
--- /dev/null
+++ b/graphics/epstool/files/patch-src_common.mak
@@ -0,0 +1,11 @@
+--- src/common.mak.orig	2024-02-06 11:23:13 UTC
++++ src/common.mak
+@@ -77,7 +77,7 @@ plapis_h=$(SRC)plapis.h
+ plapis_h=$(SRC)plapis.h
+ 
+ 
+-all: $(BEGIN) $(TARGET)
++all: $(BEGIN) .WAIT $(TARGET)
+ 
+ $(OD)calloc$(OBJ): $(SRC)calloc.c $(common_h)
+ 	$(COMP) $(FOO)calloc$(OBJ) $(CO) $(SRC)calloc.c