From nobody Fri Jun 09 14:01:37 2023 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 4Qd2nG1CN1z4c8mm; Fri, 9 Jun 2023 14:01:38 +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 4Qd2nG0hJxz4bLQ; Fri, 9 Jun 2023 14:01:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686319298; 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=OPH52vyWkYjo0mxPO0Rcd7LJBYb39OmQX76SSs9p7/c=; b=uLuSlt8nwssAUPs7b49CecnSyB1tmLqBqJY4Z59kwzILKXRIn8m0LtSZeL3V0200I43bdv Y4zdh+csMIduH64dFzWL+XV06rsslT9fZe0Ljil6MP6PF4BxD6zgdzpM1PnifPzAC2euzC W/UtDihyKNk/U7iBmWJYxgdbz8vUFOlv1m9kc6GOVmIHV3fQ2XG2ytL9FPK3u8ZdVKKPGu P9KfKQ89bb2a1uPIWvo9aKA9Ox2BKAlshQ/eiAV+/VHCn3nXl2yWNcvLOv16XRSwfYmE0Z CUul9FeHIIc/6Hi7fFMTVBcNNMF2RgClnPkSCSz7EeGHeVPgSfAXWbvqsz8j2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686319298; 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=OPH52vyWkYjo0mxPO0Rcd7LJBYb39OmQX76SSs9p7/c=; b=Hb2+iS1xgEONBxGtkX1OIihRYLzAdMEHvHQGtp9uyWxTByStkEDJ9CzAhZlyHoIkCL5PPU ohkFbHWr9LlscPbzijUrsl/4naL32JlHhQX5633EJkTv+OLCEso7bZR0NhMQxHZZlXR2xB RnLS3jHAAILnsWHhjnksLQ9R06inh1Au6+E+Gg5zqVzV9vbf04qaCuYn0+nYbFU4umYVay WZleMhQUTYdBFOxF3Epl79ZbZK2JrPQ+ir/c+/FB07lKwxK29tQ7jPFZL+qcTZq2+AkeGM 8wQsoRrhClROFaHvKpUT2pOX4nfvvYiEum4J2J+KV3ChI4qLJkMh/Pn2gP924A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686319298; a=rsa-sha256; cv=none; b=LDR48Gqbt/t+7MojuJyARwbnj/dYxUU88oh15wJwYIBMapr76oMBptIAUklS7dALY8BqDr tGjjM+SKmOTUKj0t6dMRD5xpoHp3AMa4jA1snDlx6iZD0vNedTkVDcFdXfRhIUJNLYqjR7 1JejLt4FVJyYJh7ik50BKnP5yMWx/0IbnbpaGRYByHZOJnEhaGuW/AvJlMwnn8DA7bbd7u ocpLLKoThehgT25HtHuNXugk+tx8HoUNqylSvEw/V7jXG1XCX4yOB0AaIEOpw7ZBG3dPY7 YyrZsxLftnl9BEz/00QBum2PTGdC7PHDV8iL2coR0UUrvw3eGoUcl9N4btrx2Q== 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 4Qd2nF6rqdzdNf; Fri, 9 Jun 2023 14:01:37 +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 359E1bFv088753; Fri, 9 Jun 2023 14:01:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 359E1bn1088752; Fri, 9 Jun 2023 14:01:37 GMT (envelope-from git) Date: Fri, 9 Jun 2023 14:01:37 GMT Message-Id: <202306091401.359E1bn1088752@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: ad57b089a827 - main - security/nmap: PCAP option no longer conflicts with pcap in 14-CURRENT 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad57b089a8278b6e313f53d4ad9f0f3771d14ae2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=ad57b089a8278b6e313f53d4ad9f0f3771d14ae2 commit ad57b089a8278b6e313f53d4ad9f0f3771d14ae2 Author: Cy Schubert AuthorDate: 2023-06-09 14:00:24 +0000 Commit: Cy Schubert CommitDate: 2023-06-09 14:01:33 +0000 security/nmap: PCAP option no longer conflicts with pcap in 14-CURRENT As of 6d1c946e9168 the PCAP option the conflict no longer exists. --- security/nmap/Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/security/nmap/Makefile b/security/nmap/Makefile index 3c218176a58a..d12ad6eb544f 100644 --- a/security/nmap/Makefile +++ b/security/nmap/Makefile @@ -53,10 +53,6 @@ CONFIGURE_ARGS+=--without-localdirs \ .include -.if ${PORT_OPTIONS:MPCAP} -BROKEN_FreeBSD_14= Conflicts with pcap in base -.endif - # XXX limit results if we do a grep in the sources! post-extract: @${RM} -r ${WRKSRC}/mswin32