Date: Sun, 31 Oct 2021 04:31:30 GMT From: Yasuhiro Kimura <yasu@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9e078ab7b751 - main - net/dhcpcd: Fix build when TOP environment viriable is set Message-ID: <202110310431.19V4VU7M090597@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=9e078ab7b7515a325c0ce7b6089e638e8ce0e63c commit 9e078ab7b7515a325c0ce7b6089e638e8ce0e63c Author: Dries Michiels <driesm.michiels@gmail.com> AuthorDate: 2021-10-31 04:21:37 +0000 Commit: Yasuhiro Kimura <yasu@FreeBSD.org> CommitDate: 2021-10-31 04:21:37 +0000 net/dhcpcd: Fix build when TOP environment viriable is set PR: 253270 Reported by: Volodymyr Kostyrko --- 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110310431.19V4VU7M090597>