pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

nim: use official guideline for packaging



Module Name:	pkgsrc-wip
Committed By:	arcathrax <ivan%ivanpollak.com@localhost>
Pushed By:	arcathrax
Date:		Sun Nov 1 23:45:49 2026 +0100
Changeset:	bb5bb1f553b70add1b9a03a7c3ef7adc4fff92cc

Modified Files:
	nim/Makefile
	nim/PLIST
	nim/distinfo

Log Message:
nim: use official guideline for packaging

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bb5bb1f553b70add1b9a03a7c3ef7adc4fff92cc

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

diffstat:
 nim/Makefile |  58 ++++++++++++-----------
 nim/PLIST    | 150 -----------------------------------------------------------
 nim/distinfo |   6 +++
 3 files changed, 37 insertions(+), 177 deletions(-)

diffs:
diff --git a/nim/Makefile b/nim/Makefile
index e623553d0c..27502534ec 100644
--- a/nim/Makefile
+++ b/nim/Makefile
@@ -12,26 +12,26 @@ LICENSE=	mit
 
 # Taken from:
 # https://github.com/nim-lang/Nim/blob/14991af742d0833503741fd9a0918133d1bcf8a4/koch.nim
-# ATLAS_TAG=			aa6fb162006f3015aa84c4305e15cb4d230f5ad6
-# SAT_TAG=				9d52513b3c68bfb929dbd687d4fb2836cfee6936
+ATLAS_TAG=			aa6fb162006f3015aa84c4305e15cb4d230f5ad6
+SAT_TAG=				9d52513b3c68bfb929dbd687d4fb2836cfee6936
 
-# GH_SFX=		.tar.gz
+GH_SFX=		.tar.gz
 
-# ATLAS_DISTNAME=		atlas-${ATLAS_TAG}
-# SAT_DISTNAME=			sat-${SAT_TAG}
+ATLAS_DISTNAME=		atlas-${ATLAS_TAG}
+SAT_DISTNAME=			sat-${SAT_TAG}
 
-# ATLAS_DISTFILE=		${ATLAS_DISTNAME}${GH_SFX}
-# SAT_DISTFILE=			${SAT_DISTNAME}${GH_SFX}
+ATLAS_DISTFILE=		${ATLAS_DISTNAME}${GH_SFX}
+SAT_DISTFILE=			${SAT_DISTNAME}${GH_SFX}
 
-# DISTFILES=		${DEFAULT_DISTFILES}
-# DISTFILES+=		${ATLAS_DISTFILE}
-# DISTFILES+=		${SAT_DISTFILE}
+DISTFILES=		${DEFAULT_DISTFILES}
+DISTFILES+=		${ATLAS_DISTFILE}
+DISTFILES+=		${SAT_DISTFILE}
 
-# SITES.${ATLAS_DISTFILE}=	-${MASTER_SITE_GITHUB:=nim-lang/atlas/archive/}${ATLAS_TAG}${GH_SFX}
-# SITES.${SAT_DISTFILE}=		-${MASTER_SITE_GITHUB:=nim-lang/sat/archive/}${SAT_TAG}${GH_SFX}
+SITES.${ATLAS_DISTFILE}=	-${MASTER_SITE_GITHUB:=nim-lang/atlas/archive/}${ATLAS_TAG}${GH_SFX}
+SITES.${SAT_DISTFILE}=		-${MASTER_SITE_GITHUB:=nim-lang/sat/archive/}${SAT_TAG}${GH_SFX}
 
-# EXTRACT_DIR.${ATLAS_DISTFILE}=		${WRKSRC}
-# EXTRACT_DIR.${SAT_DISTFILE}=			${WRKSRC}
+EXTRACT_DIR.${ATLAS_DISTFILE}=		${WRKSRC}
+EXTRACT_DIR.${SAT_DISTFILE}=			${WRKSRC}
 
 DEPENDS+=	coreutils-[0-9]*:../../sysutils/coreutils
 
@@ -39,6 +39,7 @@ USE_TOOLS+=	bash gmake
 REPLACE_BASH+=	bin/nim-gdb
 
 USE_LANGUAGES= c
