From owner-freebsd-ports@freebsd.org Thu Jan 28 20:14:14 2021 Return-Path: Delivered-To: freebsd-ports@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 35FE04EC16F for ; Thu, 28 Jan 2021 20:14:14 +0000 (UTC) (envelope-from SRS0=GCVp=G7=quip.cz=000.fbsd@elsa.codelab.cz) Received: from elsa.codelab.cz (elsa.codelab.cz [94.124.105.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DRWs131C5z4dwW for ; Thu, 28 Jan 2021 20:14:13 +0000 (UTC) (envelope-from SRS0=GCVp=G7=quip.cz=000.fbsd@elsa.codelab.cz) Received: from elsa.codelab.cz (localhost [127.0.0.1]) by elsa.codelab.cz (Postfix) with ESMTP id B82EC28417; Thu, 28 Jan 2021 21:14:10 +0100 (CET) Received: from illbsd.quip.test (ip-94-113-69-69.net.upcbroadband.cz [94.113.69.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by elsa.codelab.cz (Postfix) with ESMTPSA id C48A228416; Thu, 28 Jan 2021 21:14:09 +0100 (CET) Subject: Re: poudriere merging multiple ports trees To: Henrik Rosenke , freebsd-ports@freebsd.org References: <3ea16730-84a1-52ce-2251-bdd808fe5c52@pinyon.org> <4990d009-1962-62c2-3f4e-4f62fd03e26d@madpilot.net> <20210125141051.qheedhp76d2ha6zy@ivaldir.net> <3f2d08b2-2959-dd3e-89e5-895437e44040@quip.cz> <20210125152825.mnd4qhi4k23dy6dw@ivaldir.net> <0e79482c-fd7c-87a2-0052-5d7eeffd3099@dssgmbh.de> From: Miroslav Lachman <000.fbsd@quip.cz> Message-ID: Date: Thu, 28 Jan 2021 21:14:08 +0100 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4DRWs131C5z4dwW X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of SRS0=GCVp=G7=quip.cz=000.fbsd@elsa.codelab.cz has no SPF policy when checking 94.124.105.4) smtp.mailfrom=SRS0=GCVp=G7=quip.cz=000.fbsd@elsa.codelab.cz X-Spamd-Result: default: False [-1.80 / 15.00]; FROM_NEQ_ENVFROM(0.00)[000.fbsd@quip.cz,SRS0=GCVp=G7=quip.cz=000.fbsd@elsa.codelab.cz]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[quip.cz]; RBL_DBL_DONT_QUERY_IPS(0.00)[94.124.105.4:from]; AUTH_NA(1.00)[]; SPAMHAUS_ZRD(0.00)[94.124.105.4:from:127.0.2.255]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[000.fbsd@quip.cz,SRS0=GCVp=G7=quip.cz=000.fbsd@elsa.codelab.cz]; RECEIVED_SPAMHAUS_PBL(0.00)[94.113.69.69:received]; RCVD_TLS_LAST(0.00)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:42000, ipnet:94.124.104.0/21, country:CZ]; MIME_TRACE(0.00)[0:+]; MAILMAN_DEST(0.00)[freebsd-ports] X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2021 20:14:14 -0000 On 28/01/2021 17:47, Henrik Rosenke wrote: > I tried this with a patched MOVED file, copied from the master > portstree, deleted the entry and tried to build but this File seems to > be ignored. I dont really understand where the MOVED file is handled, it > seems to be bsd.port.subdir.mk but i am not sure. MOVED is handled by bsd.port.subdir.mk but overlays do not account with it. Overlays are handled on more places Scripts/do-depends.sh Scripts/depends-list.sh Next is bsd.port.mk: .if defined(USE_LOCAL_MK) .include "${PORTSDIR}/Mk/bsd.local.mk" .endif .for odir in ${OVERLAYS} .sinclude "${odir}/Mk/bsd.overlay.mk" .endfor But there is no bsd.overlay.mk and I don't know what should be in it (file in the overlay ports tree) The AWK code in bsd.port.subdir.mk can be changed to use MOVED from overlay if it exists insead of the default one. > I think the best way > to handle this would be a NOT_MOVED file in the overlay portstree with > the ports to ignore from the MOVED file with entries like "sysutils/sge62". This can be possible too. NOT_MOVED can be used as additional INDEXFILE Or maybe start with PORTSEARCH_MOVED=0 (not tried yet) Kind regards Miroslav Lachman