From e2ca9da1e863d71966549c784fa1dbe521206a0d Mon Sep 17 00:00:00 2001 From: marino Date: Tue, 26 May 2015 14:12:39 +0000 Subject: [PATCH] devel/adacurses: work around FreeBSD 11 ncurses regression The upgrade of ncurses on the -CURRENT version of FreeBSD resulted in an regression (see PR) which results in multiple pkg-fallout mails to me weekly. Since the PR isn't moving despite periodic pinging, I am forcing the ports version of ncurses to be used with FreeBSD 11 rather than the base like FreeBSD 10 and earlier, and DragonFly. While here, tweak a makefile install target that was emitting a non-fatal error. PR: 199109 --- devel/adacurses/Makefile | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/devel/adacurses/Makefile b/devel/adacurses/Makefile index 1f4c22f39fd5..8ce60efa0c10 100644 --- a/devel/adacurses/Makefile +++ b/devel/adacurses/Makefile @@ -13,7 +13,7 @@ COMMENT= Ada95 bindings for ncurses LICENSE= MIT -USES= ada gmake ncurses tar:tgz +USES= ada gmake tar:tgz GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-ada-include=${PREFIX}/include/adacurses \ --with-ada-objects=${PREFIX}/lib/adacurses \ @@ -26,8 +26,19 @@ MAKE_JOBS_UNSAFE= yes .include +.if ${OPSYS} == FreeBSD && ${OSREL:R} == 11 +# PR 199109 The base ncurses has suffered a regression which prevents +# adacurses from building on -CURRENT. The PR is not getting any attention +# and I'm sick of never-ending fallout messages so bring back ports ncurses +# for the FreeBSD 11 users. +USES+= ncurses:port +.else +USES+= ncurses +.endif + post-patch: @${REINPLACE_CMD} -e 's|#if A|#ifdef A|g' ${WRKSRC}/gen/gen.c + @${REINPLACE_CMD} -e '/(INSTALL_PROG)/d' ${WRKSRC}/gen/Makefile.in post-install: ${INSTALL_SCRIPT} ${WRKSRC}/gen/adacurses-config \