+# ALLOW_NETWORK_ACCESS= yes
 
 # INSTALLATION_DIRS=	bin
 # INSTALLATION_DIRS+=	lib/nim/tools/debug
@@ -59,31 +60,32 @@ USE_LANGUAGES= c
 # NIM_FLAGS=	${LDFLAGS:S/^/--passL:/}
 # NIM_FLAGS+=	${CFLAGS:S/^/--passC:/}
 
-# post-extract:
+post-extract:
 	# TODO: csources for cross-building?
 	# ${MV} ${WRKSRC}/csources_v2-${C2VERSION_TAG} ${WRKSRC}/csources_v2
-	# ${MKDIR} ${WRKSRC}/dist
+	${MKDIR} ${WRKSRC}/dist
 	# ${MV} nimble-$_nimbleversion $build_wrksrc/dist/nimble
 	#mv checksums-$_checksumsversion $build_wrksrc/dist/checksums
 	#mkdir -p $build_wrksrc/dist/nimble/dist
 	#cp -r $build_wrksrc/dist/checksums $build_wrksrc/dist/nimble/dist/checksums
-	# ${MV} ${WRKSRC}/atlas-${ATLAS_TAG} ${WRKSRC}/dist/atlas
+	${MV} ${WRKSRC}/atlas-${ATLAS_TAG} ${WRKSRC}/dist/atlas
 
-	# ${MKDIR} ${WRKSRC}/dist/atlas/dist
-	# ${MV} ${WRKSRC}/sat-${SAT_TAG} ${WRKSRC}/dist/atlas/dist/sat
+	${MKDIR} ${WRKSRC}/dist/atlas/dist
+	${MV} ${WRKSRC}/sat-${SAT_TAG} ${WRKSRC}/dist/atlas/dist/sat
 
 do-build:
-	cd ${WRKSRC} && ${GMAKE} -j${_MAKE_JOBS_N}
+	cd ${WRKSRC} && ${GMAKE}
 
 	# build koch
-	cd ${WRKSRC} && ./bin/nim c \
+	cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ./bin/nim c \
 		-d:release \
+		--parallelBuild:${_MAKE_JOBS_N} \
 		koch
 
-	cd ${WRKSRC} && ./koch \
+	cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ./koch \
 		boot \
-		-d:release \
-		--parallelBuild:${_MAKE_JOBS_N}
+		--parallelBuild:${_MAKE_JOBS_N} \
+		-d:release
 
 	# Build docs
 	# cd ${WRKSRC} && ./koch \
@@ -91,15 +93,17 @@ do-build:
 		# --parallelBuild:${_MAKE_JOBS_N}
 
 	# Build tools
-	cd ${WRKSRC} && ./koch \
+	cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ./koch \
 		tools \
 		--parallelBuild:${_MAKE_JOBS_N}
 
 
 do-install:
-	cd ${WRKSRC} && sh ./install.sh ${DESTDIR}${PREFIX}
+	cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ./install.sh \
+		${DESTDIR}${PREFIX}
 
-.for fn in nimble nimsuggest nimgrep
+	${MKDIR} ${DESTDIR}${PREFIX}/bin
+.for fn in nim nimble nimsuggest nimgrep
 	${LN} -sf ${DESTDIR}${PREFIX}/nim/bin/${fn} ${DESTDIR}${PREFIX}/bin/${fn}
 .endfor
 
diff --git a/nim/PLIST b/nim/PLIST
index 56279c5773..2236485c16 100644
--- a/nim/PLIST
+++ b/nim/PLIST
@@ -2,139 +2,8 @@
 bin/nim
 bin/nimble
 bin/nimgrep
-bin/niminst
-bin/nimpretty
 bin/nimsuggest
