From owner-svn-ports-all@FreeBSD.ORG  Fri Nov 23 02:27:09 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 9D946618;
 Fri, 23 Nov 2012 02:27:09 +0000 (UTC)
 (envelope-from fluffy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8330A8FC13;
 Fri, 23 Nov 2012 02:27:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAN2R91H017880;
 Fri, 23 Nov 2012 02:27:09 GMT (envelope-from fluffy@svn.freebsd.org)
Received: (from fluffy@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAN2R97w017879;
 Fri, 23 Nov 2012 02:27:09 GMT (envelope-from fluffy@svn.freebsd.org)
Message-Id: <201211230227.qAN2R97w017879@svn.freebsd.org>
From: Dima Panov <fluffy@FreeBSD.org>
Date: Fri, 23 Nov 2012 02:27:09 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307668 - head/graphics/vigra
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
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, 23 Nov 2012 02:27:09 -0000

Author: fluffy
Date: Fri Nov 23 02:27:09 2012
New Revision: 307668
URL: http://svnweb.freebsd.org/changeset/ports/307668

Log:
  - Control of Python dependency
  
  PR:		173772
  Submitted by:	Mamoru Sakaue
  Feature safe:	yes

Modified:
  head/graphics/vigra/Makefile   (contents, props changed)

Modified: head/graphics/vigra/Makefile
==============================================================================
--- head/graphics/vigra/Makefile	Thu Nov 22 21:39:32 2012	(r307667)
+++ head/graphics/vigra/Makefile	Fri Nov 23 02:27:09 2012	(r307668)
@@ -11,6 +11,7 @@
 
 PORTNAME=	vigra
 PORTVERSION=	1.8.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://hci.iwr.uni-heidelberg.de/vigra/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -27,6 +28,19 @@ CMAKE_ARGS=	-DDEPENDENCY_SEARCH_PREFIX:P
 
 USE_LDCONFIG=	yes
 
+OPTIONS=	PYTHON "Python bindings" off
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_PYTHON)
+CONFLICTS_BUILD=	python3*
+USE_PYTHON=	2.6-2.7
+.else
+CMAKE_ARGS+=	-DWITH_VIGRANUMPY=0
+.endif
+
+.include <bsd.port.pre.mk>
+
 # Vigra's CMakeLists.txt does not support disabling those so we hook them
 # as dependencies here unconditionally (without OPTIONS=) even though if
 # they are not present then Vigra/CMake will do without them (they are not
@@ -67,4 +81,4 @@ post-patch:
 # FIXME: This is ugly
 	@${RM} ${WRKSRC}/include/vigra/*.orig
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>