CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Maya Rashish" <maya%netbsd.org@localhost>
Date: Sun, 19 Jan 2020 18:20:46 +0000

Module Name:    pkgsrc
Committed By:   maya
Date:           Sun Jan 19 18:20:46 UTC 2020

Modified Files:
        pkgsrc/devel/cbindgen: Makefile
        pkgsrc/graphics/librsvg: Makefile
        pkgsrc/mk/build: build.mk
        pkgsrc/sysutils/exa: Makefile
        pkgsrc/textproc/bat: Makefile
        pkgsrc/textproc/ripgrep: Makefile
        pkgsrc/www/geckodriver: Makefile

Log Message:
Rename EFFECTIVE_MAKE_JOBS -> _MAKE_JOBS_N, suggested by gdt.

I am under the impression we use _THING to mean "defined by the
implementation", which would be similar to the C meaning of __ prefix,
rather than "private to this file".


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/cbindgen/Makefile
cvs rdiff -u -r1.114 -r1.115 pkgsrc/graphics/librsvg/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/mk/build/build.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/exa/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/bat/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/ripgrep/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/geckodriver/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/cbindgen/Makefile
diff -u pkgsrc/devel/cbindgen/Makefile:1.12 pkgsrc/devel/cbindgen/Makefile:1.13
--- pkgsrc/devel/cbindgen/Makefile:1.12 Sun Jan 19 16:52:46 2020
+++ pkgsrc/devel/cbindgen/Makefile      Sun Jan 19 18:20:45 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2020/01/19 16:52:46 maya Exp $
+# $NetBSD: Makefile,v 1.13 2020/01/19 18:20:45 maya Exp $
 
 DISTNAME=      cbindgen-0.12.1
 CATEGORIES=    devel
@@ -48,7 +48,7 @@ CARGO_CRATE_DEPENDS+= winapi-x86_64-pc-w
 INSTALLATION_DIRS=     bin
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${EFFECTIVE_MAKE_JOBS}
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${_MAKE_JOBS_N}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/cbindgen ${DESTDIR}${PREFIX}/bin

Index: pkgsrc/graphics/librsvg/Makefile
diff -u pkgsrc/graphics/librsvg/Makefile:1.114 pkgsrc/graphics/librsvg/Makefile:1.115
--- pkgsrc/graphics/librsvg/Makefile:1.114      Sun Jan 19 16:52:46 2020
+++ pkgsrc/graphics/librsvg/Makefile    Sun Jan 19 18:20:46 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.114 2020/01/19 16:52:46 maya Exp $
+# $NetBSD: Makefile,v 1.115 2020/01/19 18:20:46 maya Exp $
 
 DISTNAME=      librsvg-2.46.4
 CATEGORIES=    graphics gnome
@@ -11,7 +11,7 @@ COMMENT=      SVG library for GNOME
 LICENSE=       gnu-lgpl-v2
 
 MAKE_JOBS_SAFE=        NO
-MAKE_FLAGS+=   CARGO_MAKE_JOBS=-j${EFFECTIVE_MAKE_JOBS}
+MAKE_FLAGS+=   CARGO_MAKE_JOBS=-j${_MAKE_JOBS_N}
 
 USE_LIBTOOL=           yes
 USE_TOOLS+=            pkg-config gmake aclocal autoconf automake

Index: pkgsrc/mk/build/build.mk
diff -u pkgsrc/mk/build/build.mk:1.29 pkgsrc/mk/build/build.mk:1.30
--- pkgsrc/mk/build/build.mk:1.29       Sun Jan 19 16:51:47 2020
+++ pkgsrc/mk/build/build.mk    Sun Jan 19 18:20:46 2020
@@ -1,4 +1,4 @@
-# $NetBSD: build.mk,v 1.29 2020/01/19 16:51:47 maya Exp $
+# $NetBSD: build.mk,v 1.30 2020/01/19 18:20:46 maya Exp $
 #
 # This file defines what happens in the build phase, excluding the
 # self-test, which is defined in test.mk.
@@ -38,7 +38,7 @@
 # Keywords: build make
 
 _VARGROUPS+=           build
-_DEF_VARS.build=       EFFECTIVE_MAKE_JOBS
+_DEF_VARS.build=       _MAKE_JOBS_N
 _USER_VARS.build=      MAKE_JOBS BUILD_ENV_SHELL
 _PKG_VARS.build=       MAKE_ENV MAKE_FLAGS BUILD_MAKE_FLAGS BUILD_TARGET MAKE_JOBS_SAFE
 _SYS_VARS.build=       BUILD_MAKE_CMD
@@ -55,14 +55,14 @@ BUILD_MAKE_CMD= \
                        -f ${MAKE_FILE}
 
 .if defined(MAKE_JOBS_SAFE) && !empty(MAKE_JOBS_SAFE:M[nN][oO])
