From owner-svn-ports-head@freebsd.org  Thu Jun  8 21:08:34 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 446E0C79B02;
 Thu,  8 Jun 2017 21:08:34 +0000 (UTC)
 (envelope-from thierry@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 12A5A7194B;
 Thu,  8 Jun 2017 21:08:34 +0000 (UTC)
 (envelope-from thierry@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v58L8XHk087392;
 Thu, 8 Jun 2017 21:08:33 GMT (envelope-from thierry@FreeBSD.org)
Received: (from thierry@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v58L8Xwb087390;
 Thu, 8 Jun 2017 21:08:33 GMT (envelope-from thierry@FreeBSD.org)
Message-Id: <201706082108.v58L8Xwb087390@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: thierry set sender to
 thierry@FreeBSD.org using -f
From: Thierry Thomas <thierry@FreeBSD.org>
Date: Thu, 8 Jun 2017 21:08:33 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r442959 - head/textproc/py-enchant
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jun 2017 21:08:34 -0000

Author: thierry
Date: Thu Jun  8 21:08:32 2017
New Revision: 442959
URL: https://svnweb.freebsd.org/changeset/ports/442959

Log:
  Make wxPython optional.
  
  Note: no PORTREVISION bump, because the default is not changed.
  
  PR:		219804
  Submitted by:	pete (at) nomadlogic.org

Modified:
  head/textproc/py-enchant/Makefile
  head/textproc/py-enchant/pkg-plist

Modified: head/textproc/py-enchant/Makefile
==============================================================================
--- head/textproc/py-enchant/Makefile	Thu Jun  8 20:37:18 2017	(r442958)
+++ head/textproc/py-enchant/Makefile	Thu Jun  8 21:08:32 2017	(r442959)
@@ -16,11 +16,27 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libenchant.so:textproc/enchant
 
+OPTIONS_DEFINE=	WX
+OPTIONS_DEFAULT=WX
+WX_DESC=	Provide a wxSpellCheckerDialog
+OPTIONS_SUB=	yes
+
 USES=		python
 USE_PYTHON=	distutils
-USE_WX=		3.0+
-WX_COMPS=	python:run
 
+WX_USE=		WX=3.0+
+
 LDFLAGS+=	-L${LOCALBASE}/lib
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MWX}
+WX_COMPS=	python:run
+.endif
+
+post-install:
+.if ! ${PORT_OPTIONS:MWX}
+	${RM] ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/checker/wxSpellCheckerDialog*
+.endif
 
 .include <bsd.port.mk>

Modified: head/textproc/py-enchant/pkg-plist
==============================================================================
--- head/textproc/py-enchant/pkg-plist	Thu Jun  8 20:37:18 2017	(r442958)
+++ head/textproc/py-enchant/pkg-plist	Thu Jun  8 21:08:32 2017	(r442959)
@@ -16,9 +16,9 @@
 %%PYTHON_SITELIBDIR%%/enchant/checker/tests.py
 %%PYTHON_SITELIBDIR%%/enchant/checker/tests.pyc
 %%PYTHON_SITELIBDIR%%/enchant/checker/tests.pyo
-%%PYTHON_SITELIBDIR%%/enchant/checker/wxSpellCheckerDialog.py
-%%PYTHON_SITELIBDIR%%/enchant/checker/wxSpellCheckerDialog.pyc
-%%PYTHON_SITELIBDIR%%/enchant/checker/wxSpellCheckerDialog.pyo
+%%WX%%%%PYTHON_SITELIBDIR%%/enchant/checker/wxSpellCheckerDialog.py
+%%WX%%%%PYTHON_SITELIBDIR%%/enchant/checker/wxSpellCheckerDialog.pyc
+%%WX%%%%PYTHON_SITELIBDIR%%/enchant/checker/wxSpellCheckerDialog.pyo
 %%PYTHON_SITELIBDIR%%/enchant/errors.py
 %%PYTHON_SITELIBDIR%%/enchant/errors.pyc
 %%PYTHON_SITELIBDIR%%/enchant/errors.pyo