svn commit: r566530 - head/x11/foot

Jan Beich jbeich at FreeBSD.org
Thu Feb 25 12:35:56 UTC 2021


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>


More information about the svn-ports-all mailing list