From nobody Sun Aug 25 09:05:06 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 4Ws7Df4R4Vz5VdCw; Sun, 25 Aug 2024 09:05:06 +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 4Ws7Df3wlBz48Hv; Sun, 25 Aug 2024 09:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724576706; 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=tUjzXBH7swIVta7CbwPz5mny9DZPvtEk1gOZRAXz4q0=; b=Pbz6eEt6C50igx3fljRUmdgcy6jC5NREIjtdPvG+Jm3B0D4LgY++AJ315CF8vdj9FYWzIs DwG2KIABVU4+BD/tdyD1IQmkauvF283WBJuqsgK8MTQZJbw0GrQiqbfUd31hGlH0CmpRV9 3rg1ErihNFGoxBCP7hxV/prc9T2YTW36VRcVyiVpNRD/+bEfyl4LfkWFxT6f8AHTFHENts AXoACqAFMDp6kf2cXeDVwngK70pyvckuGBQipTIdcE3domJ+FW9yGkPgh3ZaXkmJa3MqLi m9WQp6ZQ2cFvRw95ciS6NPx9OvuaKmxG3+SYNMCgA5d1oVrCU8vIVmURG8k60w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724576706; a=rsa-sha256; cv=none; b=sJvKC6Cl3jH+tVYntMsEOtAANl4+wA7hkngXQrOcKlaJmgPtO+1bdiyxaUnbqo0U2+dX6F lrWNS0yEWQqdnB2xON7VM1hUBe3vD2gzauOdumK/Hs8VBqLd5iLLKVJyCbp1aA5T2HNNnt ylKq/gKcJdr7IJJo+6krnXuughw/10OZlBkihFBeYnBIP08LtQUWIGJ539YyRM6gMCEcD8 jKnR6yXdjHLSpvsr0Iujw0OlwqjImKo/MLTTM9yJdupFan1Ur6F2QLn/+2XHbtprp5e17/ TtifM5u+Qie7Ddceu13zdiTZZPHqJ0pN39CNRg4uAKClJdrX33hRXm2V4WkMrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724576706; 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=tUjzXBH7swIVta7CbwPz5mny9DZPvtEk1gOZRAXz4q0=; b=wvNSnj31MW9ttw6vmJ5c/alPdZa468mYC9HMjjrxqNp7XJC0bZy1SnYxeXiuig5ZFfY5MD fM5kbWa3+7hIGXDyItqioNqZGYzgk0zIM9zJ1zdWrKgIehvt/Otu8alIQTzOCFsBJx6QQt CO6BlfoF1v9z2s7mlV+qXT4pA3u6npvQje0HMrXMOtBC84PgG9Ny6o0kMhANVKQBXtjzUu /pg89onKfRxI8NMLies4QcrbBFZ1dnKA+8e/b/TdSfqpqD3+IUA1Se4+3WGcSH2uVIIdgA LM1LO5jCtI0hXoQ8bfngeohw2D0yisllTdbB5CzV4Uw8kbuawUxT3vjgxTD3hA== 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 4Ws7Df3G7xzH3k; Sun, 25 Aug 2024 09:05:06 +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 47P956xZ084000; Sun, 25 Aug 2024 09:05:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47P9567Z083997; Sun, 25 Aug 2024 09:05:06 GMT (envelope-from git) Date: Sun, 25 Aug 2024 09:05:06 GMT Message-Id: <202408250905.47P9567Z083997@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mathieu Arnold Subject: git: 06750562416b - main - dns/bind918: remove bind-tools support 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: mat X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06750562416befc9dd51b8cf5fe0c0906a19589b Auto-Submitted: auto-generated The branch main has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=06750562416befc9dd51b8cf5fe0c0906a19589b commit 06750562416befc9dd51b8cf5fe0c0906a19589b Author: Mathieu Arnold AuthorDate: 2024-08-25 09:01:58 +0000 Commit: Mathieu Arnold CommitDate: 2024-08-25 09:04:49 +0000 dns/bind918: remove bind-tools support --- dns/bind918/Makefile | 38 ---------------------- dns/bind918/files/extrapatch-bind-tools | 28 ---------------- ...xtrapatch-no-bind-tools => patch-no-bind-tools} | 0 3 files changed, 66 deletions(-) diff --git a/dns/bind918/Makefile b/dns/bind918/Makefile index a6e6e230381c..9fc6b100e90d 100644 --- a/dns/bind918/Makefile +++ b/dns/bind918/Makefile @@ -2,28 +2,14 @@ PORTNAME= bind DISTVERSION= 9.18.29 -.if defined(BIND_TOOLS_SLAVE) -# dns/bind-tools here PORTREVISION= 0 -.else -# dns/bind918 here -PORTREVISION= 0 -.endif CATEGORIES= dns net MASTER_SITES= ISC/bind9/${DISTVERSION} -.if defined(BIND_TOOLS_SLAVE) -PKGNAMESUFFIX= -tools -.else PKGNAMESUFFIX= 918 -.endif MAINTAINER= mat@FreeBSD.org WWW= https://www.isc.org/bind/ -.if defined(BIND_TOOLS_SLAVE) -COMMENT= Command line tools from BIND: delv, dig, host, nslookup... -.else COMMENT= BIND DNS suite with updated DNSSEC and DNS64 -.endif # Uncomment when bind920 comes of age. +3 years if ESV, +1year otherwise, see # https://kb.isc.org/docs/aa-00896 @@ -37,9 +23,7 @@ LIB_DEPENDS= libuv.so:devel/libuv \ libnghttp2.so:www/libnghttp2 \ libxml2.so:textproc/libxml2 -.if !defined(BIND_TOOLS_SLAVE) RUN_DEPENDS= bind-tools>0:dns/bind-tools -.endif USES= autoreconf compiler:c11 cpe libedit libtool pkgconfig ssl tar:xz @@ -62,18 +46,12 @@ CONFIGURE_ARGS= --disable-linux-caps \ CONFIGURE_ENV= READLINE_CFLAGS="-L${LOCALBASE}/lib" ETCDIR= ${PREFIX}/etc/namedb -.if defined(BIND_TOOLS_SLAVE) -EXTRA_PATCHES= ${PATCHDIR}/extrapatch-bind-tools -CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/bind-tools -.else USE_RC_SUBR= named SUB_FILES= named.conf pkg-message -EXTRA_PATCHES= ${PATCHDIR}/extrapatch-no-bind-tools PORTDOCS= * CONFLICTS= bind920 bind9-devel -.endif # BIND_TOOLS_SLAVE MAKE_JOBS_UNSAFE= yes @@ -86,12 +64,6 @@ OPTIONS_DEFINE= DNSTAP DOCS FIXED_RRSET GEOIP IDN JSON LARGE_FILE LMDB \ OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE -.if defined(BIND_TOOLS_SLAVE) -OPTIONS_EXCLUDE= DOCS GEOIP LMDB \ - OVERRIDECACHE QUERYTRACE START_LATE \ - TCP_FASTOPEN -.endif # BIND_TOOLS_SLAVE - OPTIONS_SUB= yes DNSTAP_DESC= Provides fast passive logging of DNS messages @@ -193,7 +165,6 @@ post-patch: ${WRKSRC}/bin/${FILE} .endfor -.if !defined(BIND_TOOLS_SLAVE) post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mtree ${MKDIR} ${STAGEDIR}${ETCDIR} @@ -213,14 +184,5 @@ post-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/CHANGES* \ ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc/arm/_build/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/arm -.else - -do-install: - for dir in bin lib doc/man; do \ - (cd ${INSTALL_WRKSRC}/$$dir && ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) ; \ - done - @${RM} -r ${STAGEDIR}${PREFIX}/include - -.endif # BIND_TOOLS_SLAVE .include diff --git a/dns/bind918/files/extrapatch-bind-tools b/dns/bind918/files/extrapatch-bind-tools deleted file mode 100644 index 4201316025f5..000000000000 --- a/dns/bind918/files/extrapatch-bind-tools +++ /dev/null @@ -1,28 +0,0 @@ -Only select the "tools" part of bind for building. - ---- Makefile.am.orig 2022-06-02 14:20:10 UTC -+++ Makefile.am -@@ -12,8 +12,6 @@ CLEANFILES = bind.keys.h - bind.keys.h: bind.keys Makefile - ${PERL} ${top_srcdir}/util/bindkeys.pl ${top_srcdir}/bind.keys > $@ - --dist_sysconf_DATA = bind.keys -- - .PHONY: doc - - EXTRA_DIST = \ ---- bin/Makefile.am.orig 2022-06-02 14:20:10 UTC -+++ bin/Makefile.am -@@ -1 +1 @@ --SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen tests plugins -+SUBDIRS = dig delv dnssec tools nsupdate ---- bin/tools/Makefile.am.orig 2022-06-02 14:20:10 UTC -+++ bin/tools/Makefile.am -@@ -11,7 +11,6 @@ LDADD += \ - bin_PROGRAMS = \ - arpaname \ - mdig \ -- named-journalprint \ - named-rrchecker \ - nsec3hash - diff --git a/dns/bind918/files/extrapatch-no-bind-tools b/dns/bind918/files/patch-no-bind-tools similarity index 100% rename from dns/bind918/files/extrapatch-no-bind-tools rename to dns/bind918/files/patch-no-bind-tools