CVS commit: pkgsrc/lang/nim

["Nikita" <nikita%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nikita
Date:           Tue Apr 25 15:34:38 UTC 2023

Modified Files:
        pkgsrc/lang/nim: Makefile buildlink3.mk

Log Message:
nim: fix hardcoded /usr/pkg prefix in config/nim.cfg
fix some pkglint warnings in bl3


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/lang/nim/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/nim/buildlink3.mk

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

Modified files:

Index: pkgsrc/lang/nim/Makefile
diff -u pkgsrc/lang/nim/Makefile:1.31 pkgsrc/lang/nim/Makefile:1.32
--- pkgsrc/lang/nim/Makefile:1.31       Wed Apr 19 22:35:27 2023
+++ pkgsrc/lang/nim/Makefile    Tue Apr 25 15:34:38 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2023/04/19 22:35:27 nikita Exp $
+# $NetBSD: Makefile,v 1.32 2023/04/25 15:34:38 nikita Exp $
 
 DISTNAME=      nim-1.6.12
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  http://nim-lang.org/download/
 EXTRACT_SUFX=  .tar.xz
@@ -20,6 +21,11 @@ INSTALLATION_DIRS=   bin
 post-patch:
        cd ${WRKSRC}/bin && ${LN} -sf nim-gdb nim-gdb.bash
 
+SUBST_CLASSES+=                paths
+SUBST_STAGE.paths=     pre-configure
+SUBST_FILES.paths=     config/nim.cfg
+SUBST_SED.paths=       -e 's,/usr/pkg,${PREFIX},g'
+
 # nim doesn't honor the environment variable LDFLAGS. In order to
 # support PKGSRC_USE_RELRO, we need to translate the flags to compiler
 # options.

Index: pkgsrc/lang/nim/buildlink3.mk
diff -u pkgsrc/lang/nim/buildlink3.mk:1.3 pkgsrc/lang/nim/buildlink3.mk:1.4
--- pkgsrc/lang/nim/buildlink3.mk:1.3   Sun Aug  9 22:11:29 2020
+++ pkgsrc/lang/nim/buildlink3.mk       Tue Apr 25 15:34:38 2023
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2020/08/09 22:11:29 nikita Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2023/04/25 15:34:38 nikita Exp $
 
 BUILDLINK_TREE+=       nim
 
 .if !defined(NIM_BUILDLINK3_MK)
 NIM_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.nim=     nim>=1.2.6
-BUILDLINK_ABI_DEPENDS.nim?=    nim>=1.2.6
+BUILDLINK_API_DEPENDS.nim+=    nim>=1.2.6
+BUILDLINK_ABI_DEPENDS.nim+=    nim>=1.2.6
 BUILDLINK_PKGSRCDIR.nim?=      ../../lang/nim
 
 .endif # NIM_BUILDLINK3_MK