Date: Fri, 23 Dec 2011 00:31:56 +0400 From: Ruslan Mahmatkhanov <cvs-src@yandex.ru> To: Christer Edwards <christer.edwards@gmail.com> Cc: "freebsd-ports@FreeBSD.org" <freebsd-ports@freebsd.org> Subject: Re: RUN_DEPENDS for python based port Message-ID: <4EF393BC.2020003@yandex.ru> In-Reply-To: <CAH2d3%2BvWDbahx_kuo9_T8ezK2W9JGxyy74czeUTDopKKUzrQfg@mail.gmail.com> References: <CAH2d3%2BvMF8jM6GHJQ6DR7EywmnY%2Bj=0tSHFEf_5oW1C6QhYD8A@mail.gmail.com> <4EEC6D9D.1020102@yandex.ru> <CAH2d3%2Btr8deqeGLPywXAXsRDPt_-3GwpkqPhK=zk5PtztvkK6g@mail.gmail.com> <4EEEAE03.1080908@yandex.ru> <CAH2d3%2BtE8s%2Bf6ni9GLdh0nHTQdN50BeaoAQ6%2BnYTrUBbJAiKDA@mail.gmail.com> <4EF2FBAE.8050406@yandex.ru> <CAH2d3%2BvWDbahx_kuo9_T8ezK2W9JGxyy74czeUTDopKKUzrQfg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Christer Edwards wrote on 22.12.2011 23:54: > On Thu, Dec 22, 2011 at 2:43 AM, Ruslan Mahmatkhanov <cvs-src@yandex.ru> wrote: >> Sorry for delay. Please review this patch: >> http://people.freebsd.org/~rm/salt.diff.txt >> >> it fixes: >> - fetch (FETCH_ARGS added, that i noted erlier) >> - build (you mistyped py-Jinja2 dependency) >> - python version changed to 2.6-2.7 >> - whitespace issue (spotted by portlint) >> - man-pages install >> - configuration files install >> - missing files in pkg-plist > > Wow. Thank you for those fixes! > > Everything seems to build correctly for me now, but I'm wondering if I > didn't apply the setup.py patch properly because I'm still not getting > the config files. Do you think you could tell me how setup.py patch is > supposed to be used from files/? > > Thanks Here is updated tarball (couple of lines in pkg-plist fixed dealing with config files): http://people.freebsd.org/~rm/salt.tbz Config files (master and minion) installed into /usr/local/etc/salt/ by default: [rm@smeshariki3 /tmp]> ls -l /usr/local/etc/salt/ total 16 -rw-r--r-- 1 root wheel 6223 28 ноя 02:14 master -rw-r--r-- 1 root wheel 4242 25 окт 08:48 minion Btw, i'd prefer to patch setup.py once again to install them with '.sample' postfix. User will need to copy them into just `master' and `minion' to make it work. This will guarantee that user will not lost their configuration while upgrading salt to new version from ports. You should change this block in setup.py: data_files=[(os.path.join(etc_path, 'salt'), ['conf/master', 'conf/minion', ]), Just add '.sample' postfix to this file names. And similar change in pkg-plist: %%ETCDIR%%/master.sample %%ETCDIR%%/minion.sample instead of %%ETCDIR%%/master %%ETCDIR%%/minion More about patching here: http://www.freebsd.org/doc/en/books/porters-handbook/book.html#SLOW-PATCH -- Regards, Ruslan Tinderboxing kills... the drives.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4EF393BC.2020003>