From nobody Fri Jan  5 09:23:19 2024
X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
	by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T5ygC3NTfz56cKZ;
	Fri,  5 Jan 2024 09:23:19 +0000 (UTC)
	(envelope-from danfe@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
	 client-signature RSA-PSS (4096 bits) client-digest SHA256)
	(Client CN "freefall.freebsd.org", Issuer "R3" (verified OK))
	by mx1.freebsd.org (Postfix) with ESMTPS id 4T5ygC2vmBz4CcQ;
	Fri,  5 Jan 2024 09:23:19 +0000 (UTC)
	(envelope-from danfe@freebsd.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1704446599;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
	 in-reply-to:in-reply-to:references:references;
	bh=1afF7b+YzOWWybk7XTDbq4iZBw7K4XJiqgR551rPPrA=;
	b=YvRiLhDPnZ4m7bpG2sXS6GJBtheQI2kfAEHHOWJmchC+vGD+z/l3XqSIXrfg709eTNUztY
	IXiJ+qVgUza9kokV0SB2El/XydEpqeVWM9rxAchGAiQFf5ReixG+M3H3e9WV+N6Nu+Yv1+
	l+ERjSndcoLO3T4sgTx+wbXDzPezyr0pxS9zYfnzN5WVWk2UtPQBasp0yA+WmWB4mf8f8F
	HTD86LJMMbjRMGxPnSmSh+21cH2hcAfr49fIoBWGocOdutB4gtywnwxQtNU/DurfsUK2g6
	lpVRFWaJ7jSJJVlf5KJVrbVSb0jFeqglcFHCDWm/mv6pH9M8BApchSf1/+QgdQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1704446599;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
	 in-reply-to:in-reply-to:references:references;
	bh=1afF7b+YzOWWybk7XTDbq4iZBw7K4XJiqgR551rPPrA=;
	b=Nj/Ss6OxwP1gv/VrlE2hebaRXKrW8Fw7bBkIErcH+SoUUITyC3v0wFPHZuTFnyVRZkjF0v
	8sLGcS27YxUR7pJ9h0V95Voy3ahmvhyFcL2y9UCv/oNDUIG5Dg7IDTJQUKGYs6XaLCaiKW
	9s/AW2jn1Z0b0cmPBLd9odppMhXEUK27bnM/oEFLhRJkRI5gl330tDUrnpl3AUA7XnWou7
	YDrZjJW6rLATK8GzuQyVrF4PnE2sfTHm2yo3nweRm9FPmlCwp4Zq+qB5o3aNI6HN2AE5De
	vHV86Nau5X2qNmDHHGTq74FlzfBYgPAnwTclAHM0edHduvA2ApoV5aG/WVbq0A==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704446599; a=rsa-sha256; cv=none;
	b=tCduh7BGt78poYnDnta2R4GbFed1Cj78viaXNBlpJNd3vUOoB8QkJJgTXXp/QXvfdPVBNC
	DAWB6+M4294sEVPnh32pmMWOtBTw2BZZh9+cxZCITPvdtiUt0jRCjhIv+O/v3ge0rqlM/p
	ZkGmj+AzqmYaR5HRO0kgGHacWqHSKMhua60u2HVFkes3+Tw6V8ShPLH5T0Mmn7WDopm9jW
	Bp1cvUrTOJ8v/ILASNXWMhewllwn6jghXpVuhYtMXkss4Rto10/AtvDASwTqnG5UIAZoOk
	cYTp24Oc4MKgSnyM/hl9UHN+7JbSI37OmdqMyG9VhO5A3GGy09nYc1P+6jAi3Q==
Received: by freefall.freebsd.org (Postfix, from userid 1033)
	id 311EB1ADCE; Fri,  5 Jan 2024 09:23:19 +0000 (UTC)
Date: Fri, 5 Jan 2024 09:23:19 +0000
From: Alexey Dokuchaev <danfe@freebsd.org>
To: Jose Alonso Cardenas Marquez <acm@freebsd.org>
Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org,
	dev-commits-ports-main@freebsd.org
Subject: Re: git: 8faa16b6db4b - main - lang/fpc-source: update mirrors,
 apply patches and another minor changes
Message-ID: <ZZfKh5EvPWkjEIus@FreeBSD.org>
References: <202401050017.4050HSa7008938@gitrepo.freebsd.org>
 <ZZfAxUhO83WOKFfG@FreeBSD.org>
List-Id: Commits to the main branch of the FreeBSD ports repository <dev-commits-ports-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main
List-Help: <mailto:dev-commits-ports-main+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-main+unsubscribe@freebsd.org>
Sender: owner-dev-commits-ports-main@freebsd.org
X-BeenThere: dev-commits-ports-main@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ZZfAxUhO83WOKFfG@FreeBSD.org>

On Fri, Jan 05, 2024 at 08:41:41AM +0000, Alexey Dokuchaev wrote:
> On Fri, Jan 05, 2024 at 12:17:28AM +0000, Jose Alonso Cardenas Marquez wrote:
> > commit 8faa16b6db4b95b746ad1c779bd000dd4424c840
> > 
> >   lang/fpc-source: update mirrors, apply patches and another minor changes
> > ...
> > +
> > +.include <bsd.port.pre.mk>
> > +
> > +.if ${ARCH} == "i386"
> > +FPC_ARCH=	i386
> > +.elif ${ARCH} == "amd64"
> > +FPC_ARCH=	x86_64
> > +.endif
> 
> Now you're including <bsd.port.pre.mk>, but at the end it still says
> .include <bsd.port.mk> which causes the following error:
> 
>   /!\ fpc-source-3.2.2_4: Makefile errors /!\
>   
>   you cannot include bsd.port[.pre].mk twice

And then it does not stage.  Here's what I had to duct tape locally to
get it packaged:

    https://people.freebsd.org/~danfe/fpc-source-staging-fix.diff

./danfe