From owner-freebsd-x11@FreeBSD.ORG Tue May 6 08:10:01 2014 Return-Path: Delivered-To: freebsd-x11@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 45D8F74F for ; Tue, 6 May 2014 08:10: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 180D41A7 for ; Tue, 6 May 2014 08:10:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s468A03i050058 for ; Tue, 6 May 2014 08:10:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s468A0G7050057; Tue, 6 May 2014 08:10:00 GMT (envelope-from gnats) Date: Tue, 6 May 2014 08:10:00 GMT Message-Id: <201405060810.s468A0G7050057@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 Reply-To: John Marino X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 May 2014 08:10:01 -0000 The following reply was made to PR ports/184952; it has been noted by GNATS. From: John Marino To: bug-followup@FreeBSD.org, freebsd@marino.st Cc: Subject: Re: ports/184952: x11-servers/xorg-server: Slave port makefiles all have same error Date: Tue, 06 May 2014 10:02:36 +0200 zeising@ reverted the commit, and thus broke the port on DragonFly again: http://svnweb.freebsd.org/ports/head/x11-servers/xephyr/Makefile?r1=351411&r2=351410&pathrev=351411 Here's the error that it caused mixing bsd.port.options.mk followed by bsd.port.pre.mk. > =================================================== > ===> Patching for xephyr-1.12.4_7,1 > ===> Applying extra patch /usr/ports/x11-servers/xephyr/../xorg-server/dragonfly/extra-new-hw_xfree86_os-support_xf86__OSlib.h > ===> Applying extra patch /usr/ports/x11-servers/xephyr/../xorg-server/dragonfly/extra-new-hw_xfree86_os-support_xf86__OSlib.h > Ignoring previously applied (or reversed) patch. > 1 out of 1 hunks ignored--saving rejects to hw/xfree86/os-support/xf86_OSlib.h.rej > *** Error code 1 Here is the inclusion order on DragonFly: x11-servers/xephyr> make -V .MAKE.MAKEFILES | tr " " "\n" /usr/share/mk/sys.mk /etc/defaults/make.conf /etc/make.conf /usr/share/mk/bsd.cpu.mk /usr/share/mk/bsd.cpu.gcc47.mk Makefile /usr/share/mk/bsd.port.options.mk /usr/share/mk/bsd.port.mk /usr/share/mk/bsd.own.mk /usr/dports/Mk/bsd.port.mk /usr/dports/Mk/bsd.commands.mk /home/automaton/merged-ports/x11-servers/xephyr/../xorg-server/Makefile.DragonFly /usr/dports/Mk/bsd.options.mk /home/automaton/merged-ports/x11-servers/xephyr/../xorg-server/Makefile /usr/share/mk/bsd.port.pre.mk /usr/dports/Mk/bsd.sanity.mk /usr/dports/Mk/bsd.xorg.mk /usr/dports/Mk/bsd.openssl.mk /usr/dports/Mk/bsd.pbi.mk /usr/dports/Mk/Uses/gmake.mk /usr/dports/Mk/Uses/libtool.mk /usr/dports/Mk/Uses/perl5.mk /usr/dports/Mk/Uses/tar.mk /usr/dports/Mk/Uses/pkgconfig.mk /usr/dports/Mk/Uses/pathfix.mk /usr/share/mk/bsd.port.post.mk /usr/dports/Mk/bsd.stage.mk /usr/dports/Mk/bsd.pkgng.mk /usr/dports/Mk/bsd.licenses.mk /usr/dports/Mk/bsd.sites.mk /usr/dports/Mk/bsd.options.desc.mk One doesn't normally needed both options and pre, it's usually one or the other. What exactly is broken when ".include " is removed? Because it builds fine without it. Reopening - and hopefully this will be resolved quickly. John