Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 26 May 2015 14:12:39 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r387478 - head/devel/adacurses
Message-ID:  <201505261412.t4QECdep074338@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Tue May 26 14:12:39 2015
New Revision: 387478
URL: https://svnweb.freebsd.org/changeset/ports/387478

Log:
  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

Modified:
  head/devel/adacurses/Makefile

Modified: head/devel/adacurses/Makefile
==============================================================================
--- head/devel/adacurses/Makefile	Tue May 26 13:56:06 2015	(r387477)
+++ head/devel/adacurses/Makefile	Tue May 26 14:12:39 2015	(r387478)
@@ -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 <bsd.port.options.mk>
 
+.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 \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505261412.t4QECdep074338>