-_MAKE_JOBS=            # nothing
-EFFECTIVE_MAKE_JOBS=   1
+_MAKE_JOBS=    # nothing
+_MAKE_JOBS_N=  1
 .elif defined(MAKE_JOBS.${PKGPATH})
-_MAKE_JOBS=            -j${MAKE_JOBS.${PKGPATH}}
-EFFECTIVE_MAKE_JOBS=   ${MAKE_JOBS.${PKGPATH}}
+_MAKE_JOBS=    -j${MAKE_JOBS.${PKGPATH}}
+_MAKE_JOBS_N=  ${MAKE_JOBS.${PKGPATH}}
 .elif defined(MAKE_JOBS)
-_MAKE_JOBS=            -j${MAKE_JOBS}
-EFFECTIVE_MAKE_JOBS=   ${MAKE_JOBS}
+_MAKE_JOBS=    -j${MAKE_JOBS}
+_MAKE_JOBS_N=  ${MAKE_JOBS}
 .endif
 
 ######################################################################

Index: pkgsrc/sysutils/exa/Makefile
diff -u pkgsrc/sysutils/exa/Makefile:1.2 pkgsrc/sysutils/exa/Makefile:1.3
--- pkgsrc/sysutils/exa/Makefile:1.2    Sun Jan 19 16:52:46 2020
+++ pkgsrc/sysutils/exa/Makefile        Sun Jan 19 18:20:45 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/01/19 16:52:46 maya Exp $
+# $NetBSD: Makefile,v 1.3 2020/01/19 18:20:45 maya Exp $
 
 DISTNAME=      exa-0.9.0
 CATEGORIES=    sysutils
@@ -85,7 +85,7 @@ INSTALLATION_DIRS=    bin \
                        share/zsh/site-functions
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${EFFECTIVE_MAKE_JOBS}
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${_MAKE_JOBS_N}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/exa ${DESTDIR}${PREFIX}/bin

Index: pkgsrc/textproc/bat/Makefile
diff -u pkgsrc/textproc/bat/Makefile:1.5 pkgsrc/textproc/bat/Makefile:1.6
--- pkgsrc/textproc/bat/Makefile:1.5    Sun Jan 19 16:52:47 2020
+++ pkgsrc/textproc/bat/Makefile        Sun Jan 19 18:20:46 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/01/19 16:52:47 maya Exp $
+# $NetBSD: Makefile,v 1.6 2020/01/19 18:20:46 maya Exp $
 
 DISTNAME=      bat-0.12.1
 PKGREVISION=   1
@@ -159,7 +159,7 @@ CARGO_CRATE_DEPENDS+=       yaml-rust-0.4.3
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${EFFECTIVE_MAKE_JOBS}
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${_MAKE_JOBS_N}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/bat ${DESTDIR}${PREFIX}/bin

Index: pkgsrc/textproc/ripgrep/Makefile
diff -u pkgsrc/textproc/ripgrep/Makefile:1.7 pkgsrc/textproc/ripgrep/Makefile:1.8
--- pkgsrc/textproc/ripgrep/Makefile:1.7        Sun Jan 19 16:52:47 2020
+++ pkgsrc/textproc/ripgrep/Makefile    Sun Jan 19 18:20:46 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/01/19 16:52:47 maya Exp $
+# $NetBSD: Makefile,v 1.8 2020/01/19 18:20:46 maya Exp $
 
 DISTNAME=      ripgrep-11.0.2
 CATEGORIES=    textproc
@@ -79,7 +79,7 @@ CARGO_CRATE_DEPENDS+= wincolor-1.0.1
 INSTALLATION_DIRS=     bin
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${EFFECTIVE_MAKE_JOBS}
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${_MAKE_JOBS_N}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/rg ${DESTDIR}${PREFIX}/bin

Index: pkgsrc/www/geckodriver/Makefile
diff -u pkgsrc/www/geckodriver/Makefile:1.9 pkgsrc/www/geckodriver/Makefile:1.10
--- pkgsrc/www/geckodriver/Makefile:1.9 Sun Jan 19 16:52:47 2020
+++ pkgsrc/www/geckodriver/Makefile     Sun Jan 19 18:20:46 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/01/19 16:52:47 maya Exp $
+# $NetBSD: Makefile,v 1.10 2020/01/19 18:20:46 maya Exp $
 
 DISTNAME=      geckodriver-0.24.0
 CATEGORIES=    www
@@ -170,7 +170,7 @@ post-extract:
        cp ${FILESDIR}/Cargo.lock ${WRKSRC}/Cargo.lock
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${EFFECTIVE_MAKE_JOBS}
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${_MAKE_JOBS_N}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/geckodriver ${DESTDIR}${PREFIX}/bin

Prev by Date: CVS commit: pkgsrc/lang/rust
Next by Date: CVS commit: pkgsrc/lang/rust
Previous by Thread: CVS commit: pkgsrc/lang/rust
Next by Thread: CVS commit: pkgsrc/lang/rust
Indexes:

Home | Main Index | Thread Index | Old Index