From owner-svn-ports-head@FreeBSD.ORG Mon Dec 2 18:22:02 2013 Return-Path: Delivered-To: svn-ports-head@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 E76006D1; Mon, 2 Dec 2013 18:22:01 +0000 (UTC) Received: from mail-la0-x22e.google.com (mail-la0-x22e.google.com [IPv6:2a00:1450:4010:c03::22e]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DE2C61A51; Mon, 2 Dec 2013 18:22:00 +0000 (UTC) Received: by mail-la0-f46.google.com with SMTP id eh20so8366339lab.19 for ; Mon, 02 Dec 2013 10:21:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=ubVGGsnO8jDnA1KKp+Ga6H0z+cdWwsWGMVBn0nuiq48=; b=gZ5S41CV1TEuPTLKxMw/Y8Wrm6tQOG3vcitMGDGFUo7VzXzDCTMHh2kiEeaHpitVTW bXg41or6hAEiPgdV8QTconFxDar0//oqh0uD0659F9GA70fZaG4hTRtpvHCGN/x9vvLi T5ALOz/st0tYUFDnaVQu5OdryguZXWuW1RGPVVRp6aiYGs98C+nv+LQD1sJMz4fHoyxS 6qCYrzdrFIDlE+jGbmTzOoK7jsMwgiC20QXqyTCGU+sByn6sDDu1+i4eXUPqjUuqr9ZX A44nS2Upz6kHeOgKsAx7XvpT3SbGy/Uek6bwKTiyqT4FI2/AXOYSKIlk815oDxZQjm/1 pKoQ== MIME-Version: 1.0 X-Received: by 10.152.225.161 with SMTP id rl1mr45398429lac.5.1386008518677; Mon, 02 Dec 2013 10:21:58 -0800 (PST) Received: by 10.152.130.193 with HTTP; Mon, 2 Dec 2013 10:21:58 -0800 (PST) In-Reply-To: <20131202175155.GA44136@hag.hw.v5d.org> References: <201312021628.rB2GSIFs048953@svn.freebsd.org> <20131202175155.GA44136@hag.hw.v5d.org> Date: Mon, 2 Dec 2013 19:21:58 +0100 Message-ID: Subject: Re: svn commit: r335508 - head/graphics/hugin From: Olivier Duchateau To: Vasil Dimov Content-Type: text/plain; charset=ISO-8859-1 Cc: "svn-ports-head@freebsd.org" , "svn-ports-all@freebsd.org" , "ports-committers@freebsd.org" X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Dec 2013 18:22:02 -0000 2013/12/2 Vasil Dimov : > On Mon, Dec 02, 2013 at 17:59:07 +0100, Olivier Duchateau wrote: >> 2013/12/2 Vasil Dimov : >> > Author: vd >> > Date: Mon Dec 2 16:28:18 2013 >> > New Revision: 335508 >> > URL: http://svnweb.freebsd.org/changeset/ports/335508 >> > >> > Log: >> > Fix graphics/hugin's pkg-plist >> > >> > Modified: >> > head/graphics/hugin/pkg-plist >> > >> > Modified: head/graphics/hugin/pkg-plist >> > ============================================================================== >> > --- head/graphics/hugin/pkg-plist Mon Dec 2 16:10:20 2013 (r335507) >> > +++ head/graphics/hugin/pkg-plist Mon Dec 2 16:28:18 2013 (r335508) >> > @@ -25,6 +25,9 @@ bin/pto_gen >> > bin/pto_merge >> > bin/tca_correct >> > bin/vig_optimize >> > +%%LOCALBASE%%/lib/python2.7/site-packages/_hsi.so >> > +%%LOCALBASE%%/lib/python2.7/site-packages/hpi.py >> > +%%LOCALBASE%%/lib/python2.7/site-packages/hsi.py >> > lib/hugin/libceleste.so.0.0 >> > lib/hugin/libflann_cpp.so >> > lib/hugin/libhugin_python_interface.so.0.0 >> >> It needs to define USE_PYTHON= -2.7 > > Any specific reason to use "-2.7" instead of "yes". "yes" it's for Python 2.x and Python 3.x. According to CMakeLists.txt file hugin supports both Python versions, macro should be USE_PYTHON= yes (but not tested if everything works fine with Python 3). You can also add option because Python is optional (see CMakeLists.txt line 311). CMAKE_ARGS= -DBUILD_HSI:BOOL=ON|OFF > >> and replace %%LOCALBASE%%/lib/python2.7/site-packages%% by %%PYTHON_ >> SITELIBDIR%% > [...] > > Hmm, of course python2.7 should not be hardcoded in there and > %%PYTHON_SITELIBDIR%% should be used instead, I overlooked this. > > But notice - using %%PYTHON_SITELIBDIR%% does not work if the port is > installed in an unusual PREFIX, I guess this is not hugin specific: > > (python and other ports are installed into /usr/local/, as by default) > > /usr/ports/graphics/hugin# make PREFIX=/tmp/hugin install > ... > python files get installed into /usr/local/lib/python2.7/site-packages/ > ... > ===> Registering installation for hugin-2012.0.0_3 > pkg-static: lstat(/tmp/hugin/lib/python2.7/site-packages/_hsi.so): No such file or directory > pkg-static: lstat(/tmp/hugin/lib/python2.7/site-packages/hpi.py): No such file or directory > pkg-static: lstat(/tmp/hugin/lib/python2.7/site-packages/hsi.py): No such file or directory > ... > > /usr/ports/graphics/hugin# make PREFIX=/tmp/hugin deinstall > ---> files under /usr/local/lib/python2.7/site-packages/ are not removed. Generally, when I want to test port in another prefix I add these 2 macros in Makefile NO_STAGE= yes NO_MTREE= yes and make install PREFIX=/tmp/hugin (for example). > > -- > Vasil Dimov > gro.DSBeerF@dv > % > If you accidently end up inside vi, you can quit it by pressing Escape, colon > (:), q (q), bang (!) and pressing return. -- olivier