From owner-svn-ports-head@FreeBSD.ORG  Fri Apr 10 13:35:28 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3C6B0ECF;
 Fri, 10 Apr 2015 13:35:28 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (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 27CAF8EE;
 Fri, 10 Apr 2015 13:35:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3ADZSnS003438;
 Fri, 10 Apr 2015 13:35:28 GMT (envelope-from gerald@FreeBSD.org)
Received: (from gerald@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3ADZSE8003437;
 Fri, 10 Apr 2015 13:35:28 GMT (envelope-from gerald@FreeBSD.org)
Message-Id: <201504101335.t3ADZSE8003437@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gerald set sender to
 gerald@FreeBSD.org using -f
From: Gerald Pfeifer <gerald@FreeBSD.org>
Date: Fri, 10 Apr 2015 13:35:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r383728 - head/emulators/wine-devel
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Apr 2015 13:35:28 -0000

Author: gerald
Date: Fri Apr 10 13:35:27 2015
New Revision: 383728
URL: https://svnweb.freebsd.org/changeset/ports/383728

Log:
  Revert the bogus half of the previous commit (which added COMPHOLIO
  to OPTIONS_DEFAULT).
  
  The other half, which is actually desirable, moved extraction of
  the Compholio/Staging patchset from the pre-configure target to
  the post-extract target which allows us to actually add local
  patches for this patchset as well.

Modified:
  head/emulators/wine-devel/Makefile

Modified: head/emulators/wine-devel/Makefile
==============================================================================
--- head/emulators/wine-devel/Makefile	Fri Apr 10 13:34:07 2015	(r383727)
+++ head/emulators/wine-devel/Makefile	Fri Apr 10 13:35:27 2015	(r383728)
@@ -53,7 +53,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 PORTDATA=	l_intl.nls wine.inf
 
 OPTIONS_DEFINE=	COMPHOLIO CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL V4L WINEMAKER X11 GECKO MONO
-OPTIONS_DEFAULT=X11 COMPHOLIO
+OPTIONS_DEFAULT=X11
 OPTIONS_SUB=	yes
 
 COMPHOLIO_DESC=	Include the Compholio patchset, needed for Pipelight support