Date: Tue, 31 Dec 2013 20:20:01 GMT From: Niclas Zeising <zeising@freebsd.org> To: freebsd-x11@FreeBSD.org Subject: Re: ports/184952: x11-servers/xorg-server: Slave port makefiles all have same error Message-ID: <201312312020.rBVKK178061648@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/184952; it has been noted by GNATS. From: Niclas Zeising <zeising@freebsd.org> To: marino@freebsd.org Cc: John Marino <freebsd.contact@marino.st>, bug-followup@FreeBSD.org, freebsd@marino.st, kwm@freebsd.org, Baptiste Daroussin <bapt@freebsd.org> Subject: Re: ports/184952: x11-servers/xorg-server: Slave port makefiles all have same error Date: Tue, 31 Dec 2013 21:17:23 +0100 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. 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. Regards! -- Niclas Zeising
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312312020.rBVKK178061648>