sysutils/moreutils: Convert REINPLACE_CMD to patch files

This commit is contained in:
Po-Chuan Hsieh 2024-10-07 21:51:09 +08:00
parent c26cf9c596
commit e9cf2bc94d
No known key found for this signature in database
GPG key ID: 9A4BD10F002DD04B
4 changed files with 32 additions and 3 deletions

View file

@ -46,9 +46,6 @@ post-extract:
.endfor
post-patch:
@${REINPLACE_CMD} -e 's|parallel|moreutils-&|g' ${WRKSRC}/Makefile
@${REINPLACE_CMD} -e 's|__APPLE__|__${OPSYS}__|' ${WRKSRC}/ifdata.c
@${REINPLACE_CMD} -e '/^CC = gcc/d' ${WRKSRC}/is_utf8/Makefile
@cd ${FILESDIR}/ && ${CP} ${CANNED_MANPAGES} ${WRKSRC}/
post-build:

View file

@ -0,0 +1,11 @@
--- Makefile.orig 2024-02-25 19:47:01 UTC
+++ Makefile
@@ -1,6 +1,6 @@
-BINS=isutf8 ifdata ifne pee sponge mispipe lckdo parallel errno
+BINS=isutf8 ifdata ifne pee sponge mispipe lckdo moreutils-parallel errno
PERLSCRIPTS=vidir vipe ts combine zrun chronic
-MANS=sponge.1 vidir.1 vipe.1 isutf8.1 ts.1 combine.1 ifdata.1 ifne.1 pee.1 zrun.1 chronic.1 mispipe.1 lckdo.1 parallel.1 errno.1
+MANS=sponge.1 vidir.1 vipe.1 isutf8.1 ts.1 combine.1 ifdata.1 ifne.1 pee.1 zrun.1 chronic.1 mispipe.1 lckdo.1 moreutils-parallel.1 errno.1
CFLAGS?=-O2 -g -Wall
INSTALL_BIN?=install -s
PREFIX?=/usr

View file

@ -0,0 +1,11 @@
--- ifdata.c.orig 2024-02-25 19:47:01 UTC
+++ ifdata.c
@@ -18,7 +18,7 @@
#include <net/if.h>
#endif
-#if defined(__APPLE__) || defined(__OpenBSD__)
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
#define s6_addr16 __u6_addr.__u6_addr16
#include <net/if.h>
#endif

View file

@ -0,0 +1,10 @@
--- is_utf8/Makefile.orig 2024-02-25 19:47:01 UTC
+++ is_utf8/Makefile
@@ -37,7 +37,6 @@ REALNAME = $(SONAME).$(MINOR).$(RELEASE)
SONAME = $(LINKERNAME).$(VERSION)
REALNAME = $(SONAME).$(MINOR).$(RELEASE)
-CC = gcc
CFLAGS ?= -O3 -Wextra -Wall -ansi -Wstrict-prototypes
$(NAME): $(OBJ)