Re: [UPDATE] lang/nim 1.2.0 -> 1.4.2
Hi,
I fixed the MAINTAINER syntax.
If the patch is ok could someone commit it, please?
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
--- Makefile2 May 2020 09:33:06 - 1.11
+++ Makefile11 Feb 2021 13:42:45 -
@@ -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 De Pandis
+
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
Index: distinfo
===
RCS file: /cvs/ports/lang/nim/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo2 May 2020 09:33:06 - 1.5
+++ distinfo11 Feb 2021 13:42:45 -
@@ -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_sh2 May 2020 09:33:06 - 1.1
+++ patches/patch-install_sh11 Feb 2021 13:42:45 -
@@ -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")
-
Re: [UPDATE] lang/nim 1.2.0 -> 1.4.2
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
--- Makefile2 May 2020 09:33:06 - 1.11
+++ Makefile6 Feb 2021 00:10:49 -
@@ -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
Index: distinfo
===
RCS file: /cvs/ports/lang/nim/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo2 May 2020 09:33:06 - 1.5
+++ distinfo6 Feb 2021 00:10:49 -
@@ -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_sh2 May 2020 09:33:06 - 1.1
+++ patches/patch-install_sh6 Feb 2021 00:10:49 -
@@ -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
--
Re: [UPDATE] lang/nim 1.2.0 -> 1.4.2
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 +, 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 - 1.11
> +++ Makefile 16 Jan 2021 13:10:55 -
> @@ -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
> 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 - 1.5
> +++ distinfo 16 Jan 2021 13:10:55 -
> @@ -1,2 +1,2 @@
> -SHA256
Re: [UPDATE] lang/nim 1.2.0 -> 1.4.2
Hi,
thank you everyone for the feedback.
On Fri, Jan 15, 2021 at 05:01:19PM +, 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
--- Makefile2 May 2020 09:33:06 - 1.11
+++ Makefile16 Jan 2021 13:10:55 -
@@ -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
Index: distinfo
===
RCS file: /cvs/ports/lang/nim/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo2 May 2020 09:33:06 - 1.5
+++ distinfo16 Jan 2021 13:10:55 -
@@ -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:
Re: [UPDATE] lang/nim 1.2.0 -> 1.4.2
On Fri, Jan 15, 2021 at 05:07:10PM +0100, Rafael Sadowski wrote: [...] > cvs diff -uNp, please. More information: > https://www.openbsd.org/faq/ports/testing.html Yes, but note that this is the automatic default and doesn't need to be specified *unless* you changed /etc/skel/.cvsrc or your $HOME/.cvsrc. $ grep diff /etc/skel/.cvsrc diff -uNp These become the default flags for cvs per cvs(1). Still probably good to have the occasional reminder about the existence of these rc files and what goes into your 'cvs diff' command. > > > > > regards, > > Dimitri > > >
Re: [UPDATE] lang/nim 1.2.0 -> 1.4.2
On Fri, Jan 15, 2021 at 01:02:16PM +, Luca De Pandis wrote: > Hi, > could anyone review this, so that the port could be upgraded, please? > > > Best regards, > Luca De Pandis > > > On Tue, Jan 12, 2021 at 10:40:00PM +0100, me wrote: > > Hi, > > I updated the lang/nim port to the latest version. > > > > The following checks passed: > > - portcheck > > - port-lib-depends-check > > - update-plist > > > > Best regards, > > Luca De Pandis Updates are supposed to be sent as an inline diff. To get the diff: cd /usr/ports/lang/nim && cvs diff regards, Dimitri
Re: [UPDATE] lang/nim 1.2.0 -> 1.4.2
On 2021/01/15 14:02, Luca De Pandis wrote:
> Hi,
> could anyone review this, so that the port could be upgraded, please?
>
>
> Best regards,
> Luca De Pandis
>
>
> On Tue, Jan 12, 2021 at 10:40:00PM +0100, me wrote:
> > Hi,
> > I updated the lang/nim port to the latest version.
> >
> > The following checks passed:
> > - portcheck
> > - port-lib-depends-check
> > - update-plist
> >
> > Best regards,
> > Luca De Pandis
>
>
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.
PLIST: missing @sample for the new cfg file
Makefile: drop REVISION, maybe the --parallelBuild:1 should really
be ${MAKE_JOBS} instead of 1
Re: [UPDATE] lang/nim 1.2.0 -> 1.4.2
On Fri Jan 15, 2021 at 03:58:57PM +, Dimitri Karamazov wrote: > On Fri, Jan 15, 2021 at 01:02:16PM +, Luca De Pandis wrote: > > Hi, > > could anyone review this, so that the port could be upgraded, please? > > > > > > Best regards, > > Luca De Pandis > > > > > > On Tue, Jan 12, 2021 at 10:40:00PM +0100, me wrote: > > > Hi, > > > I updated the lang/nim port to the latest version. > > > > > > The following checks passed: > > > - portcheck > > > - port-lib-depends-check > > > - update-plist > > > > > > Best regards, > > > Luca De Pandis > > Updates are supposed to be sent as an inline diff. > To get the diff: > cd /usr/ports/lang/nim && cvs diff cvs diff -uNp, please. More information: https://www.openbsd.org/faq/ports/testing.html > > regards, > Dimitri >
Re: [UPDATE] lang/nim 1.2.0 -> 1.4.2
Hi, could anyone review this, so that the port could be upgraded, please? Best regards, Luca De Pandis On Tue, Jan 12, 2021 at 10:40:00PM +0100, me wrote: > Hi, > I updated the lang/nim port to the latest version. > > The following checks passed: > - portcheck > - port-lib-depends-check > - update-plist > > Best regards, > Luca De Pandis
[UPDATE] lang/nim 1.2.0 -> 1.4.2
Hi, I updated the lang/nim port to the latest version. The following checks passed: - portcheck - port-lib-depends-check - update-plist Best regards, Luca De Pandis nim.tar.gz Description: Binary data
Re: [UPDATE] lang/nim-1.2.0
From: Denis Fondras
Date: Mon, 13 Apr 2020 17:40:15 +
To: openbsd-ports
Subject: Re: [UPDATE] lang/nim-1.2.0
On Mon, Apr 13, 2020 at 11:07:27AM -0600, j...@bitminer.ca wrote:
Denis, the PLIST file does most of this work, just adjust it to add
nimble,
the directory ${SYSCONFDIR}/nim and modify the cfg entries to add the
/nim/
directory in their path. And lose the manual copies from the Makefile.
Here is an updated diff :
This diff works for me. Hopefully it can be added prior to the ports
freeze (there are no ports depending on nim).
John
Re: [UPDATE] lang/nim-1.2.0
On Mon, Apr 13, 2020 at 11:07:27AM -0600, j...@bitminer.ca wrote:
> Denis, the PLIST file does most of this work, just adjust it to add nimble,
> the directory ${SYSCONFDIR}/nim and modify the cfg entries to add the /nim/
> directory in their path. And lose the manual copies from the Makefile.
>
Here is an updated diff :
Index: Makefile
===
RCS file: /cvs/ports/lang/nim/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile31 Aug 2019 15:36:56 - 1.10
+++ Makefile13 Apr 2020 17:38:23 -
@@ -6,7 +6,7 @@ BROKEN-i386 = hardcodes gcc; see config/
COMMENT = statically typed, imperative programming language
-VERSION = 0.16.0
+VERSION = 1.2.0
DISTNAME = nim-${VERSION}
EXTRACT_SUFX = .tar.xz
REVISION = 0
@@ -39,10 +39,14 @@ do-build:
cd ${WRKSRC} && ./koch boot -d:release --parallelBuild:1 \
--nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \
--listCmd --putenv:"PATH=${PATH}"
+ cd ${WRKSRC} && ./koch nimble -d:release --parallelBuild:1 \
+ --nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \
+ --listCmd --putenv:"PATH=${PATH}"
do-install:
${INSTALL_PROGRAM_DIR} ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/bin/nim ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/nimble ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/lib/nim
cp -R ${WRKSRC}/lib/* ${PREFIX}/lib/nim
chown -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/nim
Index: distinfo
===
RCS file: /cvs/ports/lang/nim/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo9 Jan 2017 10:32:33 - 1.4
+++ distinfo13 Apr 2020 17:38:23 -
@@ -1,2 +1,2 @@
-SHA256 (nim-0.16.0.tar.xz) = nhmYI75Hy6VeYt1pgvAs8KrXMvNpeZ/sQqTYwiZcUWc=
-SIZE (nim-0.16.0.tar.xz) = 2907076
+SHA256 (nim-1.2.0.tar.xz) = TpRYOjc5ZYIYBeZl4KBfUvthCRZnbtsJFIlBQVY3xXU=
+SIZE (nim-1.2.0.tar.xz) = 5869428
Index: patches/patch-build_sh
===
RCS file: patches/patch-build_sh
diff -N patches/patch-build_sh
--- patches/patch-build_sh 15 Jun 2016 00:19:59 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-build_sh,v 1.2 2016/06/15 00:19:59 juanfra Exp $
build.sh.orig Tue Jun 7 00:38:53 2016
-+++ build.sh Thu Jun 9 19:43:03 2016
-@@ -26,9 +26,9 @@ do
- esac
- done
-
--CC="gcc"
--LINKER="gcc"
--COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w -O3
-fno-strict-aliasing$extraBuildArgs"
-+#CC="gcc"
-+#LINKER="gcc"
-+COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w -fno-strict-aliasing$extraBuildArgs"
- LINK_FLAGS="${LDFLAGS:-} "
- PS4=""
- # platform detection
Index: patches/patch-compiler_extccomp_nim
===
RCS file: patches/patch-compiler_extccomp_nim
diff -N patches/patch-compiler_extccomp_nim
--- patches/patch-compiler_extccomp_nim 9 Jan 2017 10:32:33 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,47 +0,0 @@
-$OpenBSD: patch-compiler_extccomp_nim,v 1.3 2017/01/09 10:32:33 juanfra Exp $
compiler/extccomp.nim.orig Sun Jan 8 21:33:43 2017
-+++ compiler/extccomp.nim Mon Jan 9 02:22:00 2017
-@@ -21,7 +21,7 @@ import
- type
- TSystemCC* = enum
- ccNone, ccGcc, ccLLVM_Gcc, ccCLang, ccLcc, ccBcc, ccDmc, ccWcc, ccVcc,
--ccTcc, ccPcc, ccUcc, ccIcl, asmFasm
-+ccTcc, ccPcc, ccUcc, ccIcl, asmFasm, ccEGcc
- TInfoCCProp* = enum # properties of the C compiler:
- hasSwitchRange, # CC allows ranges in switch statements (GNU C)
- hasComputedGoto, # CC has computed goto (GNU C extension)
-@@ -69,8 +69,8 @@ compiler gcc:
- result = (
- name: "gcc",
- objExt: "o",
--optSpeed: " -O3 -ffast-math ",
--optSize: " -Os -ffast-math ",
-+optSpeed: " -O2 ",
-+optSize: " -Os ",
- compilerExe: "gcc",
- cppCompiler: "g++",
- compileTmpl: "-c $options $include -o $objfile $file",
-@@ -90,6 +90,13 @@ compiler gcc:
- props: {hasSwitchRange, hasComputedGoto, hasCpp, hasGcGuard, hasGnuAsm,
- hasAttribute})
-
-+compiler egcc:
-+result = gcc()
-+
-+result.name = "egcc"
-+result.compilerExe = "egcc"
-+result.cppCompiler = "eg++"
-+
- # LLVM Frontend for GCC/G++
- compiler llvmGcc:
- result = gcc() # Uses settings from GCC
-@@ -359,7 +366,8 @@ const
- pcc(),
- ucc(),
- icl(),
--fasm()]
-+fasm(),
-+egcc()]
-
- hExt* = ".h"
-
Index: patches/patch-config_nim_cfg
===
RCS file: /cvs/ports/lang/nim/patches/patch-config_nim_cfg,v
retrieving revision 1.3
diff -u -p -r1.3 patch-config_nim_cfg
--- patches/patch-config_nim_cfg9 Jan 2017 10:32:33 -
Re: [UPDATE] lang/nim-1.2.0
On 2020/04/13 17:20, Denis Fondras wrote:
> On Mon, Apr 13, 2020 at 08:29:23AM -0600, j...@bitminer.ca wrote:
> > Hi Denis,
> >
> > I think there is still an issue with the nimble install (thanks for
> > that by the way, I was thinking of this myself):
> >
> > > do-install:
> > > ${INSTALL_PROGRAM_DIR} ${PREFIX}/bin
> > > ${INSTALL_PROGRAM} ${WRKSRC}/bin/nim ${PREFIX}/bin
> > > + ${INSTALL_PROGRAM} ${WRKSRC}/bin/nimble ${PREFIX}/bin
> > > ${INSTALL_DATA_DIR} ${PREFIX}/lib/nim
> > > cp -R ${WRKSRC}/lib/* ${PREFIX}/lib/nim
> > > chown -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/nim
> > > ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nim
> > > ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/nim
> > > + ${INSTALL_DATA_DIR} ${WRKINST}/etc/nim
> > > + ${INSTALL_DATA} ${WRKSRC}/config/*.cfg ${WRKINST}/etc/nim
> >
> > The right-hand-side of ${INSTALL_DATA} or _DIR should include ${PREFIX}
> > not ${WRKINST}, no?
> >
>
> I don't know what I am doing, this is very "trial-and-error".
> What I noticed is that using ${WRKINST} allows to copy files to /etc instead
> of
> /usr/local/etc.
>
They aren't included in the package though. Those files are already handled
by copying them to share/examples and then @sample'd to ${SYSCONFDIR}/nim.cfg
etc.
in the PLIST.
Re: [UPDATE] lang/nim-1.2.0
On Mon, Apr 13, 2020 at 08:29:23AM -0600, j...@bitminer.ca wrote:
> Hi Denis,
>
> I think there is still an issue with the nimble install (thanks for
> that by the way, I was thinking of this myself):
>
> > do-install:
> > ${INSTALL_PROGRAM_DIR} ${PREFIX}/bin
> > ${INSTALL_PROGRAM} ${WRKSRC}/bin/nim ${PREFIX}/bin
> > + ${INSTALL_PROGRAM} ${WRKSRC}/bin/nimble ${PREFIX}/bin
> > ${INSTALL_DATA_DIR} ${PREFIX}/lib/nim
> > cp -R ${WRKSRC}/lib/* ${PREFIX}/lib/nim
> > chown -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/nim
> > ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nim
> > ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/nim
> > + ${INSTALL_DATA_DIR} ${WRKINST}/etc/nim
> > + ${INSTALL_DATA} ${WRKSRC}/config/*.cfg ${WRKINST}/etc/nim
>
> The right-hand-side of ${INSTALL_DATA} or _DIR should include ${PREFIX}
> not ${WRKINST}, no?
>
I don't know what I am doing, this is very "trial-and-error".
What I noticed is that using ${WRKINST} allows to copy files to /etc instead of
/usr/local/etc.
Re: [UPDATE] lang/nim-1.2.0
Hi Denis,
I think there is still an issue with the nimble install (thanks for
that by the way, I was thinking of this myself):
do-install:
${INSTALL_PROGRAM_DIR} ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/bin/nim ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/nimble ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/lib/nim
cp -R ${WRKSRC}/lib/* ${PREFIX}/lib/nim
chown -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/nim
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nim
${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/nim
+ ${INSTALL_DATA_DIR} ${WRKINST}/etc/nim
+ ${INSTALL_DATA} ${WRKSRC}/config/*.cfg ${WRKINST}/etc/nim
The right-hand-side of ${INSTALL_DATA} or _DIR should include ${PREFIX}
not ${WRKINST}, no?
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nim
${INSTALL_DATA} ${WRKSRC}/config/*.cfg ${PREFIX}/share/examples/nim
As used here.
John
Re: [UPDATE] lang/nim-1.2.0
On Sun, Apr 12, 2020 at 03:37:35PM +0100, Stuart Henderson wrote:
> > Here is a new diff. Add config files to /usr/local/etc/nim and add nimble
> > to the
> > package.
>
> ?!
>
> OpenBSD should use ${SYSCONFDIR}, not /usr/local/etc.
>
package, local, it sounded like a sensible path.
Here is an updated diff :
Index: Makefile
===
RCS file: /cvs/ports/lang/nim/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile31 Aug 2019 15:36:56 - 1.10
+++ Makefile12 Apr 2020 16:05:02 -
@@ -6,7 +6,7 @@ BROKEN-i386 = hardcodes gcc; see config/
COMMENT = statically typed, imperative programming language
-VERSION = 0.16.0
+VERSION = 1.2.0
DISTNAME = nim-${VERSION}
EXTRACT_SUFX = .tar.xz
REVISION = 0
@@ -39,15 +39,21 @@ do-build:
cd ${WRKSRC} && ./koch boot -d:release --parallelBuild:1 \
--nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \
--listCmd --putenv:"PATH=${PATH}"
+ cd ${WRKSRC} && ./koch nimble -d:release --parallelBuild:1 \
+ --nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \
+ --listCmd --putenv:"PATH=${PATH}"
do-install:
${INSTALL_PROGRAM_DIR} ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/bin/nim ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/nimble ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/lib/nim
cp -R ${WRKSRC}/lib/* ${PREFIX}/lib/nim
chown -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/nim
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nim
${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/nim
+ ${INSTALL_DATA_DIR} ${WRKINST}/etc/nim
+ ${INSTALL_DATA} ${WRKSRC}/config/*.cfg ${WRKINST}/etc/nim
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nim
${INSTALL_DATA} ${WRKSRC}/config/*.cfg ${PREFIX}/share/examples/nim
Index: distinfo
===
RCS file: /cvs/ports/lang/nim/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo9 Jan 2017 10:32:33 - 1.4
+++ distinfo12 Apr 2020 16:05:02 -
@@ -1,2 +1,2 @@
-SHA256 (nim-0.16.0.tar.xz) = nhmYI75Hy6VeYt1pgvAs8KrXMvNpeZ/sQqTYwiZcUWc=
-SIZE (nim-0.16.0.tar.xz) = 2907076
+SHA256 (nim-1.2.0.tar.xz) = TpRYOjc5ZYIYBeZl4KBfUvthCRZnbtsJFIlBQVY3xXU=
+SIZE (nim-1.2.0.tar.xz) = 5869428
Index: patches/patch-build_sh
===
RCS file: patches/patch-build_sh
diff -N patches/patch-build_sh
--- patches/patch-build_sh 15 Jun 2016 00:19:59 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-build_sh,v 1.2 2016/06/15 00:19:59 juanfra Exp $
build.sh.orig Tue Jun 7 00:38:53 2016
-+++ build.sh Thu Jun 9 19:43:03 2016
-@@ -26,9 +26,9 @@ do
- esac
- done
-
--CC="gcc"
--LINKER="gcc"
--COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w -O3
-fno-strict-aliasing$extraBuildArgs"
-+#CC="gcc"
-+#LINKER="gcc"
-+COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w -fno-strict-aliasing$extraBuildArgs"
- LINK_FLAGS="${LDFLAGS:-} "
- PS4=""
- # platform detection
Index: patches/patch-compiler_extccomp_nim
===
RCS file: patches/patch-compiler_extccomp_nim
diff -N patches/patch-compiler_extccomp_nim
--- patches/patch-compiler_extccomp_nim 9 Jan 2017 10:32:33 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,47 +0,0 @@
-$OpenBSD: patch-compiler_extccomp_nim,v 1.3 2017/01/09 10:32:33 juanfra Exp $
compiler/extccomp.nim.orig Sun Jan 8 21:33:43 2017
-+++ compiler/extccomp.nim Mon Jan 9 02:22:00 2017
-@@ -21,7 +21,7 @@ import
- type
- TSystemCC* = enum
- ccNone, ccGcc, ccLLVM_Gcc, ccCLang, ccLcc, ccBcc, ccDmc, ccWcc, ccVcc,
--ccTcc, ccPcc, ccUcc, ccIcl, asmFasm
-+ccTcc, ccPcc, ccUcc, ccIcl, asmFasm, ccEGcc
- TInfoCCProp* = enum # properties of the C compiler:
- hasSwitchRange, # CC allows ranges in switch statements (GNU C)
- hasComputedGoto, # CC has computed goto (GNU C extension)
-@@ -69,8 +69,8 @@ compiler gcc:
- result = (
- name: "gcc",
- objExt: "o",
--optSpeed: " -O3 -ffast-math ",
--optSize: " -Os -ffast-math ",
-+optSpeed: " -O2 ",
-+optSize: " -Os ",
- compilerExe: "gcc",
- cppCompiler: "g++",
- compileTmpl: "-c $options $include -o $objfile $file",
-@@ -90,6 +90,13 @@ compiler gcc:
- props: {hasSwitchRange, hasComputedGoto, hasCpp, hasGcGuard, hasGnuAsm,
- hasAttribute})
-
-+compiler egcc:
-+result = gcc()
-+
-+result.name = "egcc"
-+result.compilerExe = "egcc"
-+result.cppCompiler = "eg++"
-+
- # LLVM Frontend for GCC/G++
- compiler llvmGcc:
- result = gcc() # Uses settings from GCC
-@@ -359,7 +366,8 @@ const
- pcc(),
- ucc(),
- icl(),
--
Re: [UPDATE] lang/nim-1.2.0
On 2020/04/12 10:54, Denis Fondras wrote:
> On Fri, Apr 10, 2020 at 09:41:53PM +0200, Denis Fondras wrote:
> > On Fri, Apr 10, 2020 at 12:12:58AM +0530, putridsou...@gmail.com wrote:
> > > Latest Update for nim-1.2.0
> > > Builds successfully on amd64
> > >
> > > 1 new patch added -> patch-install_sh
> > > 4 patches removed -> patch-koch_nim, patch-lib_pure_endians_nim,
> > > patch-compiler_extccomp_nim,
> > > patch-tests_testament_tester_nim
> > >
> > > Someone should test this.
> > >
> >
> > It does not work here unless I copy /etc/nim* to /usr/local/etc/nim/
> >
>
> Here is a new diff. Add config files to /usr/local/etc/nim and add nimble to
> the
> package.
?!
OpenBSD should use ${SYSCONFDIR}, not /usr/local/etc.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/nim/Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile
> --- Makefile 31 Aug 2019 15:36:56 - 1.10
> +++ Makefile 12 Apr 2020 08:50:34 -
> @@ -6,7 +6,7 @@ BROKEN-i386 = hardcodes gcc; see config/
>
> COMMENT =statically typed, imperative programming language
>
> -VERSION =0.16.0
> +VERSION =1.2.0
> DISTNAME = nim-${VERSION}
> EXTRACT_SUFX = .tar.xz
> REVISION = 0
> @@ -39,15 +39,21 @@ do-build:
> cd ${WRKSRC} && ./koch boot -d:release --parallelBuild:1 \
> --nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \
> --listCmd --putenv:"PATH=${PATH}"
> + cd ${WRKSRC} && ./koch nimble -d:release --parallelBuild:1 \
> + --nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \
> + --listCmd --putenv:"PATH=${PATH}"
>
> do-install:
> ${INSTALL_PROGRAM_DIR} ${PREFIX}/bin
> ${INSTALL_PROGRAM} ${WRKSRC}/bin/nim ${PREFIX}/bin
> + ${INSTALL_PROGRAM} ${WRKSRC}/bin/nimble ${PREFIX}/bin
> ${INSTALL_DATA_DIR} ${PREFIX}/lib/nim
> cp -R ${WRKSRC}/lib/* ${PREFIX}/lib/nim
> chown -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/nim
> ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nim
> ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/nim
> + ${INSTALL_DATA_DIR} ${PREFIX}/etc/nim
> + ${INSTALL_DATA} ${WRKSRC}/config/*.cfg ${PREFIX}/etc/nim
> ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nim
> ${INSTALL_DATA} ${WRKSRC}/config/*.cfg ${PREFIX}/share/examples/nim
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/lang/nim/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- distinfo 9 Jan 2017 10:32:33 - 1.4
> +++ distinfo 12 Apr 2020 08:50:34 -
> @@ -1,2 +1,2 @@
> -SHA256 (nim-0.16.0.tar.xz) = nhmYI75Hy6VeYt1pgvAs8KrXMvNpeZ/sQqTYwiZcUWc=
> -SIZE (nim-0.16.0.tar.xz) = 2907076
> +SHA256 (nim-1.2.0.tar.xz) = TpRYOjc5ZYIYBeZl4KBfUvthCRZnbtsJFIlBQVY3xXU=
> +SIZE (nim-1.2.0.tar.xz) = 5869428
> Index: patches/patch-build_sh
> ===
> RCS file: /cvs/ports/lang/nim/patches/patch-build_sh,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-build_sh
> --- patches/patch-build_sh15 Jun 2016 00:19:59 - 1.2
> +++ patches/patch-build_sh12 Apr 2020 08:50:34 -
> @@ -1,16 +1,15 @@
> $OpenBSD: patch-build_sh,v 1.2 2016/06/15 00:19:59 juanfra Exp $
> --- build.sh.origTue Jun 7 00:38:53 2016
> +++ build.sh Thu Jun 9 19:43:03 2016
> -@@ -26,9 +26,9 @@ do
> - esac
> - done
> -
> --CC="gcc"
> --LINKER="gcc"
> --COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w -O3
> -fno-strict-aliasing$extraBuildArgs"
> -+#CC="gcc"
> -+#LINKER="gcc"
> -+COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w
> -fno-strict-aliasing$extraBuildArgs"
> - LINK_FLAGS="${LDFLAGS:-} "
> - PS4=""
> - # platform detection
> +@@ -89,6 +89,11 @@
> + ;;
> + *openbsd* )
> + myos="openbsd"
> ++if [ "$ucpu" = "powerpc" ] ; then
> ++ CC="gcc"
> ++ else
> ++ CC="clang"
These should not be hardcoded, but use CC (and CFLAGS etc) passed in from ports.
> ++fi
> + LINK_FLAGS="$LINK_FLAGS -lm"
> + ;;
> + *netbsd* )
> Index: patches/patch-compiler_extccomp_nim
> ===
> RCS file: patches/patch-compiler_extccomp_nim
> diff -N patches/patch-compiler_extccomp_nim
> --- patches/patch-compiler_extccomp_nim 9 Jan 2017 10:32:33 -
> 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,47 +0,0 @@
> -$OpenBSD: patch-compiler_extccomp_nim,v 1.3 2017/01/09 10:32:33 juanfra Exp $
> compiler/extccomp.nim.orig Sun Jan 8 21:33:43 2017
> -+++ compiler/extccomp.nimMon Jan 9 02:22:00 2017
> -@@ -21,7 +21,7 @@ import
> - type
> - TSystemCC* = enum
> - ccNone, ccGcc, ccLLVM_Gcc, ccCLang, ccLcc, ccBcc, ccDmc, ccWcc, ccVcc,
> --ccTcc, ccPcc, ccUcc, ccIcl, asmFasm
> -+ccTcc, ccPcc, ccUcc,
Re: [UPDATE] lang/nim-1.2.0
On Fri, Apr 10, 2020 at 09:41:53PM +0200, Denis Fondras wrote:
> On Fri, Apr 10, 2020 at 12:12:58AM +0530, putridsou...@gmail.com wrote:
> > Latest Update for nim-1.2.0
> > Builds successfully on amd64
> >
> > 1 new patch added -> patch-install_sh
> > 4 patches removed -> patch-koch_nim, patch-lib_pure_endians_nim,
> > patch-compiler_extccomp_nim,
> > patch-tests_testament_tester_nim
> >
> > Someone should test this.
> >
>
> It does not work here unless I copy /etc/nim* to /usr/local/etc/nim/
>
Here is a new diff. Add config files to /usr/local/etc/nim and add nimble to the
package.
Index: Makefile
===
RCS file: /cvs/ports/lang/nim/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile31 Aug 2019 15:36:56 - 1.10
+++ Makefile12 Apr 2020 08:50:34 -
@@ -6,7 +6,7 @@ BROKEN-i386 = hardcodes gcc; see config/
COMMENT = statically typed, imperative programming language
-VERSION = 0.16.0
+VERSION = 1.2.0
DISTNAME = nim-${VERSION}
EXTRACT_SUFX = .tar.xz
REVISION = 0
@@ -39,15 +39,21 @@ do-build:
cd ${WRKSRC} && ./koch boot -d:release --parallelBuild:1 \
--nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \
--listCmd --putenv:"PATH=${PATH}"
+ cd ${WRKSRC} && ./koch nimble -d:release --parallelBuild:1 \
+ --nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \
+ --listCmd --putenv:"PATH=${PATH}"
do-install:
${INSTALL_PROGRAM_DIR} ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/bin/nim ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/nimble ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/lib/nim
cp -R ${WRKSRC}/lib/* ${PREFIX}/lib/nim
chown -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/nim
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nim
${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/nim
+ ${INSTALL_DATA_DIR} ${PREFIX}/etc/nim
+ ${INSTALL_DATA} ${WRKSRC}/config/*.cfg ${PREFIX}/etc/nim
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nim
${INSTALL_DATA} ${WRKSRC}/config/*.cfg ${PREFIX}/share/examples/nim
Index: distinfo
===
RCS file: /cvs/ports/lang/nim/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo9 Jan 2017 10:32:33 - 1.4
+++ distinfo12 Apr 2020 08:50:34 -
@@ -1,2 +1,2 @@
-SHA256 (nim-0.16.0.tar.xz) = nhmYI75Hy6VeYt1pgvAs8KrXMvNpeZ/sQqTYwiZcUWc=
-SIZE (nim-0.16.0.tar.xz) = 2907076
+SHA256 (nim-1.2.0.tar.xz) = TpRYOjc5ZYIYBeZl4KBfUvthCRZnbtsJFIlBQVY3xXU=
+SIZE (nim-1.2.0.tar.xz) = 5869428
Index: patches/patch-build_sh
===
RCS file: /cvs/ports/lang/nim/patches/patch-build_sh,v
retrieving revision 1.2
diff -u -p -r1.2 patch-build_sh
--- patches/patch-build_sh 15 Jun 2016 00:19:59 - 1.2
+++ patches/patch-build_sh 12 Apr 2020 08:50:34 -
@@ -1,16 +1,15 @@
$OpenBSD: patch-build_sh,v 1.2 2016/06/15 00:19:59 juanfra Exp $
--- build.sh.orig Tue Jun 7 00:38:53 2016
+++ build.sh Thu Jun 9 19:43:03 2016
-@@ -26,9 +26,9 @@ do
- esac
- done
-
--CC="gcc"
--LINKER="gcc"
--COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w -O3
-fno-strict-aliasing$extraBuildArgs"
-+#CC="gcc"
-+#LINKER="gcc"
-+COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w -fno-strict-aliasing$extraBuildArgs"
- LINK_FLAGS="${LDFLAGS:-} "
- PS4=""
- # platform detection
+@@ -89,6 +89,11 @@
+ ;;
+ *openbsd* )
+ myos="openbsd"
++if [ "$ucpu" = "powerpc" ] ; then
++ CC="gcc"
++ else
++ CC="clang"
++fi
+ LINK_FLAGS="$LINK_FLAGS -lm"
+ ;;
+ *netbsd* )
Index: patches/patch-compiler_extccomp_nim
===
RCS file: patches/patch-compiler_extccomp_nim
diff -N patches/patch-compiler_extccomp_nim
--- patches/patch-compiler_extccomp_nim 9 Jan 2017 10:32:33 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,47 +0,0 @@
-$OpenBSD: patch-compiler_extccomp_nim,v 1.3 2017/01/09 10:32:33 juanfra Exp $
compiler/extccomp.nim.orig Sun Jan 8 21:33:43 2017
-+++ compiler/extccomp.nim Mon Jan 9 02:22:00 2017
-@@ -21,7 +21,7 @@ import
- type
- TSystemCC* = enum
- ccNone, ccGcc, ccLLVM_Gcc, ccCLang, ccLcc, ccBcc, ccDmc, ccWcc, ccVcc,
--ccTcc, ccPcc, ccUcc, ccIcl, asmFasm
-+ccTcc, ccPcc, ccUcc, ccIcl, asmFasm, ccEGcc
- TInfoCCProp* = enum # properties of the C compiler:
- hasSwitchRange, # CC allows ranges in switch statements (GNU C)
- hasComputedGoto, # CC has computed goto (GNU C extension)
-@@ -69,8 +69,8 @@ compiler gcc:
- result = (
- name: "gcc",
- objExt: "o",
--optSpeed: " -O3 -ffast-math ",
--optSize: " -Os
Re: [UPDATE] lang/nim-1.2.0
On Fri, Apr 10, 2020 at 12:09:57PM -0600, j...@bitminer.ca wrote: > The patch doesn't apply: > > > Hmm... The next patch looks like a unified diff to me... > The text leading up to this was: > -- > |Index: patches/patch-config_nim_cfg > |=== > |RCS file: /cvs/ports/lang/nim/patches/patch-config_nim_cfg,v > |retrieving revision 1.3 > |diff -u -p -r1.3 patch-config_nim_cfg > |--- patches/patch-config_nim_cfg 9 Jan 2017 10:32:33 - 1.3 > |+++ patches/patch-config_nim_cfg 9 Apr 2020 18:28:53 - > -- > Patching file patches/patch-config_nim_cfg using Plan A... > patch: malformed patch at line 217: - > Funny! It applied fine here :/ > > Please resubmit; btw your posted email doesn't work. > > > John >
Re: [UPDATE] lang/nim-1.2.0
The patch doesn't apply: Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -- |Index: patches/patch-config_nim_cfg |=== |RCS file: /cvs/ports/lang/nim/patches/patch-config_nim_cfg,v |retrieving revision 1.3 |diff -u -p -r1.3 patch-config_nim_cfg |--- patches/patch-config_nim_cfg 9 Jan 2017 10:32:33 - 1.3 |+++ patches/patch-config_nim_cfg 9 Apr 2020 18:28:53 - -- Patching file patches/patch-config_nim_cfg using Plan A... patch: malformed patch at line 217: - Please resubmit; btw your posted email doesn't work. John
Re: [UPDATE] lang/nim-1.2.0
On Fri, Apr 10, 2020 at 09:41:53PM +0200, Denis Fondras wrote:
> On Fri, Apr 10, 2020 at 12:12:58AM +0530, putridsou...@gmail.com wrote:
> > Latest Update for nim-1.2.0
> > Builds successfully on amd64
> >
> > 1 new patch added -> patch-install_sh
> > 4 patches removed -> patch-koch_nim, patch-lib_pure_endians_nim,
> > patch-compiler_extccomp_nim,
> > patch-tests_testament_tester_nim
> >
> > Someone should test this.
> >
>
> It does not work here unless I copy /etc/nim* to /usr/local/etc/nim/
>
More precisely, nimble does not work. This is a different problem.
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/lang/nim/Makefile,v
> > retrieving revision 1.10
> > diff -u -p -r1.10 Makefile
> > --- Makefile31 Aug 2019 15:36:56 - 1.10
> > +++ Makefile9 Apr 2020 18:28:53 -
> > @@ -6,7 +6,7 @@ BROKEN-i386 = hardcodes gcc; see config/
> >
> > COMMENT = statically typed, imperative programming language
> >
> > -VERSION = 0.16.0
> > +VERSION = 1.2.0
> > DISTNAME = nim-${VERSION}
> > EXTRACT_SUFX = .tar.xz
> > REVISION = 0
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/lang/nim/distinfo,v
> > retrieving revision 1.4
> > diff -u -p -r1.4 distinfo
> > --- distinfo9 Jan 2017 10:32:33 - 1.4
> > +++ distinfo9 Apr 2020 18:28:53 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (nim-0.16.0.tar.xz) = nhmYI75Hy6VeYt1pgvAs8KrXMvNpeZ/sQqTYwiZcUWc=
> > -SIZE (nim-0.16.0.tar.xz) = 2907076
> > +SHA256 (nim-1.2.0.tar.xz) = TpRYOjc5ZYIYBeZl4KBfUvthCRZnbtsJFIlBQVY3xXU=
> > +SIZE (nim-1.2.0.tar.xz) = 5869428
> > Index: patches/patch-build_sh
> > ===
> > RCS file: /cvs/ports/lang/nim/patches/patch-build_sh,v
> > retrieving revision 1.2
> > diff -u -p -r1.2 patch-build_sh
> > --- patches/patch-build_sh 15 Jun 2016 00:19:59 - 1.2
> > +++ patches/patch-build_sh 9 Apr 2020 18:28:53 -
> > @@ -1,16 +1,15 @@
> > $OpenBSD: patch-build_sh,v 1.2 2016/06/15 00:19:59 juanfra Exp $
> > --- build.sh.orig Tue Jun 7 00:38:53 2016
> > +++ build.sh Thu Jun 9 19:43:03 2016
> > -@@ -26,9 +26,9 @@ do
> > - esac
> > - done
> > -
> > --CC="gcc"
> > --LINKER="gcc"
> > --COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w -O3
> > -fno-strict-aliasing$extraBuildArgs"
> > -+#CC="gcc"
> > -+#LINKER="gcc"
> > -+COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w
> > -fno-strict-aliasing$extraBuildArgs"
> > - LINK_FLAGS="${LDFLAGS:-} "
> > - PS4=""
> > - # platform detection
> > +@@ -89,6 +89,11 @@
> > + ;;
> > + *openbsd* )
> > + myos="openbsd"
> > ++if [ "$ucpu" = "powerpc" ] ; then
> > ++ CC="gcc"
> > ++ else
> > ++ CC="clang"
> > ++fi
> > + LINK_FLAGS="$LINK_FLAGS -lm"
> > + ;;
> > + *netbsd* )
> > Index: patches/patch-compiler_extccomp_nim
> > ===
> > RCS file: patches/patch-compiler_extccomp_nim
> > diff -N patches/patch-compiler_extccomp_nim
> > --- patches/patch-compiler_extccomp_nim 9 Jan 2017 10:32:33 -
> > 1.3
> > +++ /dev/null 1 Jan 1970 00:00:00 -
> > @@ -1,47 +0,0 @@
> > -$OpenBSD: patch-compiler_extccomp_nim,v 1.3 2017/01/09 10:32:33 juanfra
> > Exp $
> > compiler/extccomp.nim.orig Sun Jan 8 21:33:43 2017
> > -+++ compiler/extccomp.nim Mon Jan 9 02:22:00 2017
> > -@@ -21,7 +21,7 @@ import
> > - type
> > - TSystemCC* = enum
> > - ccNone, ccGcc, ccLLVM_Gcc, ccCLang, ccLcc, ccBcc, ccDmc, ccWcc, ccVcc,
> > --ccTcc, ccPcc, ccUcc, ccIcl, asmFasm
> > -+ccTcc, ccPcc, ccUcc, ccIcl, asmFasm, ccEGcc
> > - TInfoCCProp* = enum # properties of the C compiler:
> > - hasSwitchRange, # CC allows ranges in switch statements
> > (GNU C)
> > - hasComputedGoto, # CC has computed goto (GNU C extension)
> > -@@ -69,8 +69,8 @@ compiler gcc:
> > - result = (
> > - name: "gcc",
> > - objExt: "o",
> > --optSpeed: " -O3 -ffast-math ",
> > --optSize: " -Os -ffast-math ",
> > -+optSpeed: " -O2 ",
> > -+optSize: " -Os ",
> > - compilerExe: "gcc",
> > - cppCompiler: "g++",
> > - compileTmpl: "-c $options $include -o $objfile $file",
> > -@@ -90,6 +90,13 @@ compiler gcc:
> > - props: {hasSwitchRange, hasComputedGoto, hasCpp, hasGcGuard,
> > hasGnuAsm,
> > - hasAttribute})
> > -
> > -+compiler egcc:
> > -+result = gcc()
> > -+
> > -+result.name = "egcc"
> > -+result.compilerExe = "egcc"
> > -+result.cppCompiler = "eg++"
> > -+
> > - # LLVM Frontend for GCC/G++
> > - compiler llvmGcc:
> > - result = gcc() # Uses settings from GCC
> > -@@ -359,7 +366,8 @@ const
> > - pcc(),
> > - ucc(),
> > - icl(),
> > --fasm()]
> > -+fasm(),
> > -+
Re: [UPDATE] lang/nim-1.2.0
On Fri, Apr 10, 2020 at 12:12:58AM +0530, putridsou...@gmail.com wrote:
> Latest Update for nim-1.2.0
> Builds successfully on amd64
>
> 1 new patch added -> patch-install_sh
> 4 patches removed -> patch-koch_nim, patch-lib_pure_endians_nim,
> patch-compiler_extccomp_nim,
> patch-tests_testament_tester_nim
>
> Someone should test this.
>
It does not work here unless I copy /etc/nim* to /usr/local/etc/nim/
> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/nim/Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile
> --- Makefile 31 Aug 2019 15:36:56 - 1.10
> +++ Makefile 9 Apr 2020 18:28:53 -
> @@ -6,7 +6,7 @@ BROKEN-i386 = hardcodes gcc; see config/
>
> COMMENT =statically typed, imperative programming language
>
> -VERSION =0.16.0
> +VERSION =1.2.0
> DISTNAME = nim-${VERSION}
> EXTRACT_SUFX = .tar.xz
> REVISION = 0
> Index: distinfo
> ===
> RCS file: /cvs/ports/lang/nim/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- distinfo 9 Jan 2017 10:32:33 - 1.4
> +++ distinfo 9 Apr 2020 18:28:53 -
> @@ -1,2 +1,2 @@
> -SHA256 (nim-0.16.0.tar.xz) = nhmYI75Hy6VeYt1pgvAs8KrXMvNpeZ/sQqTYwiZcUWc=
> -SIZE (nim-0.16.0.tar.xz) = 2907076
> +SHA256 (nim-1.2.0.tar.xz) = TpRYOjc5ZYIYBeZl4KBfUvthCRZnbtsJFIlBQVY3xXU=
> +SIZE (nim-1.2.0.tar.xz) = 5869428
> Index: patches/patch-build_sh
> ===
> RCS file: /cvs/ports/lang/nim/patches/patch-build_sh,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-build_sh
> --- patches/patch-build_sh15 Jun 2016 00:19:59 - 1.2
> +++ patches/patch-build_sh9 Apr 2020 18:28:53 -
> @@ -1,16 +1,15 @@
> $OpenBSD: patch-build_sh,v 1.2 2016/06/15 00:19:59 juanfra Exp $
> --- build.sh.origTue Jun 7 00:38:53 2016
> +++ build.sh Thu Jun 9 19:43:03 2016
> -@@ -26,9 +26,9 @@ do
> - esac
> - done
> -
> --CC="gcc"
> --LINKER="gcc"
> --COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w -O3
> -fno-strict-aliasing$extraBuildArgs"
> -+#CC="gcc"
> -+#LINKER="gcc"
> -+COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w
> -fno-strict-aliasing$extraBuildArgs"
> - LINK_FLAGS="${LDFLAGS:-} "
> - PS4=""
> - # platform detection
> +@@ -89,6 +89,11 @@
> + ;;
> + *openbsd* )
> + myos="openbsd"
> ++if [ "$ucpu" = "powerpc" ] ; then
> ++ CC="gcc"
> ++ else
> ++ CC="clang"
> ++fi
> + LINK_FLAGS="$LINK_FLAGS -lm"
> + ;;
> + *netbsd* )
> Index: patches/patch-compiler_extccomp_nim
> ===
> RCS file: patches/patch-compiler_extccomp_nim
> diff -N patches/patch-compiler_extccomp_nim
> --- patches/patch-compiler_extccomp_nim 9 Jan 2017 10:32:33 -
> 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,47 +0,0 @@
> -$OpenBSD: patch-compiler_extccomp_nim,v 1.3 2017/01/09 10:32:33 juanfra Exp $
> compiler/extccomp.nim.orig Sun Jan 8 21:33:43 2017
> -+++ compiler/extccomp.nimMon Jan 9 02:22:00 2017
> -@@ -21,7 +21,7 @@ import
> - type
> - TSystemCC* = enum
> - ccNone, ccGcc, ccLLVM_Gcc, ccCLang, ccLcc, ccBcc, ccDmc, ccWcc, ccVcc,
> --ccTcc, ccPcc, ccUcc, ccIcl, asmFasm
> -+ccTcc, ccPcc, ccUcc, ccIcl, asmFasm, ccEGcc
> - TInfoCCProp* = enum # properties of the C compiler:
> - hasSwitchRange, # CC allows ranges in switch statements (GNU
> C)
> - hasComputedGoto, # CC has computed goto (GNU C extension)
> -@@ -69,8 +69,8 @@ compiler gcc:
> - result = (
> - name: "gcc",
> - objExt: "o",
> --optSpeed: " -O3 -ffast-math ",
> --optSize: " -Os -ffast-math ",
> -+optSpeed: " -O2 ",
> -+optSize: " -Os ",
> - compilerExe: "gcc",
> - cppCompiler: "g++",
> - compileTmpl: "-c $options $include -o $objfile $file",
> -@@ -90,6 +90,13 @@ compiler gcc:
> - props: {hasSwitchRange, hasComputedGoto, hasCpp, hasGcGuard, hasGnuAsm,
> - hasAttribute})
> -
> -+compiler egcc:
> -+result = gcc()
> -+
> -+result.name = "egcc"
> -+result.compilerExe = "egcc"
> -+result.cppCompiler = "eg++"
> -+
> - # LLVM Frontend for GCC/G++
> - compiler llvmGcc:
> - result = gcc() # Uses settings from GCC
> -@@ -359,7 +366,8 @@ const
> - pcc(),
> - ucc(),
> - icl(),
> --fasm()]
> -+fasm(),
> -+egcc()]
> -
> - hExt* = ".h"
> -
> Index: patches/patch-config_nim_cfg
> ===
> RCS file: /cvs/ports/lang/nim/patches/patch-config_nim_cfg,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-config_nim_cfg
> --- patches/patch-config_nim_cfg 9 Jan 2017 10:32:33 - 1.3
> +++ patches/patch-config_nim_cfg 9 Apr 2020 18:28:53 -
>
[UPDATE] lang/nim-1.2.0
Latest Update for nim-1.2.0
Builds successfully on amd64
1 new patch added -> patch-install_sh
4 patches removed -> patch-koch_nim, patch-lib_pure_endians_nim,
patch-compiler_extccomp_nim,
patch-tests_testament_tester_nim
Someone should test this.
comments, ok's?
Index: Makefile
===
RCS file: /cvs/ports/lang/nim/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile31 Aug 2019 15:36:56 - 1.10
+++ Makefile9 Apr 2020 18:28:53 -
@@ -6,7 +6,7 @@ BROKEN-i386 = hardcodes gcc; see config/
COMMENT = statically typed, imperative programming language
-VERSION = 0.16.0
+VERSION = 1.2.0
DISTNAME = nim-${VERSION}
EXTRACT_SUFX = .tar.xz
REVISION = 0
Index: distinfo
===
RCS file: /cvs/ports/lang/nim/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo9 Jan 2017 10:32:33 - 1.4
+++ distinfo9 Apr 2020 18:28:53 -
@@ -1,2 +1,2 @@
-SHA256 (nim-0.16.0.tar.xz) = nhmYI75Hy6VeYt1pgvAs8KrXMvNpeZ/sQqTYwiZcUWc=
-SIZE (nim-0.16.0.tar.xz) = 2907076
+SHA256 (nim-1.2.0.tar.xz) = TpRYOjc5ZYIYBeZl4KBfUvthCRZnbtsJFIlBQVY3xXU=
+SIZE (nim-1.2.0.tar.xz) = 5869428
Index: patches/patch-build_sh
===
RCS file: /cvs/ports/lang/nim/patches/patch-build_sh,v
retrieving revision 1.2
diff -u -p -r1.2 patch-build_sh
--- patches/patch-build_sh 15 Jun 2016 00:19:59 - 1.2
+++ patches/patch-build_sh 9 Apr 2020 18:28:53 -
@@ -1,16 +1,15 @@
$OpenBSD: patch-build_sh,v 1.2 2016/06/15 00:19:59 juanfra Exp $
--- build.sh.orig Tue Jun 7 00:38:53 2016
+++ build.sh Thu Jun 9 19:43:03 2016
-@@ -26,9 +26,9 @@ do
- esac
- done
-
--CC="gcc"
--LINKER="gcc"
--COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w -O3
-fno-strict-aliasing$extraBuildArgs"
-+#CC="gcc"
-+#LINKER="gcc"
-+COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w -fno-strict-aliasing$extraBuildArgs"
- LINK_FLAGS="${LDFLAGS:-} "
- PS4=""
- # platform detection
+@@ -89,6 +89,11 @@
+ ;;
+ *openbsd* )
+ myos="openbsd"
++if [ "$ucpu" = "powerpc" ] ; then
++ CC="gcc"
++ else
++ CC="clang"
++fi
+ LINK_FLAGS="$LINK_FLAGS -lm"
+ ;;
+ *netbsd* )
Index: patches/patch-compiler_extccomp_nim
===
RCS file: patches/patch-compiler_extccomp_nim
diff -N patches/patch-compiler_extccomp_nim
--- patches/patch-compiler_extccomp_nim 9 Jan 2017 10:32:33 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,47 +0,0 @@
-$OpenBSD: patch-compiler_extccomp_nim,v 1.3 2017/01/09 10:32:33 juanfra Exp $
compiler/extccomp.nim.orig Sun Jan 8 21:33:43 2017
-+++ compiler/extccomp.nim Mon Jan 9 02:22:00 2017
-@@ -21,7 +21,7 @@ import
- type
- TSystemCC* = enum
- ccNone, ccGcc, ccLLVM_Gcc, ccCLang, ccLcc, ccBcc, ccDmc, ccWcc, ccVcc,
--ccTcc, ccPcc, ccUcc, ccIcl, asmFasm
-+ccTcc, ccPcc, ccUcc, ccIcl, asmFasm, ccEGcc
- TInfoCCProp* = enum # properties of the C compiler:
- hasSwitchRange, # CC allows ranges in switch statements (GNU C)
- hasComputedGoto, # CC has computed goto (GNU C extension)
-@@ -69,8 +69,8 @@ compiler gcc:
- result = (
- name: "gcc",
- objExt: "o",
--optSpeed: " -O3 -ffast-math ",
--optSize: " -Os -ffast-math ",
-+optSpeed: " -O2 ",
-+optSize: " -Os ",
- compilerExe: "gcc",
- cppCompiler: "g++",
- compileTmpl: "-c $options $include -o $objfile $file",
-@@ -90,6 +90,13 @@ compiler gcc:
- props: {hasSwitchRange, hasComputedGoto, hasCpp, hasGcGuard, hasGnuAsm,
- hasAttribute})
-
-+compiler egcc:
-+result = gcc()
-+
-+result.name = "egcc"
-+result.compilerExe = "egcc"
-+result.cppCompiler = "eg++"
-+
- # LLVM Frontend for GCC/G++
- compiler llvmGcc:
- result = gcc() # Uses settings from GCC
-@@ -359,7 +366,8 @@ const
- pcc(),
- ucc(),
- icl(),
--fasm()]
-+fasm(),
-+egcc()]
-
- hExt* = ".h"
-
Index: patches/patch-config_nim_cfg
===
RCS file: /cvs/ports/lang/nim/patches/patch-config_nim_cfg,v
retrieving revision 1.3
diff -u -p -r1.3 patch-config_nim_cfg
--- patches/patch-config_nim_cfg9 Jan 2017 10:32:33 - 1.3
+++ patches/patch-config_nim_cfg9 Apr 2020 18:28:53 -
@@ -1,56 +1,25 @@
$OpenBSD: patch-config_nim_cfg,v 1.3 2017/01/09 10:32:33 juanfra Exp $
--- config/nim.cfg.origSun Jan 8 21:33:42 2017
+++ config/nim.cfg Mon Jan 9 02:28:32 2017
-@@ -76,7 +76,7 @@ path="$lib/pure"
- @end
- @if bsd or haiku:
- # BSD got posix_spawn only recently, so we deactivate it for osproc:
--define:useFork
-+#define:useFork
- # at
