From owner-svn-ports-head@freebsd.org  Thu Feb 25 12:35:56 2021
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 7A9FE5616FE;
 Thu, 25 Feb 2021 12:35:56 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4DmXMJ361Cz4dQ7;
 Thu, 25 Feb 2021 12:35:56 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5D21817ABF;
 Thu, 25 Feb 2021 12:35:56 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11PCZuak054763;
 Thu, 25 Feb 2021 12:35:56 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11PCZuXF054762;
 Thu, 25 Feb 2021 12:35:56 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <202102251235.11PCZuXF054762@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Thu, 25 Feb 2021 12:35:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r566530 - head/x11/foot
X-SVN-Group: ports-head
X-SVN-Commit-Author: jbeich
X-SVN-Commit-Paths: head/x11/foot
X-SVN-Commit-Revision: 566530
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Feb 2021 12:35:56 -0000

Author: jbeich
Date: Thu Feb 25 12:35:55 2021
New Revision: 566530
URL: https://svnweb.freebsd.org/changeset/ports/566530

Log:
  x11/foot: simplify terminfo support
  
  - Make post-patch unconditional as it's nop on FreeBSD < 14
  - Switch = to += to allow additions outside the conditional

Modified:
  head/x11/foot/Makefile   (contents, props changed)

Modified: head/x11/foot/Makefile
==============================================================================
--- head/x11/foot/Makefile	Thu Feb 25 11:30:22 2021	(r566529)
+++ head/x11/foot/Makefile	Thu Feb 25 12:35:55 2021	(r566530)
@@ -27,13 +27,14 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 .if exists(/usr/bin/tic)
 PKGMESSAGE=	${NONEXISTENT}
-PLIST_FILES=	share/site-terminfo/f/${PORTNAME} \
+PLIST_FILES+=	share/site-terminfo/f/${PORTNAME} \
 		share/site-terminfo/f/${PORTNAME}-direct
-post-patch:	terminfo-patch
-terminfo-patch:
-	@${REINPLACE_CMD} '/datadir/s/terminfo/site-&/' ${WRKSRC}/meson.build
 .else
-MESON_ARGS=	-Dterminfo=disabled
+MESON_ARGS+=	-Dterminfo=disabled
 .endif
+
+post-patch:
+# Chase default TERMINFO_DIRS on FreeBSD, see lib/ncurses/ncurses/ncurses_cfg.h
+	@${REINPLACE_CMD} '/datadir/s/terminfo/site-&/' ${WRKSRC}/meson.build
 
 .include <bsd.port.mk>