diff options
| author | rillig <rillig@pkgsrc.org> | 2019-11-03 19:03:56 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2019-11-03 19:03:56 +0000 |
| commit | f3e75ceb4c3556df6213bde475948b339e473145 (patch) | |
| tree | b3b17a0eba0ed16bdb945808e31f63568deae484 | |
| parent | ad8095b0a5c5b758e832cddea87cfb29097177bd (diff) | |
| download | pkgsrc-f3e75ceb4c3556df6213bde475948b339e473145.tar.gz | |
lang: align variable assignments
pkglint -Wall -F --only aligned --only indent -r
No manual corrections.
159 files changed, 1032 insertions, 1032 deletions
diff --git a/lang/Cg-compiler/Makefile b/lang/Cg-compiler/Makefile index 807487cf5aa..50ec82ad837 100644 --- a/lang/Cg-compiler/Makefile +++ b/lang/Cg-compiler/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2017/08/01 14:59:00 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/03 19:03:56 rillig Exp $ # DISTNAME= Cg-3.1_April2012_x86${DIST_ARCH} @@ -71,23 +71,23 @@ INSTALLATION_DIRS+= bin include/Cg share/doc/Cg-compiler \ share/examples/Cg-compiler/Direct3D11/advanced/include_string \ share/examples/Cg-compiler/Direct3D11/advanced/interpolation_modifier \ share/examples/Cg-compiler/Direct3D11/basic/02_vertex_and_fragment_program \ - share/examples/Cg-compiler/Direct3D11/basic/03_uniform_parameter \ - share/examples/Cg-compiler/Direct3D11/basic/04_varying_parameter \ - share/examples/Cg-compiler/Direct3D11/basic/05_texture_sampling \ - share/examples/Cg-compiler/Direct3D11/basic/06_vertex_twisting \ - share/examples/Cg-compiler/Direct3D11/basic/07_two_texture_accesses \ - share/examples/Cg-compiler/Direct3D11/basic/cgfx_buffer \ - share/examples/Cg-compiler/Direct3D11/basic/cgfx_simple \ - share/examples/Cg-compiler/Direct3D11/basic/cgfx_texture \ + share/examples/Cg-compiler/Direct3D11/basic/03_uniform_parameter \ + share/examples/Cg-compiler/Direct3D11/basic/04_varying_parameter \ + share/examples/Cg-compiler/Direct3D11/basic/05_texture_sampling \ + share/examples/Cg-compiler/Direct3D11/basic/06_vertex_twisting \ + share/examples/Cg-compiler/Direct3D11/basic/07_two_texture_accesses \ + share/examples/Cg-compiler/Direct3D11/basic/cgfx_buffer \ + share/examples/Cg-compiler/Direct3D11/basic/cgfx_simple \ + share/examples/Cg-compiler/Direct3D11/basic/cgfx_texture \ share/examples/Cg-compiler/Direct3D9/advanced/cgfx_buffer_lighting \ - share/examples/Cg-compiler/Direct3D9/advanced/cgfx_bumpdemo \ + share/examples/Cg-compiler/Direct3D9/advanced/cgfx_bumpdemo \ share/examples/Cg-compiler/Direct3D9/basic/01_vertex_program \ share/examples/Cg-compiler/Direct3D9/basic/02_vertex_and_fragment_program \ - share/examples/Cg-compiler/Direct3D9/basic/03_uniform_parameter \ - share/examples/Cg-compiler/Direct3D9/basic/04_varying_parameter \ - share/examples/Cg-compiler/Direct3D9/basic/05_texture_sampling \ - share/examples/Cg-compiler/Direct3D9/basic/06_vertex_twisting \ - share/examples/Cg-compiler/Direct3D9/basic/07_two_texture_accesses \ + share/examples/Cg-compiler/Direct3D9/basic/03_uniform_parameter \ + share/examples/Cg-compiler/Direct3D9/basic/04_varying_parameter \ + share/examples/Cg-compiler/Direct3D9/basic/05_texture_sampling \ + share/examples/Cg-compiler/Direct3D9/basic/06_vertex_twisting \ + share/examples/Cg-compiler/Direct3D9/basic/07_two_texture_accesses \ share/examples/Cg-compiler/Direct3D9/miniDXUT \ share/examples/Cg-compiler/OpenGL/advanced/cgfx_boxfilter \ share/examples/Cg-compiler/OpenGL/advanced/cgfx_bumpdemo_array \ diff --git a/lang/STk/Makefile b/lang/STk/Makefile index 5d737587209..9153d4423ad 100644 --- a/lang/STk/Makefile +++ b/lang/STk/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.23 2013/06/16 11:47:13 ryoon Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/03 19:03:56 rillig Exp $ DISTNAME= STk-4.0.1 -PKGREVISION= 3 -CATEGORIES= lang -MASTER_SITES= ftp://kaolin.unice.fr/pub/STk/ +PKGREVISION= 3 +CATEGORIES= lang +MASTER_SITES= ftp://kaolin.unice.fr/pub/STk/ -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://kaolin.essi.fr/STk/ +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://kaolin.essi.fr/STk/ COMMENT= Scheme interpreter with full access to the Tk graphical package CONFLICTS+= snow-[0-9]* diff --git a/lang/camlp4/Makefile b/lang/camlp4/Makefile index 0148b84b91b..19923ec0f66 100644 --- a/lang/camlp4/Makefile +++ b/lang/camlp4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2019/10/09 08:57:14 msaitoh Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/03 19:03:56 rillig Exp $ GITHUB_PROJECT= camlp4 DISTNAME= ${GITHUB_PROJECT}-4.08+1 @@ -16,9 +16,9 @@ MAKE_JOBS_SAFE= no .include "../../mk/ocaml.mk" -BUILD_TARGET= byte camlp4/META +BUILD_TARGET= byte camlp4/META .if ${OCAML_USE_OPT_COMPILER} == "yes" -BUILD_TARGET+= native +BUILD_TARGET+= native .endif INSTALLATION_DIRS+= ${OCAML_SITELIBDIR}/camlp4 diff --git a/lang/chicken/Makefile b/lang/chicken/Makefile index f65a75b09b5..f10f925a6d4 100644 --- a/lang/chicken/Makefile +++ b/lang/chicken/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2018/10/18 14:32:43 jperkin Exp $ +# $NetBSD: Makefile,v 1.61 2019/11/03 19:03:56 rillig Exp $ DISTNAME= chicken-4.13.0 CATEGORIES= lang @@ -25,17 +25,17 @@ BUILD_TARGET= all # PLATFORM detection: .if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" -PLATFORM= bsd +PLATFORM= bsd .elif ${OPSYS} == "Linux" -PLATFORM= linux +PLATFORM= linux .elif ${OPSYS} == "Darwin" -PLATFORM= macosx +PLATFORM= macosx .elif ${OPSYS} == "SunOS" -PLATFORM= solaris +PLATFORM= solaris .elif ${OPSYS} == "Haiku" -PLATFORM= haiku +PLATFORM= haiku .else -#PLATFORM+= ${OPSYS} == "Interix" +#PLATFORM+= ${OPSYS} == "Interix" # possible choices left: mingw-msys mingw cygwin cross-linux-mingw PKG_SKIP_REASON+= "${OPSYS} is not supported" .endif diff --git a/lang/chicken5/Makefile b/lang/chicken5/Makefile index ccfa3b6900b..51a684054f6 100644 --- a/lang/chicken5/Makefile +++ b/lang/chicken5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2019/07/06 21:16:59 leot Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/03 19:03:56 rillig Exp $ DISTNAME= chicken-5.1.0 PKGREVISION= 1 @@ -28,17 +28,17 @@ BUILD_TARGET= all # PLATFORM detection: .if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" -PLATFORM= bsd +PLATFORM= bsd .elif ${OPSYS} == "Linux" -PLATFORM= linux +PLATFORM= linux .elif ${OPSYS} == "Darwin" -PLATFORM= macosx +PLATFORM= macosx .elif ${OPSYS} == "SunOS" -PLATFORM= solaris +PLATFORM= solaris .elif ${OPSYS} == "Haiku" -PLATFORM= haiku +PLATFORM= haiku .else -#PLATFORM+= ${OPSYS} == "Interix" +#PLATFORM+= ${OPSYS} == "Interix" # possible choices left: aix android cross-linux-mingw cygwin hurd mingw # mingw-msys PKG_SKIP_REASON+= "${OPSYS} is not supported" diff --git a/lang/cim/Makefile b/lang/cim/Makefile index 384917a52cb..07177cc807f 100644 --- a/lang/cim/Makefile +++ b/lang/cim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2019/08/11 13:21:19 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2019/11/03 19:03:56 rillig Exp $ DISTNAME= cim-3.30 PKGREVISION= 8 @@ -9,10 +9,10 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.gnu.org/software/cim/cim.html COMMENT= Simula compiler based on the C programming language -GNU_CONFIGURE= YES -CONFIGURE_ENV+= libtool_path=${PKG_LIBTOOL:Q} -USE_TOOLS+= perl:run -USE_LIBTOOL= YES +GNU_CONFIGURE= YES +CONFIGURE_ENV+= libtool_path=${PKG_LIBTOOL:Q} +USE_TOOLS+= perl:run +USE_LIBTOOL= YES INFO_FILES= yes .include "../../mk/bsd.pkg.mk" diff --git a/lang/clang/Makefile.common b/lang/clang/Makefile.common index 5b02e5979fb..4e54fb8c185 100644 --- a/lang/clang/Makefile.common +++ b/lang/clang/Makefile.common @@ -1,11 +1,11 @@ -# $NetBSD: Makefile.common,v 1.36 2019/10/24 11:40:00 tnn Exp $ +# $NetBSD: Makefile.common,v 1.37 2019/11/03 19:03:56 rillig Exp $ # used by lang/clang/Makefile # used by lang/clang-static-analyzer/Makefile # used by lang/clang-tools-extra/Makefile DISTNAME= cfe-9.0.0.src CATEGORIES= lang devel -MASTER_SITES= http://releases.llvm.org/${PKGVERSION_NOREV}/ +MASTER_SITES= http://releases.llvm.org/${PKGVERSION_NOREV}/ EXTRACT_SUFX= .tar.xz MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/lang/classpath-gui/Makefile b/lang/classpath-gui/Makefile index 48bee03bf66..5d9285fa540 100644 --- a/lang/classpath-gui/Makefile +++ b/lang/classpath-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2019/07/21 22:25:14 wiz Exp $ +# $NetBSD: Makefile,v 1.47 2019/11/03 19:03:56 rillig Exp $ .include "../../lang/classpath/Makefile.common" @@ -14,7 +14,7 @@ BUILD_DIRS= native/jni/classpath BUILD_DIRS+= native/jni/gtk-peer INSTALL_DIRS= native/jni/gtk-peer -BUILDLINK_FILES.libart+= bin/libart2-config +BUILDLINK_FILES.libart+= bin/libart2-config BUILDLINK_FNAME_TRANSFORM.libart+= -e 's|/libart2-config|/libart-config|g' BUILDLINK_DEPMETHOD.libXt?= build diff --git a/lang/classpath/Makefile b/lang/classpath/Makefile index b2b65d4e712..e4778c4cd57 100644 --- a/lang/classpath/Makefile +++ b/lang/classpath/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.20 2013/04/06 20:27:22 rodent Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/03 19:03:56 rillig Exp $ .include "Makefile.common" PKGREVISION= 5 -USE_TOOLS+= makeinfo zip +USE_TOOLS+= makeinfo zip INFO_FILES= yes CONFIGURE_ARGS+= --disable-gtk-peer diff --git a/lang/coq/Makefile b/lang/coq/Makefile index f28ac819f9a..30dc15d8a7c 100644 --- a/lang/coq/Makefile +++ b/lang/coq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.125 2019/09/01 00:51:46 markd Exp $ +# $NetBSD: Makefile,v 1.126 2019/11/03 19:03:57 rillig Exp $ # DISTNAME= coq-8.9.1 @@ -28,18 +28,18 @@ BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.10 .include "../../mk/bsd.prefs.mk" .include "../../mk/ocaml.mk" -PLIST_VARS+= native +PLIST_VARS+= native .if ${OCAML_USE_OPT_COMPILER} == "yes" -PLIST_SUBST+= COQIDE_TYPE="opt" -PLIST.native= yes +PLIST_SUBST+= COQIDE_TYPE="opt" +PLIST.native= yes CONFIGURE_ARGS+= -native-compiler yes UNLIMIT_RESOURCES+= stacksize # compilation of some files needs this -BUILD_TARGET= world +BUILD_TARGET= world .else -PLIST_SUBST+= COQIDE_TYPE="byte" +PLIST_SUBST+= COQIDE_TYPE="byte" CONFIGURE_ARGS+= -native-compiler no -BUILD_TARGET= byte -INSTALL_TARGET= install-byte +BUILD_TARGET= byte +INSTALL_TARGET= install-byte .endif .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "x86_64") @@ -54,14 +54,14 @@ PLIST.natdynlink= yes .include "../../lang/python/pyversion.mk" -REPLACE_SH= configure install.sh +REPLACE_SH= configure install.sh REPLACE_INTERPRETER= python REPLACE.python.old= python REPLACE.python.new= ${PYTHONBIN} REPLACE_FILES.python= tools/TimeFileMaker.py \ - tools/make-both-single-timing-files.py \ - tools/make-both-time-files.py \ - tools/make-one-time-file.py + tools/make-both-single-timing-files.py \ + tools/make-both-time-files.py \ + tools/make-one-time-file.py INSTALL_ENV+= COQINSTALLPREFIX=${DESTDIR} @@ -72,11 +72,11 @@ PLIST_VARS+= coqide natdynlink doc EGDIR= ${PREFIX}/share/coq/examples #CONF_FILES= {EGDIR}/coqide-gtk2rc ${PKG_SYSCONFDIR}/xdg/coq/coqide-gtk2rc -SUBST_CLASSES+= fix-paths -SUBST_STAGE.fix-paths= post-configure +SUBST_CLASSES+= fix-paths +SUBST_STAGE.fix-paths= post-configure SUBST_MESSAGE.fix-paths= Remove buildlink references from Coq_config module -SUBST_FILES.fix-paths= config/coq_config.ml -SUBST_SED.fix-paths= -e "s,${BUILDLINK_DIR},${PREFIX},g" +SUBST_FILES.fix-paths= config/coq_config.ml +SUBST_SED.fix-paths= -e "s,${BUILDLINK_DIR},${PREFIX},g" .include "../../lang/camlp5/buildlink3.mk" .include "../../math/ocaml-num/buildlink3.mk" diff --git a/lang/coq/options.mk b/lang/coq/options.mk index c6481d24b60..477b0d2276f 100644 --- a/lang/coq/options.mk +++ b/lang/coq/options.mk @@ -1,53 +1,53 @@ -# $NetBSD: options.mk,v 1.7 2019/09/02 13:33:23 adam Exp $ +# $NetBSD: options.mk,v 1.8 2019/11/03 19:03:57 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.coq -PKG_SUPPORTED_OPTIONS= doc coqide -PKG_SUGGESTED_OPTIONS= coqide +PKG_OPTIONS_VAR= PKG_OPTIONS.coq +PKG_SUPPORTED_OPTIONS= doc coqide +PKG_SUGGESTED_OPTIONS= coqide .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mdoc) PYTHON_VERSIONS_INCOMPATIBLE= 27 -CONFIGURE_ARGS+= -with-doc yes -PLIST.doc= yes -BUILD_DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin -BUILD_DEPENDS+= hevea>=1.10:../../textproc/hevea -BUILD_DEPENDS+= tex-moreverb-[0-9]*:../../print/tex-moreverb -BUILD_DEPENDS+= tex-preprint-[0-9]*:../../print/tex-preprint -BUILD_DEPENDS+= tex-ucs-[0-9]*:../../print/tex-ucs -BUILD_DEPENDS+= py[0-9]*-sphinx-[0-9]*:../../textproc/py-sphinx -BUILD_DEPENDS+= py[0-9]*-sphinx-rtd-theme-[0-9]*:../../textproc/py-sphinx-rtd-theme -BUILD_DEPENDS+= py[0-9]*-sphinxcontrib-bibtex-[0-9]*:../../textproc/py-sphinxcontrib-bibtex -BUILD_DEPENDS+= py[0-9]*-pybtex-[0-9]*:../../textproc/py-pybtex -BUILD_DEPENDS+= py[0-9]*-pybtex-docutils-[0-9]*:../../textproc/py-pybtex-docutils -BUILD_DEPENDS+= py[0-9]*-pexpect-[0-9]*:../../devel/py-pexpect -BUILD_DEPENDS+= py[0-9]*-antlr4-[0-9]*:../../textproc/py-antlr4 -BUILD_DEPENDS+= py[0-9]*-beautifulsoup4-[0-9]*:../../www/py-beautifulsoup4 -BUILD_DEPENDS+= latexmk-[0-9]*:../../print/latexmk -BUILD_DEPENDS+= tex-xetex-[0-9]*:../../print/tex-xetex -BUILD_DEPENDS+= tex-polyglossia-[0-9]*:../../print/tex-polyglossia -BUILD_DEPENDS+= tex-fncychap-[0-9]*:../../print/tex-fncychap -BUILD_DEPENDS+= tex-tabulary-[0-9]*:../../print/tex-tabulary -BUILD_DEPENDS+= tex-varwidth-[0-9]*:../../print/tex-varwidth -BUILD_DEPENDS+= tex-parskip-[0-9]*:../../print/tex-parskip -BUILD_DEPENDS+= tex-upquote-[0-9]*:../../print/tex-upquote -BUILD_DEPENDS+= tex-capt-of-[0-9]*:../../print/tex-capt-of -BUILD_DEPENDS+= tex-needspace-[0-9]*:../../print/tex-needspace -BUILD_DEPENDS+= tex-unicode-math-[0-9]*:../../math/tex-unicode-math -BUILD_DEPENDS+= tex-microtype-[0-9]*:../../print/tex-microtype -BUILD_DEPENDS+= tex-adjustbox-[0-9]*:../../print/tex-adjustbox -BUILD_DEPENDS+= tex-xindy-[0-9]*:../../textproc/tex-xindy -BUILD_DEPENDS+= tex-ec-[0-9]*:../../fonts/tex-ec -BUILD_DEPENDS+= tex-xcolor-[0-9]*:../../print/tex-xcolor -BUILD_DEPENDS+= tex-xkeyval-[0-9]*:../../print/tex-xkeyval -BUILD_DEPENDS+= tex-titlesec-[0-9]*:../../print/tex-titlesec -BUILD_DEPENDS+= tex-framed-[0-9]*:../../print/tex-framed -BUILD_DEPENDS+= tex-float-[0-9]*:../../print/tex-float -BUILD_DEPENDS+= tex-wrapfig-[0-9]*:../../print/tex-wrapfig -BUILD_DEPENDS+= tex-lm-math-[0-9]*:../../fonts/tex-lm-math -BUILD_DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk +CONFIGURE_ARGS+= -with-doc yes +PLIST.doc= yes +BUILD_DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin +BUILD_DEPENDS+= hevea>=1.10:../../textproc/hevea +BUILD_DEPENDS+= tex-moreverb-[0-9]*:../../print/tex-moreverb +BUILD_DEPENDS+= tex-preprint-[0-9]*:../../print/tex-preprint +BUILD_DEPENDS+= tex-ucs-[0-9]*:../../print/tex-ucs +BUILD_DEPENDS+= py[0-9]*-sphinx-[0-9]*:../../textproc/py-sphinx +BUILD_DEPENDS+= py[0-9]*-sphinx-rtd-theme-[0-9]*:../../textproc/py-sphinx-rtd-theme +BUILD_DEPENDS+= py[0-9]*-sphinxcontrib-bibtex-[0-9]*:../../textproc/py-sphinxcontrib-bibtex +BUILD_DEPENDS+= py[0-9]*-pybtex-[0-9]*:../../textproc/py-pybtex +BUILD_DEPENDS+= py[0-9]*-pybtex-docutils-[0-9]*:../../textproc/py-pybtex-docutils +BUILD_DEPENDS+= py[0-9]*-pexpect-[0-9]*:../../devel/py-pexpect +BUILD_DEPENDS+= py[0-9]*-antlr4-[0-9]*:../../textproc/py-antlr4 +BUILD_DEPENDS+= py[0-9]*-beautifulsoup4-[0-9]*:../../www/py-beautifulsoup4 +BUILD_DEPENDS+= latexmk-[0-9]*:../../print/latexmk +BUILD_DEPENDS+= tex-xetex-[0-9]*:../../print/tex-xetex +BUILD_DEPENDS+= tex-polyglossia-[0-9]*:../../print/tex-polyglossia +BUILD_DEPENDS+= tex-fncychap-[0-9]*:../../print/tex-fncychap +BUILD_DEPENDS+= tex-tabulary-[0-9]*:../../print/tex-tabulary +BUILD_DEPENDS+= tex-varwidth-[0-9]*:../../print/tex-varwidth +BUILD_DEPENDS+= tex-parskip-[0-9]*:../../print/tex-parskip +BUILD_DEPENDS+= tex-upquote-[0-9]*:../../print/tex-upquote +BUILD_DEPENDS+= tex-capt-of-[0-9]*:../../print/tex-capt-of +BUILD_DEPENDS+= tex-needspace-[0-9]*:../../print/tex-needspace +BUILD_DEPENDS+= tex-unicode-math-[0-9]*:../../math/tex-unicode-math +BUILD_DEPENDS+= tex-microtype-[0-9]*:../../print/tex-microtype +BUILD_DEPENDS+= tex-adjustbox-[0-9]*:../../print/tex-adjustbox +BUILD_DEPENDS+= tex-xindy-[0-9]*:../../textproc/tex-xindy +BUILD_DEPENDS+= tex-ec-[0-9]*:../../fonts/tex-ec +BUILD_DEPENDS+= tex-xcolor-[0-9]*:../../print/tex-xcolor +BUILD_DEPENDS+= tex-xkeyval-[0-9]*:../../print/tex-xkeyval +BUILD_DEPENDS+= tex-titlesec-[0-9]*:../../print/tex-titlesec +BUILD_DEPENDS+= tex-framed-[0-9]*:../../print/tex-framed +BUILD_DEPENDS+= tex-float-[0-9]*:../../print/tex-float +BUILD_DEPENDS+= tex-wrapfig-[0-9]*:../../print/tex-wrapfig +BUILD_DEPENDS+= tex-lm-math-[0-9]*:../../fonts/tex-lm-math +BUILD_DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk .else -CONFIGURE_ARGS+= -with-doc no +CONFIGURE_ARGS+= -with-doc no .endif .if !empty(PKG_OPTIONS:Mcoqide) diff --git a/lang/ecl/options.mk b/lang/ecl/options.mk index d943ecc5629..9cc28c54771 100644 --- a/lang/ecl/options.mk +++ b/lang/ecl/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.11 2019/03/01 13:30:52 leot Exp $ +# $NetBSD: options.mk,v 1.12 2019/11/03 19:03:57 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ecl PKG_SUPPORTED_OPTIONS+= debug threads unicode ffi @@ -22,11 +22,11 @@ CONFIGURE_ENV+= THREAD_LDFLAGS=${BUILDLINK_LDFLAGS.pthread:Q} CONFIGURE_ENV+= THREAD_LIBS=${BUILDLINK_LIBS.pthread:Q} # XXX Although NetBSD-6+ supports TLS, ECL oddly crashes on startup # on NetBSD-6 when it's used here. Untested yet with NetBSD-7. -.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "Darwin" +. if ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "Darwin" CONFIGURE_ARGS+= --with-__thread=yes -.else +. else CONFIGURE_ARGS+= --with-__thread=no -.endif +. endif .include "../../mk/pthread.buildlink3.mk" .else CONFIGURE_ARGS+= --disable-threads diff --git a/lang/elk/options.mk b/lang/elk/options.mk index 9da6e4d7724..d29decdf86e 100644 --- a/lang/elk/options.mk +++ b/lang/elk/options.mk @@ -1,9 +1,9 @@ -# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:02 jlam Exp $ +# $NetBSD: options.mk,v 1.4 2019/11/03 19:03:57 rillig Exp $ # Global and legacy options PKG_OPTIONS_VAR= PKG_OPTIONS.elk -PKG_SUPPORTED_OPTIONS= xaw motif +PKG_SUPPORTED_OPTIONS= xaw motif PKG_SUGGESTED_OPTIONS= .include "../../mk/bsd.options.mk" @@ -23,7 +23,7 @@ CONFIGURE_ENV+= WITH_XAW="yes" CONFIGURE_ENV+= WITH_XAW="no" . endif . if !empty(PKG_OPTIONS:Mmotif) -. include "../../mk/motif.buildlink3.mk" +. include "../../mk/motif.buildlink3.mk" PLIST.motif= yes . endif .else diff --git a/lang/erlang/Makefile.versions b/lang/erlang/Makefile.versions index 05586f7ec30..cebe2367910 100644 --- a/lang/erlang/Makefile.versions +++ b/lang/erlang/Makefile.versions @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.versions,v 1.44 2019/08/01 11:43:00 nia Exp $ +# $NetBSD: Makefile.versions,v 1.45 2019/11/03 19:03:57 rillig Exp $ DIST_VERSION_MAJOR= 22 DIST_VERSION_MINOR= 0 @@ -10,8 +10,8 @@ DIST_VERSION_PATCH= 7 PLIST_SUBST+= VERSION=${DIST_VERSION_MAJOR} .for name version in ${_VERSIONS} -VERSION.${name}=${version} -PLIST_SUBST+= VERSION.${name}=${version} +VERSION.${name}= ${version} +PLIST_SUBST+= VERSION.${name}=${version} .endfor # Generate PLIST diff --git a/lang/f2c/Makefile b/lang/f2c/Makefile index 03cabfac59b..2fd7a0b4a9d 100644 --- a/lang/f2c/Makefile +++ b/lang/f2c/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2018/11/20 09:38:26 maya Exp $ +# $NetBSD: Makefile,v 1.67 2019/11/03 19:03:57 rillig Exp $ DISTNAME= f2c-20100903 # see notes below PKGREVISION= 1 @@ -13,7 +13,7 @@ CONFLICTS= egcs-current-19980608 WRKSRC= ${WRKDIR}/f2c -BUILD_DIRS= src +BUILD_DIRS= src USE_BSD_MAKEFILE= yes USE_TOOLS= nroff INSTALLATION_DIRS= bin share/doc/f2c ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1 diff --git a/lang/g95/Makefile b/lang/g95/Makefile index e13d847a538..4cf74a06b9e 100644 --- a/lang/g95/Makefile +++ b/lang/g95/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2019/08/11 13:21:19 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2019/11/03 19:03:57 rillig Exp $ DISTNAME= g95_source PKGNAME= g95-0.93 @@ -37,10 +37,10 @@ LDFLAGS.Darwin+= -Wl,-read_only_relocs,suppress .if ${OPSYS} == "Linux" . if exists(/usr/lib/${MACHINE_ARCH}-linux-gnu) -MAKE_ENV+= LIBRARY_PATH=/usr/lib/${MACHINE_ARCH}-linux-gnu +MAKE_ENV+= LIBRARY_PATH=/usr/lib/${MACHINE_ARCH}-linux-gnu . endif -MAKE_ENV+= ac_cv_have_decl_asprintf=yes -USE_TOOLS+= perl:build +MAKE_ENV+= ac_cv_have_decl_asprintf=yes +USE_TOOLS+= perl:build .endif .if ${OPSYS} == "SunOS" diff --git a/lang/gambc/Makefile b/lang/gambc/Makefile index 9431866b505..bc9470e60fb 100644 --- a/lang/gambc/Makefile +++ b/lang/gambc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2018/07/18 00:06:20 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/03 19:03:57 rillig Exp $ # DISTNAME= gambc-${GAMBC_DIST_VERSION} @@ -36,8 +36,8 @@ MAKE_FILE= makefile BUILD_TARGET+= bootstrap TEST_TARGET= check -CHECK_PORTABILITY_SKIP= prebuilt/*/* -DLOPEN_REQUIRE_PTHREADS=no +CHECK_PORTABILITY_SKIP= prebuilt/*/* +DLOPEN_REQUIRE_PTHREADS= no TEST_TARGET= check diff --git a/lang/gambc/hacks.mk b/lang/gambc/hacks.mk index 82cceb0991c..7d953385a6b 100644 --- a/lang/gambc/hacks.mk +++ b/lang/gambc/hacks.mk @@ -1,15 +1,15 @@ -# $NetBSD: hacks.mk,v 1.2 2008/05/06 15:26:57 bjs Exp $ +# $NetBSD: hacks.mk,v 1.3 2019/11/03 19:03:57 rillig Exp $ ### .if !defined(GAMBC_HACKS_MK) GAMBC_HACKS_MK= # empty -. include "../../mk/compiler.mk" +.include "../../mk/compiler.mk" ### ### It looks as if the developers don't think O2 is a win. Considering how ### much memory and time this package takes to build the more optimization ### is enabled, let's let the configure script do its job. ### -. if !empty(CC_VERSION:Mgcc-*) +.if !empty(CC_VERSION:Mgcc-*) BUILDLINK_TRANSFORM+= rm:-O[2-9s]* -. endif +.endif BUILDLINK_TRANSFORM+= rm:-pipe # XXX takes up too much memory .endif diff --git a/lang/gcc-aux/Makefile b/lang/gcc-aux/Makefile index 320c83862ed..a07c92459e5 100644 --- a/lang/gcc-aux/Makefile +++ b/lang/gcc-aux/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2019/09/08 09:24:04 maya Exp $ +# $NetBSD: Makefile,v 1.34 2019/11/03 19:03:57 rillig Exp $ PKGNAME= gcc-aux-${SNAPSHOT} PKGREVISION= 4 @@ -53,14 +53,14 @@ BOOTSTRAP_COMPILER= ada-bootstrap.${GARCH}.freebsd.100B.tar.bz2 .if ${OPSYS} == NetBSD . if !empty(OS_VERSION:M6.99.*) -NSUFF= 7.0_DEV +NSUFF= 7.0_DEV . elif !empty(OS_VERSION:M7.99.*) -NSUFF= 8.0_DEV +NSUFF= 8.0_DEV . else -NSUFF= ${OS_VERSION} +NSUFF= ${OS_VERSION} . endif . if ${GARCH} == i386 -NELF= elf +NELF= elf . endif XLDF= -lm . if ${OS_VERSION:R} < 7 @@ -126,7 +126,7 @@ BUILDDIR= ${WRKDIR}/build NEWBSDIR= ${WRKDIR}/newbs/bootstrap SYSLIBDIR= ${WRKDIR}/lib CFG_SCRIPT= ${WRKSRC}/configure -REVFILE= ${WRKSRC}/gcc/REVISION +REVFILE= ${WRKSRC}/gcc/REVISION BOOTSTRAP_PREFIX= ${WRKDIR}/bootstrap PKG_PREFIX= ${PREFIX}/gcc-aux BSFILENAME= ada-bootstrap.${GARCH}.${LOWER_OPSYS}.${OS_VERSION:C/[A-Z_.-]//g}.tar @@ -135,22 +135,22 @@ BSFILENAME= ada-bootstrap.${GARCH}.${LOWER_OPSYS}.${OS_VERSION:C/[A-Z_.-]//g}.t # testing if gcc-aux is already installed - if so, use this compiler along with # its gnatlink, gnatbind, and gnatmake rather than the older bootstrap versions .if exists(${LOCALBASE}/gcc-aux/bin/ada) -FULL_GNATGCC=${LOCALBASE}/gcc-aux/bin/ada -FULL_GNATGXX=${LOCALBASE}/gcc-aux/bin/g++ +FULL_GNATGCC= ${LOCALBASE}/gcc-aux/bin/ada +FULL_GNATGXX= ${LOCALBASE}/gcc-aux/bin/g++ .endif .if ${FULL_GNATGCC} == "NOT SET" # here we know we need to install the bootstrap compiler . if defined(BOOTSTRAP_TRIPLET) -FULL_GNATGCC=${BOOTSTRAP_PREFIX}/bin/gnatgcc +FULL_GNATGCC= ${BOOTSTRAP_PREFIX}/bin/gnatgcc . else -FULL_GNATGCC=${BOOTSTRAP_PREFIX}/bin/gcc ${COMPILER_ABI_SWITCH} -FULL_GNATGXX=${BOOTSTRAP_PREFIX}/bin/g++ ${COMPILER_ABI_SWITCH} +FULL_GNATGCC= ${BOOTSTRAP_PREFIX}/bin/gcc ${COMPILER_ABI_SWITCH} +FULL_GNATGXX= ${BOOTSTRAP_PREFIX}/bin/g++ ${COMPILER_ABI_SWITCH} . endif -DISTFILES+= ${BOOTSTRAP_COMPILER} +DISTFILES+= ${BOOTSTRAP_COMPILER} SITES.${BOOTSTRAP_COMPILER}= http://downloads.dragonlace.net/src/ -FULL_PATH=${BOOTSTRAP_PREFIX}/bin:/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/sbin:${PREFIX}/bin +FULL_PATH= ${BOOTSTRAP_PREFIX}/bin:/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/sbin:${PREFIX}/bin .endif @@ -158,17 +158,17 @@ FULL_PATH=${BOOTSTRAP_PREFIX}/bin:/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/sbin:$ .if defined(PLUS_BOOTSTRAPS) MASTER_SITES= http://downloads.dragonlace.net/src/ MASTER_SITES+= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/} -DISTFILES= \ - ${DISTNAME}.tar.bz2 \ - ada-bootstrap.i386.dragonfly.36A.tar.bz2 \ - ada-bootstrap.i386.freebsd.84.tar.bz2 \ - ada-bootstrap.i386.freebsd.100B.tar.bz2 \ - ada-bootstrap.i386.netbsd.614.tar.bz2 \ - ada-bootstrap.x86_64.dragonfly.36A.tar.bz2 \ - ada-bootstrap.x86_64.freebsd.84.tar.bz2 \ - ada-bootstrap.x86_64.freebsd.100B.tar.bz2 \ - ada-bootstrap.x86_64.netbsd.614.tar.bz2 \ - ada-bootstrap.x86_64.solaris.511.tar.bz2 +DISTFILES= \ + ${DISTNAME}.tar.bz2 \ + ada-bootstrap.i386.dragonfly.36A.tar.bz2 \ + ada-bootstrap.i386.freebsd.84.tar.bz2 \ + ada-bootstrap.i386.freebsd.100B.tar.bz2 \ + ada-bootstrap.i386.netbsd.614.tar.bz2 \ + ada-bootstrap.x86_64.dragonfly.36A.tar.bz2 \ + ada-bootstrap.x86_64.freebsd.84.tar.bz2 \ + ada-bootstrap.x86_64.freebsd.100B.tar.bz2 \ + ada-bootstrap.x86_64.netbsd.614.tar.bz2 \ + ada-bootstrap.x86_64.solaris.511.tar.bz2 .endif # establish ada-aware compiler for use @@ -200,8 +200,8 @@ CONFIGURE_ARGS+= --disable-libitm CONFIGURE_ARGS+= ${EXTRA_CONFARGS} # Automatic package list generation -GENERATE_PLIST= cd ${DESTDIR}${PREFIX}; -GENERATE_PLIST+= ${FIND} * \( -type f -or -type l \) | ${SORT} -dr; +GENERATE_PLIST= cd ${DESTDIR}${PREFIX}; +GENERATE_PLIST+= ${FIND} * \( -type f -or -type l \) | ${SORT} -dr; post-extract: @@ -295,7 +295,7 @@ do-build: do-test: build test-ada test-fortran test-objc test-cxx test-c test-ada: -.if (${OPSYS} == NetBSD) && (${MACHINE_ARCH} == x86_64) +. if (${OPSYS} == NetBSD) && (${MACHINE_ARCH} == x86_64) # NetBSD has an extremely small default stacksize of 2MB, which is # insufficient for the gnat.dg testsuite. # specifically: entry_queues test on AMD64 @@ -304,20 +304,20 @@ test-ada: cd ${BUILDDIR} && \ ${ULIMIT_CMD_stacksize} && \ ${SETENV} ${MY_MAKE_ENV} ${GMAKE} -sk check-ada -.else +. else cd ${BUILDDIR} && ${SETENV} ${MY_MAKE_ENV} DEJAGNU_TIMEOUT=30 \ ${GMAKE} -sk check-ada -.endif +. endif test-fortran: -.if !empty(PKG_OPTIONS:Mfortran) +. if !empty(PKG_OPTIONS:Mfortran) cd ${BUILDDIR} && ${SETENV} ${MY_MAKE_ENV} ${GMAKE} -sk check-fortran -.endif +. endif test-objc: -.if !empty(PKG_OPTIONS:Mobjc) +. if !empty(PKG_OPTIONS:Mobjc) cd ${BUILDDIR} && ${SETENV} ${MY_MAKE_ENV} ${GMAKE} -sk check-objc -.endif +. endif test-cxx: # libstdc++ always ends with error status, so ignore it diff --git a/lang/gcc-aux/options.mk b/lang/gcc-aux/options.mk index 1f4fa07d4ea..054fbdf86d3 100644 --- a/lang/gcc-aux/options.mk +++ b/lang/gcc-aux/options.mk @@ -1,11 +1,11 @@ -# $NetBSD: options.mk,v 1.7 2019/09/08 14:05:38 maya Exp $ +# $NetBSD: options.mk,v 1.8 2019/11/03 19:03:57 rillig Exp $ # NLS is failing, might be linking with wrong iconv lib. # Disable option until further notice PKG_OPTIONS_VAR= PKG_OPTIONS.gcc-aux -PKG_SUPPORTED_OPTIONS= fortran objc testsuite static bootstrap always-libgcc #nls -PKG_SUGGESTED_OPTIONS= fortran objc #nls +PKG_SUPPORTED_OPTIONS= fortran objc testsuite static bootstrap always-libgcc #nls +PKG_SUGGESTED_OPTIONS= fortran objc #nls .include "../../mk/compiler.mk" .if empty(PKGSRC_COMPILER:Mgcc) @@ -26,15 +26,15 @@ PKG_SUGGESTED_OPTIONS.SunOS+= always-libgcc ############################# .if empty(PKG_OPTIONS:Mfortran) || !empty(PKG_OPTIONS:Mbootstrap) -EXTRA_CONFARGS+= --disable-libquadmath +EXTRA_CONFARGS+= --disable-libquadmath .else -LANGS+= fortran -APPLY_DIFFS+= fortran -.if ${OPSYS} == NetBSD -EXTRA_CONFARGS+= --disable-libquadmath -.else -EXTRA_CONFARGS+= --enable-libquadmath -.endif +LANGS+= fortran +APPLY_DIFFS+= fortran +. if ${OPSYS} == NetBSD +EXTRA_CONFARGS+= --disable-libquadmath +. else +EXTRA_CONFARGS+= --enable-libquadmath +. endif .endif ############################# @@ -54,7 +54,7 @@ delete-installed-libgcc: ################################# .if !empty(PKG_OPTIONS:Mobjc) && empty(PKG_OPTIONS:Mbootstrap) -LANGS+= objc +LANGS+= objc .endif @@ -63,11 +63,11 @@ LANGS+= objc ######################### .if !empty(PKG_OPTIONS:Mtestsuite) && empty(PKG_OPTIONS:Mbootstrap) -BUILD_DEPENDS+= dejagnu>=1.4:../../devel/dejagnu -APPLY_DIFFS+= ada-testsuite -APPLY_DIFFS+= cxx-testsuite -APPLY_DIFFS+= gcc-testsuite -APPLY_DIFFS+= fortran-testsuite +BUILD_DEPENDS+= dejagnu>=1.4:../../devel/dejagnu +APPLY_DIFFS+= ada-testsuite +APPLY_DIFFS+= cxx-testsuite +APPLY_DIFFS+= gcc-testsuite +APPLY_DIFFS+= fortran-testsuite .endif @@ -93,14 +93,14 @@ EXTRA_CONFARGS+= --disable-nls ############################### .if !empty(PKG_OPTIONS:Mstatic) -STATIC_BUILD = yes +STATIC_BUILD = yes .endif .if defined(STATIC_BUILD) && empty(PKG_OPTIONS:Mbootstrap) . if ${OPSYS} == SunOS -PKG_FAIL_REASON+= SunOS does not support static builds +PKG_FAIL_REASON+= SunOS does not support static builds . else -EXTRA_CONFARGS+= --with-stage1-ldflags=-static +EXTRA_CONFARGS+= --with-stage1-ldflags=-static . endif .endif @@ -131,14 +131,14 @@ EXTRA_CONFARGS+= --with-mpc=${BUILDLINK_PREFIX.mpcomplex} .endif .if !empty(PKG_OPTIONS:Mbootstrap) -EXTRA_CONFARGS+= --disable-shared --disable-lto +EXTRA_CONFARGS+= --disable-shared --disable-lto . if ${OPSYS} != SunOS -EXTRA_CONFARGS+= --with-stage1-ldflags=-static -EXTRA_CONFARGS+= --with-boot-ldflags=-static -EXTRA_CONFARGS+= --with-system-zlib +EXTRA_CONFARGS+= --with-stage1-ldflags=-static +EXTRA_CONFARGS+= --with-boot-ldflags=-static +EXTRA_CONFARGS+= --with-system-zlib . endif .else -EXTRA_CONFARGS+= --enable-shared -EXTRA_CONFARGS+= --disable-bootstrap +EXTRA_CONFARGS+= --enable-shared +EXTRA_CONFARGS+= --disable-bootstrap .endif diff --git a/lang/gcc3-c++/buildlink3.mk b/lang/gcc3-c++/buildlink3.mk index 400791e1333..beb236d76d1 100644 --- a/lang/gcc3-c++/buildlink3.mk +++ b/lang/gcc3-c++/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.21 2018/01/07 13:04:18 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2019/11/03 19:03:58 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -15,7 +15,7 @@ GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} BUILDLINK_API_DEPENDS.gcc3-cxx+= gcc3${GCC3_PKGMODIF}-c++>=3.0 BUILDLINK_ABI_DEPENDS.gcc3-cxx+= gcc3-c++>=3.3.5nb1 BUILDLINK_PKGSRCDIR.gcc3-cxx?= ../../lang/gcc3-c++ -BUILDLINK_LIBDIRS.gcc3-cxx?= \ +BUILDLINK_LIBDIRS.gcc3-cxx?= \ lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-cxx}\///} # Packages that link against shared libraries need a full dependency. diff --git a/lang/gcc3-c/Makefile b/lang/gcc3-c/Makefile index 1f77b7fddd9..b7ed9b40408 100644 --- a/lang/gcc3-c/Makefile +++ b/lang/gcc3-c/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2015/03/21 01:17:08 tnn Exp $ +# $NetBSD: Makefile,v 1.29 2019/11/03 19:03:58 rillig Exp $ PKGNAME= gcc3${GCC3_PKGMODIF}-c-${GCC_VERSION} PKGREVISION= 1 @@ -33,12 +33,12 @@ GENERATE_PLIST+= \ post-install: .if ${OPSYS} == "SunOS" cd ${DESTDIR:Q}${GCC_ARCHDIR}/include && ${RM} -f fixed -.if exists(${DESTDIR}${GCC_ARCHDIR}/include/v7) +. if exists(${DESTDIR}${GCC_ARCHDIR}/include/v7) ${RMDIR} ${DESTDIR:Q}${GCC_ARCHDIR}/include/v7 -.endif -.if exists(${DESTDIR}${GCC_ARCHDIR}/include/v9) +. endif +. if exists(${DESTDIR}${GCC_ARCHDIR}/include/v9) ${RMDIR} ${DESTDIR:Q}${GCC_ARCHDIR}/include/v9 -.endif +. endif .endif ${INSTALL_DATA_DIR} ${DESTDIR:Q}${GCC_PREFIX}/mk ${INSTALL_DATA} ${WRKDIR}/gcc3.mk ${DESTDIR:Q}${GCC_PREFIX}/mk/c.mk diff --git a/lang/gcc3-f77/buildlink3.mk b/lang/gcc3-f77/buildlink3.mk index 89436ce8a35..c498dcd8861 100644 --- a/lang/gcc3-f77/buildlink3.mk +++ b/lang/gcc3-f77/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.21 2018/01/07 13:04:18 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2019/11/03 19:03:58 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -15,7 +15,7 @@ GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} BUILDLINK_API_DEPENDS.gcc3-f77+= gcc3${GCC3_PKGMODIF}-f77>=3.0 BUILDLINK_ABI_DEPENDS.gcc3-f77+= gcc3-f77>=3.3.5nb2 BUILDLINK_PKGSRCDIR.gcc3-f77?= ../../lang/gcc3-f77 -BUILDLINK_LIBDIRS.gcc3-f77?= \ +BUILDLINK_LIBDIRS.gcc3-f77?= \ lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-f77}\///} # Packages that link against shared libraries need a full dependency. diff --git a/lang/gcc3-objc/buildlink3.mk b/lang/gcc3-objc/buildlink3.mk index d415685cd2b..f242bd3bbbf 100644 --- a/lang/gcc3-objc/buildlink3.mk +++ b/lang/gcc3-objc/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.21 2018/01/07 13:04:18 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2019/11/03 19:03:58 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -15,7 +15,7 @@ GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} BUILDLINK_API_DEPENDS.gcc3-objc+= gcc3${GCC3_PKGMODIF}-objc>=3.0 BUILDLINK_ABI_DEPENDS.gcc3-objc+= gcc3-objc>=3.3.5nb1 BUILDLINK_PKGSRCDIR.gcc3-objc?= ../../lang/gcc3-objc -BUILDLINK_LIBDIRS.gcc3-objc?= \ +BUILDLINK_LIBDIRS.gcc3-objc?= \ lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-objc}\///} # Packages that link against shared libraries need a full dependency. diff --git a/lang/gcc3/Makefile.common b/lang/gcc3/Makefile.common index e7719ebd876..1e1524c1219 100644 --- a/lang/gcc3/Makefile.common +++ b/lang/gcc3/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.28 2016/02/25 14:42:55 jperkin Exp $ +# $NetBSD: Makefile.common,v 1.29 2019/11/03 19:03:57 rillig Exp $ # # used by lang/gcc3/language.mk # used by lang/gcc3-c/Makefile @@ -27,7 +27,7 @@ DISTINFO_FILE= ${.CURDIR}/../../lang/gcc3/distinfo GCC3_DEFAULT_SUBPREFIX= gcc3 GCC3_INSTALLTO_SUBPREFIX?= ${GCC3_DEFAULT_SUBPREFIX} .if ${GCC3_INSTALLTO_SUBPREFIX} != ${GCC3_DEFAULT_SUBPREFIX} -GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} +GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} .endif GCC_SUBPREFIX= ${GCC3_INSTALLTO_SUBPREFIX} @@ -63,11 +63,11 @@ CONFIGURE_ARGS.AIX+= --disable-aix64 .if ${OPSYS} == "NetBSD" . if !defined(USE_BINUTILS) -AS_PATH:= ${AS} +AS_PATH:= ${AS} . for _dir_ in ${PATH:C/\:/ /g} . if empty(AS_PATH:M/*) . if exists(${_dir_}/${AS}) -AS_PATH:= ${_dir_}/${AS} +AS_PATH:= ${_dir_}/${AS} . endif . endif . endfor @@ -110,7 +110,7 @@ GCC_REQD+= ${GCC_VERSION} .if ${OPSYS} == "IRIX" . if !empty(PKGSRC_COMPILER:Mmipspro*) -CONFIGURE_ENV+= SGI_ABI="n32" +CONFIGURE_ENV+= SGI_ABI="n32" MAKE_ENV+= SGI_ABI="n32" . endif .endif diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile index 866402596dd..beff8c3200f 100644 --- a/lang/gcc34/Makefile +++ b/lang/gcc34/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2016/01/24 16:14:44 jperkin Exp $ +# $NetBSD: Makefile,v 1.58 2019/11/03 19:03:58 rillig Exp $ # DISTNAME= gcc-${GCC_VERSION} @@ -23,25 +23,25 @@ NOT_FOR_PLATFORM= Interix-*-* # Determine whether to use binutils .if ${OPSYS} == "NetBSD" . if !defined(USE_BINUTILS) -AS_PATH:= ${AS} +AS_PATH:= ${AS} . for _dir_ in ${PATH:C/\:/ /g} . if empty(AS_PATH:M/*) . if exists(${_dir_}/${AS}) -AS_PATH:= ${_dir_}/${AS} +AS_PATH:= ${_dir_}/${AS} . endif . endif . endfor . if !empty(AS_PATH:M${LOCALBASE}/*) -USE_BINUTILS= YES +USE_BINUTILS= YES . else -AS_VERSION!= ${AS_PATH} --version | ${AWK} '{ \ +AS_VERSION!= ${AS_PATH} --version | ${AWK} '{ \ split($$3, v, /[.]/); \ printf "%02d%02d%02d%02d\n",v[1],v[2],v[3],v[4]; \ exit; \ }' -USE_BINUTILS!= ${TEST} ${AS_VERSION} -lt 02130201 && ${ECHO} YES || ${ECHO} NO +USE_BINUTILS!= ${TEST} ${AS_VERSION} -lt 02130201 && ${ECHO} YES || ${ECHO} NO . endif -MAKEFLAGS+= USE_BINUTILS=${USE_BINUTILS:Q} +MAKEFLAGS+= USE_BINUTILS=${USE_BINUTILS:Q} . endif .elif ${OPSYS} == "SunOS" CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump @@ -53,7 +53,7 @@ CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas . endif .endif .if defined(USE_BINUTILS) && !empty(USE_BINUTILS:M[yY][eE][sS]) -DEPENDS+= binutils>=2.14:../../devel/binutils +DEPENDS+= binutils>=2.14:../../devel/binutils CONFIGURE_ARGS+= --with-as=${LOCALBASE}/bin/as CONFIGURE_ARGS+= --with-ld=${LOCALBASE}/bin/ld CONFIGURE_ARGS+= --with-gnu-as @@ -85,14 +85,14 @@ GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX} FILES_SUBST+= PKGNAME=${PKGNAME:Q} MESSAGE_SUBST+= GCC_PREFIX=${GCC_PREFIX} CONFIGURE_ARGS+= --prefix=${GCC_PREFIX:Q} -CPPFLAGS+= -I${BUILDLINK_DIR}/include -CFLAGS+= -I${BUILDLINK_DIR}/include +CPPFLAGS+= -I${BUILDLINK_DIR}/include +CFLAGS+= -I${BUILDLINK_DIR}/include .if ${OPSYS} == "NetBSD" # thread / crtbegin / __cxa_atexit support depend on a "netbsd2" OS name -GCC_PLATFORM= ${MACHINE_ARCH}--${LOWER_OPSYS}${APPEND_ELF}${LOWER_OS_VERSION:C/[_a-z].*//} +GCC_PLATFORM= ${MACHINE_ARCH}--${LOWER_OPSYS}${APPEND_ELF}${LOWER_OS_VERSION:C/[_a-z].*//} CONFIGURE_ARGS+= --host=${GCC_PLATFORM:Q} ABI_BASELINE_PAIR= ${GCC_PLATFORM:C/--/-/} -MAKE_ENV+= ABI_BASELINE_PAIR=${ABI_BASELINE_PAIR:Q} +MAKE_ENV+= ABI_BASELINE_PAIR=${ABI_BASELINE_PAIR:Q} .endif # NetBSD post-patch: @@ -134,12 +134,12 @@ do-install: (cd ${WRKDIR}/obj && ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ${GMAKE} install \ && ${TEST} -f ${GCC_PREFIX}/bin/cc || ${LN} -f ${DESTDIR}${GCC_PREFIX}/bin/gcc ${DESTDIR}${GCC_PREFIX}/bin/cc) .if !empty(PKG_OPTIONS:Mgcc-ada) - (SPECPATH=`${GCC_PREFIX}/bin/gcc -print-file-name=specs` && \ - for EXPANDEDSPECPATH in $${SPECPATH} ; do \ - SPECDIR=`${DIRNAME} $${EXPANDEDSPECPATH}`; \ - ${ECHO} $${SPECDIR}/adainclude > $${SPECDIR}/ada_source_path; \ - ${ECHO} $${SPECDIR}/adalib > $${SPECDIR}/ada_object_path; \ - done ) + (SPECPATH=`${GCC_PREFIX}/bin/gcc -print-file-name=specs` && \ + for EXPANDEDSPECPATH in $${SPECPATH} ; do \ + SPECDIR=`${DIRNAME} $${EXPANDEDSPECPATH}`; \ + ${ECHO} $${SPECDIR}/adainclude > $${SPECDIR}/ada_source_path; \ + ${ECHO} $${SPECDIR}/adalib > $${SPECDIR}/ada_object_path; \ + done ) .endif GENERATE_PLIST+= \ diff --git a/lang/gcc34/options.mk b/lang/gcc34/options.mk index fbbd73ef84b..f8aae359728 100644 --- a/lang/gcc34/options.mk +++ b/lang/gcc34/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2016/09/30 13:16:59 sevan Exp $ +# $NetBSD: options.mk,v 1.8 2019/11/03 19:03:58 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gcc34 PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran gcc-java gcc-objc gcc-ada @@ -21,10 +21,10 @@ PKG_OPTIONS_LEGACY_VARS+= BUILD_OBJC:gcc-objc ### .if !empty(PKG_OPTIONS:Mgcc-fortran) . if !empty(PKG_OPTIONS:Mgcc-inplace-math) -. include "../../devel/gmp/inplace.mk" +. include "../../devel/gmp/inplace.mk" . else CONFIGURE_ARGS+= --with-gmp=${BUILDLINK_PREFIX.gmp} -. include "../../devel/gmp/buildlink3.mk" +. include "../../devel/gmp/buildlink3.mk" . endif .endif @@ -54,8 +54,8 @@ CONFIGURE_ARGS+= --enable-__cxa_atexit .endif .if !empty(PKG_OPTIONS:Mgcc-fortran) -USE_TOOLS+= chmod -MAKE_ENV+= ac_cv_path_ac_cv_prog_chmod=${TOOLS_CHMOD:Q} +USE_TOOLS+= chmod +MAKE_ENV+= ac_cv_path_ac_cv_prog_chmod=${TOOLS_CHMOD:Q} LANGS+= f77 .endif @@ -74,25 +74,25 @@ LANGS+= objc .endif .if !empty(PKG_OPTIONS:Mgcc-ada) -PTHREAD_OPTS+= require native +PTHREAD_OPTS+= require native LANGS+= ada # Ada bootstrap compiler section # An Ada compiler is required to build the Ada compiler. # You may specify the path of any gcc/gnat Ada compiler # by providing the full path of the compiler (example) below: -ALT_GCC= /usr/pkg/bin/gnatgcc +ALT_GCC= /usr/pkg/bin/gnatgcc . if defined(ALT_GCC) -. if exists(${ALT_GCC}) -ALT_GCC_RTS!= ${ALT_GCC} --print-file-name=adalib -. if !empty(ALT_GCC_RTS) -RALT_GCC_RTS= ${ALT_GCC_RTS:S%${LOCALBASE}%%:S%/%%} -. else +. if exists(${ALT_GCC}) +ALT_GCC_RTS!= ${ALT_GCC} --print-file-name=adalib +. if !empty(ALT_GCC_RTS) +RALT_GCC_RTS= ${ALT_GCC_RTS:S%${LOCALBASE}%%:S%/%%} +. else PKG_FAIL_REASON+= "${ALT_GCC} does not appear to be an Ada compiler" -. endif -. else +. endif +. else PKG_FAIL_REASON+= "Missing bootstrap Ada compiler" -. endif +. endif . endif . if !defined(ALT_GCC) PKG_FAIL_REASON+= "An Ada bootstrap compiler must be specified to build Ada" diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile index ae127a89209..227d2bfe6cf 100644 --- a/lang/gcc44/Makefile +++ b/lang/gcc44/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2019/08/11 13:21:19 wiz Exp $ +# $NetBSD: Makefile,v 1.51 2019/11/03 19:03:58 rillig Exp $ DISTNAME= gcc-${GCC_VERSION} PKGNAME= gcc44-${GCC_VERSION} @@ -34,11 +34,11 @@ UNLIMIT_RESOURCES+= stacksize .if ${OPSYS} == "SunOS" CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld -. if !exists(/usr/sfw/bin/gas) +. if !exists(/usr/sfw/bin/gas) CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as -. else +. else CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas -.endif +. endif .endif @@ -50,17 +50,17 @@ CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas # gcc/opth-gen.awk \ # gcc/opt-functions.awk -REPLACE_BASH+= contrib/dg-cmp-results.sh -REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-patchlist -REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-update -REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-update-fix -REPLACE_BASH+= contrib/reghunt/bin/reg-hunt -REPLACE_BASH+= contrib/reghunt/bin/reg-test -REPLACE_BASH+= contrib/reghunt/date_based/reg_periodic -REPLACE_BASH+= contrib/reghunt/date_based/reg_search -REPLACE_BASH+= gcc/dbgcnt.def -REPLACE_BASH+= gcc/testsuite/gcc.test-framework/gen_directive_tests -REPLACE_BASH+= libstdc++-v3/scripts/run_doxygen +REPLACE_BASH+= contrib/dg-cmp-results.sh +REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-patchlist +REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-update +REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-update-fix +REPLACE_BASH+= contrib/reghunt/bin/reg-hunt +REPLACE_BASH+= contrib/reghunt/bin/reg-test +REPLACE_BASH+= contrib/reghunt/date_based/reg_periodic +REPLACE_BASH+= contrib/reghunt/date_based/reg_search +REPLACE_BASH+= gcc/dbgcnt.def +REPLACE_BASH+= gcc/testsuite/gcc.test-framework/gen_directive_tests +REPLACE_BASH+= libstdc++-v3/scripts/run_doxygen CONFIGURE_ARGS+= --prefix=${GCC_PREFIX:Q} CONFIGURE_ARGS+= --enable-languages=${LANGS:Q} @@ -91,15 +91,15 @@ CFLAGS+= -I${BUILDLINK_DIR}/include # Somone should fix this so it will match the NetBSD system compiler #.if ${OPSYS} == "NetBSD" -#GCC_PLATFORM= ${MACHINE_ARCH}--${LOWER_OPSYS}${APPEND_ELF} +#GCC_PLATFORM= ${MACHINE_ARCH}--${LOWER_OPSYS}${APPEND_ELF} #CONFIGURE_ARGS+= --host=${GCC_PLATFORM:Q} #MAKE_ENV+= AR=/usr/bin/ar #.endif # NetBSD .if ${OPSYS} == "NetBSD" -.if !empty(OS_VERSION:M5.*) +. if !empty(OS_VERSION:M5.*) MAKE_ENV+= ac_cv_func_gethostbyname_r=no -.endif +. endif .endif LIBS.SunOS+= -lgmp diff --git a/lang/gcc44/buildlink3.mk b/lang/gcc44/buildlink3.mk index b4e7961501d..d826cf0763c 100644 --- a/lang/gcc44/buildlink3.mk +++ b/lang/gcc44/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2015/11/25 12:51:16 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2019/11/03 19:03:58 rillig Exp $ BUILDLINK_TREE+= gcc44 @@ -15,10 +15,10 @@ BUILDLINK_PKGSRCDIR.gcc44?= ../../lang/gcc44 .if exists(${_GCC44_PREFIX}/bin/gcc) # logic for detecting the ADA compiler (not yet supported) -#gcc44_GNAT1!=${_GCC44_PREFIX}/bin/gcc -print-prog-name=gnat1 +#gcc44_GNAT1!= ${_GCC44_PREFIX}/bin/gcc -print-prog-name=gnat1 #. if exists(${gcc44_GNAT1}) #CONFIGURE_ENV+= ADAC=${_GCC44_PREFIX}/bin/gcc -#MAKE_ENV+= ADAC=${_GCC44_PREFIX}/bin/gcc +#MAKE_ENV+= ADAC=${_GCC44_PREFIX}/bin/gcc #. endif # add libraries diff --git a/lang/gcc48-libs/Makefile b/lang/gcc48-libs/Makefile index f08dce1a4de..250707f70fd 100644 --- a/lang/gcc48-libs/Makefile +++ b/lang/gcc48-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2019/01/16 04:31:39 gutteridge Exp $ +# $NetBSD: Makefile,v 1.31 2019/11/03 19:03:59 rillig Exp $ GCC_PKGNAME= gcc48 .include "../../lang/${GCC_PKGNAME}/version.mk" @@ -42,10 +42,10 @@ SHLIB_EXT= so LIBRARY_FILES= ${WRKDIR}/lib_files -GENERATE_PLIST+= ${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/,' \ - ${LIBRARY_FILES}; -GENERATE_PLIST+= ${GREP} -q 'lib/' ${LIBRARY_FILES} || \ - ${ECHO} '@pkgdir ${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/lib' ; +GENERATE_PLIST+= ${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/,' \ + ${LIBRARY_FILES}; +GENERATE_PLIST+= ${GREP} -q 'lib/' ${LIBRARY_FILES} || \ + ${ECHO} '@pkgdir ${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/lib' ; ${LIBRARY_FILES}: ${PKG_INFO} -qL '${GCC_PKGNAME}-${GCC48_DIST_VERSION}*' | \ diff --git a/lang/gcc48/options.mk b/lang/gcc48/options.mk index 4ff3eb6ed38..f3c0fd96e2b 100644 --- a/lang/gcc48/options.mk +++ b/lang/gcc48/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.12 2019/09/08 14:47:53 maya Exp $ +# $NetBSD: options.mk,v 1.13 2019/11/03 19:03:59 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.${GCC_PKGNAME} PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran gcc-java \ @@ -24,9 +24,9 @@ MULTILIB_SUPPORTED?= unknown .if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) . if exists(/usr/include/gnu/stubs-64.h) && \ !exists(/usr/include/gnu/stubs-32.h) -MULTILIB_SUPPORTED=No +MULTILIB_SUPPORTED= No . else -MULTILIB_SUPPORTED=Yes +MULTILIB_SUPPORTED= Yes . endif .endif .if !empty(MULTILIB_SUPPORTED:M[Yy][Ee][Ss]) @@ -64,24 +64,24 @@ CONFIGURE_ARGS+= --disable-multilib ### .if empty(PKG_OPTIONS:Malways-libgcc) -.for _libdir_ in ${_OPSYS_LIB_DIRS} -. if exists(${_libdir_}) +. for _libdir_ in ${_OPSYS_LIB_DIRS} +. if exists(${_libdir_}) BASE_LIBGCC!= find ${_libdir_} -name libgcc_s.so BASE_LIBGCC_MATCH_STRING!= ${ECHO} ${BASE_LIBGCC} ${GCC48_DIST_VERSION} | \ ${AWK} -f ../../mk/scripts/larger_symbol_version.awk -. if ${BASE_LIBGCC_MATCH_STRING:Mnewer} +. if ${BASE_LIBGCC_MATCH_STRING:Mnewer} DELETE_INSTALLED_LIBGCC= yes +. endif . endif -. endif -.endfor +. endfor -.if ${DELETE_INSTALLED_LIBGCC:Uno} +. if ${DELETE_INSTALLED_LIBGCC:Uno} post-install: delete-installed-libgcc delete-installed-libgcc: ${FIND} ${DESTDIR} -name 'libgcc_s.so*' -delete -.endif +. endif .endif diff --git a/lang/gcc48/version.mk b/lang/gcc48/version.mk index 8b83361f6d6..74421a6be39 100644 --- a/lang/gcc48/version.mk +++ b/lang/gcc48/version.mk @@ -1,2 +1,2 @@ -# $NetBSD: version.mk,v 1.9 2016/09/12 18:42:04 maya Exp $ -GCC48_DIST_VERSION:=4.8.5 +# $NetBSD: version.mk,v 1.10 2019/11/03 19:03:59 rillig Exp $ +GCC48_DIST_VERSION:= 4.8.5 diff --git a/lang/gcc49-libs/Makefile b/lang/gcc49-libs/Makefile index 2f4e90bb157..2b1206b0009 100644 --- a/lang/gcc49-libs/Makefile +++ b/lang/gcc49-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2018/07/11 11:21:26 jperkin Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/03 19:03:59 rillig Exp $ GCC_PKGNAME= gcc49 .include "../../lang/${GCC_PKGNAME}/version.mk" @@ -44,10 +44,10 @@ SHLIB_EXT= so LIBRARY_FILES= ${WRKDIR}/lib_files -GENERATE_PLIST+= ${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/,' \ - ${LIBRARY_FILES}; -GENERATE_PLIST+= ${GREP} -q 'lib/' ${LIBRARY_FILES} || \ - ${ECHO} '@pkgdir ${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/lib' ; +GENERATE_PLIST+= ${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/,' \ + ${LIBRARY_FILES}; +GENERATE_PLIST+= ${GREP} -q 'lib/' ${LIBRARY_FILES} || \ + ${ECHO} '@pkgdir ${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/lib' ; ${LIBRARY_FILES}: ${PKG_INFO} -qL '${GCC_PKGNAME}-${GCC49_DIST_VERSION}*' | \ diff --git a/lang/gcc49/Makefile b/lang/gcc49/Makefile index 3a28b987da3..d3b9cc76db7 100644 --- a/lang/gcc49/Makefile +++ b/lang/gcc49/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2019/08/11 13:21:20 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2019/11/03 19:03:59 rillig Exp $ GCC_PKGNAME= gcc49 .include "version.mk" @@ -106,12 +106,12 @@ CONFIGURE_ARGS.DragonFly+= --disable-bootstrap CONFIGURE_ARGS.Darwin+= STRIP_FOR_TARGET=${TOOLS_PLATFORM.strip} .if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*) -CONFIGURE_ARGS+= --with-dwarf2 -CONFIGURE_ARGS+= --disable-libitm +CONFIGURE_ARGS+= --with-dwarf2 +CONFIGURE_ARGS+= --disable-libitm .endif .if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-powerpc) -CONFIGURE_ARGS+= --disable-multilib +CONFIGURE_ARGS+= --disable-multilib .endif .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386) diff --git a/lang/gcc49/options.mk b/lang/gcc49/options.mk index a3fecf75bbd..92086356db4 100644 --- a/lang/gcc49/options.mk +++ b/lang/gcc49/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2019/09/08 14:47:53 maya Exp $ +# $NetBSD: options.mk,v 1.5 2019/11/03 19:03:59 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.${GCC_PKGNAME} PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran gcc-java \ @@ -7,7 +7,7 @@ PKG_SUGGESTED_OPTIONS= gcc-c++ gcc-fortran gcc-objc gcc-objc++ PKG_SUGGESTED_OPTIONS.DragonFly+= nls PKG_SUGGESTED_OPTIONS.Linux+= nls -PKG_SUGGESTED_OPTIONS.NetBSD+= nls +PKG_SUGGESTED_OPTIONS.NetBSD+= nls PKG_SUGGESTED_OPTIONS.SunOS+= gcc-go gcc-inplace-math always-libgcc # gcc-java was dropped from PKG_SUGGESTED_OPTIONS to spare legacy systems attempting bulkbuilds # For example on Darwin/PowerPC this option adds another 24 hours to build time on a G4. @@ -24,9 +24,9 @@ MULTILIB_SUPPORTED?= unknown .if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) . if exists(/usr/include/gnu/stubs-64.h) && \ !exists(/usr/include/gnu/stubs-32.h) -MULTILIB_SUPPORTED=No +MULTILIB_SUPPORTED= No . else -MULTILIB_SUPPORTED=Yes +MULTILIB_SUPPORTED= Yes . endif .endif .if !empty(MULTILIB_SUPPORTED:M[Yy][Ee][Ss]) @@ -64,24 +64,24 @@ CONFIGURE_ARGS+= --disable-multilib ### .if empty(PKG_OPTIONS:Malways-libgcc) -.for _libdir_ in ${_OPSYS_LIB_DIRS} -. if exists(${_libdir_}) +. for _libdir_ in ${_OPSYS_LIB_DIRS} +. if exists(${_libdir_}) BASE_LIBGCC!= find ${_libdir_} -name libgcc_s.so BASE_LIBGCC_MATCH_STRING!= ${ECHO} ${BASE_LIBGCC} ${GCC49_DIST_VERSION} | \ ${AWK} -f ../../mk/scripts/larger_symbol_version.awk -. if ${BASE_LIBGCC_MATCH_STRING:Mnewer} +. if ${BASE_LIBGCC_MATCH_STRING:Mnewer} DELETE_INSTALLED_LIBGCC= yes +. endif . endif -. endif -.endfor +. endfor -.if ${DELETE_INSTALLED_LIBGCC:Uno} +. if ${DELETE_INSTALLED_LIBGCC:Uno} post-install: delete-installed-libgcc delete-installed-libgcc: ${FIND} ${DESTDIR} -name 'libgcc_s.so*' -delete -.endif +. endif .endif @@ -189,9 +189,9 @@ LANGS+= fortran .if !empty(PKG_OPTIONS:Mgcc-c++) LANGS+= c++ USE_TOOLS+= perl -.if ${OPSYS} != "SunOS" +. if ${OPSYS} != "SunOS" CONFIGURE_ARGS+= --enable-__cxa_atexit -.endif +. endif CONFIGURE_ARGS+= --with-gxx-include-dir=${GCC_PREFIX}/include/c++/ .else CONFIGURE_ARGS+= --disable-build-with-cxx diff --git a/lang/gcc5-aux/Makefile b/lang/gcc5-aux/Makefile index e1324f6426b..2254cbf6bd6 100644 --- a/lang/gcc5-aux/Makefile +++ b/lang/gcc5-aux/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2019/08/05 21:16:39 maya Exp $ +# $NetBSD: Makefile,v 1.12 2019/11/03 19:03:59 rillig Exp $ PKGNAME= gcc5-aux-${SNAPSHOT} PKGREVISION= ${MAIN_PR} @@ -54,12 +54,12 @@ BOOTSTRAP_COMPILER= ada-bootstrap.${GARCH}.freebsd.100B.tar.bz2 .if ${OPSYS} == NetBSD . if !empty(OS_VERSION:M7.99.*) -NSUFF= 8.0_DEV +NSUFF= 8.0_DEV . else -NSUFF= ${OS_VERSION} +NSUFF= ${OS_VERSION} . endif . if ${GARCH} == i386 -NELF= elf +NELF= elf . endif XLDF= -lm . if ${OS_VERSION:R} < 7 @@ -125,7 +125,7 @@ BUILDDIR= ${WRKDIR}/build NEWBSDIR= ${WRKDIR}/newbs/bootstrap SYSLIBDIR= ${WRKDIR}/lib CFG_SCRIPT= ${WRKSRC}/configure -REVFILE= ${WRKSRC}/gcc/REVISION +REVFILE= ${WRKSRC}/gcc/REVISION PHASEFILE= ${WRKSRC}/gcc/DEV-PHASE BOOTSTRAP_PREFIX= ${WRKDIR}/bootstrap PKG_PREFIX= ${PREFIX}/gcc5-aux @@ -135,22 +135,22 @@ BSFILENAME= ada-bootstrap.${GARCH}.${LOWER_OPSYS}.${OS_VERSION:C/[A-Z_.-]//g}.t # testing if gcc5-aux is already installed - if so, use this compiler along with # its gnatlink, gnatbind, and gnatmake rather than the older bootstrap versions .if exists(${LOCALBASE}/gcc5-aux/bin/ada) -FULL_GNATGCC=${LOCALBASE}/gcc5-aux/bin/ada -FULL_GNATGXX=${LOCALBASE}/gcc5-aux/bin/g++ +FULL_GNATGCC= ${LOCALBASE}/gcc5-aux/bin/ada +FULL_GNATGXX= ${LOCALBASE}/gcc5-aux/bin/g++ .endif .if ${FULL_GNATGCC} == "NOT SET" # here we know we need to install the bootstrap compiler . if defined(BOOTSTRAP_TRIPLET) -FULL_GNATGCC=${BOOTSTRAP_PREFIX}/bin/gnatgcc +FULL_GNATGCC= ${BOOTSTRAP_PREFIX}/bin/gnatgcc . else -FULL_GNATGCC=${BOOTSTRAP_PREFIX}/bin/gcc ${COMPILER_ABI_SWITCH} -FULL_GNATGXX=${BOOTSTRAP_PREFIX}/bin/g++ ${COMPILER_ABI_SWITCH} +FULL_GNATGCC= ${BOOTSTRAP_PREFIX}/bin/gcc ${COMPILER_ABI_SWITCH} +FULL_GNATGXX= ${BOOTSTRAP_PREFIX}/bin/g++ ${COMPILER_ABI_SWITCH} . endif -DISTFILES+= ${BOOTSTRAP_COMPILER} +DISTFILES+= ${BOOTSTRAP_COMPILER} SITES.${BOOTSTRAP_COMPILER}= http://downloads.dragonlace.net/src/ -FULL_PATH=${BOOTSTRAP_PREFIX}/bin:/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/sbin:${PREFIX}/bin +FULL_PATH= ${BOOTSTRAP_PREFIX}/bin:/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/sbin:${PREFIX}/bin .endif @@ -158,16 +158,16 @@ FULL_PATH=${BOOTSTRAP_PREFIX}/bin:/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/sbin:$ .if defined(PLUS_BOOTSTRAPS) MASTER_SITES= http://downloads.dragonlace.net/src/ MASTER_SITES+= ${MASTER_SITE_GNU:=gcc/${IDENTIFICATION}/} -DISTFILES= \ - ${DISTNAME}.tar.bz2 \ - ada-bootstrap.i386.freebsd.84.tar.bz2 \ - ada-bootstrap.i386.freebsd.100B.tar.bz2 \ - ada-bootstrap.i386.netbsd.614.tar.bz2 \ - ada-bootstrap.x86_64.dragonfly.41.tar.bz2 \ - ada-bootstrap.x86_64.freebsd.84.tar.bz2 \ - ada-bootstrap.x86_64.freebsd.100B.tar.bz2 \ - ada-bootstrap.x86_64.netbsd.614.tar.bz2 \ - ada-bootstrap.x86_64.solaris.511.tar.bz2 +DISTFILES= \ + ${DISTNAME}.tar.bz2 \ + ada-bootstrap.i386.freebsd.84.tar.bz2 \ + ada-bootstrap.i386.freebsd.100B.tar.bz2 \ + ada-bootstrap.i386.netbsd.614.tar.bz2 \ + ada-bootstrap.x86_64.dragonfly.41.tar.bz2 \ + ada-bootstrap.x86_64.freebsd.84.tar.bz2 \ + ada-bootstrap.x86_64.freebsd.100B.tar.bz2 \ + ada-bootstrap.x86_64.netbsd.614.tar.bz2 \ + ada-bootstrap.x86_64.solaris.511.tar.bz2 .endif # establish ada-aware compiler for use @@ -199,8 +199,8 @@ CONFIGURE_ARGS+= --disable-libitm CONFIGURE_ARGS+= ${EXTRA_CONFARGS} # Automatic package list generation -GENERATE_PLIST= cd ${DESTDIR}${PREFIX}; -GENERATE_PLIST+= ${FIND} * \( -type f -or -type l \) | ${SORT} -dr; +GENERATE_PLIST= cd ${DESTDIR}${PREFIX}; +GENERATE_PLIST+= ${FIND} * \( -type f -or -type l \) | ${SORT} -dr; post-extract: @@ -282,7 +282,7 @@ do-build: do-test: build test-ada test-fortran test-objc test-cxx test-c test-ada: -.if (${OPSYS} == NetBSD) && (${MACHINE_ARCH} == x86_64) +. if (${OPSYS} == NetBSD) && (${MACHINE_ARCH} == x86_64) # NetBSD has an extremely small default stacksize of 2MB, which is # insufficient for the gnat.dg testsuite. # specifically: entry_queues test on AMD64 @@ -291,20 +291,20 @@ test-ada: cd ${BUILDDIR} && \ ${ULIMIT_CMD_stacksize} && \ ${SETENV} ${MY_MAKE_ENV} ${GMAKE} -sk check-ada -.else +. else cd ${BUILDDIR} && ${SETENV} ${MY_MAKE_ENV} DEJAGNU_TIMEOUT=30 \ ${GMAKE} -sk check-ada -.endif +. endif test-fortran: -.if !empty(PKG_OPTIONS:Mfortran) +. if !empty(PKG_OPTIONS:Mfortran) cd ${BUILDDIR} && ${SETENV} ${MY_MAKE_ENV} ${GMAKE} -sk check-fortran -.endif +. endif test-objc: -.if !empty(PKG_OPTIONS:Mobjc) +. if !empty(PKG_OPTIONS:Mobjc) cd ${BUILDDIR} && ${SETENV} ${MY_MAKE_ENV} ${GMAKE} -sk check-objc -.endif +. endif test-cxx: # libstdc++ always ends with error status, so ignore it diff --git a/lang/gcc5-aux/buildlink3.mk b/lang/gcc5-aux/buildlink3.mk index ebb82a82c28..8c4fc920827 100644 --- a/lang/gcc5-aux/buildlink3.mk +++ b/lang/gcc5-aux/buildlink3.mk @@ -1,14 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.4 2018/01/28 16:24:11 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2019/11/03 19:03:59 rillig Exp $ BUILDLINK_TREE+= gcc5-aux .if !defined(GCC5_AUX_BUILDLINK3_MK) GCC5_AUX_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.gcc5-aux+= gcc5-aux>=20150422 +BUILDLINK_API_DEPENDS.gcc5-aux+= gcc5-aux>=20150422 BUILDLINK_ABI_DEPENDS.gcc5-aux?= gcc5-aux>=20160603nb6 -BUILDLINK_PKGSRCDIR.gcc5-aux?= ../../lang/gcc5-aux -BUILDLINK_DEPMETHOD.gcc5-aux?= build +BUILDLINK_PKGSRCDIR.gcc5-aux?= ../../lang/gcc5-aux +BUILDLINK_DEPMETHOD.gcc5-aux?= build .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gmp/buildlink3.mk" diff --git a/lang/gcc5-aux/options.mk b/lang/gcc5-aux/options.mk index d30ac072e51..288cc1c7027 100644 --- a/lang/gcc5-aux/options.mk +++ b/lang/gcc5-aux/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.6 2019/09/08 14:05:38 maya Exp $ +# $NetBSD: options.mk,v 1.7 2019/11/03 19:03:59 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gcc5-aux -PKG_SUPPORTED_OPTIONS= fortran objc testsuite static bootstrap allstages always-libgcc -PKG_SUGGESTED_OPTIONS= #fortran objc +PKG_SUPPORTED_OPTIONS= fortran objc testsuite static bootstrap allstages always-libgcc +PKG_SUGGESTED_OPTIONS= #fortran objc .include "../../mk/compiler.mk" .if empty(PKGSRC_COMPILER:Mgcc) @@ -26,15 +26,15 @@ PKG_SUGGESTED_OPTIONS.SunOS+= always-libgcc ############################# .if empty(PKG_OPTIONS:Mfortran) || !empty(PKG_OPTIONS:Mbootstrap) -EXTRA_CONFARGS+= --disable-libquadmath +EXTRA_CONFARGS+= --disable-libquadmath .else -LANGS+= fortran -APPLY_DIFFS+= fortran -.if ${OPSYS} == NetBSD -EXTRA_CONFARGS+= --disable-libquadmath -.else -EXTRA_CONFARGS+= --enable-libquadmath -.endif +LANGS+= fortran +APPLY_DIFFS+= fortran +. if ${OPSYS} == NetBSD +EXTRA_CONFARGS+= --disable-libquadmath +. else +EXTRA_CONFARGS+= --enable-libquadmath +. endif .endif @@ -56,7 +56,7 @@ delete-installed-libgcc: ################################# .if !empty(PKG_OPTIONS:Mobjc) && empty(PKG_OPTIONS:Mbootstrap) -LANGS+= objc +LANGS+= objc .endif @@ -65,10 +65,10 @@ LANGS+= objc ######################### .if !empty(PKG_OPTIONS:Mtestsuite) && empty(PKG_OPTIONS:Mbootstrap) -BUILD_DEPENDS+= dejagnu>=1.4:../../devel/dejagnu -APPLY_DIFFS+= ada-testsuite -APPLY_DIFFS+= cxx-testsuite -APPLY_DIFFS+= gcc-testsuite +BUILD_DEPENDS+= dejagnu>=1.4:../../devel/dejagnu +APPLY_DIFFS+= ada-testsuite +APPLY_DIFFS+= cxx-testsuite +APPLY_DIFFS+= gcc-testsuite .endif @@ -76,7 +76,7 @@ APPLY_DIFFS+= gcc-testsuite ## NATIONAL LANGUAGE SUPPORT ## ################################# -EXTRA_CONFARGS+= --disable-nls +EXTRA_CONFARGS+= --disable-nls ############################### @@ -84,14 +84,14 @@ EXTRA_CONFARGS+= --disable-nls ############################### .if !empty(PKG_OPTIONS:Mstatic) -STATIC_BUILD = yes +STATIC_BUILD = yes .endif .if defined(STATIC_BUILD) && empty(PKG_OPTIONS:Mbootstrap) . if ${OPSYS} == SunOS -PKG_FAIL_REASON+= SunOS does not support static builds +PKG_FAIL_REASON+= SunOS does not support static builds . else -EXTRA_CONFARGS+= --with-stage1-ldflags=-static +EXTRA_CONFARGS+= --with-stage1-ldflags=-static . endif .endif @@ -122,16 +122,16 @@ EXTRA_CONFARGS+= --with-mpc=${BUILDLINK_PREFIX.mpcomplex} .endif .if !empty(PKG_OPTIONS:Mbootstrap) -EXTRA_CONFARGS+= --disable-shared --disable-lto +EXTRA_CONFARGS+= --disable-shared --disable-lto . if ${OPSYS} != SunOS -EXTRA_CONFARGS+= --with-stage1-ldflags=-static -EXTRA_CONFARGS+= --with-boot-ldflags=-static -EXTRA_CONFARGS+= --with-system-zlib +EXTRA_CONFARGS+= --with-stage1-ldflags=-static +EXTRA_CONFARGS+= --with-boot-ldflags=-static +EXTRA_CONFARGS+= --with-system-zlib . endif .else . if empty(PKG_OPTIONS:Mallstages) -EXTRA_CONFARGS+= --disable-bootstrap -EXTRA_CONFARGS+= --disable-libcc1 +EXTRA_CONFARGS+= --disable-bootstrap +EXTRA_CONFARGS+= --disable-libcc1 . endif -EXTRA_CONFARGS+= --enable-shared +EXTRA_CONFARGS+= --enable-shared .endif diff --git a/lang/gcc5-libs/Makefile b/lang/gcc5-libs/Makefile index 82291be1c19..814de15978f 100644 --- a/lang/gcc5-libs/Makefile +++ b/lang/gcc5-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2018/11/28 16:08:55 abs Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/03 19:03:59 rillig Exp $ GCC_PKGNAME= gcc5 .include "../../lang/${GCC_PKGNAME}/version.mk" @@ -44,10 +44,10 @@ SHLIB_EXT= so LIBRARY_FILES= ${WRKDIR}/lib_files -GENERATE_PLIST+= ${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/,' \ - ${LIBRARY_FILES}; -GENERATE_PLIST+= ${GREP} -q 'lib/' ${LIBRARY_FILES} || \ - ${ECHO} '@pkgdir ${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/lib' ; +GENERATE_PLIST+= ${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/,' \ + ${LIBRARY_FILES}; +GENERATE_PLIST+= ${GREP} -q 'lib/' ${LIBRARY_FILES} || \ + ${ECHO} '@pkgdir ${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/lib' ; ${LIBRARY_FILES}: ${PKG_INFO} -qL '${GCC_PKGNAME}-${GCC5_DIST_VERSION}*' | \ diff --git a/lang/gcc5/Makefile b/lang/gcc5/Makefile index 2d9625331a1..74f7df92749 100644 --- a/lang/gcc5/Makefile +++ b/lang/gcc5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2019/08/11 13:21:20 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2019/11/03 19:03:59 rillig Exp $ GCC_PKGNAME= gcc5 PKGREVISION= 5 @@ -23,7 +23,7 @@ EXTRACT_ONLY= ${DEFAULT_DISTFILES} NOT_FOR_PLATFORM= Interix-*-* -USE_LANGUAGES= c c++03 +USE_LANGUAGES= c c++03 USE_TOOLS+= gmake makeinfo sed:run tar:build USE_TOOLS.NetBSD+= gsed diff --git a/lang/gcc5/options.mk b/lang/gcc5/options.mk index 86bc245d9f2..9887adc2d55 100644 --- a/lang/gcc5/options.mk +++ b/lang/gcc5/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2019/09/08 14:47:52 maya Exp $ +# $NetBSD: options.mk,v 1.4 2019/11/03 19:03:59 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.${GCC_PKGNAME} PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran \ @@ -24,9 +24,9 @@ MULTILIB_SUPPORTED?= unknown .if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) . if exists(/usr/include/gnu/stubs-64.h) && \ !exists(/usr/include/gnu/stubs-32.h) -MULTILIB_SUPPORTED=No +MULTILIB_SUPPORTED= No . else -MULTILIB_SUPPORTED=Yes +MULTILIB_SUPPORTED= Yes . endif .endif .if !empty(MULTILIB_SUPPORTED:M[Yy][Ee][Ss]) @@ -65,24 +65,24 @@ CONFIGURE_ARGS+= --disable-multilib .include "../../mk/bsd.prefs.mk" .if empty(PKG_OPTIONS:Malways-libgcc) -.for _libdir_ in ${_OPSYS_LIB_DIRS} -. if exists(${_libdir_}) +. for _libdir_ in ${_OPSYS_LIB_DIRS} +. if exists(${_libdir_}) BASE_LIBGCC!= find ${_libdir_} -name libgcc_s.so BASE_LIBGCC_MATCH_STRING!= ${ECHO} ${BASE_LIBGCC} ${GCC5_DIST_VERSION} | \ ${AWK} -f ../../mk/scripts/larger_symbol_version.awk -. if ${BASE_LIBGCC_MATCH_STRING:Mnewer} +. if ${BASE_LIBGCC_MATCH_STRING:Mnewer} DELETE_INSTALLED_LIBGCC= yes +. endif . endif -. endif -.endfor +. endfor -.if ${DELETE_INSTALLED_LIBGCC:Uno} +. if ${DELETE_INSTALLED_LIBGCC:Uno} post-install: delete-installed-libgcc delete-installed-libgcc: ${FIND} ${DESTDIR} -name 'libgcc_s.so*' -delete -.endif +. endif .endif @@ -108,9 +108,9 @@ LIBS.SunOS+= -lgmp ### Graphite Support ### .if !empty(PKG_OPTIONS:Mgcc-graphite) -ISL14 = isl-0.14 +ISL14 = isl-0.14 SITES.${ISL14}.tar.bz2 = ${MASTER_SITE_GNU:=gcc/infrastructure/} -DISTFILES += ${ISL14}.tar.bz2 +DISTFILES += ${ISL14}.tar.bz2 .endif ### diff --git a/lang/gcc5/version.mk b/lang/gcc5/version.mk index 749fba0ee1a..26392ec2311 100644 --- a/lang/gcc5/version.mk +++ b/lang/gcc5/version.mk @@ -1,2 +1,2 @@ -# $NetBSD: version.mk,v 1.5 2017/10/20 23:49:47 maya Exp $ -GCC5_DIST_VERSION:=5.5.0 +# $NetBSD: version.mk,v 1.6 2019/11/03 19:03:59 rillig Exp $ +GCC5_DIST_VERSION:= 5.5.0 diff --git a/lang/gcc6-aux/Makefile b/lang/gcc6-aux/Makefile index c3cdbed08ed..7e9dd682542 100644 --- a/lang/gcc6-aux/Makefile +++ b/lang/gcc6-aux/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2019/08/05 21:16:39 maya Exp $ +# $NetBSD: Makefile,v 1.5 2019/11/03 19:04:00 rillig Exp $ PKGNAME= gcc6-aux-${SNAPSHOT} PKGREVISION= ${MAIN_PR} @@ -49,12 +49,12 @@ BOOTSTRAP_COMPILER= ada-bootstrap.${GARCH}.freebsd.100B.tar.bz2 .if ${OPSYS} == NetBSD . if !empty(OS_VERSION:M7.99.*) -NSUFF= 8.0_DEV +NSUFF= 8.0_DEV . else -NSUFF= ${OS_VERSION} +NSUFF= ${OS_VERSION} . endif . if ${GARCH} == i386 -NELF= elf +NELF= elf . endif XLDF= -lm . if ${OS_VERSION:R} < 7 @@ -120,7 +120,7 @@ BUILDDIR= ${WRKDIR}/build NEWBSDIR= ${WRKDIR}/newbs/bootstrap SYSLIBDIR= ${WRKDIR}/lib CFG_SCRIPT= ${WRKSRC}/configure -REVFILE= ${WRKSRC}/gcc/REVISION +REVFILE= ${WRKSRC}/gcc/REVISION PHASEFILE= ${WRKSRC}/gcc/DEV-PHASE BOOTSTRAP_PREFIX= ${WRKDIR}/bootstrap PKG_PREFIX= ${PREFIX}/gcc6-aux @@ -130,39 +130,39 @@ BSFILENAME= ada-bootstrap.${GARCH}.${LOWER_OPSYS}.${OS_VERSION:C/[A-Z_.-]//g}.t # testing if gcc6-aux is already installed - if so, use this compiler along with # its gnatlink, gnatbind, and gnatmake rather than the older bootstrap versions .if exists(${LOCALBASE}/gcc6-aux/bin/ada) -FULL_GNATGCC=${LOCALBASE}/gcc6-aux/bin/ada -FULL_GNATGXX=${LOCALBASE}/gcc6-aux/bin/g++ +FULL_GNATGCC= ${LOCALBASE}/gcc6-aux/bin/ada +FULL_GNATGXX= ${LOCALBASE}/gcc6-aux/bin/g++ .endif .if ${FULL_GNATGCC} == "NOT SET" # here we know we need to install the bootstrap compiler . if defined(BOOTSTRAP_TRIPLET) -FULL_GNATGCC=${BOOTSTRAP_PREFIX}/bin/gnatgcc +FULL_GNATGCC= ${BOOTSTRAP_PREFIX}/bin/gnatgcc . else -FULL_GNATGCC=${BOOTSTRAP_PREFIX}/bin/gcc ${COMPILER_ABI_SWITCH} -FULL_GNATGXX=${BOOTSTRAP_PREFIX}/bin/g++ ${COMPILER_ABI_SWITCH} +FULL_GNATGCC= ${BOOTSTRAP_PREFIX}/bin/gcc ${COMPILER_ABI_SWITCH} +FULL_GNATGXX= ${BOOTSTRAP_PREFIX}/bin/g++ ${COMPILER_ABI_SWITCH} . endif -DISTFILES+= ${BOOTSTRAP_COMPILER} +DISTFILES+= ${BOOTSTRAP_COMPILER} SITES.${BOOTSTRAP_COMPILER}= http://downloads.dragonlace.net/src/ -FULL_PATH=${BOOTSTRAP_PREFIX}/bin:/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/sbin:${PREFIX}/bin +FULL_PATH= ${BOOTSTRAP_PREFIX}/bin:/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/sbin:${PREFIX}/bin .endif # for port maintenance, invoke "make mdi PLUS_BOOTSTRAPS=1" .if defined(PLUS_BOOTSTRAPS) -ALL_BOOTSTRAPS= \ - ada-bootstrap.i386.freebsd.100B.tar.bz2 \ - ada-bootstrap.i386.netbsd.614.tar.bz2 \ - ada-bootstrap.x86_64.dragonfly.41.tar.bz2 \ - ada-bootstrap.x86_64.freebsd.84.tar.bz2 \ - ada-bootstrap.x86_64.freebsd.100B.tar.bz2 \ - ada-bootstrap.x86_64.netbsd.614.tar.bz2 \ - ada-bootstrap.x86_64.solaris.511.tar.bz2 -.for BC in ${ALL_BOOTSTRAPS} +ALL_BOOTSTRAPS= \ + ada-bootstrap.i386.freebsd.100B.tar.bz2 \ + ada-bootstrap.i386.netbsd.614.tar.bz2 \ + ada-bootstrap.x86_64.dragonfly.41.tar.bz2 \ + ada-bootstrap.x86_64.freebsd.84.tar.bz2 \ + ada-bootstrap.x86_64.freebsd.100B.tar.bz2 \ + ada-bootstrap.x86_64.netbsd.614.tar.bz2 \ + ada-bootstrap.x86_64.solaris.511.tar.bz2 +. for BC in ${ALL_BOOTSTRAPS} SITES.${BC}= http://downloads.dragonlace.net/src/ -.endfor -DISTFILES= ${DISTNAME}.tar.bz2 ${ALL_BOOTSTRAPS} +. endfor +DISTFILES= ${DISTNAME}.tar.bz2 ${ALL_BOOTSTRAPS} .endif # establish ada-aware compiler for use @@ -180,7 +180,7 @@ MY_MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED} # The standard configuration options -CONFIGURE_ARGS= --enable-languages=${LANGS:Q} +CONFIGURE_ARGS= --enable-languages=${LANGS:Q} CONFIGURE_ARGS+= --build=${BLD_TARGET} CONFIGURE_ARGS+= --prefix=${PKG_PREFIX:Q} CONFIGURE_ARGS+= --enable-threads=posix @@ -193,8 +193,8 @@ CONFIGURE_ARGS+= --disable-libitm CONFIGURE_ARGS+= ${EXTRA_CONFARGS} # Automatic package list generation -GENERATE_PLIST= cd ${DESTDIR}${PREFIX}; -GENERATE_PLIST+= ${FIND} * \( -type f -or -type l \) | ${SORT} -dr; +GENERATE_PLIST= cd ${DESTDIR}${PREFIX}; +GENERATE_PLIST+= ${FIND} * \( -type f -or -type l \) | ${SORT} -dr; post-extract: @@ -276,7 +276,7 @@ do-build: do-test: build test-ada test-fortran test-objc test-cxx test-c test-ada: -.if (${OPSYS} == NetBSD) && (${MACHINE_ARCH} == x86_64) +. if (${OPSYS} == NetBSD) && (${MACHINE_ARCH} == x86_64) # NetBSD has an extremely small default stacksize of 2MB, which is # insufficient for the gnat.dg testsuite. # specifically: entry_queues test on AMD64 @@ -285,20 +285,20 @@ test-ada: cd ${BUILDDIR} && \ ${ULIMIT_CMD_stacksize} && \ ${SETENV} ${MY_MAKE_ENV} ${GMAKE} -sk check-ada -.else +. else cd ${BUILDDIR} && ${SETENV} ${MY_MAKE_ENV} DEJAGNU_TIMEOUT=30 \ ${GMAKE} -sk check-ada -.endif +. endif test-fortran: -.if !empty(PKG_OPTIONS:Mfortran) +. if !empty(PKG_OPTIONS:Mfortran) cd ${BUILDDIR} && ${SETENV} ${MY_MAKE_ENV} ${GMAKE} -sk check-fortran -.endif +. endif test-objc: -.if !empty(PKG_OPTIONS:Mobjc) +. if !empty(PKG_OPTIONS:Mobjc) cd ${BUILDDIR} && ${SETENV} ${MY_MAKE_ENV} ${GMAKE} -sk check-objc -.endif +. endif test-cxx: # libstdc++ always ends with error status, so ignore it diff --git a/lang/gcc6-aux/buildlink3.mk b/lang/gcc6-aux/buildlink3.mk index 39d95e5a24f..78216e4c036 100644 --- a/lang/gcc6-aux/buildlink3.mk +++ b/lang/gcc6-aux/buildlink3.mk @@ -1,14 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.3 2018/01/28 16:24:11 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2019/11/03 19:04:00 rillig Exp $ BUILDLINK_TREE+= gcc6-aux .if !defined(GCC5_AUX_BUILDLINK3_MK) GCC5_AUX_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.gcc6-aux+= gcc6-aux>=20160822 +BUILDLINK_API_DEPENDS.gcc6-aux+= gcc6-aux>=20160822 BUILDLINK_ABI_DEPENDS.gcc6-aux?= gcc6-aux>=20160822nb1 -BUILDLINK_PKGSRCDIR.gcc6-aux?= ../../lang/gcc6-aux -BUILDLINK_DEPMETHOD.gcc6-aux?= build +BUILDLINK_PKGSRCDIR.gcc6-aux?= ../../lang/gcc6-aux +BUILDLINK_DEPMETHOD.gcc6-aux?= build .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gmp/buildlink3.mk" diff --git a/lang/gcc6-aux/options.mk b/lang/gcc6-aux/options.mk index 640acb386df..d870cec51c4 100644 --- a/lang/gcc6-aux/options.mk +++ b/lang/gcc6-aux/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.1 2016/12/13 01:19:20 marino Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/03 19:04:00 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gcc6-aux -PKG_SUPPORTED_OPTIONS= fortran objc testsuite static bootstrap allstages -PKG_SUGGESTED_OPTIONS= # fortran +PKG_SUPPORTED_OPTIONS= fortran objc testsuite static bootstrap allstages +PKG_SUGGESTED_OPTIONS= # fortran # fortran fails to build transfer.c, disable @@ -18,15 +18,15 @@ PKG_SUGGESTED_OPTIONS= # fortran ############################# .if empty(PKG_OPTIONS:Mfortran) || !empty(PKG_OPTIONS:Mbootstrap) -EXTRA_CONFARGS+= --disable-libquadmath +EXTRA_CONFARGS+= --disable-libquadmath .else -LANGS+= fortran -APPLY_DIFFS+= fortran -.if ${OPSYS} == NetBSD -EXTRA_CONFARGS+= --disable-libquadmath -.else -EXTRA_CONFARGS+= --enable-libquadmath -.endif +LANGS+= fortran +APPLY_DIFFS+= fortran +. if ${OPSYS} == NetBSD +EXTRA_CONFARGS+= --disable-libquadmath +. else +EXTRA_CONFARGS+= --enable-libquadmath +. endif .endif @@ -35,7 +35,7 @@ EXTRA_CONFARGS+= --enable-libquadmath ################################# .if !empty(PKG_OPTIONS:Mobjc) && empty(PKG_OPTIONS:Mbootstrap) -LANGS+= objc +LANGS+= objc .endif @@ -44,9 +44,9 @@ LANGS+= objc ######################### .if !empty(PKG_OPTIONS:Mtestsuite) && empty(PKG_OPTIONS:Mbootstrap) -BUILD_DEPENDS+= dejagnu>=1.4:../../devel/dejagnu -APPLY_DIFFS+= ada-testsuite -APPLY_DIFFS+= gcc-testsuite +BUILD_DEPENDS+= dejagnu>=1.4:../../devel/dejagnu +APPLY_DIFFS+= ada-testsuite +APPLY_DIFFS+= gcc-testsuite .endif @@ -55,14 +55,14 @@ APPLY_DIFFS+= gcc-testsuite ############################### .if !empty(PKG_OPTIONS:Mstatic) -STATIC_BUILD = yes +STATIC_BUILD = yes .endif .if defined(STATIC_BUILD) && empty(PKG_OPTIONS:Mbootstrap) . if ${OPSYS} == SunOS -PKG_FAIL_REASON+= SunOS does not support static builds +PKG_FAIL_REASON+= SunOS does not support static builds . else -EXTRA_CONFARGS+= --with-stage1-ldflags=-static +EXTRA_CONFARGS+= --with-stage1-ldflags=-static . endif .endif @@ -93,17 +93,17 @@ EXTRA_CONFARGS+= --with-mpc=${BUILDLINK_PREFIX.mpcomplex} .endif .if !empty(PKG_OPTIONS:Mbootstrap) -EXTRA_CONFARGS+= --disable-shared --disable-lto -EXTRA_CONFARGS+= --disable-libstdcxx-pch +EXTRA_CONFARGS+= --disable-shared --disable-lto +EXTRA_CONFARGS+= --disable-libstdcxx-pch . if ${OPSYS} != SunOS -EXTRA_CONFARGS+= --with-stage1-ldflags=-static -EXTRA_CONFARGS+= --with-boot-ldflags=-static -EXTRA_CONFARGS+= --with-system-zlib +EXTRA_CONFARGS+= --with-stage1-ldflags=-static +EXTRA_CONFARGS+= --with-boot-ldflags=-static +EXTRA_CONFARGS+= --with-system-zlib . endif .else . if empty(PKG_OPTIONS:Mallstages) -EXTRA_CONFARGS+= --disable-bootstrap -EXTRA_CONFARGS+= --disable-libcc1 +EXTRA_CONFARGS+= --disable-bootstrap +EXTRA_CONFARGS+= --disable-libcc1 . endif -EXTRA_CONFARGS+= --enable-shared +EXTRA_CONFARGS+= --enable-shared .endif diff --git a/lang/gcc6-libs/Makefile b/lang/gcc6-libs/Makefile index f55fc560a7a..42a589d5201 100644 --- a/lang/gcc6-libs/Makefile +++ b/lang/gcc6-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2018/11/28 16:05:54 abs Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/03 19:04:00 rillig Exp $ GCC_PKGNAME= gcc6 .include "../../lang/${GCC_PKGNAME}/version.mk" @@ -44,10 +44,10 @@ SHLIB_EXT= so LIBRARY_FILES= ${WRKDIR}/lib_files -GENERATE_PLIST+= ${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/,' \ - ${LIBRARY_FILES}; -GENERATE_PLIST+= ${GREP} -q 'lib/' ${LIBRARY_FILES} || \ - ${ECHO} '@pkgdir ${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/lib' ; +GENERATE_PLIST+= ${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/,' \ + ${LIBRARY_FILES}; +GENERATE_PLIST+= ${GREP} -q 'lib/' ${LIBRARY_FILES} || \ + ${ECHO} '@pkgdir ${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/lib' ; ${LIBRARY_FILES}: ${PKG_INFO} -qL '${GCC_PKGNAME}-${GCC6_DIST_VERSION}*' | \ diff --git a/lang/gcc6/options.mk b/lang/gcc6/options.mk index 311dc5ca54f..4d60bd513e1 100644 --- a/lang/gcc6/options.mk +++ b/lang/gcc6/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2019/09/08 14:47:52 maya Exp $ +# $NetBSD: options.mk,v 1.3 2019/11/03 19:03:59 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.${GCC_PKGNAME} PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran \ @@ -12,7 +12,7 @@ PKG_SUGGESTED_OPTIONS+= nls .elif ${OPSYS} == "Linux" PKG_SUGGESTED_OPTIONS+= nls .elif ${OPSYS} == "DragonFly" -PKG_SUGGESTED_OPTIONS+= nls +PKG_SUGGESTED_OPTIONS+= nls .elif ${OPSYS} == "SunOS" PKG_SUGGESTED_OPTIONS+= gcc-inplace-math always-libgcc .else @@ -30,9 +30,9 @@ MULTILIB_SUPPORTED?= unknown .if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) . if exists(/usr/include/gnu/stubs-64.h) && \ !exists(/usr/include/gnu/stubs-32.h) -MULTILIB_SUPPORTED=No +MULTILIB_SUPPORTED= No . else -MULTILIB_SUPPORTED=Yes +MULTILIB_SUPPORTED= Yes . endif .endif .if !empty(MULTILIB_SUPPORTED:M[Yy][Ee][Ss]) @@ -70,24 +70,24 @@ CONFIGURE_ARGS+= --disable-multilib ### .if empty(PKG_OPTIONS:Malways-libgcc) -.for _libdir_ in ${_OPSYS_LIB_DIRS} -. if exists(${_libdir_}) +. for _libdir_ in ${_OPSYS_LIB_DIRS} +. if exists(${_libdir_}) BASE_LIBGCC!= find ${_libdir_} -name libgcc_s.so BASE_LIBGCC_MATCH_STRING!= ${ECHO} ${BASE_LIBGCC} ${GCC6_DIST_VERSION} | \ ${AWK} -f ../../mk/scripts/larger_symbol_version.awk -. if ${BASE_LIBGCC_MATCH_STRING:Mnewer} +. if ${BASE_LIBGCC_MATCH_STRING:Mnewer} DELETE_INSTALLED_LIBGCC= yes +. endif . endif -. endif -.endfor +. endfor -.if ${DELETE_INSTALLED_LIBGCC:Uno} +. if ${DELETE_INSTALLED_LIBGCC:Uno} post-install: delete-installed-libgcc delete-installed-libgcc: ${FIND} ${DESTDIR} -name 'libgcc_s.so*' -delete -.endif +. endif .endif @@ -113,9 +113,9 @@ LIBS.SunOS+= -lgmp ### Graphite Support ### .if !empty(PKG_OPTIONS:Mgcc-graphite) -ISL14 = isl-0.14 +ISL14 = isl-0.14 SITES.${ISL14}.tar.bz2 = ${MASTER_SITE_GNU:=gcc/infrastructure/} -DISTFILES += ${ISL14}.tar.bz2 +DISTFILES += ${ISL14}.tar.bz2 .endif ### diff --git a/lang/gcc6/version.mk b/lang/gcc6/version.mk index 5215c65adcd..520a18e553f 100644 --- a/lang/gcc6/version.mk +++ b/lang/gcc6/version.mk @@ -1,2 +1,2 @@ -# $NetBSD: version.mk,v 1.4 2018/11/05 18:59:44 maya Exp $ -GCC6_DIST_VERSION:=6.5.0 +# $NetBSD: version.mk,v 1.5 2019/11/03 19:03:59 rillig Exp $ +GCC6_DIST_VERSION:= 6.5.0 diff --git a/lang/gcc7/options.mk b/lang/gcc7/options.mk index b1758dea048..58fc0701cbf 100644 --- a/lang/gcc7/options.mk +++ b/lang/gcc7/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2019/09/08 14:47:52 maya Exp $ +# $NetBSD: options.mk,v 1.6 2019/11/03 19:04:00 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.${GCC_PKGNAME} PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran \ @@ -30,9 +30,9 @@ _GNU_INCLUDE_DIR= /usr/include/gnu . endif . if exists(${_GNU_INCLUDE_DIR}/stubs-64.h) && \ !exists(${_GNU_INCLUDE_DIR}/stubs-32.h) -MULTILIB_SUPPORTED=No +MULTILIB_SUPPORTED= No . else -MULTILIB_SUPPORTED=Yes +MULTILIB_SUPPORTED= Yes . endif .endif .if !empty(MULTILIB_SUPPORTED:M[Yy][Ee][Ss]) @@ -70,24 +70,24 @@ CONFIGURE_ARGS+= --disable-multilib ### .if empty(PKG_OPTIONS:Malways-libgcc) -.for _libdir_ in ${_OPSYS_LIB_DIRS} -. if exists(${_libdir_}) +. for _libdir_ in ${_OPSYS_LIB_DIRS} +. if exists(${_libdir_}) BASE_LIBGCC!= find ${_libdir_} -name libgcc_s.so BASE_LIBGCC_MATCH_STRING!= ${ECHO} ${BASE_LIBGCC} ${GCC7_DIST_VERSION} | \ ${AWK} -f ../../mk/scripts/larger_symbol_version.awk -. if ${BASE_LIBGCC_MATCH_STRING:Mnewer} +. if ${BASE_LIBGCC_MATCH_STRING:Mnewer} DELETE_INSTALLED_LIBGCC= yes +. endif . endif -. endif -.endfor +. endfor -.if ${DELETE_INSTALLED_LIBGCC:Uno} +. if ${DELETE_INSTALLED_LIBGCC:Uno} post-install: delete-installed-libgcc delete-installed-libgcc: ${FIND} ${DESTDIR} -name 'libgcc_s.so*' -delete -.endif +. endif .endif diff --git a/lang/gcc8-libs/Makefile b/lang/gcc8-libs/Makefile index 17535706866..24d707d334f 100644 --- a/lang/gcc8-libs/Makefile +++ b/lang/gcc8-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2019/05/31 09:23:57 kamil Exp $ +# $NetBSD: Makefile,v 1.5 2019/11/03 19:04:00 rillig Exp $ GCC_PKGNAME= gcc8 .include "../../lang/${GCC_PKGNAME}/version.mk" @@ -43,10 +43,10 @@ SHLIB_EXT= so LIBRARY_FILES= ${WRKDIR}/lib_files -GENERATE_PLIST+= ${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/,' \ - ${LIBRARY_FILES}; -GENERATE_PLIST+= ${GREP} -q 'lib/' ${LIBRARY_FILES} || \ - ${ECHO} '@pkgdir ${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/lib' ; +GENERATE_PLIST+= ${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/,' \ + ${LIBRARY_FILES}; +GENERATE_PLIST+= ${GREP} -q 'lib/' ${LIBRARY_FILES} || \ + ${ECHO} '@pkgdir ${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/lib' ; ${LIBRARY_FILES}: ${PKG_INFO} -qL '${GCC_PKGNAME}-${GCC8_DIST_VERSION}*' | \ diff --git a/lang/gcc8/options.mk b/lang/gcc8/options.mk index 894eb59b015..756a87a9c0e 100644 --- a/lang/gcc8/options.mk +++ b/lang/gcc8/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2019/09/08 14:47:52 maya Exp $ +# $NetBSD: options.mk,v 1.3 2019/11/03 19:04:00 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.${GCC_PKGNAME} PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran \ @@ -35,9 +35,9 @@ _GNU_INCLUDE_DIR= /usr/include/gnu . endif . if exists(${_GNU_INCLUDE_DIR}/stubs-64.h) && \ !exists(${_GNU_INCLUDE_DIR}/stubs-32.h) -MULTILIB_SUPPORTED=No +MULTILIB_SUPPORTED= No . else -MULTILIB_SUPPORTED=Yes +MULTILIB_SUPPORTED= Yes . endif .endif .if !empty(MULTILIB_SUPPORTED:M[Yy][Ee][Ss]) @@ -52,24 +52,24 @@ PKG_SUGGESTED_OPTIONS+= gcc-multilib ### .if empty(PKG_OPTIONS:Malways-libgcc) -.for _libdir_ in ${_OPSYS_LIB_DIRS} -. if exists(${_libdir_}) +. for _libdir_ in ${_OPSYS_LIB_DIRS} +. if exists(${_libdir_}) BASE_LIBGCC!= find ${_libdir_} -name libgcc_s.so BASE_LIBGCC_MATCH_STRING!= ${ECHO} ${BASE_LIBGCC} ${GCC8_DIST_VERSION} | \ ${AWK} -f ../../mk/scripts/larger_symbol_version.awk -. if ${BASE_LIBGCC_MATCH_STRING:Mnewer} +. if ${BASE_LIBGCC_MATCH_STRING:Mnewer} DELETE_INSTALLED_LIBGCC= yes +. endif . endif -. endif -.endfor +. endfor -.if ${DELETE_INSTALLED_LIBGCC:Uno} +. if ${DELETE_INSTALLED_LIBGCC:Uno} post-install: delete-installed-libgcc delete-installed-libgcc: ${FIND} ${DESTDIR} -name 'libgcc_s.so*' -delete -.endif +. endif .endif diff --git a/lang/gforth/Makefile b/lang/gforth/Makefile index 1d4f79d25bf..20ebe9c14d7 100644 --- a/lang/gforth/Makefile +++ b/lang/gforth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2019/08/11 13:21:20 wiz Exp $ +# $NetBSD: Makefile,v 1.44 2019/11/03 19:04:00 rillig Exp $ DISTNAME= gforth-0.7.3 PKGREVISION= 5 @@ -60,9 +60,9 @@ PLIST_SUBST+= KERNEL_FI=${KERNEL_FI_cmd:sh:Q} # demand at least gcc 4.3 for arm. .include "../../mk/bsd.prefs.mk" .if !empty(MACHINE_ARCH:Marm*) || !empty(MACHINE_ARCH:Mearm*) -.if !empty(PKGSRC_COMPILER:Mgcc) +. if !empty(PKGSRC_COMPILER:Mgcc) GCC_REQD+= 4.3 -.endif +. endif .endif # XXX Need test. diff --git a/lang/ghc-bootstrap/Makefile b/lang/ghc-bootstrap/Makefile index 72ca41a5ffa..50a54743cb9 100644 --- a/lang/ghc-bootstrap/Makefile +++ b/lang/ghc-bootstrap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2019/07/08 10:36:26 nia Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/03 19:04:00 rillig Exp $ DISTNAME= ghc-6.8.3 PKGNAME= ghc-bootstrap-6.8.3 @@ -15,7 +15,7 @@ COMMENT= Bootstrap kit generator for the GHC Haskell compiler # build defs # -CONFLICTS+= ghc-[0-9]* +CONFLICTS+= ghc-[0-9]* # Disable this (at least for now) so bootstrap kits get built by autobuilds. #NOT_FOR_BULK_PLATFORM= *-*-* # Package is useful only for maintainers. diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index 81ab3d664d1..bb47d1d8750 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2019/10/25 08:55:46 gutteridge Exp $ +# $NetBSD: Makefile,v 1.63 2019/11/03 19:04:00 rillig Exp $ DISTNAME= ghc-6.8.3 PKGREVISION= 10 @@ -13,11 +13,11 @@ OWNER= kristerw@NetBSD.org HOMEPAGE= https://www.haskell.org/ghc/ COMMENT= Compiler for the functional language Haskell -SITES.ghc-6.4.2-src.tar.bz2=http://www.haskell.org/ghc/dist/6.4.2/ -SITES.ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz=${MASTER_SITE_LOCAL} +SITES.ghc-6.4.2-src.tar.bz2= http://www.haskell.org/ghc/dist/6.4.2/ +SITES.ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz= ${MASTER_SITE_LOCAL} # There is only an i386 bootstrap kit available. -ONLY_FOR_PLATFORM= Darwin-*-i386 FreeBSD-*-i386 NetBSD-*-i386 OpenBSD-*-i386 SunOS-*-i386 +ONLY_FOR_PLATFORM= Darwin-*-i386 FreeBSD-*-i386 NetBSD-*-i386 OpenBSD-*-i386 SunOS-*-i386 CHECK_PORTABILITY_SKIP= distrib/prep-bin-dist-mingw diff --git a/lang/ghc7/bootstrap.mk b/lang/ghc7/bootstrap.mk index d5885704d5b..6e0bb3d3a1b 100644 --- a/lang/ghc7/bootstrap.mk +++ b/lang/ghc7/bootstrap.mk @@ -1,4 +1,4 @@ -# $NetBSD: bootstrap.mk,v 1.25 2019/10/14 02:36:30 gutteridge Exp $ +# $NetBSD: bootstrap.mk,v 1.26 2019/11/03 19:04:00 rillig Exp $ # ----------------------------------------------------------------------------- # Select a bindist of bootstrapping compiler on a per-platform basis. # @@ -54,7 +54,7 @@ BOOT_ARCHIVE:= ghc-${BOOT_VERSION}-boot-x86_64-unknown-solaris2.tar.xz .endif .if empty(BOOT_ARCHIVE) -BOOT_ARCHIVE:= ghc-${BOOT_VERSION}-boot-unknown.tar.xz +BOOT_ARCHIVE:= ghc-${BOOT_VERSION}-boot-unknown.tar.xz PKG_FAIL_REASON+= "internal error: unsupported platform" .endif diff --git a/lang/gnat_util/Makefile b/lang/gnat_util/Makefile index a62e1cc925a..e44deeda06a 100644 --- a/lang/gnat_util/Makefile +++ b/lang/gnat_util/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2018/04/02 09:30:06 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2019/11/03 19:04:01 rillig Exp $ PKGNAME= gnat_util-${SNAPSHOT} CATEGORIES= lang @@ -22,8 +22,8 @@ MAKE_ENV= MAKEOBJDIR=${WRKSRC}/obj USE_LANGUAGES= c ada # Automatic package list generation -GENERATE_PLIST= cd ${DESTDIR}${PREFIX}; -GENERATE_PLIST+= ${FIND} * \( -type f -or -type l \) | ${SORT} -dr; +GENERATE_PLIST= cd ${DESTDIR}${PREFIX}; +GENERATE_PLIST+= ${FIND} * \( -type f -or -type l \) | ${SORT} -dr; post-extract: ${MKDIR} ${WRKSRC}/obj diff --git a/lang/go-hcl/Makefile b/lang/go-hcl/Makefile index 4272bfdbf0c..ba1455782e1 100644 --- a/lang/go-hcl/Makefile +++ b/lang/go-hcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2019/10/18 14:58:53 bsiegert Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/03 19:04:01 rillig Exp $ DISTNAME= hcl-0.0.20160616 PKGNAME= go-${DISTNAME} @@ -6,7 +6,7 @@ PKGREVISION= 13 MASTER_SITES= ${MASTER_SITE_GITHUB:=hashicorp/} CATEGORIES= lang GITHUB_TAG= d7400db7143f8e869812e50a53acd6c8d92af3b8 -GITHUB_PROJECT= ${PKGBASE:S/^go-//} +GITHUB_PROJECT= ${PKGBASE:S/^go-//} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://github.com/hashicorp/hcl diff --git a/lang/go/version.mk b/lang/go/version.mk index 9201a928e28..60b9a39b797 100644 --- a/lang/go/version.mk +++ b/lang/go/version.mk @@ -1,4 +1,4 @@ -# $NetBSD: version.mk,v 1.70 2019/10/18 14:48:29 bsiegert Exp $ +# $NetBSD: version.mk,v 1.71 2019/11/03 19:04:01 rillig Exp $ CTF_SUPPORTED= no SSP_SUPPORTED= no @@ -38,22 +38,22 @@ GO_PACKAGE_DEP= go${GOVERSSUFFIX}-${GO${GOVERSSUFFIX}_VERSION}*:../../lang/go${ ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64 *-*-earmv[67]hf NOT_FOR_PLATFORM= SunOS-*-i386 .if ${MACHINE_ARCH} == "i386" -GOARCH= 386 -GOCHAR= 8 +GOARCH= 386 +GOCHAR= 8 .elif ${MACHINE_ARCH} == "x86_64" -GOARCH= amd64 -GOCHAR= 6 +GOARCH= amd64 +GOCHAR= 6 .elif ${MACHINE_ARCH} == "earmv6hf" || ${MACHINE_ARCH} == "earmv7hf" -GOARCH= arm -GOCHAR= 5 +GOARCH= arm +GOCHAR= 5 .endif .if ${MACHINE_ARCH} == "earmv6hf" -GOOPT= GOARM=6 +GOOPT= GOARM=6 .elif ${MACHINE_ARCH} == "earmv7hf" -GOOPT= GOARM=7 +GOOPT= GOARM=7 .endif -GO_PLATFORM= ${LOWER_OPSYS}_${GOARCH} -PLIST_SUBST+= GO_PLATFORM=${GO_PLATFORM:Q} GOARCH=${GOARCH:Q} -PLIST_SUBST+= GOCHAR=${GOCHAR:Q} +GO_PLATFORM= ${LOWER_OPSYS}_${GOARCH} +PLIST_SUBST+= GO_PLATFORM=${GO_PLATFORM:Q} GOARCH=${GOARCH:Q} +PLIST_SUBST+= GOCHAR=${GOCHAR:Q} PRINT_PLIST_AWK+= { sub("/${GO_PLATFORM}/", "/$${GO_PLATFORM}/") } diff --git a/lang/go14/Makefile b/lang/go14/Makefile index e6b501aa766..827fce5c687 100644 --- a/lang/go14/Makefile +++ b/lang/go14/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2019/08/11 13:21:21 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/03 19:04:01 rillig Exp $ .include "../../lang/go/version.mk" @@ -24,8 +24,8 @@ BUILD_DEPENDS+= bash>=4.2nb3:../../shells/bash TMPDIR?= /tmp BUILDLINK_PASSTHRU_DIRS+= ${TMPDIR} -GOROOT_FINAL= ${PREFIX}/go14 -INSTALLATION_DIRS= go14 +GOROOT_FINAL= ${PREFIX}/go14 +INSTALLATION_DIRS= go14 MAKE_ENV+= GOROOT_FINAL=${GOROOT_FINAL:Q} MAKE_ENV+= CGO_ENABLED=0 diff --git a/lang/go19/Makefile b/lang/go19/Makefile index 34a120b3465..123967a1922 100644 --- a/lang/go19/Makefile +++ b/lang/go19/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2019/08/11 13:21:21 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/03 19:04:01 rillig Exp $ PKGREVISION= 2 .include "../../lang/go/version.mk" @@ -24,8 +24,8 @@ USE_TOOLS+= bash:run perl:run pax TMPDIR?= /tmp BUILDLINK_PASSTHRU_DIRS+= ${TMPDIR} -GOROOT_FINAL= ${PREFIX}/go19 -INSTALLATION_DIRS= bin +GOROOT_FINAL= ${PREFIX}/go19 +INSTALLATION_DIRS= bin REPLACE_BASH+= doc/articles/wiki/test.bash REPLACE_BASH+= doc/codewalk/run diff --git a/lang/gpc/Makefile b/lang/gpc/Makefile index aacaa8a9c5b..bd4de365eec 100644 --- a/lang/gpc/Makefile +++ b/lang/gpc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2015/11/08 07:05:45 dholland Exp $ +# $NetBSD: Makefile,v 1.38 2019/11/03 19:04:01 rillig Exp $ DISTNAME= gpc-2.1 PKGREVISION= 5 @@ -6,7 +6,7 @@ CATEGORIES= lang MASTER_SITES= http://www.gnu-pascal.de/stable/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DISTFILES+= gcc-2.95.3.tar.gz -SITES.gcc-2.95.3.tar.gz=${MASTER_SITE_GNU:=gcc/} +SITES.gcc-2.95.3.tar.gz= ${MASTER_SITE_GNU:=gcc/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.gnu-pascal.de/gpc/h-index.html diff --git a/lang/guile22/Makefile b/lang/guile22/Makefile index 3629cb0aa65..b4ab760d6b6 100644 --- a/lang/guile22/Makefile +++ b/lang/guile22/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2019/09/10 03:47:27 gutteridge Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/03 19:04:01 rillig Exp $ DISTNAME= guile-2.2.6 PKGNAME= ${DISTNAME:S/guile/guile22/} @@ -36,9 +36,9 @@ CONFIGURE_ARGS+= --infodir=${PREFIX}/${PKGINFODIR} CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} .endif -INFO_FILES= yes -USE_LIBTOOL= yes -USE_TOOLS+= gmake pkg-config +INFO_FILES= yes +USE_LIBTOOL= yes +USE_TOOLS+= gmake pkg-config USE_TOOLS.Darwin+= gsed PKGCONFIG_OVERRIDE+= meta/guile-2.2.pc.in diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile index db1fee1e522..69b399c9225 100644 --- a/lang/hugs/Makefile +++ b/lang/hugs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2019/07/10 10:24:05 nia Exp $ +# $NetBSD: Makefile,v 1.45 2019/11/03 19:04:01 rillig Exp $ DISTNAME= hugs98-Sep2006 PKGNAME= hugs98-200609 @@ -41,5 +41,5 @@ CONFIGURE_ARGS+= ac_cv_lib_readline_readline=no # The default -O2 breaks the interpreter producing strange internal errors # at run time. .if !empty(CC_VERSION:Mgcc-4*) -CFLAGS+= -O0 +CFLAGS+= -O0 .endif diff --git a/lang/icon/Makefile b/lang/icon/Makefile index 87c6eb079db..6342da65201 100644 --- a/lang/icon/Makefile +++ b/lang/icon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2012/10/02 20:11:42 asau Exp $ +# $NetBSD: Makefile,v 1.51 2019/11/03 19:04:01 rillig Exp $ DISTNAME= icon.v943src PKGNAME= icon-9.4.3 @@ -29,7 +29,7 @@ NAME= bsd (${MACHINE_ARCH} == "m68k") || (${MACHINE_ARCH} == "vax") . else PTHREAD_OPTS+= require native -. include "../../mk/pthread.buildlink3.mk" +. include "../../mk/pthread.buildlink3.mk" . endif .elif ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" @@ -54,7 +54,7 @@ PKG_FAIL_REASON+= "${PKGNAME} does not know about "${CC_VERSION:Q} . if ${MACHINE_ARCH} == "sparc" . else PTHREAD_OPTS+= require native -. include "../../mk/pthread.buildlink3.mk" +. include "../../mk/pthread.buildlink3.mk" . endif .else diff --git a/lang/intercal/Makefile b/lang/intercal/Makefile index 7a33a152513..a13438b6485 100644 --- a/lang/intercal/Makefile +++ b/lang/intercal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2016/09/08 01:48:39 dholland Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/03 19:04:02 rillig Exp $ # DISTNAME= intercal-0.30 @@ -11,10 +11,10 @@ COMMENT= The ultimate language for obfuscation and job security LICENSE= gnu-gpl-v2 MAKE_JOBS_SAFE= no -USE_TOOLS+= flex yacc -GNU_CONFIGURE= yes +USE_TOOLS+= flex yacc +GNU_CONFIGURE= yes INSTALLATION_DIRS+= bin lib -INFO_FILES= yes +INFO_FILES= yes # 0.30 still mostly calls itself 0.29 PLIST_SUBST+= PLISTVERSION=0.29 diff --git a/lang/ja-gawk/Makefile b/lang/ja-gawk/Makefile index 866043dbae7..1c9cefccbc5 100644 --- a/lang/ja-gawk/Makefile +++ b/lang/ja-gawk/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.11 2012/10/02 20:11:43 asau Exp $ +# $NetBSD: Makefile,v 1.12 2019/11/03 19:04:02 rillig Exp $ DISTNAME= gawk-3.0.6 PKGNAME= ja-${DISTNAME} CATEGORIES= japanese lang MASTER_SITES= ${MASTER_SITE_GNU:=gawk/} -PATCH_SITES= http://www.hinadori.atnifty.com/~wills/program/ -PATCHFILES= gawkmb115.diff.gz +PATCH_SITES= http://www.hinadori.atnifty.com/~wills/program/ +PATCHFILES= gawkmb115.diff.gz PATCH_DIST_STRIP= -p1 MAINTAINER= tech-pkg-ja@jp.NetBSD.org diff --git a/lang/kaffe-x11/Makefile b/lang/kaffe-x11/Makefile index 343d85a678c..9ac496e10cb 100644 --- a/lang/kaffe-x11/Makefile +++ b/lang/kaffe-x11/Makefile @@ -1,18 +1,18 @@ -# $NetBSD: Makefile,v 1.53 2019/07/21 22:25:14 wiz Exp $ +# $NetBSD: Makefile,v 1.54 2019/11/03 19:04:02 rillig Exp $ # .include "../../lang/kaffe/Makefile.common" -PKGNAME= ${DISTNAME:S/kaffe/kaffe-x11/} +PKGNAME= ${DISTNAME:S/kaffe/kaffe-x11/} PKGREVISION= 37 -COMMENT+= (AWT support through X11) +COMMENT+= (AWT support through X11) -CONFIGURE_ARGS+= --with-kaffe-x-awt -CONFIGURE_ARGS+= --enable-gtk-peer -CONFIGURE_ARGS+= --with-x -CONFIGURE_ARGS+= --without-esd -CONFIGURE_ARGS+= --disable-esdtest +CONFIGURE_ARGS+= --with-kaffe-x-awt +CONFIGURE_ARGS+= --enable-gtk-peer +CONFIGURE_ARGS+= --with-x +CONFIGURE_ARGS+= --without-esd +CONFIGURE_ARGS+= --disable-esdtest USE_TOOLS+= pkg-config diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile index 7734f9cb1d0..495941d61b3 100644 --- a/lang/kaffe/Makefile +++ b/lang/kaffe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.77 2011/04/22 13:43:59 obache Exp $ +# $NetBSD: Makefile,v 1.78 2019/11/03 19:04:02 rillig Exp $ # .include "Makefile.common" @@ -21,8 +21,8 @@ JAVA_WRAPPERS= appletviewer jar java javac javadoc javah javakey \ .include "../../mk/bsd.prefs.mk" -UNLIMIT_RESOURCES= datasize -LIBS+= -lltdl +UNLIMIT_RESOURCES= datasize +LIBS+= -lltdl .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/lang/kaffe/Makefile.common b/lang/kaffe/Makefile.common index a4bcc6d4c73..960ac8e2774 100644 --- a/lang/kaffe/Makefile.common +++ b/lang/kaffe/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.26 2014/10/05 16:41:07 wiz Exp $ +# $NetBSD: Makefile.common,v 1.27 2019/11/03 19:04:02 rillig Exp $ # # used by lang/kaffe-esound/Makefile # used by lang/kaffe-x11/Makefile @@ -14,7 +14,7 @@ COMMENT= Virtual machine capable of running Java(tm) code DEPENDS+= jikes>=1.22:../../lang/jikes DEPENDS+= fastjar>=0.93:../../archivers/fastjar -EXTRACT_USING= bsdtar +EXTRACT_USING= bsdtar GNU_CONFIGURE_PREFIX= ${JAVA_HOME} GNU_CONFIGURE_MANDIR= ${PREFIX}/${PKGMANDIR} JAVA_HOME= ${PREFIX}/java/kaffe diff --git a/lang/kali/Makefile b/lang/kali/Makefile index 70f7d1a7de2..24917aa36fe 100644 --- a/lang/kali/Makefile +++ b/lang/kali/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2018/01/01 18:16:37 rillig Exp $ +# $NetBSD: Makefile,v 1.18 2019/11/03 19:04:02 rillig Exp $ DISTNAME= kali-0.52.2 CATEGORIES= lang @@ -8,9 +8,9 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://community.schemewiki.org/kali-scheme/ COMMENT= Distributed implementation of Scheme -GNU_CONFIGURE= yes -BUILD_TARGET= # empty -MAKE_ENV= mandir=${PREFIX}/${PKGMANDIR}/man1 +GNU_CONFIGURE= yes +BUILD_TARGET= # empty +MAKE_ENV= mandir=${PREFIX}/${PKGMANDIR}/man1 INSTALLATION_DIRS= bin include lib ${PKGMANDIR}/man1 # Thoroughly broken on 64-bit architectures. diff --git a/lang/libBlocksRuntime/buildlink3.mk b/lang/libBlocksRuntime/buildlink3.mk index d2cf2f53d9f..278788e2c53 100644 --- a/lang/libBlocksRuntime/buildlink3.mk +++ b/lang/libBlocksRuntime/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2018/06/02 19:11:01 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2019/11/03 19:04:02 rillig Exp $ BUILDLINK_TREE+= libBlocksRuntime @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libBlocksRuntime LIBBLOCKSRUNTIME_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libBlocksRuntime+= libBlocksRuntime>=6.0.0 -BUILDLINK_PKGSRCDIR.libBlocksRuntime?= ../../lang/libBlocksRuntime +BUILDLINK_PKGSRCDIR.libBlocksRuntime?= ../../lang/libBlocksRuntime .endif # LIBBLOCKSRUNTIME_BUILDLINK3_MK BUILDLINK_TREE+= -libBlocksRuntime diff --git a/lang/libLLVM/Makefile b/lang/libLLVM/Makefile index 0d0893cc6b5..ac6dd3eb46f 100644 --- a/lang/libLLVM/Makefile +++ b/lang/libLLVM/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2019/08/22 17:49:01 nia Exp $ +# $NetBSD: Makefile,v 1.33 2019/11/03 19:04:02 rillig Exp $ DISTNAME= llvm-7.0.1.src PKGNAME= ${DISTNAME:S/llvm/libLLVM/:S/.src//} @@ -17,7 +17,7 @@ USE_CMAKE= yes GCC_REQD+= 4.8 PYTHON_FOR_BUILD_ONLY= yes -CONFIGURE_DIRS= ${WRKDIR}/build +CONFIGURE_DIRS= ${WRKDIR}/build CMAKE_ARG_PATH= ${WRKSRC} CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release diff --git a/lang/libLLVM4/Makefile b/lang/libLLVM4/Makefile index 2179c2f2677..93e1acc57f7 100644 --- a/lang/libLLVM4/Makefile +++ b/lang/libLLVM4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2019/04/25 07:33:02 maya Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/03 19:04:02 rillig Exp $ DISTNAME= llvm-4.0.1.src PKGNAME= ${DISTNAME:S/llvm/libLLVM4/:S/.src//} @@ -17,7 +17,7 @@ USE_CMAKE= yes GCC_REQD+= 4.8 PYTHON_FOR_BUILD_ONLY= yes -CONFIGURE_DIRS= ${WRKDIR}/build +CONFIGURE_DIRS= ${WRKDIR}/build CMAKE_ARG_PATH= ${WRKSRC} CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release diff --git a/lang/libcxx/Makefile b/lang/libcxx/Makefile index ef89f7ab6e8..913e413cbc7 100644 --- a/lang/libcxx/Makefile +++ b/lang/libcxx/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2019/10/24 11:52:20 tnn Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/03 19:04:02 rillig Exp $ DISTNAME= libcxx-9.0.0.src PKGREVISION= 1 PKGNAME= ${DISTNAME:S/.src//} CATEGORIES= lang devel -MASTER_SITES= http://releases.llvm.org/${PKGVERSION_NOREV}/ +MASTER_SITES= http://releases.llvm.org/${PKGVERSION_NOREV}/ EXTRACT_SUFX= .tar.xz MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/lang/libunwind/Makefile b/lang/libunwind/Makefile index 664c228eacb..0cd1b6e675a 100644 --- a/lang/libunwind/Makefile +++ b/lang/libunwind/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.20 2019/10/24 11:52:20 tnn Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/03 19:04:03 rillig Exp $ DISTNAME= libunwind-9.0.0.src PKGREVISION= 1 PKGNAME= ${DISTNAME:S/.src//} CATEGORIES= lang devel -MASTER_SITES= http://releases.llvm.org/${PKGVERSION_NOREV}/ +MASTER_SITES= http://releases.llvm.org/${PKGVERSION_NOREV}/ EXTRACT_SUFX= .tar.xz MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/lang/likepython/Makefile b/lang/likepython/Makefile index e13c714be21..eaae6718125 100644 --- a/lang/likepython/Makefile +++ b/lang/likepython/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.7 2019/04/25 07:33:02 maya Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/03 19:04:03 rillig Exp $ # -VER= 0.1 -DISTNAME= likepython_${VER} -PKGNAME= likepython-${VER} +VER= 0.1 +DISTNAME= likepython_${VER} +PKGNAME= likepython-${VER} PKGREVISION= 3 CATEGORIES= lang @@ -17,7 +17,7 @@ LICENSE= mit WRKSRC= ${WRKDIR} # More than one possibility -- please check manually. -REPLACE_PYTHON= likepython +REPLACE_PYTHON= likepython SUBST_CLASSES+= fix-runt-interp SUBST_STAGE.fix-runt-interp= pre-configure @@ -26,7 +26,7 @@ SUBST_FILES.fix-runt-interp= likepython SUBST_SED.fix-runt-interp= -e '/call/s,python,${PYTHONBIN},g' -NO_BUILD= yes +NO_BUILD= yes INSTALLATION_DIRS= bin share/examples/likepython share/doc/likepython diff --git a/lang/micropython/Makefile b/lang/micropython/Makefile index 95aa7bd1b8b..24b4f9d6014 100644 --- a/lang/micropython/Makefile +++ b/lang/micropython/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2019/04/25 07:33:03 maya Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/03 19:04:03 rillig Exp $ DISTNAME= micropython-1.9.2 PKGREVISION= 3 @@ -19,7 +19,7 @@ USE_TOOLS+= pax gmake pkg-config AUTO_MKDIRS= yes PYTHON_VERSIONS_INCOMPATIBLE= 27 -PYTHON_FOR_BUILD_ONLY= yes +PYTHON_FOR_BUILD_ONLY= yes MAKE_ENV+= PYTHON=${PYTHONBIN:Q} MAKE_ENV+= MICROPY_CPYTHON3=${PYTHONBIN:Q} @@ -27,11 +27,11 @@ MAKE_ENV+= MICROPY_CPYTHON3=${PYTHONBIN:Q} REPLACE_PYTHON+= tools/make-frozen.py REPLACE_PYTHON+= tests/run-tests -SUBST_CLASSES+= fix-paths -SUBST_STAGE.fix-paths= pre-configure -SUBST_MESSAGE.fix-paths= Fixing absolute paths. -SUBST_FILES.fix-paths= unix/main.c -SUBST_SED.fix-paths= -e 's,%PREFIX%,${PREFIX},g' +SUBST_CLASSES+= fix-paths +SUBST_STAGE.fix-paths= pre-configure +SUBST_MESSAGE.fix-paths= Fixing absolute paths. +SUBST_FILES.fix-paths= unix/main.c +SUBST_SED.fix-paths= -e 's,%PREFIX%,${PREFIX},g' pre-configure: cd ${WRKSRC}/lib/axtls && ${GMAKE} clean diff --git a/lang/mono/options.mk b/lang/mono/options.mk index 190211783fe..76a165d5687 100644 --- a/lang/mono/options.mk +++ b/lang/mono/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2010/10/16 04:32:18 kefren Exp $ +# $NetBSD: options.mk,v 1.4 2019/11/03 19:04:03 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.mono PKG_SUPPORTED_OPTIONS= moonlight @@ -9,7 +9,7 @@ PKG_SUPPORTED_OPTIONS= moonlight PLIST_VARS+= moon .if !empty(PKG_OPTIONS:Mmoonlight) -PLIST.moon= yes +PLIST.moon= yes CONFIGURE_ARGS+= --with-moonlight=yes .else CONFIGURE_ARGS+= --with-moonlight=no diff --git a/lang/mono2/options.mk b/lang/mono2/options.mk index 4f22ae5cade..87c7d7fc11f 100644 --- a/lang/mono2/options.mk +++ b/lang/mono2/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2013/06/17 12:43:28 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/03 19:04:03 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.mono PKG_SUPPORTED_OPTIONS= moonlight @@ -9,7 +9,7 @@ PKG_SUPPORTED_OPTIONS= moonlight PLIST_VARS+= moon .if !empty(PKG_OPTIONS:Mmoonlight) -PLIST.moon= yes +PLIST.moon= yes CONFIGURE_ARGS+= --with-moonlight=yes .else CONFIGURE_ARGS+= --with-moonlight=no diff --git a/lang/newsqueak/Makefile b/lang/newsqueak/Makefile index 639e84cc248..f13298c9779 100644 --- a/lang/newsqueak/Makefile +++ b/lang/newsqueak/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2017/09/03 08:53:09 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/03 19:04:03 rillig Exp $ DISTNAME= newsqueak PKGNAME= newsqueak-20000211 @@ -10,8 +10,8 @@ HOMEPAGE= https://en.wikipedia.org/wiki/Newsqueak COMMENT= Newsqueak: a language for communicating with mice LICENSE= public-domain -WRKSRC= ${WRKDIR} -USE_TOOLS+= yacc +WRKSRC= ${WRKDIR} +USE_TOOLS+= yacc INSTALLATION_DIRS= bin share/squint/include do-install: diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile index b853ad2c9ad..a747d926dfb 100644 --- a/lang/nhc98/Makefile +++ b/lang/nhc98/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2019/07/10 10:24:06 nia Exp $ +# $NetBSD: Makefile,v 1.52 2019/11/03 19:04:03 rillig Exp $ DISTNAME= nhc98src-1.22 PKGNAME= nhc98-1.22 @@ -27,9 +27,9 @@ NOT_FOR_PLATFORM+= DragonFly-*-x86_64 # This package has LP64 issues, so must build as 32-bit binary. M32= .for P in ${LP64PLATFORMS} -.if ${MACHINE_PLATFORM:M${P}} +. if ${MACHINE_PLATFORM:M${P}} M32= -m32 -.endif +. endif .endfor BUILD_MAKE_FLAGS+= PKGSRC_M32=${M32} diff --git a/lang/nodejs/Makefile.common b/lang/nodejs/Makefile.common index f9a8ad8bbab..83b0271e994 100644 --- a/lang/nodejs/Makefile.common +++ b/lang/nodejs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.27 2019/01/18 16:24:37 jperkin Exp $ +# $NetBSD: Makefile.common,v 1.28 2019/11/03 19:04:03 rillig Exp $ # used by lang/nodejs/Makefile # used by lang/nodejs6/Makefile # used by lang/nodejs8/Makefile @@ -42,7 +42,7 @@ REPLACE_PYTHON+= tools/genv8constants.py REPLACE_PYTHON+= tools/gyp/pylib/gyp/flock_tool.py .if ${OPSYS} == "NetBSD" -BUILD_DEPENDS+= lockf-[0-9]*:../../sysutils/lockf +BUILD_DEPENDS+= lockf-[0-9]*:../../sysutils/lockf BUILDLINK_TRANSFORM+= rm:-ldl .endif diff --git a/lang/oo2c/Makefile b/lang/oo2c/Makefile index dee875bb0ff..d60eefb178c 100644 --- a/lang/oo2c/Makefile +++ b/lang/oo2c/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2019/10/12 20:03:36 rillig Exp $ +# $NetBSD: Makefile,v 1.39 2019/11/03 19:04:03 rillig Exp $ DISTNAME= oo2c_${BITS}-2.0.11 PKGNAME= oo2c-2.0.11 @@ -36,10 +36,10 @@ SUBST_SED.pkg-unwrap= -e 's,${WRAPPER_DIR},${LOCALBASE},g' .include "../../mk/bsd.prefs.mk" -BITS=32 +BITS= 32 .for PLAT in ${LP64PLATFORMS} . if !empty(MACHINE_PLATFORM:M${PLAT}) -BITS=64 +BITS= 64 . endif .endfor diff --git a/lang/open-cobol-ce/Makefile b/lang/open-cobol-ce/Makefile index 6104fa72b6a..3972fa6c5f8 100644 --- a/lang/open-cobol-ce/Makefile +++ b/lang/open-cobol-ce/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2017/09/03 08:53:09 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/03 19:04:04 rillig Exp $ DISTNAME= open-cobol-ce-1.1.r59 PKGNAME= ${DISTNAME:S/.r/./} @@ -28,7 +28,7 @@ SUBST_MESSAGE.bdb= Fixing runrime error. SUBST_STAGE.bdb= pre-configure SUBST_FILES.bdb= configure SUBST_SED.bdb= -e 's,db-4.4,db4,g' -#SUBST_SED.bdb+= -e 's,ncurses,curses,g' +#SUBST_SED.bdb+= -e 's,ncurses,curses,g' TEST_TARGET= check diff --git a/lang/openjdk11/Makefile b/lang/openjdk11/Makefile index 3fa933d9f91..e9c527d0c0f 100644 --- a/lang/openjdk11/Makefile +++ b/lang/openjdk11/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.4 2019/11/03 00:37:28 tnn Exp $ +# $NetBSD: Makefile,v 1.5 2019/11/03 19:04:04 rillig Exp $ DISTNAME= openjdk-jdk11u-${GITHUB_TAG:C/\+/-/} PKGNAME= openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/} CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GITHUB:=battleblow/} -GITHUB_PROJECT= openjdk-jdk11u -GITHUB_TAG= jdk-11.0.5+10-1 +GITHUB_PROJECT= openjdk-jdk11u +GITHUB_TAG= jdk-11.0.5+10-1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://openjdk.java.net/ @@ -69,12 +69,12 @@ CONFIGURE_ARGS+= USER=pkgsrc MAKE_ENV+= JAVA_HOME= MAKE_ENV+= CLASSPATH= -BUILD_OPSYS= ${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/:S/Linux/linux/} -BUILD_ARCH= ${MACHINE_ARCH:S/i386/x86/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/} -BUILDDIR= ${WRKSRC}/build/${BUILD_OPSYS}-${BUILD_ARCH}-normal-${BUILD_VARIANT}-${BUILD_DEBUG_LEVEL} +BUILD_OPSYS= ${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/:S/Linux/linux/} +BUILD_ARCH= ${MACHINE_ARCH:S/i386/x86/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/} +BUILDDIR= ${WRKSRC}/build/${BUILD_OPSYS}-${BUILD_ARCH}-normal-${BUILD_VARIANT}-${BUILD_DEBUG_LEVEL} BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/${JAVA_NAME}/lib BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/${JAVA_NAME}/lib/server -WRKSRC= ${WRKDIR}/${DISTNAME} +WRKSRC= ${WRKDIR}/${DISTNAME} .include "../../mk/compiler.mk" diff --git a/lang/openjdk11/bootstrap.mk b/lang/openjdk11/bootstrap.mk index 065653f25da..952561ddacc 100644 --- a/lang/openjdk11/bootstrap.mk +++ b/lang/openjdk11/bootstrap.mk @@ -1,10 +1,10 @@ -# $NetBSD: bootstrap.mk,v 1.2 2019/10/14 07:58:50 tnn Exp $ +# $NetBSD: bootstrap.mk,v 1.3 2019/11/03 19:04:04 rillig Exp $ -ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-x86_64 -BOOT.nb7-i386= bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz -SITES.${BOOT.nb7-i386}= ${MASTER_SITE_LOCAL:=openjdk11/} -BOOT.nb7-amd64= bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz -SITES.${BOOT.nb7-amd64}=${MASTER_SITE_LOCAL:=openjdk11/} +ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-x86_64 +BOOT.nb7-i386= bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz +SITES.${BOOT.nb7-i386}= ${MASTER_SITE_LOCAL:=openjdk11/} +BOOT.nb7-amd64= bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz +SITES.${BOOT.nb7-amd64}= ${MASTER_SITE_LOCAL:=openjdk11/} .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) DISTFILES+= ${BOOT.nb7-i386} diff --git a/lang/openjdk11/options.mk b/lang/openjdk11/options.mk index 5cf6fb5a1b8..5a8295f67fd 100644 --- a/lang/openjdk11/options.mk +++ b/lang/openjdk11/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2019/10/01 12:36:34 tnn Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/03 19:04:04 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openjdk11 PKG_OPTIONS_OPTIONAL_GROUPS= variant @@ -93,9 +93,9 @@ CONFIGURE_ARGS+= --enable-dtrace=no # Also, -static-libgcc doesn't work because libpthread needs dynamic # linkage of libgcc. .if !empty(PKG_OPTIONS:Mstatic-libstdcpp) -. if ${OPSYS} == "NetBSD" && !empty(PKGSRC_COMPILER:Mgcc) +. if ${OPSYS} == "NetBSD" && !empty(PKGSRC_COMPILER:Mgcc) BUILDLINK_TRANSFORM+= rm:-static-libgcc -. endif +. endif .else CONFIGURE_ARGS+= --with-stdc++lib=dynamic .endif diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile index 14c82df7590..c1f86277a7b 100644 --- a/lang/openjdk7/Makefile +++ b/lang/openjdk7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.138 2019/10/01 14:54:31 tnn Exp $ +# $NetBSD: Makefile,v 1.139 2019/11/03 19:04:04 rillig Exp $ JDK_MICRO= 141 DISTNAME= openjdk-1.7.${JDK_MICRO}-20170813 @@ -87,12 +87,12 @@ MAKE_ENV+= SKIP_COMPARE_IMAGES=true MAKE_ENV+= JAVA_HOME= MAKE_ENV+= CLASSPATH= -BUILD_OPSYS= ${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/} -BUILD_ARCH= ${MACHINE_ARCH:S/i386/i586/:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/} -LIBDIR_ARCH= ${MACHINE_ARCH:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/} -BUILDDIR= ${WRKSRC}/build/${BUILD_OPSYS}-${BUILD_ARCH} -LD_LIBRARY_PATH= ${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/jli:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/server -MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH} +BUILD_OPSYS= ${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/} +BUILD_ARCH= ${MACHINE_ARCH:S/i386/i586/:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/} +LIBDIR_ARCH= ${MACHINE_ARCH:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/} +BUILDDIR= ${WRKSRC}/build/${BUILD_OPSYS}-${BUILD_ARCH} +LD_LIBRARY_PATH= ${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/jli:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/server +MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH} BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/${JAVA_NAME}/jre/lib/${LIBDIR_ARCH} PLIST_SUBST+= ARCH=${LIBDIR_ARCH} @@ -162,10 +162,10 @@ CWRAPPERS_APPEND.cxx+= -Wno-parentheses -Wno-sign-conversion \ -Wno-delete-non-virtual-dtor \ -Wno-return-type -Wno-unused-parameter \ -Wno-parentheses-equality -Wno-empty-body -.if ${OPSYS} != "FreeBSD" +. if ${OPSYS} != "FreeBSD" _WRAP_EXTRA_ARGS.CXX+= -Wno-new-returns-null CWRAPPERS_APPEND.cxx+= -Wno-new-returns-null -.endif +. endif BUILDLINK_TRANSFORM+= rm:-fcheck-new BUILDLINK_TRANSFORM+= rm:-fpch-deps . if ${MACHINE_ARCH} == "x86_64" diff --git a/lang/openjdk7/builtin.mk b/lang/openjdk7/builtin.mk index a4872f86e88..a7317c7a443 100644 --- a/lang/openjdk7/builtin.mk +++ b/lang/openjdk7/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.3 2018/01/02 00:15:08 rillig Exp $ +# $NetBSD: builtin.mk,v 1.4 2019/11/03 19:04:04 rillig Exp $ BUILTIN_PKG:= openjdk7 @@ -19,7 +19,7 @@ IS_BUILTIN.openjdk7= yes IS_BUILTIN.openjdk7= no . endif .endif -MAKEVARS+= IS_BUILTIN.openjdk7 +MAKEVARS+= IS_BUILTIN.openjdk7 ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -28,9 +28,9 @@ MAKEVARS+= IS_BUILTIN.openjdk7 .if !defined(BUILTIN_PKG.openjdk7) && \ !empty(IS_BUILTIN.openjdk7:M[yY][eE][sS]) BUILTIN_VERSION.openjdk7!= ${OJDK7} -version 2>&1 | ${SED} -Ee 's:^[^0-9]*([0-9._]+)$$:\1:' -e 's/_/./g' -e 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\1.\2.\4/' -BUILTIN_PKG.openjdk7= openjdk7-${BUILTIN_VERSION.openjdk7} +BUILTIN_PKG.openjdk7= openjdk7-${BUILTIN_VERSION.openjdk7} .endif -MAKEVARS+= BUILTIN_PKG.openjdk7 +MAKEVARS+= BUILTIN_PKG.openjdk7 ### ### Determine whether we should use the built-in implementation if it @@ -57,7 +57,7 @@ USE_BUILTIN.openjdk7!= \ . endif . endif .endif -MAKEVARS+= USE_BUILTIN.openjdk7 +MAKEVARS+= USE_BUILTIN.openjdk7 ### ### The section below only applies if we are not including this file diff --git a/lang/openjdk8/Makefile b/lang/openjdk8/Makefile index dbd5b499d8a..69a9ad3b732 100644 --- a/lang/openjdk8/Makefile +++ b/lang/openjdk8/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.86 2019/11/02 21:31:14 tnn Exp $ +# $NetBSD: Makefile,v 1.87 2019/11/03 19:04:04 rillig Exp $ DISTNAME= openjdk-jdk8u-${GITHUB_TAG} PKGNAME= openjdk8-1.8.${GITHUB_TAG:C/.*u([0-9]+).*/\1/} CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GITHUB:=battleblow/} MASTER_SITES+= ${MASTER_SITE_LOCAL:=openjdk7/} # for bootstrap kits -GITHUB_PROJECT= openjdk-jdk8u -GITHUB_TAG= jdk8u232-b09.1 +GITHUB_PROJECT= openjdk-jdk8u +GITHUB_TAG= jdk8u232-b09.1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://openjdk.java.net/ @@ -66,26 +66,26 @@ CONFIGURE_ARGS+= --with-extra-ldflags=${LDFLAGS:Q} CHECK_PORTABILITY_SKIP+= hotspot/test/runtime/*/*.sh -NOT_PAX_MPROTECT_SAFE+= java/${JAVA_NAME}/bin/[a-ik-z]* -NOT_PAX_MPROTECT_SAFE+= java/${JAVA_NAME}/bin/j[b-z]* -NOT_PAX_MPROTECT_SAFE+= java/${JAVA_NAME}/bin/jar* -NOT_PAX_MPROTECT_SAFE+= java/${JAVA_NAME}/bin/java -NOT_PAX_MPROTECT_SAFE+= java/${JAVA_NAME}/bin/java[a-z]* -NOT_PAX_MPROTECT_SAFE+= java/${JAVA_NAME}/jre/bin/* +NOT_PAX_MPROTECT_SAFE+= java/${JAVA_NAME}/bin/[a-ik-z]* +NOT_PAX_MPROTECT_SAFE+= java/${JAVA_NAME}/bin/j[b-z]* +NOT_PAX_MPROTECT_SAFE+= java/${JAVA_NAME}/bin/jar* +NOT_PAX_MPROTECT_SAFE+= java/${JAVA_NAME}/bin/java +NOT_PAX_MPROTECT_SAFE+= java/${JAVA_NAME}/bin/java[a-z]* +NOT_PAX_MPROTECT_SAFE+= java/${JAVA_NAME}/jre/bin/* # Avoid build errors when JAVA_HOME and CLASSPATH are defined by user. MAKE_ENV+= JAVA_HOME= MAKE_ENV+= CLASSPATH= -BUILD_OPSYS= ${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/:S/Linux/linux/} -BUILD_ARCH= ${MACHINE_ARCH:S/i386/x86/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/} -LIBDIR_ARCH= ${MACHINE_ARCH:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/} -BUILDDIR= ${WRKSRC}/build/${BUILD_OPSYS}-${BUILD_ARCH}-normal-${BUILD_VARIANT}-${BUILD_DEBUG_LEVEL} -LD_LIBRARY_PATH= ${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/jli:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/server -CONFIGURE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH} -MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH} -CONFIGURE_ENV+= LFLAGS=${LDFLAGS:Q} -MAKE_ENV+= LFLAGS=${LDFLAGS:Q} +BUILD_OPSYS= ${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/:S/Linux/linux/} +BUILD_ARCH= ${MACHINE_ARCH:S/i386/x86/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/} +LIBDIR_ARCH= ${MACHINE_ARCH:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/} +BUILDDIR= ${WRKSRC}/build/${BUILD_OPSYS}-${BUILD_ARCH}-normal-${BUILD_VARIANT}-${BUILD_DEBUG_LEVEL} +LD_LIBRARY_PATH= ${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/jli:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/server +CONFIGURE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH} +MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH} +CONFIGURE_ENV+= LFLAGS=${LDFLAGS:Q} +MAKE_ENV+= LFLAGS=${LDFLAGS:Q} BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/${JAVA_NAME}/jre/lib/${LIBDIR_ARCH} PLIST_SUBST+= ARCH=${LIBDIR_ARCH} diff --git a/lang/openjdk8/builtin.mk b/lang/openjdk8/builtin.mk index 3c0a850ef88..214e48ed762 100644 --- a/lang/openjdk8/builtin.mk +++ b/lang/openjdk8/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.3 2018/01/02 00:17:35 rillig Exp $ +# $NetBSD: builtin.mk,v 1.4 2019/11/03 19:04:04 rillig Exp $ BUILTIN_PKG:= openjdk8 @@ -19,7 +19,7 @@ IS_BUILTIN.openjdk8= yes IS_BUILTIN.openjdk8= no . endif .endif -MAKEVARS+= IS_BUILTIN.openjdk8 +MAKEVARS+= IS_BUILTIN.openjdk8 ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -28,9 +28,9 @@ MAKEVARS+= IS_BUILTIN.openjdk8 .if !defined(BUILTIN_PKG.openjdk8) && \ !empty(IS_BUILTIN.openjdk8:M[yY][eE][sS]) BUILTIN_VERSION.openjdk8!= ${OJDK8} -version 2>&1 | ${SED} -Ee 's:^[^0-9]*([0-9._]+)$$:\1:' -e 's/_/./g' -e 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\1.\2.\4/' -BUILTIN_PKG.openjdk8= openjdk8-${BUILTIN_VERSION.openjdk8} +BUILTIN_PKG.openjdk8= openjdk8-${BUILTIN_VERSION.openjdk8} .endif -MAKEVARS+= BUILTIN_PKG.openjdk8 +MAKEVARS+= BUILTIN_PKG.openjdk8 ### ### Determine whether we should use the built-in implementation if it @@ -57,7 +57,7 @@ USE_BUILTIN.openjdk8!= \ . endif . endif .endif -MAKEVARS+= USE_BUILTIN.openjdk8 +MAKEVARS+= USE_BUILTIN.openjdk8 ### ### The section below only applies if we are not including this file diff --git a/lang/openjdk8/hacks.mk b/lang/openjdk8/hacks.mk index 5db671ba801..c183c1ea3b0 100644 --- a/lang/openjdk8/hacks.mk +++ b/lang/openjdk8/hacks.mk @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.7 2018/09/14 15:53:46 tnn Exp $ +# $NetBSD: hacks.mk,v 1.8 2019/11/03 19:04:04 rillig Exp $ .if !defined(OPENJDK8_HACKS_MK) OPENJDK8_HACKS_MK= # empty @@ -23,22 +23,22 @@ VA_HACK_ARGS+= -XX:CompressedClassSpaceSize=128M .PHONY: apply-va-hack apply-va-hack: @${STEP_MSG} "Bulk build: reducing VA usage for tools in ${ALT_BOOTDIR}" -. for t in bin/java +.for t in bin/java @test -f ${ALT_BOOTDIR}/${t}.real || \ mv ${ALT_BOOTDIR}/${t} ${ALT_BOOTDIR}/${t}.real @echo '#!/bin/sh' > ${ALT_BOOTDIR}/${t} && \ echo 'exec ${ALT_BOOTDIR}/${t}.real ${VA_HACK_ARGS:M*} "$$@"' >> \ ${ALT_BOOTDIR}/${t} && \ chmod +x ${ALT_BOOTDIR}/${t} -. endfor -. for t in bin/jar bin/jarsigner bin/javac bin/javah bin/javap bin/keytool bin/native2ascii bin/rmic +.endfor +.for t in bin/jar bin/jarsigner bin/javac bin/javah bin/javap bin/keytool bin/native2ascii bin/rmic @test -f ${ALT_BOOTDIR}/${t}.real || \ mv ${ALT_BOOTDIR}/${t} ${ALT_BOOTDIR}/${t}.real @echo '#!/bin/sh' > ${ALT_BOOTDIR}/${t} && \ echo 'exec ${ALT_BOOTDIR}/${t}.real ${VA_HACK_ARGS:C/^/-J/} "$$@"' >> \ ${ALT_BOOTDIR}/${t} && \ chmod +x ${ALT_BOOTDIR}/${t} -. endfor +.endfor # Workaround incorrect constant folding of subnormals in javac when the FPU # does not handle subnormal arithmetic, like on ARM in Flush-to-zero mode. diff --git a/lang/oracle-jdk8/Makefile b/lang/oracle-jdk8/Makefile index 03c95ae091d..9cb9c5b4d06 100644 --- a/lang/oracle-jdk8/Makefile +++ b/lang/oracle-jdk8/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2018/11/25 12:41:50 ryoon Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/03 19:04:04 rillig Exp $ # Note: This must be kept in sync with the oracle-jre8 package # Note: make sure you include sums for both the x86_64 and the x86_32 @@ -32,9 +32,9 @@ DISTFILES+= jdk-8u${UPDATE_NUMBER}-linux-x64.tar.gz DISTFILES+= jdk-8u${UPDATE_NUMBER}-solaris-x64.tar.gz FETCH_MESSAGE= "You must fetch the following files to generate distinfo:" FETCH_MESSAGE+= "" -.for file in ${DISTFILES} +. for file in ${DISTFILES} FETCH_MESSAGE+= " ${file}" -.endfor +. endfor FETCH_MESSAGE+= "" FETCH_MESSAGE+= "from:" FETCH_MESSAGE+= " ${DOWNLOAD}" diff --git a/lang/oracle-jdk8/builtin.mk b/lang/oracle-jdk8/builtin.mk index 4c092efc1c8..f6aa23a4935 100644 --- a/lang/oracle-jdk8/builtin.mk +++ b/lang/oracle-jdk8/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2015/05/30 09:51:11 ryoon Exp $ +# $NetBSD: builtin.mk,v 1.2 2019/11/03 19:04:04 rillig Exp $ BUILTIN_PKG:= oracle-jdk8 @@ -13,7 +13,7 @@ BUILTIN_FIND_FILES.JDK8= \ ### program to find the default 1.8 JDK if it exists. ### .if ${OPSYS} == "Darwin" -_JAVA_HOME_ANSWER!= \ +_JAVA_HOME_ANSWER!= \ if [ -x /usr/libexec/java_home ]; then \ result=`/usr/libexec/java_home -v 1.8 2> /dev/null`; \ if [ $$? -eq 0 ]; then \ @@ -38,7 +38,7 @@ IS_BUILTIN.oracle-jdk8= yes IS_BUILTIN.oracle-jdk8= no . endif .endif -MAKEVARS+= IS_BUILTIN.oracle-jdk8 +MAKEVARS+= IS_BUILTIN.oracle-jdk8 ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -48,8 +48,8 @@ MAKEVARS+= IS_BUILTIN.oracle-jdk8 !empty(IS_BUILTIN.oracle-jdk8:M[yY][eE][sS]) && \ empty(JDK8:M__nonexistent__) -BUILTIN_VERSION.oracle-jdk8!= ${JDK8} -version 2>&1 | \ - ${AWK} '{print $$2; exit}' | \ +BUILTIN_VERSION.oracle-jdk8!= ${JDK8} -version 2>&1 | \ + ${AWK} '{print $$2; exit}' | \ ${AWK} '{sub(/^1\./,"");sub(/_/,".");print $$1}' BUILTIN_PKG.oracle-jdk8= oracle-jdk8-${BUILTIN_VERSION.oracle-jdk8} diff --git a/lang/oracle-jre8/Makefile b/lang/oracle-jre8/Makefile index 03a12fcba53..10450f7d472 100644 --- a/lang/oracle-jre8/Makefile +++ b/lang/oracle-jre8/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2017/12/13 09:34:48 jperkin Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/03 19:04:04 rillig Exp $ # Note: Regen distinfo with PKG_OPTIONS.oracle-jre8+=oracle-jre-jce # Note: Update DOWNLOAD_NAME when you update the JRE version @@ -33,7 +33,7 @@ WRKSRC= ${WRKDIR}/jre1.8.0_${UPDATE_NUMBER}.jre/Contents/Home WRKSRC= ${WRKDIR}/jre1.8.0_${UPDATE_NUMBER} .endif -SFILES_MK=sfiles-${DIST_OS}-${EMUL_ARCH}.mk +SFILES_MK= sfiles-${DIST_OS}-${EMUL_ARCH}.mk .sinclude "${SFILES_MK}" @@ -69,9 +69,9 @@ DISTFILES+= jre-8u${UPDATE_NUMBER}-macosx-x64.tar.gz DISTFILES+= jre-8u${UPDATE_NUMBER}-solaris-x64.tar.gz FETCH_MESSAGE= "You must fetch the following files to generate distinfo:" FETCH_MESSAGE+= "" -.for file in ${DISTFILES} +. for file in ${DISTFILES} FETCH_MESSAGE+= " ${file}" -.endfor +. endfor FETCH_MESSAGE+= "" FETCH_MESSAGE+= "from:" FETCH_MESSAGE+= " ${DOWNLOAD}" @@ -94,11 +94,11 @@ PKG_FAIL_REASON+= "${X11_LIB} does not exist. Please install the" \ "X11 library packages for your system." . endif . else -. include "../../x11/libX11/buildlink3.mk" -. include "../../x11/libXext/buildlink3.mk" -. include "../../x11/libXi/buildlink3.mk" -. include "../../x11/libXt/buildlink3.mk" -. include "../../x11/libXtst/buildlink3.mk" +. include "../../x11/libX11/buildlink3.mk" +. include "../../x11/libXext/buildlink3.mk" +. include "../../x11/libXi/buildlink3.mk" +. include "../../x11/libXt/buildlink3.mk" +. include "../../x11/libXtst/buildlink3.mk" X11_LIBDIR= ${X11BASE}/lib . endif diff --git a/lang/oracle-jre8/Makefile.common b/lang/oracle-jre8/Makefile.common index 4c3a6f2e330..d34401bd4be 100644 --- a/lang/oracle-jre8/Makefile.common +++ b/lang/oracle-jre8/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.17 2019/07/10 10:37:13 nia Exp $ +# $NetBSD: Makefile.common,v 1.18 2019/11/03 19:04:04 rillig Exp $ # used by lang/oracle-jre8/Makefile # used by lang/oracle-jdk8/Makefile @@ -10,11 +10,11 @@ HOMEPAGE= https://www.oracle.com/technetwork/java/index.html DOWNLOAD= https://www.oracle.com/technetwork/java/javase/downloads/index-jsp-138363.html ARCHIVE= https://www.oracle.com/technetwork/java/javase/archive-139210.html -RESTRICTED= Redistribution of repackaged binaries not permitted -NO_SRC_ON_CDROM=${RESTRICTED} -NO_SRC_ON_FTP= ${RESTRICTED} -NO_BIN_ON_CDROM=${RESTRICTED} -NO_BIN_ON_FTP= ${RESTRICTED} +RESTRICTED= Redistribution of repackaged binaries not permitted +NO_SRC_ON_CDROM= ${RESTRICTED} +NO_SRC_ON_FTP= ${RESTRICTED} +NO_BIN_ON_CDROM= ${RESTRICTED} +NO_BIN_ON_FTP= ${RESTRICTED} EMUL_PLATFORMS= darwin-x86_64 linux-i386 linux-x86_64 solaris-x86_64 diff --git a/lang/oracle-jre8/builtin.mk b/lang/oracle-jre8/builtin.mk index 3b28a65ce0f..8d169ccacd4 100644 --- a/lang/oracle-jre8/builtin.mk +++ b/lang/oracle-jre8/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2015/05/30 09:49:43 ryoon Exp $ +# $NetBSD: builtin.mk,v 1.2 2019/11/03 19:04:04 rillig Exp $ BUILTIN_PKG:= oracle-jre8 @@ -38,7 +38,7 @@ IS_BUILTIN.oracle-jre8= yes IS_BUILTIN.oracle-jre8= no . endif .endif -MAKEVARS+= IS_BUILTIN.oracle-jre8 +MAKEVARS+= IS_BUILTIN.oracle-jre8 ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -48,8 +48,8 @@ MAKEVARS+= IS_BUILTIN.oracle-jre8 !empty(IS_BUILTIN.oracle-jre8:M[yY][eE][sS]) && \ empty(JAVAVM8:M__nonexistent__) -BUILTIN_VERSION.oracle-jre8!= ${JAVAVM8:Q}/bin/java -version 2>&1 | \ - ${AWK} -F \" '{print $$2; exit}' | \ +BUILTIN_VERSION.oracle-jre8!= ${JAVAVM8:Q}/bin/java -version 2>&1 | \ + ${AWK} -F \" '{print $$2; exit}' | \ ${AWK} '{sub(/^1\./,"");sub(/_/,".");print $$1}' BUILTIN_PKG.oracle-jre8= oracle-jre8-${BUILTIN_VERSION.oracle-jre8} @@ -81,7 +81,7 @@ USE_BUILTIN.oracle-jre8!= \ . endif . endif # PREFER.oracle-jre8 .endif -MAKEVARS+= USE_BUILTIN.oracle-jre8 +MAKEVARS+= USE_BUILTIN.oracle-jre8 ### ### The section below only applies if we are not including this file diff --git a/lang/ossp-js/Makefile b/lang/ossp-js/Makefile index d7d5e967d1b..8a447001335 100644 --- a/lang/ossp-js/Makefile +++ b/lang/ossp-js/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2019/08/11 13:21:22 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2019/11/03 19:04:04 rillig Exp $ # DISTNAME= js-1.6.20070208 @@ -34,8 +34,8 @@ CONFIGURE_ARGS+= --without-perl REPLACE_SH= js-config.sh.in REPLACE_INTERPRETER+= js -REPLACE.js.old= ./js -REPLACE.js.new= ${PREFIX}/bin/js +REPLACE.js.old= ./js +REPLACE.js.new= ${PREFIX}/bin/js REPLACE_FILES.js= jslint.js jspack.js .include "libm.mk" diff --git a/lang/ossp-js/libm.mk b/lang/ossp-js/libm.mk index 74f33fc1e15..41333ffffec 100644 --- a/lang/ossp-js/libm.mk +++ b/lang/ossp-js/libm.mk @@ -1,4 +1,4 @@ -# $NetBSD: libm.mk,v 1.1 2008/02/06 10:08:01 bjs Exp $ +# $NetBSD: libm.mk,v 1.2 2019/11/03 19:04:04 rillig Exp $ # # XXX I took this from jslibmath.h. If this is not correct, please feel # free to change it. Our lang/spidermonkey package never uses @@ -7,9 +7,9 @@ .include "../../mk/bsd.fast.prefs.mk" JS_FDLIBM_PLATFORMS= Linux-*-* IRIX-*-* SunOS-*-* \ - Solaris-*-* AIX-*-* HPUX-*-* + Solaris-*-* AIX-*-* HPUX-*-* -JS_FDLIBM_MATH_REQUESTED?= no +JS_FDLIBM_MATH_REQUESTED?= no .for plat in ${JS_FDLIBM_PLATFORMS} . if !empty(MACHINE_PLATFORM:M${plat}) JS_FDLIBM_MATH_REQUESTED= yes diff --git a/lang/parrot/Makefile b/lang/parrot/Makefile index 7c91d953554..5fb684dc158 100644 --- a/lang/parrot/Makefile +++ b/lang/parrot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.95 2019/08/11 13:21:23 wiz Exp $ +# $NetBSD: Makefile,v 1.96 2019/11/03 19:04:04 rillig Exp $ # DISTNAME= parrot-${PARROT_VERSION} @@ -44,7 +44,7 @@ SUBST_SED.pthread+= -e '/^LINKFLAGS /s|$$|${PTHREAD_LDFLAGS:Q} ${PTHREAD_LIBS:Q} SUBST_SED.pthread+= -e '/^LDFLAGS /s|$$|${PTHREAD_LDFLAGS:Q} ${PTHREAD_LIBS:Q}|' PLIST_SUBST+= PARROT_VERSION=${PARROT_VERSION:Q} -PRINT_PLIST_AWK+= { gsub(/${PARROT_VERSION}/, "$${PARROT_VERSION}") } +PRINT_PLIST_AWK+= { gsub(/${PARROT_VERSION}/, "$${PARROT_VERSION}") } PLIST_SRC+= ${PLIST_SRC_DFLT} # Default this to ELF shared libs with .so, # Darwin has PLIST.Darwin which gets included automatically. @@ -63,12 +63,12 @@ REPLACE_PERL+= tools/dev/reconfigure.pl REPLACE_INTERPRETER+= parrot REPLACE.parrot.old= .*parrot[^[:space:]]* REPLACE.parrot.new= ${PREFIX}/bin/parrot -REPLACE_FILES.parrot+= tools/dev/pbc_to_exe.pir +REPLACE_FILES.parrot+= tools/dev/pbc_to_exe.pir -REPLACE_INTERPRETER+= parrot-nqp -REPLACE.parrot-nqp.old= .*parrot-nqp[^[:space:]]* -REPLACE.parrot-nqp.new= ${PREFIX}/bin/parrot-nqp -REPLACE_FILES.parrot-nqp+= compilers/data_json/JSON.nqp +REPLACE_INTERPRETER+= parrot-nqp +REPLACE.parrot-nqp.old= .*parrot-nqp[^[:space:]]* +REPLACE.parrot-nqp.new= ${PREFIX}/bin/parrot-nqp +REPLACE_FILES.parrot-nqp+= compilers/data_json/JSON.nqp REPLACE_INTERPRETER+= nqp REPLACE.nqp.old= .*nqp[^[:space:]]* diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile index a5c5f23a28e..98f1ab4d406 100644 --- a/lang/perl5/Makefile +++ b/lang/perl5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.256 2019/10/10 17:59:57 maya Exp $ +# $NetBSD: Makefile,v 1.257 2019/11/03 19:04:05 rillig Exp $ .include "license.mk" .include "Makefile.common" @@ -132,7 +132,7 @@ TEST_TARGET= test # Policy.sh generation # (see comments in files/Policy.sh) -SUBST_CLASSES+= policysh +SUBST_CLASSES+= policysh SUBST_STAGE.policysh= pre-configure SUBST_FILES.policysh= Policy.sh SUBST_VARS.policysh+= MACHINE_ARCH diff --git a/lang/perl5/hacks.mk b/lang/perl5/hacks.mk index ace69ef42b4..c48dae965c3 100644 --- a/lang/perl5/hacks.mk +++ b/lang/perl5/hacks.mk @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.24 2019/10/10 17:59:57 maya Exp $ +# $NetBSD: hacks.mk,v 1.25 2019/11/03 19:04:05 rillig Exp $ .if !defined(PERL5_HACKS_MK) PERL5_HACKS_MK= defined @@ -31,7 +31,7 @@ BUILDLINK_TRANSFORM+= opt:-O[0-9]*:-Os # XXX: is there any good way to replace the default -O2 with multiple args? PKG_HACKS+= alpha-optimisation #BUILDLINK_TRANSFORM+= opt:-O[2-9]*:-O2 -fno-tree-ter -CFLAGS+=-fno-tree-ter +CFLAGS+= -fno-tree-ter .endif ### [Thu May 14 23:17:20 JST 2015 : ryoon] diff --git a/lang/perl5/module.mk b/lang/perl5/module.mk index 4959e991fbb..354071c15b6 100644 --- a/lang/perl5/module.mk +++ b/lang/perl5/module.mk @@ -1,4 +1,4 @@ -# $NetBSD: module.mk,v 1.73 2018/01/07 11:40:57 rillig Exp $ +# $NetBSD: module.mk,v 1.74 2019/11/03 19:04:05 rillig Exp $ # # This Makefile fragment is intended to be included by packages that build # and install perl5 modules. @@ -63,7 +63,7 @@ TEST_TARGET?= test ${PERL5_MODULE_TYPE} == "Module::Build::Bundled" || \ ${PERL5_MODULE_TYPE} == "Module::Build::Tiny" PERL5_MODTYPE= modbuild -PERL5_MODBUILD_DESTDIR_OPTION=--destdir ${DESTDIR:Q} +PERL5_MODBUILD_DESTDIR_OPTION= --destdir ${DESTDIR:Q} .elif ${PERL5_MODULE_TYPE} == "Module::Install" || \ ${PERL5_MODULE_TYPE} == "Module::Install::Bundled" PERL5_MODTYPE= modinst diff --git a/lang/perl5/options.mk b/lang/perl5/options.mk index a73c4403e46..bb30f063b57 100644 --- a/lang/perl5/options.mk +++ b/lang/perl5/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.12 2016/06/20 17:19:56 sevan Exp $ +# $NetBSD: options.mk,v 1.13 2019/11/03 19:04:05 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.perl PKG_OPTIONS_REQUIRED_GROUPS= perlbits @@ -89,7 +89,7 @@ CONFIGURE_ARGS+= -Duse64bitall CONFIGURE_ARGS+= -Uuse64bitall -Uusemorebits -Uuse64bitint .else . if ${OBJECT_FMT} == "XCOFF" -BROKEN= XCOFF targets need the path specified where libperl.a resides.\ -Please choose on of 64bitint 64bitmore 64bitall or 64bitnone to allow this. +BROKEN= XCOFF targets need the path specified where libperl.a resides.\ + Please choose on of 64bitint 64bitmore 64bitall or 64bitnone to allow this. . endif .endif diff --git a/lang/perl5/packlist.mk b/lang/perl5/packlist.mk index 6c1bf53295f..d3bd2e75150 100644 --- a/lang/perl5/packlist.mk +++ b/lang/perl5/packlist.mk @@ -1,4 +1,4 @@ -# $NetBSD: packlist.mk,v 1.20 2018/01/07 11:40:57 rillig Exp $ +# $NetBSD: packlist.mk,v 1.21 2019/11/03 19:04:05 rillig Exp $ # # This Makefile fragment is intended to be included by packages that # create packlist files. This file is automatically included by @@ -62,7 +62,7 @@ FILES_SUBST+= PERL5_PACKLIST=${_PERL5_REAL_PACKLIST:Q} PERL5_PLIST_COMMENT_CMD= \ { ${ECHO} "@comment The following lines are automatically generated"; \ ${ECHO} "@comment from the installed .packlist files."; } -PERL5_PLIST_FILES_CMD= \ +PERL5_PLIST_FILES_CMD= \ { ${CAT} ${_PERL5_PACKLIST}; for f in ${_PERL5_REAL_PACKLIST}; do ${TEST} ! -f "${DESTDIR}$$f" || ${ECHO} "$$f"; done; } \ | ${SED} -e "s,[ ].*,," -e "s,/\\./,/,g" -e "s,${PREFIX}/,," \ | ${SORT} -u @@ -95,7 +95,7 @@ _PERL5_PACKLIST_AWK_STRIP_DESTDIR= ### _PERL5_PACKLIST_MANPAGE_RE= \ - ^(\/[^ \/]*)+\/(man[1-9ln]\/[^ \/]*\.[1-9ln]|cat[1-9ln]\/[^ \/]*\.[0-9])$$ + ^(\/[^ \/]*)+\/(man[1-9ln]\/[^ \/]*\.[1-9ln]|cat[1-9ln]\/[^ \/]*\.[0-9])$$ _PERL5_PACKLIST_AWK_STRIP_MANZ= \ /${_PERL5_PACKLIST_MANPAGE_RE}\.gz/ \ diff --git a/lang/pfe/Makefile b/lang/pfe/Makefile index a52e0f91a67..db05b91150c 100644 --- a/lang/pfe/Makefile +++ b/lang/pfe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2019/08/11 13:21:23 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/03 19:04:05 rillig Exp $ DISTNAME= pfe-0.33.71 PKGREVISION= 13 @@ -21,7 +21,7 @@ BUILD_TARGET= all mans docs INSTALL_TARGET= install install-mans install-docs TEST_TARGET= tests -TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto # documentation +TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto # documentation PYTHON_FOR_BUILD_ONLY= tool .include "../../lang/python/pyversion.mk" diff --git a/lang/pict/Makefile b/lang/pict/Makefile index 49d57880c17..95a90513e34 100644 --- a/lang/pict/Makefile +++ b/lang/pict/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.20 2018/11/12 16:10:24 jaapb Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/03 19:04:05 rillig Exp $ DISTNAME= pict-4.1 PKGREVISION= 16 CATEGORIES= lang MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/papers/pict/pict-4.1/ -PATCH_SITES= http://www.NetBSD.org/~dholland/patchkits/pict/ -PATCHFILES= pict-jumbo-patch-20180316.gz -PATCH_DIST_STRIP= -p1 +PATCH_SITES= http://www.NetBSD.org/~dholland/patchkits/pict/ +PATCHFILES= pict-jumbo-patch-20180316.gz +PATCH_DIST_STRIP= -p1 MAINTAINER= dholland@NetBSD.org HOMEPAGE= http://www.cis.upenn.edu/~bcpierce/papers/pict/Html/Pict.html diff --git a/lang/polyml/Makefile b/lang/polyml/Makefile index 51902cf6d50..6385750a892 100644 --- a/lang/polyml/Makefile +++ b/lang/polyml/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.19 2019/05/02 18:24:58 alnsn Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/03 19:04:05 rillig Exp $ DISTNAME= polyml-5.7.1 CATEGORIES= lang -MASTER_SITES= ${MASTER_SITE_GITHUB:=polyml/} -GITHUB_PROJECT= polyml -GITHUB_TAG= v${PKGVERSION_NOREV} +MASTER_SITES= ${MASTER_SITE_GITHUB:=polyml/} +GITHUB_PROJECT= polyml +GITHUB_TAG= v${PKGVERSION_NOREV} MAINTAINER= asau@inbox.ru HOMEPAGE= http://polyml.org/ @@ -13,7 +13,7 @@ COMMENT= Poly/ML is an implementation of Standard ML # ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64 *-*-sparc *-*-powerpc NOT_PAX_ASLR_SAFE+= bin/poly -NOT_PAX_MPROTECT_SAFE+= bin/poly +NOT_PAX_MPROTECT_SAFE+= bin/poly WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} diff --git a/lang/py-basicproperty/Makefile b/lang/py-basicproperty/Makefile index 4a0aef39c63..e9c2264bc05 100644 --- a/lang/py-basicproperty/Makefile +++ b/lang/py-basicproperty/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2019/09/02 13:20:05 adam Exp $ +# $NetBSD: Makefile,v 1.22 2019/11/03 19:04:05 rillig Exp $ DISTNAME= basicproperty-0.6.9a PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,7 +14,7 @@ USE_LANGUAGES= c REPLACE_PYTHON= basicproperty/tests/test.py EGG_NAME= ${DISTNAME}0 -PYTHON_VERSIONS_ACCEPTED= 27 +PYTHON_VERSIONS_ACCEPTED= 27 post-extract: # wrong architecture binary diff --git a/lang/py-byterun/Makefile b/lang/py-byterun/Makefile index 76a68a5c54f..1f8a2e05513 100644 --- a/lang/py-byterun/Makefile +++ b/lang/py-byterun/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2016/09/17 23:46:37 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/03 19:04:05 rillig Exp $ DISTNAME= byterun PKGNAME= ${PYPKGPREFIX}-${DISTNAME}-20160218 @@ -14,7 +14,7 @@ LICENSE= mit WRKSRC= ${WRKDIR}/${DISTNAME}-${GITHUB_TAG} -DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six +DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six EGG_NAME= Byterun-1.0 diff --git a/lang/py-pyrex/Makefile b/lang/py-pyrex/Makefile index a97d5792a72..39384c00d94 100644 --- a/lang/py-pyrex/Makefile +++ b/lang/py-pyrex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2019/09/02 13:20:05 adam Exp $ +# $NetBSD: Makefile,v 1.34 2019/11/03 19:04:05 rillig Exp $ DISTNAME= Pyrex-0.9.9 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/P/p/} @@ -13,7 +13,7 @@ LICENSE= apache-2.0 USE_TOOLS+= pax -PYTHON_SELF_CONFLICT= yes +PYTHON_SELF_CONFLICT= yes PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 0.9.9 .include "../../lang/python/distutils.mk" diff --git a/lang/py-python-lua/Makefile b/lang/py-python-lua/Makefile index 7826b5740c7..107f02cbf43 100644 --- a/lang/py-python-lua/Makefile +++ b/lang/py-python-lua/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2018/10/26 12:52:43 jperkin Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/03 19:04:05 rillig Exp $ DISTNAME= python-lua PKGNAME= ${PYPKGPREFIX}-python-lua-20170109 @@ -19,7 +19,7 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-yaml>=3.12:../../textproc/py-yaml USE_LANGUAGES= #none -PYTHON_VERSIONS_INCOMPATIBLE= 27 +PYTHON_VERSIONS_INCOMPATIBLE= 27 REPLACE_PYTHON= pythonlua/*.py tests/*.py *.py AUTO_MKDIRS= yes diff --git a/lang/python38/Makefile b/lang/python38/Makefile index 6490e835940..a6bf50f745d 100644 --- a/lang/python38/Makefile +++ b/lang/python38/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2019/10/15 16:50:11 adam Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/03 19:04:05 rillig Exp $ .include "dist.mk" @@ -158,10 +158,10 @@ SUBST_SED.findlib+= -e "s!\('-Wl,-t'\)!'${COMPILER_RPATH_FLAG}${PREFIX}/lib', '- .include "options.mk" -CHECK_INTERPRETER_SKIP= lib/python${PY_VER_SUFFIX}/venv/scripts/posix/pydoc -CHECK_INTERPRETER_SKIP+=lib/python${PY_VER_SUFFIX}/test/ziptestdata/exe_with_z64 -CHECK_INTERPRETER_SKIP+=lib/python${PY_VER_SUFFIX}/test/ziptestdata/exe_with_zip -CHECK_INTERPRETER_SKIP+=lib/python${PY_VER_SUFFIX}/test/ziptestdata/header.sh +CHECK_INTERPRETER_SKIP= lib/python${PY_VER_SUFFIX}/venv/scripts/posix/pydoc +CHECK_INTERPRETER_SKIP+= lib/python${PY_VER_SUFFIX}/test/ziptestdata/exe_with_z64 +CHECK_INTERPRETER_SKIP+= lib/python${PY_VER_SUFFIX}/test/ziptestdata/exe_with_zip +CHECK_INTERPRETER_SKIP+= lib/python${PY_VER_SUFFIX}/test/ziptestdata/header.sh # Avoid error: Cannot generate ./Include/opcode.h, python not found ! post-configure: diff --git a/lang/qore/Makefile b/lang/qore/Makefile index ea9bf7aa7ea..eb2998bc597 100644 --- a/lang/qore/Makefile +++ b/lang/qore/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.18 2018/12/27 15:15:22 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/03 19:04:06 rillig Exp $ DISTNAME= qore-0.8.13.5 CATEGORIES= lang -MASTER_SITES= ${MASTER_SITE_GITHUB:=qorelanguage/} -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= ${MASTER_SITE_GITHUB:=qorelanguage/} +EXTRACT_SUFX= .tar.bz2 GITHUB_RELEASE= release-${PKGVERSION_NOREV} @@ -24,7 +24,7 @@ REPLACE_QORE= bin/qdbg bin/qdbg-remote bin/qdbg-server REPLACE_QORE+= bin/qget bin/rest bin/schema-reverse REPLACE_QORE+= bin/sfrest bin/sqlutil doxygen/qdx -CONFIGURE_ARGS+=--with-libsuffix="" --disable-single-compilation-unit +CONFIGURE_ARGS+= --with-libsuffix="" --disable-single-compilation-unit #This is needed in order to comply the with MIT license and binary distribution #Install docs diff --git a/lang/qore/options.mk b/lang/qore/options.mk index 79bea2cd6db..a9a625c5055 100644 --- a/lang/qore/options.mk +++ b/lang/qore/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2014/12/30 15:39:51 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/03 19:04:06 rillig Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.qore @@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS= debug .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mdebug) -CONFIGURE_ARGS+= --enable-debug +CONFIGURE_ARGS+= --enable-debug .else -CONFIGURE_ARGS+= --disable-debug +CONFIGURE_ARGS+= --disable-debug .endif diff --git a/lang/racket-textual/Makefile b/lang/racket-textual/Makefile index f354cfa6200..3c24babbb80 100644 --- a/lang/racket-textual/Makefile +++ b/lang/racket-textual/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2019/07/10 10:38:18 nia Exp $ +# $NetBSD: Makefile,v 1.36 2019/11/03 19:04:06 rillig Exp $ PKGNAME= racket-minimal-6.12 DISTNAME= ${PKGNAME_NOREV}-src @@ -27,12 +27,12 @@ WRKSRC= ${WRKDIR}/racket-${PKGVERSION_NOREV} GNU_CONFIGURE= yes CONFIGURE_DIRS= src CONFIGURE_ARGS= --enable-pthread -USE_TOOLS+= paxctl +USE_TOOLS+= paxctl USE_LANGUAGES= c c++ MAKE_JOBS_SAFE= no UNLIMIT_RESOURCES= datasize OVERRIDE_DIRDEPTH= 3 -MAKE_ENV+= "PAXCTL=${TOOLS_PLATFORM.paxctl}" +MAKE_ENV+= "PAXCTL=${TOOLS_PLATFORM.paxctl}" CPPFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS LDFLAGS.DragonFly+= -rdynamic diff --git a/lang/racket/Makefile b/lang/racket/Makefile index f64d31f5e61..39fef239dac 100644 --- a/lang/racket/Makefile +++ b/lang/racket/Makefile @@ -1,15 +1,15 @@ -# $NetBSD: Makefile,v 1.76 2019/07/10 10:38:18 nia Exp $ +# $NetBSD: Makefile,v 1.77 2019/11/03 19:04:06 rillig Exp $ PKGNAME= racket-6.12 PKGREVISION= 4 DISTNAME= ${PKGNAME_NOREV}-src CATEGORIES= lang MASTER_SITES_PLT= https://download.racket-lang.org/installers/${PKGVERSION_NOREV}/ -MASTER_SITES_PLT+= https://mirror.racket-lang.org/installers/${PKGVERSION_NOREV}/ +MASTER_SITES_PLT+= https://mirror.racket-lang.org/installers/${PKGVERSION_NOREV}/ MASTER_SITES_PLT+= https://plt.eecs.northwestern.edu/racket-mirror/${PKGVERSION_NOREV}/ MASTER_SITES_PLT+= https://www.cs.utah.edu/plt/installers/${PKGVERSION_NOREV}/ MASTER_SITES_PLT+= http://mirror.informatik.uni-tuebingen.de/mirror/racket/${PKGVERSION_NOREV}/ -MASTER_SITES_PLT+= http://mirror.csclub.uwaterloo.ca/racket/racket-installers/${PKGVERSION_NOREV}/ +MASTER_SITES_PLT+= http://mirror.csclub.uwaterloo.ca/racket/racket-installers/${PKGVERSION_NOREV}/ MASTER_SITES_PLT+= https://racket.infogroep.be/${PKGVERSION_NOREV}/ # Pre-release: #MASTER_SITES_PLT= http://pre-release.racket-lang.org/installers/ @@ -31,7 +31,7 @@ CONFIGURE_ARGS= --enable-pthread USE_LANGUAGES= c c++ USE_TOOLS= pkg-config gmake UNLIMIT_RESOURCES= datasize -MAKE_ENV+= "PAXCTL=${TOOLS_PLATFORM.paxctl}" +MAKE_ENV+= "PAXCTL=${TOOLS_PLATFORM.paxctl}" CPPFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS LDFLAGS.DragonFly+= -rdynamic diff --git a/lang/rakudo-star/Makefile b/lang/rakudo-star/Makefile index f477e9ab511..c35a28ddf34 100644 --- a/lang/rakudo-star/Makefile +++ b/lang/rakudo-star/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2019/08/11 13:21:23 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/03 19:04:06 rillig Exp $ DISTNAME= rakudo-star-2013.08 PKGREVISION= 14 @@ -14,13 +14,13 @@ MAKE_JOBS_SAFE= no .include "../../mk/bsd.prefs.mk" -USE_LANGUAGES= c c++ -USE_TOOLS+= perl -PLIST_SRC+= ${PLIST_SRC_DFLT} +USE_LANGUAGES= c c++ +USE_TOOLS+= perl +PLIST_SRC+= ${PLIST_SRC_DFLT} .if (${OPSYS} != "Darwin") -PLIST_SRC+= PLIST.shared +PLIST_SRC+= PLIST.shared .else -USE_TOOLS+= gmake +USE_TOOLS+= gmake .endif HAS_CONFIGURE= yes @@ -30,7 +30,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX:Q} \ --with-nqp=${PREFIX}/bin/nqp PLIST_SUBST+= PARROT_VERSION=${PARROT_VERSION:Q} -PRINT_PLIST_AWK+= { gsub(/${PARROT_VERSION}/, "$${PARROT_VERSION}") } +PRINT_PLIST_AWK+= { gsub(/${PARROT_VERSION}/, "$${PARROT_VERSION}") } .include "../../lang/nqp/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/rcfunge/Makefile b/lang/rcfunge/Makefile index 3ebaa8c561f..8295a310529 100644 --- a/lang/rcfunge/Makefile +++ b/lang/rcfunge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2015/08/18 07:31:10 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/03 19:04:06 rillig Exp $ # DISTNAME= rcfunge2 @@ -14,8 +14,8 @@ HOMEPAGE= http://www.rcfunge98.com/ COMMENT= Funge interpreter #LICENSE= # TODO: (see mk/license.mk) -WRKSRC= ${WRKDIR}/rcfunge -BUILD_TARGET= funge +WRKSRC= ${WRKDIR}/rcfunge +BUILD_TARGET= funge INSTALLATION_DIRS= bin CFLAGS.SunOS+= -Du_int32_t=uint32_t diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index b01c31a95a9..14e3d7603fd 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2017/05/30 15:47:51 taca Exp $ +# $NetBSD: Makefile,v 1.64 2019/11/03 19:04:06 rillig Exp $ DISTNAME= # empty PKGNAME= ruby-${RUBY_VERSION} @@ -17,7 +17,7 @@ NO_BUILD= yes .include "../../lang/ruby/rubyversion.mk" -DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR} +DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR} RUBY_COMMANDS= erb gem irb rake ruby testrb diff --git a/lang/ruby/gem-vars.mk b/lang/ruby/gem-vars.mk index 3e4bf66e437..33f08e6ca04 100644 --- a/lang/ruby/gem-vars.mk +++ b/lang/ruby/gem-vars.mk @@ -1,4 +1,4 @@ -# $NetBSD: gem-vars.mk,v 1.8 2018/02/19 13:48:11 taca Exp $ +# $NetBSD: gem-vars.mk,v 1.9 2019/11/03 19:04:06 rillig Exp $ # # This Makefile fragment defines various make(1) variables for Ruby gems # support. @@ -22,17 +22,17 @@ GEM_EXTSDIR_NEEDS_SUBDIR?= yes .if exists(${RUBYGEM}) RUBY_GEM_ARCH!= ${RUBYGEM} environment platform | ${SED} -e 's|.*:||' -.if !empty(GEM_EXTSDIR_NEEDS_SUBDIR:M[nN][oO]) +. if !empty(GEM_EXTSDIR_NEEDS_SUBDIR:M[nN][oO]) GEM_EXTSDIR= ${GEM_HOME}/extensions/${RUBY_GEM_ARCH}/${RUBY_VER_DIR} -.else +. else GEM_EXTSDIR= ${GEM_HOME}/extensions/${RUBY_GEM_ARCH}/${RUBY_VER_DIR}/${GEM_NAME} -.endif +. endif -.if !empty(GEM_EXTSDIR) +. if !empty(GEM_EXTSDIR) PLIST_SUBST+= GEM_EXTSDIR=${GEM_EXTSDIR} -.else +. else PLIST_SUBST+= GEM_EXTSDIR="@comment " -.endif +. endif .endif .endif diff --git a/lang/ruby/gem.mk b/lang/ruby/gem.mk index 58461876dfc..892eb282a96 100644 --- a/lang/ruby/gem.mk +++ b/lang/ruby/gem.mk @@ -1,4 +1,4 @@ -# $NetBSD: gem.mk,v 1.40 2019/10/24 14:39:37 taca Exp $ +# $NetBSD: gem.mk,v 1.41 2019/11/03 19:04:06 rillig Exp $ # # This Makefile fragment is intended to be included by packages that build # and install Ruby gems. @@ -183,7 +183,7 @@ _RUBY_PRINT_PLIST_GEM+= /${GEM_NAME:S/./[.]/g}[.](gem|gemspec)$$/ \ { gsub(/${PKGVERSION_NOREV:S|/|\\/|g}[.]gem/, "$${PKGVERSION}.gem"); } .if !empty(GEM_EXTSDIR) _RUBY_PRINT_PLIST_GEM+= /^${GEM_EXTSDIR:S|/|\\/|g}/ \ - { gsub(/${GEM_EXTSDIR:S|/|\\/|g}/, "$${GEM_EXTSDIR}"); \ + { gsub(/${GEM_EXTSDIR:S|/|\\/|g}/, "$${GEM_EXTSDIR}"); \ print; next; } .endif _RUBY_PRINT_PLIST_GEM+= /^${GEM_LIBDIR:S|/|\\/|g}/ \ @@ -194,7 +194,7 @@ _RUBY_PRINT_PLIST_GEM+= /^${GEM_HOME:S|/|\\/|g}/ \ { gsub(/${GEM_HOME:S|/|\\/|g}/, "$${GEM_HOME}"); \ print; next; } _RUBY_PRINT_PLIST_GEM+= /^${RUBY_GEM_BASE:S|/|\\/|g}/ \ - { gsub(/${RUBY_GEM_BASE:S|/|\\/|g}/, "$${RUBY_GEM_BASE}"); \ + { gsub(/${RUBY_GEM_BASE:S|/|\\/|g}/, "$${RUBY_GEM_BASE}"); \ print; next; } .include "../../lang/ruby/gem-extract.mk" @@ -263,12 +263,12 @@ _RUBYGEM_OPTIONS+= --no-document .endif .if !empty(CONFIGURE_ARGS) || !empty(RUBY_EXTCONF_ARGS) _RUBYGEM_OPTIONS+= -- -.if !empty(RUBY_EXTCONF_ARGS) +. if !empty(RUBY_EXTCONF_ARGS) _RUBYGEM_OPTIONS+= ${RUBY_EXTCONF_ARGS} -.endif -.if !empty(CONFIGURE_ARGS) +. endif +. if !empty(CONFIGURE_ARGS) _RUBYGEM_OPTIONS+= --build-args ${CONFIGURE_ARGS} -.endif +. endif .endif RUBYGEM_INSTALL_ROOT_OPTION= --install-root ${RUBYGEM_INSTALL_ROOT} @@ -292,7 +292,7 @@ _gem-build-install-root-check: .PHONY: _gem-build-cleanbuild _gem-build-cleanbuild: @${STEP_MSG} "Cleaning intermediate gem build files" -.if !empty(GEM_CLEANBUILD) +. if !empty(GEM_CLEANBUILD) ${RUN} cd ${RUBYGEM_INSTALL_ROOT}${PREFIX}/${GEM_LIBDIR} && \ find . -print | sort -r | \ while read file; do \ @@ -312,8 +312,8 @@ _gem-build-cleanbuild: rm -f $$file; \ fi; \ done -.endif -.if !empty(GEM_EXTSDIR) && !empty(GEM_CLEANBUILD_EXTENSIONS) +. endif +. if !empty(GEM_EXTSDIR) && !empty(GEM_CLEANBUILD_EXTENSIONS) ${RUN} \ if test ! -d ${RUBYGEM_INSTALL_ROOT}${PREFIX}/${GEM_EXTSDIR}; then \ :; \ @@ -324,7 +324,7 @@ _gem-build-cleanbuild: rm -f $$f; \ done; \ fi -.endif +. endif .endif ### diff --git a/lang/ruby/modules.mk b/lang/ruby/modules.mk index 33185a33326..13b27d7700c 100644 --- a/lang/ruby/modules.mk +++ b/lang/ruby/modules.mk @@ -1,4 +1,4 @@ -# $NetBSD: modules.mk,v 1.42 2018/03/18 14:21:21 taca Exp $ +# $NetBSD: modules.mk,v 1.43 2019/11/03 19:04:06 rillig Exp $ # # # Package-settable variables: @@ -64,50 +64,50 @@ RUBY_EXTCONF_MAKEFILE?= Makefile do-configure: ruby-extconf-configure -.if defined(RUBY_EXTCONF_SUBDIRS) +. if defined(RUBY_EXTCONF_SUBDIRS) ruby-extconf-configure: -.for d in ${RUBY_EXTCONF_SUBDIRS} +. for d in ${RUBY_EXTCONF_SUBDIRS} @${ECHO_MSG} "===> Running ${RUBY_EXTCONF} in ${d} to configure"; \ ${ECHO_MSG} "${RUBY} ${RUBY_EXTCONF_DEBUG} ${RUBY_EXTCONF} ${CONFIGURE_ARGS}" ${RUN}cd ${WRKSRC}/${d}; \ ${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_EXTCONF_DEBUG} ${RUBY_EXTCONF} ${CONFIGURE_ARGS} -.if empty(RUBY_EXTCONF_CHECK:M[nN][oO]) +. if empty(RUBY_EXTCONF_CHECK:M[nN][oO]) ${RUN}cd ${WRKSRC}/${d}; \ ${TEST} -f ${RUBY_EXTCONF_MAKEFILE} -.endif -.endfor +. endif +. endfor -.if !target(do-build) +. if !target(do-build) do-build: ruby-extconf-build ruby-extconf-build: -.for d in ${RUBY_EXTCONF_SUBDIRS} +. for d in ${RUBY_EXTCONF_SUBDIRS} @${ECHO_MSG} "===> Building ${d}" ${RUN}cd ${WRKSRC}/${d}; ${SETENV} ${MAKE_ENV} ${MAKE} ${BUILD_TARGET} -.endfor -.endif +. endfor +. endif -.if !target(do-install) +. if !target(do-install) do-install: ruby-extconf-install ruby-extconf-install: -.for d in ${RUBY_EXTCONF_SUBDIRS} +. for d in ${RUBY_EXTCONF_SUBDIRS} @${ECHO_MSG} "===> Installing ${d}" ${RUN}cd ${WRKSRC}/${d}; ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET} ${INSTALL_MAKE_FLAGS} -.endfor -.endif +. endfor +. endif -.else +. else ruby-extconf-configure: @${ECHO_MSG} "===> Running ${RUBY_EXTCONF} to configure"; \ ${ECHO_MSG} "${RUBY} ${RUBY_EXTCONF_DEBUG} ${RUBY_EXTCONF} ${CONFIGURE_ARGS}" ${RUN}cd ${WRKSRC}; \ ${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_EXTCONF_DEBUG} ${RUBY_EXTCONF} ${CONFIGURE_ARGS} -.if empty(RUBY_EXTCONF_CHECK:M[nN][oO]) +. if empty(RUBY_EXTCONF_CHECK:M[nN][oO]) ${RUN}cd ${WRKSRC}/${d}; \ ${TEST} -f ${RUBY_EXTCONF_MAKEFILE} -.endif -.endif +. endif +. endif # # setup.rb support @@ -117,50 +117,50 @@ ruby-extconf-configure: RUBY_SETUP?= setup.rb RUBY_SETUP_SUBDIRS?= . -.if defined(USE_RUBY_SETUP_PKG) && empty(USE_RUBY_SETUP_PKG:M[nN][oO]) +. if defined(USE_RUBY_SETUP_PKG) && empty(USE_RUBY_SETUP_PKG:M[nN][oO]) BUILD_DEPENDS+= ${RUBY_PKGPREFIX}-setup>=3.4.0:../../devel/ruby-setup -.endif +. endif -.if !target(do-configure) +. if !target(do-configure) do-configure: ruby-setup-configure ruby-setup-configure: -.for d in ${RUBY_SETUP_SUBDIRS} -.if defined(USE_RUBY_SETUP_PKG) && empty(USE_RUBY_SETUP_PKG:M[nN][oO]) +. for d in ${RUBY_SETUP_SUBDIRS} +. if defined(USE_RUBY_SETUP_PKG) && empty(USE_RUBY_SETUP_PKG:M[nN][oO]) @${ECHO_MSG} "===> Use pkgsrc's ruby-setup" ${RUN}cd ${WRKSRC}/${d}; \ ${CP} ${PREFIX}/${RUBY_VENDORLIB}/setup.rb ${RUBY_SETUP} -.endif +. endif @${ECHO_MSG} "===> Running ${RUBY_SETUP} to configure" ${RUN}cd ${WRKSRC}/${d}; \ ${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_SETUP} config ${CONFIGURE_ARGS} -. endfor -.endif +. endfor +. endif -.if !target(do-build) +. if !target(do-build) do-build: ruby-setup-build ruby-setup-build: @${ECHO_MSG} "===> Running ${RUBY_SETUP} to build" -.for d in ${RUBY_SETUP_SUBDIRS} +. for d in ${RUBY_SETUP_SUBDIRS} ${RUN}cd ${WRKSRC}/${d}; \ ${SETENV} ${MAKE_ENV} ${RUBY} ${RUBY_SETUP} setup -.endfor -.endif +. endfor +. endif -.if !target(do-install) +. if !target(do-install) do-install: ruby-setup-install -_RUBY_SETUP_INSTALLARGS= ${INSTALL_TARGET} -_RUBY_SETUP_INSTALLARGS+= --prefix=${DESTDIR:Q} +_RUBY_SETUP_INSTALLARGS= ${INSTALL_TARGET} +_RUBY_SETUP_INSTALLARGS+= --prefix=${DESTDIR:Q} ruby-setup-install: @${ECHO_MSG} "===> Running ${RUBY_SETUP} to ${INSTALL_TARGET}" -.for d in ${RUBY_SETUP_SUBDIRS} +. for d in ${RUBY_SETUP_SUBDIRS} ${RUN}cd ${WRKSRC}/${d}; \ ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ${RUBY} ${RUBY_SETUP} ${_RUBY_SETUP_INSTALLARGS} -.endfor -.endif +. endfor +. endif # # install.rb support @@ -178,14 +178,14 @@ SUBST_SED.rinstall+= -e 's|"sitelibdir"|"vendorlibdir"|g' SUBST_SED.rinstall+= -e 's|/site_ruby/|/vendor_ruby/|g' SUBST_MESSAGE.rinstall= Fixing ${RUBY_SIMPLE_INSTALL} files. -.if !target(do-install) +. if !target(do-install) do-install: ruby-simple-install ruby-simple-install: @${ECHO_MSG} "===> Running ${RUBY_SIMPLE_INSTALL} to ${INSTALL_TARGET}" ${RUN}cd ${WRKSRC}; \ ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ${RUBY} ${RUBY_SIMPLE_INSTALL} ${INSTALL_TARGET} -.endif +. endif .endif # USE_RUBY_INSTALL .include "replace.mk" diff --git a/lang/ruby/platform.mk b/lang/ruby/platform.mk index e1dffc16553..a0cd2d50d09 100644 --- a/lang/ruby/platform.mk +++ b/lang/ruby/platform.mk @@ -1,4 +1,4 @@ -# $NetBSD: platform.mk,v 1.5 2019/05/23 19:23:03 rillig Exp $ +# $NetBSD: platform.mk,v 1.6 2019/11/03 19:04:06 rillig Exp $ # # @@ -32,7 +32,7 @@ SUBST_MESSAGE.conf= Fixing configuration files. # CONFIGURE_ENV+= INSTALL="${INSTALL} ${COPY}" \ INSTALL_DATA= INSTALL_PROGRAM= INSTALL_SCRIPT= -CONFIGURE_ENV+= ac_cv_prog_PKG_CONFIG="" +CONFIGURE_ENV+= ac_cv_prog_PKG_CONFIG="" # # prevent unwanted mkdir recorded in rbconfig.rb diff --git a/lang/ruby/rails.mk b/lang/ruby/rails.mk index 631f2d6b9b8..27cd7490b0b 100644 --- a/lang/ruby/rails.mk +++ b/lang/ruby/rails.mk @@ -1,4 +1,4 @@ -# $NetBSD: rails.mk,v 1.77 2019/04/14 10:29:39 taca Exp $ +# $NetBSD: rails.mk,v 1.78 2019/11/03 19:04:06 rillig Exp $ .if !defined(_RUBY_RAILS_MK) _RUBY_RAILS_MK= # defined @@ -59,7 +59,7 @@ RUBY_RAILS_STRICT_DEP?= no RUBY_RAILS_SUPPORTED= 42 51 52 .if empty(RUBY_RAILS_SUPPORTED:M${RUBY_RAILS_DEFAULT}) -.error Unsupported RUBY_RAILS_DEFAULT: ${RUBY_RAILS_DEFAULT} +. error Unsupported RUBY_RAILS_DEFAULT: ${RUBY_RAILS_DEFAULT} .endif .if empty(RUBY_RAILS_ACCEPTED) @@ -122,8 +122,8 @@ _RAILS_DEP= ${RUBY_RAILS}>=${RAILS_VERSION}<${_RAILS_MAJOR}.${_RAILS_NEXT} MAKE_ENV+= RUBY_RAILS_DEFAULT=${RUBY_RAILS} \ RUBY_RAILS_ACCEPTED=${RUBY_RAILS} # -MULTI+= RUBY_RAILS_DEFAULT=${RUBY_RAILS} \ - RUBY_RAILS_ACCEPTED=${RUBY_RAILS} +MULTI+= RUBY_RAILS_DEFAULT=${RUBY_RAILS} \ + RUBY_RAILS_ACCEPTED=${RUBY_RAILS} RUBY_ACTIVESUPPORT_DEPENDS= \ ${RUBY_PKGPREFIX}-activesupport${_RAILS_DEP}:../../devel/ruby-activesupport${RUBY_RAILS} diff --git a/lang/ruby/replace.mk b/lang/ruby/replace.mk index 5df8312be98..24e7541b68b 100644 --- a/lang/ruby/replace.mk +++ b/lang/ruby/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.16 2017/04/23 14:16:58 taca Exp $ +# $NetBSD: replace.mk,v 1.17 2019/11/03 19:04:06 rillig Exp $ # .if !defined(_RUBY_REPLACE_MK) @@ -30,10 +30,10 @@ REPLACE_RUBY_PAT?= *.rb .if defined(REPLACE_RUBY_DIRS) && !empty(REPLACE_RUBY_DIRS) pre-configure: replace-ruby-dirs -.for f in ${REPLACE_RUBY_PAT} -_REPLACE_RUBY_PAT+= -o -name "${f}" -.endfor -_REPLACE_RUBY_FIND_ARGS=\( ${_REPLACE_RUBY_PAT:S/-o//1} \) +. for f in ${REPLACE_RUBY_PAT} +_REPLACE_RUBY_PAT+= -o -name "${f}" +. endfor +_REPLACE_RUBY_FIND_ARGS= \( ${_REPLACE_RUBY_PAT:S/-o//1} \) replace-ruby-dirs: ${RUN} cd ${WRKSRC} && \ diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk index 41d3e196d60..44acf0da690 100644 --- a/lang/ruby/rubyversion.mk +++ b/lang/ruby/rubyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: rubyversion.mk,v 1.212 2019/10/24 14:39:37 taca Exp $ +# $NetBSD: rubyversion.mk,v 1.213 2019/11/03 19:04:06 rillig Exp $ # # This file determines which Ruby version is used as a dependency for @@ -200,10 +200,10 @@ _RUBYVERSION_MK= # defined .include "../../mk/bsd.prefs.mk" .if defined(PKGNAME_REQD) -. if !empty(PKGNAME_REQD:Mruby[0-9][0-9]-*) -_RUBY_VERSION_REQD:= ${PKGNAME_REQD:C/ruby([0-9][0-9])-.*/\1/} -RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9])-.*/\1/} -. endif +. if !empty(PKGNAME_REQD:Mruby[0-9][0-9]-*) +_RUBY_VERSION_REQD:= ${PKGNAME_REQD:C/ruby([0-9][0-9])-.*/\1/} +RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9])-.*/\1/} +. endif .endif # current supported Ruby's version @@ -222,13 +222,13 @@ RUBY26_API_VERSION= 2.6.0 RUBY_VERSION_DEFAULT?= 24 # supported Ruby's version -RUBY_VERSIONS_SUPPORTED= 24 25 26 22 +RUBY_VERSIONS_SUPPORTED= 24 25 26 22 -RUBY_VERSIONS_ACCEPTED?= 24 25 26 +RUBY_VERSIONS_ACCEPTED?= 24 25 26 RUBY_VERSIONS_INCOMPATIBLE?= .if empty(RUBY_VERSIONS_SUPPORTED:M${RUBY_VERSION_DEFAULT}) -.error Unsuported RUBY_VERSION_DEFAULT: ${RUBY_VERSION_DEFAULT} +. error Unsuported RUBY_VERSION_DEFAULT: ${RUBY_VERSION_DEFAULT} .endif .for rv in ${RUBY_VERSIONS_ACCEPTED} @@ -238,25 +238,25 @@ _RUBY_VERSIONS_ACCEPTED+= ${rv} .endfor .if defined(RUBY_VERSION_REQD) -. for rv in ${_RUBY_VERSIONS_ACCEPTED} -. if "${rv}" == ${RUBY_VERSION_REQD} +. for rv in ${_RUBY_VERSIONS_ACCEPTED} +. if "${rv}" == ${RUBY_VERSION_REQD} RUBY_VER= ${rv} -. endif -. endfor +. endif +. endfor .elif !defined(RUBY_VER) -. for rv in ${_RUBY_VERSIONS_ACCEPTED} -. if "${rv}" == ${RUBY_VERSION_DEFAULT} +. for rv in ${_RUBY_VERSIONS_ACCEPTED} +. if "${rv}" == ${RUBY_VERSION_DEFAULT} RUBY_VER= ${rv} -. endif -. endfor +. endif +. endfor .endif .if !defined(RUBY_VER) -. for rv in ${_RUBY_VERSIONS_ACCEPTED} -. if !defined(RUBY_VER) +. for rv in ${_RUBY_VERSIONS_ACCEPTED} +. if !defined(RUBY_VER) RUBY_VER= ${rv} -. endif -. endfor +. endif +. endfor .endif RUBY_VER:= ${RUBY_VER_MAP.${RUBY_VER}:U${RUBY_VER}} @@ -375,7 +375,7 @@ RUBY_ZLIB_VERSION= 1.0.0 RUBY_SUFFIX= ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR} .else -PKG_FAIL_REASON+= "Unknown Ruby version specified: ${RUBY_VER}." +PKG_FAIL_REASON+= "Unknown Ruby version specified: ${RUBY_VER}." .endif .if !empty(RUBY_VERSION) @@ -424,7 +424,7 @@ RUBY?= ${PREFIX}/bin/${RUBY_NAME} RAKE?= ${PREFIX}/bin/${RAKE_NAME} RDOC?= ${PREFIX}/bin/rdoc${RUBY_SUFFIX} -RUBY_ARCH?= ${MACHINE_GNU_ARCH}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}${APPEND_ABI} +RUBY_ARCH?= ${MACHINE_GNU_ARCH}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}${APPEND_ABI} RUBY_MAJOR_MINOR= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR} @@ -450,11 +450,11 @@ _RUBY_SHLIBALIAS= ${RUBY_SUFFIX}.${RUBY_SLEXT}.${_RUBY_SHLIB_MAJOR} .elif ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" RUBY_SHLIBVER= ${_RUBY_SHLIB_MAJOR}${_RUBY_SHLIB_MINOR} .elif ${OPSYS} == "OpenBSD" || ${OPSYS} == "MirBSD" -.if ${_RUBY_VER_MINOR} == 0 +. if ${_RUBY_VER_MINOR} == 0 RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}.${_RUBY_SHLIB_MINOR} -.else +. else RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}${_RUBY_SHLIB_MINOR} -.endif +. endif .elif ${OPSYS} == "Darwin" RUBY_SHLIB= ${RUBY_SUFFIX}.${RUBY_SHLIBVER}.${RUBY_SLEXT} _RUBY_SHLIBALIAS= .${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${RUBY_SLEXT} @@ -632,28 +632,28 @@ PLIST_SUBST+= \ RUBY_PLIST_DYNAMIC= ${WRKDIR}/PLIST.work -.if !defined(PLIST_SRC) -. if exists(${PKGDIR}/PLIST.common) +. if !defined(PLIST_SRC) +. if exists(${PKGDIR}/PLIST.common) PLIST_SRC+= ${PKGDIR}/PLIST.common -. elif exists(${PKGDIR}/PLIST) +. elif exists(${PKGDIR}/PLIST) PLIST_SRC+= ${PKGDIR}/PLIST -. endif +. endif PLIST_SRC+= ${RUBY_PLIST_DYNAMIC} -. if exists(${PKGDIR}/PLIST.common_end) +. if exists(${PKGDIR}/PLIST.common_end) PLIST_SRC+= ${PKGDIR}/PLIST.common_end -. endif +. endif -.endif +. endif -RUBY_PLIST_COMMENT_CMD= \ +RUBY_PLIST_COMMENT_CMD= \ ${ECHO} "@comment The following lines are automatically generated" -RUBY_PLIST_FILES_CMD= ( cd ${DESTDIR}${PREFIX}; \ +RUBY_PLIST_FILES_CMD= ( cd ${DESTDIR}${PREFIX}; \ ${FIND} ${RUBY_DYNAMIC_DIRS} \( -type f -o -type l \) -print ) | \ ${SORT} -u RUBY_GENERATE_PLIST= ( \ - ${RUBY_PLIST_COMMENT_CMD}; \ + ${RUBY_PLIST_COMMENT_CMD}; \ ${RUBY_PLIST_FILES_CMD} ) > ${RUBY_PLIST_DYNAMIC} .endif diff --git a/lang/ruby22-base/Makefile b/lang/ruby22-base/Makefile index 2a4102f8ab9..4974f81598d 100644 --- a/lang/ruby22-base/Makefile +++ b/lang/ruby22-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2018/07/17 10:56:23 jperkin Exp $ +# $NetBSD: Makefile,v 1.26 2019/11/03 19:04:06 rillig Exp $ DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION} @@ -21,19 +21,19 @@ CONFIGURE_ARGS+= --enable-shared WRKSRC= ${RUBY_WRKSRC} # This file is directly installed from -CHECK_INTERPRETER_SKIP+= ${GEM_HOME}/gems/test-unit-3.0.8/test/run-test.rb +CHECK_INTERPRETER_SKIP+= ${GEM_HOME}/gems/test-unit-3.0.8/test/run-test.rb .include "options.mk" .include "../../lang/ruby/platform.mk" .if !empty(RUBY_SUFFIX) -CONFIGURE_ARGS+= --program-suffix=${RUBY_SUFFIX} -CONFIGURE_ARGS+= --with-soname=${RUBY_NAME} -CONFIGURE_ARGS+= --with-ruby-version=${RUBY_VER_DIR} -CONFIGURE_ARGS+= --with-ruby-pc="ruby-${RUBY_VERSION}.pc" +CONFIGURE_ARGS+= --program-suffix=${RUBY_SUFFIX} +CONFIGURE_ARGS+= --with-soname=${RUBY_NAME} +CONFIGURE_ARGS+= --with-ruby-version=${RUBY_VER_DIR} +CONFIGURE_ARGS+= --with-ruby-pc="ruby-${RUBY_VERSION}.pc" .endif -DOCS= BSDL COPYING COPYING.ja ChangeLog LEGAL NEWS README.EXT README.EXT.ja \ +DOCS= BSDL COPYING COPYING.ja ChangeLog LEGAL NEWS README.EXT README.EXT.ja \ README.ja.md README.md doc/ChangeLog-1.8.0 doc/ChangeLog-1.9.3 \ doc/ChangeLog-2.0.0 doc/ChangeLog-2.1.0 doc/ChangeLog-YARV \ doc/NEWS-1.8.7 doc/NEWS-1.9.1 doc/NEWS-1.9.2 doc/NEWS-1.9.3 \ diff --git a/lang/ruby22-base/options.mk b/lang/ruby22-base/options.mk index db1c81d4565..6eb0dea2d44 100644 --- a/lang/ruby22-base/options.mk +++ b/lang/ruby22-base/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2015/03/08 16:24:55 taca Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/03 19:04:06 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ruby PKG_SUPPORTED_OPTIONS= ruby-build-ri-db @@ -7,7 +7,7 @@ PKG_SUGGESTED_OPTIONS= ruby-build-ri-db .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mruby-build-ri-db) -#PRIVILEGED_STAGES+= clean +#PRIVILEGED_STAGES+= clean RUBY_DYNAMIC_DIRS+= ${RUBY_SYSRIDIR} # Use huge memory. UNLIMIT_RESOURCES+= datasize diff --git a/lang/ruby22/Makefile b/lang/ruby22/Makefile index 33ecf7ac7f9..f4c04c9897f 100644 --- a/lang/ruby22/Makefile +++ b/lang/ruby22/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2017/05/30 15:54:12 taca Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/03 19:04:06 rillig Exp $ # DISTNAME= # empty @@ -14,11 +14,11 @@ LICENSE= 2-clause-bsd OR ruby-license META_PACKAGE= yes -DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR} -DEPENDS+= ${RUBY_NAME}-gdbm>=${RUBY_VERSION}:../../databases/ruby-gdbm -DEPENDS+= ${RUBY_NAME}-fiddle>=${RUBY_VERSION}:../../devel/ruby-fiddle -DEPENDS+= ${RUBY_NAME}-readline>=${RUBY_VERSION}:../../devel/ruby-readline -DEPENDS+= ${RUBY_NAME}-tk>=${RUBY_VERSION}:../../x11/ruby-tk +DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR} +DEPENDS+= ${RUBY_NAME}-gdbm>=${RUBY_VERSION}:../../databases/ruby-gdbm +DEPENDS+= ${RUBY_NAME}-fiddle>=${RUBY_VERSION}:../../devel/ruby-fiddle +DEPENDS+= ${RUBY_NAME}-readline>=${RUBY_VERSION}:../../devel/ruby-readline +DEPENDS+= ${RUBY_NAME}-tk>=${RUBY_VERSION}:../../x11/ruby-tk RUBY_VERSIONS_ACCEPTED= 22 diff --git a/lang/ruby24-base/Makefile b/lang/ruby24-base/Makefile index ddb85adcba1..5104404c21a 100644 --- a/lang/ruby24-base/Makefile +++ b/lang/ruby24-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2019/10/03 00:42:50 ryoon Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/03 19:04:07 rillig Exp $ DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION} @@ -23,13 +23,13 @@ WRKSRC= ${RUBY_WRKSRC} .include "../../lang/ruby/platform.mk" .if !empty(RUBY_SUFFIX) -CONFIGURE_ARGS+= --program-suffix=${RUBY_SUFFIX} -CONFIGURE_ARGS+= --with-soname=${RUBY_NAME} -CONFIGURE_ARGS+= --with-ruby-version=${RUBY_VER_DIR} -CONFIGURE_ARGS+= --with-ruby-pc="ruby-${RUBY_VERSION}.pc" +CONFIGURE_ARGS+= --program-suffix=${RUBY_SUFFIX} +CONFIGURE_ARGS+= --with-soname=${RUBY_NAME} +CONFIGURE_ARGS+= --with-ruby-version=${RUBY_VER_DIR} +CONFIGURE_ARGS+= --with-ruby-pc="ruby-${RUBY_VERSION}.pc" .endif -DOCS= BSDL COPYING COPYING.ja ChangeLog LEGAL NEWS README.EXT README.EXT.ja \ +DOCS= BSDL COPYING COPYING.ja ChangeLog LEGAL NEWS README.EXT README.EXT.ja \ README.ja.md README.md doc/ChangeLog-1.8.0 doc/ChangeLog-1.9.3 \ doc/ChangeLog-2.0.0 doc/ChangeLog-2.1.0 doc/ChangeLog-2.2.0 \ doc/ChangeLog-2.3.0 doc/ChangeLog-2.4.0 doc/ChangeLog-YARV \ diff --git a/lang/ruby24-base/options.mk b/lang/ruby24-base/options.mk index 90ddbd84544..5263c6c81a2 100644 --- a/lang/ruby24-base/options.mk +++ b/lang/ruby24-base/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2017/06/18 13:45:11 taca Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/03 19:04:07 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ruby PKG_SUPPORTED_OPTIONS= ruby-build-ri-db @@ -7,7 +7,7 @@ PKG_SUGGESTED_OPTIONS= ruby-build-ri-db .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mruby-build-ri-db) -#PRIVILEGED_STAGES+= clean +#PRIVILEGED_STAGES+= clean RUBY_DYNAMIC_DIRS+= ${RUBY_SYSRIDIR} # Use huge memory. UNLIMIT_RESOURCES+= datasize diff --git a/lang/ruby24/Makefile b/lang/ruby24/Makefile index d09e54cee80..764383c8782 100644 --- a/lang/ruby24/Makefile +++ b/lang/ruby24/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2019/10/02 13:31:47 taca Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/03 19:04:06 rillig Exp $ # DISTNAME= # empty @@ -13,10 +13,10 @@ COMMENT= Ruby programming language ${RUBY_VERSION} meta package META_PACKAGE= yes -DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR} -DEPENDS+= ${RUBY_NAME}-gdbm>=${RUBY_VERSION}:../../databases/ruby-gdbm -DEPENDS+= ${RUBY_NAME}-fiddle>=${RUBY_VERSION}:../../devel/ruby-fiddle -DEPENDS+= ${RUBY_NAME}-readline>=${RUBY_VERSION}:../../devel/ruby-readline +DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR} +DEPENDS+= ${RUBY_NAME}-gdbm>=${RUBY_VERSION}:../../databases/ruby-gdbm +DEPENDS+= ${RUBY_NAME}-fiddle>=${RUBY_VERSION}:../../devel/ruby-fiddle +DEPENDS+= ${RUBY_NAME}-readline>=${RUBY_VERSION}:../../devel/ruby-readline RUBY_VERSIONS_ACCEPTED= 24 diff --git a/lang/ruby25-base/Makefile b/lang/ruby25-base/Makefile index 775ba62648e..8d5cabfffdc 100644 --- a/lang/ruby25-base/Makefile +++ b/lang/ruby25-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2019/10/03 00:42:50 ryoon Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/03 19:04:07 rillig Exp $ DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION} @@ -23,15 +23,15 @@ WRKSRC= ${RUBY_WRKSRC} .include "../../lang/ruby/platform.mk" .if !empty(RUBY_SUFFIX) -CONFIGURE_ARGS+= --program-suffix=${RUBY_SUFFIX} -CONFIGURE_ARGS+= --with-soname=${RUBY_NAME} -CONFIGURE_ARGS+= --with-ruby-version=${RUBY_VER_DIR} -CONFIGURE_ARGS+= --with-ruby-pc="ruby-${RUBY_VERSION}.pc" +CONFIGURE_ARGS+= --program-suffix=${RUBY_SUFFIX} +CONFIGURE_ARGS+= --with-soname=${RUBY_NAME} +CONFIGURE_ARGS+= --with-ruby-version=${RUBY_VER_DIR} +CONFIGURE_ARGS+= --with-ruby-pc="ruby-${RUBY_VERSION}.pc" .endif CONFIGURE_ENV.Darwin+= ac_cv_prog_dsymutil= -DOCS= BSDL COPYING COPYING.ja ChangeLog LEGAL NEWS README.EXT README.EXT.ja \ +DOCS= BSDL COPYING COPYING.ja ChangeLog LEGAL NEWS README.EXT README.EXT.ja \ README.ja.md README.md doc/ChangeLog-1.8.0 doc/ChangeLog-1.9.3 \ doc/ChangeLog-2.0.0 doc/ChangeLog-2.1.0 doc/ChangeLog-2.2.0 \ doc/ChangeLog-2.3.0 doc/ChangeLog-2.4.0 doc/ChangeLog-2016 \ diff --git a/lang/ruby25-base/options.mk b/lang/ruby25-base/options.mk index 854504c69e0..5263c6c81a2 100644 --- a/lang/ruby25-base/options.mk +++ b/lang/ruby25-base/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2018/01/08 14:19:06 taca Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/03 19:04:07 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ruby PKG_SUPPORTED_OPTIONS= ruby-build-ri-db @@ -7,7 +7,7 @@ PKG_SUGGESTED_OPTIONS= ruby-build-ri-db .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mruby-build-ri-db) -#PRIVILEGED_STAGES+= clean +#PRIVILEGED_STAGES+= clean RUBY_DYNAMIC_DIRS+= ${RUBY_SYSRIDIR} # Use huge memory. UNLIMIT_RESOURCES+= datasize diff --git a/lang/ruby25/Makefile b/lang/ruby25/Makefile index 54e91704c0d..9e8f6ad0c6d 100644 --- a/lang/ruby25/Makefile +++ b/lang/ruby25/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2019/10/02 13:39:52 taca Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/03 19:04:07 rillig Exp $ # DISTNAME= # empty @@ -13,10 +13,10 @@ COMMENT= Ruby programming language ${RUBY_VERSION} meta package META_PACKAGE= yes -DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR} -DEPENDS+= ${RUBY_NAME}-gdbm>=${RUBY_VERSION}:../../databases/ruby-gdbm -DEPENDS+= ${RUBY_NAME}-fiddle>=${RUBY_VERSION}:../../devel/ruby-fiddle -DEPENDS+= ${RUBY_NAME}-readline>=${RUBY_VERSION}:../../devel/ruby-readline +DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR} +DEPENDS+= ${RUBY_NAME}-gdbm>=${RUBY_VERSION}:../../databases/ruby-gdbm +DEPENDS+= ${RUBY_NAME}-fiddle>=${RUBY_VERSION}:../../devel/ruby-fiddle +DEPENDS+= ${RUBY_NAME}-readline>=${RUBY_VERSION}:../../devel/ruby-readline RUBY_VERSIONS_ACCEPTED= 25 diff --git a/lang/ruby26-base/Makefile b/lang/ruby26-base/Makefile index fb63614fffc..25f4b37fa4f 100644 --- a/lang/ruby26-base/Makefile +++ b/lang/ruby26-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2019/10/03 00:40:33 ryoon Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/03 19:04:07 rillig Exp $ DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION} @@ -23,15 +23,15 @@ WRKSRC= ${RUBY_WRKSRC} .include "../../lang/ruby/platform.mk" .if !empty(RUBY_SUFFIX) -CONFIGURE_ARGS+= --program-suffix=${RUBY_SUFFIX} -CONFIGURE_ARGS+= --with-soname=${RUBY_NAME} -CONFIGURE_ARGS+= --with-ruby-version=${RUBY_VER_DIR} -CONFIGURE_ARGS+= --with-ruby-pc="ruby-${RUBY_VERSION}.pc" +CONFIGURE_ARGS+= --program-suffix=${RUBY_SUFFIX} +CONFIGURE_ARGS+= --with-soname=${RUBY_NAME} +CONFIGURE_ARGS+= --with-ruby-version=${RUBY_VER_DIR} +CONFIGURE_ARGS+= --with-ruby-pc="ruby-${RUBY_VERSION}.pc" .endif CONFIGURE_ENV.Darwin+= ac_cv_prog_dsymutil= -DOCS= BSDL COPYING COPYING.ja ChangeLog LEGAL NEWS README.EXT README.EXT.ja \ +DOCS= BSDL COPYING COPYING.ja ChangeLog LEGAL NEWS README.EXT README.EXT.ja \ README.ja.md README.md doc/ChangeLog-1.8.0 doc/ChangeLog-1.9.3 \ doc/ChangeLog-2.0.0 doc/ChangeLog-2.1.0 doc/ChangeLog-2.2.0 \ doc/ChangeLog-2.3.0 doc/ChangeLog-2.4.0 doc/ChangeLog-2016 \ diff --git a/lang/ruby26/Makefile b/lang/ruby26/Makefile index 530b453e0b3..97af08b0963 100644 --- a/lang/ruby26/Makefile +++ b/lang/ruby26/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2019/10/02 13:44:34 taca Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/03 19:04:07 rillig Exp $ # DISTNAME= # empty @@ -13,10 +13,10 @@ COMMENT= Ruby programming language ${RUBY_VERSION} meta package META_PACKAGE= yes -DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR} -DEPENDS+= ${RUBY_NAME}-gdbm>=${RUBY_VERSION}:../../databases/ruby-gdbm -DEPENDS+= ${RUBY_NAME}-fiddle>=${RUBY_VERSION}:../../devel/ruby-fiddle -DEPENDS+= ${RUBY_NAME}-readline>=${RUBY_VERSION}:../../devel/ruby-readline +DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR} +DEPENDS+= ${RUBY_NAME}-gdbm>=${RUBY_VERSION}:../../databases/ruby-gdbm +DEPENDS+= ${RUBY_NAME}-fiddle>=${RUBY_VERSION}:../../devel/ruby-fiddle +DEPENDS+= ${RUBY_NAME}-readline>=${RUBY_VERSION}:../../devel/ruby-readline RUBY_VERSIONS_ACCEPTED= 26 diff --git a/lang/rust/Makefile b/lang/rust/Makefile index eba2434e178..42f237cfdcd 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.122 2019/10/28 14:38:41 he Exp $ +# $NetBSD: Makefile,v 1.123 2019/11/03 19:04:07 rillig Exp $ DISTNAME= rustc-1.38.0-src PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} @@ -20,28 +20,28 @@ USE_TOOLS+= bash ggrep gmake perl:build pkg-config # build on 7). Mark earlier versions as broken. BROKEN_ON_PLATFORM+= NetBSD-[1-7].*-* -CHECK_PORTABILITY_SKIP+=vendor/openssl-src/openssl/.travis-create-release.sh - -HAS_CONFIGURE= yes -PYTHON_FOR_BUILD_ONLY= yes -PYTHON_VERSIONS_ACCEPTED=27 -CONFIG_SHELL= ${PYTHONBIN} -CONFIGURE_SCRIPT= src/bootstrap/configure.py -CONFIGURE_ARGS+= --prefix=${PREFIX} -CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --python=${PYTHONBIN} -CONFIGURE_ARGS+= --release-channel=stable -#CONFIGURE_ARGS+= --enable-local-rust -CONFIGURE_ARGS+= --local-rust-root=${RUST_BOOTSTRAP_PATH} -CONFIGURE_ARGS+= --enable-extended # Build and install cargo too. -CONFIGURE_ARGS+= --enable-rpath -CONFIGURE_ARGS+= --disable-codegen-tests -CONFIGURE_ARGS+= --disable-dist-src -CONFIGURE_ARGS+= --disable-llvm-static-stdcpp -CONFIGURE_ARGS+= --disable-ninja +CHECK_PORTABILITY_SKIP+= vendor/openssl-src/openssl/.travis-create-release.sh + +HAS_CONFIGURE= yes +PYTHON_FOR_BUILD_ONLY= yes +PYTHON_VERSIONS_ACCEPTED= 27 +CONFIG_SHELL= ${PYTHONBIN} +CONFIGURE_SCRIPT= src/bootstrap/configure.py +CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --python=${PYTHONBIN} +CONFIGURE_ARGS+= --release-channel=stable +#CONFIGURE_ARGS+= --enable-local-rust +CONFIGURE_ARGS+= --local-rust-root=${RUST_BOOTSTRAP_PATH} +CONFIGURE_ARGS+= --enable-extended # Build and install cargo too. +CONFIGURE_ARGS+= --enable-rpath +CONFIGURE_ARGS+= --disable-codegen-tests +CONFIGURE_ARGS+= --disable-dist-src +CONFIGURE_ARGS+= --disable-llvm-static-stdcpp +CONFIGURE_ARGS+= --disable-ninja # XXX: to be enabled in the future -#CONFIGURE_ARGS+= --jemalloc-root=${BUILDLINK_PREFIX.jemalloc}/lib +#CONFIGURE_ARGS+= --jemalloc-root=${BUILDLINK_PREFIX.jemalloc}/lib # Use "dist" build target for cross compile of bootstrap #BUILD_TARGET= dist @@ -67,10 +67,10 @@ BUILD_TARGET= build # the ultimate target to built for, as well as the # host the compiler is supposed to run on. # Rust's target designation -#TARGET= armv7-unknown-netbsd-eabihf -#TARGET= sparc64-unknown-netbsd -#TARGET= powerpc-unknown-netbsd -#TARGET= aarch64-unknown-netbsd +#TARGET= armv7-unknown-netbsd-eabihf +#TARGET= sparc64-unknown-netbsd +#TARGET= powerpc-unknown-netbsd +#TARGET= aarch64-unknown-netbsd #SCRIPTS= ${WRKDIR}/scripts #CONFIGURE_ARGS+= --host=${TARGET} #CONFIGURE_ARGS+= --target=${TARGET} @@ -132,7 +132,7 @@ CONFIGURE_ARGS+= --debuginfo-level-tests=0 # (X86 needs to go along due to 2-stage build process) .if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || \ !empty(TARGET:Marmv7-unknown-netbsd-eabihf) -CONFIGURE_ARGS+= --set llvm.targets="ARM;X86" +CONFIGURE_ARGS+= --set llvm.targets="ARM;X86" .endif @@ -358,8 +358,8 @@ do-install: && ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} \ ${PYTHONBIN} ./x.py -v install -j ${MAKE_JOBS:U1} -GENERATE_PLIST+=find ${DESTDIR}${PREFIX} \( -type f -o -type l \) -print | \ - sed 's,${DESTDIR}${PREFIX}/,,' | ${SORT} ; +GENERATE_PLIST+= find ${DESTDIR}${PREFIX} \( -type f -o -type l \) -print | \ + sed 's,${DESTDIR}${PREFIX}/,,' | ${SORT} ; # Create a relocatable stage2 bootstrap from the bits we just built that can be # used to build the next version of rust. Currently only tested on SmartOS. diff --git a/lang/rust/cargo.mk b/lang/rust/cargo.mk index 5d2ec51b962..b18e8f02d33 100644 --- a/lang/rust/cargo.mk +++ b/lang/rust/cargo.mk @@ -1,4 +1,4 @@ -# $NetBSD: cargo.mk,v 1.7 2019/07/17 11:04:45 fox Exp $ +# $NetBSD: cargo.mk,v 1.8 2019/11/03 19:04:07 rillig Exp $ # # Common logic that can be used by packages that depend on cargo crates # from crates.io. This lets existing pkgsrc infrastructure fetch and verify @@ -25,10 +25,10 @@ BUILD_DEPENDS+= rust-[0-9]*:../../lang/rust USE_TOOLS+= bsdtar digest CARGO_VENDOR_DIR= ${WRKDIR}/vendor -DISTFILES?= ${DEFAULT_DISTFILES} +DISTFILES?= ${DEFAULT_DISTFILES} .for _crate in ${CARGO_CRATE_DEPENDS} -DISTFILES+= ${_crate}.crate -SITES.${_crate}.crate+= -${MASTER_SITE_CRATESIO}${_crate:C/-[0-9]+\.[0-9.]+.*$//}/${_crate:C/^.*-([0-9]+\.[0-9.]+.*)$/\1/}/download +DISTFILES+= ${_crate}.crate +SITES.${_crate}.crate+= -${MASTER_SITE_CRATESIO}${_crate:C/-[0-9]+\.[0-9.]+.*$//}/${_crate:C/^.*-([0-9]+\.[0-9.]+.*)$/\1/}/download EXTRACT_DIR.${_crate}.crate?= ${CARGO_VENDOR_DIR} .endfor diff --git a/lang/rust/platform.mk b/lang/rust/platform.mk index 99d5641cdf2..6fb7263f68e 100644 --- a/lang/rust/platform.mk +++ b/lang/rust/platform.mk @@ -1,18 +1,18 @@ -# $NetBSD: platform.mk,v 1.1 2019/06/01 13:55:11 wiz Exp $ +# $NetBSD: platform.mk,v 1.2 2019/11/03 19:04:07 rillig Exp $ .if !defined(PLATFORM_SUPPORTS_RUST) -.for _rust_arch in aarch64 armv7 i386 powerpc sparc64 x86_64 -.for _rust_os in Darwin FreeBSD Linux NetBSD SunOS -RUST_PLATFORMS+= ${_rust_os}-*-${_rust_arch} -.endfor -.endfor +. for _rust_arch in aarch64 armv7 i386 powerpc sparc64 x86_64 +. for _rust_os in Darwin FreeBSD Linux NetBSD SunOS +RUST_PLATFORMS+= ${_rust_os}-*-${_rust_arch} +. endfor +. endfor -.for _rust_platform in ${RUST_PLATFORMS} -.if !empty(MACHINE_PLATFORM:M${_rust_platform}) -PLATFORM_SUPPORTS_RUST= yes -.endif -.endfor -PLATFORM_SUPPORTS_RUST?= no +. for _rust_platform in ${RUST_PLATFORMS} +. if !empty(MACHINE_PLATFORM:M${_rust_platform}) +PLATFORM_SUPPORTS_RUST= yes +. endif +. endfor +PLATFORM_SUPPORTS_RUST?= no .endif # !defined(PLATFORM_SUPPORTS_RUST) diff --git a/lang/sather/Makefile b/lang/sather/Makefile index ead783d5fec..9c48e831af4 100644 --- a/lang/sather/Makefile +++ b/lang/sather/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2019/08/11 13:21:23 wiz Exp $ +# $NetBSD: Makefile,v 1.68 2019/11/03 19:04:07 rillig Exp $ DISTNAME= sather-1.2.3 PKGREVISION= 15 @@ -21,7 +21,7 @@ INFO_FILES= yes REPLACE_PERL= Browser/Web/ps2gif -SUBST_CLASSES+= sather-configure +SUBST_CLASSES+= sather-configure SUBST_STAGE.sather-configure= pre-configure SUBST_MESSAGE.sather-configure= Configuring sources SUBST_FILES.sather-configure= \ diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile index 03b8d6dd55e..ef77e5f1c55 100644 --- a/lang/sbcl/Makefile +++ b/lang/sbcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.82 2019/10/12 09:47:39 he Exp $ +# $NetBSD: Makefile,v 1.83 2019/11/03 19:04:07 rillig Exp $ DISTNAME= ${PKGNAME_NOREV}-source PKGNAME= sbcl-1.5.7 @@ -58,7 +58,7 @@ SUBST_STAGE.fix-paths= pre-configure SUBST_MESSAGE.fix-paths= Fixing absolute paths. SUBST_FILES.fix-paths= install.sh src/runtime/runtime.c doc/sbcl.1 SUBST_VARS.fix-paths= PREFIX -SUBST_SED.fix-paths+= -e 's,/var/log,${VARBASE}/log,g' +SUBST_SED.fix-paths+= -e 's,/var/log,${VARBASE}/log,g' SUBST_CLASSES+= fix-gtar SUBST_STAGE.fix-gtar= pre-configure diff --git a/lang/scm/Makefile b/lang/scm/Makefile index 082eb153ef0..fa1733f332a 100644 --- a/lang/scm/Makefile +++ b/lang/scm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2016/09/06 20:54:00 joerg Exp $ +# $NetBSD: Makefile,v 1.28 2019/11/03 19:04:08 rillig Exp $ # # Convert the version number as follows 2d2 -> 2.4.2, where the d is # changed to a 4, representing the 4th letter. @@ -27,10 +27,10 @@ INFO_FILES= yes LDFLAGS.SunOS+= -lsocket -lnsl -SCM_MODULES+= sc2 ramap dynl edline gsubr ioext posix record rgx socket -SCM_MODULES+= unix continue scm scmmain findexec script time repl scl eval -SCM_MODULES+= sys subr debug unif rope unexelf -COMPILED_INITS+=init_edline +SCM_MODULES+= sc2 ramap dynl edline gsubr ioext posix record rgx socket +SCM_MODULES+= unix continue scm scmmain findexec script time repl scl eval +SCM_MODULES+= sys subr debug unif rope unexelf +COMPILED_INITS+= init_edline .include "options.mk" diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile index 92ad2ebef60..8bef67102b1 100644 --- a/lang/smalltalk/Makefile +++ b/lang/smalltalk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.110 2019/09/01 13:06:25 wiz Exp $ +# $NetBSD: Makefile,v 1.111 2019/11/03 19:04:08 rillig Exp $ DISTNAME= smalltalk-3.2.5 PKGREVISION= 11 @@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --with-system-libffi=${BUILDLINK_PREFIX.libffi}/lib CONFIGURE_ARGS+= --with-gmp=${BUILDLINK_PREFIX.gmp}/lib CONFIGURE_ARGS+= --with-lispdir=${PREFIX}/share/emacs/site-lisp CONFIGURE_ARGS+= --without-emacs -#CONFIGURE_ENV+= CFLAGS="-O2 -fsigned-char" +#CONFIGURE_ENV+= CFLAGS="-O2 -fsigned-char" IGNORE_LIBTOOLIZE= lib/smalltalk/libc.la INFO_FILES= YES diff --git a/lang/smlnj/Makefile b/lang/smlnj/Makefile index 41823a4b393..f7597184990 100644 --- a/lang/smlnj/Makefile +++ b/lang/smlnj/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2019/10/12 20:52:53 he Exp $ +# $NetBSD: Makefile,v 1.36 2019/11/03 19:04:08 rillig Exp $ # DISTNAME= boot.${BOX}-unix @@ -57,12 +57,12 @@ BUILD_ENV+= PATCH=${PATCH:Q} PATCH_ARGS=${PATCH_ARGS:Q} # note that this includes bsd.prefs.mk .include "../../lang/smlnj/Makefile.common" -BOXES= x86 ppc sparc +BOXES= x86 ppc sparc .if make(distinfo) || make(makesum) || make(mdi) -.for B in ${BOXES} -DISTFILES+= boot.${B}-unix.tgz -.endfor +. for B in ${BOXES} +DISTFILES+= boot.${B}-unix.tgz +. endfor .endif # diff --git a/lang/smlnj11072/Makefile b/lang/smlnj11072/Makefile index d47ba285be6..0fe6697bfc8 100644 --- a/lang/smlnj11072/Makefile +++ b/lang/smlnj11072/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2019/10/12 20:00:06 he Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/03 19:04:08 rillig Exp $ # DISTNAME= boot.${BOX}-unix @@ -57,12 +57,12 @@ BUILD_ENV+= PATCH=${PATCH:Q} PATCH_ARGS=${PATCH_ARGS:Q} # note that this includes bsd.prefs.mk .include "../../lang/smlnj/Makefile.common" -BOXES= x86 ppc sparc +BOXES= x86 ppc sparc .if make(distinfo) || make(makesum) || make(mdi) -.for B in ${BOXES} +. for B in ${BOXES} DISTFILES+= boot.${B}-unix.tgz -.endfor +. endfor .endif # diff --git a/lang/snobol/Makefile b/lang/snobol/Makefile index b963a853f06..182600f18c6 100644 --- a/lang/snobol/Makefile +++ b/lang/snobol/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2018/07/04 13:40:22 jperkin Exp $ +# $NetBSD: Makefile,v 1.34 2019/11/03 19:04:08 rillig Exp $ # DISTNAME= snobol4-1.3 @@ -28,8 +28,8 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS+= --prefix=${PREFIX} CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} # not yet -#CONFIGURE_ARGS+=--with-tcl -#CONFIGURE_ARGS+=--with-tk +#CONFIGURE_ARGS+= --with-tcl +#CONFIGURE_ARGS+= --with-tk BUILD_TARGET= all pv diff --git a/lang/spidermonkey/Makefile b/lang/spidermonkey/Makefile index a64d0408657..33c306b9d6c 100644 --- a/lang/spidermonkey/Makefile +++ b/lang/spidermonkey/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2017/09/09 16:04:31 sevan Exp $ +# $NetBSD: Makefile,v 1.32 2019/11/03 19:04:08 rillig Exp $ DISTNAME= js-1.8.0-rc1 PKGNAME= spidermonkey-1.8.0rc1 @@ -41,9 +41,9 @@ BUILDDIRPREFIX= ${OPSYS} .endif .if ${OPSYS} == "Darwin" -SO_SUFFIX=dylib +SO_SUFFIX= dylib .else -SO_SUFFIX=so +SO_SUFFIX= so .endif PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX} diff --git a/lang/spidermonkey52/hacks.mk b/lang/spidermonkey52/hacks.mk index 4d7f32c7aa8..9d90eb46cec 100644 --- a/lang/spidermonkey52/hacks.mk +++ b/lang/spidermonkey52/hacks.mk @@ -1,7 +1,7 @@ -# $NetBSD: hacks.mk,v 1.1 2018/08/01 09:32:27 jmcneill Exp $ +# $NetBSD: hacks.mk,v 1.2 2019/11/03 19:04:08 rillig Exp $ .if !defined(SPIDERMONKEY52_HACKS_MK) -SPIDERMONKEY52_HACKS_MK= # defined +SPIDERMONKEY52_HACKS_MK= # defined ### ### TLS is not supported yet on NetBSD aarch64 as of 8.99.22 diff --git a/lang/spl/Makefile b/lang/spl/Makefile index 67408c1fa43..d48ecea0ba1 100644 --- a/lang/spl/Makefile +++ b/lang/spl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2019/04/03 00:32:50 ryoon Exp $ +# $NetBSD: Makefile,v 1.38 2019/11/03 19:04:08 rillig Exp $ # DISTNAME= spl-1.0pre3 @@ -23,7 +23,7 @@ SUBST_SED.prefix+= -e 's,^ENABLE_OPENGL_SUPPORT.*,ENABLE_OPENGL_SUPPORT=0,g' SUBST_SED.prefix+= -e 's,^ cgibin_libdir.*, cgibin_libdir = ${PREFIX}/libexec/cgi-bin,g' #subst.mk does not correctly detect GNUmakefile as text file -_SUBST_IS_TEXT_FILE=true +_SUBST_IS_TEXT_FILE= true MAKE_ENV+= ENABLE_OPENGL_SUPPORT=0 MAKE_FILE= GNUmakefile diff --git a/lang/sr-examples/Makefile b/lang/sr-examples/Makefile index ff5c0554fcb..b908f01b4b5 100644 --- a/lang/sr-examples/Makefile +++ b/lang/sr-examples/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2012/10/02 20:11:54 asau Exp $ +# $NetBSD: Makefile,v 1.12 2019/11/03 19:04:09 rillig Exp $ # DISTNAME= vs233 @@ -21,7 +21,7 @@ NO_BUILD= yes ### Use the second line below for installing if you want to make print-PLIST! DOMOD= -#DOMOD=-pm +#DOMOD= -pm do-install: ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX:Q}/share/examples/sr diff --git a/lang/sr/Makefile b/lang/sr/Makefile index 9c8133e0755..b49d403a6c4 100644 --- a/lang/sr/Makefile +++ b/lang/sr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2018/04/18 08:42:16 he Exp $ +# $NetBSD: Makefile,v 1.26 2019/11/03 19:04:08 rillig Exp $ # DISTNAME= sr233 @@ -20,9 +20,9 @@ MAKE_JOBS_SAFE= no USE_TOOLS+= yacc -WRKSRC= ${WRKDIR} -TEST_TARGET= verify -AUTO_MKDIRS= yes +WRKSRC= ${WRKDIR} +TEST_TARGET= verify +AUTO_MKDIRS= yes SUBST_CLASSES+= sr SUBST_STAGE.sr= pre-configure diff --git a/lang/sun-jdk7/builtin.mk b/lang/sun-jdk7/builtin.mk index a85eb7a970a..4bbc1625851 100644 --- a/lang/sun-jdk7/builtin.mk +++ b/lang/sun-jdk7/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.3 2014/09/03 12:47:37 tron Exp $ +# $NetBSD: builtin.mk,v 1.4 2019/11/03 19:04:09 rillig Exp $ BUILTIN_PKG:= sun-jdk7 @@ -13,7 +13,7 @@ BUILTIN_FIND_FILES.JDK7= \ ### program to find the default 1.7 JDK if it exists. ### .if ${OPSYS} == "Darwin" -_JAVA_HOME_ANSWER!= \ +_JAVA_HOME_ANSWER!= \ if [ -x /usr/libexec/java_home ]; then \ result=`/usr/libexec/java_home -v 1.7 2> /dev/null`; \ if [ $$? -eq 0 ]; then \ @@ -38,7 +38,7 @@ IS_BUILTIN.sun-jdk7= yes IS_BUILTIN.sun-jdk7= no . endif .endif -MAKEVARS+= IS_BUILTIN.sun-jdk7 +MAKEVARS+= IS_BUILTIN.sun-jdk7 ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -48,13 +48,13 @@ MAKEVARS+= IS_BUILTIN.sun-jdk7 !empty(IS_BUILTIN.sun-jdk7:M[yY][eE][sS]) && \ empty(JDK7:M__nonexistent__) -BUILTIN_VERSION.sun-jdk7!= ${JDK7} -version 2>&1 | \ - ${AWK} '{print $$2; exit}' | \ +BUILTIN_VERSION.sun-jdk7!= ${JDK7} -version 2>&1 | \ + ${AWK} '{print $$2; exit}' | \ ${AWK} '{sub(/^1\./,"");sub(/_/,".");print $$1}' BUILTIN_PKG.sun-jdk7= sun-jdk7-${BUILTIN_VERSION.sun-jdk7} .endif -MAKEVARS+= BUILTIN_PKG.sun-jdk7 +MAKEVARS+= BUILTIN_PKG.sun-jdk7 ### ### Determine whether we should use the built-in implementation if it diff --git a/lang/sun-jre7/Makefile b/lang/sun-jre7/Makefile index ee97635b570..0b8fcdccef8 100644 --- a/lang/sun-jre7/Makefile +++ b/lang/sun-jre7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2018/12/09 21:05:33 adam Exp $ +# $NetBSD: Makefile,v 1.28 2019/11/03 19:04:09 rillig Exp $ # Note: Regen distinfo with PKG_OPTIONS.sun-jre7+=sun-jre-jce # Note: Update DOWNLOAD_NAME when you update the JRE version @@ -28,7 +28,7 @@ CONF_FILES= # empty .include "../../lang/sun-jre7/Makefile.common" -SFILES_MK=sfiles-${DIST_OS}-${EMUL_ARCH}.mk +SFILES_MK= sfiles-${DIST_OS}-${EMUL_ARCH}.mk .sinclude "${SFILES_MK}" @@ -77,11 +77,11 @@ PKG_FAIL_REASON+= "${X11_LIB} does not exist. Please install the" \ "X11 library packages for your system." . endif . else -. include "../../x11/libX11/buildlink3.mk" -. include "../../x11/libXext/buildlink3.mk" -. include "../../x11/libXi/buildlink3.mk" -. include "../../x11/libXt/buildlink3.mk" -. include "../../x11/libXtst/buildlink3.mk" +. include "../../x11/libX11/buildlink3.mk" +. include "../../x11/libXext/buildlink3.mk" +. include "../../x11/libXi/buildlink3.mk" +. include "../../x11/libXt/buildlink3.mk" +. include "../../x11/libXtst/buildlink3.mk" X11_LIBDIR= ${X11BASE}/lib . endif diff --git a/lang/sun-jre7/Makefile.common b/lang/sun-jre7/Makefile.common index 93a9e2409c8..c3ecd7e8371 100644 --- a/lang/sun-jre7/Makefile.common +++ b/lang/sun-jre7/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.16 2019/07/10 10:37:13 nia Exp $ +# $NetBSD: Makefile.common,v 1.17 2019/11/03 19:04:09 rillig Exp $ # used by lang/sun-jre7/Makefile # used by lang/sun-jdk7/Makefile @@ -10,11 +10,11 @@ HOMEPAGE= https://www.oracle.com/technetwork/java/index.html DOWNLOAD= https://www.oracle.com/technetwork/java/javase/downloads/index-jsp-138363.html ARCHIVE= https://www.oracle.com/technetwork/java/javase/archive-139210.html -RESTRICTED= Redistribution of repackaged binaries not permitted -NO_SRC_ON_CDROM=${RESTRICTED} -NO_SRC_ON_FTP= ${RESTRICTED} -NO_BIN_ON_CDROM=${RESTRICTED} -NO_BIN_ON_FTP= ${RESTRICTED} +RESTRICTED= Redistribution of repackaged binaries not permitted +NO_SRC_ON_CDROM= ${RESTRICTED} +NO_SRC_ON_FTP= ${RESTRICTED} +NO_BIN_ON_CDROM= ${RESTRICTED} +NO_BIN_ON_FTP= ${RESTRICTED} EMUL_PLATFORMS= linux-i386 linux-x86_64 solaris-i386 solaris-x86_64 diff --git a/lang/sun-jre7/builtin.mk b/lang/sun-jre7/builtin.mk index 82fd44d7460..5c0f7f1f687 100644 --- a/lang/sun-jre7/builtin.mk +++ b/lang/sun-jre7/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.3 2014/09/03 12:47:37 tron Exp $ +# $NetBSD: builtin.mk,v 1.4 2019/11/03 19:04:09 rillig Exp $ BUILTIN_PKG:= sun-jre7 @@ -38,7 +38,7 @@ IS_BUILTIN.sun-jre7= yes IS_BUILTIN.sun-jre7= no . endif .endif -MAKEVARS+= IS_BUILTIN.sun-jre7 +MAKEVARS+= IS_BUILTIN.sun-jre7 ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -48,13 +48,13 @@ MAKEVARS+= IS_BUILTIN.sun-jre7 !empty(IS_BUILTIN.sun-jre7:M[yY][eE][sS]) && \ empty(JAVAVM7:M__nonexistent__) -BUILTIN_VERSION.sun-jre7!= ${JAVAVM7:Q}/bin/java -version 2>&1 | \ - ${AWK} -F \" '{print $$2; exit}' | \ +BUILTIN_VERSION.sun-jre7!= ${JAVAVM7:Q}/bin/java -version 2>&1 | \ + ${AWK} -F \" '{print $$2; exit}' | \ ${AWK} '{sub(/^1\./,"");sub(/_/,".");print $$1}' BUILTIN_PKG.sun-jre7= sun-jre7-${BUILTIN_VERSION.sun-jre7} .endif -MAKEVARS+= BUILTIN_PKG.sun-jre7 +MAKEVARS+= BUILTIN_PKG.sun-jre7 ### ### Determine whether we should use the built-in implementation if it @@ -81,7 +81,7 @@ USE_BUILTIN.sun-jre7!= \ . endif . endif # PREFER.sun-jre7 .endif -MAKEVARS+= USE_BUILTIN.sun-jre7 +MAKEVARS+= USE_BUILTIN.sun-jre7 ### ### The section below only applies if we are not including this file diff --git a/lang/tcl/Makefile.version b/lang/tcl/Makefile.version index 9aa64bdaccb..34e8224f78d 100644 --- a/lang/tcl/Makefile.version +++ b/lang/tcl/Makefile.version @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.version,v 1.24 2018/12/09 18:33:55 adam Exp $ +# $NetBSD: Makefile.version,v 1.25 2019/11/03 19:04:09 rillig Exp $ # used by cad/xcircuit/Makefile # used by devel/tcl-tclcl/Makefile # used by lang/tcl/Makefile @@ -10,7 +10,7 @@ TCL_BASEVER= 8.6 TCL_VERSION= 8.6.9 # Update bundled versions in lang/tcl/buildlink3.mk -ITCL_VERSION= 4.1.2 -SQLITE3_VERSION=3.25.3 -TDBC_VERSION= 1.1.0 -THREAD_VERSION= 2.8.4 +ITCL_VERSION= 4.1.2 +SQLITE3_VERSION= 3.25.3 +TDBC_VERSION= 1.1.0 +THREAD_VERSION= 2.8.4 diff --git a/lang/ucblogo/Makefile b/lang/ucblogo/Makefile index e85f5ed87de..f917f9b46b3 100644 --- a/lang/ucblogo/Makefile +++ b/lang/ucblogo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2017/01/05 17:22:09 roy Exp $ +# $NetBSD: Makefile,v 1.30 2019/11/03 19:04:09 rillig Exp $ DISTNAME= ucblogo PKGNAME= ${DISTNAME}-6.0 @@ -15,17 +15,17 @@ COMMENT= Brian Harvey's logo language interpreter WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} -MAKE_FILE= makefile -BUILD_TARGET= # empty -GNU_CONFIGURE= yes +MAKE_FILE= makefile +BUILD_TARGET= # empty +GNU_CONFIGURE= yes # otherwise ./configure might find wxgtk CONFIGURE_ARGS+= --wx-disable # otherwise ./configure guesses -L incorrectly -LIBS+= -L${X11BASE}/lib +LIBS+= -L${X11BASE}/lib -USE_TOOLS+= makeinfo +USE_TOOLS+= makeinfo INSTALLATION_DIRS= info -INFO_FILES= yes +INFO_FILES= yes post-extract: ${RM} ${WRKSRC}/config.cache |