-bin/testament
-lib/nim/nimpretty/nimpretty.nim
-lib/nim/nimpretty/nimpretty.nim.cfg
-lib/nim/nimpretty/tester.nim
-lib/nim/nimpretty/tests/exhaustive.nim
-lib/nim/nimpretty/tests/expected/exhaustive.nim
-lib/nim/nimpretty/tests/expected/simple.nim
-lib/nim/nimpretty/tests/expected/simple2.nim
-lib/nim/nimpretty/tests/expected/simple3.nim
-lib/nim/nimpretty/tests/expected/simple4.nim
-lib/nim/nimpretty/tests/expected/tevil_spaces.nim
-lib/nim/nimpretty/tests/expected/wrong_ind.nim
-lib/nim/nimpretty/tests/simple.nim
-lib/nim/nimpretty/tests/simple2.nim
-lib/nim/nimpretty/tests/simple3.nim
-lib/nim/nimpretty/tests/simple4.nim
-lib/nim/nimpretty/tests/tevil_spaces.nim
-lib/nim/nimpretty/tests/wrong_ind.nim
-lib/nim/nimsuggest/config.nims
-lib/nim/nimsuggest/crashtester.nim
-lib/nim/nimsuggest/nimsuggest.nim
-lib/nim/nimsuggest/nimsuggest.nim.cfg
-lib/nim/nimsuggest/nimsuggest.nimble
-lib/nim/nimsuggest/procmonitor.nim
-lib/nim/nimsuggest/sexp.nim
-lib/nim/nimsuggest/tester.nim
-lib/nim/nimsuggest/tests/fixtures/mclass_macro.nim
-lib/nim/nimsuggest/tests/fixtures/mdep_v1.nim
-lib/nim/nimsuggest/tests/fixtures/mdep_v2.nim
-lib/nim/nimsuggest/tests/fixtures/mfakeassert.nim
-lib/nim/nimsuggest/tests/fixtures/minclude_import.nim
-lib/nim/nimsuggest/tests/fixtures/minclude_include.nim
-lib/nim/nimsuggest/tests/fixtures/minclude_types.nim
-lib/nim/nimsuggest/tests/fixtures/mstrutils.nim
-lib/nim/nimsuggest/tests/fixtures/munknown_file.nim
-lib/nim/nimsuggest/tests/module_20265.nim
-lib/nim/nimsuggest/tests/module_26307.nim
-lib/nim/nimsuggest/tests/t20265_1.nim
-lib/nim/nimsuggest/tests/t20265_2.nim
-lib/nim/nimsuggest/tests/t20440.nim
-lib/nim/nimsuggest/tests/t20440.nims
-lib/nim/nimsuggest/tests/t21185.nim
-lib/nim/nimsuggest/tests/t21923.nim
-lib/nim/nimsuggest/tests/t22448.nim
-lib/nim/nimsuggest/tests/t26307.nim
-lib/nim/nimsuggest/tests/taccent_highlight.nim
-lib/nim/nimsuggest/tests/tarrowcrash.nim
-lib/nim/nimsuggest/tests/tcallstrlit_highlight.nim
-lib/nim/nimsuggest/tests/tcase.nim
-lib/nim/nimsuggest/tests/tchk1.nim
-lib/nim/nimsuggest/tests/tchk2.nim
-lib/nim/nimsuggest/tests/tchk_compiles.nim
-lib/nim/nimsuggest/tests/tcon1.nim
-lib/nim/nimsuggest/tests/tcon_variable.nim
-lib/nim/nimsuggest/tests/tconcept1.nim
-lib/nim/nimsuggest/tests/tconcept2.nim
-lib/nim/nimsuggest/tests/tconfigerror.nim
-lib/nim/nimsuggest/tests/tconfigerror.nims
-lib/nim/nimsuggest/tests/tcursor_at_end.nim
-lib/nim/nimsuggest/tests/tdef1.nim
-lib/nim/nimsuggest/tests/tdef2.nim
-lib/nim/nimsuggest/tests/tdef_forward.nim
-lib/nim/nimsuggest/tests/tdef_let.nim
-lib/nim/nimsuggest/tests/tdot1.nim
-lib/nim/nimsuggest/tests/tdot2.nim
-lib/nim/nimsuggest/tests/tdot3.nim
-lib/nim/nimsuggest/tests/tdot4.nim
-lib/nim/nimsuggest/tests/tenum_field.nim
-lib/nim/nimsuggest/tests/tfatal1.nim
-lib/nim/nimsuggest/tests/tgeneric_highlight.nim
-lib/nim/nimsuggest/tests/tgenerics.nim
-lib/nim/nimsuggest/tests/tic.nim
-lib/nim/nimsuggest/tests/timport1.nim
-lib/nim/nimsuggest/tests/timport2.nim
-lib/nim/nimsuggest/tests/timport3.nim
-lib/nim/nimsuggest/tests/timport_highlight.nim
-lib/nim/nimsuggest/tests/tinclude.nim
-lib/nim/nimsuggest/tests/tmacro_highlight.nim
-lib/nim/nimsuggest/tests/tmaxmemory.nim
-lib/nim/nimsuggest/tests/tnimscript_project.nims
-lib/nim/nimsuggest/tests/tno_deref.nim
-lib/nim/nimsuggest/tests/tobj_highlight.nim
-lib/nim/nimsuggest/tests/top_highlight.nim
-lib/nim/nimsuggest/tests/tqualified_highlight.nim
-lib/nim/nimsuggest/tests/tsetter_highlight.nim
-lib/nim/nimsuggest/tests/tsi_highlight.nim
-lib/nim/nimsuggest/tests/tsug_accquote.nim
-lib/nim/nimsuggest/tests/tsug_enum.nim
-lib/nim/nimsuggest/tests/tsug_pragmas.nim
-lib/nim/nimsuggest/tests/tsug_recursive.nim
-lib/nim/nimsuggest/tests/tsug_regression.nim
-lib/nim/nimsuggest/tests/tsug_template.nim
-lib/nim/nimsuggest/tests/tsug_typedecl.nim
-lib/nim/nimsuggest/tests/ttempl_inst.nim
-lib/nim/nimsuggest/tests/ttemplate_highlight.nim
-lib/nim/nimsuggest/tests/ttype_decl.nim
-lib/nim/nimsuggest/tests/ttype_highlight.nim
-lib/nim/nimsuggest/tests/tunknown_file.nim
-lib/nim/nimsuggest/tests/tunknown_file_recompile.nim
-lib/nim/nimsuggest/tests/tuse.nim
-lib/nim/nimsuggest/tests/tuse_enum.nim
-lib/nim/nimsuggest/tests/tuse_structure.nim
-lib/nim/nimsuggest/tests/tv3.nim
-lib/nim/nimsuggest/tests/tv3_con.nim
-lib/nim/nimsuggest/tests/tv3_definition.nim
-lib/nim/nimsuggest/tests/tv3_forward_definition.nim
-lib/nim/nimsuggest/tests/tv3_generic_multiple_defs.nim
-lib/nim/nimsuggest/tests/tv3_generic_uninstantiated_defs.nim
-lib/nim/nimsuggest/tests/tv3_generics.nim
-lib/nim/nimsuggest/tests/tv3_globalSymbols.nim
-lib/nim/nimsuggest/tests/tv3_import.nim
-lib/nim/nimsuggest/tests/tv3_outline.nim
-lib/nim/nimsuggest/tests/tv3_outline2.nim
-lib/nim/nimsuggest/tests/tv3_typeDefinition.nim
-lib/nim/nimsuggest/tests/twithin_macro.nim
-lib/nim/nimsuggest/tests/twithin_macro_prefix.nim
-nim/bin/.nifler.nimony-commit
-nim/bin/.nifmake.nimony-commit
-nim/bin/atlas
-nim/bin/nifler
-nim/bin/nifmake
 nim/bin/nim
