From nobody Sat Nov 13 15:33:04 2021 X-Original-To: dev-commits-ports-all@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 EA5F1183C642; Sat, 13 Nov 2021 15:33:04 +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 4HrzxD6FK1z4ZMF; Sat, 13 Nov 2021 15:33:04 +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 B5DE815EC9; Sat, 13 Nov 2021 15:33:04 +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 1ADFX443089340; Sat, 13 Nov 2021 15:33:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ADFX4vc089339; Sat, 13 Nov 2021 15:33:04 GMT (envelope-from git) Date: Sat, 13 Nov 2021 15:33:04 GMT Message-Id: <202111131533.1ADFX4vc089339@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dries Michiels Subject: git: a36a14a79809 - main - net/dhcpcd: Use HAS_CONFIGURE over GNU_CONFIGURE List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: driesm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a36a14a79809eea30710ffb36bdfc6268855b4f6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by driesm: URL: https://cgit.FreeBSD.org/ports/commit/?id=a36a14a79809eea30710ffb36bdfc6268855b4f6 commit a36a14a79809eea30710ffb36bdfc6268855b4f6 Author: Dries Michiels AuthorDate: 2021-11-01 09:52:02 +0000 Commit: Dries Michiels CommitDate: 2021-11-13 15:32:26 +0000 net/dhcpcd: Use HAS_CONFIGURE over GNU_CONFIGURE Historically the port used GNU_CONFIGURE but this is not needed. Switch to HAS_CONFIGURE and adjust the needed configure args. While here install the sample config file under etc/. Reported by: diizzy Approved by: 0mp (mentor) Differential Revision: https://reviews.freebsd.org/D32907 --- net/dhcpcd/Makefile | 8 ++++---- net/dhcpcd/pkg-plist | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/net/dhcpcd/Makefile b/net/dhcpcd/Makefile index 7afc86f15b6c..cf13b33cc4ad 100644 --- a/net/dhcpcd/Makefile +++ b/net/dhcpcd/Makefile @@ -2,6 +2,7 @@ PORTNAME= dhcpcd DISTVERSION= 9.4.1 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= https://roy.marples.name/downloads/dhcpcd/ @@ -15,15 +16,14 @@ USES= compiler:c11 cpe tar:xz CPE_VENDOR= dhcpcd_project USE_RC_SUBR= dhcpcd -GNU_CONFIGURE= yes +HAS_CONFIGURE= yes CONFIGURE_ARGS= --datadir=${PREFIX}/share/examples \ + --prefix=${PREFIX} \ --privsepuser="_dhcp" \ --without-udev post-install: - ${MV} ${STAGEDIR}${PREFIX}/etc/dhcpcd.conf \ - ${STAGEDIR}${PREFIX}/share/examples/dhcpcd + ${MV} ${STAGEDIR}${PREFIX}/etc/dhcpcd.conf ${STAGEDIR}${PREFIX}/etc/dhcpcd.conf.sample @${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/dhcpcd - ${MKDIR} ${STAGEDIR}/var/db/dhcpcd .include diff --git a/net/dhcpcd/pkg-plist b/net/dhcpcd/pkg-plist index 891ce7fabc99..4a2505f079f2 100644 --- a/net/dhcpcd/pkg-plist +++ b/net/dhcpcd/pkg-plist @@ -3,13 +3,13 @@ libexec/dhcpcd-hooks/20-resolv.conf libexec/dhcpcd-hooks/30-hostname libexec/dhcpcd-hooks/50-ntp.conf libexec/dhcpcd-run-hooks -man/man5/dhcpcd.conf.5.gz -man/man8/dhcpcd-run-hooks.8.gz -man/man8/dhcpcd.8.gz sbin/dhcpcd %%EXAMPLESDIR%%/hooks/10-wpa_supplicant %%EXAMPLESDIR%%/hooks/15-timezone %%EXAMPLESDIR%%/hooks/29-lookup-hostname %%EXAMPLESDIR%%/hooks/50-ypbind -@sample %%EXAMPLESDIR%%/dhcpcd.conf etc/dhcpcd.conf +share/man/man5/dhcpcd.conf.5.gz +share/man/man8/dhcpcd-run-hooks.8.gz +share/man/man8/dhcpcd.8.gz +@sample etc/dhcpcd.conf.sample @dir(_dhcp,_dhcp,) /var/db/dhcpcd