Tue Nov 22 14:35:33 2022 UTC ()
ghc: depend on compat90 instead of compat80 on NetBSD/aarch64

There was never a NetBSD 8 release for aarch64 so compat80 is not
available, but compat90 will work nicely.


(nia)
diff -r1.53 -r1.54 pkgsrc/lang/ghc7/Makefile
diff -r1.19 -r1.20 pkgsrc/lang/ghc80/Makefile
diff -r1.14 -r1.15 pkgsrc/lang/ghc810/Makefile
diff -r1.21 -r1.22 pkgsrc/lang/ghc84/Makefile
diff -r1.27 -r1.28 pkgsrc/lang/ghc88/Makefile
diff -r1.22 -r1.23 pkgsrc/lang/ghc90/Makefile
diff -r1.9 -r1.10 pkgsrc/lang/ghc92/Makefile
cvs diff -r1.53 -r1.54 pkgsrc/lang/ghc7/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ghc7/Makefile 2022/06/28 11:34:12 1.53
+++ pkgsrc/lang/ghc7/Makefile 2022/11/22 14:35:32 1.54
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.53 2022/06/28 11:34:12 wiz Exp $ 1# $NetBSD: Makefile,v 1.54 2022/11/22 14:35:32 nia Exp $
2# ----------------------------------------------------------------------------- 2# -----------------------------------------------------------------------------
3# Package metadata 3# Package metadata
4# 4#
5DISTNAME= ghc-7.10.3-src 5DISTNAME= ghc-7.10.3-src
6PKGREVISION= 8 6PKGREVISION= 8
7PKGNAME= ${DISTNAME:S/-src$//} 7PKGNAME= ${DISTNAME:S/-src$//}
8CATEGORIES= lang 8CATEGORIES= lang
9MASTER_SITES= https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/ 9MASTER_SITES= https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/
10EXTRACT_SUFX= .tar.xz 10EXTRACT_SUFX= .tar.xz
11 11
12MAINTAINER= pho@cielonegro.org 12MAINTAINER= pho@cielonegro.org
13HOMEPAGE= https://www.haskell.org/ghc/ 13HOMEPAGE= https://www.haskell.org/ghc/
14COMMENT= Compiler for the functional language Haskell - 7.10 Release Series 14COMMENT= Compiler for the functional language Haskell - 7.10 Release Series
@@ -167,28 +167,32 @@ CTF_FILES_SKIP+= */libHS*-ghc${PKGVERSI @@ -167,28 +167,32 @@ CTF_FILES_SKIP+= */libHS*-ghc${PKGVERSI
167 167
168# ld: fatal: relocation error ... relocation requires reference symbol 168# ld: fatal: relocation error ... relocation requires reference symbol
169STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV}/libHSrts.a 169STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV}/libHSrts.a
170 170
171 171
172# ----------------------------------------------------------------------------- 172# -----------------------------------------------------------------------------
173# Dependencies 173# Dependencies
174# 174#
175BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 175BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
176BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl 176BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
177 177
178# NetBSD 9.x have libcurses with a newer major version than the 178# NetBSD 9.x have libcurses with a newer major version than the
179# bootstrap kit is linked against. For now, work around this with 179# bootstrap kit is linked against. For now, work around this with
180# compat80. 180# compat libraries.
181.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000 181#
182BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 
183# In a sandboxed build environment, we have to reach over to the 182# In a sandboxed build environment, we have to reach over to the
184# installed libraries themselves, since the symlinks compat80 adds 183# installed libraries themselves, since the symlinks compatXX adds
185# to the /usr tree can't be applied. 184# to the /usr tree can't be applied.
 185.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*) && ${OPSYS_VERSION} >= 099000
 186BUILD_DEPENDS+= compat90-[0-9]*:../../emulators/compat90
 187ALL_ENV+= LD_LIBRARY_PATH=${PREFIX:Q}/emul/netbsd/usr/lib
 188.elif ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000
 189BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80
