Hi, since I don't think there are people interested in such port beside me, I will gladly take the maintainership of lang/nim.
I modified the patch in order to reflect the change.
Could someone commit if patch is ok?
Best regards,
Luca De Pandis
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/nim/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- Makefile 2 May 2020 09:33:06 -0000 1.11
+++ Makefile 6 Feb 2021 00:10:49 -0000
@@ -6,7 +6,7 @@ BROKEN-i386 = hardcodes gcc; see config/
COMMENT = statically typed, imperative programming language
-VERSION = 1.2.0
+VERSION = 1.4.2
DISTNAME = nim-${VERSION}
EXTRACT_SUFX = .tar.xz
REVISION = 0
@@ -14,6 +14,9 @@ REVISION = 0
CATEGORIES = lang
HOMEPAGE = http://nim-lang.org/
+
+MAINTAINER = luca.depan...@protonmail.com
+
MASTER_SITES = http://nim-lang.org/download/ \
https://download.tuxfamily.org/jod/lang/nim/
@@ -22,6 +25,13 @@ PERMIT_PACKAGE = Yes
WANTLIB = c m
+# cc is not a supported compiler, so CC has to be set as clang instead
+CC = clang
+
+MODULES = lang/python
+
+MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
+
post-patch:
mkdir -p ${WRKSRC}/nimcache-port
mkdir -p ${WRKSRC}/nimcache-port-test
@@ -33,15 +43,15 @@ do-build:
cd ${WRKSRC} && ${SETENV} CC="${CC}" LINKER="${CC}" \
CFLAGS="${CFLAGS}" sh build.sh
# slow machines can get a head of themselves and fail to link
- cd ${WRKSRC} && bin/nim c -d:release --parallelBuild:1 \
+ cd ${WRKSRC} && bin/nim c -d:release --parallelBuild:${MAKE_JOBS} \
--nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \
- --listCmd --putenv:"PATH=${PATH}" koch
- cd ${WRKSRC} && ./koch boot -d:release --parallelBuild:1 \
+ --listCmd --putenv:"PATH=${PATH}" --cc:${CC} koch
+ cd ${WRKSRC} && ./koch boot -d:release --parallelBuild:${MAKE_JOBS} \
--nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \
- --listCmd --putenv:"PATH=${PATH}"
- cd ${WRKSRC} && ./koch nimble -d:release --parallelBuild:1 \
+ --listCmd --putenv:"PATH=${PATH}" --cc:${CC}
+ cd ${WRKSRC} && ./koch nimble -d:release --parallelBuild:${MAKE_JOBS} \
--nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \
- --listCmd --putenv:"PATH=${PATH}"
+ --listCmd --putenv:"PATH=${PATH}" --cc:${CC}
do-install:
${INSTALL_PROGRAM_DIR} ${PREFIX}/bin
@@ -54,11 +64,13 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/nim
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nim
${INSTALL_DATA} ${WRKSRC}/config/*.cfg ${PREFIX}/share/examples/nim
+ ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
+ ${PREFIX}/lib/nim/pure/unidecode/gen.py
do-test:
cd ${WRKSRC} && ${SETENV} ./koch test all -d:release \
- --parallelBuild:1 --listFullPaths --listCmd \
+ --parallelBuild:${MAKE_JOBS} --listFullPaths --listCmd \
--nimcache:"${WRKSRC}/nimcache-port-test" \
- --putenv:"PATH=${PATH}"
+ --putenv:"PATH=${PATH}" --cc:${CC}
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/nim/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo 2 May 2020 09:33:06 -0000 1.5
+++ distinfo 6 Feb 2021 00:10:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (nim-1.2.0.tar.xz) = TpRYOjc5ZYIYBeZl4KBfUvthCRZnbtsJFIlBQVY3xXU=
-SIZE (nim-1.2.0.tar.xz) = 5869428
+SHA256 (nim-1.4.2.tar.xz) =
03a47583777dd81380a3407aa6a788c9aa8a67df4821025770c9ac4186291161
+SIZE (nim-1.4.2.tar.xz) = 4770616
Index: patches/patch-install_sh
===================================================================
RCS file: /cvs/ports/lang/nim/patches/patch-install_sh,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-install_sh
--- patches/patch-install_sh 2 May 2020 09:33:06 -0000 1.1
+++ patches/patch-install_sh 6 Feb 2021 00:10:49 -0000
@@ -1,4 +1,7 @@
---- install.sh.orig 2020-04-03 17:25:49 UTC
+$OpenBSD$
+
+Index: install.sh
+--- install.sh.orig
+++ install.sh
@@ -15,48 +15,14 @@ if [ $# -eq 1 ] ; then
"--help"|"-h"|"help"|"h")
@@ -19,7 +22,7 @@
- libdir=/usr/lib/nim
- docdir=/usr/share/nim/doc
- datadir=/usr/share/nim/data
-- nimbleDir="/opt/nimble/pkgs/compiler-1.2.0"
+- nimbleDir="/opt/nimble/pkgs/compiler-1.4.2"
- ;;
- "/usr/local/bin")
- bindir=/usr/local/bin
@@ -27,7 +30,7 @@
- libdir=/usr/local/lib/nim
- docdir=/usr/local/share/nim/doc
- datadir=/usr/local/share/nim/data
-- nimbleDir="/opt/nimble/pkgs/compiler-1.2.0"
+- nimbleDir="/opt/nimble/pkgs/compiler-1.4.2"
- ;;
- "/opt")
- bindir="/opt/nim/bin"
@@ -35,7 +38,7 @@
- libdir="/opt/nim/lib"
- docdir="/opt/nim/doc"
- datadir="/opt/nim/data"
-- nimbleDir="/opt/nimble/pkgs/compiler-1.2.0"
+- nimbleDir="/opt/nimble/pkgs/compiler-1.4.2"
- mkdir -p /opt/nim
- mkdir -p $bindir
- mkdir -p $configdir
@@ -54,7 +57,7 @@
nimbleDir="$1/nim"
mkdir -p $1/nim
mkdir -p $bindir
-@@ -973,13 +939,6 @@ chmod 644 $nimbleDir/compiler.nimble
+@@ -1044,13 +1010,6 @@ chmod 644 $nimbleDir/compiler.nimble
else
echo "Nim installation script"
echo "Usage: [sudo] sh install.sh DIR"
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/nim/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- pkg/PLIST 2 May 2020 09:33:06 -0000 1.5
+++ pkg/PLIST 6 Feb 2021 00:10:49 -0000
@@ -27,6 +27,15 @@ lib/nim/deprecated/pure/securehash.nim
lib/nim/deprecated/pure/sharedstrings.nim
lib/nim/experimental/
lib/nim/experimental/diff.nim
+lib/nim/fusion/
+lib/nim/fusion/btreetables.nim
+lib/nim/fusion/compat.nim
+lib/nim/fusion/filepermissions.nim
+lib/nim/fusion/htmlparser/
+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/
lib/nim/genode/alloc.nim
lib/nim/genode/env.nim
@@ -47,9 +56,11 @@ lib/nim/impure/re.nim
lib/nim/js/
lib/nim/js/asyncjs.nim
lib/nim/js/dom.nim
+lib/nim/js/dom_extensions.nim
lib/nim/js/jsconsole.nim
lib/nim/js/jscore.nim
lib/nim/js/jsffi.nim
+lib/nim/js/jsre.nim
lib/nim/nimbase.h
lib/nim/nimhcr.nim
lib/nim/nimhcr.nim.cfg
@@ -70,6 +81,8 @@ lib/nim/posix/inotify.nim
lib/nim/posix/kqueue.nim
lib/nim/posix/linux.nim
lib/nim/posix/posix.nim
+lib/nim/posix/posix_freertos_consts.nim
+lib/nim/posix/posix_haiku.nim
lib/nim/posix/posix_linux_amd64.nim
lib/nim/posix/posix_linux_amd64_consts.nim
lib/nim/posix/posix_macos_amd64.nim
@@ -138,6 +151,7 @@ lib/nim/pure/htmlparser.nim
lib/nim/pure/httpclient.nim
lib/nim/pure/httpcore.nim
lib/nim/pure/includes/
+lib/nim/pure/includes/decode_helpers.nim
lib/nim/pure/includes/osenv.nim
lib/nim/pure/includes/oserr.nim
lib/nim/pure/includes/osseps.nim
@@ -186,8 +200,10 @@ lib/nim/pure/selectors.nim
lib/nim/pure/smtp.nim
lib/nim/pure/smtp.nim.cfg
lib/nim/pure/ssl_certs.nim
+lib/nim/pure/ssl_config.nim
lib/nim/pure/stats.nim
lib/nim/pure/streams.nim
+lib/nim/pure/streamwrapper.nim
lib/nim/pure/strformat.nim
lib/nim/pure/strmisc.nim
lib/nim/pure/strscans.nim
@@ -199,6 +215,8 @@ lib/nim/pure/times.nim
lib/nim/pure/typetraits.nim
lib/nim/pure/unicode.nim
lib/nim/pure/unidecode/
+${MODPY_COMMENT}lib/nim/pure/unidecode/${MODPY_PYCACHE}/
+lib/nim/pure/unidecode/${MODPY_PYCACHE}gen.${MODPY_PYC_MAGIC_TAG}pyc
lib/nim/pure/unidecode/gen.py
lib/nim/pure/unidecode/unidecode.dat
lib/nim/pure/unidecode/unidecode.nim
@@ -211,9 +229,17 @@ lib/nim/std/
lib/nim/std/compilesettings.nim
lib/nim/std/decls.nim
lib/nim/std/editdistance.nim
+lib/nim/std/effecttraits.nim
+lib/nim/std/enumerate.nim
+lib/nim/std/exitprocs.nim
+lib/nim/std/isolation.nim
+lib/nim/std/jsonutils.nim
lib/nim/std/logic.nim
lib/nim/std/monotimes.nim
lib/nim/std/private/
+lib/nim/std/private/globs.nim
+lib/nim/std/private/miscdollars.nim
+lib/nim/std/private/since.nim
lib/nim/std/private/underscored_calls.nim
lib/nim/std/sha1.nim
lib/nim/std/stackframes.nim
@@ -228,6 +254,7 @@ lib/nim/system/
lib/nim/system.nim
lib/nim/system/alloc.nim
lib/nim/system/ansi_c.nim
+lib/nim/system/arc.nim
lib/nim/system/arithm.nim
lib/nim/system/arithmetics.nim
lib/nim/system/assertions.nim
@@ -235,13 +262,15 @@ lib/nim/system/assign.nim
lib/nim/system/atomics.nim
lib/nim/system/avltree.nim
lib/nim/system/basic_types.nim
+lib/nim/system/bitmasks.nim
+lib/nim/system/cellseqs_v1.nim
+lib/nim/system/cellseqs_v2.nim
lib/nim/system/cellsets.nim
lib/nim/system/cgprocs.nim
lib/nim/system/channels.nim
lib/nim/system/chcks.nim
lib/nim/system/comparisons.nim
lib/nim/system/cyclebreaker.nim
-lib/nim/system/cyclicrefs_v2.nim
lib/nim/system/deepcopy.nim
lib/nim/system/dollars.nim
lib/nim/system/dyncalls.nim
@@ -275,16 +304,18 @@ lib/nim/system/mm/malloc.nim
lib/nim/system/mm/none.nim
lib/nim/system/mmdisp.nim
lib/nim/system/nimscript.nim
+lib/nim/system/orc.nim
lib/nim/system/osalloc.nim
lib/nim/system/platforms.nim
lib/nim/system/profiler.nim
-lib/nim/system/refs_v2.nim
lib/nim/system/repr.nim
lib/nim/system/repr_v2.nim
lib/nim/system/reprjs.nim
lib/nim/system/seqs_v2.nim
+lib/nim/system/seqs_v2_reimpl.nim
lib/nim/system/setops.nim
lib/nim/system/sets.nim
+lib/nim/system/stacktraces.nim
lib/nim/system/strmantle.nim
lib/nim/system/strs_v2.nim
lib/nim/system/syslocks.nim
@@ -334,3 +365,4 @@ share/examples/nim/nimdoc.cfg
@sample ${SYSCONFDIR}/nim/nimdoc.cfg
share/examples/nim/nimdoc.tex.cfg
@sample ${SYSCONFDIR}/nim/nimdoc.tex.cfg
+share/examples/nim/rename.rules.cfg
On Tue, Feb 02, 2021 at 05:16:41PM +0100, Luca De Pandis wrote:
> up
>
> On Sat, Jan 16, 2021 at 02:31:42PM +0100, Luca De Pandis wrote:
> > Hi,
> > thank you everyone for the feedback.
> >
> > On Fri, Jan 15, 2021 at 05:01:19PM +0000, Stuart Henderson wrote:
> > > 3 days is way too soon to be prodding really, especially for what is
> > > a relatively specialist port that most ports devs won't use. Anyway a
> > > few quick comments I am short on time - as mentioned by others please
> > > send a diff not a tar for updates. Use cvs add / cvs rm if there are
> > > any new/removed files and cvs diff -uNp.
> > >
> > > patch-config_nim_cfg:
> > > -cc = gcc
> > > +cc = clang
> > >
> > > The compiler should be passed from the port in CC not hardcoded.
> > nim.cfg is read by the nim compiler to know what C compiler it has to run
> > when it is going to compile nim code.
> > It cannot be left neither unset nor set to cc %= "$CC", otherwise the
> > compilation will fail.
> > That said, I added the --cc:$CC parameter in Makefile order to let the port
> > build with the compiler of choice, as long as it is supported by nim. This
> > parameter will override the value in nim.cfg during the building of the
> > port.
> >
> >
> > >
> > > PLIST: missing @sample for the new cfg file
> > Now it should be ok.
> >
> > $ grep sample pkg/PLIST
> > \
> > @sample ${SYSCONFDIR}/nim/
> > @sample ${SYSCONFDIR}/nim/nim.cfg
> > @sample ${SYSCONFDIR}/nim/nimdoc.cfg
> > @sample ${SYSCONFDIR}/nim/nimdoc.tex.cfg
> >
> >
> > > Makefile: drop REVISION, maybe the --parallelBuild:1 should really
> > > be ${MAKE_JOBS} instead of 1
> > >
> > Fixed.
> >
> >
> > Best regards,
> > Luca De Pandis
> >
> >
> >
> >
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/lang/nim/Makefile,v
> > retrieving revision 1.11
> > diff -u -p -u -p -r1.11 Makefile
> > --- Makefile 2 May 2020 09:33:06 -0000 1.11
> > +++ Makefile 16 Jan 2021 13:10:55 -0000
> > @@ -6,7 +6,7 @@ BROKEN-i386 = hardcodes gcc; see config/
> >
> > COMMENT = statically typed, imperative programming language
> >
> > -VERSION = 1.2.0
> > +VERSION = 1.4.2
> > DISTNAME = nim-${VERSION}
> > EXTRACT_SUFX = .tar.xz
> > REVISION = 0
> > @@ -22,6 +22,13 @@ PERMIT_PACKAGE = Yes
> >
> > WANTLIB = c m
> >
> > +# cc is not a supported compiler, so CC has to be set as clang instead
> > +CC = clang
> > +
> > +MODULES = lang/python
> > +
> > +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
> > +
> > post-patch:
> > mkdir -p ${WRKSRC}/nimcache-port
> > mkdir -p ${WRKSRC}/nimcache-port-test
> > @@ -33,15 +40,15 @@ do-build:
> > cd ${WRKSRC} && ${SETENV} CC="${CC}" LINKER="${CC}" \
> > CFLAGS="${CFLAGS}" sh build.sh
> > # slow machines can get a head of themselves and fail to link
> > - cd ${WRKSRC} && bin/nim c -d:release --parallelBuild:1 \
> > + cd ${WRKSRC} && bin/nim c -d:release --parallelBuild:${MAKE_JOBS} \
> > --nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \
> > - --listCmd --putenv:"PATH=${PATH}" koch
> > - cd ${WRKSRC} && ./koch boot -d:release --parallelBuild:1 \
> > + --listCmd --putenv:"PATH=${PATH}" --cc:${CC} koch
> > + cd ${WRKSRC} && ./koch boot -d:release --parallelBuild:${MAKE_JOBS} \
> > --nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \
> > - --listCmd --putenv:"PATH=${PATH}"
> > - cd ${WRKSRC} && ./koch nimble -d:release --parallelBuild:1 \
> > + --listCmd --putenv:"PATH=${PATH}" --cc:${CC}
> > + cd ${WRKSRC} && ./koch nimble -d:release --parallelBuild:${MAKE_JOBS} \
> > --nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \
> > - --listCmd --putenv:"PATH=${PATH}"
> > + --listCmd --putenv:"PATH=${PATH}" --cc:${CC}
> >
> > do-install:
> > ${INSTALL_PROGRAM_DIR} ${PREFIX}/bin
> > @@ -54,11 +61,13 @@ do-install:
> > ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/nim
> > ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nim
> > ${INSTALL_DATA} ${WRKSRC}/config/*.cfg ${PREFIX}/share/examples/nim
> > + ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
> > + ${PREFIX}/lib/nim/pure/unidecode/gen.py
> >
> > do-test:
> > cd ${WRKSRC} && ${SETENV} ./koch test all -d:release \
> > - --parallelBuild:1 --listFullPaths --listCmd \
> > + --parallelBuild:${MAKE_JOBS} --listFullPaths --listCmd \
> > --nimcache:"${WRKSRC}/nimcache-port-test" \
> > - --putenv:"PATH=${PATH}"
> > + --putenv:"PATH=${PATH}" --cc:${CC}
> >
> > .include <bsd.port.mk>
> > Index: distinfo
> > ===================================================================
> > RCS file: /cvs/ports/lang/nim/distinfo,v
> > retrieving revision 1.5
> > diff -u -p -u -p -r1.5 distinfo
> > --- distinfo 2 May 2020 09:33:06 -0000 1.5
> > +++ distinfo 16 Jan 2021 13:10:55 -0000
> > @@ -1,2 +1,2 @@
> > -SHA256 (nim-1.2.0.tar.xz) = TpRYOjc5ZYIYBeZl4KBfUvthCRZnbtsJFIlBQVY3xXU=
> > -SIZE (nim-1.2.0.tar.xz) = 5869428
> > +SHA256 (nim-1.4.2.tar.xz) = \
> > 03a47583777dd81380a3407aa6a788c9aa8a67df4821025770c9ac4186291161 +SIZE \
> > (nim-1.4.2.tar.xz) = 4770616
> > Index: patches/patch-install_sh
> > ===================================================================
> > RCS file: /cvs/ports/lang/nim/patches/patch-install_sh,v
> > retrieving revision 1.1
> > diff -u -p -u -p -r1.1 patch-install_sh
> > --- patches/patch-install_sh 2 May 2020 09:33:06 -0000 1.1
> > +++ patches/patch-install_sh 16 Jan 2021 13:10:55 -0000
> > @@ -1,4 +1,7 @@
> > ---- install.sh.orig 2020-04-03 17:25:49 UTC
> > +$OpenBSD$
> > +
> > +Index: install.sh
> > +--- install.sh.orig
> > +++ install.sh
> > @@ -15,48 +15,14 @@ if [ $# -eq 1 ] ; then
> > "--help"|"-h"|"help"|"h")
> > @@ -19,7 +22,7 @@
> > - libdir=/usr/lib/nim
> > - docdir=/usr/share/nim/doc
> > - datadir=/usr/share/nim/data
> > -- nimbleDir="/opt/nimble/pkgs/compiler-1.2.0"
> > +- nimbleDir="/opt/nimble/pkgs/compiler-1.4.2"
> > - ;;
> > - "/usr/local/bin")
> > - bindir=/usr/local/bin
> > @@ -27,7 +30,7 @@
> > - libdir=/usr/local/lib/nim
> > - docdir=/usr/local/share/nim/doc
> > - datadir=/usr/local/share/nim/data
> > -- nimbleDir="/opt/nimble/pkgs/compiler-1.2.0"
> > +- nimbleDir="/opt/nimble/pkgs/compiler-1.4.2"
> > - ;;
> > - "/opt")
> > - bindir="/opt/nim/bin"
> > @@ -35,7 +38,7 @@
> > - libdir="/opt/nim/lib"
> > - docdir="/opt/nim/doc"
> > - datadir="/opt/nim/data"
> > -- nimbleDir="/opt/nimble/pkgs/compiler-1.2.0"
> > +- nimbleDir="/opt/nimble/pkgs/compiler-1.4.2"
> > - mkdir -p /opt/nim
> > - mkdir -p $bindir
> > - mkdir -p $configdir
> > @@ -54,7 +57,7 @@
> > nimbleDir="$1/nim"
> > mkdir -p $1/nim
> > mkdir -p $bindir
> > -@@ -973,13 +939,6 @@ chmod 644 $nimbleDir/compiler.nimble
> > +@@ -1044,13 +1010,6 @@ chmod 644 $nimbleDir/compiler.nimble
> > else
> > echo "Nim installation script"
> > echo "Usage: [sudo] sh install.sh DIR"
> >
>
publickey - luca.depandis@protonmail.com - 0xC73C26D2.asc
Description: application/pgp-keys
signature.asc
Description: OpenPGP digital signature
