Date: Mon, 2 Dec 2013 19:21:58 +0100 From: Olivier Duchateau <duchateau.olivier@gmail.com> To: Vasil Dimov <vd@freebsd.org> Cc: "svn-ports-head@freebsd.org" <svn-ports-head@freebsd.org>, "svn-ports-all@freebsd.org" <svn-ports-all@freebsd.org>, "ports-committers@freebsd.org" <ports-committers@freebsd.org> Subject: Re: svn commit: r335508 - head/graphics/hugin Message-ID: <CAHcdu2qSjC61Tb8diPTJs37nUzpXfvGKiRb6OodnsKEwA8eR3A@mail.gmail.com> In-Reply-To: <20131202175155.GA44136@hag.hw.v5d.org> References: <201312021628.rB2GSIFs048953@svn.freebsd.org> <CAHcdu2qj1VhuxWomMqaxHzbH%2BUUnwiKcgEyUptzG4JuQ%2BGqrRA@mail.gmail.com> <20131202175155.GA44136@hag.hw.v5d.org>
next in thread | previous in thread | raw e-mail | index | archive | help
2013/12/2 Vasil Dimov <vd@freebsd.org>: > On Mon, Dec 02, 2013 at 17:59:07 +0100, Olivier Duchateau wrote: >> 2013/12/2 Vasil Dimov <vd@freebsd.org>: >> > 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAHcdu2qSjC61Tb8diPTJs37nUzpXfvGKiRb6OodnsKEwA8eR3A>