1 files changed, 29 insertions, 17 deletions
diff --git a/lang/harec/Makefile b/lang/harec/Makefile
index f2d9af3202c5..79a775d3d4bc 100644
--- a/lang/harec/Makefile
+++ b/lang/harec/Makefile
@@ -1,9 +1,8 @@
 PORTNAME=	harec
-PORTVERSION=	0.24.2
+DISTVERSION=	0.25.2
+PORTREVISION=	1
 CATEGORIES=	lang
-MASTER_SITES=	https://git.sr.ht/~sircmpwn/${PORTNAME}/archive/
-DISTNAME=	${PORTVERSION}
-DIST_SUBDIR=	harec
+MASTER_SITES=	https://git.sr.ht/~sircmpwn/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/
 
 MAINTAINER=	se@FreeBSD.org
 COMMENT=	Hare compiler written in C11
@@ -23,26 +22,39 @@ USES=		compiler:c11
 
 MAKE_ARGS=	ARCH=${ARCH:S/^amd64$/x86_64/} \
 		DESTDIR=${STAGEDIR} \
-		PREFIX=${PREFIX}
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTNAME}
+		PREFIX=${PREFIX} \
+		VERSION=${DISTVERSION}
 
 PLIST_FILES=	bin/harec
 PORTDOCS=	*
+TEST_TARGET=	check
 
 OPTIONS_DEFINE=	DOCS
 
-do-build:
-		cd ${WRKSRC} && ${CP} configs/freebsd.mk config.mk
-		cd ${WRKSRC} && ${MAKE} ${MAKE_ARGS}
+post-patch:
+	@${REINPLACE_CMD} -e '\
+	s|@$$(AS)|$$(AS)|g; \
+	s|@$$(CC)|$$(CC)|g; \
+	s|@$$(TDENV)|$$(TDENV)|g; \
+	s|@$$(QBE)|$$(QBE)|g' \
+	    ${PATCH_WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e '\
+	s|@$$(AS)|$$(AS)|g; \
+	s|@$$(CC)|$$(CC)|g; \
+	s|@$$(TDENV)|$$(TDENV)|g; \
+	s|@$$(QBE)|$$(QBE)|g' \
+	    ${PATCH_WRKSRC}/makefiles/tests.mk
+	@${REINPLACE_CMD} -e '/printf/d' \
+	    ${PATCH_WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e '/printf/d' \
+	    ${PATCH_WRKSRC}/makefiles/tests.mk
+
+do-configure:
+	(cd ${WRKSRC} && ${CP} configs/freebsd.mk config.mk)
 
 do-install:
-		cd ${WRKSRC} && ${MAKE} ${MAKE_ARGS} install
-		${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/bin/*
-		${MKDIR} ${STAGEDIR}${DOCSDIR}
-		${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${STAGEDIR}${DOCSDIR}
-
-do-test:
-		cd ${WRKSRC} && make ${MAKE_ARGS} check
+	${INSTALL_PROGRAM} ${WRKSRC}/.bin/harec ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>