Thu May 5 08:19:00 2022 UTC ()
ghc*: Use OPSYS_VERSION to numerically compare NetBSD versions


(nia)
diff -r1.51 -r1.52 pkgsrc/lang/ghc7/Makefile
diff -r1.15 -r1.16 pkgsrc/lang/ghc80/Makefile
diff -r1.10 -r1.11 pkgsrc/lang/ghc810/Makefile
diff -r1.17 -r1.18 pkgsrc/lang/ghc84/Makefile
diff -r1.23 -r1.24 pkgsrc/lang/ghc88/Makefile
diff -r1.19 -r1.20 pkgsrc/lang/ghc90/Makefile
diff -r1.6 -r1.7 pkgsrc/lang/ghc92/Makefile
cvs diff -r1.51 -r1.52 pkgsrc/lang/ghc7/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ghc7/Makefile 2021/12/08 16:02:15 1.51
+++ pkgsrc/lang/ghc7/Makefile 2022/05/05 08:18:59 1.52
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.51 2021/12/08 16:02:15 adam Exp $ 1# $NetBSD: Makefile,v 1.52 2022/05/05 08:18:59 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= 7 6PKGREVISION= 7
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
@@ -168,27 +168,27 @@ CTF_FILES_SKIP+= */libHS*-ghc${PKGVERSI @@ -168,27 +168,27 @@ CTF_FILES_SKIP+= */libHS*-ghc${PKGVERSI
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# compat80.
181.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*) 181.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000
182BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 182BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80
183# In a sandboxed build environment, we have to reach over to the 183# In a sandboxed build environment, we have to reach over to the
184# installed libraries themselves, since the symlinks compat80 adds 184# installed libraries themselves, since the symlinks compat80 adds
185# to the /usr tree can't be applied. 185# to the /usr tree can't be applied.
186ALL_ENV+= LD_LIBRARY_PATH=${PREFIX:Q}/emul/netbsd/usr/lib 186ALL_ENV+= LD_LIBRARY_PATH=${PREFIX:Q}/emul/netbsd/usr/lib
187.endif 187.endif
188 188
189.include "../../converters/libiconv/buildlink3.mk" 189.include "../../converters/libiconv/buildlink3.mk"
190.include "../../devel/libffi/buildlink3.mk" 190.include "../../devel/libffi/buildlink3.mk"
191.include "../../devel/gmp/buildlink3.mk" 191.include "../../devel/gmp/buildlink3.mk"
192.include "../../mk/curses.buildlink3.mk" 192.include "../../mk/curses.buildlink3.mk"
193.include "../../mk/pthread.buildlink3.mk" 193.include "../../mk/pthread.buildlink3.mk"
194.include "../../mk/bsd.pkg.mk" 194.include "../../mk/bsd.pkg.mk"
cvs diff -r1.15 -r1.16 pkgsrc/lang/ghc80/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ghc80/Makefile 2021/12/08 16:02:15 1.15
+++ pkgsrc/lang/ghc80/Makefile 2022/05/05 08:18:59 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.15 2021/12/08 16:02:15 adam Exp $ 1# $NetBSD: Makefile,v 1.16 2022/05/05 08:18:59 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= 6 7PKGREVISION= 6
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
@@ -168,27 +168,27 @@ CTF_FILES_SKIP+= */libHS*-ghc${PKGVERSI @@ -168,27 +168,27 @@ CTF_FILES_SKIP+= */libHS*-ghc${PKGVERSI
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# compat80.
181.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*) 181.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000
182BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 182BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80
183# In a sandboxed build environment, we have to reach over to the 183# In a sandboxed build environment, we have to reach over to the
184# installed libraries themselves, since the symlinks compat80 adds 184# installed libraries themselves, since the symlinks compat80 adds
185# to the /usr tree can't be applied. 185# to the /usr tree can't be applied.
186ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib 186ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib
187.endif 187.endif
188 188
189.include "../../converters/libiconv/buildlink3.mk" 189.include "../../converters/libiconv/buildlink3.mk"
190.include "../../devel/libffi/buildlink3.mk" 190.include "../../devel/libffi/buildlink3.mk"
191.include "../../devel/gmp/buildlink3.mk" 191.include "../../devel/gmp/buildlink3.mk"
192.include "../../mk/curses.buildlink3.mk" 192.include "../../mk/curses.buildlink3.mk"
193.include "../../mk/pthread.buildlink3.mk" 193.include "../../mk/pthread.buildlink3.mk"
194.include "../../mk/bsd.pkg.mk" 194.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.11 pkgsrc/lang/ghc810/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ghc810/Makefile 2022/02/14 12:12:07 1.10
+++ pkgsrc/lang/ghc810/Makefile 2022/05/05 08:18:59 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.10 2022/02/14 12:12:07 pho Exp $ 1# $NetBSD: Makefile,v 1.11 2022/05/05 08:18:59 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= 4 6PKGREVISION= 4
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
@@ -210,27 +210,27 @@ STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV} @@ -210,27 +210,27 @@ STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV}
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# compat80.
223.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*) 223.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000
224BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 224BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80
225# In a sandboxed build environment, we have to reach over to the 225# In a sandboxed build environment, we have to reach over to the
226# installed libraries themselves, since the symlinks compat80 adds 226# installed libraries themselves, since the symlinks compat80 adds
227# to the /usr tree can't be applied. 227# to the /usr tree can't be applied.
228ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib 228ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib
229.endif 229.endif
230 230
231.include "../../converters/libiconv/buildlink3.mk" 231.include "../../converters/libiconv/buildlink3.mk"
232.include "../../devel/libffi/buildlink3.mk" 232.include "../../devel/libffi/buildlink3.mk"
233.include "../../devel/gmp/buildlink3.mk" 233.include "../../devel/gmp/buildlink3.mk"
234.include "../../mk/curses.buildlink3.mk" 234.include "../../mk/curses.buildlink3.mk"
235.include "../../mk/pthread.buildlink3.mk" 235.include "../../mk/pthread.buildlink3.mk"
236.include "../../mk/bsd.pkg.mk" 236.include "../../mk/bsd.pkg.mk"
cvs diff -r1.17 -r1.18 pkgsrc/lang/ghc84/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ghc84/Makefile 2021/12/08 16:02:15 1.17
+++ pkgsrc/lang/ghc84/Makefile 2022/05/05 08:18:59 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.17 2021/12/08 16:02:15 adam Exp $ 1# $NetBSD: Makefile,v 1.18 2022/05/05 08:18:59 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= 6 7PKGREVISION= 6
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
@@ -186,27 +186,27 @@ STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV} @@ -186,27 +186,27 @@ STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV}
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# compat80.
199.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*) 199.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000
200BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 200BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80
201# In a sandboxed build environment, we have to reach over to the 201# In a sandboxed build environment, we have to reach over to the
202# installed libraries themselves, since the symlinks compat80 adds 202# installed libraries themselves, since the symlinks compat80 adds
203# to the /usr tree can't be applied. 203# to the /usr tree can't be applied.
204ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib 204ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib
205.endif 205.endif
206 206
207.include "../../converters/libiconv/buildlink3.mk" 207.include "../../converters/libiconv/buildlink3.mk"
208.include "../../devel/libffi/buildlink3.mk" 208.include "../../devel/libffi/buildlink3.mk"
209.include "../../devel/gmp/buildlink3.mk" 209.include "../../devel/gmp/buildlink3.mk"
210.include "../../mk/curses.buildlink3.mk" 210.include "../../mk/curses.buildlink3.mk"
211.include "../../mk/pthread.buildlink3.mk" 211.include "../../mk/pthread.buildlink3.mk"
212.include "../../mk/bsd.pkg.mk" 212.include "../../mk/bsd.pkg.mk"
cvs diff -r1.23 -r1.24 pkgsrc/lang/ghc88/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ghc88/Makefile 2021/12/08 16:02:15 1.23
+++ pkgsrc/lang/ghc88/Makefile 2022/05/05 08:18:59 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.23 2021/12/08 16:02:15 adam Exp $ 1# $NetBSD: Makefile,v 1.24 2022/05/05 08:18:59 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= 6 7PKGREVISION= 6
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
@@ -210,27 +210,27 @@ STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV} @@ -210,27 +210,27 @@ STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV}
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# compat80.
223.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*) 223.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000
224BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 224BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80
225# In a sandboxed build environment, we have to reach over to the 225# In a sandboxed build environment, we have to reach over to the
226# installed libraries themselves, since the symlinks compat80 adds 226# installed libraries themselves, since the symlinks compat80 adds
227# to the /usr tree can't be applied. 227# to the /usr tree can't be applied.
228ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib 228ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib
229# XXX: ${WRKDIR}/lib is a temporary workaround for compat80 not having 229# XXX: ${WRKDIR}/lib is a temporary workaround for compat80 not having
230# libterminfo.so.1. See ./bootstrap.mk 230# libterminfo.so.1. See ./bootstrap.mk
231.endif 231.endif
232 232
233.include "../../converters/libiconv/buildlink3.mk" 233.include "../../converters/libiconv/buildlink3.mk"
234.include "../../devel/libffi/buildlink3.mk" 234.include "../../devel/libffi/buildlink3.mk"
235.include "../../devel/gmp/buildlink3.mk" 235.include "../../devel/gmp/buildlink3.mk"
236.include "../../mk/curses.buildlink3.mk" 236.include "../../mk/curses.buildlink3.mk"
cvs diff -r1.19 -r1.20 pkgsrc/lang/ghc90/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ghc90/Makefile 2022/02/24 09:18:09 1.19
+++ pkgsrc/lang/ghc90/Makefile 2022/05/05 08:18:59 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.19 2022/02/24 09:18:09 pho Exp $ 1# $NetBSD: Makefile,v 1.20 2022/05/05 08:18:59 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= 1 6PKGREVISION= 1
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
@@ -225,27 +225,27 @@ STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV} @@ -225,27 +225,27 @@ STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV}
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# compat80.
238.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && empty(OS_VERSION:M[0-8].*) 238.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && ${OPSYS_VERSION} >= 090000
239BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 239BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80
240# 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
241# installed libraries themselves, since the symlinks compat80 adds 241# installed libraries themselves, since the symlinks compat80 adds
242# to the /usr tree can't be applied. 242# to the /usr tree can't be applied.
243ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib 243ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib
244# XXX: ${WRKDIR}/lib is a temporary workaround for compat80 not having 244# XXX: ${WRKDIR}/lib is a temporary workaround for compat80 not having
245# libterminfo.so.1. See ./bootstrap.mk 245# libterminfo.so.1. See ./bootstrap.mk
246.endif 246.endif
247 247
248# On Solaris-based platforms our bootkit tends to depend on 248# On Solaris-based platforms our bootkit tends to depend on
249# pkgsrc-installed shlibs. 249# pkgsrc-installed shlibs.
250.if ${OPSYS} == "SunOS" 250.if ${OPSYS} == "SunOS"
251ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/lib 251ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/lib
cvs diff -r1.6 -r1.7 pkgsrc/lang/ghc92/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ghc92/Makefile 2022/02/24 09:17:59 1.6
+++ pkgsrc/lang/ghc92/Makefile 2022/05/05 08:18:59 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.6 2022/02/24 09:17:59 pho Exp $ 1# $NetBSD: Makefile,v 1.7 2022/05/05 08:18:59 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= 2 7PKGREVISION= 2
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
@@ -226,27 +226,27 @@ STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV} @@ -226,27 +226,27 @@ STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV}
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# compat80.
239.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && empty(OS_VERSION:M[0-8].*) 239.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && ${OPSYS_VERSION} >= 090000
240BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 240BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80
241# In a sandboxed build environment, we have to reach over to the 241# In a sandboxed build environment, we have to reach over to the
242# installed libraries themselves, since the symlinks compat80 adds 242# installed libraries themselves, since the symlinks compat80 adds
243# to the /usr tree can't be applied. 243# to the /usr tree can't be applied.
244ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib 244ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib
245# XXX: ${WRKDIR}/lib is a temporary workaround for compat80 not having 245# XXX: ${WRKDIR}/lib is a temporary workaround for compat80 not having
246# libterminfo.so.1. See ./bootstrap.mk 246# libterminfo.so.1. See ./bootstrap.mk
247.endif 247.endif
248 248
249# On Solaris-based platforms our bootkit tends to depend on 249# On Solaris-based platforms our bootkit tends to depend on
250# pkgsrc-installed shlibs. 250# pkgsrc-installed shlibs.
251.if ${OPSYS} == "SunOS" 251.if ${OPSYS} == "SunOS"
252ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/lib 252ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/lib