Received: by mail.netbsd.org (Postfix, from userid 605) id 0263A84D65; Wed, 17 Feb 2021 07:02:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3CF7D84D04 for ; Wed, 17 Feb 2021 07:02:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id ykCyEqS7-Tnf for ; Wed, 17 Feb 2021 07:02:30 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 9E8C484CE8 for ; Wed, 17 Feb 2021 07:02:30 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 92662FA95; Wed, 17 Feb 2021 07:02:30 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1613545350206710" MIME-Version: 1.0 Date: Wed, 17 Feb 2021 07:02:30 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/lang/ghc84 To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20210217070230.92662FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1613545350206710 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Wed Feb 17 07:02:30 UTC 2021 Modified Files: pkgsrc/lang/ghc84: Makefile bootstrap.mk distinfo Log Message: ghc84: merge NetBSD-current support from ghc810 To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/ghc84/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/ghc84/bootstrap.mk \ pkgsrc/lang/ghc84/distinfo Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1613545350206710 Content-Disposition: inline Content-Length: 3533 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/ghc84/Makefile diff -u pkgsrc/lang/ghc84/Makefile:1.10 pkgsrc/lang/ghc84/Makefile:1.11 --- pkgsrc/lang/ghc84/Makefile:1.10 Mon Aug 31 18:09:50 2020 +++ pkgsrc/lang/ghc84/Makefile Wed Feb 17 07:02:30 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2020/08/31 18:09:50 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2021/02/17 07:02:30 wiz Exp $ # ----------------------------------------------------------------------------- # Package metadata # @@ -211,7 +211,7 @@ BUILD_DEPENDS+= compat80-[0-9]*:../../em # In a sandboxed build environment, we have to reach over to the # installed libraries themselves, since the symlinks compat80 adds # to the /usr tree can't be applied. -ALL_ENV+= LD_LIBRARY_PATH=${PREFIX:Q}/emul/netbsd/usr/lib:${FILESDIR} +ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib:${FILESDIR} .endif .include "../../converters/libiconv/buildlink3.mk" Index: pkgsrc/lang/ghc84/bootstrap.mk diff -u pkgsrc/lang/ghc84/bootstrap.mk:1.6 pkgsrc/lang/ghc84/bootstrap.mk:1.7 --- pkgsrc/lang/ghc84/bootstrap.mk:1.6 Fri Mar 27 04:13:57 2020 +++ pkgsrc/lang/ghc84/bootstrap.mk Wed Feb 17 07:02:30 2021 @@ -1,4 +1,4 @@ -# $NetBSD: bootstrap.mk,v 1.6 2020/03/27 04:13:57 riastradh Exp $ +# $NetBSD: bootstrap.mk,v 1.7 2021/02/17 07:02:30 wiz Exp $ # ----------------------------------------------------------------------------- # Select a bindist of bootstrapping compiler on a per-platform basis. # @@ -46,6 +46,10 @@ DISTFILES:= ${DISTFILES} ${BOOT_ARCHIVE} BOOT_VERSION:= 8.4.4 BOOT_ARCHIVE:= ghc-${BOOT_VERSION}-boot-x86_64-unknown-netbsd.tar.xz DISTFILES:= ${DISTFILES} ${BOOT_ARCHIVE} # Available in LOCAL_PORTS +. if !empty(MACHINE_PLATFORM:MNetBSD-9.99*-x86_64) || make(distinfo) || make (makesum) || make(mdi) +DISTFILES+= netbsd-9.0-amd64-libterminfo.tar.gz +EXTRACT_ONLY+= netbsd-9.0-amd64-libterminfo.tar.gz +. endif .endif .if !empty(MACHINE_PLATFORM:MSunOS-*-i386) || make(distinfo) || make (makesum) || make(mdi) Index: pkgsrc/lang/ghc84/distinfo diff -u pkgsrc/lang/ghc84/distinfo:1.6 pkgsrc/lang/ghc84/distinfo:1.7 --- pkgsrc/lang/ghc84/distinfo:1.6 Tue Feb 9 12:41:32 2021 +++ pkgsrc/lang/ghc84/distinfo Wed Feb 17 07:02:30 2021 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2021/02/09 12:41:32 ryoon Exp $ +$NetBSD: distinfo,v 1.7 2021/02/17 07:02:30 wiz Exp $ SHA1 (ghc-8.0.2-boot-x86_64-unknown-solaris2.tar.xz) = 517ea9435af0c8b4f32899ae3bd26ff8da34f180 RMD160 (ghc-8.0.2-boot-x86_64-unknown-solaris2.tar.xz) = c88b0958085ce9a6e1b175280d536986e4c712b1 @@ -24,6 +24,10 @@ SHA1 (ghc-8.4.4-src.tar.xz) = bf8f807348 RMD160 (ghc-8.4.4-src.tar.xz) = d2be33c4b38ee0660fe081e625ad5242c819392c SHA512 (ghc-8.4.4-src.tar.xz) = 685e102eee8cf8b6a377afd7871998c8c368a5da288469367e3fb804aa6109e6f59be5945b8cd3d1e36c851190ea9a7f74c576528589589313d237b721d86da5 Size (ghc-8.4.4-src.tar.xz) = 11319500 bytes +SHA1 (netbsd-9.0-amd64-libterminfo.tar.gz) = db6b385b8676efc135c08b06e3dd6fd11b926999 +RMD160 (netbsd-9.0-amd64-libterminfo.tar.gz) = 5a246633c90ee85f71efcc02d8280bd0c50ab5a7 +SHA512 (netbsd-9.0-amd64-libterminfo.tar.gz) = 79288d44b84df8848afc2cdfee628cc4fd1ec0334159403ef8ba994d617bc56a7114af3031198afb5f3b8f45c0463a848099431e32bc6725042908576b6f95b8 +Size (netbsd-9.0-amd64-libterminfo.tar.gz) = 27744 bytes SHA1 (patch-aclocal.m4) = cb444acc956f46657070f9f6dc343008b35594bd SHA1 (patch-configure.ac) = dae98e76c51fdc2f70a77adf7d206c3d79c6bca6 SHA1 (patch-libraries_base_GHC_Event_KQueue.hsc) = 8ee5da667a241a05fde3c580d3dc9bdc05aa5f00 --_----------=_1613545350206710--