From owner-freebsd-x11@FreeBSD.ORG Tue Dec 31 21:40:01 2013 Return-Path: Delivered-To: freebsd-x11@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 908962A5 for ; Tue, 31 Dec 2013 21:40:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7BDF21242 for ; Tue, 31 Dec 2013 21:40:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rBVLe1fW078491 for ; Tue, 31 Dec 2013 21:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rBVLe1NX078490; Tue, 31 Dec 2013 21:40:01 GMT (envelope-from gnats) Date: Tue, 31 Dec 2013 21:40:01 GMT Message-Id: <201312312140.rBVLe1NX078490@freefall.freebsd.org> To: freebsd-x11@FreeBSD.org Cc: From: John Marino Subject: Re: ports/184952: x11-servers/xorg-server: Slave port makefiles all have same error X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: John Marino List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Dec 2013 21:40:01 -0000 The following reply was made to PR ports/184952; it has been noted by GNATS. From: John Marino To: Niclas Zeising Cc: marino@freebsd.org, bug-followup@FreeBSD.org, freebsd@marino.st, kwm@freebsd.org, Baptiste Daroussin Subject: Re: ports/184952: x11-servers/xorg-server: Slave port makefiles all have same error Date: Tue, 31 Dec 2013 22:33:03 +0100 On 12/31/2013 21:17, Niclas Zeising wrote: > On 12/31/13 20:43, John Marino wrote: >> On 12/31/2013 19:23, Niclas Zeising wrote: >>> This breaks detection of WITH_NEW_XORG= and needs to be reverted. >>> Regards! >> >> Then your WITH_NEW_XORG detection is wrong. >> Having bsd.ports.options.mk loaded multiple times causes problems, such >> as applying the same patches multiple times (if patches are present). >> It was detected independently by myself and kwm. >> >> By the way, the "detection" broke DragonFly too because of the use of >> OSVERSION without OPSYS. >> >> I'd say the detection is what needs to be reverted. >> >> (DragonFly has /etc/defaults/make.conf so we put WITH_NEW_XORG defaults >> there) > > > FreeBSD has no such thing, so that is not an option. Yes, I was surprised to discover this when I investigated earlier. > Currently WITH_NEW_XORG is defined in bsd.port.mk, which is included from > bsd.port.options.mk. This needs to be included WITH_NEW_XORG is > checked. Bapt said that the best way was to include bsd.port.options.mk > before checking for WITH_NEW_XORG. I will leave this as-is for now, > since I'm not in a position to develop a better solution currently, > however, this has to be revisisted asap. If bsd.ports.options.mk is loaded at least once, why does removing it from xephry/nested/vbf slave ports break the detection? Should not it still work since xorg-server loads it? John