From owner-svn-ports-all@FreeBSD.ORG  Fri May 16 08:41:01 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 7D2071DA;
 Fri, 16 May 2014 08:41:01 +0000 (UTC)
Received: from mailrelay003.isp.belgacom.be (mailrelay003.isp.belgacom.be
 [195.238.6.53]) by mx1.freebsd.org (Postfix) with ESMTP id 9F254277C;
 Fri, 16 May 2014 08:41:00 +0000 (UTC)
X-Belgacom-Dynamic: yes
X-IronPort-Anti-Spam-Filtered: true
X-IronPort-Anti-Spam-Result: AlcGAPjNdVNbsWnc/2dsb2JhbABZgwZPS8RvAYEUF3SCJQEBBTocHgUQCw4GBAklDyoeBohYAQjRSBeOHDMHhEABA5lXgT6RXIM5OzA
Received: from 220.105-177-91.adsl-dyn.isp.belgacom.be (HELO
 kalimero.tijl.coosemans.org) ([91.177.105.220])
 by relay.skynet.be with ESMTP; 16 May 2014 10:40:57 +0200
Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org
 [127.0.0.1])
 by kalimero.tijl.coosemans.org (8.14.8/8.14.8) with ESMTP id s4G8evsK001411;
 Fri, 16 May 2014 10:40:57 +0200 (CEST)
 (envelope-from tijl@FreeBSD.org)
Date: Fri, 16 May 2014 10:40:56 +0200
From: Tijl Coosemans <tijl@FreeBSD.org>
To: Koop Mast <kwm@FreeBSD.org>
Subject: Re: svn commit: r354175 - head/x11-servers/xephyr
Message-ID: <20140516104056.1cb65b8a@kalimero.tijl.coosemans.org>
In-Reply-To: <201405152126.s4FLQNkB015115@svn.freebsd.org>
References: <201405152126.s4FLQNkB015115@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org,
 ports-committers@freebsd.org
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 May 2014 08:41:01 -0000

On Thu, 15 May 2014 21:26:23 +0000 (UTC) Koop Mast wrote:
> Author: kwm
> Date: Thu May 15 21:26:23 2014
> New Revision: 354175
> URL: http://svnweb.freebsd.org/changeset/ports/354175
> QAT: https://qat.redports.org/buildarchive/r354175/
> 
> Log:
>   Revert accident commit in -r351411. This should stop the option dialog
>   from spamming the user.
>   
>   Submitted by:	marino@
> 
> Modified:
>   head/x11-servers/xephyr/Makefile
> 
> Modified: head/x11-servers/xephyr/Makefile
> ==============================================================================
> --- head/x11-servers/xephyr/Makefile	Thu May 15 21:22:17 2014	(r354174)
> +++ head/x11-servers/xephyr/Makefile	Thu May 15 21:26:23 2014	(r354175)
> @@ -21,8 +21,6 @@ CONFIGURE_ARGS=	--enable-kdrive --enable
>  SLAVE_PORT=	yes
>  PLIST_FILES=	bin/Xephyr man/man1/Xephyr.1.gz
>  
> -.include <bsd.port.options.mk>
> -
>  do-install:
>  	${INSTALL_PROGRAM} ${WRKSRC}/hw/kdrive/ephyr/Xephyr ${STAGEDIR}${PREFIX}/bin/
>  .if defined(WITH_NEW_XORG)

Isn't it needed to make this "if defined(WITH_NEW_XORG)" work on 10-STABLE
and 11-CURRENT?