Date: Tue, 6 May 2014 08:10:00 GMT From: John Marino <freebsd.contact@marino.st> To: freebsd-x11@FreeBSD.org Subject: Re: ports/184952: x11-servers/xorg-server: Slave port makefiles all have same error Message-ID: <201405060810.s468A0G7050057@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: John Marino <freebsd.contact@marino.st> 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. > =======================<phase: patch >============================ > ===> 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 <bsd.port.options.mk>" is removed? Because it builds fine without it. Reopening - and hopefully this will be resolved quickly. John
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405060810.s468A0G7050057>