Attachment 234391 Details for Bug 264337 – patch

[patch] patch

patch2 (text/plain), 2.69 KB, created by as on 2022-06-02 04:42:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: as

Created: 2022-06-02 04:42:54 UTC

Size: 2.69 KB

patch

obsolete

>diff --git a/editors/mle/Makefile b/editors/mle/Makefile
>index 9fa2d1fe77c8..e79106bb47ff 100644
>--- a/editors/mle/Makefile
>+++ b/editors/mle/Makefile
>@@ -1,50 +1,60 @@
> # Created by: Adam Saponara <as@php.net>
> 
> PORTNAME=	mle
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	1.4.3
>+DISTVERSION=	1.5.0
> CATEGORIES=	editors
> 
> MAINTAINER=	as@php.net
> COMMENT=	Small, flexible, terminal-based text editor
> 
> LICENSE=	APACHE20
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> BUILD_DEPENDS=	${LOCALBASE}/include/uthash.h:devel/uthash
>-LIB_DEPENDS=	libpcre.so:devel/pcre \
>-		libtermbox.so:devel/termbox
>+LIB_DEPENDS=	libpcre.so:devel/pcre
> TEST_DEPENDS=	${LOCALBASE}/bin/gpaste:sysutils/coreutils \
> 		${LOCALBASE}/bin/grep:textproc/gnugrep \
> 		bash:shells/bash \
> 		gfind:misc/findutils
> 
>-USES=		compiler:c11 gmake localbase:ldflags shebangfix lua:53
>+USES=		compiler:c11 gmake localbase:ldflags shebangfix lua:54
> SHEBANG_FILES=	tests/func/*.sh tests/run.sh
> USE_GITHUB=	yes
> GH_ACCOUNT=	adsr
> 
> PLIST_FILES=	bin/mle
> TEST_TARGET=	test
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|lua5.3|lua53|g' ${WRKSRC}/mle.h
>-	@${REINPLACE_CMD} -e 's|lua5.3|lua-5.3|g' ${WRKSRC}/Makefile
>+	@${REINPLACE_CMD} -e 's|lua5.4|lua54|g' ${WRKSRC}/mle.h
>+	@${REINPLACE_CMD} -e 's|lua5.4|lua-5.4|g' ${WRKSRC}/Makefile
>+	@${REINPLACE_CMD} -e 's|-O0|-O2|g' ${WRKSRC}/Makefile
> 
>-	# Tests.
>+	# Fix shell commands in tests
> 	@${REINPLACE_CMD} -e 's|find|gfind|g' \
> 		-e 's|grep|${LOCALBASE}/bin/grep|g' \
> 		${WRKSRC}/tests/run.sh \
> 		${WRKSRC}/tests/func/*.sh
> 	@${REINPLACE_CMD} -e 's|p a s t e|g p a s t e|g' \
> 		${WRKSRC}/tests/func/test_lua.sh
> 
>+	# Remove assertion that relies on UTF-8 codeset (fixed upstream)
>+	@${REINPLACE_CMD} -e '/0wv/d' \
>+		${WRKSRC}/tests/unit/test_bline_insert.c
>+
>+	# Remove assertions that rely on GNU tooling output
>+	@${REINPLACE_CMD} -e '/shell_line/d' \
>+		${WRKSRC}/tests/func/test_multi_cursor.sh
>+	@${REINPLACE_CMD} -e '/byte_count/d' \
>+		${WRKSRC}/tests/func/test_coarse_undo.sh
>+
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/mle ${STAGEDIR}${PREFIX}/bin
> 
> pre-test:
> 	# Remove backup files generated by REINPLACE_CMD. Those must not exist
> 	# for the tests to run properly.
> 	@${FIND} ${WRKSRC}/tests -name '*.sh.bak' -delete
> 
> .include <bsd.port.mk>
>diff --git a/editors/mle/distinfo b/editors/mle/distinfo
>index b979f98afd64..3b22cb6f77dc 100644
>--- a/editors/mle/distinfo
>+++ b/editors/mle/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1582636451
>-SHA256 (adsr-mle-v1.4.3_GH0.tar.gz) = 452b14d63f7d3ccd98263baec2e4840e4093cc42d1f9cedeaf45151b89ac5ff6
>-SIZE (adsr-mle-v1.4.3_GH0.tar.gz) = 106221
>+TIMESTAMP = 1654130400
>+SHA256 (adsr-mle-v1.5.0_GH0.tar.gz) = 569316485fa3775d0bb7559ac176a63adb29467c7098b14c0072c821feb6226b
>+SIZE (adsr-mle-v1.5.0_GH0.tar.gz) = 135463

Flags:

as: maintainer-approval+

Actions: View | Diff

Attachments on bug 264337: 234318 | 234391