From owner-dev-commits-ports-main@freebsd.org Thu Sep 30 21:45:59 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E65CE670D59; Thu, 30 Sep 2021 21:45:59 +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 4HL6Hq6DSpz4wFG; Thu, 30 Sep 2021 21:45:59 +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 B688313A0F; Thu, 30 Sep 2021 21:45:59 +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 18ULjxNS068640; Thu, 30 Sep 2021 21:45:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18ULjxBu068639; Thu, 30 Sep 2021 21:45:59 GMT (envelope-from git) Date: Thu, 30 Sep 2021 21:45:59 GMT Message-Id: <202109302145.18ULjxBu068639@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: aad489fbb00d - main - x11-servers/xorg-server: fix OPTIONs handling MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aad489fbb00d1ac52339ca57f0f25b331917dde4 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Sep 2021 21:46:00 -0000 The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=aad489fbb00d1ac52339ca57f0f25b331917dde4 commit aad489fbb00d1ac52339ca57f0f25b331917dde4 Author: Rene Ladan AuthorDate: 2021-09-30 21:44:45 +0000 Commit: Rene Ladan CommitDate: 2021-09-30 21:45:50 +0000 x11-servers/xorg-server: fix OPTIONs handling Reported by: kbowling Fixes: 620968a43a5f9bb3fa98ab20f257a4c0d864caa7 --- x11-servers/xorg-server/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index c012f0d4afbc..5859e6293579 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -22,8 +22,7 @@ OPTIONS_SUB= yes OPTIONS_DEFINE+= SUID OPTIONS_RADIO= CONF OPTIONS_RADIO_CONF= DEVD UDEV -OPTIONS_DEFAULT= SUID -OPTIONS_DEFAULT_FreeBSD= UDEV +OPTIONS_DEFAULT= SUID UDEV OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}} SUID_DESC= Install setuid wrapper to allow startx as non-root