From nobody Mon Oct 07 14:23:54 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMhGg5pzYz5YD39; Mon, 07 Oct 2024 14:23:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMhGg1Lz9z4dVN; Mon, 7 Oct 2024 14:23:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728311035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pHfudc60kkFw4HcWzhs7UUZoRFnC5O880orFmaOnR/o=; b=mj+Bbx6kphFbqF7WNcY6yDi1NadQB0QczKgOMgsgbrNdv1fts/o3NuV/SbufPc42D0hYwc xdaQoRANdJDrK+a/RnXOH5KNrmLUZoeecFSw7FcPBhXkku7D4YtT3goZOm7pMz34lPaMV9 vJKZUCaMeCgengUk3kJvCWfzDMLl6mMoI7CSobRSmVld9qtdAOAQY2zRBJhnLMUa5LZrQ7 iyXdPJ47Jri3FJ8F+UFVoiIxXhjKGJGRHidyaQGwBXAKHmTVpUfr2ludF6GI5Zg0AYXHhx jLzi+MMCDl1LQHqX5nO35/urp/9zO2jhleqi64ohmMgDjIg0YQ44Hf8AzX6N4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728311035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pHfudc60kkFw4HcWzhs7UUZoRFnC5O880orFmaOnR/o=; b=wGD0DMpWHOm+8lXLd35fH8ZRDqxJAEQm7IRkqjNtpRkD0O6f+2rPhGbtnaQyId5wBsXkmI kAYVRExweJtbuNOhvE4bEJvALdQr5lxjooA49J+0+iAz4R4ABNZq8u/WbMZHuB4WjUZpQV 3Hgq5RwUTWNRnm+OGPcNASD/R72Aqw2vI9oatlqSpHs4Bi4Q/1ibECp35MLmX39ZGqseRg CJbUTye3idmXmHHUo6k0lsHziziZoG1G4TzFVIu95n3kZHtx5+SER2xyEuEi1Zz7DppTy8 36lfz4MgFfpxG6ofZxjTEAgjOa975b4t3qWy768Hz1tMW2YhD8XB55d2/httFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728311035; a=rsa-sha256; cv=none; b=QzmQM5EcH57UpQCIEH9dLtCxgPsoq2RiltN0012Ph0ChhT9oQ9Rc/xhNu8jne+j5XkL31j ugH75Zygd9pF9uLftD/mUys4VKRtHXBJpLKS00CuaHSA/FsctVS2ULAyQaejbe2nQXgUrE I/EKfXU25VN/QLOMdrM9OHFmfPZGqRMJvVJXn0EJSYnCvnjJqyJ7oKijuCrlyEkrOYlyW6 l/Atcd6fikFB/LGXBXw1/X9Z7PO9uULqaU3mt/wk6C/NBkpZP/1AdjFQIKP5XKJFJMCfmC iVKNcWVCmBIZcz56lCsegJbHL4RpRYQ44Zc589EZMUzmcAn3O0qPAjhyCWsFIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XMhGg0PKnzptM; Mon, 7 Oct 2024 14:23:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497ENsVs029503; Mon, 7 Oct 2024 14:23:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497ENsMm029500; Mon, 7 Oct 2024 14:23:54 GMT (envelope-from git) Date: Mon, 7 Oct 2024 14:23:54 GMT Message-Id: <202410071423.497ENsMm029500@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: e9cf2bc94d65 - main - sysutils/moreutils: Convert REINPLACE_CMD to patch files List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9cf2bc94d655f4688284b87a0c20c315472d9b6 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=e9cf2bc94d655f4688284b87a0c20c315472d9b6 commit e9cf2bc94d655f4688284b87a0c20c315472d9b6 Author: Po-Chuan Hsieh AuthorDate: 2024-10-07 13:51:09 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-10-07 14:16:42 +0000 sysutils/moreutils: Convert REINPLACE_CMD to patch files --- sysutils/moreutils/Makefile | 3 --- sysutils/moreutils/files/patch-Makefile | 11 +++++++++++ sysutils/moreutils/files/patch-ifdata.c | 11 +++++++++++ sysutils/moreutils/files/patch-is_utf8-Makefile | 10 ++++++++++ 4 files changed, 32 insertions(+), 3 deletions(-) diff --git a/sysutils/moreutils/Makefile b/sysutils/moreutils/Makefile index c87a32581abb..58cb8c18b881 100644 --- a/sysutils/moreutils/Makefile +++ b/sysutils/moreutils/Makefile @@ -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: diff --git a/sysutils/moreutils/files/patch-Makefile b/sysutils/moreutils/files/patch-Makefile new file mode 100644 index 000000000000..b48da167f6e7 --- /dev/null +++ b/sysutils/moreutils/files/patch-Makefile @@ -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 diff --git a/sysutils/moreutils/files/patch-ifdata.c b/sysutils/moreutils/files/patch-ifdata.c new file mode 100644 index 000000000000..cfa77038e259 --- /dev/null +++ b/sysutils/moreutils/files/patch-ifdata.c @@ -0,0 +1,11 @@ +--- ifdata.c.orig 2024-02-25 19:47:01 UTC ++++ ifdata.c +@@ -18,7 +18,7 @@ + #include + #endif + +-#if defined(__APPLE__) || defined(__OpenBSD__) ++#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) + #define s6_addr16 __u6_addr.__u6_addr16 + #include + #endif diff --git a/sysutils/moreutils/files/patch-is_utf8-Makefile b/sysutils/moreutils/files/patch-is_utf8-Makefile new file mode 100644 index 000000000000..ed6a975d9324 --- /dev/null +++ b/sysutils/moreutils/files/patch-is_utf8-Makefile @@ -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)