From owner-freebsd-ports Sat Oct 14 5:20: 7 2000 Delivered-To: freebsd-ports@freebsd.org Received: from blizzard.sabbo.net (blizzard.sabbo.net [193.193.218.18]) by hub.freebsd.org (Postfix) with ESMTP id 0E9BB37B502; Sat, 14 Oct 2000 05:19:56 -0700 (PDT) Received: from vic.sabbo.net (root@[193.193.218.96]) by blizzard.sabbo.net (8.10.1/8.10.1) with ESMTP id e9ECLdY10332; Sat, 14 Oct 2000 15:21:40 +0300 Received: from FreeBSD.org (big_brother.vega.com [192.168.1.1]) by vic.sabbo.net (8.11.0/8.9.3) with ESMTP id e9ECJXi00367; Sat, 14 Oct 2000 15:19:33 +0300 (EEST) (envelope-from sobomax@FreeBSD.org) Message-ID: <39E84F54.257664E5@FreeBSD.org> Date: Sat, 14 Oct 2000 15:19:32 +0300 From: Maxim Sobolev Organization: Vega International Capital X-Mailer: Mozilla 4.75 [en] (WinNT; U) X-Accept-Language: uk,ru,en MIME-Version: 1.0 To: Satoshi - Ports Wraith - Asami Cc: bmah@FreeBSD.org, Neil Blakey-Milner , Akinori -Aki- MUSHA , freebsd-ports@FreeBSD.org, will@FreeBSD.org Subject: Re: PROPOSAL: Use @comment PLIST variable to track where installed packages came from [Was: Enhancement of pkg_version's version comparison routine] References: <86k8by6eis.wl@archon.local.idaemons.org> <20000927002401.A73341@mithrandr.moria.org> <39D9D006.652DC258@FreeBSD.org> <20001003161027.B67542@mithrandr.moria.org> <39D9EE01.7A880665@FreeBSD.org> <200010031657.e93Gvtg10718@bmah-freebsd-0.cisco.com> <39DB17BB.12805565@FreeBSD.org> <200010060426.e964Qvx70814@bmah-freebsd-0.cisco.com> <39DE1A48.C7C8C9CF@FreeBSD.org> Content-Type: multipart/mixed; boundary="------------1D0F5659FEF4E537659BDA16" Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org This is a multi-part message in MIME format. --------------1D0F5659FEF4E537659BDA16 Content-Type: text/plain; charset=koi8-r Content-Transfer-Encoding: 7bit Satoshi - Ports Wraith - Asami wrote: > I wish we could do these substitutions without having to invoke > separate processes though. Will, aren't there ways to do this in > make? > > Satoshi Satosi, With this message I'm attaching slightly revised bsd.port.mk patch, which doesn't invoke separate processes (BTW, Will can you please extend our make(1) to let address words in variables using their numbers, something like ${SOMEVAR:123}?). Please let me know if this patch is OK, so I'll start hammering Jordan to review pkg_install's patch of the patchset. -Maxim --------------1D0F5659FEF4E537659BDA16 Content-Type: text/plain; charset=koi8-r; name="bsd.port.mk-origin.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="bsd.port.mk-origin.patch" --- bsd.port.mk.orig Sat Oct 14 15:16:17 2000 +++ bsd.port.mk Sat Oct 14 15:17:23 2000 @@ -1017,6 +1017,14 @@ PKGREQ?= ${PKGDIR}/pkg-req PKGMESSAGE?= ${PKGDIR}/pkg-message +.if ${OSVERSION} > 500012 +.for _CATEGORY in ${CATEGORIES} +PKGCATEGORY?= ${_CATEGORY} +.endfor +PORTDIRNAME?= ${.CURDIR:C/^.*\///g} +PKGORIGIN?= ${PKGCATEGORY}/${PORTDIRNAME} +.endif + TMPPLIST?= ${WRKDIR}/.PLIST.mktmp PKG_CMD?= /usr/sbin/pkg_create @@ -1038,6 +1046,9 @@ .endif .if !defined(NO_MTREE) PKG_ARGS+= -m ${MTREE_FILE} +.endif +.if defined(PKGORIGIN) && ${OSVERSION} > 500012 +PKG_ARGS+= -o ${PKGORIGIN} .endif .endif .if defined(PKG_NOCOMPRESS) --------------1D0F5659FEF4E537659BDA16-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message