From owner-freebsd-ports@FreeBSD.ORG Thu Dec 22 20:32:29 2011 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 70DEC106564A for ; Thu, 22 Dec 2011 20:32:29 +0000 (UTC) (envelope-from cvs-src@yandex.ru) Received: from forward5.mail.yandex.net (forward5.mail.yandex.net [IPv6:2a02:6b8:0:602::5]) by mx1.freebsd.org (Postfix) with ESMTP id 7C32F8FC08 for ; Thu, 22 Dec 2011 20:32:28 +0000 (UTC) Received: from smtp3.mail.yandex.net (smtp3.mail.yandex.net [77.88.46.103]) by forward5.mail.yandex.net (Yandex) with ESMTP id DE4021200964; Fri, 23 Dec 2011 00:32:25 +0400 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1324585945; bh=jyT+2WY15Nzi49nzjMrpS5w2LMMD0zErwM4Yl1aPa/A=; h=Message-ID:Date:From:MIME-Version:To:CC:Subject:References: In-Reply-To:Content-Type:Content-Transfer-Encoding; b=g/CrIQgk0IaVTlpcRQLT3LLzcDGtjWqvisVatnQlTcI9M7WMTyGtgmcVLSQlqj4SN 46BHuntfirt67rHLqLOgmOpGhQXQrNYH5uBPYYzpZr9QOnteK4oUP7fbw2qU8h32zV aZ5Ki2Ox1DJ4xe4zLN7xgEl6VBA1AQ0bMJ6JkKn0= Received: from smtp3.mail.yandex.net (localhost [127.0.0.1]) by smtp3.mail.yandex.net (Yandex) with ESMTP id B93B21BA02E7; Fri, 23 Dec 2011 00:32:25 +0400 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1324585945; bh=jyT+2WY15Nzi49nzjMrpS5w2LMMD0zErwM4Yl1aPa/A=; h=Message-ID:Date:From:MIME-Version:To:CC:Subject:References: In-Reply-To:Content-Type:Content-Transfer-Encoding; b=g/CrIQgk0IaVTlpcRQLT3LLzcDGtjWqvisVatnQlTcI9M7WMTyGtgmcVLSQlqj4SN 46BHuntfirt67rHLqLOgmOpGhQXQrNYH5uBPYYzpZr9QOnteK4oUP7fbw2qU8h32zV aZ5Ki2Ox1DJ4xe4zLN7xgEl6VBA1AQ0bMJ6JkKn0= Received: from unknown (unknown [178.76.224.133]) by smtp3.mail.yandex.net (nwsmtp/Yandex) with ESMTP id WOSOuiIW-WPSCZkCS; Fri, 23 Dec 2011 00:32:25 +0400 X-Yandex-Spam: 1 Message-ID: <4EF393BC.2020003@yandex.ru> Date: Fri, 23 Dec 2011 00:31:56 +0400 From: Ruslan Mahmatkhanov User-Agent: Mozilla/5.0 (X11; FreeBSD i386; rv:8.0) Gecko/20111109 Thunderbird/8.0 MIME-Version: 1.0 To: Christer Edwards References: <4EEC6D9D.1020102@yandex.ru> <4EEEAE03.1080908@yandex.ru> <4EF2FBAE.8050406@yandex.ru> In-Reply-To: X-Enigmail-Version: undefined Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: "freebsd-ports@FreeBSD.org" Subject: Re: RUN_DEPENDS for python based port X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Dec 2011 20:32:29 -0000 Christer Edwards wrote on 22.12.2011 23:54: > On Thu, Dec 22, 2011 at 2:43 AM, Ruslan Mahmatkhanov 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.