From owner-freebsd-emulation@FreeBSD.ORG Mon Mar 20 22:13:45 2006 Return-Path: X-Original-To: freebsd-emulation@FreeBSD.org Delivered-To: freebsd-emulation@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 83E5B16A424; Mon, 20 Mar 2006 22:13:45 +0000 (UTC) (envelope-from bsam@ipt.ru) Received: from mail.kuban.ru (mail.kuban.ru [62.183.66.246]) by mx1.FreeBSD.org (Postfix) with ESMTP id D080743D46; Mon, 20 Mar 2006 22:13:44 +0000 (GMT) (envelope-from bsam@ipt.ru) Received: from ipt.ru ([83.239.48.188]) by mail.kuban.ru (8.9.1/8.9.1) with ESMTP id k2KMDPw4033211; Tue, 21 Mar 2006 01:13:35 +0300 (MSK) Received: from bsam by ipt.ru with local (Exim 4.60 (FreeBSD)) (envelope-from ) id 1FLScf-0002nb-Op; Tue, 21 Mar 2006 01:13:09 +0300 To: freebsd-emulation@FreeBSD.org From: Boris Samorodov Date: Tue, 21 Mar 2006 01:13:09 +0300 Message-ID: <48803978@ho.ipt.ru> User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Cc: jylefort@FreeBSD.org Subject: [patch] for bsd.linux-rpm.mk (generating auto-plist) X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 22:13:45 -0000 --=-=-= Hi! Both linux_base-8 port and linux_base-fc3 have not only @dirrm but also @dirrmtry commands at their pkg-plist files. Current version of bsd.linux-rpm.mk deals only with the first ones. The proposed uses both and hence generate a more accurate auto-plist file. CC: to jylefort@ as it was his original code to generate automatic plist files. Comments are welcome. WBR -- Boris B. Samorodov, Research Engineer InPharmTech Co, http://www.ipt.ru Telephone & Internet Service Provider --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=patch Content-Description: tiny patch for bsd.linux-rpm.mk --- bsd.linux-rpm.mk.orig Tue Mar 21 00:13:54 2006 +++ bsd.linux-rpm.mk Tue Mar 21 00:05:43 2006 @@ -123,7 +123,7 @@ @cd ${WRKSRC} && \ ${FIND} * ! -type d | ${SORT} > ${PLIST} && \ ${FIND} * -type d | ${SORT} | ${SED} -e 's|^|@dirrm |' > ${PLIST}.dirs - @${GREP} '^@dirrm ' ${PORTSDIR}/emulators/linux_base-${_LINUX_BASE_SUFFIX}/pkg-plist | ${SORT} > ${PLIST}.shared-dirs + @${GREP} '^@dirrm' ${PORTSDIR}/emulators/linux_base-${_LINUX_BASE_SUFFIX}/pkg-plist | ${SED} 's:^@dirrmtry:@dirrm:g' | ${SORT} > ${PLIST}.shared-dirs @${COMM} -1 -3 ${PLIST}.shared-dirs ${PLIST}.dirs | ${SORT} -r >> ${PLIST} . endif . endif --=-=-=--