Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 6 Nov 2020 06:56:38 +0000 (UTC)
From:      Li-Wen Hsu <lwhsu@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r554169 - head/lang/nim
Message-ID:  <202011060656.0A66ucdI024279@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: lwhsu
Date: Fri Nov  6 06:56:38 2020
New Revision: 554169
URL: https://svnweb.freebsd.org/changeset/ports/554169

Log:
  lang/nim: Update 1.4 for unexpected change in distfile and include nimble
  
  For some reason the distribution file of nim 1.4 has changed on the nim web
  site without a change in version.
  
  Two things have been added to the distribution and are no longer distributed
  from their own github repository:
  - fusion
  - nimble
  
  PR:		250881
  Submitted by:	Neal Nelson <ports@nicandneal.net> (maintainer)

Modified:
  head/lang/nim/Makefile
  head/lang/nim/distinfo
  head/lang/nim/pkg-plist

Modified: head/lang/nim/Makefile
==============================================================================
--- head/lang/nim/Makefile	Fri Nov  6 05:48:53 2020	(r554168)
+++ head/lang/nim/Makefile	Fri Nov  6 06:56:38 2020	(r554169)
@@ -3,6 +3,7 @@
 
 PORTNAME=	nim
 PORTVERSION=	1.4.0
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	https://nim-lang.org/download/
 
@@ -15,14 +16,15 @@ LICENSE_FILE=	${WRKSRC}/copying.txt
 BROKEN_sparc64=		fails to build: build.sh: clang: not found
 
 LIB_DEPENDS=	libpcre.so:devel/pcre
-
 TEST_DEPENDS=	node>=0:www/node
 
 USES=		compiler:c11 tar:xz
 USE_LDCONFIG=	yes
 
-TOOLS_DESC=	Build and install nim tools
+CONFLICTS_INSTALL=	nimble
 
+TOOLS_DESC=	Build and install nim tools, including nimble
+
 OPTIONS_DEFINE=	DOCS TOOLS
 OPTIONS_DEFAULT=	DOCS TOOLS
 
@@ -34,7 +36,7 @@ MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.pre.mk>
 
-TLIST=	nimfind nimgrep nimpretty nimsuggest testament
+TLIST=	nimble nimfind nimgrep nimpretty nimsuggest testament
 
 .if ${CHOSEN_COMPILER_TYPE} == "gcc"
 EXTRA_PATCHES=	${PATCHDIR}/elfv1-patch-build.sh
@@ -66,9 +68,8 @@ do-build-DOCS-on:
 		-d:release --nimcache=${WRKDIR}/nimcache --docCmd=skip
 
 do-build-TOOLS-on:
-	cd ${WRKSRC} && ./koch toolsNoNimble --parallelBuild=${MAKE_JOBS_NUMBER} \
+	cd ${WRKSRC} && ./koch tools --parallelBuild=${MAKE_JOBS_NUMBER} \
 		-d:release --nimcache=${WRKSRC}/nimcache
-
 
 do-install:
 	# Revert hack to build docs

Modified: head/lang/nim/distinfo
==============================================================================
--- head/lang/nim/distinfo	Fri Nov  6 05:48:53 2020	(r554168)
+++ head/lang/nim/distinfo	Fri Nov  6 06:56:38 2020	(r554169)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1603099030
-SHA256 (nim-1.4.0.tar.xz) = be3120ab6b737f6ce0dd63fabf9e7c2c7625992b1145e5ebccf0573f3b09905d
-SIZE (nim-1.4.0.tar.xz) = 4626604
+TIMESTAMP = 1604564068
+SHA256 (nim-1.4.0.tar.xz) = 9dfba2bed31a21a5a34231016dd556b1b5e0db23c01357cfab26aa8f27a6c23d
+SIZE (nim-1.4.0.tar.xz) = 4706936

Modified: head/lang/nim/pkg-plist
==============================================================================
--- head/lang/nim/pkg-plist	Fri Nov  6 05:48:53 2020	(r554168)
+++ head/lang/nim/pkg-plist	Fri Nov  6 06:56:38 2020	(r554169)
@@ -1,4 +1,5 @@
 bin/nim
+%%TOOLS%%bin/nimble
 %%TOOLS%%bin/nimfind
 %%TOOLS%%bin/nimgrep
 %%TOOLS%%bin/nimpretty
@@ -176,6 +177,13 @@ lib/nim/deprecated/pure/parseopt2.nim
 lib/nim/deprecated/pure/securehash.nim
 lib/nim/deprecated/pure/sharedstrings.nim
 lib/nim/experimental/diff.nim
+lib/nim/fusion/btreetables.nim
+lib/nim/fusion/compat.nim
+lib/nim/fusion/filepermissions.nim
+lib/nim/fusion/htmlparser.nim
+lib/nim/fusion/htmlparser/parsexml.nim
+lib/nim/fusion/htmlparser/xmltree.nim
+lib/nim/fusion/pools.nim
 lib/nim/genode/alloc.nim
 lib/nim/genode/env.nim
 lib/nim/genode_cpp/syslocks.h
@@ -497,11 +505,13 @@ lib/nim/wrappers/tinyc.nim
 %%PORTDOCS%%%%DOCSDIR%%/html/base64.html
 %%PORTDOCS%%%%DOCSDIR%%/html/bitops.html
 %%PORTDOCS%%%%DOCSDIR%%/html/browsers.html
+%%PORTDOCS%%%%DOCSDIR%%/html/btreetables.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cgi.html
 %%PORTDOCS%%%%DOCSDIR%%/html/chains.html
 %%PORTDOCS%%%%DOCSDIR%%/html/channels.html
 %%PORTDOCS%%%%DOCSDIR%%/html/codeowners.html
 %%PORTDOCS%%%%DOCSDIR%%/html/colors.html
+%%PORTDOCS%%%%DOCSDIR%%/html/compat.html
 %%PORTDOCS%%%%DOCSDIR%%/html/compiler/aliases.html
 %%PORTDOCS%%%%DOCSDIR%%/html/compiler/asciitables.html
 %%PORTDOCS%%%%DOCSDIR%%/html/compiler/ast.html
@@ -655,6 +665,7 @@ lib/nim/wrappers/tinyc.nim
 %%PORTDOCS%%%%DOCSDIR%%/html/estp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/exitprocs.html
 %%PORTDOCS%%%%DOCSDIR%%/html/fenv.html
+%%PORTDOCS%%%%DOCSDIR%%/html/filepermissions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/filters.html
 %%PORTDOCS%%%%DOCSDIR%%/html/gc.html
 %%PORTDOCS%%%%DOCSDIR%%/html/globs.html
@@ -740,6 +751,7 @@ lib/nim/wrappers/tinyc.nim
 %%PORTDOCS%%%%DOCSDIR%%/html/pathnorm.html
 %%PORTDOCS%%%%DOCSDIR%%/html/pcre.html
 %%PORTDOCS%%%%DOCSDIR%%/html/pegs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/pools.html
 %%PORTDOCS%%%%DOCSDIR%%/html/posix.html
 %%PORTDOCS%%%%DOCSDIR%%/html/posix_utils.html
 %%PORTDOCS%%%%DOCSDIR%%/html/postgres.html



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011060656.0A66ucdI024279>