186ALL_ENV+= LD_LIBRARY_PATH=${PREFIX:Q}/emul/netbsd/usr/lib 190ALL_ENV+= LD_LIBRARY_PATH=${PREFIX:Q}/emul/netbsd/usr/lib
187.endif 191.endif
188 192
189.include "../../converters/libiconv/buildlink3.mk" 193.include "../../converters/libiconv/buildlink3.mk"
190.include "../../devel/libffi/buildlink3.mk" 194.include "../../devel/libffi/buildlink3.mk"
191.include "../../devel/gmp/buildlink3.mk" 195.include "../../devel/gmp/buildlink3.mk"
192.include "../../mk/curses.buildlink3.mk" 196.include "../../mk/curses.buildlink3.mk"
193.include "../../mk/pthread.buildlink3.mk" 197.include "../../mk/pthread.buildlink3.mk"
194.include "../../mk/bsd.pkg.mk" 198.include "../../mk/bsd.pkg.mk"
cvs diff -r1.19 -r1.20 pkgsrc/lang/ghc80/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ghc80/Makefile 2022/10/31 23:19:47 1.19
+++ pkgsrc/lang/ghc80/Makefile 2022/11/22 14:35:32 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.19 2022/10/31 23:19:47 jperkin Exp $ 1# $NetBSD: Makefile,v 1.20 2022/11/22 14:35:32 nia Exp $
2# ----------------------------------------------------------------------------- 2# -----------------------------------------------------------------------------
3# Package metadata 3# Package metadata
4# 4#
5DISTNAME= ghc-8.0.2-src 5DISTNAME= ghc-8.0.2-src
6PKGNAME= ${DISTNAME:S/-src$//} 6PKGNAME= ${DISTNAME:S/-src$//}
7PKGREVISION= 8 7PKGREVISION= 8
8CATEGORIES= lang 8CATEGORIES= lang
9MASTER_SITES= https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/ 9MASTER_SITES= https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/
10EXTRACT_SUFX= .tar.xz 10EXTRACT_SUFX= .tar.xz
11 11
12MAINTAINER= pho@cielonegro.org 12MAINTAINER= pho@cielonegro.org
13HOMEPAGE= https://www.haskell.org/ghc/ 13HOMEPAGE= https://www.haskell.org/ghc/
14COMMENT= Compiler for the functional language Haskell - 8.0 Release Series 14COMMENT= Compiler for the functional language Haskell - 8.0 Release Series
@@ -167,28 +167,32 @@ CTF_FILES_SKIP+= */libHS*-ghc${PKGVERSI @@ -167,28 +167,32 @@ CTF_FILES_SKIP+= */libHS*-ghc${PKGVERSI
167# ld: fatal: relocation error ... relocation requires reference symbol 167# ld: fatal: relocation error ... relocation requires reference symbol
168STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV}/libHSrts.a 168STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV}/libHSrts.a
169 169
170 170
171# ----------------------------------------------------------------------------- 171# -----------------------------------------------------------------------------
172# Dependencies 172# Dependencies
173# 173#
174BUILDLINK_DEPMETHOD.python:= build 174BUILDLINK_DEPMETHOD.python:= build
175.include "../../lang/python/pyversion.mk" 175.include "../../lang/python/pyversion.mk"
176BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx 176BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
177 177
178# NetBSD 9.x have libcurses with a newer major version than the 178# NetBSD 9.x have libcurses with a newer major version than the
179# bootstrap kit is linked against. For now, work around this with 179# bootstrap kit is linked against. For now, work around this with
180# compat80. 180# compat libraries.
181.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000 181#
182BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 
183# In a sandboxed build environment, we have to reach over to the 182# In a sandboxed build environment, we have to reach over to the
184# installed libraries themselves, since the symlinks compat80 adds 183# installed libraries themselves, since the symlinks compatXX adds
185# to the /usr tree can't be applied. 184# to the /usr tree can't be applied.
 185.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*) && ${OPSYS_VERSION} >= 099000
 186BUILD_DEPENDS+= compat90-[0-9]*:../../emulators/compat90
 187ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib
 188.elif ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000
 189BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80
186ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib 190ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib
187.endif 191.endif
188 192
189.include "../../converters/libiconv/buildlink3.mk" 193.include "../../converters/libiconv/buildlink3.mk"
190.include "../../devel/libffi/buildlink3.mk" 194.include "../../devel/libffi/buildlink3.mk"
191.include "../../devel/gmp/buildlink3.mk" 195.include "../../devel/gmp/buildlink3.mk"
192.include "../../mk/curses.buildlink3.mk" 196.include "../../mk/curses.buildlink3.mk"
193.include "../../mk/pthread.buildlink3.mk" 197.include "../../mk/pthread.buildlink3.mk"
194.include "../../mk/bsd.pkg.mk" 198.include "../../mk/bsd.pkg.mk"
cvs diff -r1.14 -r1.15 pkgsrc/lang/ghc810/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ghc810/Makefile 2022/10/31 23:19:47 1.14
+++ pkgsrc/lang/ghc810/Makefile 2022/11/22 14:35:32 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.14 2022/10/31 23:19:47 jperkin Exp $ 1# $NetBSD: Makefile,v 1.15 2022/11/22 14:35:32 nia Exp $
2# ----------------------------------------------------------------------------- 2# -----------------------------------------------------------------------------
3# Package metadata 3# Package metadata
4# 4#
5DISTNAME= ghc-8.10.4-src 5DISTNAME= ghc-8.10.4-src
6PKGREVISION= 6 6PKGREVISION= 6
7PKGNAME= ${DISTNAME:S/-src$//} 7PKGNAME= ${DISTNAME:S/-src$//}
8CATEGORIES= lang 8CATEGORIES= lang
9MASTER_SITES= https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/ 9MASTER_SITES= https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/
10EXTRACT_SUFX= .tar.xz 10EXTRACT_SUFX= .tar.xz
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= https://www.haskell.org/ghc/ 13HOMEPAGE= https://www.haskell.org/ghc/
14COMMENT= Compiler for the functional language Haskell - 8.10 Release Series 14COMMENT= Compiler for the functional language Haskell - 8.10 Release Series
@@ -209,28 +209,32 @@ STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV} @@ -209,28 +209,32 @@ STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV}
209 209
210 210
211# ----------------------------------------------------------------------------- 211# -----------------------------------------------------------------------------
212# Dependencies 212# Dependencies
213# 213#
214.if ${BUILD_SPHINX_HTML} != "no" 214.if ${BUILD_SPHINX_HTML} != "no"
215BUILDLINK_DEPMETHOD.python:= build 215BUILDLINK_DEPMETHOD.python:= build
216.include "../../lang/python/pyversion.mk" 216.include "../../lang/python/pyversion.mk"
217BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx 217BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
218.endif 218.endif
219 219
220# NetBSD 9.x have libcurses with a newer major version than the 220# NetBSD 9.x have libcurses with a newer major version than the
221# bootstrap kit is linked against. For now, work around this with 221# bootstrap kit is linked against. For now, work around this with
222# compat80. 222# compat libraries.
223.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000 223#
224BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 
225# In a sandboxed build environment, we have to reach over to the 224# In a sandboxed build environment, we have to reach over to the
226# installed libraries themselves, since the symlinks compat80 adds 225# installed libraries themselves, since the symlinks compatXX adds
227# to the /usr tree can't be applied. 226# to the /usr tree can't be applied.
 227.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*) && ${OPSYS_VERSION} >= 099000
 228BUILD_DEPENDS+= compat90-[0-9]*:../../emulators/compat90
 229ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib
 230.elif ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000
 231BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80
228ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib 232ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib
229.endif 233.endif
230 234
231.include "../../converters/libiconv/buildlink3.mk" 235.include "../../converters/libiconv/buildlink3.mk"
232.include "../../devel/libffi/buildlink3.mk" 236.include "../../devel/libffi/buildlink3.mk"
233.include "../../devel/gmp/buildlink3.mk" 237.include "../../devel/gmp/buildlink3.mk"
234.include "../../mk/curses.buildlink3.mk" 238.include "../../mk/curses.buildlink3.mk"
235.include "../../mk/pthread.buildlink3.mk" 239.include "../../mk/pthread.buildlink3.mk"
236.include "../../mk/bsd.pkg.mk" 240.include "../../mk/bsd.pkg.mk"
cvs diff -r1.21 -r1.22 pkgsrc/lang/ghc84/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ghc84/Makefile 2022/10/31 23:19:47 1.21
+++ pkgsrc/lang/ghc84/Makefile 2022/11/22 14:35:32 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.21 2022/10/31 23:19:47 jperkin Exp $ 1# $NetBSD: Makefile,v 1.22 2022/11/22 14:35:32 nia Exp $
2# ----------------------------------------------------------------------------- 2# -----------------------------------------------------------------------------
3# Package metadata 3# Package metadata
4# 4#
5DISTNAME= ghc-8.4.4-src 5DISTNAME= ghc-8.4.4-src
6PKGNAME= ${DISTNAME:S/-src$//} 6PKGNAME= ${DISTNAME:S/-src$//}
7PKGREVISION= 8 7PKGREVISION= 8
8CATEGORIES= lang 8CATEGORIES= lang
9MASTER_SITES= https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/ 9MASTER_SITES= https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/
10EXTRACT_SUFX= .tar.xz 10EXTRACT_SUFX= .tar.xz
11 11
12MAINTAINER= pho@cielonegro.org 12MAINTAINER= pho@cielonegro.org
13HOMEPAGE= https://www.haskell.org/ghc/ 13HOMEPAGE= https://www.haskell.org/ghc/
14COMMENT= Compiler for the functional language Haskell - 8.4 Release Series 14COMMENT= Compiler for the functional language Haskell - 8.4 Release Series
@@ -185,28 +185,32 @@ STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV} @@ -185,28 +185,32 @@ STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV}
185 185
186 186
187# ----------------------------------------------------------------------------- 187# -----------------------------------------------------------------------------
188# Dependencies 188# Dependencies
189# 189#
190.if ${BUILD_SPHINX_HTML} != "no" 190.if ${BUILD_SPHINX_HTML} != "no"
191BUILDLINK_DEPMETHOD.python:= build 191BUILDLINK_DEPMETHOD.python:= build
192.include "../../lang/python/pyversion.mk" 192.include "../../lang/python/pyversion.mk"
193BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx 193BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
194.endif 194.endif
195 195
196# NetBSD 9.x have libcurses with a newer major version than the 196# NetBSD 9.x have libcurses with a newer major version than the
197# bootstrap kit is linked against. For now, work around this with 197# bootstrap kit is linked against. For now, work around this with
198# compat80. 198# compat libraries.
199.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000 199#
200BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 
201# In a sandboxed build environment, we have to reach over to the 200# In a sandboxed build environment, we have to reach over to the
202# installed libraries themselves, since the symlinks compat80 adds 201# installed libraries themselves, since the symlinks compatXX adds
203# to the /usr tree can't be applied. 202# to the /usr tree can't be applied.
 203.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*) && ${OPSYS_VERSION} >= 099000
 204BUILD_DEPENDS+= compat90-[0-9]*:../../emulators/compat90
 205ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib
 206.elif ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000
 207BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80
204ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib 208ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib
205.endif 209.endif
206 210
207.include "../../converters/libiconv/buildlink3.mk" 211.include "../../converters/libiconv/buildlink3.mk"
208.include "../../devel/libffi/buildlink3.mk" 212.include "../../devel/libffi/buildlink3.mk"
209.include "../../devel/gmp/buildlink3.mk" 213.include "../../devel/gmp/buildlink3.mk"
210.include "../../mk/curses.buildlink3.mk" 214.include "../../mk/curses.buildlink3.mk"
211.include "../../mk/pthread.buildlink3.mk" 215.include "../../mk/pthread.buildlink3.mk"
212.include "../../mk/bsd.pkg.mk" 216.include "../../mk/bsd.pkg.mk"
cvs diff -r1.27 -r1.28 pkgsrc/lang/ghc88/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ghc88/Makefile 2022/10/31 23:19:47 1.27
+++ pkgsrc/lang/ghc88/Makefile 2022/11/22 14:35:32 1.28
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.27 2022/10/31 23:19:47 jperkin Exp $ 1# $NetBSD: Makefile,v 1.28 2022/11/22 14:35:32 nia Exp $
2# ----------------------------------------------------------------------------- 2# -----------------------------------------------------------------------------
3# Package metadata 3# Package metadata
4# 4#
5DISTNAME= ghc-8.8.4-src 5DISTNAME= ghc-8.8.4-src
6PKGNAME= ${DISTNAME:S/-src$//} 6PKGNAME= ${DISTNAME:S/-src$//}
7PKGREVISION= 8 7PKGREVISION= 8
8CATEGORIES= lang 8CATEGORIES= lang
9MASTER_SITES= https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/ 9MASTER_SITES= https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/
10EXTRACT_SUFX= .tar.xz 10EXTRACT_SUFX= .tar.xz
11 11
12MAINTAINER= pho@cielonegro.org 12MAINTAINER= pho@cielonegro.org
13HOMEPAGE= https://www.haskell.org/ghc/ 13HOMEPAGE= https://www.haskell.org/ghc/
14COMMENT= Compiler for the functional language Haskell - 8.8 Release Series 14COMMENT= Compiler for the functional language Haskell - 8.8 Release Series
@@ -209,30 +209,34 @@ STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV} @@ -209,30 +209,34 @@ STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV}
209 209
210 210
211# ----------------------------------------------------------------------------- 211# -----------------------------------------------------------------------------
212# Dependencies 212# Dependencies
213# 213#
214.if ${BUILD_SPHINX_HTML} != "no" 214.if ${BUILD_SPHINX_HTML} != "no"
215BUILDLINK_DEPMETHOD.python:= build 215BUILDLINK_DEPMETHOD.python:= build
216.include "../../lang/python/pyversion.mk" 216.include "../../lang/python/pyversion.mk"
217BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx 217BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
218.endif 218.endif
219 219
220# NetBSD 9.x have libcurses with a newer major version than the 220# NetBSD 9.x have libcurses with a newer major version than the
221# bootstrap kit is linked against. For now, work around this with 221# bootstrap kit is linked against. For now, work around this with
222# compat80. 222# compat libraries.
223.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000 223#
224BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 
225# In a sandboxed build environment, we have to reach over to the 224# In a sandboxed build environment, we have to reach over to the
226# installed libraries themselves, since the symlinks compat80 adds 225# installed libraries themselves, since the symlinks compatXX adds
227# to the /usr tree can't be applied. 226# to the /usr tree can't be applied.
 227.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*) && ${OPSYS_VERSION} >= 099000
 228BUILD_DEPENDS+= compat90-[0-9]*:../../emulators/compat90
 229ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib
 230.elif ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000
 231BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80
228ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib 232ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib
229# XXX: ${WRKDIR}/lib is a temporary workaround for compat80 not having 233# XXX: ${WRKDIR}/lib is a temporary workaround for compat80 not having
230# libterminfo.so.1. See ./bootstrap.mk 234# libterminfo.so.1. See ./bootstrap.mk
231.endif 235.endif
232 236
233.include "../../converters/libiconv/buildlink3.mk" 237.include "../../converters/libiconv/buildlink3.mk"
234.include "../../devel/libffi/buildlink3.mk" 238.include "../../devel/libffi/buildlink3.mk"
235.include "../../devel/gmp/buildlink3.mk" 239.include "../../devel/gmp/buildlink3.mk"
236.include "../../mk/curses.buildlink3.mk" 240.include "../../mk/curses.buildlink3.mk"
237.include "../../mk/pthread.buildlink3.mk" 241.include "../../mk/pthread.buildlink3.mk"
238.include "../../mk/bsd.pkg.mk" 242.include "../../mk/bsd.pkg.mk"
cvs diff -r1.22 -r1.23 pkgsrc/lang/ghc90/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ghc90/Makefile 2022/10/31 23:19:47 1.22
+++ pkgsrc/lang/ghc90/Makefile 2022/11/22 14:35:32 1.23
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.22 2022/10/31 23:19:47 jperkin Exp $ 1# $NetBSD: Makefile,v 1.23 2022/11/22 14:35:32 nia Exp $
2# ----------------------------------------------------------------------------- 2# -----------------------------------------------------------------------------
3# Package metadata 3# Package metadata
4# 4#
5DISTNAME= ghc-9.0.2-src 5DISTNAME= ghc-9.0.2-src
6PKGREVISION= 2 6PKGREVISION= 2
7PKGNAME= ${DISTNAME:S/-src$//} 7PKGNAME= ${DISTNAME:S/-src$//}
8CATEGORIES= lang 8CATEGORIES= lang
9MASTER_SITES= https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/ 9MASTER_SITES= https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/
10EXTRACT_SUFX= .tar.xz 10EXTRACT_SUFX= .tar.xz
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= https://www.haskell.org/ghc/ 13HOMEPAGE= https://www.haskell.org/ghc/
14COMMENT= Compiler for the functional language Haskell - 9.0 Release Series 14COMMENT= Compiler for the functional language Haskell - 9.0 Release Series
@@ -224,32 +224,36 @@ STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV} @@ -224,32 +224,36 @@ STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV}
224 224
225 225
226# ----------------------------------------------------------------------------- 226# -----------------------------------------------------------------------------
227# Dependencies 227# Dependencies
228# 228#
229.if ${BUILD_SPHINX_HTML} != "no" 229.if ${BUILD_SPHINX_HTML} != "no"
230BUILDLINK_DEPMETHOD.python:= build 230BUILDLINK_DEPMETHOD.python:= build
231.include "../../lang/python/pyversion.mk" 231.include "../../lang/python/pyversion.mk"
232BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx 232BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
233.endif 233.endif
234 234
235# NetBSD 9.x have libcurses with a newer major version than the 235# NetBSD 9.x have libcurses with a newer major version than the
236# bootstrap kit is linked against. For now, work around this with 236# bootstrap kit is linked against. For now, work around this with
237# compat80. 237# compat libraries.
238.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && ${OPSYS_VERSION} >= 090000 238#
239BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 
240# In a sandboxed build environment, we have to reach over to the 239# In a sandboxed build environment, we have to reach over to the
241# installed libraries themselves, since the symlinks compat80 adds 240# installed libraries themselves, since the symlinks compatXX adds
242# to the /usr tree can't be applied. 241# to the /usr tree can't be applied.
 242.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*) && ${OPSYS_VERSION} >= 099000
 243BUILD_DEPENDS+= compat90-[0-9]*:../../emulators/compat90
 244ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib
 245.elif !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && ${OPSYS_VERSION} >= 090000
 246BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80
243ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib 247ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib
244# XXX: ${WRKDIR}/lib is a temporary workaround for compat80 not having 248# XXX: ${WRKDIR}/lib is a temporary workaround for compat80 not having
245# libterminfo.so.1. See ./bootstrap.mk 249# libterminfo.so.1. See ./bootstrap.mk
246.endif 250.endif
247 251
248# On Solaris-based platforms our bootkit tends to depend on 252# On Solaris-based platforms our bootkit tends to depend on
249# pkgsrc-installed shlibs. 253# pkgsrc-installed shlibs.
250.if ${OPSYS} == "SunOS" 254.if ${OPSYS} == "SunOS"
251ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/lib 255ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/lib
252.endif 256.endif
253 257
254.include "../../converters/libiconv/buildlink3.mk" 258.include "../../converters/libiconv/buildlink3.mk"
255.include "../../devel/libffi/buildlink3.mk" 259.include "../../devel/libffi/buildlink3.mk"
cvs diff -r1.9 -r1.10 pkgsrc/lang/ghc92/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ghc92/Makefile 2022/10/31 23:19:47 1.9
+++ pkgsrc/lang/ghc92/Makefile 2022/11/22 14:35:32 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.9 2022/10/31 23:19:47 jperkin Exp $ 1# $NetBSD: Makefile,v 1.10 2022/11/22 14:35:32 nia Exp $
2# ----------------------------------------------------------------------------- 2# -----------------------------------------------------------------------------
3# Package metadata 3# Package metadata
4# 4#
5DISTNAME= ghc-9.2.1-src 5DISTNAME= ghc-9.2.1-src
6PKGNAME= ${DISTNAME:S/-src$//} 6PKGNAME= ${DISTNAME:S/-src$//}
7PKGREVISION= 3 7PKGREVISION= 3
8CATEGORIES= lang 8CATEGORIES= lang
9MASTER_SITES= https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/ 9MASTER_SITES= https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/
10EXTRACT_SUFX= .tar.xz 10EXTRACT_SUFX= .tar.xz
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= https://www.haskell.org/ghc/ 13HOMEPAGE= https://www.haskell.org/ghc/
14COMMENT= Compiler for the functional language Haskell - 9.2 Release Series 14COMMENT= Compiler for the functional language Haskell - 9.2 Release Series
@@ -225,32 +225,36 @@ STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV} @@ -225,32 +225,36 @@ STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV}
225 225
226 226
227# ----------------------------------------------------------------------------- 227# -----------------------------------------------------------------------------
228# Dependencies 228# Dependencies
229# 229#
230.if ${BUILD_SPHINX_HTML} != "no" 230.if ${BUILD_SPHINX_HTML} != "no"
231BUILDLINK_DEPMETHOD.python:= build 231BUILDLINK_DEPMETHOD.python:= build
232.include "../../lang/python/pyversion.mk" 232.include "../../lang/python/pyversion.mk"
233BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx 233BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
234.endif 234.endif
235 235
236# NetBSD 9.x have libcurses with a newer major version than the 236# NetBSD 9.x have libcurses with a newer major version than the
237# bootstrap kit is linked against. For now, work around this with 237# bootstrap kit is linked against. For now, work around this with
238# compat80. 238# compat libraries.
239.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && ${OPSYS_VERSION} >= 090000 239#
240BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 
241# In a sandboxed build environment, we have to reach over to the 240# In a sandboxed build environment, we have to reach over to the
242# installed libraries themselves, since the symlinks compat80 adds 241# installed libraries themselves, since the symlinks compatXX adds
243# to the /usr tree can't be applied. 242# to the /usr tree can't be applied.
 243.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*) && ${OPSYS_VERSION} >= 099000
 244BUILD_DEPENDS+= compat90-[0-9]*:../../emulators/compat90
 245ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib
 246.elif !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && ${OPSYS_VERSION} >= 090000
 247BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80
244ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib 248ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib
245# XXX: ${WRKDIR}/lib is a temporary workaround for compat80 not having 249# XXX: ${WRKDIR}/lib is a temporary workaround for compat80 not having
246# libterminfo.so.1. See ./bootstrap.mk 250# libterminfo.so.1. See ./bootstrap.mk
247.endif 251.endif
248 252
249# On Solaris-based platforms our bootkit tends to depend on 253# On Solaris-based platforms our bootkit tends to depend on
250# pkgsrc-installed shlibs. 254# pkgsrc-installed shlibs.
251.if ${OPSYS} == "SunOS" 255.if ${OPSYS} == "SunOS"
252ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/lib 256ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/lib
253.endif 257.endif
254 258
255.include "../../converters/libiconv/buildlink3.mk" 259.include "../../converters/libiconv/buildlink3.mk"
256.include "../../devel/libffi/buildlink3.mk" 260.include "../../devel/libffi/buildlink3.mk"