CVS commit: pkgsrc/lang/ghc

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Fri Oct 25 08:55:46 UTC 2019

Modified Files:
        pkgsrc/lang/ghc: Makefile distinfo
        pkgsrc/lang/ghc/patches: patch-at

Log Message:
ghc: adjust patch to allow for Perl >= 5.30


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 pkgsrc/lang/ghc/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/lang/ghc/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/ghc/patches/patch-at

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

Modified files:

Index: pkgsrc/lang/ghc/Makefile
diff -u pkgsrc/lang/ghc/Makefile:1.61 pkgsrc/lang/ghc/Makefile:1.62
--- pkgsrc/lang/ghc/Makefile:1.61       Sun Aug 11 13:21:21 2019
+++ pkgsrc/lang/ghc/Makefile    Fri Oct 25 08:55:46 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2019/08/11 13:21:21 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2019/10/25 08:55:46 gutteridge Exp $
 
 DISTNAME=      ghc-6.8.3
-PKGREVISION=   9
+PKGREVISION=   10
 CATEGORIES=    lang
 MASTER_SITES=  http://www.haskell.org/ghc/dist/6.8.3/
 DISTFILES=     ghc-6.8.3-src.tar.bz2 \

Index: pkgsrc/lang/ghc/distinfo
diff -u pkgsrc/lang/ghc/distinfo:1.32 pkgsrc/lang/ghc/distinfo:1.33
--- pkgsrc/lang/ghc/distinfo:1.32       Tue Nov  3 22:50:36 2015
+++ pkgsrc/lang/ghc/distinfo    Fri Oct 25 08:55:46 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2015/11/03 22:50:36 agc Exp $
+$NetBSD: distinfo,v 1.33 2019/10/25 08:55:46 gutteridge Exp $
 
 SHA1 (ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz) = 29c1a17a83ec0ddec8ff231e009c740ebc61dd6c
 RMD160 (ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz) = 5ce775a19797fe257357fedd33db2354dd50d2de
@@ -35,5 +35,5 @@ SHA1 (patch-ap) = 13afc2f1c51fc10f5bc657
 SHA1 (patch-aq) = 554514e160ae2bdcab0dfd444839d333a72b5b4f
 SHA1 (patch-ar) = 0cc6fedc5ee6304b201da79b7cc0104a804501cd
 SHA1 (patch-as) = cebeefbeada25b1d52a528c4d83d66b7a2766e1a
-SHA1 (patch-at) = f6c1b589d1285e14de9344cdcbbacb4d128e8f7c
+SHA1 (patch-at) = cef80fb1493394c4a6045b729d5dc374136d1813
 SHA1 (patch-au) = 4eb10fb1558a758ce9919c422ec7f15fa5b466e1

Index: pkgsrc/lang/ghc/patches/patch-at
diff -u pkgsrc/lang/ghc/patches/patch-at:1.8 pkgsrc/lang/ghc/patches/patch-at:1.9
--- pkgsrc/lang/ghc/patches/patch-at:1.8        Fri Jun 27 06:51:22 2014
+++ pkgsrc/lang/ghc/patches/patch-at    Fri Oct 25 08:55:46 2019
@@ -1,4 +1,6 @@
-$NetBSD: patch-at,v 1.8 2014/06/27 06:51:22 dholland Exp $
+$NetBSD: patch-at,v 1.9 2019/10/25 08:55:46 gutteridge Exp $
+
+Recognize more Perl versions.
 
 --- ../ghc-6.4.2/configure.orig        2006-04-19 07:36:55.000000000 +1200
 +++ ../ghc-6.4.2/configure
@@ -7,7 +9,7 @@ $NetBSD: patch-at,v 1.8 2014/06/27 06:51
     else
     $PerlCmd -v >conftest.out 2>&1
 -   if grep "v5.6" conftest.out >/dev/null 2>&1; then
-+   if grep "v5.[12][02468]" conftest.out >/dev/null 2>&1; then
++   if grep "v5.[123][02468]" conftest.out >/dev/null 2>&1; then
        :
     else
        if grep "v5.8" conftest.out >/dev/null 2>&1; then