diff --git a/games/liblcf/Makefile b/games/liblcf/Makefile
index af308283626..60d36f394e1 100644
--- a/games/liblcf/Makefile
+++ b/games/liblcf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2017/11/04 01:05:55 bcallah Exp $
+# $OpenBSD: Makefile,v 1.3 2019/04/02 09:01:55 naddy Exp $
 
 # Keep in sync with games/easyrpg
 COMMENT =	library for handling RPG Maker 2000/2003 data
@@ -19,16 +19,17 @@ WANTLIB += ${COMPILER_LIBCXX} expat icudata icui18n icuuc m
 
 COMPILER =	base-clang ports-clang ports-gcc
 
+BUILD_DEPENDS =	${MODGNU_AUTOCONF_DEPENDS} \
+		${MODGNU_AUTOMAKE_DEPENDS}
 LIB_DEPENDS =	textproc/icu4c
 
 AUTOCONF_VERSION =	2.69
 AUTOMAKE_VERSION =	1.15
-CONFIGURE_STYLE =	autoconf automake
+CONFIGURE_STYLE =	gnu
 USE_LIBTOOL =		gnu
 USE_GMAKE =		Yes
-AUTOCONF =	AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
-		AUTOMAKE="automake --add-missing" \
-		LIBTOOLIZE="${LOCALBASE}/bin/libtoolize" \
-		autoreconf -i
+
+do-gen:
+	cd ${WRKSRC}; ${AUTOCONF_ENV} autoreconf -fi
 
 .include <bsd.port.mk>
diff --git a/games/numptyphysics/Makefile b/games/numptyphysics/Makefile
index b547acd7ce4..8bf3df0aa5e 100644
--- a/games/numptyphysics/Makefile
+++ b/games/numptyphysics/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2018/10/24 14:28:03 sthen Exp $
+# $OpenBSD: Makefile,v 1.35 2019/04/02 09:01:55 naddy Exp $
 
 COMMENT-main =		physics-based drawing puzzle game
 COMMENT-npcomplete =	extra levels for physics-based drawing puzzle game
@@ -29,6 +29,8 @@ WANTLIB-main =		SDL SDL_image SDL_ttf X11 c m \
 
 COMPILER =		base-clang ports-gcc base-gcc
 
+BUILD_DEPENDS =		${MODGNU_AUTOCONF_DEPENDS} \
+			${MODGNU_AUTOMAKE_DEPENDS}
 RUN_DEPENDS-main =	devel/desktop-file-utils \
 			x11/gtk+3,-guic
 LIB_DEPENDS-main =	devel/sdl \
@@ -37,7 +39,7 @@ LIB_DEPENDS-main =	devel/sdl \
 
 RUN_DEPENDS-npcomplete =${FULLPKGPATH-main}
 
-CONFIGURE_STYLE =	autoconf automake no-autoheader
+CONFIGURE_STYLE =	gnu
 AUTOCONF_VERSION =	2.61
 AUTOMAKE_VERSION =	1.9
 
@@ -52,15 +54,12 @@ CONFIGURE_ARGS =--disable-hildon
 
 WRKDIST =	${WRKDIR}/numptyphysics
 
-post-patch:
-	@cd ${WRKSRC}; AUTOCONF_VERSION=${AUTOCONF_VERSION} \
-	    AUTOMAKE_VERSION=${AUTOMAKE_VERSION} aclocal
-
 pre-configure:
-	@cd ${WRKSRC}; AUTOCONF_VERSION=${AUTOCONF_VERSION} \
-	    AUTOMAKE_VERSION=${AUTOMAKE_VERSION} /bin/sh ./autogen.sh
 	@${SUBST_CMD} ${WRKSRC}/Config.h
 
+do-gen:
+	cd ${WRKSRC}; ${AUTOCONF_ENV} autoreconf -fi
+
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/npcomplete/*.nph \
 	    ${PREFIX}/share/numptyphysics/
diff --git a/games/zangband/Makefile b/games/zangband/Makefile
index fcbf9a6bb11..9e605ed5f6e 100644
--- a/games/zangband/Makefile
+++ b/games/zangband/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2017/10/23 17:10:50 sthen Exp $
+# $OpenBSD: Makefile,v 1.25 2019/04/02 09:01:55 naddy Exp $
 
 COMMENT=	Zangband (Zelazny Angband) with color, X11 support
 
@@ -15,12 +15,15 @@ WANTLIB=		c ncurses
 
 HOMEPAGE=		http://www.zangband.org/
 
+BUILD_DEPENDS=		${MODGNU_AUTOCONF_DEPENDS} \
+			${MODGNU_AUTOMAKE_DEPENDS}
+
 USE_GMAKE=		Yes
 MAKE_ENV=		CC="${CC}" CFLAGS="${CFLAGS}"
 
 AUTOCONF_VERSION=	2.54
 AUTOMAKE_VERSION=	1.4
-CONFIGURE_STYLE=	autoconf automake
+CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV=		TRUEPREFIX="${TRUEPREFIX}"
 
 WRKDIST=		${WRKDIR}/zangband
@@ -35,12 +38,8 @@ WANTLIB+=		ICE SM X11 Xaw Xmu Xt xcb
 CONFIGURE_ARGS+=	--without-x
 .endif
 
-post-patch:
-	@cd ${WRKSRC}; AUTOMAKE_VERSION=${AUTOMAKE_VERSION} aclocal
-
-pre-configure:
-	@cd ${WRKSRC}; AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
-		automake --foreign --add-missing --copy
+do-gen:
+	@cd ${WRKSRC}; ${AUTOCONF_ENV} autoreconf -i
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/zangband