-nim/bin/nim-gdb
-nim/bin/nim_dbg
-nim/bin/nimble
-nim/bin/nimgrep
-nim/bin/niminst
-nim/bin/nimpretty
-nim/bin/nimsuggest
-nim/bin/testament
 nim/compiler/aliasanalysis.nim
 nim/compiler/aliases.nim
 nim/compiler/ast.nim
@@ -678,23 +547,4 @@ nim/lib/wrappers/openssl.nim
 nim/lib/wrappers/pcre.nim
 nim/lib/wrappers/tinyc.nim
 nim/nim.nimble
-share/nim/nimpretty
-share/nim/nimsuggest
-share/nimble/pkgs/${PKGNAME}/dist/checksums/README.md
-share/nimble/pkgs/${PKGNAME}/dist/checksums/checksums.nimble
-share/nimble/pkgs/${PKGNAME}/dist/checksums/src/checksums/bcrypt.nim
-share/nimble/pkgs/${PKGNAME}/dist/checksums/src/checksums/docutils.nim
-share/nimble/pkgs/${PKGNAME}/dist/checksums/src/checksums/md5.nim
-share/nimble/pkgs/${PKGNAME}/dist/checksums/src/checksums/private/sha_utils.nim
-share/nimble/pkgs/${PKGNAME}/dist/checksums/src/checksums/sha1.nim
-share/nimble/pkgs/${PKGNAME}/dist/checksums/src/checksums/sha2.nim
-share/nimble/pkgs/${PKGNAME}/dist/checksums/src/checksums/sha3.nim
-share/nimble/pkgs/${PKGNAME}/dist/checksums/tests/config.nims
-share/nimble/pkgs/${PKGNAME}/dist/checksums/tests/crypto/tbcrypt.nim
-share/nimble/pkgs/${PKGNAME}/dist/checksums/tests/crypto/tmd5.nim
-share/nimble/pkgs/${PKGNAME}/dist/checksums/tests/crypto/tsha1.nim
-share/nimble/pkgs/${PKGNAME}/dist/checksums/tests/crypto/tsha2.nim
-share/nimble/pkgs/${PKGNAME}/dist/checksums/tests/crypto/tsha3.nim
 @pkgdir nim/data
