Index: head/lang/nim/Makefile =================================================================== --- head/lang/nim/Makefile (revision 441279) +++ head/lang/nim/Makefile (revision 441280) @@ -1,43 +1,57 @@ # Created by: Neal Nelson # $FreeBSD$ PORTNAME= nim -PORTVERSION= 0.16.0 +PORTVERSION= 0.17.0 CATEGORIES= lang MASTER_SITES= http://nim-lang.org/download/ MAINTAINER= ports@nicandneal.net COMMENT= Nim programming language LICENSE= MIT BROKEN_aarch64= Does not compile: crt1.c: undefined reference to main BROKEN_mips64= Does not build: build.sh: clang: not found BROKEN_powerpc64= Does not build: build.sh: clang: not found BROKEN_sparc64= Does not build: build.sh: clang: not found -OPTIONS_DEFINE= DOCS +TOOLS_DESC= Build and install nimgrep and nimsuggest +OPTIONS_DEFINE= DOCS TOOLS +OPTIONS_SUB= yes + MAKE_JOBS_UNSAFE= yes USES= compiler tar:xz .include +TLIST= nimgrep nimsuggest + post-patch: .if ${COMPILER_TYPE} == clang @${REINPLACE_CMD} -e '/cc =/s/gcc/clang/' ${WRKSRC}/config/nim.cfg .endif do-build: cd ${WRKSRC} && ${SETENV} CC="${CC}" LINKER="${CC}" \ COMP_FLAGS="${CPPFLAGS} ${CFLAGS}" LINK_FLAGS="${LDFLAGS}" \ ${SH} build.sh cd ${WRKSRC} && bin/nim c --parallelBuild=${MAKE_JOBS_NUMBER} koch cd ${WRKSRC} && ./koch boot --parallelBuild=${MAKE_JOBS_NUMBER} \ -d:release +do-build-TOOLS-on: + cd ${WRKSRC} && ./koch tools --parallelBuild=${MAKE_JOBS_NUMBER} \ + -d:release + do-install: cd ${WRKSRC} && ${SH} install.sh ${STAGEDIR}${PREFIX} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/nim + +do-install-TOOLS-on: +.for t in ${TLIST} + ${INSTALL_PROGRAM} ${WRKSRC}/bin/${t} ${STAGEDIR}${PREFIX}/bin +.endfor .include Index: head/lang/nim/distinfo =================================================================== --- head/lang/nim/distinfo (revision 441279) +++ head/lang/nim/distinfo (revision 441280) @@ -1,3 +1,3 @@ -TIMESTAMP = 1484056102 -SHA256 (nim-0.16.0.tar.xz) = 9e199823be47cba55e62dd6982f02cf0aad732f369799fec42a4d8c2265c5167 -SIZE (nim-0.16.0.tar.xz) = 2907076 +TIMESTAMP = 1495114578 +SHA256 (nim-0.17.0.tar.xz) = 36e18dd9384f6c67e6d0199b871b43e774a0af30532698184d6f5a9cc9ac7a9b +SIZE (nim-0.17.0.tar.xz) = 25079320 Index: head/lang/nim/files/patch-install.sh =================================================================== --- head/lang/nim/files/patch-install.sh (revision 441279) +++ head/lang/nim/files/patch-install.sh (revision 441280) @@ -1,70 +1,70 @@ ---- install.sh.orig 2017-01-10 13:55:39.983263000 +0000 -+++ install.sh 2017-01-10 14:01:20.665343000 +0000 +--- install.sh.orig 2017-05-17 22:06:55.000000000 +0000 ++++ install.sh 2017-05-18 13:59:55.263749000 +0000 @@ -15,48 +15,14 @@ "--help"|"-h"|"help"|"h") echo "Nim installation script" echo "Usage: [sudo] sh install.sh DIR" - echo "Where DIR may be:" - echo " /usr/bin" - echo " /usr/local/bin" - echo " /opt" - echo " (treated similar to '/opt')" - echo "To deinstall, use the command:" - echo "sh deinstall.sh DIR" exit 1 ;; - "/usr/bin") - bindir=/usr/bin - configdir=/etc - libdir=/usr/lib/nim - docdir=/usr/share/nim/doc - datadir=/usr/share/nim/data -- nimbleDir="/opt/nimble/pkgs/compiler-0.16.0" +- nimbleDir="/opt/nimble/pkgs/compiler-0.17.0" - ;; - "/usr/local/bin") - bindir=/usr/local/bin - configdir=/etc - libdir=/usr/local/lib/nim - docdir=/usr/local/share/nim/doc - datadir=/usr/local/share/nim/data -- nimbleDir="/opt/nimble/pkgs/compiler-0.16.0" +- nimbleDir="/opt/nimble/pkgs/compiler-0.17.0" - ;; - "/opt") - bindir="/opt/nim/bin" - configdir="/opt/nim/config" - libdir="/opt/nim/lib" - docdir="/opt/nim/doc" - datadir="/opt/nim/data" -- nimbleDir="/opt/nimble/pkgs/compiler-0.16.0" +- nimbleDir="/opt/nimble/pkgs/compiler-0.17.0" - mkdir -p /opt/nim - mkdir -p $bindir - mkdir -p $configdir - ;; *) - bindir="$1/nim/bin" - configdir="$1/nim/config" - libdir="$1/nim/lib" - docdir="$1/nim/doc" - datadir="$1/nim/data" + bindir="$1/bin" + configdir="$1/etc" + libdir="$1/lib" + docdir="$1/share/doc/nim" + datadir="$1/share/nim" nimbleDir="$1/nim" mkdir -p $1/nim mkdir -p $bindir -@@ -823,13 +789,6 @@ +@@ -848,13 +814,6 @@ else echo "Nim installation script" echo "Usage: [sudo] sh install.sh DIR" - echo "Where DIR may be:" - echo " /usr/bin" - echo " /usr/local/bin" - echo " /opt" - echo " (treated similar to '/opt')" - echo "To deinstall, use the command:" - echo "sh deinstall.sh DIR" exit 1 fi Index: head/lang/nim/files/patch-koch.nim =================================================================== --- head/lang/nim/files/patch-koch.nim (nonexistent) +++ head/lang/nim/files/patch-koch.nim (revision 441280) @@ -0,0 +1,10 @@ +--- koch.nim.orig 2017-05-18 14:19:21.268379000 +0000 ++++ koch.nim 2017-05-18 14:21:26.248851000 +0000 +@@ -257,7 +257,6 @@ + let nimgrepExe = "bin/nimgrep".exe + nimexec "c -o:" & nimgrepExe & " tools/nimgrep.nim" + when defined(windows): buildVccTool() +- buildNimble(latest) + + proc nsis(args: string) = + bundleNimbleExe() Property changes on: head/lang/nim/files/patch-koch.nim ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/nim/pkg-plist =================================================================== --- head/lang/nim/pkg-plist (revision 441279) +++ head/lang/nim/pkg-plist (revision 441280) @@ -1,362 +1,374 @@ bin/nim etc/nim.cfg etc/nimdoc.cfg etc/nimdoc.tex.cfg -lib/arch/arch.nim -lib/arch/i386.asm -lib/arch/ms_amd64.asm -lib/arch/ms_i386.asm -lib/arch/unix_amd64.asm -lib/arch/unix_i386.asm +lib/arch/x86/amd64.S +lib/arch/x86/i386.S lib/core/locks.nim lib/core/macros.nim lib/core/rlocks.nim lib/core/typeinfo.nim lib/cycle.h lib/deprecated/core/unsigned.nim lib/deprecated/pure/actors.nim lib/deprecated/pure/actors.nim.cfg lib/deprecated/pure/asyncio.nim lib/deprecated/pure/ftpclient.nim lib/deprecated/pure/parseurl.nim lib/deprecated/pure/rawsockets.nim lib/deprecated/pure/sockets.nim +lib/genode_cpp/syslocks.h +lib/genode_cpp/threads.h lib/impure/db_mysql.nim lib/impure/db_odbc.nim lib/impure/db_postgres.nim lib/impure/db_sqlite.nim lib/impure/nre.nim lib/impure/nre/private/util.nim lib/impure/osinfo_posix.nim lib/impure/osinfo_win.nim lib/impure/rdstdin.nim lib/impure/re.nim lib/impure/ssl.nim lib/js/dom.nim lib/js/jsconsole.nim +lib/js/jsffi.nim lib/nimbase.h lib/nimrtl.nim lib/nimrtl.nim.cfg lib/packages/docutils/docutils.babel lib/packages/docutils/highlite.nim lib/packages/docutils/rst.nim lib/packages/docutils/rstast.nim lib/packages/docutils/rstgen.nim +lib/packages/fsmonitor.nim lib/posix/epoll.nim lib/posix/inotify.nim lib/posix/kqueue.nim lib/posix/linux.nim lib/posix/posix.nim +lib/posix/posix_linux_amd64.nim +lib/posix/posix_linux_amd64_consts.nim +lib/posix/posix_other.nim +lib/posix/posix_other_consts.nim lib/posix/termios.nim lib/prelude.nim lib/pure/algorithm.nim lib/pure/asyncdispatch.nim lib/pure/asyncdispatch.nim.cfg lib/pure/asyncfile.nim lib/pure/asyncftpclient.nim lib/pure/asynchttpserver.nim lib/pure/asyncmacro.nim lib/pure/asyncnet.nim lib/pure/base64.nim lib/pure/basic2d.nim lib/pure/basic3d.nim +lib/pure/bitops.nim lib/pure/browsers.nim lib/pure/cgi.nim lib/pure/collections/LockFreeHash.nim lib/pure/collections/chains.nim lib/pure/collections/critbits.nim lib/pure/collections/deques.nim lib/pure/collections/heapqueue.nim lib/pure/collections/intsets.nim lib/pure/collections/lists.nim lib/pure/collections/queues.nim lib/pure/collections/rtarrays.nim lib/pure/collections/sequtils.nim lib/pure/collections/sets.nim lib/pure/collections/sharedlist.nim lib/pure/collections/sharedstrings.nim lib/pure/collections/sharedtables.nim lib/pure/collections/tableimpl.nim lib/pure/collections/tables.nim lib/pure/colors.nim lib/pure/complex.nim lib/pure/concurrency/cpuinfo.nim lib/pure/concurrency/cpuload.nim lib/pure/concurrency/threadpool.nim lib/pure/concurrency/threadpool.nim.cfg lib/pure/cookies.nim lib/pure/coro.nim lib/pure/coro.nimcfg lib/pure/db_common.nim lib/pure/distros.nim lib/pure/dynlib.nim lib/pure/encodings.nim lib/pure/endians.nim -lib/pure/etcpriv.nim lib/pure/events.nim lib/pure/fenv.nim -lib/pure/fsmonitor.nim lib/pure/future.nim lib/pure/gentabs.nim lib/pure/hashes.nim lib/pure/htmlgen.nim lib/pure/htmlparser.nim lib/pure/httpclient.nim lib/pure/httpcore.nim lib/pure/httpserver.nim +lib/pure/includes/asynccommon.nim lib/pure/includes/asyncfutures.nim lib/pure/ioselectors.nim lib/pure/ioselects/ioselectors_epoll.nim lib/pure/ioselects/ioselectors_kqueue.nim lib/pure/ioselects/ioselectors_poll.nim lib/pure/ioselects/ioselectors_select.nim lib/pure/json.nim lib/pure/lexbase.nim lib/pure/logging.nim lib/pure/marshal.nim lib/pure/matchers.nim lib/pure/math.nim lib/pure/md5.nim lib/pure/memfiles.nim lib/pure/mersenne.nim lib/pure/mimetypes.nim lib/pure/nativesockets.nim lib/pure/net.nim lib/pure/nimprof.nim lib/pure/nimprof.nim.cfg lib/pure/nimtracker.nim lib/pure/numeric.nim lib/pure/oids.nim lib/pure/options.nim lib/pure/os.nim lib/pure/ospaths.nim lib/pure/osproc.nim lib/pure/oswalkdir.nim lib/pure/parsecfg.nim lib/pure/parsecsv.nim lib/pure/parseopt.nim lib/pure/parseopt2.nim lib/pure/parsesql.nim lib/pure/parseutils.nim lib/pure/parsexml.nim lib/pure/pegs.nim lib/pure/poly.nim lib/pure/punycode.nim lib/pure/random.nim lib/pure/rationals.nim lib/pure/romans.nim lib/pure/ropes.nim lib/pure/scgi.nim lib/pure/securehash.nim +lib/pure/segfaults.nim lib/pure/selectors.nim lib/pure/smtp.nim lib/pure/smtp.nim.cfg lib/pure/stats.nim lib/pure/streams.nim lib/pure/strmisc.nim lib/pure/strscans.nim lib/pure/strtabs.nim lib/pure/strutils.nim lib/pure/subexes.nim lib/pure/terminal.nim lib/pure/times.nim lib/pure/typetraits.nim lib/pure/unicode.nim lib/pure/unidecode/gen.py lib/pure/unidecode/unidecode.dat lib/pure/unidecode/unidecode.nim lib/pure/unittest.nim lib/pure/uri.nim +lib/pure/volatile.nim lib/pure/xmldom.nim lib/pure/xmldomparser.nim lib/pure/xmlparser.nim lib/pure/xmltree.nim lib/stdlib.nimble lib/system.nim lib/system/alloc.nim lib/system/ansi_c.nim lib/system/arithm.nim lib/system/assign.nim lib/system/atomics.nim lib/system/avltree.nim lib/system/cellsets.nim lib/system/cgprocs.nim lib/system/channels.nim lib/system/chcks.nim lib/system/debugger.nim lib/system/deepcopy.nim lib/system/dyncalls.nim lib/system/embedded.nim lib/system/endb.nim lib/system/excpt.nim lib/system/gc.nim lib/system/gc2.nim lib/system/gc_common.nim lib/system/gc_ms.nim lib/system/gc_stack.nim lib/system/hti.nim lib/system/inclrtl.nim lib/system/jssys.nim lib/system/memtracker.nim lib/system/mmdisp.nim lib/system/nimscript.nim lib/system/osalloc.nim lib/system/platforms.nim lib/system/profiler.nim lib/system/repr.nim lib/system/reprjs.nim lib/system/sets.nim lib/system/sysio.nim lib/system/syslocks.nim lib/system/sysspawn.nim lib/system/sysstr.nim lib/system/threads.nim lib/system/timers.nim lib/system/widestrs.nim lib/upcoming/asyncdispatch.nim lib/windows/registry.nim lib/windows/winlean.nim lib/wrappers/iup.nim lib/wrappers/joyent_http_parser.nim lib/wrappers/libsvm.nim lib/wrappers/libuv.nim lib/wrappers/linenoise/LICENSE.txt lib/wrappers/linenoise/README.markdown -lib/wrappers/linenoise/clinenoise.c -lib/wrappers/linenoise/clinenoise.h +lib/wrappers/linenoise/linenoise.c +lib/wrappers/linenoise/linenoise.h lib/wrappers/linenoise/linenoise.nim lib/wrappers/mysql.nim lib/wrappers/odbcsql.nim lib/wrappers/openssl.nim lib/wrappers/pcre.nim lib/wrappers/pdcurses.nim lib/wrappers/postgres.nim lib/wrappers/sqlite3.nim lib/wrappers/tinyc.nim nim/compiler.nimble nim/compiler/aliases.nim nim/compiler/ast.nim nim/compiler/astalgo.nim nim/compiler/bitsets.nim nim/compiler/canonicalizer.nim nim/compiler/ccgcalls.nim nim/compiler/ccgexprs.nim nim/compiler/ccgmerge.nim nim/compiler/ccgstmts.nim nim/compiler/ccgthreadvars.nim nim/compiler/ccgtrav.nim nim/compiler/ccgtypes.nim nim/compiler/ccgutils.nim nim/compiler/cgen.nim nim/compiler/cgendata.nim nim/compiler/cgmeth.nim nim/compiler/commands.nim nim/compiler/condsyms.nim nim/compiler/debuginfo.nim nim/compiler/depends.nim nim/compiler/docgen.nim nim/compiler/docgen2.nim nim/compiler/evalffi.nim nim/compiler/evaltempl.nim nim/compiler/extccomp.nim nim/compiler/filter_tmpl.nim nim/compiler/filters.nim nim/compiler/forloops.nim nim/compiler/guards.nim nim/compiler/hlo.nim nim/compiler/idents.nim nim/compiler/idgen.nim nim/compiler/importer.nim nim/compiler/installer.ini nim/compiler/jsgen.nim nim/compiler/jstypes.nim nim/compiler/lambdalifting.nim nim/compiler/lexer.nim nim/compiler/lists.nim nim/compiler/llstream.nim nim/compiler/lookups.nim nim/compiler/lowerings.nim nim/compiler/magicsys.nim nim/compiler/main.nim nim/compiler/mapping.txt nim/compiler/modulegraphs.nim nim/compiler/modules.nim nim/compiler/msgs.nim +nim/compiler/ndi.nim nim/compiler/nim.cfg nim/compiler/nim.nim nim/compiler/nimblecmd.nim nim/compiler/nimconf.nim nim/compiler/nimeval.nim nim/compiler/nimfix/nimfix.nim nim/compiler/nimfix/nimfix.nim.cfg nim/compiler/nimfix/pretty.nim nim/compiler/nimfix/prettybase.nim nim/compiler/nimlexbase.nim nim/compiler/nimsets.nim nim/compiler/nodejs.nim nim/compiler/nversion.nim nim/compiler/options.nim nim/compiler/packagehandling.nim nim/compiler/parampatterns.nim nim/compiler/parser.nim nim/compiler/passaux.nim nim/compiler/passes.nim nim/compiler/patterns.nim nim/compiler/pbraces.nim nim/compiler/platform.nim nim/compiler/plugins/active.nim nim/compiler/plugins/itersgen.nim nim/compiler/plugins/locals/locals.nim nim/compiler/pluginsupport.nim nim/compiler/pragmas.nim +nim/compiler/prefixmatches.nim nim/compiler/procfind.nim nim/compiler/readme.txt nim/compiler/renderer.nim nim/compiler/rodread.nim nim/compiler/rodutils.nim nim/compiler/rodwrite.nim nim/compiler/ropes.nim nim/compiler/saturate.nim nim/compiler/scriptconfig.nim nim/compiler/sem.nim nim/compiler/semasgn.nim nim/compiler/semcall.nim nim/compiler/semdata.nim nim/compiler/semdestruct.nim nim/compiler/semexprs.nim nim/compiler/semfields.nim nim/compiler/semfold.nim nim/compiler/semgnrc.nim nim/compiler/seminst.nim nim/compiler/semmacrosanity.nim nim/compiler/semmagic.nim +nim/compiler/semobjconstr.nim nim/compiler/semparallel.nim nim/compiler/sempass2.nim nim/compiler/semstmts.nim nim/compiler/semtempl.nim nim/compiler/semtypes.nim nim/compiler/semtypinst.nim nim/compiler/service.nim nim/compiler/sighashes.nim nim/compiler/sigmatch.nim nim/compiler/suggest.nim nim/compiler/syntaxes.nim nim/compiler/tccgen.nim nim/compiler/testability.nim nim/compiler/transf.nim nim/compiler/trees.nim nim/compiler/treetab.nim nim/compiler/types.nim nim/compiler/typesrenderer.nim nim/compiler/vm.nim nim/compiler/vmdef.nim nim/compiler/vmdeps.nim nim/compiler/vmgen.nim nim/compiler/vmhooks.nim nim/compiler/vmmarshal.nim nim/compiler/vmops.nim nim/compiler/wordrecg.nim nim/compiler/writetracking.nim nim/doc/advopt.txt nim/doc/basicopt.txt %%PORTDOCS%%@dir %%DOCSDIR%% +%%PORTDOCS%%%%DOCSDIR%%/html/overview.html +%%TOOLS%%bin/nimgrep +%%TOOLS%%bin/nimsuggest