Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1572325967149530"
MIME-Version: 1.0
Date: Tue, 29 Oct 2019 05:12:47 +0000
From: "David H. Gutteridge" <gutteridge@netbsd.org>
Subject: CVS commit: pkgsrc/lang/ghc7
To: pkgsrc-changes@NetBSD.org
Reply-To: gutteridge@netbsd.org
Message-Id: <20191029051247.522C9FA8E@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1572325967149530
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	gutteridge
Date:		Tue Oct 29 05:12:47 UTC 2019

Modified Files:
	pkgsrc/lang/ghc7: Makefile

Log Message:
ghc7: build fix (workaround) for NetBSD 9.x

NetBSD 9.x have libcurses with a newer major version than the
bootstrap kit is linked against. For now, work around this with
compat80. (This could also be dealt with by creating versioned
bootstrap kits, but that's more involved, and NetBSD 9.x is pre-
release software, so best to leave this off for now.) Thanks to
Greg Troxel for the compat80 hint.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/lang/ghc7/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1572325967149530
Content-Disposition: inline
Content-Length: 1066
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/lang/ghc7/Makefile
diff -u pkgsrc/lang/ghc7/Makefile:1.34 pkgsrc/lang/ghc7/Makefile:1.35
--- pkgsrc/lang/ghc7/Makefile:1.34	Sun Aug 11 13:21:21 2019
+++ pkgsrc/lang/ghc7/Makefile	Tue Oct 29 05:12:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2019/08/11 13:21:21 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2019/10/29 05:12:47 gutteridge Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
@@ -188,6 +188,13 @@ STRIP_FILES_SKIP+=		lib/${PKGNAME_NOREV}
 BUILD_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
 BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 
+# NetBSD 9.x have libcurses with a newer major version than the
+# bootstrap kit is linked against. For now, work around this with
+# compat80.
+.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*)
+BUILD_DEPENDS+=	compat80-[0-9]*:../../emulators/compat80
+.endif
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"


--_----------=_1572325967149530--