-@pkgdir lib/nim/tools/debug
-@pkgdir include
diff --git a/nim/distinfo b/nim/distinfo
index 023bcb145c..62386e3f01 100644
--- a/nim/distinfo
+++ b/nim/distinfo
@@ -1,5 +1,11 @@
 $NetBSD$
 
+BLAKE2s (atlas-aa6fb162006f3015aa84c4305e15cb4d230f5ad6.tar.gz) = ea416dc909621edec9b06fa0cc510e3248b9638331055d5b9faaa1dce0f0f0d9
+SHA512 (atlas-aa6fb162006f3015aa84c4305e15cb4d230f5ad6.tar.gz) = 66c37492872dc47105f9c40d3f0c7be105b69e089293996eb9b0ccf441248dce351be2fa8bfbc9ecd7914fd2a6d66f64d83f3280f32561a03a6b4f4d581e7b0b
+Size (atlas-aa6fb162006f3015aa84c4305e15cb4d230f5ad6.tar.gz) = 160714 bytes
 BLAKE2s (nim-2.4.0.tar.xz) = 79eda24bceb44181b3ccc1828cb38720b3e50c0b16735a2acb1cda6be123aba2
 SHA512 (nim-2.4.0.tar.xz) = 75aaab6903dd2bb7766be722e2a765ffccd035f754e6f08af5049b9ba3cffa2c64a96ad0ff71602daffe4f6ccbec3aa7010f06ba8bd807c44897c9613a2bb550
 Size (nim-2.4.0.tar.xz) = 16957544 bytes
+BLAKE2s (sat-9d52513b3c68bfb929dbd687d4fb2836cfee6936.tar.gz) = e61713da1b17aea1a345df71dc22cd8ec2058623546668a7b9af6db501d1a224
+SHA512 (sat-9d52513b3c68bfb929dbd687d4fb2836cfee6936.tar.gz) = 6dff5f65bb7aaa7c59b7c832e760b35ba6f9aebbc53ef6e4d87ef3dde6308458cd6c27988c309f60f8eca9019e135fb34981704310cb55b5dd5c84de1641b20d
+Size (sat-9d52513b3c68bfb929dbd687d4fb2836cfee6936.tar.gz) = 10247 bytes


Home | Main Index | Thread Index | Old Index