From nobody Sun Oct 31 04:35:46 2021 X-Original-To: dev-commits-ports-branches@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 1F98A182795F; Sun, 31 Oct 2021 04:35:47 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hhjyq0HJFz3Hbm; Sun, 31 Oct 2021 04:35:47 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 DE6E717A1D; Sun, 31 Oct 2021 04:35:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19V4ZkOP094170; Sun, 31 Oct 2021 04:35:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19V4Zkj2094169; Sun, 31 Oct 2021 04:35:46 GMT (envelope-from git) Date: Sun, 31 Oct 2021 04:35:46 GMT Message-Id: <202110310435.19V4Zkj2094169@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yasuhiro Kimura Subject: git: 01223a9c0d50 - 2021Q4 - net/dhcpcd: Fix build when TOP environment viriable is set List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 01223a9c0d50f4a263beacb400770ae1085d111d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=01223a9c0d50f4a263beacb400770ae1085d111d commit 01223a9c0d50f4a263beacb400770ae1085d111d Author: Dries Michiels AuthorDate: 2021-10-31 04:21:37 +0000 Commit: Yasuhiro Kimura CommitDate: 2021-10-31 04:35:13 +0000 net/dhcpcd: Fix build when TOP environment viriable is set PR: 253270 Reported by: Volodymyr Kostyrko (cherry picked from commit 9e078ab7b7515a325c0ce7b6089e638e8ce0e63c) --- net/dhcpcd/Makefile | 1 + net/dhcpcd/files/patch-hooks_Makefile | 8 ++++++++ net/dhcpcd/files/patch-src_Makefile | 11 +++++++++++ net/dhcpcd/files/patch-src_dev_Makefile | 8 ++++++++ net/dhcpcd/files/patch-tests_crypt_Makefile | 8 ++++++++ net/dhcpcd/files/patch-tests_eloop-bench_Makefile | 8 ++++++++ 6 files changed, 44 insertions(+) diff --git a/net/dhcpcd/Makefile b/net/dhcpcd/Makefile index 45222564301b..744e540e21ca 100644 --- a/net/dhcpcd/Makefile +++ b/net/dhcpcd/Makefile @@ -2,6 +2,7 @@ PORTNAME= dhcpcd PORTVERSION= 9.4.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= https://roy.marples.name/downloads/dhcpcd/ \ https://cflags.cc/roy/dhcpcd/ diff --git a/net/dhcpcd/files/patch-hooks_Makefile b/net/dhcpcd/files/patch-hooks_Makefile new file mode 100644 index 000000000000..7416f5dbe6ca --- /dev/null +++ b/net/dhcpcd/files/patch-hooks_Makefile @@ -0,0 +1,8 @@ +--- hooks/Makefile.orig 2020-12-28 12:59:20 UTC ++++ hooks/Makefile +@@ -1,4 +1,4 @@ +-TOP?= ../ ++TOP= ../ + include ${TOP}/iconfig.mk + + PROG= dhcpcd-run-hooks diff --git a/net/dhcpcd/files/patch-src_Makefile b/net/dhcpcd/files/patch-src_Makefile new file mode 100644 index 000000000000..35217a33629b --- /dev/null +++ b/net/dhcpcd/files/patch-src_Makefile @@ -0,0 +1,11 @@ +--- src/Makefile.orig 2021-09-10 17:26:01 UTC ++++ src/Makefile +@@ -8,7 +8,7 @@ SRCS+= dhcp-common.c script.c + CFLAGS?= -O2 + SUBDIRS+= ${MKDIRS} + +-TOP?= .. ++TOP= .. + include ${TOP}/iconfig.mk + + CSTD?= c99 diff --git a/net/dhcpcd/files/patch-src_dev_Makefile b/net/dhcpcd/files/patch-src_dev_Makefile new file mode 100644 index 000000000000..a171fdc5358c --- /dev/null +++ b/net/dhcpcd/files/patch-src_dev_Makefile @@ -0,0 +1,8 @@ +--- src/dev/Makefile.orig 2020-12-28 12:59:20 UTC ++++ src/dev/Makefile +@@ -1,4 +1,4 @@ +-TOP?= ../../ ++TOP= ../../ + include ${TOP}/Makefile.inc + include ${TOP}/config.mk + diff --git a/net/dhcpcd/files/patch-tests_crypt_Makefile b/net/dhcpcd/files/patch-tests_crypt_Makefile new file mode 100644 index 000000000000..1f19ccea56b9 --- /dev/null +++ b/net/dhcpcd/files/patch-tests_crypt_Makefile @@ -0,0 +1,8 @@ +--- tests/crypt/Makefile.orig 2020-12-28 12:59:20 UTC ++++ tests/crypt/Makefile +@@ -1,4 +1,4 @@ +-TOP?= ../.. ++TOP= ../.. + include ${TOP}/iconfig.mk + + PROG= run-test diff --git a/net/dhcpcd/files/patch-tests_eloop-bench_Makefile b/net/dhcpcd/files/patch-tests_eloop-bench_Makefile new file mode 100644 index 000000000000..7e5cb9ac750a --- /dev/null +++ b/net/dhcpcd/files/patch-tests_eloop-bench_Makefile @@ -0,0 +1,8 @@ +--- tests/eloop-bench/Makefile.orig 2020-12-28 12:59:20 UTC ++++ tests/eloop-bench/Makefile +@@ -1,4 +1,4 @@ +-TOP?= ../.. ++TOP= ../.. + include ${TOP}/iconfig.mk + + PROG= eloop-bench