dev-lang/nim/nim-0.19.2_20190103.recipe → dev-lang/nim/nim-0.19.4.recipe

@@ -13,18 +13,9 @@ COPYRIGHT="2006-2018 Andreas Rumpf
 	2017-2018 Nim contributors"
 LICENSE="MIT"
 REVISION="1"
-# TODO: switch to the official source at nim-lang.org for the next version
-csourceVersion="0.19.0"
-srcGitRev="1134f85faa55531a0eb5a3aff8f766299c1add52"
-SOURCE_URI="https://github.com/nim-lang/Nim/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="445ae79a8e1948c1782eac0d8ad43052f5b74bab5997e54e332dea32cb8c9de0"
-SOURCE_FILENAME="nim-$portVersion.tar.gz"
-SOURCE_DIR="Nim-$srcGitRev"
+SOURCE_URI="https://nim-lang.org/download/nim-$portVersion.tar.xz"
+CHECKSUM_SHA256="f441135ee311099be81a46dba5bab3323579cd18aabc6e079b9697a71d6ca94c"
 PATCHES="nim-$portVersion.patchset"
-SOURCE_URI_2="https://github.com/nim-lang/csources/archive/v$csourceVersion.tar.gz"
-CHECKSUM_SHA256_2="68042afae0b24915acac813b52b9ee0a303219e990d3bfa05ca57fb6bbc51578"
-SOURCE_FILENAME_2="nim-csources-$csourceVersion.tar.gz"
-SOURCE_DIR_2="csources-$csourceVersion"
 ADDITIONAL_FILES="
 	config.nims
 	nim.rdef.in
@@ -73,6 +64,7 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	"
 
 TEST_REQUIRES="
@@ -82,13 +74,9 @@ TEST_REQUIRES="
 
 BUILD()
 {
-	# Bootstrap
-	pushd "$sourceDir2"
-	./build.sh
-	cp bin/nim "$sourceDir/bin/nim"
-	popd
+	make $jobArgs CC=gcc LD=gcc
 
-	# Build
+	export XDG_CACHE_HOME="$sourceDir/cache"
 	bin/nim c -d:release koch
 	./koch boot -d:release
 
@@ -114,13 +102,22 @@ INSTALL()
 
 	mv -T "$libDir/nim/doc" "$docDir"
 
-	complierPkgDir="$dataDir/nimble/pkgs/compiler-#$srcGitRev"
+	complierPkgDir="$dataDir/nimble/pkgs/compiler-$portVersion"
 	install -d -m 755 "$complierPkgDir"
 	mv -t "$complierPkgDir" "$libDir/nim"/compiler{,.nimble}
 	# Apparantly you need some files in docDir for the compiler sources to work
 	ln -s "$docDir" "$complierPkgDir/doc"
 
 	install -t "$settingsDir/nim" -m 644 "$portDir/additional-files/config.nims"
+	# Completions
+	install -d -m 755 "$dataDir/bash-completion/completions" \
+		"$dataDir/zsh/site-functions"
+	install -m 644 tools/nim.bash-completion \
+		"$dataDir/bash-completion/completions/nim"
+	install -m 644 tools/nim.zsh-completion \
+		"$dataDir/zsh/site-functions/_nim"
+
+	rm -rf "$docDir/html"
 	install -t "$developDocDir" -m 644 doc/html/*.html doc/html/*.js
 
 	# Add Haiku resources
@@ -135,7 +132,7 @@ INSTALL()
 
 	addResourcesToBinaries nim.rdef "$libDir/nim/bin/nim"
 
-	packageEntries _doc "$developDir"
+	packageEntries doc "$developDir"
 }
 
 TEST()