diff options
Diffstat (limited to 'devel')
274 files changed, 1176 insertions, 1176 deletions
diff --git a/devel/ExmanIDE/Makefile b/devel/ExmanIDE/Makefile index 040e7bd9568..118e3118a2b 100644 --- a/devel/ExmanIDE/Makefile +++ b/devel/ExmanIDE/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2019/09/02 13:19:39 adam Exp $ +# $NetBSD: Makefile,v 1.31 2019/11/03 10:39:04 rillig Exp $ DISTNAME= ExmanIDE-0.9.4 PKGREVISION= 8 @@ -16,7 +16,7 @@ USE_TOOLS+= pax WRKSRC= ${WRKDIR}/${PKGBASE} NO_BUILD= yes -PYTHON_VERSIONS_ACCEPTED= 27 # py-wxWidgets +PYTHON_VERSIONS_ACCEPTED= 27 # py-wxWidgets SUBST_CLASSES+= mod SUBST_MESSAGE.mod= Fixing deprecated module names. @@ -37,7 +37,7 @@ SUBST_STAGE.py2= pre-configure SUBST_FILES.py2= ExmanIDE.pyw SUBST_SED.py2= -e 's,/usr/bin/env python.*$$,${PYTHONBIN},' -INSTALLATION_DIRS= bin share/ExmanIDE +INSTALLATION_DIRS= bin share/ExmanIDE do-install: ${INSTALL_SCRIPT} ${WRKSRC}/ExmanIDE ${DESTDIR}${PREFIX}/bin diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile index 8feec31ad38..fef72354019 100644 --- a/devel/GConf/Makefile +++ b/devel/GConf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.97 2019/08/11 13:18:37 wiz Exp $ +# $NetBSD: Makefile,v 1.98 2019/11/03 10:39:05 rillig Exp $ PKGREVISION= 3 .include "../../devel/GConf/Makefile.common" @@ -15,7 +15,7 @@ OWN_DIRS+= ${PKG_SYSCONFDIR}/gconf.xml.system EGDIR= ${PREFIX}/share/examples/GConf CONF_FILES= ${EGDIR}/path ${PKG_SYSCONFDIR}/2/path -REPLACE_PYTHON= gsettings/gsettings-schema-convert +REPLACE_PYTHON= gsettings/gsettings-schema-convert INSTALLATION_DIRS= share/gconf/schemas BUILDLINK_ABI_DEPENDS.dbus-glib+= dbus-glib>=0.74 diff --git a/devel/MoarVM/Makefile b/devel/MoarVM/Makefile index 0e14944b1f6..f649d472e60 100644 --- a/devel/MoarVM/Makefile +++ b/devel/MoarVM/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2019/08/22 22:33:15 ast Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/03 10:39:05 rillig Exp $ DISTNAME= MoarVM-2019.07.1 PKGREVISION= 1 @@ -10,8 +10,8 @@ HOMEPAGE= http://www.moarvm.org/ COMMENT= Virtual machine for Rakudo Perl 6 LICENSE= artistic-2.0 -USE_TOOLS+= perl gmake -USE_LANGUAGES= c c++ +USE_TOOLS+= perl gmake +USE_LANGUAGES= c c++ NOT_PAX_MPROTECT_SAFE= bin/moar HAS_CONFIGURE= yes diff --git a/devel/RBTools/Makefile b/devel/RBTools/Makefile index 56f44fc0ce3..0014a0e34d2 100644 --- a/devel/RBTools/Makefile +++ b/devel/RBTools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2019/09/02 13:19:41 adam Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/03 10:39:05 rillig Exp $ DISTNAME= RBTools-0.7.6 PKGREVISION= 1 @@ -12,11 +12,11 @@ LICENSE= mit USE_LANGUAGES= # none -REPLACE_PYTHON= ez_setup.py setup.py rbtools/postreview.py -REPLACE_PYTHON+= contrib/internal/release.py +REPLACE_PYTHON= ez_setup.py setup.py rbtools/postreview.py +REPLACE_PYTHON+= contrib/internal/release.py PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 0.2 -DEPENDS+= ${PYPKGPREFIX}-six>=1.8.0:../../lang/py-six +DEPENDS+= ${PYPKGPREFIX}-six>=1.8.0:../../lang/py-six .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ZenTest/Makefile b/devel/ZenTest/Makefile index 81814a34f64..a9132f27064 100644 --- a/devel/ZenTest/Makefile +++ b/devel/ZenTest/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2019/10/23 16:15:36 taca Exp $ +# $NetBSD: Makefile,v 1.26 2019/11/03 10:39:05 rillig Exp $ DISTNAME= ZenTest-4.12.0 CATEGORIES= devel @@ -8,7 +8,7 @@ HOMEPAGE= http://www.zenspider.com/ZSS/Products/ZenTest/ COMMENT= Testing utilities for Ruby LICENSE= mit -CONFLICTS+= ruby[1-9][0-9][0-9]-ZenTest-[0-9]* ZenTest-[0-9]* +CONFLICTS+= ruby[1-9][0-9][0-9]-ZenTest-[0-9]* ZenTest-[0-9]* RUBYGEM_OPTIONS+= --format-executable USE_LANGUAGES= # empty diff --git a/devel/accerciser/Makefile b/devel/accerciser/Makefile index 8dfe399d40e..e1d46ddd312 100644 --- a/devel/accerciser/Makefile +++ b/devel/accerciser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2019/10/26 12:53:26 kamil Exp $ +# $NetBSD: Makefile,v 1.35 2019/11/03 10:39:05 rillig Exp $ DISTNAME= accerciser-3.34.0 CATEGORIES= devel gnome @@ -20,7 +20,7 @@ REPLACE_PYTHON= plugins/ipython_view.py REPLACE_PYTHON+= src/accerciser.in TOOL_DEPENDS+= gettext-tools>=0.19.8:../../devel/gettext-tools -_TOOLS_USE_PKGSRC.msgfmt=yes +_TOOLS_USE_PKGSRC.msgfmt= yes BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool DEPENDS+= libwnck3-[0-9]*:../../devel/libwnck3 diff --git a/devel/acme/Makefile b/devel/acme/Makefile index 2ce96165f11..50ae9c930ad 100644 --- a/devel/acme/Makefile +++ b/devel/acme/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.15 2016/08/13 06:14:48 mef Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/03 10:39:05 rillig Exp $ # -DISTNAME= acme091src -PKGNAME= acme-0.91 -CATEGORIES= devel -MASTER_SITES= http://www.esw-heim.tu-clausthal.de/~marco/smorbrod/acme/current/ -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${LIBDIST} -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +DISTNAME= acme091src +PKGNAME= acme-0.91 +CATEGORIES= devel +MASTER_SITES= http://www.esw-heim.tu-clausthal.de/~marco/smorbrod/acme/current/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${LIBDIST} +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} SITES.${LIBDIST}= http://www.esw-heim.tu-clausthal.de/~marco/smorbrod/acme/ MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/devel/acme/hacks.mk b/devel/acme/hacks.mk index 226b4beba65..7dbdc887e1e 100644 --- a/devel/acme/hacks.mk +++ b/devel/acme/hacks.mk @@ -1,15 +1,15 @@ -# $NetBSD: hacks.mk,v 1.1 2012/12/12 10:12:38 wiz Exp $ +# $NetBSD: hacks.mk,v 1.2 2019/11/03 10:39:05 rillig Exp $ .if !defined(ACME_HACKS_MK) ACME_HACKS_MK= # defined -. if ${OPSYS} == "HPUX" +.if ${OPSYS} == "HPUX" PKG_HACKS+= hpux-cpu_t SUBST_CLASSES+= cpu_t SUBST_STAGE.cpu_t= pre-configure SUBST_MESSAGE.cpu_t= Changing conflicting type cpu_t to acmecpu_t SUBST_FILES.cpu_t= cpu.c cpu.h SUBST_SED.cpu_t= -e 's,cpu_t,acmecpu_t,g' -. endif +.endif .endif diff --git a/devel/afl/Makefile b/devel/afl/Makefile index 92cdbffcd07..1c26086e028 100644 --- a/devel/afl/Makefile +++ b/devel/afl/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.62 2019/10/11 16:20:18 kamil Exp $ +# $NetBSD: Makefile,v 1.63 2019/11/03 10:39:05 rillig Exp $ DISTNAME= afl-2.56b CATEGORIES= devel MASTER_SITES= http://lcamtuf.coredump.cx/afl/releases/ -MASTER_SITES= ${MASTER_SITE_GITHUB:=google/} +MASTER_SITES= ${MASTER_SITE_GITHUB:=google/} GITHUB_TAG= v${PKGVERSION_NOREV} MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/devel/argp/builtin.mk b/devel/argp/builtin.mk index b03761eaa02..795e7c2d7d1 100644 --- a/devel/argp/builtin.mk +++ b/devel/argp/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.2 2013/11/23 11:29:35 obache Exp $ +# $NetBSD: builtin.mk,v 1.3 2019/11/03 10:39:05 rillig Exp $ BUILTIN_PKG:= argp @@ -17,7 +17,7 @@ IS_BUILTIN.argp= no IS_BUILTIN.argp= yes . endif .endif -MAKEVARS+= IS_BUILTIN.argp +MAKEVARS+= IS_BUILTIN.argp ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -31,16 +31,16 @@ MAKEVARS+= IS_BUILTIN.argp ### Determine whether we should use the built-in implementation if it ### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). ### -.if !defined(USE_BUILTIN.argp) -. if ${PREFER.argp} == "pkgsrc" +. if !defined(USE_BUILTIN.argp) +. if ${PREFER.argp} == "pkgsrc" USE_BUILTIN.argp= no -. else +. else USE_BUILTIN.argp= ${IS_BUILTIN.argp} -. if defined(BUILTIN_PKG.argp) && \ +. if defined(BUILTIN_PKG.argp) && \ !empty(IS_BUILTIN.argp:M[yY][eE][sS]) USE_BUILTIN.argp= yes -. endif -. endif # PREFER.argp -.endif -MAKEVARS+= USE_BUILTIN.argp +. endif +. endif # PREFER.argp +. endif +MAKEVARS+= USE_BUILTIN.argp .endif diff --git a/devel/at-spi2-atk/Makefile b/devel/at-spi2-atk/Makefile index 31e0d022349..822ad15d526 100644 --- a/devel/at-spi2-atk/Makefile +++ b/devel/at-spi2-atk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2019/10/25 03:43:16 ryoon Exp $ +# $NetBSD: Makefile,v 1.26 2019/11/03 10:39:05 rillig Exp $ DISTNAME= at-spi2-atk-2.33.2 CATEGORIES= devel gnome @@ -12,8 +12,8 @@ LICENSE= gnu-lgpl-v2 USE_TOOLS+= pkg-config -PKGCONFIG_OVERRIDE= output/meson-private/atk-bridge-2.0.pc -PKGCONFIG_OVERRIDE_STAGE=pre-install +PKGCONFIG_OVERRIDE= output/meson-private/atk-bridge-2.0.pc +PKGCONFIG_OVERRIDE_STAGE= pre-install BUILDLINK_API_DEPENDS.atk+= atk>=2.33.3 .include "../../devel/atk/buildlink3.mk" diff --git a/devel/at-spi2-core/Makefile b/devel/at-spi2-core/Makefile index 74c6bbc5fa5..24d1ca09421 100644 --- a/devel/at-spi2-core/Makefile +++ b/devel/at-spi2-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2019/10/07 09:28:10 prlw1 Exp $ +# $NetBSD: Makefile,v 1.33 2019/11/03 10:39:06 rillig Exp $ DISTNAME= at-spi2-core-2.33.2 PKGREVISION= 1 @@ -13,9 +13,9 @@ LICENSE= gnu-lgpl-v2 USE_TOOLS+= msgfmt pkg-config -PKGCONFIG_OVERRIDE= output/meson-private/atspi-2.pc -PKGCONFIG_OVERRIDE_STAGE=pre-install -MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/atspi +PKGCONFIG_OVERRIDE= output/meson-private/atspi-2.pc +PKGCONFIG_OVERRIDE_STAGE= pre-install +MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/atspi BUILDDEFS+= PKG_SYSCONFBASE @@ -28,7 +28,7 @@ eg_default_sessiondir= ${EGDIR}/xdg/autostart SUBST_CLASSES+= eg SUBST_SED.eg+= -e 's,defaults,examples/${PKGBASE},' SUBST_FILES.eg+= bus/meson.build -SUBST_STAGE.eg= pre-configure +SUBST_STAGE.eg= pre-configure SUBST_MESSAGE.eg= Fixing path to examples directory. CONF_FILES= ${eg_busconfigdir}/accessibility.conf \ diff --git a/devel/atk/Makefile b/devel/atk/Makefile index 3258472ae7d..7560b060fca 100644 --- a/devel/atk/Makefile +++ b/devel/atk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.101 2019/10/07 09:28:10 prlw1 Exp $ +# $NetBSD: Makefile,v 1.102 2019/11/03 10:39:06 rillig Exp $ DISTNAME= atk-2.33.3 CATEGORIES= devel gnome @@ -13,9 +13,9 @@ LICENSE= gnu-lgpl-v2 USE_TOOLS+= pkg-config msgfmt USE_LANGUAGES= c99 -PKGCONFIG_OVERRIDE= output/meson-private/atk.pc -PKGCONFIG_OVERRIDE_STAGE=pre-install -MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/${PKGBASE} +PKGCONFIG_OVERRIDE= output/meson-private/atk.pc +PKGCONFIG_OVERRIDE_STAGE= pre-install +MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/${PKGBASE} .include "../../devel/gettext-lib/buildlink3.mk" BUILDLINK_API_DEPENDS.glib2+= glib2>=2.38.0 diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile index fbd348031a7..64887bfc9c7 100644 --- a/devel/automake14/Makefile +++ b/devel/automake14/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2019/08/11 13:18:39 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2019/11/03 10:39:06 rillig Exp $ DISTNAME= automake-1.4-p6 PKGNAME= automake14-1.4.6 @@ -18,7 +18,7 @@ CONFLICTS= automake<1.6 GNU_CONFIGURE= YES _STRIPFLAG_INSTALL= # none -USE_TOOLS+= makeinfo perl:run +USE_TOOLS+= makeinfo perl:run INFO_FILES= yes TEST_TARGET= check diff --git a/devel/avltree/Makefile b/devel/avltree/Makefile index 1b3bc417480..ad21812971b 100644 --- a/devel/avltree/Makefile +++ b/devel/avltree/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2012/10/31 11:16:39 asau Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/03 10:39:06 rillig Exp $ DISTNAME= avltree-1.1 CATEGORIES= devel @@ -11,9 +11,9 @@ COMMENT= In-memory index w/ binary and string keys and key counts USE_TOOLS+= nroff MANCOMPRESSED_IF_MANZ= yes -INSTALL_TARGET= includes install +INSTALL_TARGET= includes install USE_BSD_MAKEFILE= yes -MAKE_FLAGS+= MKPROFILE=yes +MAKE_FLAGS+= MKPROFILE=yes INSTALLATION_DIRS= include lib ${PKGMANDIR}/cat3 ${PKGMANDIR}/man3 diff --git a/devel/bcc/Makefile b/devel/bcc/Makefile index 385fa206c4a..80f7426ef19 100644 --- a/devel/bcc/Makefile +++ b/devel/bcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2016/12/22 21:02:19 joerg Exp $ +# $NetBSD: Makefile,v 1.31 2019/11/03 10:39:06 rillig Exp $ DISTNAME= bcc PKGREVISION= 2 @@ -22,16 +22,16 @@ USE_TOOLS+= groff nroff INSTALLATION_DIRS= bin lib/bcc ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1 CWARNFLAGS.clang= -Wno-error=logical-op-parentheses -Wno-error=array-bounds -MAKE_FLAGS+= CWARNFLAGS.clang=${CWARNFLAGS.clang:Q} +MAKE_FLAGS+= CWARNFLAGS.clang=${CWARNFLAGS.clang:Q} .include "../../mk/bsd.prefs.mk" # This package has LP64 issues, so must build as 32-bit binary. .for P in ${LP64PLATFORMS} -.if ${MACHINE_PLATFORM:M${P}} +. if ${MACHINE_PLATFORM:M${P}} CFLAGS+= -m32 LDFLAGS+= -m32 -.endif +. endif .endfor CPPFLAGS.DragonFly+= -D_POSIX_SOURCE diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile index 6ac7733f454..2a2e1359c9e 100644 --- a/devel/binutils/Makefile +++ b/devel/binutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.77 2018/05/28 14:15:38 bacon Exp $ +# $NetBSD: Makefile,v 1.78 2019/11/03 10:39:06 rillig Exp $ DISTNAME= binutils-2.26.1 PKGREVISION= 1 @@ -16,7 +16,7 @@ MAKE_JOBS_SAFE= no CONFLICTS= avr-binutils<2.13.2.1nb1 -USE_PKGLOCALEDIR= yes +USE_PKGLOCALEDIR= yes REPLACE_LOCALEDIR_PATTERNS+= Make-in USE_LANGUAGES= c c++ @@ -33,14 +33,14 @@ CONFIG_SHELL= ksh GNU_CONFIGURE= yes # Standard lib dirs on RHEL are named *lib64 -LIB_PATH= /lib:/usr/lib +LIB_PATH= /lib:/usr/lib .if exists(/usr/lib64) -LIB_PATH:= /usr/lib64:${LIB_PATH} +LIB_PATH:= /usr/lib64:${LIB_PATH} .endif .if exists(/lib64) -LIB_PATH:= /lib64:${LIB_PATH} +LIB_PATH:= /lib64:${LIB_PATH} .endif -CONFIGURE_ARGS+= --with-lib-path=${LIB_PATH} +CONFIGURE_ARGS+= --with-lib-path=${LIB_PATH} CONFIGURE_ARGS+= --program-prefix=g BINUTILS_PREFIX= ${PREFIX}/${MACHINE_GNU_PLATFORM} @@ -75,11 +75,11 @@ PLIST.SunOS= yes || (${OPSYS} == FreeBSD && empty(OS_VERSION:M[12345678].*)) \ || (${OPSYS} == OpenBSD && empty(OS_VERSION:M[1234].*)) \ || (${OPSYS} == NetBSD && empty(OS_VERSION:M[12345].*)) -BUILD_GOLD= yes -PLIST.gold= yes -USE_TOOLS+= bison -EXTRA_FILES+= dwp ld.gold -CONFIGURE_ARGS+=--enable-gold --enable-plugins +BUILD_GOLD= yes +PLIST.gold= yes +USE_TOOLS+= bison +EXTRA_FILES+= dwp ld.gold +CONFIGURE_ARGS+= --enable-gold --enable-plugins .endif CFLAGS.OpenBSD+= -Wno-bounded diff --git a/devel/binutils/builtin.mk b/devel/binutils/builtin.mk index c2cbefdbbfe..6a60e5ca4b9 100644 --- a/devel/binutils/builtin.mk +++ b/devel/binutils/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.10 2019/07/25 19:06:28 tnn Exp $ +# $NetBSD: builtin.mk,v 1.11 2019/11/03 10:39:06 rillig Exp $ BINUTILS_PREFIX?= /usr @@ -52,7 +52,7 @@ USE_BUILTIN.binutils= no . endfor . endif # PREFER.binutils .endif -MAKEVARS+= USE_BUILTIN.binutils +MAKEVARS+= USE_BUILTIN.binutils # if USE_BINUTILS is defined, then force the use of a true binutils # implementation. diff --git a/devel/boa-constructor/Makefile b/devel/boa-constructor/Makefile index df3a0c62e2d..b1645079d62 100644 --- a/devel/boa-constructor/Makefile +++ b/devel/boa-constructor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2019/09/02 13:19:39 adam Exp $ +# $NetBSD: Makefile,v 1.47 2019/11/03 10:39:06 rillig Exp $ VERSION= 0.6.1 DISTNAME= boa-constructor-${VERSION}.src @@ -24,7 +24,7 @@ SEDSUBSTS= -e "s|@PYTHONBIN@|${PYTHONBIN}|" SEDSUBSTS+= -e "s|@PREFIX@|${PREFIX}|" SEDSUBSTS+= -e "s|@VERSION@|${VERSION}|" -PYTHON_VERSIONS_ACCEPTED= 27 # py-wxWidgets +PYTHON_VERSIONS_ACCEPTED= 27 # py-wxWidgets REPLACE_PYTHON+= Boa.py REPLACE_PYTHON+= Examples/advanced/FramePanels/wxApp1.py diff --git a/devel/boost-build/Makefile b/devel/boost-build/Makefile index f6fbe896466..81062108065 100644 --- a/devel/boost-build/Makefile +++ b/devel/boost-build/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2018/04/29 20:41:11 adam Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/03 10:39:06 rillig Exp $ BOOST_PACKAGE= build BOOST_COMMENT= (Boost.Build framework) @@ -19,12 +19,12 @@ CONF_FILES= ${EGDIR}/site-config.jam \ ${PKG_SYSCONFDIR}/site-config.jam # contains /usr/bin/python -CHECK_INTERPRETER_SKIP= share/boost-build/example/customization/inline_file.py -CHECK_INTERPRETER_SKIP+=share/boost-build/tools/doxproc.py -CHECK_INTERPRETER_SKIP+=share/boost-build/test/*.py +CHECK_INTERPRETER_SKIP= share/boost-build/example/customization/inline_file.py +CHECK_INTERPRETER_SKIP+= share/boost-build/tools/doxproc.py +CHECK_INTERPRETER_SKIP+= share/boost-build/test/*.py # contains /bin/bash -CHECK_INTERPRETER_SKIP+=share/boost-build/nightly.sh -CHECK_INTERPRETER_SKIP+=share/boost-build/roll.sh +CHECK_INTERPRETER_SKIP+= share/boost-build/nightly.sh +CHECK_INTERPRETER_SKIP+= share/boost-build/roll.sh INSTALLATION_DIRS+= share/boost-build diff --git a/devel/boost-libs/Makefile b/devel/boost-libs/Makefile index 2ac5f0eb2cd..1ed50afb999 100644 --- a/devel/boost-libs/Makefile +++ b/devel/boost-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.76 2019/07/01 04:00:10 ryoon Exp $ +# $NetBSD: Makefile,v 1.77 2019/11/03 10:39:06 rillig Exp $ BOOST_PACKAGE= libs BOOST_COMMENT= (binary libraries) @@ -22,10 +22,10 @@ BJAM_ARGS+= --without-coroutine BJAM_ARGS+= --without-fiber .else PLIST.context= yes -.if !(${OPSYS} == "NetBSD" && !empty(PKGSRC_COMPILER:Mgcc)) && \ +. if !(${OPSYS} == "NetBSD" && !empty(PKGSRC_COMPILER:Mgcc)) && \ empty(MACHINE_PLATFORM:MDarwin-1[0-4].*-*) PLIST.fiber= yes -.endif +. endif .endif # Darwin GCC is unable to build Boost.Log diff --git a/devel/breezy/Makefile b/devel/breezy/Makefile index cbfc63bae4f..c2afd234296 100644 --- a/devel/breezy/Makefile +++ b/devel/breezy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2019/10/27 13:05:46 rhialto Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/03 10:39:07 rillig Exp $ DISTNAME= breezy-3.0.1 CATEGORIES= devel scm @@ -21,7 +21,7 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-testtools>=0:../../devel/py-testtools USE_TOOLS+= gmake msgfmt -PYTHON_VERSIONS_ACCEPTED= 38 37 36 35 34 33 +PYTHON_VERSIONS_ACCEPTED= 38 37 36 35 34 33 REPLACE_PYTHON+= breezy/git/bzr-receive-pack REPLACE_PYTHON+= breezy/git/bzr-upload-pack diff --git a/devel/bugzilla/Makefile b/devel/bugzilla/Makefile index 29bde471cf7..d59791ea9d1 100644 --- a/devel/bugzilla/Makefile +++ b/devel/bugzilla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2019/08/11 13:18:39 wiz Exp $ +# $NetBSD: Makefile,v 1.51 2019/11/03 10:39:07 rillig Exp $ DISTNAME= bugzilla-5.0.3 PKGREVISION= 2 @@ -117,8 +117,8 @@ INSTALLATION_DIRS+= ${BZDIR}/docs/en/html/api/Bugzilla INSTALLATION_DIRS+= ${BZDIR}/${i} .endfor -FILES_SUBST+= WWWGRP=${APACHE_GROUP} WWWOWN=${APACHE_USER} \ - BZDIR=${BZDIR} +FILES_SUBST+= WWWGRP=${APACHE_GROUP} WWWOWN=${APACHE_USER} \ + BZDIR=${BZDIR} do-configure: cd ${WRKSRC} && ./checksetup.pl diff --git a/devel/bugzilla/options.mk b/devel/bugzilla/options.mk index ac127e60aba..77f6671b204 100644 --- a/devel/bugzilla/options.mk +++ b/devel/bugzilla/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2017/03/17 16:26:30 mef Exp $ +# $NetBSD: options.mk,v 1.4 2019/11/03 10:39:07 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.bugzilla @@ -11,7 +11,7 @@ PKG_SUPPORTED_OPTIONS+= bugzilla-imagemagick bugzilla-patchviewer PKG_SUPPORTED_OPTIONS+= bugzilla-descriptions bugzilla-xmlrpc PKG_SUPPORTED_OPTIONS+= bugzilla-modperl radius PKG_SUPPORTED_OPTIONS+= mysql pgsql oracle ldap sqlite -PKG_SUGGESTED_OPTIONS= sqlite +PKG_SUGGESTED_OPTIONS= sqlite .include "../../mk/bsd.options.mk" diff --git a/devel/bzr-explorer/Makefile b/devel/bzr-explorer/Makefile index 023124d556c..1f83c5db709 100644 --- a/devel/bzr-explorer/Makefile +++ b/devel/bzr-explorer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2019/09/02 13:19:43 adam Exp $ +# $NetBSD: Makefile,v 1.23 2019/11/03 10:39:07 rillig Exp $ DISTNAME= bzr-explorer-${VER} PKGREVISION= 3 @@ -16,7 +16,7 @@ DEPENDS+= ${PYPKGPREFIX}-qt4>=4.4:../../x11/py-qt4 USE_TOOLS+= msgfmt -PYTHON_VERSIONS_ACCEPTED= 27 # qbzr +PYTHON_VERSIONS_ACCEPTED= 27 # qbzr EGG_NAME= ${DISTNAME:S/bzr-//} diff --git a/devel/bzr-gtk/Makefile b/devel/bzr-gtk/Makefile index fced3fd7971..3045a0c1c63 100644 --- a/devel/bzr-gtk/Makefile +++ b/devel/bzr-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2019/09/02 13:19:39 adam Exp $ +# $NetBSD: Makefile,v 1.29 2019/11/03 10:39:07 rillig Exp $ DISTNAME= bzr-gtk-${VER} PKGREVISION= 2 @@ -15,13 +15,13 @@ DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.8:../../x11/py-gtk2 DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo PYDISTUTILSPKG= yes -PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2 +PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2 REPLACE_PYTHON= create-credits.py info.py USE_TOOLS+= msgfmt # Insists on working X display, and fails anyway, so disable. -BZR_PLUGIN_TEST=no +BZR_PLUGIN_TEST= no .include "../../devel/bzr/plugin.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" diff --git a/devel/bzr-svn/Makefile b/devel/bzr-svn/Makefile index 2df63c3f8f4..af45a54136e 100644 --- a/devel/bzr-svn/Makefile +++ b/devel/bzr-svn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2019/09/02 13:19:41 adam Exp $ +# $NetBSD: Makefile,v 1.39 2019/11/03 10:39:07 rillig Exp $ DISTNAME= bzr-svn-${VER} PKGREVISION= 1 @@ -12,7 +12,7 @@ HOMEPAGE= http://wiki.bazaar.canonical.com/ForeignBranches/Subversion COMMENT= Foreign Subversion repository support for Bazaar LICENSE= gnu-gpl-v2 -REPLACE_PYTHON= info.py wiki.py +REPLACE_PYTHON= info.py wiki.py DEPENDS+= ${PYPKGPREFIX}-subvertpy>=0.8.8:../../devel/py-subvertpy DEPENDS= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 @@ -26,7 +26,7 @@ USE_LANGUAGES= #none #TEST_DEPENDS+= ${PYPKGPREFIX}-paramiko-[0-9]*:../../security/py-paramiko #TEST_TARGET= check-verbose -PYTHON_VERSIONS_ACCEPTED= 27 # py-subvertpy +PYTHON_VERSIONS_ACCEPTED= 27 # py-subvertpy .include "../../devel/bzr/plugin.mk" .include "../../lang/python/application.mk" diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile index 83abdccc146..455242235cf 100644 --- a/devel/bzr/Makefile +++ b/devel/bzr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2019/10/26 13:03:21 rhialto Exp $ +# $NetBSD: Makefile,v 1.76 2019/11/03 10:39:07 rillig Exp $ DISTNAME= bzr-2.7.0 CATEGORIES= devel scm @@ -17,12 +17,12 @@ USE_TOOLS+= gmake msgfmt PY_PATCHPLIST= yes PYDISTUTILSPKG= yes -PYTHON_VERSIONS_ACCEPTED= 27 # py-pyrex +PYTHON_VERSIONS_ACCEPTED= 27 # py-pyrex REPLACE_PYTHON= bzr bzrlib/weave.py -REPLACE_PYTHON+= bzrlib/patiencediff.py bzrlib/_patiencediff_py.py -REPLACE_PYTHON+= bzrlib/plugins/bash_completion/bashcomp.py -REPLACE_PYTHON+= bzrlib/tests/ssl_certs/create_ssls.py +REPLACE_PYTHON+= bzrlib/patiencediff.py bzrlib/_patiencediff_py.py +REPLACE_PYTHON+= bzrlib/plugins/bash_completion/bashcomp.py +REPLACE_PYTHON+= bzrlib/tests/ssl_certs/create_ssls.py .include "../../mk/bsd.prefs.mk" diff --git a/devel/bzrtools/Makefile b/devel/bzrtools/Makefile index caa295df8f6..baf2f0862c3 100644 --- a/devel/bzrtools/Makefile +++ b/devel/bzrtools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2019/09/02 13:19:38 adam Exp $ +# $NetBSD: Makefile,v 1.32 2019/11/03 10:39:07 rillig Exp $ PKGNAME= bzrtools-${VER} PKGREVISION= 1 @@ -12,7 +12,7 @@ HOMEPAGE= http://bazaar-vcs.org/BzrTools COMMENT= Collection of plugins for Bazaar LICENSE= gnu-gpl-v2 -REPLACE_PYTHON= check-release.py test.py +REPLACE_PYTHON= check-release.py test.py PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 2.5.0 WRKSRC= ${WRKDIR}/bzrtools diff --git a/devel/calltree-perl/Makefile b/devel/calltree-perl/Makefile index 639c7ec48fc..bb5ea8ccb7f 100644 --- a/devel/calltree-perl/Makefile +++ b/devel/calltree-perl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2019/08/11 13:18:39 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/03 10:39:07 rillig Exp $ DISTNAME= Calltree-perl_pl PKGNAME= calltree-perl-0.1 @@ -14,9 +14,9 @@ COMMENT= Static code analysis for perl script LICENSE= modified-bsd DEPENDS+= p5-Getopt-Long-[0-9]*:../../devel/p5-Getopt-Long -DEPENDS+= p5-GraphViz-[0-9]*:../../graphics/p5-GraphViz -DEPENDS+= p5-PPI-[0-9]*:../../devel/p5-PPI -DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1 +DEPENDS+= p5-GraphViz-[0-9]*:../../graphics/p5-GraphViz +DEPENDS+= p5-PPI-[0-9]*:../../devel/p5-PPI +DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1 REPLACE_PERL= ${DISTNAME} USE_TOOLS+= perl diff --git a/devel/cdk/builtin.mk b/devel/cdk/builtin.mk index 44cde5cbe84..b1ab7a3792d 100644 --- a/devel/cdk/builtin.mk +++ b/devel/cdk/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.5 2013/11/23 11:29:35 obache Exp $ +# $NetBSD: builtin.mk,v 1.6 2019/11/03 10:39:08 rillig Exp $ BUILTIN_PKG:= cdk @@ -34,9 +34,9 @@ USE_BUILTIN.cdk= yes . for _dep_ in ${BUILDLINK_API_DEPENDS.cdk} . if !empty(USE_BUILTIN.cdk:M[yY][eE][sS]) USE_BUILTIN.cdk!= \ - if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.cdk:Q}; then \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.cdk:Q}; then \ ${ECHO} yes; \ - else \ + else \ ${ECHO} no; \ fi . endif @@ -44,4 +44,4 @@ USE_BUILTIN.cdk!= \ . endif . endif # PREFER.cdk .endif -MAKEVARS+= USE_BUILTIN.cdk +MAKEVARS+= USE_BUILTIN.cdk diff --git a/devel/cgen/Makefile b/devel/cgen/Makefile index 0fbd5fa3180..e2f4ace21b4 100644 --- a/devel/cgen/Makefile +++ b/devel/cgen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/10/12 08:39:02 ryoon Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/03 10:39:08 rillig Exp $ DISTNAME= cgen-20131001 CATEGORIES= devel @@ -25,7 +25,7 @@ INFO_FILES= yes BUILD_TARGET= info INSTALL_TARGET= install-info -CGEN_DIR= share/cgen +CGEN_DIR= share/cgen INSTALLATION_DIRS+= ${CGEN_DIR}/cgen ${CGEN_DIR}/cpu post-install: diff --git a/devel/coccinelle/Makefile b/devel/coccinelle/Makefile index 8eafca5cc30..0741942b848 100644 --- a/devel/coccinelle/Makefile +++ b/devel/coccinelle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2019/04/25 07:32:43 maya Exp $ +# $NetBSD: Makefile,v 1.37 2019/11/03 10:39:08 rillig Exp $ DISTNAME= coccinelle-1.0.0-rc17 PKGNAME= ${DISTNAME:S/-rc/rc/} @@ -15,7 +15,7 @@ LICENSE= gnu-gpl-v2 BUILD_DEPENDS+= ocaml-findlib-[0-9]*:../../devel/ocaml-findlib # the current version rejects this package's .mly file -#DEPENDS+= menhir>=20071212:../../devel/menhir +#DEPENDS+= menhir>=20071212:../../devel/menhir CONFIGURE_ARGS+= --without-menhir --disable-menhirLib MAKE_JOBS_SAFE= no diff --git a/devel/coconut/Makefile b/devel/coconut/Makefile index aa778a8df83..684631bdfd0 100644 --- a/devel/coconut/Makefile +++ b/devel/coconut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.73 2019/07/21 22:24:36 wiz Exp $ +# $NetBSD: Makefile,v 1.74 2019/11/03 10:39:08 rillig Exp $ # DISTNAME= coconut-0.3.0 @@ -18,7 +18,7 @@ GNU_CONFIGURE= YES CPPFLAGS+= -I${PREFIX}/include/libxml2/libxml -DGL_GLEXT_LEGACY MAKE_ENV+= AM_MAKEFLAGS="am__depfiles_maybe=" -SUBST_CLASSES+= g_memmove +SUBST_CLASSES+= g_memmove SUBST_MESSAGE.g_memmove= Eliminating g_memmove. SUBST_STAGE.g_memmove= pre-configure SUBST_FILES.g_memmove= coconut/cmemalloc.m coconut/cstack.m \ diff --git a/devel/codeville/Makefile b/devel/codeville/Makefile index 026d4ae63e7..eeb3d7b3086 100644 --- a/devel/codeville/Makefile +++ b/devel/codeville/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2019/09/02 13:19:41 adam Exp $ +# $NetBSD: Makefile,v 1.36 2019/11/03 10:39:08 rillig Exp $ DISTNAME= Codeville-0.8.0 PKGNAME= codeville-0.8.0 @@ -11,8 +11,8 @@ HOMEPAGE= http://codeville.org/ COMMENT= Distributed revision control system LICENSE= modified-bsd -REPLACE_PYTHON= *.py -REPLACE_PYTHON+= */*.py +REPLACE_PYTHON= *.py +REPLACE_PYTHON+= */*.py PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 0.8.0 BUILD_DEFS+= VARBASE diff --git a/devel/cogito/Makefile b/devel/cogito/Makefile index e7f9b016147..e3477eb2dd7 100644 --- a/devel/cogito/Makefile +++ b/devel/cogito/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2019/08/11 13:18:40 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/03 10:39:08 rillig Exp $ DISTNAME= cogito-0.18.2 PKGREVISION= 11 @@ -36,7 +36,7 @@ REPLACE_PERL+= cg-Xfollowrenames # that grep accept -q and xargs accept -0 .if ${OPSYS} == "SunOS" -DEPENDS+= findutils>=4.1:../../sysutils/findutils +DEPENDS+= findutils>=4.1:../../sysutils/findutils TOOLS_PLATFORM.xargs= ${LOCALBASE}/bin/gxargs .endif diff --git a/devel/compiz-bcop/Makefile b/devel/compiz-bcop/Makefile index a38344df893..f7306af04fc 100644 --- a/devel/compiz-bcop/Makefile +++ b/devel/compiz-bcop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2014/01/01 11:52:11 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/03 10:39:08 rillig Exp $ # PKGVER= 0.8.8 @@ -18,10 +18,10 @@ USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes PKGCONFIG_OVERRIDE+= bcop.pc.in -DEPENDS+= getopt-[0-9]*:../../misc/getopt -REPLACE_BASH+= src/bcop.in +DEPENDS+= getopt-[0-9]*:../../misc/getopt +REPLACE_BASH+= src/bcop.in -SUBST_CLASSES+= getopt +SUBST_CLASSES+= getopt SUBST_STAGE.getopt= pre-configure SUBST_FILES.getopt= src/bcop.in SUBST_SED.getopt= -e "s|getopt|${PREFIX}/bin/getopt|" diff --git a/devel/concurrencykit/Makefile b/devel/concurrencykit/Makefile index 52036e30cf3..54ca4f20192 100644 --- a/devel/concurrencykit/Makefile +++ b/devel/concurrencykit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2016/08/10 23:44:10 mef Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/03 10:39:08 rillig Exp $ DISTNAME= ck-0.5.1 CATEGORIES= devel @@ -9,9 +9,9 @@ HOMEPAGE= http://concurrencykit.org/ COMMENT= Concurrency primitives, safe memory reclamation & non-blocking data structures LICENSE= 2-clause-bsd -HAS_CONFIGURE= yes +HAS_CONFIGURE= yes CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} -USE_TOOLS+= pkg-config +USE_TOOLS+= pkg-config PKGCONFIG_OVERRIDE+= build/ck.pc.in diff --git a/devel/cpuflags/Makefile b/devel/cpuflags/Makefile index 2a2b3dfe65c..53b2d5d60d3 100644 --- a/devel/cpuflags/Makefile +++ b/devel/cpuflags/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.155 2018/09/27 19:14:44 tnn Exp $ +# $NetBSD: Makefile,v 1.156 2019/11/03 10:39:08 rillig Exp $ DISTNAME= cpuflags-1.43 CATEGORIES= devel sysutils @@ -10,7 +10,7 @@ COMMENT= Determine compiler flags to best target current cpu LICENSE= 2-clause-bsd # each OS needs explicit support (files/subr_*) -ONLY_FOR_PLATFORM= NetBSD-*-* Linux-*-* SunOS-*-* FreeBSD-*-* Darwin-*-* +ONLY_FOR_PLATFORM= NetBSD-*-* Linux-*-* SunOS-*-* FreeBSD-*-* Darwin-*-* USE_LANGUAGES= # empty NO_CONFIGURE= yes diff --git a/devel/cre2/Makefile b/devel/cre2/Makefile index b2e2fa2c22b..3d31f6b5f51 100644 --- a/devel/cre2/Makefile +++ b/devel/cre2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2017/05/07 03:13:24 mef Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/03 10:39:09 rillig Exp $ VERSION= 0.3.4 DISTNAME= cre2-${VERSION} @@ -11,11 +11,11 @@ HOMEPAGE= https://github.com/google/re2 COMMENT= C wrapper for re2 regular expression library LICENSE= modified-bsd -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-maintainer-mode -USE_LIBTOOL= yes -USE_LANGUAGES+= c c++ -USE_TOOLS+= autoconf autoreconf automake gmake makeinfo +USE_LIBTOOL= yes +USE_LANGUAGES+= c c++ +USE_TOOLS+= autoconf autoreconf automake gmake makeinfo INFO_FILES= yes diff --git a/devel/cssc/Makefile b/devel/cssc/Makefile index b95c5493ad7..9623a8f4f89 100644 --- a/devel/cssc/Makefile +++ b/devel/cssc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2017/05/03 08:38:40 jperkin Exp $ +# $NetBSD: Makefile,v 1.36 2019/11/03 10:39:09 rillig Exp $ # DISTNAME= CSSC-1.4.0 @@ -11,12 +11,12 @@ HOMEPAGE= http://www.gnu.org/software/cssc/ COMMENT= GNU workalike for the source code control system SCCS LICENSE= gnu-gpl-v3 -USE_LANGUAGES= c c++11 -GNU_CONFIGURE= YES -CONFIGURE_ARGS+=--enable-binary -CONFIGURE_ENV+= CONFIG_DIFF_COMMAND=${TOOLS_DIFF:Q} -USE_TOOLS+= diff makeinfo -TEST_TARGET= check +USE_LANGUAGES= c c++11 +GNU_CONFIGURE= YES +CONFIGURE_ARGS+= --enable-binary +CONFIGURE_ENV+= CONFIG_DIFF_COMMAND=${TOOLS_DIFF:Q} +USE_TOOLS+= diff makeinfo +TEST_TARGET= check TEXINFO_REQD= 4.0 INFO_FILES= yes diff --git a/devel/ctemplate/Makefile b/devel/ctemplate/Makefile index 5817a96a4b8..2a1ac4f006f 100644 --- a/devel/ctemplate/Makefile +++ b/devel/ctemplate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2019/08/11 13:18:40 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/03 10:39:09 rillig Exp $ DISTNAME= ctemplate-2.3 PKGREVISION= 5 @@ -16,11 +16,11 @@ USE_LIBTOOL= yes USE_TOOLS+= perl GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE= libctemplate.pc -PKGCONFIG_OVERRIDE+= libctemplate_nothreads.pc -PKGCONFIG_OVERRIDE_STAGE=post-build -REPLACE_PERL= src/template-converter -REPLACE_PYTHON= src/htmlparser/generate_fsm.py +PKGCONFIG_OVERRIDE= libctemplate.pc +PKGCONFIG_OVERRIDE+= libctemplate_nothreads.pc +PKGCONFIG_OVERRIDE_STAGE= post-build +REPLACE_PERL= src/template-converter +REPLACE_PYTHON= src/htmlparser/generate_fsm.py # In Python 3.x, print is a function, not a statement: # print '\n'.join(...) diff --git a/devel/cutter/Makefile b/devel/cutter/Makefile index 2089007b5a4..e8fca8e04b9 100644 --- a/devel/cutter/Makefile +++ b/devel/cutter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2019/07/21 22:24:36 wiz Exp $ +# $NetBSD: Makefile,v 1.64 2019/11/03 10:39:09 rillig Exp $ # DISTNAME= cutter-1.2.4 @@ -11,10 +11,10 @@ HOMEPAGE= http://cutter.sourceforge.net/ COMMENT= Unit Testing Framework for C and C++ LICENSE= gnu-lgpl-v3 -GNU_CONFIGURE= yes -USE_LIBTOOL= yes -USE_TOOLS+= gmake intltool pkg-config xgettext msgmerge msgfmt -USE_LANGUAGES= c c++ +GNU_CONFIGURE= yes +USE_LIBTOOL= yes +USE_TOOLS+= gmake intltool pkg-config xgettext msgmerge msgfmt +USE_LANGUAGES= c c++ USE_PKGLOCALEDIR= yes PKGCONFIG_OVERRIDE+= cppcutter.pc.in diff --git a/devel/cutter/options.mk b/devel/cutter/options.mk index 461e3446735..392aa5bb596 100644 --- a/devel/cutter/options.mk +++ b/devel/cutter/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.4 2015/06/07 14:16:01 youri Exp $ +# $NetBSD: options.mk,v 1.5 2019/11/03 10:39:09 rillig Exp $ # -PKG_OPTIONS_VAR= PKG_OPTIONS.cutter +PKG_OPTIONS_VAR= PKG_OPTIONS.cutter PKG_SUPPORTED_OPTIONS= goffice gstreamer gtk2 libsoup pdf PKG_SUGGESTED_OPTIONS= # diff --git a/devel/cvs2svn/Makefile b/devel/cvs2svn/Makefile index a80c3aa9158..b203c96fb56 100644 --- a/devel/cvs2svn/Makefile +++ b/devel/cvs2svn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2019/09/02 13:19:36 adam Exp $ +# $NetBSD: Makefile,v 1.40 2019/11/03 10:39:09 rillig Exp $ DISTNAME= cvs2svn-2.3.0 PKGREVISION= 3 @@ -13,12 +13,12 @@ DEPENDS+= subversion-base-[0-9]*:../../devel/subversion-base CONFLICTS+= py*-subversion<1.0.1 -PYDISTUTILSPKG= yes -REPLACE_PYTHON= run-tests.py cvs2svn_rcsparse/run-tests.py \ - cvs2svn_rcsparse/parse_rcs_file.py +PYDISTUTILSPKG= yes +REPLACE_PYTHON= run-tests.py cvs2svn_rcsparse/run-tests.py \ + cvs2svn_rcsparse/parse_rcs_file.py PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 2.3.0 -#USE_TOOLS+= gtar -#EXTRACT_USING= gtar +#USE_TOOLS+= gtar +#EXTRACT_USING= gtar # XXX cvs2svn depends on sort(1) with '-T' option. A dependency and a patch # to resort on GNU sort from coreutils may be required. diff --git a/devel/cvsd/Makefile b/devel/cvsd/Makefile index 8459e3efceb..29cd821d3c0 100644 --- a/devel/cvsd/Makefile +++ b/devel/cvsd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2019/08/11 13:18:41 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/03 10:39:09 rillig Exp $ DISTNAME= cvsd-1.0.23 PKGREVISION= 9 @@ -11,7 +11,7 @@ COMMENT= Run CVS pserver in a chroot-ed environment LICENSE= gnu-gpl-v2 .if !exists(/usr/bin/cvs) -DEPENDS+= cvs>=1.11:../../devel/scmcvs +DEPENDS+= cvs>=1.11:../../devel/scmcvs .endif USE_TOOLS+= gmake perl diff --git a/devel/cvsync/Makefile b/devel/cvsync/Makefile index df18eee35bc..559051355c9 100644 --- a/devel/cvsync/Makefile +++ b/devel/cvsync/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.97 2018/02/25 16:04:01 wiz Exp $ +# $NetBSD: Makefile,v 1.98 2019/11/03 10:39:09 rillig Exp $ DISTNAME= cvsync-0.24.19 PKGREVISION= 9 @@ -9,8 +9,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://www.cvsync.org/ COMMENT= Portable incremental cvs repository syncer -USE_TOOLS+= gmake -USE_LANGUAGES= c99 +USE_TOOLS+= gmake +USE_LANGUAGES= c99 INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/examples/cvsync MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} BINMODE=${BINMODE:Q} diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile index 0aab36dfac4..9516ae6c8c3 100644 --- a/devel/ddd/Makefile +++ b/devel/ddd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.79 2017/08/11 22:17:34 maya Exp $ +# $NetBSD: Makefile,v 1.80 2019/11/03 10:39:09 rillig Exp $ # DISTNAME= ddd-3.3.12 @@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.gnu.org/software/ddd/ COMMENT= Data Display Debugger -- graphical front-end for GDB/DBX/XDB -LICENSE= gnu-gpl-v3 +LICENSE= gnu-gpl-v3 GNU_CONFIGURE= YES INFO_FILES= YES # PLIST @@ -24,7 +24,7 @@ CONFIGURE_ENV+= COMPFACE=${FALSE:Q} .include "../../mk/bsd.prefs.mk" -INSTALLATION_DIRS+= share/doc/ddd +INSTALLATION_DIRS+= share/doc/ddd # Default paper size is A4 .if !empty(PAPERSIZE:MLetter*) diff --git a/devel/delta/Makefile b/devel/delta/Makefile index a29028a345b..ab0399b9c34 100644 --- a/devel/delta/Makefile +++ b/devel/delta/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2019/08/11 13:18:41 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2019/11/03 10:39:09 rillig Exp $ DISTNAME= delta-2006.08.03 PKGREVISION= 8 @@ -10,9 +10,9 @@ HOMEPAGE= http://delta.tigris.org/ COMMENT= Heuristically minimizes interesting files LICENSE= 2-clause-bsd -USE_TOOLS+= gmake perl:run -REPLACE_PERL= delta multidelta -INSTALLATION_DIRS= bin +USE_TOOLS+= gmake perl:run +REPLACE_PERL= delta multidelta +INSTALLATION_DIRS= bin do-install: ${INSTALL_SCRIPT} ${WRKSRC}/delta ${DESTDIR}${PREFIX}/bin/delta diff --git a/devel/diffuse/Makefile b/devel/diffuse/Makefile index ceafd696f03..d3275e725e7 100644 --- a/devel/diffuse/Makefile +++ b/devel/diffuse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2019/09/02 13:19:38 adam Exp $ +# $NetBSD: Makefile,v 1.44 2019/11/03 10:39:10 rillig Exp $ DISTNAME= diffuse-0.4.8 PKGREVISION= 1 @@ -12,7 +12,7 @@ COMMENT= Graphical tool for merging and comparing text files LICENSE= gnu-gpl-v2 DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.10:../../x11/py-gtk2 -PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2 +PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2 USE_TOOLS+= msgfmt USE_LANGUAGES= # none diff --git a/devel/dlcompat/builtin.mk b/devel/dlcompat/builtin.mk index 12d66b98c36..a8b21274f89 100644 --- a/devel/dlcompat/builtin.mk +++ b/devel/dlcompat/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.10 2013/11/23 11:29:35 obache Exp $ +# $NetBSD: builtin.mk,v 1.11 2019/11/03 10:39:10 rillig Exp $ BUILTIN_PKG:= dlcompat @@ -19,7 +19,7 @@ IS_BUILTIN.dlcompat= no IS_BUILTIN.dlcompat= yes . endif .endif -MAKEVARS+= IS_BUILTIN.dlcompat +MAKEVARS+= IS_BUILTIN.dlcompat ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -32,7 +32,7 @@ MAKEVARS+= IS_BUILTIN.dlcompat # XXX BUILTIN_PKG.dlcompat= dlcompat-20030629 .endif -MAKEVARS+= BUILTIN_PKG.dlcompat +MAKEVARS+= BUILTIN_PKG.dlcompat ### ### Determine whether we should use the built-in implementation if it @@ -59,4 +59,4 @@ USE_BUILTIN.dlcompat!= \ . endif . endif # PREFER.dlcompat .endif -MAKEVARS+= USE_BUILTIN.dlcompat +MAKEVARS+= USE_BUILTIN.dlcompat diff --git a/devel/dmalloc/Makefile b/devel/dmalloc/Makefile index 9f120e2546e..a04c9420df1 100644 --- a/devel/dmalloc/Makefile +++ b/devel/dmalloc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2012/10/31 11:16:53 asau Exp $ +# $NetBSD: Makefile,v 1.23 2019/11/03 10:39:10 rillig Exp $ DISTNAME= dmalloc-5.5.2 CATEGORIES= devel @@ -20,8 +20,8 @@ CONFIGURE_ARGS+= --enable-threads CONFIGURE_ARGS+= --enable-cxx INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} -INSTALL_TARGET= install installcxx -TEST_TARGET= heavy +INSTALL_TARGET= install installcxx +TEST_TARGET= heavy .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/doc++/Makefile b/devel/doc++/Makefile index c17a1226d67..7a6bb0c81b2 100644 --- a/devel/doc++/Makefile +++ b/devel/doc++/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.23 2012/10/31 11:16:54 asau Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/03 10:39:10 rillig Exp $ -DISTNAME= doc++-3.4.10 +DISTNAME= doc++-3.4.10 PKGREVISION= 3 -CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=docpp/} +CATEGORIES= devel +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=docpp/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://docpp.sourceforge.net/ @@ -16,7 +16,7 @@ USE_LANGUAGES= c c++ LIBS.SunOS+= -lintl -INSTALLATION_DIRS+= share/doc/doc++ +INSTALLATION_DIRS+= share/doc/doc++ #post-extract: # ${RM} ${WRKSRC}/src/getopt.h diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile index 0c332d315d2..28dad5b1616 100644 --- a/devel/doxygen/Makefile +++ b/devel/doxygen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.140 2019/10/17 20:35:58 adam Exp $ +# $NetBSD: Makefile,v 1.141 2019/11/03 10:39:10 rillig Exp $ DISTNAME= doxygen-1.8.16.src PKGNAME= ${DISTNAME:S/.src//} @@ -38,13 +38,13 @@ SUBST_SED.epstopdf= -e 's,"epstopdf","${PREFIX}/bin/epstopdf",g' # Fixing $PWD / $(PWD) / $(HOME) for documentation # The dollar sign should be inserted literally in the documentation # doxygen always inserted the path => Completely remove dollar sign -SUBST_CLASSES+= changelog -SUBST_STAGE.changelog= pre-configure -SUBST_MESSAGE.changelog=Fixing dollar sign for documentation -SUBST_FILES.changelog= doc/changelog.doc -SUBST_SED.changelog= -e 's,$$PWD,PWD,g' -SUBST_SED.changelog+= -e 's,$$(PWD,(PWD,g' -SUBST_SED.changelog+= -e 's,$$(HOME,(HOME,g' +SUBST_CLASSES+= changelog +SUBST_STAGE.changelog= pre-configure +SUBST_MESSAGE.changelog= Fixing dollar sign for documentation +SUBST_FILES.changelog= doc/changelog.doc +SUBST_SED.changelog= -e 's,$$PWD,PWD,g' +SUBST_SED.changelog+= -e 's,$$(PWD,(PWD,g' +SUBST_SED.changelog+= -e 's,$$(HOME,(HOME,g' .include "../../mk/bsd.prefs.mk" diff --git a/devel/eclipse/Makefile b/devel/eclipse/Makefile index 2f0e739a4bd..4233a429483 100644 --- a/devel/eclipse/Makefile +++ b/devel/eclipse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2019/05/02 08:36:10 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2019/11/03 10:39:10 rillig Exp $ DISTNAME= ${PKGNAME_NOREV} PKGNAME= eclipse-${VERSION} @@ -15,7 +15,7 @@ LICENSE= eclipse-license DEPENDS+= apache-ant>=1.4.1:../../devel/apache-ant USE_TOOLS+= unzip zip -PKG_JVMS_ACCEPTED= sun-jdk7 +PKG_JVMS_ACCEPTED= sun-jdk7 MAKE_ENV+= JAVA_HOME=${PKG_JAVA_HOME:Q} MAKE_ENV+= ANT_HOME=${PREFIX:Q} @@ -61,7 +61,7 @@ do-install: # resistance, since replacing it after install is problematic and # replacing it before install is even more problematic. XXX. # -CHECK_INTERPRETER_SKIP+=eclipse/plugins/org.apache.ant_1.6.2/bin/antRun.pl +CHECK_INTERPRETER_SKIP+= eclipse/plugins/org.apache.ant_1.6.2/bin/antRun.pl .include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/editline/builtin.mk b/devel/editline/builtin.mk index 2c2fe7e4e60..ba9fa13e503 100644 --- a/devel/editline/builtin.mk +++ b/devel/editline/builtin.mk @@ -1,11 +1,11 @@ -# $NetBSD: builtin.mk,v 1.8 2015/04/09 09:55:58 tron Exp $ +# $NetBSD: builtin.mk,v 1.9 2019/11/03 10:39:10 rillig Exp $ BUILTIN_PKG:= editline -BUILTIN_FIND_LIBS:= edit -BUILTIN_FIND_HEADERS_VAR:= H_EDITLINE -BUILTIN_FIND_HEADERS.H_EDITLINE=editline/readline.h \ - readline/readline.h +BUILTIN_FIND_LIBS:= edit +BUILTIN_FIND_HEADERS_VAR:= H_EDITLINE +BUILTIN_FIND_HEADERS.H_EDITLINE= editline/readline.h \ + readline/readline.h .include "../../mk/buildlink3/bsd.builtin.mk" @@ -20,7 +20,7 @@ IS_BUILTIN.editline= no IS_BUILTIN.editline= yes . endif .endif -MAKEVARS+= IS_BUILTIN.editline +MAKEVARS+= IS_BUILTIN.editline ### ### Determine whether we should use the built-in implementation if it @@ -35,7 +35,7 @@ USE_BUILTIN.editline= ${IS_BUILTIN.editline} !empty(IS_BUILTIN.editline:M[yY][eE][sS]) USE_BUILTIN.editline= yes . endif -MAKEVARS+= USE_BUILTIN.editline +MAKEVARS+= USE_BUILTIN.editline . endif .endif diff --git a/devel/editorconfig-core/Makefile b/devel/editorconfig-core/Makefile index 2ad192af4ea..c5af4f9793e 100644 --- a/devel/editorconfig-core/Makefile +++ b/devel/editorconfig-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2017/05/28 19:59:04 nros Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/03 10:39:10 rillig Exp $ DISTNAME= editorconfig-core-c-0.12.1 PKGNAME= ${DISTNAME:S/c-//} @@ -10,7 +10,7 @@ HOMEPAGE= http://www.editorconfig.org/ COMMENT= Editorconfig C library LICENSE= 2-clause-bsd -USE_CMAKE= yes +USE_CMAKE= yes .include "options.mk" .include "../../devel/pcre/buildlink3.mk" diff --git a/devel/editorconfig-core/options.mk b/devel/editorconfig-core/options.mk index b80396eecd5..a8ce0413125 100644 --- a/devel/editorconfig-core/options.mk +++ b/devel/editorconfig-core/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2017/05/28 19:43:46 nros Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/03 10:39:10 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.editorconfig-core PKG_SUPPORTED_OPTIONS= doc PKG_SUGGESTED_OPTIONS= @@ -10,9 +10,9 @@ PLIST_VARS+= doc ### Build and install html documentation and man pages ### .if !empty(PKG_OPTIONS:Mdoc) -BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen +BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen CMAKE_ARGS+= -DBUILD_DOCUMENTATION=ON -CMAKE_ARGS+= -DINSTALL_HTML_DOC=ON +CMAKE_ARGS+= -DINSTALL_HTML_DOC=ON PLIST.doc= yes .else CMAKE_ARGS+= -DBUILD_DOCUMENTATION=OFF diff --git a/devel/fann/Makefile b/devel/fann/Makefile index 999228ca96f..0bf8d08093e 100644 --- a/devel/fann/Makefile +++ b/devel/fann/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2015/02/28 23:43:01 joerg Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/03 10:39:10 rillig Exp $ PKGREVISION= 1 @@ -11,9 +11,9 @@ LICENSE= gnu-lgpl-v2.1 USE_TOOLS+= cmake USE_CMAKE= yes -USE_LANGUAGES+= c99 +USE_LANGUAGES+= c99 # Perhaps not, but cmake complains -USE_LANGUAGES+= c++ +USE_LANGUAGES+= c++ USE_TOOLS+= pkg-config PKGCONFIG_OVERRIDE+= fann.pc.in diff --git a/devel/flim/Makefile b/devel/flim/Makefile index dae0e1ef821..a54ca37a72d 100644 --- a/devel/flim/Makefile +++ b/devel/flim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2017/04/18 16:26:45 jperkin Exp $ +# $NetBSD: Makefile,v 1.40 2019/11/03 10:39:11 rillig Exp $ DISTNAME= flim-1.14.9 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -32,8 +32,8 @@ MAKEFLAGS.emacs+= EMACS=${EMACS_BIN} MAKEFLAGS.xemacs+= XEMACS=${EMACS_BIN} \ PACKAGEDIR=${EMACS_LISPPREFIX:C|/lisp$||} -EMACS_MODULES= base -EMACS_BUILDLINK=# defined +EMACS_MODULES= base +EMACS_BUILDLINK= # defined post-build: @cd ${WRKSRC}; for i in mime-en mime-ja; do \ diff --git a/devel/fossil/Makefile b/devel/fossil/Makefile index 9ccc1b9059a..4a240aa8979 100644 --- a/devel/fossil/Makefile +++ b/devel/fossil/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2019/10/05 20:53:01 gutteridge Exp $ +# $NetBSD: Makefile,v 1.53 2019/11/03 10:39:11 rillig Exp $ PKGREVISION= 1 DISTNAME= fossil-src-2.10 @@ -12,7 +12,7 @@ HOMEPAGE= http://www.fossil-scm.org/ COMMENT= High-reliability, distributed software configuration management LICENSE= 2-clause-bsd -HAS_CONFIGURE= yes +HAS_CONFIGURE= yes CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl:Q} CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib:Q} diff --git a/devel/frink/Makefile b/devel/frink/Makefile index deccef4e060..341a7d07fe5 100644 --- a/devel/frink/Makefile +++ b/devel/frink/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2014/02/09 12:23:35 obache Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/03 10:39:11 rillig Exp $ DISTNAME= frink-2.2.2p4 CATEGORIES= devel @@ -9,7 +9,7 @@ HOMEPAGE= http://catless.ncl.ac.uk/Programs/Frink/ COMMENT= Tcl formatting and static syntax check program LICENSE= frink-license -RESTRICTED= For commercial use please contact the author. +RESTRICTED= For commercial use please contact the author. NO_BIN_ON_CDROM= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} diff --git a/devel/ftnchek/Makefile b/devel/ftnchek/Makefile index c1fe355d454..16b96541883 100644 --- a/devel/ftnchek/Makefile +++ b/devel/ftnchek/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2019/07/08 10:36:25 nia Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/03 10:39:11 rillig Exp $ DISTNAME= ftnchek-3.3.1 CATEGORIES= devel @@ -8,9 +8,9 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://www.dsm.fordham.edu/~ftnchek/ COMMENT= Static analyzer for Fortran programs -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes GNU_CONFIGURE_LIBDIR= ${PREFIX}/libexec -CONFIGURE_ARGS+=--disable-submodel +CONFIGURE_ARGS+= --disable-submodel USE_TOOLS+= soelim diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile index 93c85f280a1..87ed7c740da 100644 --- a/devel/gcvs/Makefile +++ b/devel/gcvs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2019/08/11 13:18:42 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2019/11/03 10:39:11 rillig Exp $ DISTNAME= gcvs-1.0 PKGREVISION= 14 @@ -13,9 +13,9 @@ COMMENT= GTK interface for CVS CONFLICTS= cvs-[0-9]* -USE_LANGUAGES= c c++ -USE_TOOLS+= gmake makeinfo perl:run -GNU_CONFIGURE= yes +USE_LANGUAGES= c c++ +USE_TOOLS+= gmake makeinfo perl:run +GNU_CONFIGURE= yes INFO_FILES= yes CONFIGURE_ARGS+= --with-tclinclude="${BUILDLINK_PREFIX.tcl}/include" diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile index c979402fac6..66c012ded12 100644 --- a/devel/gdb/Makefile +++ b/devel/gdb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2019/08/11 13:18:42 wiz Exp $ +# $NetBSD: Makefile,v 1.64 2019/11/03 10:39:11 rillig Exp $ DISTNAME= gdb-8.1 PKGREVISION= 4 @@ -13,15 +13,15 @@ LICENSE= gnu-gpl-v3 USE_LANGUAGES= c c++11 BROKEN_GETTEXT_DETECTION= yes -GNU_CONFIGURE= YES -USE_PKGLOCALEDIR= YES -USE_LIBTOOL= YES -USE_TOOLS+= gmake msgfmt makeinfo perl:build +GNU_CONFIGURE= YES +USE_PKGLOCALEDIR= YES +USE_LIBTOOL= YES +USE_TOOLS+= gmake msgfmt makeinfo perl:build REPLACE_LOCALEDIR_PATTERNS+= Make-in -INSTALL_TARGET= install install-info -TEST_TARGET= check -INFO_FILES= yes -CONFIGURE_ENV+= CONFIG_LDFLAGS=${LDFLAGS:M*:Q} +INSTALL_TARGET= install install-info +TEST_TARGET= check +INFO_FILES= yes +CONFIGURE_ENV+= CONFIG_LDFLAGS=${LDFLAGS:M*:Q} # In gdb/configure, depcomp is parsed with sed. SUBST_CLASSES+= fix-depcomp @@ -67,7 +67,7 @@ TARGET_STR= ${MACHINE_ARCH}--dragonfly BUILD_DEFS+= ${TARGET_STR} ## Remove "-pc" string, without this, getting following message: ## *** Gdb does not support native target i386-pc-dragonfly" -CONFIGURE_ARGS+= --target=${TARGET_STR} +CONFIGURE_ARGS+= --target=${TARGET_STR} TEST_ENV= DEJAGNU=${WRKDIR}/../files/dragonfly-default.exp .endif diff --git a/devel/gdb7/Makefile b/devel/gdb7/Makefile index b3f7ac8877b..d9903517de4 100644 --- a/devel/gdb7/Makefile +++ b/devel/gdb7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2019/08/11 13:18:42 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2019/11/03 10:39:11 rillig Exp $ DISTNAME= gdb-7.11 PKGREVISION= 6 @@ -11,15 +11,15 @@ COMMENT= Symbolic debugger for multiple language frontends LICENSE= gnu-gpl-v3 BROKEN_GETTEXT_DETECTION= yes -GNU_CONFIGURE= YES -USE_PKGLOCALEDIR= YES -USE_LIBTOOL= YES -USE_TOOLS+= gmake msgfmt makeinfo perl:build +GNU_CONFIGURE= YES +USE_PKGLOCALEDIR= YES +USE_LIBTOOL= YES +USE_TOOLS+= gmake msgfmt makeinfo perl:build REPLACE_LOCALEDIR_PATTERNS+= Make-in -INSTALL_TARGET= install install-info -TEST_TARGET= check -INFO_FILES= yes -CONFIGURE_ENV+= CONFIG_LDFLAGS=${LDFLAGS:M*:Q} +INSTALL_TARGET= install install-info +TEST_TARGET= check +INFO_FILES= yes +CONFIGURE_ENV+= CONFIG_LDFLAGS=${LDFLAGS:M*:Q} # In gdb/configure, depcomp is parsed with sed. SUBST_CLASSES+= fix-depcomp @@ -50,7 +50,7 @@ TARGET_STR= ${MACHINE_ARCH}--dragonfly BUILD_DEFS+= ${TARGET_STR} ## Remove "-pc" string, without this, getting following message: ## *** Gdb does not support native target i386-pc-dragonfly" -CONFIGURE_ARGS+= --target=${TARGET_STR} +CONFIGURE_ARGS+= --target=${TARGET_STR} TEST_ENV= DEJAGNU=${WRKDIR}/../files/dragonfly-default.exp .endif diff --git a/devel/gearmand/Makefile b/devel/gearmand/Makefile index d147dad009c..0079638d0f4 100644 --- a/devel/gearmand/Makefile +++ b/devel/gearmand/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.41 2019/08/22 12:23:00 ryoon Exp $ +# $NetBSD: Makefile,v 1.42 2019/11/03 10:39:11 rillig Exp $ DISTNAME= gearmand-1.1.18 PKGREVISION= 6 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GITHUB:=gearman/} -GITHUB_PROJECT= gearmand -GITHUB_RELEASE= ${PKGVERSION_NOREV} +GITHUB_PROJECT= gearmand +GITHUB_RELEASE= ${PKGVERSION_NOREV} MAINTAINER= fhajny@NetBSD.org HOMEPAGE= http://gearman.org/ diff --git a/devel/gettext-lib/Makefile b/devel/gettext-lib/Makefile index e058ba3930e..7ed4cffb14a 100644 --- a/devel/gettext-lib/Makefile +++ b/devel/gettext-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2019/04/28 18:33:57 rillig Exp $ +# $NetBSD: Makefile,v 1.59 2019/11/03 10:39:12 rillig Exp $ .include "../../devel/gettext/Makefile.common" @@ -19,7 +19,7 @@ CFLAGS.gnu-iconv+= -DHAVE_GNU_ICONV INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} localedir=${EGDIR} INSTALL_MAKE_FLAGS+= includedir=${PREFIX}/include/gettext -#CONFIGURE_DIRS= gettext-runtime +#CONFIGURE_DIRS= gettext-runtime BUILD_DIRS= gettext-runtime/intl EGDIR= ${PREFIX}/share/examples/gettext LOCALEDIR= ${PREFIX}/${PKGLOCALEDIR}/locale diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk index d8550227764..79f625ff658 100644 --- a/devel/gettext-lib/buildlink3.mk +++ b/devel/gettext-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.39 2019/06/18 10:36:04 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.40 2019/11/03 10:39:12 rillig Exp $ BUILDLINK_TREE+= gettext @@ -33,10 +33,10 @@ CHECK_BUILTIN.gettext:= no # A built-in gettext is always going to use a built-in iconv. .if !empty(USE_BUILTIN.gettext:M[yY][eE][sS]) -USE_BUILTIN.iconv= yes +USE_BUILTIN.iconv= yes .else -#BUILDLINK_INCDIRS.gettext+= include/gettext -BUILDLINK_FNAME_TRANSFORM.gettext+= -e 's|include/gettext/|include/|' +#BUILDLINK_INCDIRS.gettext+= include/gettext +BUILDLINK_FNAME_TRANSFORM.gettext+= -e 's|include/gettext/|include/|' .endif .include "../../converters/libiconv/buildlink3.mk" diff --git a/devel/gettext-lib/builtin.mk b/devel/gettext-lib/builtin.mk index 272ab903ec2..1f42c7d777c 100644 --- a/devel/gettext-lib/builtin.mk +++ b/devel/gettext-lib/builtin.mk @@ -1,21 +1,21 @@ -# $NetBSD: builtin.mk,v 1.47 2019/10/30 14:43:20 triaxx Exp $ +# $NetBSD: builtin.mk,v 1.48 2019/11/03 10:39:12 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" BUILTIN_PKG:= gettext -BUILTIN_FIND_LIBS:= intl -BUILTIN_FIND_HEADERS_VAR:= H_GETTEXT H_GENTOO_GETTEXT \ - H_NGETTEXT_GETTEXT \ - H_OPNSVR5_GETTEXT -BUILTIN_FIND_HEADERS.H_GETTEXT= libintl.h -BUILTIN_FIND_GREP.H_GETTEXT= \#define[ ]*__USE_GNU_GETTEXT -BUILTIN_FIND_HEADERS.H_GENTOO_GETTEXT= libintl.h -BUILTIN_FIND_GREP.H_GENTOO_GETTEXT= gentoo-multilib/.*/libintl.h -BUILTIN_FIND_HEADERS.H_NGETTEXT_GETTEXT=libintl.h -BUILTIN_FIND_GREP.H_NGETTEXT_GETTEXT= char.*ngettext -BUILTIN_FIND_HEADERS.H_OPNSVR5_GETTEXT= libintl.h -BUILTIN_FIND_GREP.H_OPNSVR5_GETTEXT= libgnuintl.h +BUILTIN_FIND_LIBS:= intl +BUILTIN_FIND_HEADERS_VAR:= H_GETTEXT H_GENTOO_GETTEXT \ + H_NGETTEXT_GETTEXT \ + H_OPNSVR5_GETTEXT +BUILTIN_FIND_HEADERS.H_GETTEXT= libintl.h +BUILTIN_FIND_GREP.H_GETTEXT= \#define[ ]*__USE_GNU_GETTEXT +BUILTIN_FIND_HEADERS.H_GENTOO_GETTEXT= libintl.h +BUILTIN_FIND_GREP.H_GENTOO_GETTEXT= gentoo-multilib/.*/libintl.h +BUILTIN_FIND_HEADERS.H_NGETTEXT_GETTEXT= libintl.h +BUILTIN_FIND_GREP.H_NGETTEXT_GETTEXT= char.*ngettext +BUILTIN_FIND_HEADERS.H_OPNSVR5_GETTEXT= libintl.h +BUILTIN_FIND_GREP.H_OPNSVR5_GETTEXT= libgnuintl.h .include "../../mk/buildlink3/bsd.builtin.mk" @@ -48,7 +48,7 @@ IS_BUILTIN.gettext= no IS_BUILTIN.gettext= yes . endif .endif -MAKEVARS+= IS_BUILTIN.gettext +MAKEVARS+= IS_BUILTIN.gettext ### ### Determine whether we should use the built-in implementation if it @@ -86,7 +86,7 @@ USE_BUILTIN.gettext= no . endfor . endif # PREFER.gettext .endif -MAKEVARS+= USE_BUILTIN.gettext +MAKEVARS+= USE_BUILTIN.gettext # Define BUILTIN_LIBNAME.gettext to be the base name of the built-in # gettext library. @@ -123,7 +123,7 @@ BUILDLINK_TRANSFORM+= rm:-lintl . if !empty(BUILTIN_LIB_FOUND.intl:M[yY][eE][sS]) CONFIGURE_ENV+= gt_cv_func_gnugettext_libintl="yes" CONFIGURE_ENV+= gt_cv_func_gnugettext1_libintl="yes" -. if empty(H_NGETTEXT_GETTEXT:M__nonexistent__) && \ +. if empty(H_NGETTEXT_GETTEXT:M__nonexistent__) && \ empty(H_NGETTEXT_GETTEXT:M${LOCALBASE}/*) CONFIGURE_ENV+= gt_cv_func_gnugettext2_libintl="yes" . endif diff --git a/devel/gettext-m4/Makefile b/devel/gettext-m4/Makefile index 255844f8be4..f339703af34 100644 --- a/devel/gettext-m4/Makefile +++ b/devel/gettext-m4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2019/05/27 13:21:41 ryoon Exp $ +# $NetBSD: Makefile,v 1.25 2019/11/03 10:39:12 rillig Exp $ .include "../../devel/gettext/Makefile.common" @@ -19,11 +19,11 @@ do-install: ${DESTDIR}${PREFIX}/share/aclocal ${INSTALL_DATA} ${WRKSRC}/gettext-tools/m4/*.m4 \ ${DESTDIR}${PREFIX}/share/aclocal -. for i in lib-ld.m4 lib-link.m4 lib-prefix.m4 extern-inline.m4 \ +.for i in lib-ld.m4 lib-link.m4 lib-prefix.m4 extern-inline.m4 \ lock.m4 longlong.m4 lcmessage.m4 threadlib.m4 wchar_t.m4 \ wint_t.m4 codeset.m4 ${INSTALL_DATA} ${WRKSRC}/gettext-tools/gnulib-m4/${i} \ ${DESTDIR}${PREFIX}/share/aclocal -. endfor +.endfor .include "../../mk/bsd.pkg.mk" diff --git a/devel/gettext-tools/Makefile b/devel/gettext-tools/Makefile index 1da948aadcc..c72372a9d1a 100644 --- a/devel/gettext-tools/Makefile +++ b/devel/gettext-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2019/06/04 17:22:22 nia Exp $ +# $NetBSD: Makefile,v 1.39 2019/11/03 10:39:12 rillig Exp $ .include "../../devel/gettext/Makefile.common" @@ -30,7 +30,7 @@ SHLIBTOOL_OVERRIDE= # empty INFO_FILES= yes BROKEN_GETTEXT_DETECTION= yes -USE_BUILTIN.gettext= no # force use of pkgsrc gettext-lib +USE_BUILTIN.gettext= no # force use of pkgsrc gettext-lib BUILDLINK_TRANSFORM.Cygwin+= rm:-Wl,--disable-auto-import diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile index 9d070be0b62..a11ca90ea05 100644 --- a/devel/gettext/Makefile +++ b/devel/gettext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.85 2019/05/27 13:21:41 ryoon Exp $ +# $NetBSD: Makefile,v 1.86 2019/11/03 10:39:11 rillig Exp $ .include "../../devel/gettext/Makefile.common" @@ -24,7 +24,7 @@ INSTALLATION_DIRS+= lib TEST_TARGET= check BROKEN_GETTEXT_DETECTION= yes -USE_BUILTIN.gettext= no # force use of pkgsrc gettext-lib +USE_BUILTIN.gettext= no # force use of pkgsrc gettext-lib .include "../../mk/bsd.prefs.mk" diff --git a/devel/git-docs/Makefile b/devel/git-docs/Makefile index 61c09436931..2e1b4c09966 100644 --- a/devel/git-docs/Makefile +++ b/devel/git-docs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2019/08/20 13:00:02 adam Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/03 10:39:12 rillig Exp $ PKGNAME= git-docs-${GIT_VERSION} COMMENT= GIT Tree History Storage Tool (documentation) @@ -11,7 +11,7 @@ DISTINFO_FILE= ../../devel/git-base/distinfo BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto -USE_TOOLS+= perl +USE_TOOLS+= perl CONFIGURE_ARGS+= --with-perl=${PERL5:Q} MAKE_FLAGS+= INSTALL=${INSTALL:Q} BUILD_TARGET= man diff --git a/devel/git-gitk/Makefile b/devel/git-gitk/Makefile index be2f19ebecb..d2982f3d297 100644 --- a/devel/git-gitk/Makefile +++ b/devel/git-gitk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2018/04/11 19:39:35 adam Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/03 10:39:12 rillig Exp $ PKGNAME= git-gitk-${GIT_VERSION} COMMENT= GIT Tree History Storage Tool (gitk) @@ -23,12 +23,12 @@ PLIST_VARS+= macosx .if ${OPSYS} == "Darwin" && exists(/System/Library/Frameworks/Tk.framework) . if exists(/System/Library/Frameworks/Tk.framework/Resources/Wish.app) -WISH_APP=Wish +WISH_APP= Wish . else -WISH_APP=Wish Shell +WISH_APP= Wish Shell . endif -PLIST_SUBST+= WISH_APP=${WISH_APP:Q} -PLIST.macosx= yes +PLIST_SUBST+= WISH_APP=${WISH_APP:Q} +PLIST.macosx= yes .endif .include "../../devel/git/Makefile.common" diff --git a/devel/glib2/modules.mk b/devel/glib2/modules.mk index e563a7c7011..517bd78fa4c 100644 --- a/devel/glib2/modules.mk +++ b/devel/glib2/modules.mk @@ -1,4 +1,4 @@ -# $NetBSD: modules.mk,v 1.1 2010/11/17 14:09:55 drochner Exp $ +# $NetBSD: modules.mk,v 1.2 2019/11/03 10:39:12 rillig Exp $ # # This Makefile fragment is intended to be included by packages that install # GIO modules. It takes care of rebuilding the corresponding databases at @@ -12,7 +12,7 @@ GIO_QUERYMODULES= ${BUILDLINK_PREFIX.glib2}/bin/gio-querymodules FILES_SUBST+= GIO_MODULES_DIR=${GIO_MODULES_DIR:Q} FILES_SUBST+= GIO_QUERYMODULES=${GIO_QUERYMODULES:Q} -GIO_MODULES_DIR=${BUILDLINK_PREFIX.glib2}/lib/gio/modules +GIO_MODULES_DIR= ${BUILDLINK_PREFIX.glib2}/lib/gio/modules INSTALL_TEMPLATES+= ../../devel/glib2/files/modules.tmpl DEINSTALL_TEMPLATES+= ../../devel/glib2/files/modules.tmpl diff --git a/devel/glib2/schemas.mk b/devel/glib2/schemas.mk index 14a916074a7..086eede74c3 100644 --- a/devel/glib2/schemas.mk +++ b/devel/glib2/schemas.mk @@ -1,4 +1,4 @@ -# $NetBSD: schemas.mk,v 1.2 2011/02/20 15:07:40 jmmv Exp $ +# $NetBSD: schemas.mk,v 1.3 2019/11/03 10:39:12 rillig Exp $ # # This Makefile fragment is intended to be included by packages that install # GSettings schemas. It takes care of rebuilding the corresponding databases @@ -12,7 +12,7 @@ GLIB_COMPILE_SCHEMAS= ${BUILDLINK_PREFIX.glib2}/bin/glib-compile-schemas FILES_SUBST+= GLIB_SCHEMAS_DIR=${GLIB_SCHEMAS_DIR:Q} FILES_SUBST+= GLIB_COMPILE_SCHEMAS=${GLIB_COMPILE_SCHEMAS:Q} -GLIB_SCHEMAS_DIR=${BUILDLINK_PREFIX.glib2}/share/glib-2.0/schemas +GLIB_SCHEMAS_DIR= ${BUILDLINK_PREFIX.glib2}/share/glib-2.0/schemas INSTALL_TEMPLATES+= ../../devel/glib2/files/schemas.tmpl DEINSTALL_TEMPLATES+= ../../devel/glib2/files/schemas.tmpl diff --git a/devel/global/options.mk b/devel/global/options.mk index c1477eb6968..6f62f8aec95 100644 --- a/devel/global/options.mk +++ b/devel/global/options.mk @@ -1,9 +1,9 @@ -# $NetBSD: options.mk,v 1.2 2018/06/18 09:43:12 leot Exp $ +# $NetBSD: options.mk,v 1.3 2019/11/03 10:39:12 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.global +PKG_OPTIONS_VAR= PKG_OPTIONS.global PKG_OPTIONS_REQUIRED_GROUPS= db -PKG_OPTIONS_GROUP.db= bdb sqlite3 -PKG_SUGGESTED_OPTIONS= sqlite3 +PKG_OPTIONS_GROUP.db= bdb sqlite3 +PKG_SUGGESTED_OPTIONS= sqlite3 .include "../../mk/bsd.options.mk" diff --git a/devel/gmp/builtin.mk b/devel/gmp/builtin.mk index 8d2b05c5b6f..57b84a8cf4b 100644 --- a/devel/gmp/builtin.mk +++ b/devel/gmp/builtin.mk @@ -1,11 +1,11 @@ -# $NetBSD: builtin.mk,v 1.8 2015/07/16 09:16:30 richard Exp $ +# $NetBSD: builtin.mk,v 1.9 2019/11/03 10:39:12 rillig Exp $ BUILTIN_PKG:= gmp BUILTIN_FIND_HEADERS_VAR:= H_GMP BUILTIN_FIND_HEADERS.H_GMP= gmp.h gmp/gmp.h -BUILTIN_VERSION_SCRIPT.gmp= ${AWK} \ +BUILTIN_VERSION_SCRIPT.gmp= ${AWK} \ '/\#define[ \t]*__GNU_MP_VERSION[ \t]/ { major = $$3; } \ /\#define[ \t]*__GNU_MP_VERSION_MINOR[ \t]/ { minor = $$3; } \ /\#define[ \t]*__GNU_MP_VERSION_PATCHLEVEL[ \t]/ { patch = $$3; } \ @@ -19,9 +19,9 @@ BUILTIN_VERSION_SCRIPT.gmp= ${AWK} \ ### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). ### .if !defined(IS_BUILTIN.gmp) -IS_BUILTIN.gmp= no +IS_BUILTIN.gmp= no . if empty(H_GMP:M__nonexistent__) && empty(H_GMP:M${LOCALBASE}/*) -IS_BUILTIN.gmp= yes +IS_BUILTIN.gmp= yes . endif .endif MAKEVARS+= IS_BUILTIN.gmp @@ -36,7 +36,7 @@ MAKEVARS+= IS_BUILTIN.gmp BUILTIN_VERSION.gmp!= ${BUILTIN_VERSION_SCRIPT.gmp} ${H_GMP} BUILTIN_PKG.gmp= gmp-${BUILTIN_VERSION.gmp} .endif -MAKEVARS+= BUILTIN_PKG.gmp +MAKEVARS+= BUILTIN_PKG.gmp ### ### Determine whether we should use the built-in implementation if it @@ -52,17 +52,17 @@ USE_BUILTIN.gmp= yes . for _dep_ in ${BUILDLINK_API_DEPENDS.gmp} . if !empty(USE_BUILTIN.gmp:M[yY][eE][sS]) USE_BUILTIN.gmp!= \ - if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.gmp:Q}; then \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.gmp:Q}; then \ ${ECHO} yes; \ - else \ + else \ ${ECHO} no; \ - fi + fi . endif . endfor . endif . endif # PREFER.gmp .endif -MAKEVARS+= USE_BUILTIN.gmp +MAKEVARS+= USE_BUILTIN.gmp CHECK_BUILTIN.gmp?= no .if !empty(CHECK_BUILTIN.gmp:M[Nn][Oo]) diff --git a/devel/gnatpython/Makefile b/devel/gnatpython/Makefile index e12e53f4f16..b3c1d2c4985 100644 --- a/devel/gnatpython/Makefile +++ b/devel/gnatpython/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2019/09/02 13:19:36 adam Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/03 10:39:12 rillig Exp $ DISTNAME= gnatpython-${SNAPSHOT} PKGREVISION= 3 @@ -6,10 +6,10 @@ CATEGORIES= devel MASTER_SITES= http://downloads.dragonlace.net/src/ EXTRACT_SUFX= .tar.bz2 -MAINTAINER= pkgsrc-users@NetBSD.org +MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://forge.open-do.org/projects/gnatpython COMMENT= Python package used in Ada testsuites -LICENSE= gnu-gpl-v3 +LICENSE= gnu-gpl-v3 SNAPSHOT= 20110912 EGG_NAME= gnatpython-1.2 diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile index b8b36ec44bc..58135ed0599 100644 --- a/devel/gnustep-make/Makefile +++ b/devel/gnustep-make/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2018/07/04 13:40:14 jperkin Exp $ +# $NetBSD: Makefile,v 1.59 2019/11/03 10:39:13 rillig Exp $ DISTNAME= gnustep-make-2.6.2 PKGREVISION= 2 @@ -55,11 +55,11 @@ SUBST_FILES.maninfo= ${WRKSRC}/FilesystemLayouts/fhs SUBST_SED.maninfo= -e 's|share/man|${PKGMANDIR}|' SUBST_SED.maninfo+= -e 's|share/info|${PKGINFODIR}|' -SUBST_CLASSES+= unwrapping -SUBST_STAGE.unwrapping= post-build -SUBST_MESSAGE.unwrapping=Unwrapping wrapper scripts. -SUBST_FILES.unwrapping= TestFramework/gnustep-tests -SUBST_SED.unwrapping= -e 's|${TOOLS_DIR}|${PREFIX}|g' +SUBST_CLASSES+= unwrapping +SUBST_STAGE.unwrapping= post-build +SUBST_MESSAGE.unwrapping= Unwrapping wrapper scripts. +SUBST_FILES.unwrapping= TestFramework/gnustep-tests +SUBST_SED.unwrapping= -e 's|${TOOLS_DIR}|${PREFIX}|g' INSTALLATION_DIRS+= share/GNUstep/Library INSTALLATION_DIRS+= share/GNUstep/Makefiles/${GNUSTEP_ARCH} diff --git a/devel/gnustep-make/gnustep.mk b/devel/gnustep-make/gnustep.mk index 3bd9a2005a9..2a9aa812269 100644 --- a/devel/gnustep-make/gnustep.mk +++ b/devel/gnustep-make/gnustep.mk @@ -1,4 +1,4 @@ -# $NetBSD: gnustep.mk,v 1.27 2018/07/04 13:40:14 jperkin Exp $ +# $NetBSD: gnustep.mk,v 1.28 2019/11/03 10:39:13 rillig Exp $ .if !defined(GNUSTEP_MK) GNUSTEP_MK= #defined @@ -22,7 +22,7 @@ ONLY_FOR_COMPILER= clang # \todo Explain. Is this about forcing clang as the compiler, or # about using libraries in the clang package, or ? -BUILDLINK_API_DEPENDS.clang+= clang>=3.1 +BUILDLINK_API_DEPENDS.clang+= clang>=3.1 DEPENDS+= clang-[0-9]*:../../lang/clang .endif @@ -96,13 +96,13 @@ create-gnustep-chown-links: ${RUN}${CHMOD} +x ${BUILDLINK_BINDIR}/chgrp ${RUN}${CHMOD} +x ${BUILDLINK_BINDIR}/install -GNUSTEP_INSTALL= ${BUILDLINK_BINDIR}/install -GNUSTEP_INSTALL_DATA= ${INSTALL_DATA:S/${INSTALL}/${GNUSTEP_INSTALL}/} -GNUSTEP_INSTALL_PROGRAM=${INSTALL_PROGRAM:S/${INSTALL}/${GNUSTEP_INSTALL}/} +GNUSTEP_INSTALL= ${BUILDLINK_BINDIR}/install +GNUSTEP_INSTALL_DATA= ${INSTALL_DATA:S/${INSTALL}/${GNUSTEP_INSTALL}/} +GNUSTEP_INSTALL_PROGRAM= ${INSTALL_PROGRAM:S/${INSTALL}/${GNUSTEP_INSTALL}/} .else -GNUSTEP_INSTALL= ${INSTALL} -GNUSTEP_INSTALL_DATA= ${INSTALL_DATA} -GNUSTEP_INSTALL_PROGRAM=${INSTALL_PROGRAM} +GNUSTEP_INSTALL= ${INSTALL} +GNUSTEP_INSTALL_DATA= ${INSTALL_DATA} +GNUSTEP_INSTALL_PROGRAM= ${INSTALL_PROGRAM} .endif GNUSTEP_OVERRIDE_INSTALL?= YES @@ -153,17 +153,17 @@ MAKE_ENV+= GUILE_LOAD_PATH=${GUILE_LOAD_PATH:Q} . if defined(GNU_CONFIGURE) || defined(HAS_CONFIGURE) GNU_CONFIGURE_PREFIX?= ${GNUSTEP_ROOT} -CONFIGURE_ENV+= GNUSTEP_ROOT=${GNUSTEP_ROOT:Q} -CONFIGURE_ENV+= GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES:Q} -CONFIGURE_ENV+= GNUSTEP_HOST=${GNUSTEP_HOST:Q} -CONFIGURE_ENV+= GNUSTEP_HOST_CPU=${GNUSTEP_HOST_CPU:Q} -CONFIGURE_ENV+= GNUSTEP_HOST_VENDOR=${GNUSTEP_HOST_VENDOR:Q} -CONFIGURE_ENV+= GNUSTEP_HOST_OS=${GNUSTEP_HOST_OS:Q} -CONFIGURE_ENV+= GNUSTEP_PATHLIST=${GNUSTEP_PATHLIST:Q} -CONFIGURE_ENV+= GNUSTEP_FLATTENED=${GNUSTEP_FLATTENED:Q} -CONFIGURE_ENV+= GNUSTEP_IS_FLATTENED=${GNUSTEP_IS_FLATTENED:Q} -CONFIGURE_ENV+= GNUSTEP_USER_ROOT=${GNUSTEP_USER_ROOT:Q} -CONFIGURE_ENV+= GNUSTEP_CONFIG_FILE=${GNUSTEP_CONFIG_FILE:Q} +CONFIGURE_ENV+= GNUSTEP_ROOT=${GNUSTEP_ROOT:Q} +CONFIGURE_ENV+= GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES:Q} +CONFIGURE_ENV+= GNUSTEP_HOST=${GNUSTEP_HOST:Q} +CONFIGURE_ENV+= GNUSTEP_HOST_CPU=${GNUSTEP_HOST_CPU:Q} +CONFIGURE_ENV+= GNUSTEP_HOST_VENDOR=${GNUSTEP_HOST_VENDOR:Q} +CONFIGURE_ENV+= GNUSTEP_HOST_OS=${GNUSTEP_HOST_OS:Q} +CONFIGURE_ENV+= GNUSTEP_PATHLIST=${GNUSTEP_PATHLIST:Q} +CONFIGURE_ENV+= GNUSTEP_FLATTENED=${GNUSTEP_FLATTENED:Q} +CONFIGURE_ENV+= GNUSTEP_IS_FLATTENED=${GNUSTEP_IS_FLATTENED:Q} +CONFIGURE_ENV+= GNUSTEP_USER_ROOT=${GNUSTEP_USER_ROOT:Q} +CONFIGURE_ENV+= GNUSTEP_CONFIG_FILE=${GNUSTEP_CONFIG_FILE:Q} . if defined(GNUSTEP_OBSOLETE_ENV) CONFIGURE_ENV+= GNUSTEP_SYSTEM_ROOT=${GNUSTEP_SYSTEM_ROOT:Q} diff --git a/devel/google-api-go-client/buildlink3.mk b/devel/google-api-go-client/buildlink3.mk index 5e637a73458..455c4944cde 100644 --- a/devel/google-api-go-client/buildlink3.mk +++ b/devel/google-api-go-client/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.3 2016/09/13 20:50:25 bsiegert Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2019/11/03 10:39:13 rillig Exp $ BUILDLINK_TREE+= google-api-go-client .if !defined(GOOGLE_API_GO_CLIENT_BUILDLINK3_MK) GOOGLE_API_GO_CLIENT_BUILDLINK3_MK:= -BUILDLINK_CONTENTS_FILTER.google-api-go-client= ${EGREP} gopkg/ +BUILDLINK_CONTENTS_FILTER.google-api-go-client= ${EGREP} gopkg/ BUILDLINK_DEPMETHOD.google-api-go-client?= build BUILDLINK_API_DEPENDS.google-api-go-client+= google-api-go-client>=20150507 BUILDLINK_PKGSRCDIR.google-api-go-client?= ../../devel/google-api-go-client diff --git a/devel/gperftools/Makefile b/devel/gperftools/Makefile index 78c9e361989..11cc2b34726 100644 --- a/devel/gperftools/Makefile +++ b/devel/gperftools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2019/08/11 13:18:43 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/03 10:39:13 rillig Exp $ DISTNAME= gperftools-2.7 PKGREVISION= 2 @@ -27,11 +27,11 @@ CFLAGS.Darwin+= -D_XOPEN_SOURCE=1 LIBS+= -lexecinfo .endif -PKGCONFIG_OVERRIDE= libprofiler.pc -PKGCONFIG_OVERRIDE+= libtcmalloc.pc -PKGCONFIG_OVERRIDE+= libtcmalloc_debug.pc -PKGCONFIG_OVERRIDE+= libtcmalloc_minimal.pc -PKGCONFIG_OVERRIDE+= libtcmalloc_minimal_debug.pc +PKGCONFIG_OVERRIDE= libprofiler.pc +PKGCONFIG_OVERRIDE+= libtcmalloc.pc +PKGCONFIG_OVERRIDE+= libtcmalloc_debug.pc +PKGCONFIG_OVERRIDE+= libtcmalloc_minimal.pc +PKGCONFIG_OVERRIDE+= libtcmalloc_minimal_debug.pc PKGCONFIG_OVERRIDE_STAGE= post-build REPLACE_PERL= src/pprof diff --git a/devel/gps/Makefile b/devel/gps/Makefile index a9d32f035e8..85880879af0 100644 --- a/devel/gps/Makefile +++ b/devel/gps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2019/10/21 21:38:03 adam Exp $ +# $NetBSD: Makefile,v 1.64 2019/11/03 10:39:13 rillig Exp $ DISTNAME= gps-${GPS_VERSION} PKGREVISION= 24 @@ -32,7 +32,7 @@ WRKSRC= ${WRKDIR}/gps-release-ide-${GPS_VERSION}-src CONFIGURE_ARGS+= --disable-shared --with-gmp=${PREFIX} -SUBST_CLASSES+= coll python +SUBST_CLASSES+= coll python SUBST_STAGE.coll= pre-configure SUBST_FILES.coll= gnatlib/src/gnatcoll_readline.gpr.in SUBST_VARS.coll= PREFIX @@ -41,7 +41,7 @@ SUBST_STAGE.python= pre-configure SUBST_FILES.python= share/plug-ins/gps_utils/console_process.py SUBST_SED.python= -e "s|/usr/bin/python|${PYTHONBIN}|" -GENERATE_PLIST= cd ${DESTDIR}${PREFIX}; \ +GENERATE_PLIST= cd ${DESTDIR}${PREFIX}; \ ${FIND} * \( -type f -or -type l \) | ${SORT}; do-configure: diff --git a/devel/gps/options.mk b/devel/gps/options.mk index 6a5051fff6e..c7c8478859c 100644 --- a/devel/gps/options.mk +++ b/devel/gps/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.14 2019/09/02 13:19:37 adam Exp $ +# $NetBSD: options.mk,v 1.15 2019/11/03 10:39:13 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gps PKG_SUPPORTED_OPTIONS= syslog sqlite readline python pgsql @@ -24,7 +24,7 @@ CONFIGURE_ARGS+= --disable-readline ###################### .if empty(PKG_OPTIONS:Msyslog) -CONFIGURE_ARGS+= --disable-syslog +CONFIGURE_ARGS+= --disable-syslog .endif @@ -33,9 +33,9 @@ CONFIGURE_ARGS+= --disable-syslog ###################### .if !empty(PKG_OPTIONS:Msqlite) -CONFIGURE_ARGS+= --with-sqlite=embedded +CONFIGURE_ARGS+= --with-sqlite=embedded .else -CONFIGURE_ARGS+= --without-sqlite +CONFIGURE_ARGS+= --without-sqlite .endif diff --git a/devel/grantlee-qt5/Makefile b/devel/grantlee-qt5/Makefile index 8a4596bc503..be14adbca58 100644 --- a/devel/grantlee-qt5/Makefile +++ b/devel/grantlee-qt5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2019/09/18 14:17:08 ryoon Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/03 10:39:13 rillig Exp $ # DISTNAME= grantlee-5.1.0 @@ -12,8 +12,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= String template engine in QT5 based on Django template system LICENSE= gnu-lgpl-v3 -USE_LANGUAGES= c c++ -USE_CMAKE= yes +USE_LANGUAGES= c c++ +USE_CMAKE= yes # Unbreak nested templates https://github.com/steveire/grantlee/issues/27 post-patch: diff --git a/devel/grantlee/Makefile b/devel/grantlee/Makefile index 4d1c139faee..987933f3d25 100644 --- a/devel/grantlee/Makefile +++ b/devel/grantlee/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2019/10/28 16:10:52 kamil Exp $ +# $NetBSD: Makefile,v 1.12 2019/11/03 10:39:13 rillig Exp $ # DISTNAME= grantlee-0.5.1 @@ -11,8 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= String template engine in QT based on Django template system LICENSE= gnu-lgpl-v3 -USE_LANGUAGES= c c++ -USE_CMAKE= yes +USE_LANGUAGES= c c++ +USE_CMAKE= yes SUBST_CLASSES+= fix-inc SUBST_STAGE.fix-inc= pre-configure diff --git a/devel/gtexinfo/options.mk b/devel/gtexinfo/options.mk index d0c7f39a294..a1cfa63847e 100644 --- a/devel/gtexinfo/options.mk +++ b/devel/gtexinfo/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.5 2016/02/25 12:12:48 jperkin Exp $ +# $NetBSD: options.mk,v 1.6 2019/11/03 10:39:13 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.gtexinfo -PKG_SUPPORTED_OPTIONS= nls -PKG_SUGGESTED_OPTIONS= # blank +PKG_OPTIONS_VAR= PKG_OPTIONS.gtexinfo +PKG_SUPPORTED_OPTIONS= nls +PKG_SUGGESTED_OPTIONS= # blank PKG_SUGGESTED_OPTIONS.NetBSD+= nls PKG_OPTIONS_LEGACY_VARS= TEXINFO_LOCALE diff --git a/devel/gyp/Makefile b/devel/gyp/Makefile index 7a880046219..eea00468541 100644 --- a/devel/gyp/Makefile +++ b/devel/gyp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2019/09/02 13:19:40 adam Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/03 10:39:13 rillig Exp $ GIT_VERSION= 20161117.940a15ee3f1c89f193cb4c19373b3f6e9ad15b95 DIST_VERSION= 0.1 @@ -12,7 +12,7 @@ HOMEPAGE= https://gyp.gsrc.io/ COMMENT= GYP can Generate Your Projects LICENSE= modified-bsd -PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 0.1pre20161117.940a15ee3f1c89f193cb4c19373b3f6e9ad15b95 +PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 0.1pre20161117.940a15ee3f1c89f193cb4c19373b3f6e9ad15b95 EGG_NAME= gyp-${DIST_VERSION} WRKSRC= ${WRKDIR}/gyp @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/gyp # REPLACE_PYTHON settings farmed out due to size... .include "Makefile.replace-python" -SUBST_CLASSES+= python +SUBST_CLASSES+= python SUBST_STAGE.python= pre-build SUBST_MESSAGE.python= Fix python invocation SUBST_FILES.python+= gyp diff --git a/devel/gyp/Makefile.replace-python b/devel/gyp/Makefile.replace-python index 29bb34b4f62..56a3c57b884 100644 --- a/devel/gyp/Makefile.replace-python +++ b/devel/gyp/Makefile.replace-python @@ -1,140 +1,140 @@ -# $NetBSD: Makefile.replace-python,v 1.2 2017/01/11 14:47:51 wiz Exp $ +# $NetBSD: Makefile.replace-python,v 1.3 2019/11/03 10:39:13 rillig Exp $ -REPLACE_PYTHON+= *.py -REPLACE_PYTHON+= buildbot/buildbot_run.py -REPLACE_PYTHON+= pylib/gyp/*.py -REPLACE_PYTHON+= pylib/gyp/generator/*.py -REPLACE_PYTHON+= samples/samples -REPLACE_PYTHON+= test/actions-bare/gyptest-bare.py -REPLACE_PYTHON+= test/actions-bare/src/bare.py -REPLACE_PYTHON+= test/actions-multiple/gyptest-all.py -REPLACE_PYTHON+= test/actions-multiple/src/*.py -REPLACE_PYTHON+= test/actions-none/gyptest-none.py -REPLACE_PYTHON+= test/actions-none/src/fake_cross.py -REPLACE_PYTHON+= test/actions-subdir/gyptest-action.py -REPLACE_PYTHON+= test/actions-subdir/src/make-file.py -REPLACE_PYTHON+= test/actions-subdir/src/subdir/make-subdir-file.py -REPLACE_PYTHON+= test/actions/*.py -REPLACE_PYTHON+= test/actions/generated-header/action.py -REPLACE_PYTHON+= test/actions/src/confirm-dep-files.py -REPLACE_PYTHON+= test/actions/src/subdir1/*.py -REPLACE_PYTHON+= test/actions/src/subdir2/make-file.py -REPLACE_PYTHON+= test/actions/src/subdir3/generate_main.py -REPLACE_PYTHON+= test/additional-targets/gyptest-additional.py -REPLACE_PYTHON+= test/additional-targets/src/dir1/emit.py -REPLACE_PYTHON+= test/analyzer/gyptest-analyzer.py -REPLACE_PYTHON+= test/assembly/*.py -REPLACE_PYTHON+= test/build-option/gyptest-build.py -REPLACE_PYTHON+= test/builddir/*.py -REPLACE_PYTHON+= test/cflags/gyptest-cflags.py -REPLACE_PYTHON+= test/compilable/gyptest-headers.py -REPLACE_PYTHON+= test/compiler-override/*.py -REPLACE_PYTHON+= test/configurations/basics/gyptest-configurations.py -REPLACE_PYTHON+= test/configurations/inheritance/*.py -REPLACE_PYTHON+= test/configurations/invalid/gyptest-configurations.py -REPLACE_PYTHON+= test/configurations/target_platform/gyptest-target_platform.py -REPLACE_PYTHON+= test/configurations/x64/gyptest-x86.py -REPLACE_PYTHON+= test/copies/*.py -REPLACE_PYTHON+= test/custom-generator/gyptest-custom-generator.py -REPLACE_PYTHON+= test/cxxflags/gyptest-cxxflags.py -REPLACE_PYTHON+= test/defines-escaping/gyptest-defines-escaping.py -REPLACE_PYTHON+= test/defines/*.py -REPLACE_PYTHON+= test/dependencies/*.py -REPLACE_PYTHON+= test/dependency-copy/gyptest-copy.py -REPLACE_PYTHON+= test/errors/gyptest-errors.py -REPLACE_PYTHON+= test/escaping/gyptest-colon.py -REPLACE_PYTHON+= test/exclusion/gyptest-exclusion.py -REPLACE_PYTHON+= test/external-cross-compile/gyptest-cross.py -REPLACE_PYTHON+= test/external-cross-compile/src/fake_cross.py -REPLACE_PYTHON+= test/external-cross-compile/src/tochar.py -REPLACE_PYTHON+= test/generator-output/*.py -REPLACE_PYTHON+= test/generator-output/actions/subdir1/*.py -REPLACE_PYTHON+= test/generator-output/actions/subdir2/make-file.py -REPLACE_PYTHON+= test/generator-output/rules/copy-file.py -REPLACE_PYTHON+= test/gyp-defines/*.py -REPLACE_PYTHON+= test/hard_dependency/*.py -REPLACE_PYTHON+= test/hard_dependency/src/emit.py -REPLACE_PYTHON+= test/hello/*.py -REPLACE_PYTHON+= test/home_dot_gyp/*.py -REPLACE_PYTHON+= test/include_dirs/*.py -REPLACE_PYTHON+= test/intermediate_dir/gyptest-intermediate-dir.py -REPLACE_PYTHON+= test/intermediate_dir/src/script.py -REPLACE_PYTHON+= test/ios/*.py -REPLACE_PYTHON+= test/ios/app-bundle/TestApp/check_no_signature.py -REPLACE_PYTHON+= test/library/*.py -REPLACE_PYTHON+= test/library_dirs/gyptest-library-dirs.py -REPLACE_PYTHON+= test/link-dependency/gyptest-link-dependency.py -REPLACE_PYTHON+= test/link-objects/gyptest-all.py -REPLACE_PYTHON+= test/linux/gyptest-implicit-rpath.py -REPLACE_PYTHON+= test/mac/*.py -REPLACE_PYTHON+= test/make/*.py -REPLACE_PYTHON+= test/make_global_settings/ar/*.py -REPLACE_PYTHON+= test/make_global_settings/basics/*.py -REPLACE_PYTHON+= test/make_global_settings/env-wrapper/*.py -REPLACE_PYTHON+= test/make_global_settings/ld/*.py -REPLACE_PYTHON+= test/make_global_settings/wrapper/*.py -REPLACE_PYTHON+= test/many-actions/*.py -REPLACE_PYTHON+= test/module/gyptest-default.py -REPLACE_PYTHON+= test/msvs/buildevents/*.py -REPLACE_PYTHON+= test/msvs/config_attrs/gyptest-config_attrs.py -REPLACE_PYTHON+= test/msvs/express/gyptest-express.py -REPLACE_PYTHON+= test/msvs/external_builder/gyptest-all.py -REPLACE_PYTHON+= test/msvs/filters/*.py -REPLACE_PYTHON+= test/msvs/list_excluded/gyptest-all.py -REPLACE_PYTHON+= test/msvs/missing_sources/gyptest-missing.py -REPLACE_PYTHON+= test/msvs/multiple_actions_error_handling/gyptest.py -REPLACE_PYTHON+= test/msvs/props/gyptest-props.py -REPLACE_PYTHON+= test/msvs/shared_output/gyptest-shared_output.py -REPLACE_PYTHON+= test/msvs/uldi2010/gyptest-all.py -REPLACE_PYTHON+= test/multiple-targets/*.py -REPLACE_PYTHON+= test/ninja/action_dependencies/gyptest-action-dependencies.py -REPLACE_PYTHON+= test/ninja/action_dependencies/src/emit.py -REPLACE_PYTHON+= test/ninja/chained-dependency/gyptest-chained-dependency.py -REPLACE_PYTHON+= test/ninja/normalize-paths-win/gyptest-normalize-paths.py -REPLACE_PYTHON+= test/ninja/s-needs-no-depfiles/gyptest-s-needs-no-depfiles.py -REPLACE_PYTHON+= test/ninja/solibs_avoid_relinking/*.py -REPLACE_PYTHON+= test/ninja/use-custom-environment-files/*.py -REPLACE_PYTHON+= test/no-cpp/gyptest-no-cpp.py -REPLACE_PYTHON+= test/no-output/gyptest-no-output.py -REPLACE_PYTHON+= test/product/gyptest-product.py -REPLACE_PYTHON+= test/prune_targets/gyptest-prune-targets.py -REPLACE_PYTHON+= test/relative/gyptest-default.py -REPLACE_PYTHON+= test/rename/gyptest-filecase.py -REPLACE_PYTHON+= test/restat/gyptest-restat.py -REPLACE_PYTHON+= test/restat/src/create_intermediate.py -REPLACE_PYTHON+= test/restat/src/touch.py -REPLACE_PYTHON+= test/rules-dirname/gyptest-dirname.py -REPLACE_PYTHON+= test/rules-dirname/src/copy-file.py -REPLACE_PYTHON+= test/rules-dirname/src/subdir/printvars.py -REPLACE_PYTHON+= test/rules-rebuild/gyptest-all.py -REPLACE_PYTHON+= test/rules-rebuild/gyptest-default.py -REPLACE_PYTHON+= test/rules-rebuild/src/make-sources.py -REPLACE_PYTHON+= test/rules-use-built-dependencies/*.py -REPLACE_PYTHON+= test/rules-variables/gyptest-rules-variables.py -REPLACE_PYTHON+= test/rules/*.py -REPLACE_PYTHON+= test/rules/src/*.py -REPLACE_PYTHON+= test/same-gyp-name/*.py -REPLACE_PYTHON+= test/same-rule-output-file-name/gyptest-all.py -REPLACE_PYTHON+= test/same-rule-output-file-name/src/touch.py -REPLACE_PYTHON+= test/same-source-file-name/*.py -REPLACE_PYTHON+= test/same-target-name-different-directory/gyptest-all.py -REPLACE_PYTHON+= test/same-target-name-different-directory/src/touch.py -REPLACE_PYTHON+= test/same-target-name/gyptest-same-target-name.py -REPLACE_PYTHON+= test/sanitize-rule-names/*.py -REPLACE_PYTHON+= test/self-dependency/gyptest-self-dependency.py -REPLACE_PYTHON+= test/sibling/*.py -REPLACE_PYTHON+= test/small/gyptest-small.py -REPLACE_PYTHON+= test/standalone-static-library/*.py -REPLACE_PYTHON+= test/standalone/gyptest-standalone.py -REPLACE_PYTHON+= test/subdirectory/*.py -REPLACE_PYTHON+= test/target/gyptest-target.py -REPLACE_PYTHON+= test/toolsets/gyptest-toolsets.py -REPLACE_PYTHON+= test/toplevel-dir/gyptest-toplevel-dir.py -REPLACE_PYTHON+= test/variables/commands/*.py -REPLACE_PYTHON+= test/variables/filelist/*.py -REPLACE_PYTHON+= test/variables/filelist/src/dummy.py -REPLACE_PYTHON+= test/variables/latelate/gyptest-latelate.py -REPLACE_PYTHON+= test/variables/variable-in-path/gyptest-variable-in-path.py -REPLACE_PYTHON+= test/win/*.py -REPLACE_PYTHON+= test/win/generator-output-different-drive/*.py -REPLACE_PYTHON+= tools/*.py +REPLACE_PYTHON+= *.py +REPLACE_PYTHON+= buildbot/buildbot_run.py +REPLACE_PYTHON+= pylib/gyp/*.py +REPLACE_PYTHON+= pylib/gyp/generator/*.py +REPLACE_PYTHON+= samples/samples +REPLACE_PYTHON+= test/actions-bare/gyptest-bare.py +REPLACE_PYTHON+= test/actions-bare/src/bare.py +REPLACE_PYTHON+= test/actions-multiple/gyptest-all.py +REPLACE_PYTHON+= test/actions-multiple/src/*.py +REPLACE_PYTHON+= test/actions-none/gyptest-none.py +REPLACE_PYTHON+= test/actions-none/src/fake_cross.py +REPLACE_PYTHON+= test/actions-subdir/gyptest-action.py +REPLACE_PYTHON+= test/actions-subdir/src/make-file.py +REPLACE_PYTHON+= test/actions-subdir/src/subdir/make-subdir-file.py +REPLACE_PYTHON+= test/actions/*.py +REPLACE_PYTHON+= test/actions/generated-header/action.py +REPLACE_PYTHON+= test/actions/src/confirm-dep-files.py +REPLACE_PYTHON+= test/actions/src/subdir1/*.py +REPLACE_PYTHON+= test/actions/src/subdir2/make-file.py +REPLACE_PYTHON+= test/actions/src/subdir3/generate_main.py +REPLACE_PYTHON+= test/additional-targets/gyptest-additional.py +REPLACE_PYTHON+= test/additional-targets/src/dir1/emit.py +REPLACE_PYTHON+= test/analyzer/gyptest-analyzer.py +REPLACE_PYTHON+= test/assembly/*.py +REPLACE_PYTHON+= test/build-option/gyptest-build.py +REPLACE_PYTHON+= test/builddir/*.py +REPLACE_PYTHON+= test/cflags/gyptest-cflags.py +REPLACE_PYTHON+= test/compilable/gyptest-headers.py +REPLACE_PYTHON+= test/compiler-override/*.py +REPLACE_PYTHON+= test/configurations/basics/gyptest-configurations.py +REPLACE_PYTHON+= test/configurations/inheritance/*.py +REPLACE_PYTHON+= test/configurations/invalid/gyptest-configurations.py +REPLACE_PYTHON+= test/configurations/target_platform/gyptest-target_platform.py +REPLACE_PYTHON+= test/configurations/x64/gyptest-x86.py +REPLACE_PYTHON+= test/copies/*.py +REPLACE_PYTHON+= test/custom-generator/gyptest-custom-generator.py +REPLACE_PYTHON+= test/cxxflags/gyptest-cxxflags.py +REPLACE_PYTHON+= test/defines-escaping/gyptest-defines-escaping.py +REPLACE_PYTHON+= test/defines/*.py +REPLACE_PYTHON+= test/dependencies/*.py +REPLACE_PYTHON+= test/dependency-copy/gyptest-copy.py +REPLACE_PYTHON+= test/errors/gyptest-errors.py +REPLACE_PYTHON+= test/escaping/gyptest-colon.py +REPLACE_PYTHON+= test/exclusion/gyptest-exclusion.py +REPLACE_PYTHON+= test/external-cross-compile/gyptest-cross.py +REPLACE_PYTHON+= test/external-cross-compile/src/fake_cross.py +REPLACE_PYTHON+= test/external-cross-compile/src/tochar.py +REPLACE_PYTHON+= test/generator-output/*.py +REPLACE_PYTHON+= test/generator-output/actions/subdir1/*.py +REPLACE_PYTHON+= test/generator-output/actions/subdir2/make-file.py +REPLACE_PYTHON+= test/generator-output/rules/copy-file.py +REPLACE_PYTHON+= test/gyp-defines/*.py +REPLACE_PYTHON+= test/hard_dependency/*.py +REPLACE_PYTHON+= test/hard_dependency/src/emit.py +REPLACE_PYTHON+= test/hello/*.py +REPLACE_PYTHON+= test/home_dot_gyp/*.py +REPLACE_PYTHON+= test/include_dirs/*.py +REPLACE_PYTHON+= test/intermediate_dir/gyptest-intermediate-dir.py +REPLACE_PYTHON+= test/intermediate_dir/src/script.py +REPLACE_PYTHON+= test/ios/*.py +REPLACE_PYTHON+= test/ios/app-bundle/TestApp/check_no_signature.py +REPLACE_PYTHON+= test/library/*.py +REPLACE_PYTHON+= test/library_dirs/gyptest-library-dirs.py +REPLACE_PYTHON+= test/link-dependency/gyptest-link-dependency.py +REPLACE_PYTHON+= test/link-objects/gyptest-all.py +REPLACE_PYTHON+= test/linux/gyptest-implicit-rpath.py +REPLACE_PYTHON+= test/mac/*.py +REPLACE_PYTHON+= test/make/*.py +REPLACE_PYTHON+= test/make_global_settings/ar/*.py +REPLACE_PYTHON+= test/make_global_settings/basics/*.py +REPLACE_PYTHON+= test/make_global_settings/env-wrapper/*.py +REPLACE_PYTHON+= test/make_global_settings/ld/*.py +REPLACE_PYTHON+= test/make_global_settings/wrapper/*.py +REPLACE_PYTHON+= test/many-actions/*.py +REPLACE_PYTHON+= test/module/gyptest-default.py +REPLACE_PYTHON+= test/msvs/buildevents/*.py +REPLACE_PYTHON+= test/msvs/config_attrs/gyptest-config_attrs.py +REPLACE_PYTHON+= test/msvs/express/gyptest-express.py +REPLACE_PYTHON+= test/msvs/external_builder/gyptest-all.py +REPLACE_PYTHON+= test/msvs/filters/*.py +REPLACE_PYTHON+= test/msvs/list_excluded/gyptest-all.py +REPLACE_PYTHON+= test/msvs/missing_sources/gyptest-missing.py +REPLACE_PYTHON+= test/msvs/multiple_actions_error_handling/gyptest.py +REPLACE_PYTHON+= test/msvs/props/gyptest-props.py +REPLACE_PYTHON+= test/msvs/shared_output/gyptest-shared_output.py +REPLACE_PYTHON+= test/msvs/uldi2010/gyptest-all.py +REPLACE_PYTHON+= test/multiple-targets/*.py +REPLACE_PYTHON+= test/ninja/action_dependencies/gyptest-action-dependencies.py +REPLACE_PYTHON+= test/ninja/action_dependencies/src/emit.py +REPLACE_PYTHON+= test/ninja/chained-dependency/gyptest-chained-dependency.py +REPLACE_PYTHON+= test/ninja/normalize-paths-win/gyptest-normalize-paths.py +REPLACE_PYTHON+= test/ninja/s-needs-no-depfiles/gyptest-s-needs-no-depfiles.py +REPLACE_PYTHON+= test/ninja/solibs_avoid_relinking/*.py +REPLACE_PYTHON+= test/ninja/use-custom-environment-files/*.py +REPLACE_PYTHON+= test/no-cpp/gyptest-no-cpp.py +REPLACE_PYTHON+= test/no-output/gyptest-no-output.py +REPLACE_PYTHON+= test/product/gyptest-product.py +REPLACE_PYTHON+= test/prune_targets/gyptest-prune-targets.py +REPLACE_PYTHON+= test/relative/gyptest-default.py +REPLACE_PYTHON+= test/rename/gyptest-filecase.py +REPLACE_PYTHON+= test/restat/gyptest-restat.py +REPLACE_PYTHON+= test/restat/src/create_intermediate.py +REPLACE_PYTHON+= test/restat/src/touch.py +REPLACE_PYTHON+= test/rules-dirname/gyptest-dirname.py +REPLACE_PYTHON+= test/rules-dirname/src/copy-file.py +REPLACE_PYTHON+= test/rules-dirname/src/subdir/printvars.py +REPLACE_PYTHON+= test/rules-rebuild/gyptest-all.py +REPLACE_PYTHON+= test/rules-rebuild/gyptest-default.py +REPLACE_PYTHON+= test/rules-rebuild/src/make-sources.py +REPLACE_PYTHON+= test/rules-use-built-dependencies/*.py +REPLACE_PYTHON+= test/rules-variables/gyptest-rules-variables.py +REPLACE_PYTHON+= test/rules/*.py +REPLACE_PYTHON+= test/rules/src/*.py +REPLACE_PYTHON+= test/same-gyp-name/*.py +REPLACE_PYTHON+= test/same-rule-output-file-name/gyptest-all.py +REPLACE_PYTHON+= test/same-rule-output-file-name/src/touch.py +REPLACE_PYTHON+= test/same-source-file-name/*.py +REPLACE_PYTHON+= test/same-target-name-different-directory/gyptest-all.py +REPLACE_PYTHON+= test/same-target-name-different-directory/src/touch.py +REPLACE_PYTHON+= test/same-target-name/gyptest-same-target-name.py +REPLACE_PYTHON+= test/sanitize-rule-names/*.py +REPLACE_PYTHON+= test/self-dependency/gyptest-self-dependency.py +REPLACE_PYTHON+= test/sibling/*.py +REPLACE_PYTHON+= test/small/gyptest-small.py +REPLACE_PYTHON+= test/standalone-static-library/*.py +REPLACE_PYTHON+= test/standalone/gyptest-standalone.py +REPLACE_PYTHON+= test/subdirectory/*.py +REPLACE_PYTHON+= test/target/gyptest-target.py +REPLACE_PYTHON+= test/toolsets/gyptest-toolsets.py +REPLACE_PYTHON+= test/toplevel-dir/gyptest-toplevel-dir.py +REPLACE_PYTHON+= test/variables/commands/*.py +REPLACE_PYTHON+= test/variables/filelist/*.py +REPLACE_PYTHON+= test/variables/filelist/src/dummy.py +REPLACE_PYTHON+= test/variables/latelate/gyptest-latelate.py +REPLACE_PYTHON+= test/variables/variable-in-path/gyptest-variable-in-path.py +REPLACE_PYTHON+= test/win/*.py +REPLACE_PYTHON+= test/win/generator-output-different-drive/*.py +REPLACE_PYTHON+= tools/*.py diff --git a/devel/gyp/tool.mk b/devel/gyp/tool.mk index 1ae253c9158..4b750b6ce1b 100644 --- a/devel/gyp/tool.mk +++ b/devel/gyp/tool.mk @@ -1,7 +1,7 @@ -# $NetBSD: tool.mk,v 1.2 2019/04/25 08:09:49 maya Exp $ +# $NetBSD: tool.mk,v 1.3 2019/11/03 10:39:13 rillig Exp $ .if !defined(GYP_TOOL_MK) -GYP_TOOL_MK= defined +GYP_TOOL_MK= defined PYTHON_VERSIONS_ACCEPTED= 27 diff --git a/devel/hdf5/options.mk b/devel/hdf5/options.mk index 7f4bda0b6ee..e566e0103b6 100644 --- a/devel/hdf5/options.mk +++ b/devel/hdf5/options.mk @@ -1,6 +1,6 @@ -# $NetBSD: options.mk,v 1.8 2019/05/01 22:39:29 bacon Exp $ +# $NetBSD: options.mk,v 1.9 2019/11/03 10:39:13 rillig Exp $ -PKG_OPTIONS_VAR=PKG_OPTIONS.hdf5 +PKG_OPTIONS_VAR= PKG_OPTIONS.hdf5 PKG_SUPPORTED_OPTIONS= szip threads PKG_SUGGESTED_OPTIONS= szip diff --git a/devel/hoe/Makefile b/devel/hoe/Makefile index fe1ebf7c75b..acd54301cd9 100644 --- a/devel/hoe/Makefile +++ b/devel/hoe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2019/11/02 14:27:46 taca Exp $ +# $NetBSD: Makefile,v 1.48 2019/11/03 10:39:14 rillig Exp $ DISTNAME= hoe-3.19.0 CATEGORIES= devel @@ -8,7 +8,7 @@ HOMEPAGE= http://www.zenspider.com/projects/hoe.html COMMENT= Rake extension to provide full project automation LICENSE= mit -USE_RAKE= RUN +USE_RAKE= RUN RUBYGEM_OPTIONS+= --format-executable .include "../../lang/ruby/gem.mk" diff --git a/devel/hptools/Makefile b/devel/hptools/Makefile index b7720f719ef..9a1dbac6da0 100644 --- a/devel/hptools/Makefile +++ b/devel/hptools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2017/12/24 09:52:16 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/03 10:39:14 rillig Exp $ DISTNAME= hptools-src-3.0.8 PKGNAME= hptools-3.0.8 @@ -10,7 +10,7 @@ HOMEPAGE= https://www.hpcalc.org/hp48/pc/programming/ COMMENT= SDK for Hewlett-Packard HP-48G/49G/39G/40G calculators LICENSE= hptools-license -RESTRICTED= Redistribution of unmodified source only; resale prohibited. +RESTRICTED= Redistribution of unmodified source only; resale prohibited. NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} diff --git a/devel/hs-cpphs/Makefile b/devel/hs-cpphs/Makefile index d7ec7ec298c..54670283b01 100644 --- a/devel/hs-cpphs/Makefile +++ b/devel/hs-cpphs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2016/01/10 11:49:09 szptvlfn Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/03 10:39:14 rillig Exp $ DISTNAME= cpphs-1.19.2 PKGREVISION= 1 @@ -8,7 +8,7 @@ MAINTAINER= esg@sdf.lonestar.org COMMENT= Liberalised re-implementation of cpp, the C pre-processor LICENSE= gnu-lgpl-v2.1 -INSTALLATION_DIRS+= ${PKGMANDIR}/man1 +INSTALLATION_DIRS+= ${PKGMANDIR}/man1 post-install: ${INSTALL_MAN} ${WRKSRC}/docs/cpphs.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 diff --git a/devel/intellij-ce-bin/Makefile b/devel/intellij-ce-bin/Makefile index 0f7fd4f3436..0593efaf764 100644 --- a/devel/intellij-ce-bin/Makefile +++ b/devel/intellij-ce-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2019/05/13 17:30:12 ryoon Exp $ +# $NetBSD: Makefile,v 1.5 2019/11/03 10:39:14 rillig Exp $ # # TODO Import intellij-fsnotifier with inotify support from FreeBSD. @@ -23,7 +23,7 @@ USE_TOOLS+= bash pax sed REPLACE_PYTHON= bin/printenv.py \ bin/restart.py \ - + REPLACE_BASH= plugins/Kotlin/kotlinc/bin/kotlin \ plugins/Kotlin/kotlinc/bin/kotlin-dce-js\ plugins/Kotlin/kotlinc/bin/kotlinc \ diff --git a/devel/intellij-ue-bin/Makefile b/devel/intellij-ue-bin/Makefile index 1c7a88f192a..1857e8c4ea6 100644 --- a/devel/intellij-ue-bin/Makefile +++ b/devel/intellij-ue-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2019/05/09 15:12:02 mef Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/03 10:39:14 rillig Exp $ # # TODO Import intellij-fsnotifier with inotify support from FreeBSD. @@ -22,7 +22,7 @@ USE_TOOLS+= pax sed REPLACE_PYTHON= bin/printenv.py \ bin/restart.py \ - + REPLACE_BASH= plugins/Kotlin/kotlinc/bin/kotlin \ plugins/Kotlin/kotlinc/bin/kotlin-dce-js\ plugins/Kotlin/kotlinc/bin/kotlinc \ diff --git a/devel/isect/Makefile b/devel/isect/Makefile index b5bc8be4693..2349a44e896 100644 --- a/devel/isect/Makefile +++ b/devel/isect/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2016/03/05 11:28:22 jperkin Exp $ +# $NetBSD: Makefile,v 1.44 2019/11/03 10:39:14 rillig Exp $ # DISTNAME= isect-1.6.2 @@ -10,9 +10,9 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://isectd.sourceforge.net/ COMMENT= Open source middleware daemon -GNU_CONFIGURE= yes -USE_LIBTOOL= yes -PTHREAD_OPTS+= require +GNU_CONFIGURE= yes +USE_LIBTOOL= yes +PTHREAD_OPTS+= require INFO_FILES= yes RCD_SCRIPTS= isect diff --git a/devel/java-jna/Makefile b/devel/java-jna/Makefile index e56a4af5d53..1e3e49d2023 100644 --- a/devel/java-jna/Makefile +++ b/devel/java-jna/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2019/04/05 12:55:15 nonaka Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/03 10:39:14 rillig Exp $ DISTNAME= jna-5.2.0 PKGNAME= java-${DISTNAME} @@ -25,16 +25,16 @@ EXTRACT_USING= bsdtar # FreeBSD/OpenBSD/NetBSD (i386/amd64) # Android (arm/armv7/aarch64/x86/x86-64/mipsel/mips64el) # -ONLY_FOR_PLATFORM+= Cygwin-*-* -ONLY_FOR_PLATFORM+= Darwin-*-* -ONLY_FOR_PLATFORM+= Linux-*-i386 Linux-*-x86_64 -ONLY_FOR_PLATFORM+= Linux-*-powerpc* -ONLY_FOR_PLATFORM+= Linux-*-arm* Linux-*-aarch64 -ONLY_FOR_PLATFORM+= SunOS-*-* -ONLY_FOR_PLATFORM+= AIX-*-* -ONLY_FOR_PLATFORM+= FreeBSD-*-i386 FreeBSD-*-x86_64 -ONLY_FOR_PLATFORM+= OpenBSD-*-i386 OpenBSD-*-x86_64 -ONLY_FOR_PLATFORM+= NetBSD-*-i386 NetBSD-*-x86_64 +ONLY_FOR_PLATFORM+= Cygwin-*-* +ONLY_FOR_PLATFORM+= Darwin-*-* +ONLY_FOR_PLATFORM+= Linux-*-i386 Linux-*-x86_64 +ONLY_FOR_PLATFORM+= Linux-*-powerpc* +ONLY_FOR_PLATFORM+= Linux-*-arm* Linux-*-aarch64 +ONLY_FOR_PLATFORM+= SunOS-*-* +ONLY_FOR_PLATFORM+= AIX-*-* +ONLY_FOR_PLATFORM+= FreeBSD-*-i386 FreeBSD-*-x86_64 +ONLY_FOR_PLATFORM+= OpenBSD-*-i386 OpenBSD-*-x86_64 +ONLY_FOR_PLATFORM+= NetBSD-*-i386 NetBSD-*-x86_64 USE_LANGUAGES= c USE_JAVA= yes diff --git a/devel/js_of_ocaml/Makefile b/devel/js_of_ocaml/Makefile index f828bf6dc6b..78e716c7e2a 100644 --- a/devel/js_of_ocaml/Makefile +++ b/devel/js_of_ocaml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2019/05/13 11:49:52 jaapb Exp $ +# $NetBSD: Makefile,v 1.34 2019/11/03 10:39:14 rillig Exp $ # GITHUB_PROJECT= js_of_ocaml @@ -14,11 +14,11 @@ LICENSE= gnu-lgpl-v2 USE_TOOLS= bash OCAML_USE_FINDLIB= yes -OCAML_USE_DUNE= yes +OCAML_USE_DUNE= yes OPAM_INSTALL_FILES= js_of_ocaml js_of_ocaml-ocamlbuild \ - js_of_ocaml-ppx js_of_ocaml-ppx_deriving_json \ - js_of_ocaml-lwt js_of_ocaml-compiler + js_of_ocaml-ppx js_of_ocaml-ppx_deriving_json \ + js_of_ocaml-lwt js_of_ocaml-compiler DUNE_BUILD_PACKAGES= js_of_ocaml-compiler js_of_ocaml js_of_ocaml-ocamlbuild \ js_of_ocaml-ppx js_of_ocaml-ppx_deriving_json \ js_of_ocaml-lwt diff --git a/devel/kafka/Makefile b/devel/kafka/Makefile index b27e916c472..b996674fdb8 100644 --- a/devel/kafka/Makefile +++ b/devel/kafka/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2018/12/15 21:12:20 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/03 10:39:14 rillig Exp $ DISTNAME= kafka_${SCALA_VERSION}-1.1.0 PKGNAME= ${DISTNAME:S/_${SCALA_VERSION}//} @@ -35,10 +35,10 @@ KAFKA_LOGDIR?= ${VARBASE}/log/kafka KAFKA_USER?= kafka KAFKA_GROUP?= kafka -PKG_GROUPS+= ${KAFKA_GROUP} -PKG_USERS+= ${KAFKA_USER}:${KAFKA_GROUP} -PKG_GECOS.${KAFKA_USER}=Kafka service user -PKG_HOME.${KAFKA_USER}= ${KAFKA_DATADIR} +PKG_GROUPS+= ${KAFKA_GROUP} +PKG_USERS+= ${KAFKA_USER}:${KAFKA_GROUP} +PKG_GECOS.${KAFKA_USER}= Kafka service user +PKG_HOME.${KAFKA_USER}= ${KAFKA_DATADIR} OWN_DIRS_PERMS+= ${KAFKA_DATADIR} ${KAFKA_USER} ${KAFKA_GROUP} 0755 OWN_DIRS_PERMS+= ${KAFKA_LOGDIR} ${KAFKA_USER} ${KAFKA_GROUP} 0755 diff --git a/devel/kdevelop4/Makefile b/devel/kdevelop4/Makefile index f60d85d62c4..4be38b8da33 100644 --- a/devel/kdevelop4/Makefile +++ b/devel/kdevelop4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.83 2019/08/22 12:23:01 ryoon Exp $ +# $NetBSD: Makefile,v 1.84 2019/11/03 10:39:15 rillig Exp $ # DISTNAME= kdevelop-4.7.0 @@ -19,7 +19,7 @@ USE_TOOLS+= pkg-config perl msgfmt USE_LANGUAGES= c c++ # because of some expansion to ${PKGDIRNAME}.kdev4 which is done wrong by bmake -USE_TOOLS+= gmake +USE_TOOLS+= gmake CMAKE_ARGS+= -DWITH_KDE4Workspace:BOOL=OFF diff --git a/devel/kdevplatform/Makefile b/devel/kdevplatform/Makefile index 653ffeaff15..575cef7f703 100644 --- a/devel/kdevplatform/Makefile +++ b/devel/kdevplatform/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.86 2019/08/22 12:23:01 ryoon Exp $ +# $NetBSD: Makefile,v 1.87 2019/11/03 10:39:15 rillig Exp $ # DISTNAME= kdevplatform-1.7.0 @@ -12,7 +12,7 @@ HOMEPAGE= https://www.kdevelop.org/ COMMENT= KDE development platform, used by KDevelop 4 #LICENSE= # TODO: (see mk/license.mk) -BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4 +BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4 USE_TOOLS+= pkg-config perl msgfmt bash:run USE_LANGUAGES= c c++ diff --git a/devel/kdiff3/Makefile b/devel/kdiff3/Makefile index c5e926d549d..a3c91825fa1 100644 --- a/devel/kdiff3/Makefile +++ b/devel/kdiff3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2019/11/03 04:01:32 gutteridge Exp $ +# $NetBSD: Makefile,v 1.59 2019/11/03 10:39:15 rillig Exp $ VERSION= 1.8.1 PKGREVISION= 1 @@ -17,7 +17,7 @@ USE_LANGUAGES= c c++ BUILDLINK_TRANSFORM+= rm:-Wl,--fatal-warnings -BUILD_DEPENDS+= extra-cmake-modules>=5.10.0:../../devel/extra-cmake-modules +BUILD_DEPENDS+= extra-cmake-modules>=5.10.0:../../devel/extra-cmake-modules TOOLS_DEPENDS.cmake= cmake>=3.0:../../devel/cmake .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/devel/lcdis/Makefile b/devel/lcdis/Makefile index 6b2d2b80f13..1e9061ea215 100644 --- a/devel/lcdis/Makefile +++ b/devel/lcdis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2018/07/19 04:09:30 tpaul Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/03 10:39:15 rillig Exp $ DISTNAME= LCDISSRC PKGNAME= lcdis-1.04 @@ -14,7 +14,7 @@ LICENSE= gnu-gpl-v2 USE_TOOLS+= unzip WRKSRC= ${WRKDIR} -DIST_SUBDIR= ${PKGNAME_NOREV} +DIST_SUBDIR= ${PKGNAME_NOREV} INSTALLATION_DIRS= bin do-build: diff --git a/devel/lcov/Makefile b/devel/lcov/Makefile index 90ba0785d87..b5c6a6abc1e 100644 --- a/devel/lcov/Makefile +++ b/devel/lcov/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2019/08/11 13:18:45 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/03 10:39:15 rillig Exp $ # DISTNAME= lcov-1.13 @@ -17,7 +17,7 @@ USE_TOOLS+= perl REPLACE_PERL= bin/gendesc bin/genhtml bin/geninfo bin/genpng bin/lcov SUBST_CLASSES+= egdir -SUBST_STAGE.egdir= pre-configure +SUBST_STAGE.egdir= pre-configure SUBST_FILES.egdir= bin/genhtml SUBST_FILES.egdir+= bin/geninfo SUBST_FILES.egdir+= bin/lcov diff --git a/devel/ldpc/Makefile b/devel/ldpc/Makefile index 3c6f07761d7..72c7177fc96 100644 --- a/devel/ldpc/Makefile +++ b/devel/ldpc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/10/31 11:17:09 asau Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/03 10:39:15 rillig Exp $ DISTNAME= LDPC-2006-02-08 PKGNAME= ldpc-20060208 @@ -15,14 +15,14 @@ BUILD_TARGET= progs AUTO_MKDIRS= yes -LDPCPROGS= make-pchk alist-to-pchk pchk-to-alist make-ldpc print-pchk make-gen -LDPCPROGS+= print-gen rand-src encode transmit decode extract verify +LDPCPROGS= make-pchk alist-to-pchk pchk-to-alist make-ldpc print-pchk make-gen +LDPCPROGS+= print-gen rand-src encode transmit decode extract verify -LDPCDOCS= channel.html decode-detail.html decoding.html dep-H.html -LDPCDOCS+= encoding.html examples.html index.html install.html mod2convert.html -LDPCDOCS+= mod2dense.html mod2sparse.html modify.html modules.html pchk.html -LDPCDOCS+= progs.html rand.html refs.html release.html sparse-LU.html -LDPCDOCS+= support.html +LDPCDOCS= channel.html decode-detail.html decoding.html dep-H.html +LDPCDOCS+= encoding.html examples.html index.html install.html mod2convert.html +LDPCDOCS+= mod2dense.html mod2sparse.html modify.html modules.html pchk.html +LDPCDOCS+= progs.html rand.html refs.html release.html sparse-LU.html +LDPCDOCS+= support.html LDPCRANDFILE= randfile diff --git a/devel/libcbor/Makefile b/devel/libcbor/Makefile index 5006dad76b4..7d828e5e94b 100644 --- a/devel/libcbor/Makefile +++ b/devel/libcbor/Makefile @@ -1,18 +1,18 @@ -# $NetBSD: Makefile,v 1.1 2019/08/23 17:14:45 agc Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/03 10:39:15 rillig Exp $ -DISTNAME= libcbor -PKGNAME= libcbor-${VERSION} -VERSION= 0.5.0 -CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GITHUB:=PJK/} -GITHUB_TAG= v${VERSION} +DISTNAME= libcbor +PKGNAME= libcbor-${VERSION} +VERSION= 0.5.0 +CATEGORIES= devel +MASTER_SITES= ${MASTER_SITE_GITHUB:=PJK/} +GITHUB_TAG= v${VERSION} -MAINTAINER= pkgsrc-users@pkgsrc.org -HOMEPAGE= https://github.com/PJK/libcbor -COMMENT= Parsing and generate schema-less binary data format -LICENSE= mit +MAINTAINER= pkgsrc-users@pkgsrc.org +HOMEPAGE= https://github.com/PJK/libcbor +COMMENT= Parsing and generate schema-less binary data format +LICENSE= mit -USE_LANGUAGES+= c c++ +USE_LANGUAGES+= c c++ USE_CMAKE= yes USE_TOOLS+= pkg-config diff --git a/devel/libdbusmenu-glib/buildlink3.mk b/devel/libdbusmenu-glib/buildlink3.mk index 34ee45dbdab..16d2f24e0ae 100644 --- a/devel/libdbusmenu-glib/buildlink3.mk +++ b/devel/libdbusmenu-glib/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1 2016/05/20 22:00:23 youri Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2019/11/03 10:39:15 rillig Exp $ BUILDLINK_TREE+= libdbusmenu-glib .if !defined(LIBDBUSMENU_GLIB_BUILDLINK3_MK) LIBDBUSMENU_GLIB_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libdbusmenu-glib+=libdbusmenu-glib>=12.10.2 -BUILDLINK_PKGSRCDIR.libdbusmenu-glib?= ../../devel/libdbusmenu-glib +BUILDLINK_API_DEPENDS.libdbusmenu-glib+= libdbusmenu-glib>=12.10.2 +BUILDLINK_PKGSRCDIR.libdbusmenu-glib?= ../../devel/libdbusmenu-glib .include "../../devel/glib2/buildlink3.mk" .endif # LIBDBUSMENU_GLIB_BUILDLINK3_MK diff --git a/devel/libdbusmenu-qt/Makefile.common b/devel/libdbusmenu-qt/Makefile.common index 70225a5850b..a35590e4e88 100644 --- a/devel/libdbusmenu-qt/Makefile.common +++ b/devel/libdbusmenu-qt/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2018/01/17 19:49:29 markd Exp $ +# $NetBSD: Makefile.common,v 1.3 2019/11/03 10:39:16 rillig Exp $ # used by devel/libdbusmenu-qt/Makefile # used by devel/libdbusmenu-qt5/Makefile @@ -16,8 +16,8 @@ DISTINFO_FILE= ${.CURDIR}/../../devel/libdbusmenu-qt/distinfo WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} -USE_LANGUAGES= c c++ -USE_CMAKE= yes +USE_LANGUAGES= c c++ +USE_CMAKE= yes CMAKE_ARGS+= -DWITH_DOC=OFF pre-configure: diff --git a/devel/libdbusmenu-qt5/Makefile b/devel/libdbusmenu-qt5/Makefile index 80fbde57582..5c040337eb0 100644 --- a/devel/libdbusmenu-qt5/Makefile +++ b/devel/libdbusmenu-qt5/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.16 2019/04/03 00:32:37 ryoon Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/03 10:39:16 rillig Exp $ PKGREVISION= 6 .include "../../devel/libdbusmenu-qt/Makefile.common" -DISTNAME= libdbusmenu-qt_${_VER} +DISTNAME= libdbusmenu-qt_${_VER} PKGNAME= ${DISTNAME:S/qt_/qt5-/:S/+/./} COMMENT= Dbusmenu library for Qt5 diff --git a/devel/libev/Makefile b/devel/libev/Makefile index 229d235040b..842261b21f8 100644 --- a/devel/libev/Makefile +++ b/devel/libev/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2019/09/11 21:35:50 wiedi Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/03 10:39:16 rillig Exp $ DISTNAME= libev-4.27 CATEGORIES= devel @@ -9,12 +9,12 @@ HOMEPAGE= http://software.schmorp.de/pkg/libev.html COMMENT= Full-featured and high-performance event loop LICENSE= 2-clause-bsd OR gnu-gpl-v2 -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -GNU_CONFIGURE_LIBSUBDIR=ev -CONFIGURE_ARGS+= --includedir=${PREFIX}/include/ev +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +GNU_CONFIGURE_LIBSUBDIR= ev +CONFIGURE_ARGS+= --includedir=${PREFIX}/include/ev # Explicitly disable inotify on SunOS, assumes Linux statfs. -CONFIGURE_ENV.SunOS+= ac_cv_header_sys_inotify_h=no -CONFIGURE_ENV.SunOS+= ac_cv_header_sys_epoll_h=no +CONFIGURE_ENV.SunOS+= ac_cv_header_sys_inotify_h=no +CONFIGURE_ENV.SunOS+= ac_cv_header_sys_epoll_h=no .include "../../mk/bsd.pkg.mk" diff --git a/devel/libevent/builtin.mk b/devel/libevent/builtin.mk index e9fa06dd640..702806a0cd4 100644 --- a/devel/libevent/builtin.mk +++ b/devel/libevent/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.18 2016/11/30 13:21:47 wiz Exp $ +# $NetBSD: builtin.mk,v 1.19 2019/11/03 10:39:16 rillig Exp $ BUILTIN_PKG:= libevent @@ -18,7 +18,7 @@ IS_BUILTIN.libevent= no IS_BUILTIN.libevent= yes . endif .endif # IS_BUILTIN.libevent -MAKEVARS+= IS_BUILTIN.libevent +MAKEVARS+= IS_BUILTIN.libevent ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -28,13 +28,13 @@ MAKEVARS+= IS_BUILTIN.libevent !empty(IS_BUILTIN.libevent:M[yY][eE][sS]) && \ empty(H_LIBEVENT:M__nonexistent__) . if empty(H_LIBEVENTCONFIG:M__nonexistent__) -_BLTN_EVENT_1_4_11!= \ +_BLTN_EVENT_1_4_11!= \ ${GREP} -c 1.4.11-stable ${H_LIBEVENTCONFIG} || ${TRUE} -_BLTN_EVENT_1_4_12!= \ +_BLTN_EVENT_1_4_12!= \ ${GREP} -c 1.4.12-stable ${H_LIBEVENTCONFIG} || ${TRUE} -_BLTN_EVENT_2_0_21!= \ +_BLTN_EVENT_2_0_21!= \ ${GREP} -c 2.0.21-stable ${H_LIBEVENTCONFIG} || ${TRUE} -_BLTN_EVENT_2_0_22!= \ +_BLTN_EVENT_2_0_22!= \ ${GREP} -c 2.0.22-stable ${H_LIBEVENTCONFIG} || ${TRUE} . if ${_BLTN_EVENT_2_0_22} == "1" BUILTIN_VERSION.libevent= 2.0.22 @@ -49,35 +49,35 @@ BUILTIN_VERSION.libevent= 1.4.4 . endif . else # libevent>=1.3: bufferevent_base_set added -_BLTN_EVENT_13!= \ +_BLTN_EVENT_13!= \ ${GREP} -c bufferevent_base_set ${H_LIBEVENT} || ${TRUE} # libevent>=1.2: evtag_*, event_base_free added -_BLTN_EVENT_12!= \ +_BLTN_EVENT_12!= \ ${GREP} -c evtag_ ${H_LIBEVENT} || ${TRUE} # libevent>=1.1b: evbuffer_add_vprintf added -_BLTN_EVENT_11b!= \ +_BLTN_EVENT_11b!= \ ${GREP} -c evbuffer_add_vprintf ${H_LIBEVENT} || ${TRUE} # libevent>=1.0d: evbuffer_readline added -_BLTN_EVENT_10d!= \ +_BLTN_EVENT_10d!= \ ${GREP} -c event_base_loopexit ${H_LIBEVENT} || ${TRUE} # libevent>=1.0c: event_set_log_callback, event_base_loopexit and # event_get_{version,method} added -_BLTN_EVENT_10c!= \ +_BLTN_EVENT_10c!= \ ${GREP} -c event_base_loopexit ${H_LIBEVENT} || ${TRUE} # libevent>=1.0: event_base_* and event_priority_* added -_BLTN_EVENT_10!= \ +_BLTN_EVENT_10!= \ ${GREP} -c event_base_ ${H_LIBEVENT} || ${TRUE} # libevent>=0.9: evbuffer_{expand,remove} added -_BLTN_EVENT_09!= \ +_BLTN_EVENT_09!= \ ${GREP} -c evbuffer_expand ${H_LIBEVENT} || ${TRUE} # libevent>=0.8: buffering functions added -_BLTN_EVENT_08!= \ +_BLTN_EVENT_08!= \ ${GREP} -c evbuffer ${H_LIBEVENT} || ${TRUE} # libevent>=0.7b: WIN32 support added -_BLTN_EVENT_07b!= \ +_BLTN_EVENT_07b!= \ ${GREP} -c WIN32 ${H_LIBEVENT} || ${TRUE} # libevent>=0.6: evtimer_* added -_BLTN_EVENT_06!= \ +_BLTN_EVENT_06!= \ ${GREP} -c evtimer_ ${H_LIBEVENT} || ${TRUE} . if ${_BLTN_EVENT_13} == "1" @@ -104,9 +104,9 @@ BUILTIN_VERSION.libevent= 0.6 BUILTIN_VERSION.libevent= 0.5 . endif . endif -BUILTIN_PKG.libevent= libevent-${BUILTIN_VERSION.libevent} +BUILTIN_PKG.libevent= libevent-${BUILTIN_VERSION.libevent} .endif -MAKEVARS+= BUILTIN_PKG.libevent +MAKEVARS+= BUILTIN_PKG.libevent ### ### Determine whether we should use the built-in implementation if it @@ -133,7 +133,7 @@ USE_BUILTIN.libevent!= \ . endif . endif # PREFER.libevent .endif -MAKEVARS+= USE_BUILTIN.libevent +MAKEVARS+= USE_BUILTIN.libevent # Fake pkg-config for builtin libevent on NetBSD @@ -141,8 +141,8 @@ MAKEVARS+= USE_BUILTIN.libevent . if !empty(USE_TOOLS:C/:.*//:Mpkg-config) do-configure-pre-hook: override-libevent-pkgconfig -BLKDIR_PKGCFG= ${BUILDLINK_DIR}/lib/pkgconfig -LIBEVENT_PKGCFGF= libevent.pc +BLKDIR_PKGCFG= ${BUILDLINK_DIR}/lib/pkgconfig +LIBEVENT_PKGCFGF= libevent.pc LIBEVENT_OPENSSL_PKGCFGF= libevent_openssl.pc LIBEVENT_PTHREADS_PKGCFGF= libevent_pthreads.pc diff --git a/devel/libexecinfo/builtin.mk b/devel/libexecinfo/builtin.mk index 9bbaa06cfa4..ccdbcacb9bd 100644 --- a/devel/libexecinfo/builtin.mk +++ b/devel/libexecinfo/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.3 2014/03/24 20:36:47 asau Exp $ +# $NetBSD: builtin.mk,v 1.4 2019/11/03 10:39:16 rillig Exp $ BUILTIN_PKG:= libexecinfo @@ -17,7 +17,7 @@ IS_BUILTIN.libexecinfo= no IS_BUILTIN.libexecinfo= yes . endif .endif # IS_BUILTIN.libexecinfo -MAKEVARS+= IS_BUILTIN.libexecinfo +MAKEVARS+= IS_BUILTIN.libexecinfo ### ### Determine whether we should use the built-in implementation if it @@ -44,7 +44,7 @@ USE_BUILTIN.libexecinfo!= \ . endif . endif # PREFER.libexecinfo .endif -MAKEVARS+= USE_BUILTIN.libexecinfo +MAKEVARS+= USE_BUILTIN.libexecinfo ### ### The section below only applies if we are not including this file @@ -54,12 +54,12 @@ CHECK_BUILTIN.libexecinfo?= no .if !empty(CHECK_BUILTIN.libexecinfo:M[nN][oO]) . if !empty(USE_BUILTIN.libexecinfo:M[nN][oO]) -_BLTN_LIBEXECINFO= -lexecinfo +_BLTN_LIBEXECINFO= -lexecinfo . else . if exists(/usr/include/execinfo.h) && (${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD") -_BLTN_LIBEXECINFO= -lexecinfo +_BLTN_LIBEXECINFO= -lexecinfo . else -_BLTN_LIBEXECINFO= # empty +_BLTN_LIBEXECINFO= # empty . endif . endif BUILDLINK_LDADD.libexecinfo?= ${_BLTN_LIBEXECINFO} diff --git a/devel/libextractor/Makefile b/devel/libextractor/Makefile index 8f6f5b7ddbb..b48ddc3db30 100644 --- a/devel/libextractor/Makefile +++ b/devel/libextractor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.81 2019/08/23 11:02:30 ng0 Exp $ +# $NetBSD: Makefile,v 1.82 2019/11/03 10:39:16 rillig Exp $ DISTNAME= libextractor-1.9 PKGREVISION= 4 @@ -26,7 +26,7 @@ CONFLICTS= csound-{bath,dev}-[0-9]* # bin/extract # This package requires dlopen, so save on space by skipping non-PIC libs SHLIBTOOL_OVERRIDE= # empty -DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick +DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick .include "../../archivers/libarchive/buildlink3.mk" .include "../../audio/flac/buildlink3.mk" diff --git a/devel/libf2c/Makefile b/devel/libf2c/Makefile index 8d2aa23ed1c..d86fdc73e77 100644 --- a/devel/libf2c/Makefile +++ b/devel/libf2c/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2013/04/07 20:43:26 asau Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/03 10:39:16 rillig Exp $ DISTNAME= libf2c-20090201 PKGREVISION= 3 @@ -16,8 +16,8 @@ EXTRACT_DIR= ${WRKDIR}/libf2c WRKSRC= ${EXTRACT_DIR} USE_BSD_MAKEFILE= yes -USE_LIBTOOL= yes -MAKE_FLAGS= LIBF2CSRCDIR=. MKLTARCHIVE=yes +USE_LIBTOOL= yes +MAKE_FLAGS= LIBF2CSRCDIR=. MKLTARCHIVE=yes INSTALLATION_DIRS= lib include diff --git a/devel/libftdi1/Makefile b/devel/libftdi1/Makefile index 8ad8196082b..2d2a334ab4f 100644 --- a/devel/libftdi1/Makefile +++ b/devel/libftdi1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2019/09/02 13:19:40 adam Exp $ +# $NetBSD: Makefile,v 1.34 2019/11/03 10:39:16 rillig Exp $ DISTNAME= libftdi1-1.1 PKGREVISION= 15 @@ -19,10 +19,10 @@ USE_LANGUAGES= c c++ PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 1.0 -BUILD_DEPENDS+=libusb1-[0-9]*:../../devel/libusb1 +BUILD_DEPENDS+= libusb1-[0-9]*:../../devel/libusb1 # It is better off to have doxygen, but # clang segfaults while packaging print/luatex -#BUILD_DEPENDS+=doxygen-[0-9]*:../../devel/doxygen +#BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen PKGCONFIG_OVERRIDE+= libftdi1.pc.in PKGCONFIG_OVERRIDE+= libftdipp1.pc.in diff --git a/devel/libgee/Makefile b/devel/libgee/Makefile index c1b10fb4f04..b36638bbf46 100644 --- a/devel/libgee/Makefile +++ b/devel/libgee/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2019/03/25 13:56:26 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2019/11/03 10:39:16 rillig Exp $ DISTNAME= libgee-0.20.1 PKGREVISION= 1 @@ -13,7 +13,7 @@ LICENSE= gnu-lgpl-v2.1 GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_TOOLS+= pkg-config gmake +USE_TOOLS+= pkg-config gmake PKGCONFIG_OVERRIDE+= gee-0.8.pc.in diff --git a/devel/libgee0.6/Makefile b/devel/libgee0.6/Makefile index 6866906916d..72830b4f20f 100644 --- a/devel/libgee0.6/Makefile +++ b/devel/libgee0.6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2014/11/25 12:04:55 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/03 10:39:17 rillig Exp $ DISTNAME= libgee-0.6.8 PKGNAME= ${DISTNAME:S/libgee/libgee0.6/} @@ -13,10 +13,10 @@ LICENSE= gnu-lgpl-v2.1 GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_TOOLS+= pkg-config gmake +USE_TOOLS+= pkg-config gmake # to regenerate after patches -#BUILDLINK_DEPMETHOD.vala:= build +#BUILDLINK_DEPMETHOD.vala:= build #.include "../../lang/vala/buildlink3.mk" PKGCONFIG_OVERRIDE+= gee-1.0.pc.in diff --git a/devel/libgetopt/builtin.mk b/devel/libgetopt/builtin.mk index 91146005443..3276bd2bec6 100644 --- a/devel/libgetopt/builtin.mk +++ b/devel/libgetopt/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.7 2013/11/23 11:29:35 obache Exp $ +# $NetBSD: builtin.mk,v 1.8 2019/11/03 10:39:17 rillig Exp $ BUILTIN_PKG:= getopt @@ -18,7 +18,7 @@ IS_BUILTIN.getopt= no IS_BUILTIN.getopt= yes . endif .endif # IS_BUILTIN.getopt -MAKEVARS+= IS_BUILTIN.getopt +MAKEVARS+= IS_BUILTIN.getopt ### ### Determine whether we should use the built-in implementation if it @@ -45,7 +45,7 @@ USE_BUILTIN.getopt!= \ . endif . endif # PREFER.getopt .endif -MAKEVARS+= USE_BUILTIN.getopt +MAKEVARS+= USE_BUILTIN.getopt ### ### The section below only applies if we are not including this file @@ -55,9 +55,9 @@ CHECK_BUILTIN.getopt?= no .if !empty(CHECK_BUILTIN.getopt:M[nN][oO]) . if !empty(USE_BUILTIN.getopt:M[nN][oO]) -_BLTN_LIBGETOPT= -lgetopt +_BLTN_LIBGETOPT= -lgetopt . else -_BLTN_LIBGETOPT= # empty +_BLTN_LIBGETOPT= # empty . endif BUILDLINK_LDADD.getopt?= ${_BLTN_LIBGETOPT} diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile index fcb635ff5cf..423ef09950a 100644 --- a/devel/libglade/Makefile +++ b/devel/libglade/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.102 2019/07/21 22:24:00 wiz Exp $ +# $NetBSD: Makefile,v 1.103 2019/11/03 10:39:17 rillig Exp $ DISTNAME= libglade-2.6.4 PKGREVISION= 30 @@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --without-xml-catalog XML_ENTRIES= system https://glade.gnome.org/glade-2.0.dtd \ ${PREFIX}/share/xml/libglade/glade-2.0.dtd -BUILDLINK_API_DEPENDS.atk+= atk>=1.9.0 +BUILDLINK_API_DEPENDS.atk+= atk>=1.9.0 BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0 BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0 diff --git a/devel/libgweather/Makefile b/devel/libgweather/Makefile index 5a2ee85d1cb..549349ed253 100644 --- a/devel/libgweather/Makefile +++ b/devel/libgweather/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2019/07/21 22:24:01 wiz Exp $ +# $NetBSD: Makefile,v 1.76 2019/11/03 10:39:17 rillig Exp $ # DISTNAME= libgweather-2.30.3 @@ -16,7 +16,7 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config intltool gmake msgfmt -GCONF_SCHEMAS+= gweather.schemas +GCONF_SCHEMAS+= gweather.schemas PKGCONFIG_OVERRIDE+= libgweather/gweather.pc.in CONFLICTS+= gnome-applets<2.22.0 diff --git a/devel/libinotify/Makefile b/devel/libinotify/Makefile index 7d07260f80c..5921e3cc834 100644 --- a/devel/libinotify/Makefile +++ b/devel/libinotify/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2018/05/30 14:37:10 minskim Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/03 10:39:17 rillig Exp $ # DISTNAME= libinotify @@ -13,7 +13,7 @@ MAINTAINER= me@dmitrymatveev.co.uk COMMENT= Inotify emulation library for *BSDs LICENSE= mit -GNU_CONFIGURE= YES +GNU_CONFIGURE= YES USE_LIBTOOL= yes USE_LANGUAGES= c c++ USE_TOOLS+= autoconf automake autoreconf diff --git a/devel/libinotify/builtin.mk b/devel/libinotify/builtin.mk index fb539b1ce0e..45c5e7a5f15 100644 --- a/devel/libinotify/builtin.mk +++ b/devel/libinotify/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2014/02/20 10:51:28 jperkin Exp $ +# $NetBSD: builtin.mk,v 1.2 2019/11/03 10:39:17 rillig Exp $ BUILTIN_PKG:= libinotify @@ -17,7 +17,7 @@ IS_BUILTIN.libinotify= no IS_BUILTIN.libinotify= yes . endif .endif -MAKEVARS+= IS_BUILTIN.libinotify +MAKEVARS+= IS_BUILTIN.libinotify ### ### Determine whether we should use the built-in implementation if it @@ -44,4 +44,4 @@ USE_BUILTIN.libinotify!= \ . endif . endif # PREFER.libinotify .endif -MAKEVARS+= USE_BUILTIN.libinotify +MAKEVARS+= USE_BUILTIN.libinotify diff --git a/devel/libjit/Makefile b/devel/libjit/Makefile index 5b90bc78932..293311b54f8 100644 --- a/devel/libjit/Makefile +++ b/devel/libjit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2016/02/25 12:12:48 jperkin Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/03 10:39:17 rillig Exp $ # DISTNAME= libjit-0.1.2 @@ -12,10 +12,10 @@ COMMENT= Just-In-Time compilation functionality LICENSE= gnu-lgpl-v2.1 -USE_LANGUAGES= c c++ -USE_LIBTOOL= yes -USE_TOOLS+= gmake lex yacc makeinfo -GNU_CONFIGURE= yes +USE_LANGUAGES= c c++ +USE_LIBTOOL= yes +USE_TOOLS+= gmake lex yacc makeinfo +GNU_CONFIGURE= yes INFO_FILES= yes CONFIGURE_ARGS.NetBSD+= ac_cv_header_tgmath_h=no diff --git a/devel/liblangtag/Makefile b/devel/liblangtag/Makefile index cbf4ca79610..41cd03f834a 100644 --- a/devel/liblangtag/Makefile +++ b/devel/liblangtag/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2019/10/10 12:27:25 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/03 10:39:17 rillig Exp $ DISTNAME= liblangtag-0.6.3 CATEGORIES= devel @@ -10,13 +10,13 @@ HOMEPAGE= http://tagoh.bitbucket.org/liblangtag/ COMMENT= RFC 5646 language tag interface library LICENSE= gnu-lgpl-v3 OR mpl-2.0 -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config -USE_LIBTOOL= yes -USE_LANGUAGES+= c +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config +USE_LIBTOOL= yes +USE_LANGUAGES+= c PKGCONFIG_OVERRIDE+= liblangtag.pc.in -#TEST_TARGET= check +#TEST_TARGET= check #.include "../../devel/check/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" diff --git a/devel/libltdl/Makefile b/devel/libltdl/Makefile index 7bbbb16346a..3fa33e70b29 100644 --- a/devel/libltdl/Makefile +++ b/devel/libltdl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2014/10/09 13:44:36 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/03 10:39:17 rillig Exp $ # .include "../../devel/libtool/Makefile.common" @@ -11,7 +11,7 @@ CONFLICTS+= libtool<=1.3.5nb11 libtool-base<=1.5.10nb4 USE_LIBTOOL= yes -CONFIGURE_ARGS+=--enable-ltdl-install +CONFIGURE_ARGS+= --enable-ltdl-install CONFIGURE_DIRS= libltdl diff --git a/devel/libmemcached/Makefile b/devel/libmemcached/Makefile index f525f9f423b..ee07b860d2a 100644 --- a/devel/libmemcached/Makefile +++ b/devel/libmemcached/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2018/02/12 17:06:58 jperkin Exp $ +# $NetBSD: Makefile,v 1.12 2019/11/03 10:39:17 rillig Exp $ # DISTNAME= libmemcached-1.0.18 @@ -26,7 +26,7 @@ CONFIGURE_ENV+= ax_cv_check_cxxflags__Werror__pie=no .include "../../mk/bsd.prefs.mk" .include "options.mk" -CONFIGURE_ARGS+=--enable-jobserver=no +CONFIGURE_ARGS+= --enable-jobserver=no CPPFLAGS+= -D__STDC_FORMAT_MACROS diff --git a/devel/libnet11/Makefile b/devel/libnet11/Makefile index b060dba6f21..af8b84aebe1 100644 --- a/devel/libnet11/Makefile +++ b/devel/libnet11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2017/08/16 20:45:35 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/03 10:39:18 rillig Exp $ DISTNAME= libnet-1.1.2.1 PKGNAME= ${DISTNAME:S/libnet/libnet11/} @@ -16,8 +16,8 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/libnet -GNU_CONFIGURE_LIBSUBDIR=libnet11 -CONFIGURE_ARGS+= --includedir=${PREFIX}/include/libnet11 +GNU_CONFIGURE_LIBSUBDIR= libnet11 +CONFIGURE_ARGS+= --includedir=${PREFIX}/include/libnet11 LNDOCS= DESIGN_NOTES MIGRATION PACKET_BUILDING RAWSOCKET_NON_SEQUITUR LNMAN= libnet-functions.h.3 libnet-headers.h.3 libnet-macros.h.3 \ @@ -40,12 +40,12 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/sample/*.c \ ${DESTDIR}${PREFIX}/share/examples/libnet11 .for f in ${LNMAN} - ${INSTALL_MAN} ${WRKSRC}/doc/man/man3/${f} \ - ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3/${f:S/libnet/libnet11/} + ${INSTALL_MAN} ${WRKSRC}/doc/man/man3/${f} \ + ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3/${f:S/libnet/libnet11/} .endfor .for f in ${LNDOCS} - ${INSTALL_DATA} ${WRKSRC}/doc/${f} \ - ${DESTDIR}${PREFIX}/share/doc/libnet11/ + ${INSTALL_DATA} ${WRKSRC}/doc/${f} \ + ${DESTDIR}${PREFIX}/share/doc/libnet11/ .endfor ${INSTALL_SCRIPT} ${WRKSRC}/libnet-config \ ${DESTDIR}${PREFIX}/bin/libnet11-config diff --git a/devel/libnfc/Makefile b/devel/libnfc/Makefile index 7c00cf860bd..4bc5f4a8358 100644 --- a/devel/libnfc/Makefile +++ b/devel/libnfc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2018/02/27 23:56:09 khorben Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/03 10:39:18 rillig Exp $ DISTNAME= libnfc-1.7.1 PKGREVISION= 1 @@ -15,8 +15,8 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config -CONFIGURE_ARGS+=--with-drivers=all -CONFIGURE_ARGS+=--enable-doc +CONFIGURE_ARGS+= --with-drivers=all +CONFIGURE_ARGS+= --enable-doc BUILD_DEPENDS+= doxygen>=1.8.11:../../devel/doxygen diff --git a/devel/libpeas/Makefile b/devel/libpeas/Makefile index 05ebea3648c..ba55edc681d 100644 --- a/devel/libpeas/Makefile +++ b/devel/libpeas/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2019/07/21 22:24:01 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2019/11/03 10:39:18 rillig Exp $ DISTNAME= libpeas-1.20.0 PKGREVISION= 7 @@ -13,10 +13,10 @@ LICENSE= gnu-lgpl-v2.1 DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3 -USE_LIBTOOL= yes +USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake intltool msgfmt pkg-config gsed -GNU_CONFIGURE= yes +USE_TOOLS+= gmake intltool msgfmt pkg-config gsed +GNU_CONFIGURE= yes PYTHON_VERSIONS_INCOMPATIBLE= 27 diff --git a/devel/librfuncs/builtin.mk b/devel/librfuncs/builtin.mk index b17f472d426..83e0054908f 100644 --- a/devel/librfuncs/builtin.mk +++ b/devel/librfuncs/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.2 2010/08/30 17:27:11 drochner Exp $ +# $NetBSD: builtin.mk,v 1.3 2019/11/03 10:39:18 rillig Exp $ BUILTIN_PKG:= librfuncs .include "../../mk/buildlink3/bsd.builtin.mk" @@ -30,7 +30,7 @@ USE_BUILTIN.librfuncs= no USE_BUILTIN.librfuncs= ${IS_BUILTIN.librfuncs} . endif .endif -MAKEVARS+= USE_BUILTIN.librfuncs +MAKEVARS+= USE_BUILTIN.librfuncs ### ### The section below only applies if we are not including this file diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile index 0226ba260e7..c797005189b 100644 --- a/devel/libslang/Makefile +++ b/devel/libslang/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.72 2017/01/19 18:52:06 agc Exp $ +# $NetBSD: Makefile,v 1.73 2019/11/03 10:39:18 rillig Exp $ # DISTNAME= slang-1.4.9 @@ -18,7 +18,7 @@ MAKE_JOBS_SAFE= no USE_TOOLS+= gmake USE_LIBTOOL= yes GNU_CONFIGURE= yes -DLOPEN_REQUIRE_PTHREADS=no +DLOPEN_REQUIRE_PTHREADS= no .include "../../mk/termcap.buildlink3.mk" diff --git a/devel/libslang2/Makefile b/devel/libslang2/Makefile index b95485afb46..f19a8454310 100644 --- a/devel/libslang2/Makefile +++ b/devel/libslang2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2018/03/22 08:14:51 adam Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/03 10:39:18 rillig Exp $ # DISTNAME= slang-2.2.4 @@ -25,9 +25,9 @@ CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv} CONFIGURE_ARGS+= --without-x CONFIGURE_ARGS+= --with-z=${BUILDLINK_PREFIX.zlib} -DLOPEN_REQUIRE_PTHREADS=no +DLOPEN_REQUIRE_PTHREADS= no -EGDIR= ${PREFIX}/share/examples/libslang2 +EGDIR= ${PREFIX}/share/examples/libslang2 CONF_FILES+= ${EGDIR}/slsh.rc ${PKG_SYSCONFDIR}/slsh.rc INSTALL_MAKE_FLAGS+= DEST_SLSH_CONF_DIR=${DESTDIR}/${EGDIR} diff --git a/devel/libstash/Makefile b/devel/libstash/Makefile index 75e01ab6d16..82d0f98f97b 100644 --- a/devel/libstash/Makefile +++ b/devel/libstash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2017/09/25 16:11:54 wiedi Exp $ +# $NetBSD: Makefile,v 1.10 2019/11/03 10:39:18 rillig Exp $ DISTNAME= libstash_s19990912a PKGNAME= libstash-19990912 @@ -9,7 +9,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.sqrl.org/sqrl/ COMMENT= Collection of programming support routines and useful algorithms -GNU_CONFIGURE= YES +GNU_CONFIGURE= YES CONFIGURE_ARGS+= --without-pthreads CONFIGURE_ARGS+= --disable-shared diff --git a/devel/libstatgrab/options.mk b/devel/libstatgrab/options.mk index 1204c6af69b..8dfd3c66b19 100644 --- a/devel/libstatgrab/options.mk +++ b/devel/libstatgrab/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.4 2013/10/16 13:09:00 roy Exp $ +# $NetBSD: options.mk,v 1.5 2019/11/03 10:39:18 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.libstatgrab -PKG_SUPPORTED_OPTIONS= saidar statgrab -PKG_SUGGESTED_OPTIONS= saidar statgrab +PKG_OPTIONS_VAR= PKG_OPTIONS.libstatgrab +PKG_SUPPORTED_OPTIONS= saidar statgrab +PKG_SUGGESTED_OPTIONS= saidar statgrab PKG_OPTIONS_LEGACY_VARS+= WITHOUT_SAIDAR:-saidar PKG_OPTIONS_LEGACY_VARS+= WITHOUT_STATGRAB:-statgrab diff --git a/devel/libusb1/Makefile b/devel/libusb1/Makefile index 738b52005b9..4e3bd0a833d 100644 --- a/devel/libusb1/Makefile +++ b/devel/libusb1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2019/08/06 08:50:28 maya Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/03 10:39:18 rillig Exp $ DISTNAME= libusb-1.0.22 PKGNAME= ${DISTNAME:S/libusb/libusb1/} @@ -19,7 +19,7 @@ NOT_FOR_PLATFORM= DragonFly-*-* GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config -MAKE_JOBS_SAFE= no +MAKE_JOBS_SAFE= no .include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mclang) diff --git a/devel/libusb1/builtin.mk b/devel/libusb1/builtin.mk index e5e0eb4a38a..aa94d62954d 100644 --- a/devel/libusb1/builtin.mk +++ b/devel/libusb1/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.2 2015/02/04 23:44:34 tnn Exp $ +# $NetBSD: builtin.mk,v 1.3 2019/11/03 10:39:18 rillig Exp $ BUILTIN_PKG:= libusb1 @@ -8,12 +8,12 @@ BUILTIN_FIND_HEADERS.H_LIBUSB= libusb.h .include "../../mk/buildlink3/bsd.builtin.mk" .if !defined(IS_BUILTIN.libusb1) -IS_BUILTIN.libusb1= no +IS_BUILTIN.libusb1= no . if empty(H_LIBUSB:M__nonexistent__) -IS_BUILTIN.libusb1= yes +IS_BUILTIN.libusb1= yes . endif .endif -MAKEVARS+= IS_BUILTIN.libusb1 +MAKEVARS+= IS_BUILTIN.libusb1 .if !defined(USE_BUILTIN.libusb1) USE_BUILTIN.libusb1= ${IS_BUILTIN.libusb1} diff --git a/devel/libuuid/Makefile.common b/devel/libuuid/Makefile.common index 386614dc322..a440d9c694c 100644 --- a/devel/libuuid/Makefile.common +++ b/devel/libuuid/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2018/11/04 16:51:30 bsiegert Exp $ +# $NetBSD: Makefile.common,v 1.6 2019/11/03 10:39:19 rillig Exp $ # used by devel/libblkid/Makefile # used by devel/libuuid/Makefile # used by x11/mcookie/Makefile @@ -33,6 +33,6 @@ TEST_TARGET= check # XXX PR pkg/52877: configure is broken on netbsd6 .if (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[0123456].*)) -USE_TOOLS+= ksh -CONFIG_SHELL= ksh +USE_TOOLS+= ksh +CONFIG_SHELL= ksh .endif diff --git a/devel/libuuid/builtin.mk b/devel/libuuid/builtin.mk index 3ed7440e35d..11276893386 100644 --- a/devel/libuuid/builtin.mk +++ b/devel/libuuid/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.10 2018/11/06 09:38:54 markd Exp $ +# $NetBSD: builtin.mk,v 1.11 2019/11/03 10:39:19 rillig Exp $ BUILTIN_PKG:= libuuid @@ -22,7 +22,7 @@ IS_BUILTIN.libuuid= no IS_BUILTIN.libuuid= yes . endif .endif -MAKEVARS+= IS_BUILTIN.libuuid +MAKEVARS+= IS_BUILTIN.libuuid ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -32,9 +32,9 @@ MAKEVARS+= IS_BUILTIN.libuuid !empty(IS_BUILTIN.libuuid:M[yY][eE][sS]) . if empty(UUID_PC:M__nonexistent__) BUILTIN_VERSION.libuuid!= ${SED} -n -e 's/Version: //p' ${UUID_PC} -BUILTIN_PKG.libuuid= libuuid-${BUILTIN_VERSION.libuuid} +BUILTIN_PKG.libuuid= libuuid-${BUILTIN_VERSION.libuuid} . else -BUILTIN_PKG.libuuid= libuuid-2.18 # whatever, as long as it is big enough +BUILTIN_PKG.libuuid= libuuid-2.18 # whatever, as long as it is big enough . endif .endif @@ -63,7 +63,7 @@ USE_BUILTIN.libuuid!= \ . endif . endif .endif -MAKEVARS+= USE_BUILTIN.libuuid +MAKEVARS+= USE_BUILTIN.libuuid ### ### The section below only applies if we are not including this file diff --git a/devel/libvolume_id/Makefile b/devel/libvolume_id/Makefile index 0bb96cfb8d9..6a086b908e5 100644 --- a/devel/libvolume_id/Makefile +++ b/devel/libvolume_id/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2014/06/27 14:08:51 ryoon Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/03 10:39:19 rillig Exp $ # DISTNAME= libvolume_id-0.81.1 @@ -15,7 +15,7 @@ LICENSE= gnu-gpl-v2 INSTALLATION_DIRS= include lib lib/pkgconfig USE_TOOLS+= gmake pkg-config -USE_LIBTOOL=yes +USE_LIBTOOL= yes MAKE_ENV+= INSTALL_DATA=${INSTALL_DATA:Q} MAKE_ENV+= INSTALL_LIB=${INSTALL_LIB:Q} diff --git a/devel/libwhisker2/Makefile b/devel/libwhisker2/Makefile index 8a2e5d75f0d..02d095dfd66 100644 --- a/devel/libwhisker2/Makefile +++ b/devel/libwhisker2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2019/08/11 13:18:46 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/03 10:39:19 rillig Exp $ DISTNAME= libwhisker2-2.5 PKGREVISION= 5 @@ -35,9 +35,9 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/LW2.pm \ ${DESTDIR}${PREFIX}/libdata/${PKGBASE} -. for f in ${REPLACE_PERL} - ${INSTALL_SCRIPT} ${WRKSRC}/${f} \ - ${DESTDIR}${PREFIX}/share/examples/${PKGBASE} -. endfor +.for f in ${REPLACE_PERL} + ${INSTALL_SCRIPT} ${WRKSRC}/${f} \ + ${DESTDIR}${PREFIX}/share/examples/${PKGBASE} +.endfor .include "../../mk/bsd.pkg.mk" diff --git a/devel/libzookeeper/Makefile b/devel/libzookeeper/Makefile index f8e321659c7..6cd81875495 100644 --- a/devel/libzookeeper/Makefile +++ b/devel/libzookeeper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2015/10/09 13:59:57 fhajny Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/03 10:39:19 rillig Exp $ # .include "../../devel/zookeeper/Makefile.common" @@ -17,7 +17,7 @@ LIBS.SunOS+= -lnsl -lsocket # Tests require c++ and cppunit #USE_LANGUAGES+= c++ -#TEST_TARGET= run-check +#TEST_TARGET= run-check BUILDLINK_DEPMETHOD.cppunit= build .include "../../devel/cppunit/buildlink3.mk" diff --git a/devel/locktests/Makefile b/devel/locktests/Makefile index 9f86250476a..6e1ab35f9d9 100644 --- a/devel/locktests/Makefile +++ b/devel/locktests/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2017/08/16 20:45:35 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/03 10:39:19 rillig Exp $ # DISTNAME= locktests @@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= POSIX locks stress-test LICENSE= gnu-gpl-v3 # According to web site -WRKSRC= ${WRKDIR}/locks +WRKSRC= ${WRKDIR}/locks BUILD_TARGET= All do-install: diff --git a/devel/log4shib/Makefile b/devel/log4shib/Makefile index 539a4d6a683..7bd122aa40c 100644 --- a/devel/log4shib/Makefile +++ b/devel/log4shib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2015/10/23 08:06:49 pettai Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/03 10:39:19 rillig Exp $ # DISTNAME= log4shib-1.0.9 @@ -12,7 +12,7 @@ LICENSE= gnu-lgpl-v2.1 BUILD_DEFS+= VARBASE -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --localstatedir=${VARBASE} CONFIGURE_ARGS+= --disable-doxygen diff --git a/devel/lua-BitOp/Makefile b/devel/lua-BitOp/Makefile index 17a9f638b27..a5f6bdb0999 100644 --- a/devel/lua-BitOp/Makefile +++ b/devel/lua-BitOp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2017/09/16 19:53:50 alnsn Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/03 10:39:19 rillig Exp $ DISTNAME= LuaBitOp-1.0.2 PKGNAME= ${DISTNAME:S/Lua/${LUA_PKGPREFIX}-/} @@ -23,7 +23,7 @@ MAKE_FLAGS+= INSTALLPATH=${DESTDIR}${PREFIX}/${LUA_CDIR} .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "Darwin" -BUILD_TARGET= macosx +BUILD_TARGET= macosx .endif INSTALLATION_DIRS+= ${LUA_CDIR} ${LUA_DOCDIR} diff --git a/devel/lua-lrexlib/Makefile.common b/devel/lua-lrexlib/Makefile.common index 976e2f57704..da0928a8208 100644 --- a/devel/lua-lrexlib/Makefile.common +++ b/devel/lua-lrexlib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2018/07/29 11:36:06 minskim Exp $ +# $NetBSD: Makefile.common,v 1.6 2019/11/03 10:39:19 rillig Exp $ # used by devel/lua-lrexlib-posix/Makefile # used by devel/lua-lrexlib-pcre/Makefile # used by devel/lua-lrexlib-onig/Makefile @@ -29,7 +29,7 @@ PATCHDIR= ${.CURDIR}/../../devel/lua-lrexlib/patches DISTINFO_FILE= ${.CURDIR}/../../devel/lua-lrexlib/distinfo DESCR_SRC= ${.CURDIR}/../../devel/lua-lrexlib/DESCR.common -CFLAGS+= -DLUA_COMPAT_APIINTCASTS +CFLAGS+= -DLUA_COMPAT_APIINTCASTS MAKE_FLAGS+= LIBS=${LIBS:Q} MAKE_FLAGS+= LIBTOOL=${LIBTOOL:Q} MAKE_FLAGS+= MODULES_DIR=${PREFIX}/${LUA_CDIR} diff --git a/devel/lua-lrexlib/Makefile.version b/devel/lua-lrexlib/Makefile.version index b13d0b149d3..c7532e6db75 100644 --- a/devel/lua-lrexlib/Makefile.version +++ b/devel/lua-lrexlib/Makefile.version @@ -1,5 +1,5 @@ -# $NetBSD: Makefile.version,v 1.2 2013/01/25 22:02:18 ryoon Exp $ +# $NetBSD: Makefile.version,v 1.3 2019/11/03 10:39:19 rillig Exp $ -V= 2.7 -MINORV= .2 -VERSION=${V}${MINORV} +V= 2.7 +MINORV= .2 +VERSION= ${V}${MINORV} diff --git a/devel/mantis/Makefile b/devel/mantis/Makefile index 31dce336c61..f111193dae8 100644 --- a/devel/mantis/Makefile +++ b/devel/mantis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2019/05/23 19:22:58 rillig Exp $ +# $NetBSD: Makefile,v 1.52 2019/11/03 10:39:19 rillig Exp $ DISTNAME= mantisbt-2.4.1 PKGNAME= ${DISTNAME:S/mantisbt/mantis/} @@ -60,8 +60,8 @@ do-install: ${WRKSRC}/config_inc.php .for f in ${MANTIS_EG} - ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${EGDIR} - ${RM} ${WRKSRC}/${f} + ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${EGDIR} + ${RM} ${WRKSRC}/${f} .endfor cd ${WRKSRC} && ${FIND} . -name .cvsignore -print | ${XARGS} ${RM} -f diff --git a/devel/memcached/Makefile b/devel/memcached/Makefile index 8bcbf2f0267..0232ca4127b 100644 --- a/devel/memcached/Makefile +++ b/devel/memcached/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2019/10/01 18:17:24 adam Exp $ +# $NetBSD: Makefile,v 1.67 2019/11/03 10:39:20 rillig Exp $ DISTNAME= memcached-1.5.19 CATEGORIES= devel @@ -28,10 +28,10 @@ MEMCACHED_USER?= memcached MEMCACHED_GROUP?= memcached MEMCACHED_HOME?= ${VARBASE}/chroot/${PKGBASE} -PKG_GROUPS= ${MEMCACHED_GROUP} -PKG_USERS= ${MEMCACHED_USER}:${MEMCACHED_GROUP} -PKG_GROUPS_VARS+= MEMCACHED_GROUP -PKG_USERS_VARS= MEMCACHED_USER +PKG_GROUPS= ${MEMCACHED_GROUP} +PKG_USERS= ${MEMCACHED_USER}:${MEMCACHED_GROUP} +PKG_GROUPS_VARS+= MEMCACHED_GROUP +PKG_USERS_VARS= MEMCACHED_USER PKG_HOME.${MEMCACHED_USER}= ${MEMCACHED_HOME} PKG_GECOS.${MEMCACHED_USER}= Memcached diff --git a/devel/menhir/Makefile b/devel/menhir/Makefile index 09d5272f2a1..4aae08cf3ea 100644 --- a/devel/menhir/Makefile +++ b/devel/menhir/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2019/03/21 12:18:56 jaapb Exp $ +# $NetBSD: Makefile,v 1.28 2019/11/03 10:39:20 rillig Exp $ # DISTNAME= menhir-20181113 @@ -10,10 +10,10 @@ HOMEPAGE= http://gallium.inria.fr/~fpottier/menhir/ COMMENT= LR(1) parser generator in OCaml LICENSE= qpl-v1.0 -USE_TOOLS+= gmake +USE_TOOLS+= gmake MAKE_JOBS_SAFE= no -SUPERSEDES= ocaml-menhir-[0-9]* +SUPERSEDES= ocaml-menhir-[0-9]* OCAML_USE_FINDLIB= yes OCAML_FINDLIB_REGISTER= no @@ -25,9 +25,9 @@ MAKE_ENV+= TARGET=native MAKE_ENV+= TARGET=byte .endif -EGDIR= ${PREFIX}/share/examples/${PKGBASE} -MAKE_ENV+= EGDIR=${EGDIR:Q} USE_OCAMLFIND=true \ - OCAML_SITELIBDIR=${OCAML_SITELIBDIR} +EGDIR= ${PREFIX}/share/examples/${PKGBASE} +MAKE_ENV+= EGDIR=${EGDIR:Q} USE_OCAMLFIND=true \ + OCAML_SITELIBDIR=${OCAML_SITELIBDIR} .include "../../devel/ocamlbuild/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/mico/Makefile b/devel/mico/Makefile index 202f4c4d499..2a60d5e7565 100644 --- a/devel/mico/Makefile +++ b/devel/mico/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2018/07/04 13:40:14 jperkin Exp $ +# $NetBSD: Makefile,v 1.10 2019/11/03 10:39:20 rillig Exp $ # # @@ -19,8 +19,8 @@ USE_TOOLS+= gmake msgfmt intltool GNU_CONFIGURE= YES USE_LANGUAGES= c c++ -SUBST_CLASSES+= exampledir -SUBST_STAGE.exampledir= pre-configure +SUBST_CLASSES+= exampledir +SUBST_STAGE.exampledir= pre-configure SUBST_MESSAGE.exampledir= Fixing up examples directory path SUBST_FILES.exampledir= demo/ccm/Makefile demo/Makefile demo/MakeVars SUBST_FILES.exampledir+= demo/csiv2/Makefile demo/csiv2/interop/Makefile diff --git a/devel/mk-configure/mk-c.mk b/devel/mk-configure/mk-c.mk index e807d7ae932..121ce7877af 100644 --- a/devel/mk-configure/mk-c.mk +++ b/devel/mk-configure/mk-c.mk @@ -1,10 +1,10 @@ -# $NetBSD: mk-c.mk,v 1.7 2019/04/08 21:42:57 cheusov Exp $ +# $NetBSD: mk-c.mk,v 1.8 2019/11/03 10:39:20 rillig Exp $ TOOL_DEPENDS+= ${BUILDLINK_API_DEPENDS.mk-c}:${BUILDLINK_PKGSRCDIR.mk-c} -MAKE_PROGRAM= ${PREFIX}/bin/mkcmake -MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR} INSTALL=${INSTALL:Q} -MAKE_ENV+= SYSCONFDIR=${PKG_SYSCONFDIR} +MAKE_PROGRAM= ${PREFIX}/bin/mkcmake +MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR} INSTALL=${INSTALL:Q} +MAKE_ENV+= SYSCONFDIR=${PKG_SYSCONFDIR} CONFIGURE_TARGET?= errorcheck do-configure: diff --git a/devel/monotone-server/Makefile b/devel/monotone-server/Makefile index 8a5c6c5edf5..22cd88878ad 100644 --- a/devel/monotone-server/Makefile +++ b/devel/monotone-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2019/05/23 19:22:58 rillig Exp $ +# $NetBSD: Makefile,v 1.62 2019/11/03 10:39:20 rillig Exp $ # DISTNAME= monotone-1.0 @@ -22,8 +22,8 @@ NO_CHECKSUM= yes RCD_SCRIPTS= monotone PKG_SYSCONFSUBDIR= monotone-server -OWN_DIRS_PERMS= ${PKG_SYSCONFDIR}/keys \ - ${MONOTONE_USER} ${MONOTONE_GROUP} 700 +OWN_DIRS_PERMS= ${PKG_SYSCONFDIR}/keys \ + ${MONOTONE_USER} ${MONOTONE_GROUP} 700 EXAMPLEDIR= ${PREFIX}/share/examples/monotone-server CONF_FILES_PERMS= ${EXAMPLEDIR}/monotonerc \ @@ -55,7 +55,7 @@ PKG_GECOS.${MONOTONE_USER}= Monotone dedicated server PKG_HOME.${MONOTONE_USER}= ${MONOTONE_HOME} PKG_SHELL.${MONOTONE_USER}= ${SH} -SUBST_CLASSES+= vars +SUBST_CLASSES+= vars SUBST_STAGE.vars= do-configure SUBST_MESSAGE.vars= Configuring sources. SUBST_FILES.vars= ${WRKDIR}/monotone-server.7 diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile index 59048501e53..7bfa6884f99 100644 --- a/devel/monotone/Makefile +++ b/devel/monotone/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.110 2019/08/11 13:18:46 wiz Exp $ +# $NetBSD: Makefile,v 1.111 2019/11/03 10:39:20 rillig Exp $ DISTNAME= monotone-1.1 PKGREVISION= 19 @@ -35,7 +35,7 @@ REPLACE_SH= mtnopt # The following are optional scripts for hooks. We do not replace their # interpreter because we want to avoid a dependency on them. (Ideally they # should be in separate packages with appropriate dependencies.) -CHECK_INTERPRETER_SKIP= share/monotone/scripts/monotone-ciabot.py +CHECK_INTERPRETER_SKIP= share/monotone/scripts/monotone-ciabot.py CHECK_INTERPRETER_SKIP+= share/monotone/scripts/monotone-mail-notify .include "../../mk/bsd.options.mk" diff --git a/devel/myrepos/Makefile b/devel/myrepos/Makefile index ab09ec57132..3097cbb14a5 100644 --- a/devel/myrepos/Makefile +++ b/devel/myrepos/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2019/08/11 13:18:46 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/03 10:39:20 rillig Exp $ # DISTNAME= myrepos_1.20180726 @@ -24,7 +24,7 @@ BUILD_TARGET+= build TEST_TARGET+= test USE_TOOLS+= perl:run -REPLACE_PERL+= mr webcheckout +REPLACE_PERL+= mr webcheckout EGDIR= ${PREFIX}/share/examples/mr INSTALLATION_DIRS= bin ${PKGMANDIR} ${EGDIR} diff --git a/devel/ncurses/Makefile.common b/devel/ncurses/Makefile.common index 24445156fb3..48520257629 100644 --- a/devel/ncurses/Makefile.common +++ b/devel/ncurses/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.42 2019/10/10 12:29:11 triaxx Exp $ +# $NetBSD: Makefile.common,v 1.43 2019/11/03 10:39:20 rillig Exp $ # # used by devel/ncurses/Makefile # used by devel/ncursesw/Makefile @@ -75,9 +75,9 @@ CONFIGURE_ENV+= ac_cv_cxx_compiler_gnu=no .if ${OPSYS} == "SunOS" CONFIGURE_ARGS+= --disable-const -TERMINFODIR= share/lib/terminfo +TERMINFODIR= share/lib/terminfo .else -TERMINFODIR= share/terminfo +TERMINFODIR= share/terminfo .endif .if !empty(CC_VERSION:Mgcc-5.*) diff --git a/devel/ncurses/builtin.mk b/devel/ncurses/builtin.mk index 6db4beab442..eae2b071ac4 100644 --- a/devel/ncurses/builtin.mk +++ b/devel/ncurses/builtin.mk @@ -1,21 +1,21 @@ -# $NetBSD: builtin.mk,v 1.41 2019/05/01 20:15:59 gdt Exp $ +# $NetBSD: builtin.mk,v 1.42 2019/11/03 10:39:20 rillig Exp $ BUILTIN_PKG:= ncurses # what we really need for builtin on solaris is in /usr/gnu/lib # -BUILTIN_FIND_LIBS:= ncurses curses terminfo -BUILTIN_FIND_HEADERS_VAR:= H_NCURSES H_CURSES H_CURSES1 -BUILTIN_FIND_HEADERS.H_NCURSES= ncurses.h curses.h +BUILTIN_FIND_LIBS:= ncurses curses terminfo +BUILTIN_FIND_HEADERS_VAR:= H_NCURSES H_CURSES H_CURSES1 +BUILTIN_FIND_HEADERS.H_NCURSES= ncurses.h curses.h #BUILTIN_FIND_HEADERS.H_NCURSES+= ncurses/curses.h -BUILTIN_FIND_GREP.H_NCURSES= \#define[ ]*NCURSES_VERSION -BUILTIN_FIND_HEADERS.H_CURSES= ncurses.h curses.h -BUILTIN_FIND_GREP.H_CURSES= mvwchgat -BUILTIN_FIND_HEADERS.H_CURSES1= ncurses.h curses.h -BUILTIN_FIND_GREP.H_CURSES1= wsyncup -BUILTIN_FIND_FILES_VAR= NCURSES_PC -BUILTIN_FIND_FILES.NCURSES_PC= /usr/lib/pkgconfig/ncurses.pc +BUILTIN_FIND_GREP.H_NCURSES= \#define[ ]*NCURSES_VERSION +BUILTIN_FIND_HEADERS.H_CURSES= ncurses.h curses.h +BUILTIN_FIND_GREP.H_CURSES= mvwchgat +BUILTIN_FIND_HEADERS.H_CURSES1= ncurses.h curses.h +BUILTIN_FIND_GREP.H_CURSES1= wsyncup +BUILTIN_FIND_FILES_VAR= NCURSES_PC +BUILTIN_FIND_FILES.NCURSES_PC= /usr/lib/pkgconfig/ncurses.pc .include "../../mk/buildlink3/bsd.builtin.mk" @@ -32,7 +32,7 @@ IS_BUILTIN.ncurses= no IS_BUILTIN.ncurses= yes . endif .endif -MAKEVARS+= IS_BUILTIN.ncurses +MAKEVARS+= IS_BUILTIN.ncurses ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -50,7 +50,7 @@ BUILTIN_VERSION.ncurses!= \ ' ${H_NCURSES:Q} BUILTIN_PKG.ncurses= ncurses-${BUILTIN_VERSION.ncurses} .endif -MAKEVARS+= BUILTIN_PKG.ncurses +MAKEVARS+= BUILTIN_PKG.ncurses ### ### Determine whether we should use the built-in implementation if it @@ -98,7 +98,7 @@ USE_BUILTIN.ncurses= no . endfor . endif # PREFER.ncurses .endif -MAKEVARS+= USE_BUILTIN.ncurses +MAKEVARS+= USE_BUILTIN.ncurses # If USE_NCURSES is set to yes, the use of an ncurses implementation # is forced. diff --git a/devel/ncursesw/builtin.mk b/devel/ncursesw/builtin.mk index 856dda0bc3e..6d5f9abc6b0 100644 --- a/devel/ncursesw/builtin.mk +++ b/devel/ncursesw/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.15 2019/08/23 01:17:04 schmonz Exp $ +# $NetBSD: builtin.mk,v 1.16 2019/11/03 10:39:20 rillig Exp $ BUILTIN_PKG:= ncursesw @@ -29,7 +29,7 @@ IS_BUILTIN.ncursesw= no IS_BUILTIN.ncursesw= yes . endif .endif -MAKEVARS+= IS_BUILTIN.ncursesw +MAKEVARS+= IS_BUILTIN.ncursesw ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -47,7 +47,7 @@ BUILTIN_VERSION.ncursesw!= \ ' ${H_NCURSESW:Q} BUILTIN_PKG.ncursesw= ncursesw-${BUILTIN_VERSION.ncursesw} .endif -MAKEVARS+= BUILTIN_PKG.ncursesw +MAKEVARS+= BUILTIN_PKG.ncursesw ### ### Determine whether we should use the built-in implementation if it @@ -85,7 +85,7 @@ USE_BUILTIN.ncursesw= yes . endif . endif # PREFER.ncursesw .endif -MAKEVARS+= USE_BUILTIN.ncursesw +MAKEVARS+= USE_BUILTIN.ncursesw # If USE_NCURSES is defined, then only use the built-in "ncursesw" # if it's *actually* ncursesw. diff --git a/devel/netbsd-iscsi-lib/Makefile.common b/devel/netbsd-iscsi-lib/Makefile.common index 7b52a377cd1..d9ab263e9c5 100644 --- a/devel/netbsd-iscsi-lib/Makefile.common +++ b/devel/netbsd-iscsi-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2017/09/03 08:36:52 wiz Exp $ +# $NetBSD: Makefile.common,v 1.7 2019/11/03 10:39:21 rillig Exp $ # # used by net/netbsd-iscsi-target/Makefile # used by net/netbsd-iscsi-initiator/Makefile @@ -16,5 +16,5 @@ AUTO_MKDIRS= yes # ISCSI_INITIATOR_MAX_TARGETS can be overridden in your mk.conf file ISCSI_INITIATOR_MAX_TARGETS?= 16 -MESSAGE_SUBST+= MAX_TARGETS=${ISCSI_INITIATOR_MAX_TARGETS:Q} +MESSAGE_SUBST+= MAX_TARGETS=${ISCSI_INITIATOR_MAX_TARGETS:Q} CFLAGS+= -DCONFIG_INITIATOR_NUM_TARGETS=${ISCSI_INITIATOR_MAX_TARGETS} diff --git a/devel/nsis/Makefile b/devel/nsis/Makefile index 3d2c1cbcd43..1bd2631e158 100644 --- a/devel/nsis/Makefile +++ b/devel/nsis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2019/09/02 13:19:36 adam Exp $ +# $NetBSD: Makefile,v 1.23 2019/11/03 10:39:21 rillig Exp $ # DISTNAME= nsis-${NSIS_VER} @@ -15,12 +15,12 @@ COMMENT= Scriptable system to build Windows installers USE_LANGUAGES= c c++ USE_TOOLS+= pax -PYTHON_VERSIONS_ACCEPTED= 27 # as of 3.04 +PYTHON_VERSIONS_ACCEPTED= 27 # as of 3.04 -NSIS_SRC= ${DISTNAME:=-src} -NSIS_VER= 3.04 -WRKSRC= ${WRKDIR}/${NSIS_SRC} -NO_CONFIGURE= yes +NSIS_SRC= ${DISTNAME:=-src} +NSIS_VER= 3.04 +WRKSRC= ${WRKDIR}/${NSIS_SRC} +NO_CONFIGURE= yes EXTRACT_OPTS_ZIP= -qo MAKENSIS_BIN= ${PREFIX}/share/nsis/makensis diff --git a/devel/nspr-reference/Makefile b/devel/nspr-reference/Makefile index 0d31d97961b..dda94f64281 100644 --- a/devel/nspr-reference/Makefile +++ b/devel/nspr-reference/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2017/09/03 08:01:00 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/03 10:39:21 rillig Exp $ DISTNAME= nspr-reference PKGNAME= ${DISTNAME}-0.1 @@ -10,8 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR COMMENT= HTML Documentation for NSPR -NO_CONFIGURE= YES -NO_BUILD= YES +NO_CONFIGURE= YES +NO_BUILD= YES USE_TOOLS+= pax WRKSRC= ${WRKDIR}/nspr/reference/html diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile index d7f4a1ee206..d5e6f1f46d8 100644 --- a/devel/nspr/Makefile +++ b/devel/nspr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.99 2019/08/11 13:18:47 wiz Exp $ +# $NetBSD: Makefile,v 1.100 2019/11/03 10:39:21 rillig Exp $ DISTNAME= nspr-${NSPR_RELEASE:S/.0$//} NSPR_RELEASE= 4.21.0 @@ -11,15 +11,15 @@ HOMEPAGE= https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR COMMENT= Platform-neutral API for system level and libc like functions LICENSE= mpl-2.0 -CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh -CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh -CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/configure -CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}configure +CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh +CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh +CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}js/src/configure +CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}configure OVERRIDE_DIRDEPTH= 3 GNU_CONFIGURE= yes -GNU_CONFIGURE_LIBSUBDIR=nspr +GNU_CONFIGURE_LIBSUBDIR= nspr CONFIGURE_DIRS= nspr USE_GCC_RUNTIME= yes @@ -46,7 +46,7 @@ SUBST_FILES.nspr-rpath= nspr/lib/libc/src/Makefile.in nspr/lib/ds/Makefile.in SUBST_SED.nspr-rpath= -e 's|$$$$ORIGIN|${PREFIX}/lib/nspr|g' .if ${OPSYS} == "OpenBSD" -CHECK_SHLIBS_SUPPORTED= no +CHECK_SHLIBS_SUPPORTED= no .endif SUBST_CLASSES.Darwin+= exec_path @@ -72,9 +72,9 @@ PLIST_VARS+= sun4u_32 . if defined(ABI) && ${ABI} == "64" CONFIGURE_ARGS+= --enable-64bit . else -HW_CLASS!= ${UNAME} -m +HW_CLASS!= ${UNAME} -m . if ${HW_CLASS} == "sun4u" -PLIST.sun4u_32= yes +PLIST.sun4u_32= yes . endif . endif .endif diff --git a/devel/ocaml-astring/Makefile b/devel/ocaml-astring/Makefile index daded4daee5..c011668475e 100644 --- a/devel/ocaml-astring/Makefile +++ b/devel/ocaml-astring/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2019/03/12 18:04:58 jaapb Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/03 10:39:21 rillig Exp $ DISTNAME= astring-0.8.3 PKGNAME= ocaml-${DISTNAME} @@ -14,7 +14,7 @@ LICENSE= isc USE_LANGUAGES= # none OCAML_USE_TOPKG= yes -OCAML_USE_OPAM= yes +OCAML_USE_OPAM= yes .include "../../devel/ocamlbuild/buildlink3.mk" .include "../../mk/ocaml.mk" diff --git a/devel/ocaml-async_extra/buildlink3.mk b/devel/ocaml-async_extra/buildlink3.mk index b7d0a076ee4..a54283d45b2 100644 --- a/devel/ocaml-async_extra/buildlink3.mk +++ b/devel/ocaml-async_extra/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2019/03/19 10:51:00 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2019/11/03 10:39:21 rillig Exp $ BUILDLINK_TREE+= ocaml-async_extra @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-async_extra OCAML_ASYNC_EXTRA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-async_extra+= ocaml-async_extra>=0.12.0 -BUILDLINK_PKGSRCDIR.ocaml-async_extra?= ../../devel/ocaml-async_extra +BUILDLINK_PKGSRCDIR.ocaml-async_extra?= ../../devel/ocaml-async_extra .endif # OCAML_ASYNC_EXTRA_BUILDLINK3_MK diff --git a/devel/ocaml-async_unix/buildlink3.mk b/devel/ocaml-async_unix/buildlink3.mk index 30e3afbef9c..ed97cdb48d2 100644 --- a/devel/ocaml-async_unix/buildlink3.mk +++ b/devel/ocaml-async_unix/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2019/03/19 10:48:15 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2019/11/03 10:39:21 rillig Exp $ BUILDLINK_TREE+= ocaml-async_unix @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-async_unix OCAML_ASYNC_UNIX_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-async_unix+= ocaml-async_unix>=0.12.0 -BUILDLINK_PKGSRCDIR.ocaml-async_unix?= ../../devel/ocaml-async_unix +BUILDLINK_PKGSRCDIR.ocaml-async_unix?= ../../devel/ocaml-async_unix .endif # OCAML_ASYNC_UNIX_BUILDLINK3_MK diff --git a/devel/ocaml-batteries/Makefile b/devel/ocaml-batteries/Makefile index c9f872504e9..e1590b803fb 100644 --- a/devel/ocaml-batteries/Makefile +++ b/devel/ocaml-batteries/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2018/11/12 16:10:18 jaapb Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/03 10:39:21 rillig Exp $ VERSION= 2.8.0 GITHUB_PROJECT= batteries-included @@ -14,7 +14,7 @@ HOMEPAGE= http://batteries.forge.ocamlcore.org/ COMMENT= Alternative standard library for OCaml LICENSE= gnu-lgpl-v2.1 -USE_TOOLS+= gmake +USE_TOOLS+= gmake OCAML_USE_FINDLIB= yes MAKE_ENV= DESTDIR="${DESTDIR}" PREFIX="${PREFIX}" diff --git a/devel/ocaml-bigstringaf/buildlink3.mk b/devel/ocaml-bigstringaf/buildlink3.mk index 8c3694bc8d9..a208a721cb8 100644 --- a/devel/ocaml-bigstringaf/buildlink3.mk +++ b/devel/ocaml-bigstringaf/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2019/03/12 18:09:29 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2019/11/03 10:39:21 rillig Exp $ BUILDLINK_TREE+= ocaml-bigstringaf @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-bigstringaf OCAML_BIGSTRINGAF_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-bigstringaf+= ocaml-bigstringaf>=0.4.0 -BUILDLINK_PKGSRCDIR.ocaml-bigstringaf?= ../../devel/ocaml-bigstringaf +BUILDLINK_PKGSRCDIR.ocaml-bigstringaf?= ../../devel/ocaml-bigstringaf .endif # OCAML_BIGSTRINGAF_BUILDLINK3_MK diff --git a/devel/ocaml-biniou/Makefile b/devel/ocaml-biniou/Makefile index 75ccdd2b3b5..df766c7e70e 100644 --- a/devel/ocaml-biniou/Makefile +++ b/devel/ocaml-biniou/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2019/03/05 17:37:10 jaapb Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/03 10:39:22 rillig Exp $ GITHUB_PROJECT= biniou GITHUB_TAG= v${PKGVERSION_NOREV} @@ -13,7 +13,7 @@ HOMEPAGE= https://github.com/mjambon/biniou/ COMMENT= Extensible binary data format, like JSON but faster LICENSE= modified-bsd -OCAML_USE_DUNE= yes +OCAML_USE_DUNE= yes INSTALLATION_DIRS+= bin .include "../../mk/ocaml.mk" diff --git a/devel/ocaml-bos/buildlink3.mk b/devel/ocaml-bos/buildlink3.mk index 6736740e08a..404d3e22412 100644 --- a/devel/ocaml-bos/buildlink3.mk +++ b/devel/ocaml-bos/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2019/03/19 11:29:00 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2019/11/03 10:39:22 rillig Exp $ BUILDLINK_TREE+= ocaml-bos @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-bos OCAML_BOS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-bos+= ocaml-bos>=0.2.0 -BUILDLINK_PKGSRCDIR.ocaml-bos?= ../../devel/ocaml-bos +BUILDLINK_PKGSRCDIR.ocaml-bos?= ../../devel/ocaml-bos .endif # OCAML_BOS_BUILDLINK3_MK diff --git a/devel/ocaml-core_kernel/buildlink3.mk b/devel/ocaml-core_kernel/buildlink3.mk index f139f269389..dc082360bd2 100644 --- a/devel/ocaml-core_kernel/buildlink3.mk +++ b/devel/ocaml-core_kernel/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2019/06/11 09:06:33 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2019/11/03 10:39:22 rillig Exp $ BUILDLINK_TREE+= ocaml-core_kernel @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-core_kernel OCAML_CORE_KERNEL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-core_kernel+= ocaml-core_kernel>=0.12.2 -BUILDLINK_PKGSRCDIR.ocaml-core_kernel?= ../../devel/ocaml-core_kernel +BUILDLINK_PKGSRCDIR.ocaml-core_kernel?= ../../devel/ocaml-core_kernel .endif # OCAML_CORE_KERNEL_BUILDLINK3_MK diff --git a/devel/ocaml-cppo/Makefile b/devel/ocaml-cppo/Makefile index 683087f628b..d1efec982dc 100644 --- a/devel/ocaml-cppo/Makefile +++ b/devel/ocaml-cppo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2019/03/05 16:53:49 jaapb Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/03 10:39:22 rillig Exp $ DISTNAME= cppo-1.6.5 PKGNAME= ocaml-${DISTNAME} @@ -20,7 +20,7 @@ OCAML_USE_DUNE= yes INSTALLATION_DIRS+= bin ${OCAML_SITELIBDIR}/cppo_ocamlbuild \ share/doc/ocaml-cppo share/doc/ocaml-cppo_ocamlbuild -OCAML_FINDLIB_DIRS+= cppo_ocamlbuild +OCAML_FINDLIB_DIRS+= cppo_ocamlbuild DUNE_BUILD_PACKAGES= cppo cppo_ocamlbuild OPAM_INSTALL_FILES= cppo cppo_ocamlbuild diff --git a/devel/ocaml-cstruct/Makefile b/devel/ocaml-cstruct/Makefile index a97627b358c..170f09fda7f 100644 --- a/devel/ocaml-cstruct/Makefile +++ b/devel/ocaml-cstruct/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2019/03/19 11:11:31 jaapb Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/03 10:39:22 rillig Exp $ GITHUB_PROJECT= ocaml-cstruct GITHUB_TAG= v${PKGVERSION_NOREV} @@ -11,7 +11,7 @@ HOMEPAGE= https://github.com/mirage/ocaml-cstruct/ COMMENT= Map OCaml arrays onto C-like structs LICENSE= isc -OCAML_USE_DUNE= yes +OCAML_USE_DUNE= yes DUNE_BUILD_PACKAGES= cstruct cstruct-unix OPAM_INSTALL_FILES= cstruct cstruct-unix diff --git a/devel/ocaml-deriving-ocsigen/Makefile b/devel/ocaml-deriving-ocsigen/Makefile index 08ee30e7a8e..cfc3439a34f 100644 --- a/devel/ocaml-deriving-ocsigen/Makefile +++ b/devel/ocaml-deriving-ocsigen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2018/11/12 16:10:19 jaapb Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/03 10:39:22 rillig Exp $ # VERSION= 0.8.1 @@ -14,7 +14,7 @@ MAINTAINER= jaapb@NetBSD.org HOMEPAGE= https://github.com/ocsigen/deriving LICENSE= mit -USE_TOOLS= gmake +USE_TOOLS= gmake OCAML_USE_OASIS_DYNRUN= yes OCAML_FINDLIB_DIRS= deriving diff --git a/devel/ocaml-dune/Makefile b/devel/ocaml-dune/Makefile index e126ee3328f..10457e23ce1 100644 --- a/devel/ocaml-dune/Makefile +++ b/devel/ocaml-dune/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2019/11/01 19:41:46 maya Exp $ +# $NetBSD: Makefile,v 1.5 2019/11/03 10:39:22 rillig Exp $ GITHUB_PROJECT= dune #GITHUB_TAG= ${PKGVERSION_NOREV:S/_/+/} @@ -15,17 +15,17 @@ LICENSE= apache-2.0 CONFLICTS= ocaml-jbuilder-[0-9]* SUPERSEDES= ocaml-jbuilder-[0-9]* -USE_TOOLS+= gmake -USE_LANGUAGES= # none +USE_TOOLS+= gmake +USE_LANGUAGES= # none UNLIMIT_RESOURCES+= stacksize -BUILD_TARGET= release -MAKE_ENV+= MAKE_JOBS=${MAKE_JOBS:U1} +BUILD_TARGET= release +MAKE_ENV+= MAKE_JOBS=${MAKE_JOBS:U1} INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 ${OCAML_SITELIBDIR}/dune OCAML_USE_FINDLIB= yes OCAML_FINDLIB_DIRS= dune stublibs -OCAML_USE_OPAM= yes +OCAML_USE_OPAM= yes .include "../../mk/ocaml.mk" diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile index ec45ee81eb4..16c4e6608e7 100644 --- a/devel/ocaml-findlib/Makefile +++ b/devel/ocaml-findlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2019/07/31 09:07:00 jaapb Exp $ +# $NetBSD: Makefile,v 1.46 2019/11/03 10:39:22 rillig Exp $ DISTNAME= findlib-1.8.1 PKGNAME= ocaml-${DISTNAME} @@ -34,7 +34,7 @@ CONFIGURE_ARGS+= -config ${PKG_SYSCONFDIR}/ocamlfind.conf CONFIGURE_ARGS+= -sitelib ${PREFIX}/${OCAML_SITELIBDIR} CONFIGURE_ARGS+= -no-camlp4 -BUILD_TARGET= all +BUILD_TARGET= all .if ${OCAML_USE_OPT_COMPILER} == "yes" BUILD_TARGET+= opt .endif diff --git a/devel/ocaml-fmt/Makefile b/devel/ocaml-fmt/Makefile index 7b1ad89884b..86ca79e6c66 100644 --- a/devel/ocaml-fmt/Makefile +++ b/devel/ocaml-fmt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2019/06/17 09:19:57 jaapb Exp $ +# $NetBSD: Makefile,v 1.5 2019/11/03 10:39:22 rillig Exp $ DISTNAME= fmt-0.8.5 PKGNAME= ocaml-${DISTNAME} @@ -15,7 +15,7 @@ LICENSE= isc USE_LANGUAGES= # none OCAML_USE_TOPKG= yes -OCAML_USE_OPAM= yes +OCAML_USE_OPAM= yes .include "../../mk/ocaml.mk" .include "../../devel/ocamlbuild/buildlink3.mk" diff --git a/devel/ocaml-fmt/buildlink3.mk b/devel/ocaml-fmt/buildlink3.mk index 8af9b1254d7..719fae16c5f 100644 --- a/devel/ocaml-fmt/buildlink3.mk +++ b/devel/ocaml-fmt/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2019/06/17 09:19:57 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2019/11/03 10:39:22 rillig Exp $ BUILDLINK_TREE+= ocaml-fmt @@ -7,7 +7,7 @@ OCAML_FMT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-fmt+= ocaml-fmt>=0.8.5 BUILDLINK_ABI_DEPENDS.ocaml-fmt+= ocaml-fmt>=0.8.5nb1 -BUILDLINK_PKGSRCDIR.ocaml-fmt?= ../../devel/ocaml-fmt +BUILDLINK_PKGSRCDIR.ocaml-fmt?= ../../devel/ocaml-fmt .endif # OCAML_FMT_BUILDLINK3_MK diff --git a/devel/ocaml-fpath/Makefile b/devel/ocaml-fpath/Makefile index c4ec4860f7c..eb00608ef22 100644 --- a/devel/ocaml-fpath/Makefile +++ b/devel/ocaml-fpath/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2019/03/19 11:19:17 jaapb Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/03 10:39:23 rillig Exp $ DISTNAME= fpath-0.7.2 PKGNAME= ocaml-${DISTNAME} @@ -14,7 +14,7 @@ LICENSE= isc USE_LANGUAGES= # none OCAML_USE_TOPKG= yes -OCAML_USE_OPAM= yes +OCAML_USE_OPAM= yes .include "../../devel/ocaml-astring/buildlink3.mk" .include "../../devel/ocamlbuild/buildlink3.mk" diff --git a/devel/ocaml-git/Makefile b/devel/ocaml-git/Makefile index 25155a69641..594614934e3 100644 --- a/devel/ocaml-git/Makefile +++ b/devel/ocaml-git/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2019/07/01 16:08:51 jaapb Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/03 10:39:23 rillig Exp $ GITHUB_PROJECT= ocaml-git DISTNAME= ${GITHUB_PROJECT}-2.0.0 @@ -6,14 +6,14 @@ PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GITHUB:=mirage/} -MAINTAINER= jaapb@NetBSD.org +MAINTAINER= jaapb@NetBSD.org HOMEPAGE= https://github.com/mirage/ocaml-git/ COMMENT= Pure-language git bindings for OCaml LICENSE= isc USE_LANGUAGES= # none -OCAML_USE_DUNE= yes +OCAML_USE_DUNE= yes DUNE_BUILD_PACKAGES= git OPAM_INSTALL_FILES= git diff --git a/devel/ocaml-git/options.mk b/devel/ocaml-git/options.mk index d9d8bd55b6a..77559f87b3d 100644 --- a/devel/ocaml-git/options.mk +++ b/devel/ocaml-git/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2019/07/01 16:08:51 jaapb Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/03 10:39:23 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ocaml-git PKG_SUPPORTED_OPTIONS= unix http @@ -24,13 +24,13 @@ OPAM_INSTALL_FILES+= git-http ### unix support ### .if !empty(PKG_OPTIONS:Munix) -.if !empty(PKG_OPTIONS:Mhttp) # unix needs http +. if !empty(PKG_OPTIONS:Mhttp) # unix needs http .include "../../www/ocaml-cohttp/buildlink3.mk" .include "../../time/ocaml-mtime/buildlink3.mk" PLIST.unix= yes DUNE_BUILD_PACKAGES+= git-unix OPAM_INSTALL_FILES+= git-unix -.else +. else PKG_FAIL_REASON+= "unix option needs http" -.endif +. endif .endif diff --git a/devel/ocaml-hex/buildlink3.mk b/devel/ocaml-hex/buildlink3.mk index aba0d9aeb27..d6fb03782e1 100644 --- a/devel/ocaml-hex/buildlink3.mk +++ b/devel/ocaml-hex/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2019/03/19 12:56:46 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2019/11/03 10:39:23 rillig Exp $ BUILDLINK_TREE+= ocaml-hex @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-hex OCAML_HEX_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-hex+= ocaml-hex>=1.3.0 -BUILDLINK_PKGSRCDIR.ocaml-hex?= ../../devel/ocaml-hex +BUILDLINK_PKGSRCDIR.ocaml-hex?= ../../devel/ocaml-hex .endif # OCAML_HEX_BUILDLINK3_MK diff --git a/devel/ocaml-jane-street-headers/buildlink3.mk b/devel/ocaml-jane-street-headers/buildlink3.mk index 50e1673d058..2f018f4da58 100644 --- a/devel/ocaml-jane-street-headers/buildlink3.mk +++ b/devel/ocaml-jane-street-headers/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2019/03/13 11:35:47 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2019/11/03 10:39:23 rillig Exp $ BUILDLINK_TREE+= ocaml-jane-street-headers @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-jane-street-headers OCAML_JANE_STREET_HEADERS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-jane-street-headers+= ocaml-jane-street-headers>=0.12.0 -BUILDLINK_PKGSRCDIR.ocaml-jane-street-headers?= ../../devel/ocaml-jane-street-headers +BUILDLINK_PKGSRCDIR.ocaml-jane-street-headers?= ../../devel/ocaml-jane-street-headers .endif # OCAML_JANE_STREET_HEADERS_BUILDLINK3_MK BUILDLINK_TREE+= -ocaml-jane-street-headers diff --git a/devel/ocaml-jbuilder/Makefile b/devel/ocaml-jbuilder/Makefile index 149ee180ade..dfca6e72dcd 100644 --- a/devel/ocaml-jbuilder/Makefile +++ b/devel/ocaml-jbuilder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2018/11/12 16:10:19 jaapb Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/03 10:39:23 rillig Exp $ GITHUB_PROJECT= jbuilder GITHUB_TAG= ${PKGVERSION_NOREV:S/_/+/} @@ -13,12 +13,12 @@ HOMEPAGE= https://github.com/janestreet/jbuilder/ COMMENT= Composable build system for OCaml LICENSE= apache-2.0 -WRKSRC= ${WRKDIR}/dune-${PKGVERSION_NOREV:S/_/-/} -USE_LANGUAGES= # none +WRKSRC= ${WRKDIR}/dune-${PKGVERSION_NOREV:S/_/-/} +USE_LANGUAGES= # none UNLIMIT_RESOURCES+= stacksize -BUILD_TARGET= default -MAKE_ENV+= MAKE_JOBS=${MAKE_JOBS:U1} +BUILD_TARGET= default +MAKE_ENV+= MAKE_JOBS=${MAKE_JOBS:U1} INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 ${OCAML_SITELIBDIR}/jbuilder OCAML_USE_FINDLIB= yes diff --git a/devel/ocaml-js-build-tools/Makefile b/devel/ocaml-js-build-tools/Makefile index 93ef057d64a..e90d7c86d60 100644 --- a/devel/ocaml-js-build-tools/Makefile +++ b/devel/ocaml-js-build-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2018/11/12 16:10:19 jaapb Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/03 10:39:23 rillig Exp $ VERSION= 113.33.06 GITHUB_PROJECT= js-build-tools @@ -13,8 +13,8 @@ HOMEPAGE= https://github.com/janestreet/js-build-tools/ COMMENT= OCaml build helper tools from Jane Street LICENSE= apache-2.0 -HAS_CONFIGURE= yes -USE_LANGUAGES= # none +HAS_CONFIGURE= yes +USE_LANGUAGES= # none OCAML_USE_FINDLIB= yes .include "../../devel/ocaml-oasis/buildlink3.mk" diff --git a/devel/ocaml-jst-config/buildlink3.mk b/devel/ocaml-jst-config/buildlink3.mk index e20c53f2eb5..ea9d9305b0e 100644 --- a/devel/ocaml-jst-config/buildlink3.mk +++ b/devel/ocaml-jst-config/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2019/03/13 11:39:36 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2019/11/03 10:39:23 rillig Exp $ BUILDLINK_TREE+= ocaml-jst-config @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-jst-config OCAML_JST_CONFIG_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-jst-config+= ocaml-jst-config>=0.12.0 -BUILDLINK_PKGSRCDIR.ocaml-jst-config?= ../../devel/ocaml-jst-config +BUILDLINK_PKGSRCDIR.ocaml-jst-config?= ../../devel/ocaml-jst-config .endif # OCAML_JST_CONFIG_BUILDLINK3_MK diff --git a/devel/ocaml-logs/Makefile b/devel/ocaml-logs/Makefile index e1a1c2f4e4c..df73eb75856 100644 --- a/devel/ocaml-logs/Makefile +++ b/devel/ocaml-logs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2019/03/19 11:25:41 jaapb Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/03 10:39:23 rillig Exp $ DISTNAME= logs-0.6.2 PKGNAME= ocaml-${DISTNAME} @@ -14,7 +14,7 @@ LICENSE= isc USE_LANGUAGES= # none OCAML_USE_TOPKG= yes -OCAML_USE_OPAM= yes +OCAML_USE_OPAM= yes .include "options.mk" .include "../../devel/ocamlbuild/buildlink3.mk" diff --git a/devel/ocaml-lru/Makefile b/devel/ocaml-lru/Makefile index c93b0a821d6..082f56c8966 100644 --- a/devel/ocaml-lru/Makefile +++ b/devel/ocaml-lru/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2019/03/19 14:21:34 jaapb Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/03 10:39:23 rillig Exp $ GITHUB_PROJECT= lru GITHUB_TAG= v${PKGVERSION_NOREV} @@ -15,7 +15,7 @@ LICENSE= isc USE_LANGUAGES= # none OCAML_USE_TOPKG= yes -OCAML_USE_OPAM= yes +OCAML_USE_OPAM= yes .include "../../devel/ocaml-psq/buildlink3.mk" .include "../../devel/ocamlbuild/buildlink3.mk" diff --git a/devel/ocaml-lru/buildlink3.mk b/devel/ocaml-lru/buildlink3.mk index fb99ddd09a7..325765e04c4 100644 --- a/devel/ocaml-lru/buildlink3.mk +++ b/devel/ocaml-lru/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2019/03/19 14:21:34 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2019/11/03 10:39:23 rillig Exp $ BUILDLINK_TREE+= ocaml-lru @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-lru OCAML_LRU_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-lru+= ocaml-lru>=0.2.0 -BUILDLINK_PKGSRCDIR.ocaml-lru?= ../../devel/ocaml-lru +BUILDLINK_PKGSRCDIR.ocaml-lru?= ../../devel/ocaml-lru .endif # OCAML_LRU_BUILDLINK3_MK diff --git a/devel/ocaml-lwt_camlp4/Makefile b/devel/ocaml-lwt_camlp4/Makefile index 34d213c6aa3..6f655054538 100644 --- a/devel/ocaml-lwt_camlp4/Makefile +++ b/devel/ocaml-lwt_camlp4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2019/03/05 17:41:04 jaapb Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/03 10:39:24 rillig Exp $ GITHUB_PROJECT= lwt_camlp4 GITHUB_TAG= 45f25a0 @@ -17,7 +17,7 @@ CONFLICTS= ocaml-lwt<3.0.0 WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-45f25a081e01071ab566924b48ba5f7553bb33ac -OCAML_USE_DUNE= yes +OCAML_USE_DUNE= yes DUNE_BUILD_PACKAGES= lwt_camlp4 .include "../../mk/ocaml.mk" diff --git a/devel/ocaml-lwt_camlp4/buildlink3.mk b/devel/ocaml-lwt_camlp4/buildlink3.mk index 6b3c1507359..21851ac5763 100644 --- a/devel/ocaml-lwt_camlp4/buildlink3.mk +++ b/devel/ocaml-lwt_camlp4/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2019/03/05 17:41:04 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2019/11/03 10:39:24 rillig Exp $ BUILDLINK_TREE+= ocaml-lwt_camlp4 @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-lwt_camlp4 OCAML_LWT_CAMLP4_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-lwt_camlp4+= ocaml-lwt_camlp4>=20180325nb4 -BUILDLINK_PKGSRCDIR.ocaml-lwt_camlp4?= ../../devel/ocaml-lwt_camlp4 +BUILDLINK_PKGSRCDIR.ocaml-lwt_camlp4?= ../../devel/ocaml-lwt_camlp4 .include "../../devel/ocaml-lwt/buildlink3.mk" .include "../../lang/camlp4/buildlink3.mk" diff --git a/devel/ocaml-lwt_ssl/Makefile b/devel/ocaml-lwt_ssl/Makefile index 2ddd013e83d..92c0af74932 100644 --- a/devel/ocaml-lwt_ssl/Makefile +++ b/devel/ocaml-lwt_ssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2019/03/05 17:48:09 jaapb Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/03 10:39:24 rillig Exp $ GITHUB_PROJECT= lwt_ssl GITHUB_TAG= ${PKGVERSION_NOREV} @@ -15,7 +15,7 @@ LICENSE= gnu-lgpl-v2.1 CONFLICTS= ocaml-lwt<3.0.0 -OCAML_USE_DUNE= yes +OCAML_USE_DUNE= yes DUNE_BUILD_PACKAGES= lwt_ssl .include "../../mk/ocaml.mk" diff --git a/devel/ocaml-migrate-parsetree/Makefile b/devel/ocaml-migrate-parsetree/Makefile index 865980781f0..a0bd264886f 100644 --- a/devel/ocaml-migrate-parsetree/Makefile +++ b/devel/ocaml-migrate-parsetree/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2019/07/31 09:11:54 jaapb Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/03 10:39:24 rillig Exp $ GITHUB_PROJECT= ocaml-migrate-parsetree GITHUB_TAG= v${PKGVERSION_NOREV} @@ -11,10 +11,10 @@ HOMEPAGE= https://github.com/let-def/ocaml-migrate-parsetree/ COMMENT= Migrate parse trees between versions of OCaml LICENSE= gnu-lgpl-v2.1 -USE_LANGUAGES= c +USE_LANGUAGES= c OCAML_USE_FINDLIB= yes OCAML_FINDLIB_DIRS= ${GITHUB_PROJECT} -OCAML_USE_DUNE= yes +OCAML_USE_DUNE= yes OPAM_INSTALL_FILES= ${GITHUB_PROJECT} .include "../../mk/ocaml.mk" diff --git a/devel/ocaml-ocplib-endian/Makefile b/devel/ocaml-ocplib-endian/Makefile index 2bdb357dc65..79a2b0f179e 100644 --- a/devel/ocaml-ocplib-endian/Makefile +++ b/devel/ocaml-ocplib-endian/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2019/03/19 11:35:33 jaapb Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/03 10:39:24 rillig Exp $ GITHUB_PROJECT= ocplib-endian DISTNAME= ${GITHUB_PROJECT}-1.0 @@ -11,7 +11,7 @@ HOMEPAGE= https://github.com/OCamlPro/ocplib-endian/ COMMENT= Optimised functions to read and write int16/32/64 LICENSE= gnu-lgpl-v2.1 -USE_LANGUAGES= # none +USE_LANGUAGES= # none OCAML_USE_OASIS= yes .include "../../mk/ocaml.mk" diff --git a/devel/ocaml-parsexp/Makefile b/devel/ocaml-parsexp/Makefile index e33ab670fa3..4a1dc99c72b 100644 --- a/devel/ocaml-parsexp/Makefile +++ b/devel/ocaml-parsexp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2019/03/05 17:51:42 jaapb Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/03 10:39:24 rillig Exp $ GITHUB_PROJECT= parsexp GITHUB_TAG= v${PKGVERSION_NOREV} @@ -13,7 +13,7 @@ COMMENT= S-expression parsing library for OCaml LICENSE= apache-2.0 OCAML_USE_FINDLIB= yes -OCAML_USE_DUNE= yes +OCAML_USE_DUNE= yes UNLIMIT_RESOURCES+= stacksize # needed for very large constant .include "../../devel/ocaml-base/buildlink3.mk" diff --git a/devel/ocaml-ppx_assert/buildlink3.mk b/devel/ocaml-ppx_assert/buildlink3.mk index 9f2ed36d107..fc55ac84657 100644 --- a/devel/ocaml-ppx_assert/buildlink3.mk +++ b/devel/ocaml-ppx_assert/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2019/03/12 18:42:12 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2019/11/03 10:39:24 rillig Exp $ BUILDLINK_TREE+= ocaml-ppx_assert @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-ppx_assert OCAML_PPX_ASSERT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-ppx_assert+= ocaml-ppx_assert>=0.12.0 -BUILDLINK_PKGSRCDIR.ocaml-ppx_assert?= ../../devel/ocaml-ppx_assert +BUILDLINK_PKGSRCDIR.ocaml-ppx_assert?= ../../devel/ocaml-ppx_assert .endif # OCAML_PPX_ASSERT_BUILDLINK3_MK diff --git a/devel/ocaml-ppx_expect/buildlink3.mk b/devel/ocaml-ppx_expect/buildlink3.mk index fd7180e5aa1..2fb97693dfc 100644 --- a/devel/ocaml-ppx_expect/buildlink3.mk +++ b/devel/ocaml-ppx_expect/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2019/03/13 11:19:15 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2019/11/03 10:39:24 rillig Exp $ BUILDLINK_TREE+= ocaml-ppx_expect @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-ppx_expect OCAML_PPX_EXPECT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-ppx_expect+= ocaml-ppx_expect>=0.12.0 -BUILDLINK_PKGSRCDIR.ocaml-ppx_expect?= ../../devel/ocaml-ppx_expect +BUILDLINK_PKGSRCDIR.ocaml-ppx_expect?= ../../devel/ocaml-ppx_expect .endif # OCAML_PPX_EXPECT_BUILDLINK3_MK diff --git a/devel/ocaml-ppx_sexp_conv/Makefile b/devel/ocaml-ppx_sexp_conv/Makefile index 9d680c93919..d4c1c8dfa37 100644 --- a/devel/ocaml-ppx_sexp_conv/Makefile +++ b/devel/ocaml-ppx_sexp_conv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2019/03/05 18:06:23 jaapb Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/03 10:39:24 rillig Exp $ GITHUB_PROJECT= ppx_sexp_conv GITHUB_TAG= v${PKGVERSION_NOREV} @@ -12,9 +12,9 @@ HOMEPAGE= https://github.com/janestreet/ppx_sexp_conv/ COMMENT= Generation of S-expression conversion functions from type definitions LICENSE= apache-2.0 -USE_LANGUAGES= # none +USE_LANGUAGES= # none OCAML_USE_FINDLIB= yes -OCAML_USE_DUNE= yes +OCAML_USE_DUNE= yes .include "../../devel/ocaml-base/buildlink3.mk" .include "../../devel/ocaml-migrate-parsetree/buildlink3.mk" diff --git a/devel/ocaml-ppx_stable/buildlink3.mk b/devel/ocaml-ppx_stable/buildlink3.mk index 11981b6255c..e77d3f2318e 100644 --- a/devel/ocaml-ppx_stable/buildlink3.mk +++ b/devel/ocaml-ppx_stable/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2019/03/19 10:29:26 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2019/11/03 10:39:24 rillig Exp $ BUILDLINK_TREE+= ocaml-ppx_stable @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-ppx_stable OCAML_PPX_STABLE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-ppx_stable+= ocaml-ppx_stable>=0.12.0 -BUILDLINK_PKGSRCDIR.ocaml-ppx_stable?= ../../devel/ocaml-ppx_stable +BUILDLINK_PKGSRCDIR.ocaml-ppx_stable?= ../../devel/ocaml-ppx_stable .endif # OCAML_PPX_STABLE_BUILDLINK3_MK diff --git a/devel/ocaml-ppx_tools/Makefile b/devel/ocaml-ppx_tools/Makefile index 895fcbc91c2..345e14de370 100644 --- a/devel/ocaml-ppx_tools/Makefile +++ b/devel/ocaml-ppx_tools/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.14 2019/08/01 20:31:47 jperkin Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/03 10:39:25 rillig Exp $ -VERSION= 5.3 +VERSION= 5.3 GITHUB_PROJECT= ppx_tools GITHUB_TAG= ${VERSION}+4.08.0 DISTNAME= ${GITHUB_PROJECT}-${VERSION} -PKGNAME= ocaml-${DISTNAME} +PKGNAME= ocaml-${DISTNAME} CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GITHUB:=ocaml-ppx/} @@ -13,14 +13,14 @@ HOMEPAGE= https://github.com/ocaml-ppx/ppx_tools/ COMMENT= Tools for authors of OCaml ppx rewriters LICENSE= mit -WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${VERSION}-4.08.0 -USE_LANGUAGES= # none -USE_TOOLS+= gmake +WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${VERSION}-4.08.0 +USE_LANGUAGES= # none +USE_TOOLS+= gmake OCAML_USE_FINDLIB= yes MAKE_JOBS_SAFE= no -#BUILDLINK_API_DEPENDS.ocaml+= ocaml>=4.08.0 # this really needs 4.08 +#BUILDLINK_API_DEPENDS.ocaml+= ocaml>=4.08.0 # this really needs 4.08 .include "../../mk/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-ppx_tools_versioned/Makefile b/devel/ocaml-ppx_tools_versioned/Makefile index 99aa77628d7..7d374168a06 100644 --- a/devel/ocaml-ppx_tools_versioned/Makefile +++ b/devel/ocaml-ppx_tools_versioned/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2019/07/31 09:15:50 jaapb Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/03 10:39:25 rillig Exp $ VERSION= 5.2.3 GITHUB_PROJECT= ppx_tools_versioned @@ -16,7 +16,7 @@ USE_LANGUAGES= # none USE_TOOLS= gmake OCAML_USE_FINDLIB= yes -OCAML_USE_DUNE= yes +OCAML_USE_DUNE= yes .include "../../devel/ocaml-migrate-parsetree/buildlink3.mk" .include "../../mk/ocaml.mk" diff --git a/devel/ocaml-ppxfind/Makefile b/devel/ocaml-ppxfind/Makefile index e8aa1a099d4..7978c49985c 100644 --- a/devel/ocaml-ppxfind/Makefile +++ b/devel/ocaml-ppxfind/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2019/07/15 10:45:28 jaapb Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/03 10:39:25 rillig Exp $ GITHUB_PROJECT= ppxfind DISTNAME= ${GITHUB_PROJECT}-1.3 @@ -11,7 +11,7 @@ HOMEPAGE= https://github.com/diml/ppxfind/ COMMENT= OCamlfind ppx tool LICENSE= modified-bsd -OCAML_USE_DUNE= yes +OCAML_USE_DUNE= yes INSTALL_UNSTRIPPED= yes .include "../../mk/ocaml.mk" diff --git a/devel/ocaml-ppxlib/Makefile b/devel/ocaml-ppxlib/Makefile index 6498886f6f9..1bf0b6a8f37 100644 --- a/devel/ocaml-ppxlib/Makefile +++ b/devel/ocaml-ppxlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2019/05/30 09:29:23 jaapb Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/03 10:39:25 rillig Exp $ GITHUB_PROJECT= ppxlib GITHUB_TAG= ${PKGVERSION_NOREV} @@ -17,11 +17,11 @@ USE_TOOLS+= bash OCAML_USE_DUNE= yes SUPERSEDES= ocaml-ppx_ast-[0-9]* \ - ocaml-ppx_core-[0-9]* \ - ocaml-ppx_driver-[0-9]* \ - ocaml-ppx_metaquot-[0-9]* \ - ocaml-ppx_traverse_builtins-[0-9]* \ - ocaml-ppx_type_conv-[0-9]* + ocaml-ppx_core-[0-9]* \ + ocaml-ppx_driver-[0-9]* \ + ocaml-ppx_metaquot-[0-9]* \ + ocaml-ppx_traverse_builtins-[0-9]* \ + ocaml-ppx_type_conv-[0-9]* .include "../../devel/ocaml-base/buildlink3.mk" .include "../../devel/ocaml-compiler-libs/buildlink3.mk" diff --git a/devel/ocaml-psq/Makefile b/devel/ocaml-psq/Makefile index e4bbf1fab8d..62f3b79cad5 100644 --- a/devel/ocaml-psq/Makefile +++ b/devel/ocaml-psq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2019/03/19 14:19:47 jaapb Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/03 10:39:25 rillig Exp $ GITHUB_PROJECT= psq GITHUB_TAG= v${PKGVERSION_NOREV} @@ -15,7 +15,7 @@ LICENSE= isc USE_LANGUAGES= # none OCAML_USE_TOPKG= yes -OCAML_USE_OPAM= yes +OCAML_USE_OPAM= yes .include "../../devel/ocamlbuild/buildlink3.mk" .include "../../mk/ocaml.mk" diff --git a/devel/ocaml-psq/buildlink3.mk b/devel/ocaml-psq/buildlink3.mk index 481c7549577..9e2892a2c2c 100644 --- a/devel/ocaml-psq/buildlink3.mk +++ b/devel/ocaml-psq/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2019/03/19 14:19:47 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2019/11/03 10:39:25 rillig Exp $ BUILDLINK_TREE+= ocaml-psq @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-psq OCAML_PSQ_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-psq+= ocaml-psq>=0.1.0 -BUILDLINK_PKGSRCDIR.ocaml-psq?= ../../devel/ocaml-psq +BUILDLINK_PKGSRCDIR.ocaml-psq?= ../../devel/ocaml-psq .endif # OCAML_PSQ_BUILDLINK3_MK BUILDLINK_TREE+= -ocaml-psq diff --git a/devel/ocaml-re/Makefile b/devel/ocaml-re/Makefile index e12fd1dff32..c5158860ba9 100644 --- a/devel/ocaml-re/Makefile +++ b/devel/ocaml-re/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2019/08/11 13:18:47 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/03 10:39:25 rillig Exp $ VERSION= 1.8.0 GITHUB_PROJECT= ocaml-re @@ -16,7 +16,7 @@ INSTALLATION_DIRS+= ${OCAML_SITELIBDIR}/re/emacs ${OCAML_SITELIBDIR}/re/glob \ ${OCAML_SITELIBDIR}/re/pcre ${OCAML_SITELIBDIR}/re/perl \ ${OCAML_SITELIBDIR}/re/posix ${OCAML_SITELIBDIR}/re/str \ share/doc/re -OCAML_USE_DUNE= yes +OCAML_USE_DUNE= yes .include "../../mk/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-re/buildlink3.mk b/devel/ocaml-re/buildlink3.mk index 0fa6ebf0fd4..f9bdd57f491 100644 --- a/devel/ocaml-re/buildlink3.mk +++ b/devel/ocaml-re/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2019/03/05 16:50:45 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2019/11/03 10:39:25 rillig Exp $ BUILDLINK_TREE+= ocaml-re @@ -7,7 +7,7 @@ OCAML_RE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-re+= ocaml-re>=1.6.0 BUILDLINK_ABI_DEPENDS.ocaml-re+= ocaml-re>=1.8.0nb1 -BUILDLINK_PKGSRCDIR.ocaml-re?= ../../devel/ocaml-re +BUILDLINK_PKGSRCDIR.ocaml-re?= ../../devel/ocaml-re .endif # OCAML_RE_BUILDLINK3_MK BUILDLINK_TREE+= -ocaml-re diff --git a/devel/ocaml-resource-pooling/Makefile b/devel/ocaml-resource-pooling/Makefile index 0cee5c51a70..94469ddbfdb 100644 --- a/devel/ocaml-resource-pooling/Makefile +++ b/devel/ocaml-resource-pooling/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2019/01/29 14:20:26 jaapb Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/03 10:39:26 rillig Exp $ GITHUB_PROJECT= resource-pooling DISTNAME= ${GITHUB_PROJECT}-0.6 @@ -11,7 +11,7 @@ HOMEPAGE= https://github.com/ocsigen/resource-pooling/ COMMENT= Library for pooling resources like connections and threads LICENSE= mit -USE_LANGUAGES= # none +USE_LANGUAGES= # none OCAML_USE_OASIS= yes .include "../../devel/ocaml-lwt/buildlink3.mk" diff --git a/devel/ocaml-result/Makefile b/devel/ocaml-result/Makefile index 6a88af38b94..993c9779417 100644 --- a/devel/ocaml-result/Makefile +++ b/devel/ocaml-result/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2019/03/05 16:27:42 jaapb Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/03 10:39:26 rillig Exp $ GITHUB_PROJECT= result DISTNAME= ${GITHUB_PROJECT}-1.3 @@ -12,8 +12,8 @@ HOMEPAGE= https://github.com/janestreet/result/ COMMENT= OCaml compatibility library for Result module LICENSE= modified-bsd -USE_LANGUAGES= # none -OCAML_USE_DUNE= yes +USE_LANGUAGES= # none +OCAML_USE_DUNE= yes INSTALLATION_DIRS+= ${OCAML_SITELIBDIR}/result share/doc/result .include "../../mk/ocaml.mk" diff --git a/devel/ocaml-rresult/Makefile b/devel/ocaml-rresult/Makefile index 6a6a6387001..61d17aceaf2 100644 --- a/devel/ocaml-rresult/Makefile +++ b/devel/ocaml-rresult/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2019/05/30 10:00:07 jaapb Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/03 10:39:26 rillig Exp $ DISTNAME= rresult-0.6.0 PKGNAME= ocaml-${DISTNAME} @@ -15,7 +15,7 @@ LICENSE= isc USE_LANGUAGES= # none OCAML_USE_TOPKG= yes -OCAML_USE_OPAM= yes +OCAML_USE_OPAM= yes .include "../../devel/ocamlbuild/buildlink3.mk" .include "../../devel/ocaml-compiler-libs/buildlink3.mk" diff --git a/devel/ocaml-seq/Makefile b/devel/ocaml-seq/Makefile index bc5161609dd..96143cf222c 100644 --- a/devel/ocaml-seq/Makefile +++ b/devel/ocaml-seq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2019/05/13 11:30:24 jaapb Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/03 10:39:26 rillig Exp $ GITHUB_PROJECT= seq DISTNAME= ${GITHUB_PROJECT}-0.1 @@ -11,8 +11,8 @@ HOMEPAGE= https://github.com/c-cube/seq/ COMMENT= Ocaml seq library compatibility package LICENSE= gnu-lgpl-v2.1 -USE_LANGUAGES= # none -USE_TOOLS+= gmake +USE_LANGUAGES= # none +USE_TOOLS+= gmake OCAML_USE_FINDLIB= yes BUILD_TARGET= build diff --git a/devel/ocaml-seq/buildlink3.mk b/devel/ocaml-seq/buildlink3.mk index 4a5f03ec4d5..a501b915636 100644 --- a/devel/ocaml-seq/buildlink3.mk +++ b/devel/ocaml-seq/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2019/05/13 11:30:24 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2019/11/03 10:39:26 rillig Exp $ BUILDLINK_TREE+= ocaml-seq @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-seq OCAML_SEQ_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-seq+= ocaml-seq>=0.1 -BUILDLINK_PKGSRCDIR.ocaml-seq?= ../../devel/ocaml-seq +BUILDLINK_PKGSRCDIR.ocaml-seq?= ../../devel/ocaml-seq .endif # OCAML_SEQ_BUILDLINK3_MK diff --git a/devel/ocaml-sexplib/Makefile b/devel/ocaml-sexplib/Makefile index 1c73120586f..a8c2d25dd83 100644 --- a/devel/ocaml-sexplib/Makefile +++ b/devel/ocaml-sexplib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2019/03/05 18:17:19 jaapb Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/03 10:39:26 rillig Exp $ GITHUB_PROJECT= sexplib GITHUB_TAG= v${PKGVERSION_NOREV} @@ -13,7 +13,7 @@ COMMENT= S-Expressions with Type Converters for OCaml LICENSE= modified-bsd AND apache-2.0 OCAML_USE_FINDLIB= yes -OCAML_USE_DUNE= yes +OCAML_USE_DUNE= yes BUILD_TARGET= default diff --git a/devel/ocaml-sexplib0/Makefile b/devel/ocaml-sexplib0/Makefile index e0fafe07000..afebf1b63bb 100644 --- a/devel/ocaml-sexplib0/Makefile +++ b/devel/ocaml-sexplib0/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2019/03/05 16:13:26 jaapb Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/03 10:39:26 rillig Exp $ GITHUB_PROJECT= sexplib0 GITHUB_TAG= v${PKGVERSION_NOREV} @@ -13,7 +13,7 @@ COMMENT= Library with definition of S-expressions and some base converters LICENSE= apache-2.0 OCAML_USE_FINDLIB= yes -OCAML_USE_DUNE= yes +OCAML_USE_DUNE= yes BUILD_TARGET= default diff --git a/devel/ocaml-stdio/Makefile b/devel/ocaml-stdio/Makefile index d31582adb21..f9e272c0f14 100644 --- a/devel/ocaml-stdio/Makefile +++ b/devel/ocaml-stdio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2019/03/05 16:21:31 jaapb Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/03 10:39:26 rillig Exp $ GITHUB_PROJECT= stdio GITHUB_TAG= v${PKGVERSION_NOREV} @@ -12,9 +12,9 @@ HOMEPAGE= https://github.com/janestreet/stdio/ COMMENT= Standard IO library for OCaml LICENSE= apache-2.0 -USE_LANGUAGES= # none +USE_LANGUAGES= # none OCAML_USE_FINDLIB= yes -OCAML_USE_DUNE= yes +OCAML_USE_DUNE= yes .include "../../mk/ocaml.mk" .include "../../devel/ocaml-base/buildlink3.mk" diff --git a/devel/ocaml-variantslib/buildlink3.mk b/devel/ocaml-variantslib/buildlink3.mk index 0319a81f453..772c1e27f45 100644 --- a/devel/ocaml-variantslib/buildlink3.mk +++ b/devel/ocaml-variantslib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2019/03/13 10:53:40 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2019/11/03 10:39:26 rillig Exp $ BUILDLINK_TREE+= ocaml-variantslib @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-variantslib OCAML_VARIANTSLIB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-variantslib+= ocaml-variantslib>=0.12.0 -BUILDLINK_PKGSRCDIR.ocaml-variantslib?= ../../devel/ocaml-variantslib +BUILDLINK_PKGSRCDIR.ocaml-variantslib?= ../../devel/ocaml-variantslib .endif # OCAML_VARIANTSLIB_BUILDLINK3_MK diff --git a/devel/ocaml-yojson/Makefile b/devel/ocaml-yojson/Makefile index 7bdc90f9427..5e3798c4f24 100644 --- a/devel/ocaml-yojson/Makefile +++ b/devel/ocaml-yojson/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2019/03/05 18:21:04 jaapb Exp $ +# $NetBSD: Makefile,v 1.12 2019/11/03 10:39:27 rillig Exp $ GITHUB_PROJECT= yojson DISTNAME= ${GITHUB_PROJECT}-1.7.0 @@ -11,7 +11,7 @@ HOMEPAGE= https://github.com/mjambon/yojson/ COMMENT= JSON parsing and pretty-printing library for OCaml LICENSE= modified-bsd -OCAML_USE_DUNE= yes +OCAML_USE_DUNE= yes INSTALLATION_DIRS+= bin .include "../../mk/ocaml.mk" diff --git a/devel/ocamlbuild/Makefile b/devel/ocamlbuild/Makefile index ad1c521529d..bc9f1ebc9e5 100644 --- a/devel/ocamlbuild/Makefile +++ b/devel/ocamlbuild/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2019/03/21 11:55:24 jaapb Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/03 10:39:27 rillig Exp $ DISTNAME= ocamlbuild-0.14.0 CATEGORIES= devel @@ -15,7 +15,7 @@ USE_LANGUAGES= # none USE_TOOLS+= gmake OCAML_USE_FINDLIB= yes -INSTALL_TARGET= findlib-install +INSTALL_TARGET= findlib-install MAKE_ENV= CHECK_IF_PREINSTALLED=false OCAMLBUILD_BINDIR=${PREFIX}/bin \ OCAMLBUILD_LIBDIR=${PREFIX}/${OCAML_SITELIBDIR} diff --git a/devel/ocamlgraph/Makefile b/devel/ocamlgraph/Makefile index 373ac61a8e7..796b3e092b5 100644 --- a/devel/ocamlgraph/Makefile +++ b/devel/ocamlgraph/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2019/07/21 22:24:39 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2019/11/03 10:39:27 rillig Exp $ DISTNAME= ocamlgraph-1.8.8 PKGREVISION= 21 @@ -10,9 +10,9 @@ HOMEPAGE= http://ocamlgraph.lri.fr/ COMMENT= Graph library for OCaml LICENSE= gnu-lgpl-v2.1 -GNU_CONFIGURE= yes -USE_TOOLS+= gmake -INSTALL_TARGET= install-findlib +GNU_CONFIGURE= yes +USE_TOOLS+= gmake +INSTALL_TARGET= install-findlib OCAML_USE_FINDLIB= yes .include "options.mk" @@ -29,13 +29,13 @@ MAKE_ENV+= OCAMLBEST="byte" post-install: .if ${USE_LABLGTK} == "yes" -.if ${OCAML_USE_OPT_COMPILER} == "yes" +. if ${OCAML_USE_OPT_COMPILER} == "yes" ${INSTALL_PROGRAM} ${WRKSRC}/editor/editor.opt ${DESTDIR}${PREFIX}/bin/graph-editor ${INSTALL_PROGRAM} ${WRKSRC}/dgraph/dgraph.opt ${DESTDIR}${PREFIX}/bin/graph-viewer -.else +. else ${INSTALL_PROGRAM} ${WKRSRC}/editor/editor.byte ${DESTDIR}${PREFIX}/bin/graph-editor ${INSTALL_PROGRAM} ${WKRSRC}/dgraph/dgraph.byte ${DESTDIR}${PREFIX}/bin/graph-viewer -.endif +. endif .endif .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocamlify/buildlink3.mk b/devel/ocamlify/buildlink3.mk index 8e0ea43a86e..582cf9eb07a 100644 --- a/devel/ocamlify/buildlink3.mk +++ b/devel/ocamlify/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2018/07/19 15:15:26 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2019/11/03 10:39:27 rillig Exp $ BUILDLINK_TREE+= ocamlify @@ -7,7 +7,7 @@ OCAMLIFY_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocamlify+= ocamlify>=0.0.2nb1 BUILDLINK_ABI_DEPENDS.ocamlify+= ocamlify>=0.0.2nb9 -BUILDLINK_PKGSRCDIR.ocamlify?= ../../devel/ocamlify +BUILDLINK_PKGSRCDIR.ocamlify?= ../../devel/ocamlify .endif # OCAMLIFY_BUILDLINK3_MK BUILDLINK_TREE+= -ocamlify diff --git a/devel/ocamlmod/buildlink3.mk b/devel/ocamlmod/buildlink3.mk index a645f8a1b77..b202e4286d7 100644 --- a/devel/ocamlmod/buildlink3.mk +++ b/devel/ocamlmod/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2018/07/19 15:15:26 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2019/11/03 10:39:27 rillig Exp $ BUILDLINK_TREE+= ocamlmod @@ -7,7 +7,7 @@ OCAMLMOD_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocamlmod+= ocamlmod>=0.0.7nb1 BUILDLINK_ABI_DEPENDS.ocamlmod+= ocamlmod>=0.0.8nb4 -BUILDLINK_PKGSRCDIR.ocamlmod?= ../../devel/ocamlmod +BUILDLINK_PKGSRCDIR.ocamlmod?= ../../devel/ocamlmod .endif # OCAMLMOD_BUILDLINK3_MK BUILDLINK_TREE+= -ocamlmod diff --git a/devel/opencm/Makefile b/devel/opencm/Makefile index eba878b78b1..448f7bf31a1 100644 --- a/devel/opencm/Makefile +++ b/devel/opencm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2017/09/03 08:36:52 wiz Exp $ +# $NetBSD: Makefile,v 1.59 2019/11/03 10:39:27 rillig Exp $ # DISTNAME= ${OPENCM_VERSION}-2-src @@ -12,9 +12,9 @@ MAINTAINER= pkgsrc-users@NetBSD.org #HOMEPAGE= http://www.opencm.org/ COMMENT= Secure, high-integrity replacement for CVS -WRKSRC= ${WRKDIR}/${OPENCM_VERSION}/base -USE_TOOLS+= gmake gzip makeinfo lex -GNU_CONFIGURE= YES +WRKSRC= ${WRKDIR}/${OPENCM_VERSION}/base +USE_TOOLS+= gmake gzip makeinfo lex +GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-ssl-dir=${BUILDLINK_PREFIX.openssl} CONFIGURE_ARGS+= KRB5_BUILDLINK=${KRB5BASE:Q} diff --git a/devel/pango/Makefile b/devel/pango/Makefile index 981e7faff2b..58a4b57b6a4 100644 --- a/devel/pango/Makefile +++ b/devel/pango/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.227 2019/10/07 09:28:10 prlw1 Exp $ +# $NetBSD: Makefile,v 1.228 2019/11/03 10:39:27 rillig Exp $ DISTNAME= pango-1.44.6 CATEGORIES= devel fonts @@ -16,15 +16,15 @@ USE_LANGUAGES= c c++ USE_TOOLS+= gmake pkg-config INSTALLATION_DIRS= ${PKGMANDIR}/man1 -PKGCONFIG_OVERRIDE+= output/meson-private/pango.pc -PKGCONFIG_OVERRIDE+= output/meson-private/pangocairo.pc -PKGCONFIG_OVERRIDE+= output/meson-private/pangoft2.pc -PKGCONFIG_OVERRIDE+= output/meson-private/pangoxft.pc -PKGCONFIG_OVERRIDE_STAGE=pre-install -MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/${PKGBASE} +PKGCONFIG_OVERRIDE+= output/meson-private/pango.pc +PKGCONFIG_OVERRIDE+= output/meson-private/pangocairo.pc +PKGCONFIG_OVERRIDE+= output/meson-private/pangoft2.pc +PKGCONFIG_OVERRIDE+= output/meson-private/pangoxft.pc +PKGCONFIG_OVERRIDE_STAGE= pre-install +MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/${PKGBASE} -CHECK_FILES_SKIP+= ${PREFIX}/libdata/pango/pango.modules -CHECK_PORTABILITY_SKIP+= docs/check.docs +CHECK_FILES_SKIP+= ${PREFIX}/libdata/pango/pango.modules +CHECK_PORTABILITY_SKIP+= docs/check.docs BUILDLINK_TRANSFORM+= rm:-Werror=implicit-fallthrough # clang10svn diff --git a/devel/patchutils/Makefile b/devel/patchutils/Makefile index b2ebfb4c19c..cec6cb2ea72 100644 --- a/devel/patchutils/Makefile +++ b/devel/patchutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2019/08/11 13:20:49 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2019/11/03 10:39:27 rillig Exp $ DISTNAME= patchutils-0.3.4 PKGREVISION= 2 @@ -20,7 +20,7 @@ USE_TOOLS+= perl:run GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-patch=${PREFIX}/bin/gpatch -CHECK_PORTABILITY_SKIP+=tests/rediff2/run-test +CHECK_PORTABILITY_SKIP+= tests/rediff2/run-test REPLACE_BASH+= scripts/editdiff.in scripts/espdiff.in USE_TOOLS+= bash:run diff --git a/devel/pcre-ocaml/Makefile b/devel/pcre-ocaml/Makefile index 66f104445fe..4c5bb0a676e 100644 --- a/devel/pcre-ocaml/Makefile +++ b/devel/pcre-ocaml/Makefile @@ -1,21 +1,21 @@ -# $NetBSD: Makefile,v 1.36 2019/03/05 18:23:31 jaapb Exp $ +# $NetBSD: Makefile,v 1.37 2019/11/03 10:39:28 rillig Exp $ -VERSION= 7.4.1 -DISTNAME= pcre-${VERSION} -PKGNAME= pcre-ocaml-${VERSION} -CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GITHUB:=mmottl/} +VERSION= 7.4.1 +DISTNAME= pcre-${VERSION} +PKGNAME= pcre-ocaml-${VERSION} +CATEGORIES= devel +MASTER_SITES= ${MASTER_SITE_GITHUB:=mmottl/} -MAINTAINER= jaapb@NetBSD.org -HOMEPAGE= https://github.com/mmottl/pcre-ocaml -COMMENT= Perl compatible regular expressions for OCaml +MAINTAINER= jaapb@NetBSD.org +HOMEPAGE= https://github.com/mmottl/pcre-ocaml +COMMENT= Perl compatible regular expressions for OCaml LICENSE= gnu-lgpl-v2.1 WRKSRC= ${WRKDIR}/pcre-ocaml-${VERSION} -OCAML_USE_DUNE= yes +OCAML_USE_DUNE= yes OPAM_INSTALL_FILES= pcre -USE_TOOLS= pax +USE_TOOLS= pax .include "../../mk/bsd.prefs.mk" .include "../../mk/ocaml.mk" diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile index b245d0a68dd..994a57efc7e 100644 --- a/devel/pcre/Makefile +++ b/devel/pcre/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.88 2019/09/17 10:56:03 nros Exp $ +# $NetBSD: Makefile,v 1.89 2019/11/03 10:39:27 rillig Exp $ DISTNAME= pcre-8.43 CATEGORIES= devel MASTER_SITES= ftp://ftp.pcre.org/pub/pcre/ -MASTER_SITES+= https://ftp.pcre.org/pub/pcre/ +MASTER_SITES+= https://ftp.pcre.org/pub/pcre/ MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=pcre/} EXTRACT_SUFX= .tar.bz2 diff --git a/devel/phabricator/Makefile b/devel/phabricator/Makefile index 44b1a047920..8729efa328d 100644 --- a/devel/phabricator/Makefile +++ b/devel/phabricator/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2017/09/14 09:41:58 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/03 10:39:28 rillig Exp $ DISTNAME= phabricator-20170609 CATEGORIES= devel @@ -12,7 +12,7 @@ HOMEPAGE= http://phabricator.com/ COMMENT= Open software engineering platform LICENSE= apache-2.0 -PHP_VERSIONS_INCOMPATIBLE= 70 +PHP_VERSIONS_INCOMPATIBLE= 70 USE_TOOLS+= pax bash:run EXTRACT_USING= bsdtar @@ -80,20 +80,20 @@ PHABRICATOR_DIR= share/phabricator INSTALLATION_DIRS+= ${PHABRICATOR_DIR} -CHECK_INTERPRETER_SKIP+=${PHABRICATOR_DIR}/externals/wordlist/password.lst +CHECK_INTERPRETER_SKIP+= ${PHABRICATOR_DIR}/externals/wordlist/password.lst CHMOD_FILES= conf LICENSE NOTICE README.md externals resources src \ support webroot scripts/__init_script__.php scripts/fpm/warmup.php post-extract: - cd ${WRKSRC} && \ - ${FIND} ${CHMOD_FILES} -type f \ - \! -name aphlict_launcher.php \ - -exec ${CHMOD} -x \{\} \; + cd ${WRKSRC} && \ + ${FIND} ${CHMOD_FILES} -type f \ + \! -name aphlict_launcher.php \ + -exec ${CHMOD} -x \{\} \; do-install: - cd ${WRKSRC} && \ - ${PAX} -rw * -s',.*\.orig$$,,' \ - ${DESTDIR}${PREFIX}/${PHABRICATOR_DIR} + cd ${WRKSRC} && \ + ${PAX} -rw * -s',.*\.orig$$,,' \ + ${DESTDIR}${PREFIX}/${PHABRICATOR_DIR} .include "../../mk/bsd.pkg.mk" diff --git a/devel/php-gearman/Makefile b/devel/php-gearman/Makefile index ac17dfa85a9..127b19115d3 100644 --- a/devel/php-gearman/Makefile +++ b/devel/php-gearman/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2019/08/22 12:23:03 ryoon Exp $ +# $NetBSD: Makefile,v 1.12 2019/11/03 10:39:28 rillig Exp $ MODNAME= gearman -PECL_VERSION= 2.0.5 +PECL_VERSION= 2.0.5 DISTNAME= gearman-${PECL_VERSION} PKGREVISION= 4 CATEGORIES= devel diff --git a/devel/php-xdebug/Makefile b/devel/php-xdebug/Makefile index c732cd60301..103d09a4ae9 100644 --- a/devel/php-xdebug/Makefile +++ b/devel/php-xdebug/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2019/10/22 08:20:23 taca Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/03 10:39:28 rillig Exp $ # MODNAME= xdebug @@ -14,7 +14,7 @@ LICENSE= php PHP_ZEND_EXTENSION= yes -PHP_VERSIONS_ACCEPTED= 71 72 73 +PHP_VERSIONS_ACCEPTED= 71 72 73 .include "../../lang/php/ext.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/pilrc/Makefile b/devel/pilrc/Makefile index beafa552b68..e0912c7bbe8 100644 --- a/devel/pilrc/Makefile +++ b/devel/pilrc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2018/01/07 21:31:10 rillig Exp $ +# $NetBSD: Makefile,v 1.36 2019/11/03 10:39:28 rillig Exp $ # DISTNAME= pilrc-3.2 @@ -11,8 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://pilrc.sourceforge.net/ COMMENT= Generate resources for PalmOS applications from textual description -GNU_CONFIGURE= YES -CONFIGURE_SCRIPT=unix/configure +GNU_CONFIGURE= YES +CONFIGURE_SCRIPT= unix/configure .include "../../mk/bsd.prefs.mk" diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile index 3e6df48749e..e7080406012 100644 --- a/devel/pkg-config/Makefile +++ b/devel/pkg-config/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2017/05/05 01:19:35 mef Exp $ +# $NetBSD: Makefile,v 1.38 2019/11/03 10:39:28 rillig Exp $ DISTNAME= pkg-config-0.29.2 CATEGORIES= devel @@ -24,10 +24,10 @@ CONFLICTS= pkgconfig-[0-9]* CONFIGURE_ARGS.IRIX+= --cache-file=/dev/null .if ${OPSYS} == "NetBSD" -.if ${MACHINE_ARCH} == "i386" && !empty(OS_VERSION:M[12345].*) +. if ${MACHINE_ARCH} == "i386" && !empty(OS_VERSION:M[12345].*) # Built-in GLib wants __sync_bool_compare_and_swap_4 CFLAGS+= -march=i486 -.endif +. endif post-configure: cd ${WRKSRC}/glib; \ ${GREP} -v HAVE_DTRACE config.h >config.h.new; \ @@ -42,7 +42,7 @@ CONFIGURE_ENV+= glib_cv_value_AF_INET6=yes CONFIGURE_ARGS.SunOS+= --disable-dtrace CFLAGS.SunOS+= -DENABLE_NLS # required due to __EXTENSIONS__ -CONFIGURE_ARGS+= ${CONFIGURE_ARGS.${ICONV_TYPE}-iconv} +CONFIGURE_ARGS+= ${CONFIGURE_ARGS.${ICONV_TYPE}-iconv} CONFIGURE_ARGS.gnu-iconv= --with-libiconv=gnu PKGCONFIG_EXTRA_PATHS= # empty diff --git a/devel/poco/Makefile.common b/devel/poco/Makefile.common index ac01ff8eb1d..1508647fea2 100644 --- a/devel/poco/Makefile.common +++ b/devel/poco/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.15 2018/07/27 21:03:26 jperkin Exp $ +# $NetBSD: Makefile.common,v 1.16 2019/11/03 10:39:28 rillig Exp $ # # used by devel/poco/Makefile # used by databases/poco-data/Makefile @@ -6,7 +6,7 @@ # used by databases/poco-data-mysql/Makefile # used by databases/poco-data-odbc/Makefile -POCO_VERSION=1.6.1 +POCO_VERSION= 1.6.1 DISTNAME= poco-${POCO_VERSION}-all MASTER_SITES= http://pocoproject.org/releases/poco-${POCO_VERSION}/ @@ -46,17 +46,17 @@ CONFIGURE_ARGS.NetBSD+= --no-sharedmemory .if ${OPSYS} == "SunOS" .include "../../mk/compiler.mk" -. if ${PKGSRC_COMPILER} == "sunpro" +. if ${PKGSRC_COMPILER} == "sunpro" CONFIGURE_ARGS+= --config=SunOS-SunStudio -. else +. else CONFIGURE_ARGS+= --config=SunOS-GCC # GCC 4.6 and newer forces c99 for C++, need _XOPEN_SOURCE=600 -. if !empty(CC_VERSION:Mgcc-4.[6-9].*) || !empty(CC_VERSION:Mgcc-[5-9].*) || !empty(PKGSRC_COMPILER:Mclang) +. if !empty(CC_VERSION:Mgcc-4.[6-9].*) || !empty(CC_VERSION:Mgcc-[5-9].*) || !empty(PKGSRC_COMPILER:Mclang) MAKE_ENV+= XOPEN_SOURCE=600 -. else +. else MAKE_ENV+= XOPEN_SOURCE=500 +. endif . endif -. endif .endif MAKE_FLAGS+= POCO_BASE=${WRKSRC} diff --git a/devel/popt/Makefile b/devel/popt/Makefile index 1f3feed5f70..5dd52d52105 100644 --- a/devel/popt/Makefile +++ b/devel/popt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2019/05/05 23:16:06 rjs Exp $ +# $NetBSD: Makefile,v 1.48 2019/11/03 10:39:28 rillig Exp $ # DISTNAME= popt-1.16 @@ -13,11 +13,11 @@ LICENSE= mit CONFLICTS= ORBit<=0.5.3 -USE_PKGLOCALEDIR= yes -GNU_CONFIGURE= yes -USE_TOOLS+= gmake -USE_LIBTOOL= yes -PKGCONFIG_OVERRIDE= popt.pc +USE_PKGLOCALEDIR= yes +GNU_CONFIGURE= yes +USE_TOOLS+= gmake +USE_LIBTOOL= yes +PKGCONFIG_OVERRIDE= popt.pc PKGCONFIG_OVERRIDE_STAGE= post-configure TEST_TARGET= check diff --git a/devel/pythontidy/Makefile b/devel/pythontidy/Makefile index 13deb37584e..0835bbfa1c1 100644 --- a/devel/pythontidy/Makefile +++ b/devel/pythontidy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2019/04/25 07:32:49 maya Exp $ +# $NetBSD: Makefile,v 1.5 2019/11/03 10:39:28 rillig Exp $ # DISTNAME= PythonTidy-1.20 @@ -15,15 +15,15 @@ LICENSE= gnu-gpl-v2 WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} -NO_BUILD= yes +NO_BUILD= yes INSTALLATION_DIRS= bin -REPLACE_PYTHON= ${WRKSRC}/*.py -SUBST_CLASSES+= pythonbin -SUBST_STAGE.pythonbin= pre-configure -SUBST_MESSAGE.pythonbin= Fixing references to python interpreter. -SUBST_FILES.pythonbin= *.py -SUBST_SED.pythonbin= -e 's,%PYTHONBIN%,${PYTHONBIN},g' +REPLACE_PYTHON= ${WRKSRC}/*.py +SUBST_CLASSES+= pythonbin +SUBST_STAGE.pythonbin= pre-configure +SUBST_MESSAGE.pythonbin= Fixing references to python interpreter. +SUBST_FILES.pythonbin= *.py +SUBST_SED.pythonbin= -e 's,%PYTHONBIN%,${PYTHONBIN},g' do-extract: ${MKDIR} ${WRKSRC:Q} diff --git a/devel/qore-uuid-module/Makefile b/devel/qore-uuid-module/Makefile index 5011c5ba918..3969a496e75 100644 --- a/devel/qore-uuid-module/Makefile +++ b/devel/qore-uuid-module/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2018/06/08 20:49:41 nros Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/03 10:39:29 rillig Exp $ DISTNAME= qore-uuid-module-1.3 PKGREVISION= 6 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qore/} -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qore/} +EXTRACT_SUFX= .tar.bz2 MAINTAINER= nros@users.sourceforge.net HOMEPAGE= http://www.qore.org/ diff --git a/devel/qore-uuid-module/options.mk b/devel/qore-uuid-module/options.mk index 209832d0b39..4690b17faab 100644 --- a/devel/qore-uuid-module/options.mk +++ b/devel/qore-uuid-module/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2014/12/30 15:54:32 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/03 10:39:29 rillig Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.qore-uuid-module @@ -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/devel/quilt/Makefile b/devel/quilt/Makefile index f3058fde54a..5aee4a9a31a 100644 --- a/devel/quilt/Makefile +++ b/devel/quilt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2019/08/11 13:20:50 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2019/11/03 10:39:29 rillig Exp $ # DISTNAME= quilt-0.66 @@ -29,10 +29,10 @@ CONFIGURE_ARGS+= --with-patch=${PREFIX}/bin/gpatch DEPENDS+= coreutils-[0-9]*:../../sysutils/coreutils DEPENDS+= patch>=2.4:../../devel/patch -.if ${OPSYS} == "OpenBSD" +. if ${OPSYS} == "OpenBSD" DEPENDS+= grep-[0-9]*:../../textproc/grep CONFIGURE_ARGS+= --with-grep=${PREFIX}/bin/ggrep -.endif +. endif CONFIGURE_ARGS+= --with-cp=${PREFIX}/bin/gcp CONFIGURE_ARGS+= --with-date=${PREFIX}/bin/gdate @@ -46,10 +46,10 @@ CONFIGURE_ARGS+= --without-getopt INSTALL_MAKE_FLAGS+= BUILD_ROOT=${DESTDIR:Q} etcdir=${PREFIX}/share/examples/quilt -REPLACE_INTERPRETER+= conf-bash -REPLACE.conf-bash.old= @BASH@ -REPLACE.conf-bash.new= ${BASH} -REPLACE_FILES.conf-bash=*.in */*.in */*/*.in +REPLACE_INTERPRETER+= conf-bash +REPLACE.conf-bash.old= @BASH@ +REPLACE.conf-bash.new= ${BASH} +REPLACE_FILES.conf-bash= *.in */*.in */*/*.in SUBST_CLASSES+= bash SUBST_MESSAGE.bash= Fixing non-shellbang references to bash. diff --git a/devel/radare2/Makefile b/devel/radare2/Makefile index 77a9269333f..8ee0ac58eec 100644 --- a/devel/radare2/Makefile +++ b/devel/radare2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2019/08/11 13:20:50 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2019/11/03 10:39:29 rillig Exp $ DISTNAME= radare2-3.6.0 PKGREVISION= 1 @@ -10,13 +10,13 @@ HOMEPAGE= http://www.radare.org/ COMMENT= Reverse engineering framework LICENSE= gnu-gpl-v3 -HAS_CONFIGURE= YES +HAS_CONFIGURE= YES CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} CONFIGURE_ARGS+= --with-sysmagic CONFIGURE_ARGS+= --with-syscapstone CONFIGURE_ARGS+= --with-syszip PKGCONFIG_OVERRIDE+= pkgcfg/*.pc* -USE_TOOLS+= gmake patch pkg-config perl +USE_TOOLS+= gmake patch pkg-config perl # node CHECK_INTERPRETER_SKIP+= share/radare2/${PKGVERSION_NOREV}/www/m/fonts/iconjar-map.js diff --git a/devel/rainbow-delimiters-el/Makefile b/devel/rainbow-delimiters-el/Makefile index f8ed11c8d0a..4e4859d6b61 100644 --- a/devel/rainbow-delimiters-el/Makefile +++ b/devel/rainbow-delimiters-el/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2015/05/19 13:36:04 mef Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/03 10:39:29 rillig Exp $ DISTNAME= rainbow-delimiters-1.3.5 CATEGORIES= devel @@ -8,8 +8,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://github.com/Fanael/rainbow-delimiters COMMENT= Emacs mode for colorful parentheses highlighting -USE_LANGUAGES= # none -MESSAGE_SUBST+= LISPDIR=${EMACS_LISPPREFIX:Q} +USE_LANGUAGES= # none +MESSAGE_SUBST+= LISPDIR=${EMACS_LISPPREFIX:Q} INSTALLATION_DIRS= ${EMACS_LISPPREFIX} do-build: diff --git a/devel/readline/Makefile b/devel/readline/Makefile index d6bc9dcfd55..b7975dbc710 100644 --- a/devel/readline/Makefile +++ b/devel/readline/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.68 2019/02/13 22:49:02 wiz Exp $ +# $NetBSD: Makefile,v 1.69 2019/11/03 10:39:29 rillig Exp $ READLINE_VERSION= 8.0 -DISTNAME= readline-${READLINE_VERSION} +DISTNAME= readline-${READLINE_VERSION} CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=readline/} diff --git a/devel/readline/builtin.mk b/devel/readline/builtin.mk index 4abf8ef2853..a0f76cda2f2 100644 --- a/devel/readline/builtin.mk +++ b/devel/readline/builtin.mk @@ -1,12 +1,12 @@ -# $NetBSD: builtin.mk,v 1.20 2013/11/23 11:29:35 obache Exp $ +# $NetBSD: builtin.mk,v 1.21 2019/11/03 10:39:29 rillig Exp $ BUILTIN_PKG:= readline -BUILTIN_FIND_LIBS:= readline history -BUILTIN_FIND_HEADERS_VAR:= H_READLINE _BLTN_H_READLINE -BUILTIN_FIND_HEADERS.H_READLINE=readline/readline.h \ - readline.h -BUILTIN_FIND_GREP.H_READLINE= \#define[ ]*RL_VERSION_MAJOR +BUILTIN_FIND_LIBS:= readline history +BUILTIN_FIND_HEADERS_VAR:= H_READLINE _BLTN_H_READLINE +BUILTIN_FIND_HEADERS.H_READLINE= readline/readline.h \ + readline.h +BUILTIN_FIND_GREP.H_READLINE= \#define[ ]*RL_VERSION_MAJOR .include "../../mk/buildlink3/bsd.builtin.mk" @@ -22,7 +22,7 @@ IS_BUILTIN.readline= no IS_BUILTIN.readline= yes . endif .endif -MAKEVARS+= IS_BUILTIN.readline +MAKEVARS+= IS_BUILTIN.readline ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -38,7 +38,7 @@ BUILTIN_VERSION.readline!= \ ' ${H_READLINE:Q} BUILTIN_PKG.readline= readline-${BUILTIN_VERSION.readline} .endif -MAKEVARS+= BUILTIN_PKG.readline +MAKEVARS+= BUILTIN_PKG.readline ### ### Determine whether we should use the built-in implementation if it @@ -78,7 +78,7 @@ USE_BUILTIN.readline= no . endfor . endif # PREFER.readline .endif -MAKEVARS+= USE_BUILTIN.readline +MAKEVARS+= USE_BUILTIN.readline ### ### The section below only applies if we are not including this file diff --git a/devel/rebar3/Makefile b/devel/rebar3/Makefile index 308d41eed00..f61bc8d1286 100644 --- a/devel/rebar3/Makefile +++ b/devel/rebar3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2018/09/15 13:56:15 tnn Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/03 10:39:29 rillig Exp $ DISTNAME= rebar3-3.6.1 CATEGORIES= devel @@ -12,7 +12,7 @@ LICENSE= apache-2.0 USE_TOOLS+= tar -REBAR_DEPS= bbmustache-1.5.0 \ +REBAR_DEPS= bbmustache-1.5.0 \ certifi-2.0.0 \ cf-0.2.2 \ cth_readable-1.4.2 \ diff --git a/devel/roundup/Makefile b/devel/roundup/Makefile index e1f4a30236c..b441134cd7c 100644 --- a/devel/roundup/Makefile +++ b/devel/roundup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2019/09/02 13:19:43 adam Exp $ +# $NetBSD: Makefile,v 1.57 2019/11/03 10:39:29 rillig Exp $ DISTNAME= roundup-1.4.19 PKGREVISION= 3 @@ -14,19 +14,19 @@ USE_LANGUAGES= # empty USE_TOOLS+= pax PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 1.4.19 -REPLACE_PYTHON+= cgi-bin/roundup.cgi demo.py roundup/admin.py -REPLACE_PYTHON+= frontends/roundup.cgi -REPLACE_PYTHON+= roundup/backends/locking.py -REPLACE_PYTHON+= roundup/cgi/TAL/talgettext.py -REPLACE_PYTHON+= roundup/msgfmt.py -REPLACE_PYTHON+= roundup/scripts/roundup_demo.py -REPLACE_PYTHON+= roundup/scripts/roundup_gettext.py -REPLACE_PYTHON+= roundup/scripts/roundup_xmlrpc_server.py -REPLACE_PYTHON+= roundup/version_check.py run_tests.py -REPLACE_PYTHON+= scripts/add-issue scripts/copy-user.py -REPLACE_PYTHON+= scripts/imapServer.py scripts/roundup-reminder -REPLACE_PYTHON+= scripts/schema_diagram.py tools/load_tracker.py -REPLACE_PYTHON+= tools/migrate-queries.py tools/pygettext.py +REPLACE_PYTHON+= cgi-bin/roundup.cgi demo.py roundup/admin.py +REPLACE_PYTHON+= frontends/roundup.cgi +REPLACE_PYTHON+= roundup/backends/locking.py +REPLACE_PYTHON+= roundup/cgi/TAL/talgettext.py +REPLACE_PYTHON+= roundup/msgfmt.py +REPLACE_PYTHON+= roundup/scripts/roundup_demo.py +REPLACE_PYTHON+= roundup/scripts/roundup_gettext.py +REPLACE_PYTHON+= roundup/scripts/roundup_xmlrpc_server.py +REPLACE_PYTHON+= roundup/version_check.py run_tests.py +REPLACE_PYTHON+= scripts/add-issue scripts/copy-user.py +REPLACE_PYTHON+= scripts/imapServer.py scripts/roundup-reminder +REPLACE_PYTHON+= scripts/schema_diagram.py tools/load_tracker.py +REPLACE_PYTHON+= tools/migrate-queries.py tools/pygettext.py ROUNDUPDOCDIR= ${PREFIX}/share/doc/roundup diff --git a/devel/rox-lib/Makefile b/devel/rox-lib/Makefile index a2bb922fab6..a96873bc29c 100644 --- a/devel/rox-lib/Makefile +++ b/devel/rox-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2019/09/02 13:19:37 adam Exp $ +# $NetBSD: Makefile,v 1.30 2019/11/03 10:39:29 rillig Exp $ DISTNAME= rox-lib-2.0.2 PKGREVISION= 15 @@ -21,10 +21,10 @@ NO_BUILD= yes USE_TOOLS+= pax -REPLACE_PYTHON= AppRun MakeDist -REPLACE_PYTHON+= python/make_docs.py -REPLACE_PYTHON+= tests/python/*.py -PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2 +REPLACE_PYTHON= AppRun MakeDist +REPLACE_PYTHON+= python/make_docs.py +REPLACE_PYTHON+= tests/python/*.py +PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2 INSTALLATION_DIRS= share/rox/ROX-Lib2 diff --git a/devel/rt-mysql/Makefile.common b/devel/rt-mysql/Makefile.common index e27f6f78787..719423ef001 100644 --- a/devel/rt-mysql/Makefile.common +++ b/devel/rt-mysql/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.22 2017/03/11 23:26:32 maya Exp $ +# $NetBSD: Makefile.common,v 1.23 2019/11/03 10:39:29 rillig Exp $ # used by devel/rt-mysql/Makefile # used by devel/rt-pgsql/Makefile @@ -15,18 +15,18 @@ PKG_DESTDIR_SUPPORT= destdir .include "../../mk/bsd.prefs.mk" -RT_GROUP?= rt -RT_PATH?= ${PREFIX}/rt -RT_VAR_PATH?= ${VARBASE}/pkg/rt -RT_LOG_PATH?= ${RT_VAR_PATH}/log -RT_DATA_PATH?= ${RT_VAR_PATH}/data +RT_GROUP?= rt +RT_PATH?= ${PREFIX}/rt +RT_VAR_PATH?= ${VARBASE}/pkg/rt +RT_LOG_PATH?= ${RT_VAR_PATH}/log +RT_DATA_PATH?= ${RT_VAR_PATH}/data RT_SESSION_PATH?= ${RT_VAR_PATH}/sessiondata -BUILD_DEFS+= VARBASE +BUILD_DEFS+= VARBASE -RT_DB_HOME?= ${PREFIX} -RT_DB_DATABASE?=rt2 -RT_DB_USER?= rt -RT_DB_PASS?= changemeplease +RT_DB_HOME?= ${PREFIX} +RT_DB_DATABASE?= rt2 +RT_DB_USER?= rt +RT_DB_PASS?= changemeplease RT_WEB_USER?= nobody RT_WEB_GROUP?= nobody @@ -101,7 +101,7 @@ SUBST_CLASSES+= rt SUBST_STAGE.rt= pre-configure SUBST_FILES.rt= Makefile rtconfig README.pkg SUBST_VARS.rt= PREFIX RT_GROUP \ - RT_PATH RT_LOG_PATH RT_DATA_PATH RT_SESSION_PATH \ + RT_PATH RT_LOG_PATH RT_DATA_PATH RT_SESSION_PATH \ RT_DB_TYPE RT_DB_DBA RT_DB_DBA_PASSWORD RT_DB_DATABASE RT_DB_USER \ RT_DB_PASS RT_DB_HOME RT_DB_HOST RT_DB_PORT RT_WEB_USER RT_WEB_GROUP diff --git a/devel/rt4/Makefile b/devel/rt4/Makefile index 2b948b3a066..482d1b5d650 100644 --- a/devel/rt4/Makefile +++ b/devel/rt4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2019/08/11 13:20:50 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2019/11/03 10:39:30 rillig Exp $ DISTNAME= rt-4.2.16 PKGNAME= ${DISTNAME:S/rt/rt4/} @@ -178,10 +178,10 @@ SUBST_SED.egpath= -e 's,@CONFIG_FILE_PATH_R@,${RT_EXAMPLE_DIR},' SUBST_SED.egpath+= -e 's,@RT_ETC_PATH_R@,${RT4DIR}/etc,' SUBST_STAGE.egpath= pre-configure -GNU_CONFIGURE= yes -NO_BUILD= yes -USE_LANGUAGES= c -USE_TOOLS+= perl:run +GNU_CONFIGURE= yes +NO_BUILD= yes +USE_LANGUAGES= c +USE_TOOLS+= perl:run PKG_SYSCONFSUBDIR= rt4 USE_PKGLOCALEDIR= yes @@ -198,9 +198,9 @@ CONF_FILES_PERMS+= ${RT_EXAMPLE_DIR}/${_file_} \ 640 .endfor -OWN_DIRS+= ${RT_VAR_DIR} ${RT_LOCAL_DIR} ${RT_LOCAL_DIR}/etc -OWN_DIRS+= ${RT_LOCAL_DIR}/lib ${RT_LOCAL_DIR}/po ${RT_LOCAL_DIR}/plugins -OWN_DIRS+= ${RT_LOCAL_DIR}/html ${RT_LOCAL_DIR}/static +OWN_DIRS+= ${RT_VAR_DIR} ${RT_LOCAL_DIR} ${RT_LOCAL_DIR}/etc +OWN_DIRS+= ${RT_LOCAL_DIR}/lib ${RT_LOCAL_DIR}/po ${RT_LOCAL_DIR}/plugins +OWN_DIRS+= ${RT_LOCAL_DIR}/html ${RT_LOCAL_DIR}/static OWN_DIRS_PERMS+= ${RT_VAR_DIR}/mason_data ${APACHE_USER} ${APACHE_GROUP} 0770 OWN_DIRS_PERMS+= ${RT_VAR_DIR}/mason_data/cache ${APACHE_USER} ${APACHE_GROUP} 0770 diff --git a/devel/rt4/dirs.mk b/devel/rt4/dirs.mk index 2279cb629c8..7d3a28952d5 100644 --- a/devel/rt4/dirs.mk +++ b/devel/rt4/dirs.mk @@ -1,10 +1,10 @@ -# $NetBSD: dirs.mk,v 1.1 2014/06/17 11:10:40 markd Exp $ +# $NetBSD: dirs.mk,v 1.2 2019/11/03 10:39:30 rillig Exp $ .include "../../mk/bsd.prefs.mk" RT_LOCAL_DIR?= ${VARBASE}/rt4 BUILD_DEFS+= RT_LOCAL_DIR -RT_EXAMPLE_DIR= ${PREFIX}/share/examples/rt4 +RT_EXAMPLE_DIR= ${PREFIX}/share/examples/rt4 RT_SHARE_DIR= ${PREFIX}/share/rt4 RT_VAR_DIR= ${VARBASE}/spool/rt4 diff --git a/devel/semantic/Makefile b/devel/semantic/Makefile index 1ac3044f28d..0abed73986f 100644 --- a/devel/semantic/Makefile +++ b/devel/semantic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2018/02/06 16:42:22 jperkin Exp $ +# $NetBSD: Makefile,v 1.33 2019/11/03 10:39:30 rillig Exp $ DISTNAME= semantic-1.4.4 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -37,7 +37,7 @@ AUXFILES+= c.bnf make.bnf java.bnf scheme.bnf INSTALLATION_DIRS= ${EMACS_INFOPREFIX} -EMACS_BUILDLINK=# defined +EMACS_BUILDLINK= # defined do-install: ${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/semantic diff --git a/devel/semi/Makefile b/devel/semi/Makefile index 57bf678eb13..d9a950caa4e 100644 --- a/devel/semi/Makefile +++ b/devel/semi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2015/11/25 12:49:46 jperkin Exp $ +# $NetBSD: Makefile,v 1.37 2019/11/03 10:39:30 rillig Exp $ # DISTNAME= semi-1.14.6 @@ -29,8 +29,8 @@ MAKEFLAGS= ${MAKEFLAGS.${EMACS_FLAVOR}} USE_TOOLS+= makeinfo INFO_FILES= yes -EMACS_MODULES= base -EMACS_BUILDLINK=# defined +EMACS_MODULES= base +EMACS_BUILDLINK= # defined BUILD_TARGET.emacs= elc BUILD_TARGET.xemacs= package diff --git a/devel/semi/options.mk b/devel/semi/options.mk index efd4820e07d..8bd18c6ee29 100644 --- a/devel/semi/options.mk +++ b/devel/semi/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:00 jlam Exp $ +# $NetBSD: options.mk,v 1.6 2019/11/03 10:39:30 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.semi -PKG_SUPPORTED_OPTIONS= semi-bbdb +PKG_OPTIONS_VAR= PKG_OPTIONS.semi +PKG_SUPPORTED_OPTIONS= semi-bbdb PKG_OPTIONS_OPTIONAL_GROUPS= semi-browser PKG_OPTIONS_GROUP.semi-browser= w3 w3m PKG_SUGGESTED_OPTIONS= diff --git a/devel/skalibs/Makefile b/devel/skalibs/Makefile index 7dae1e84e06..ce598d8f1d0 100644 --- a/devel/skalibs/Makefile +++ b/devel/skalibs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2019/06/20 00:56:58 schmonz Exp $ +# $NetBSD: Makefile,v 1.5 2019/11/03 10:39:30 rillig Exp $ DISTNAME= skalibs-2.8.1.0 CATEGORIES= devel @@ -15,9 +15,9 @@ USE_TOOLS+= gmake CONFIGURE_ARGS+= --prefix=${PREFIX:Q} -PLIST_VARS+= include-shared-objects +PLIST_VARS+= include-shared-objects .if "${OPSYS}" == "Darwin" -CONFIGURE_ARGS+= "--disable-shared" +CONFIGURE_ARGS+= "--disable-shared" .else PLIST.include-shared-objects= yes .endif diff --git a/devel/snappy-java10/Makefile b/devel/snappy-java10/Makefile index 32ce967809a..a93e4d79eda 100644 --- a/devel/snappy-java10/Makefile +++ b/devel/snappy-java10/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2018/06/09 11:36:45 fhajny Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/03 10:39:30 rillig Exp $ DISTNAME= snappy-java-${SNAPVER}${SNAPJVER} CATEGORIES= devel @@ -13,13 +13,13 @@ GITHUB_PROJECT= snappy-java SNAPVER= 1.0.5 SNAPJVER= .4 -DIST_SUBDIR= ${PKGBASE} -DISTFILES= ${DEFAULT_DISTFILES} -DISTFILES+= snappy-java-deps-${SNAPVER}${SNAPJVER}.tar.gz -DISTFILES+= snappy-${SNAPVER}.tar.gz +DIST_SUBDIR= ${PKGBASE} +DISTFILES= ${DEFAULT_DISTFILES} +DISTFILES+= snappy-java-deps-${SNAPVER}${SNAPJVER}.tar.gz +DISTFILES+= snappy-${SNAPVER}.tar.gz SITES.snappy-${SNAPVER}.tar.gz= ftp://ftp.NetBSD.org/pub/NetBSD/misc/fhajny/ SITES.snappy-java-deps-${SNAPVER}${SNAPJVER}.tar.gz= ftp://ftp.NetBSD.org/pub/NetBSD/misc/fhajny/ -EXTRACT_DIR.snappy-${SNAPVER}.tar.gz= ${WRKSRC}/target +EXTRACT_DIR.snappy-${SNAPVER}.tar.gz= ${WRKSRC}/target TOOL_DEPENDS+= apache-maven-[0-9]*:../../devel/apache-maven diff --git a/devel/sofia-sip/Makefile b/devel/sofia-sip/Makefile index 12f75ae333f..6582538107d 100644 --- a/devel/sofia-sip/Makefile +++ b/devel/sofia-sip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2016/03/05 11:27:46 jperkin Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/03 10:39:30 rillig Exp $ # DISTNAME= sofia-sip-1.12.11 @@ -20,7 +20,7 @@ USE_LANGUAGES= c MAKE_JOBS_SAFE= no -SUBST_CLASSES+= awk +SUBST_CLASSES+= awk SUBST_FILES.awk+= libsofia-sip-ua/msg/msg_parser.awk SUBST_FILES.awk+= libsofia-sip-ua/su/tag_dll.awk SUBST_STAGE.awk= pre-configure diff --git a/devel/splint/Makefile b/devel/splint/Makefile index 102495bb5dd..c7e8277d14c 100644 --- a/devel/splint/Makefile +++ b/devel/splint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2013/05/04 19:48:00 richard Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/03 10:39:30 rillig Exp $ # DISTNAME= splint-3.1.2.src @@ -10,7 +10,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://lclint.cs.virginia.edu/ COMMENT= Statically check C programs -LICENSE= gnu-gpl-v2 +LICENSE= gnu-gpl-v2 MAKE_JOBS_SAFE= no diff --git a/devel/startbug1/options.mk b/devel/startbug1/options.mk index 443ff87cae1..6d8bd1cde4f 100644 --- a/devel/startbug1/options.mk +++ b/devel/startbug1/options.mk @@ -1,9 +1,9 @@ -# $NetBSD: options.mk,v 1.1 2014/01/08 14:59:15 ryoon Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/03 10:39:30 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.starbug1 +PKG_OPTIONS_VAR= PKG_OPTIONS.starbug1 PKG_OPTIONS_REQUIRED_GROUPS= lang PKG_OPTIONS_GROUP.lang= lang-en lang-ja lang-zh-cn -PKG_SUGGESTED_OPTIONS= lang-en +PKG_SUGGESTED_OPTIONS= lang-en .include "../../mk/bsd.options.mk" diff --git a/devel/stfl/Makefile b/devel/stfl/Makefile index b462af346fa..325612b9049 100644 --- a/devel/stfl/Makefile +++ b/devel/stfl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2019/08/11 13:20:51 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/03 10:39:30 rillig Exp $ DISTNAME= stfl-0.24 PKGREVISION= 4 @@ -13,7 +13,7 @@ LICENSE= gnu-lgpl-v3 NO_CONFIGURE= yes USE_TOOLS+= gmake perl USE_LIBTOOL= yes -USE_CURSES= wide +USE_CURSES= wide INSTALL_MAKE_FLAGS+= prefix=${PREFIX} diff --git a/devel/stgit/Makefile b/devel/stgit/Makefile index c9ec627f492..f5ccdbb323c 100644 --- a/devel/stgit/Makefile +++ b/devel/stgit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2019/09/02 13:19:42 adam Exp $ +# $NetBSD: Makefile,v 1.42 2019/11/03 10:39:31 rillig Exp $ DISTNAME= stgit-0.17.1 PKGREVISION= 14 @@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v2 BUILD_DEPENDS+= asciidoc>=8:../../textproc/asciidoc BUILD_DEPENDS+= docbook-xsl>=1.72:../../textproc/docbook-xsl -BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto +BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto DEPENDS+= git-base>=1.5.2:../../devel/git-base AUTO_MKDIRS= yes @@ -22,8 +22,8 @@ USE_LANGUAGES= #none REPLACE_PERL= Documentation/build-docdep.perl REPLACE_BASH= contrib/stg-* -REPLACE_PYTHON= *.py stgit/*.py stg -PYSETUPINSTALLARGS= --prefix=${PREFIX} +REPLACE_PYTHON= *.py stgit/*.py stg +PYSETUPINSTALLARGS= --prefix=${PREFIX} PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 0.17.1 MAKE_ENV+= ASCIIDOC=${PREFIX}/bin/asciidoc diff --git a/devel/sysexits/builtin.mk b/devel/sysexits/builtin.mk index af87905a9ac..99ad7ac4798 100644 --- a/devel/sysexits/builtin.mk +++ b/devel/sysexits/builtin.mk @@ -1,9 +1,9 @@ -# $NetBSD: builtin.mk,v 1.4 2013/11/23 11:29:36 obache Exp $ +# $NetBSD: builtin.mk,v 1.5 2019/11/03 10:39:31 rillig Exp $ BUILTIN_PKG:= sysexits -BUILTIN_FIND_HEADERS_VAR:= H_SYSEXITS -BUILTIN_FIND_HEADERS.H_SYSEXITS=sysexits.h +BUILTIN_FIND_HEADERS_VAR:= H_SYSEXITS +BUILTIN_FIND_HEADERS.H_SYSEXITS= sysexits.h .include "../../mk/buildlink3/bsd.builtin.mk" @@ -17,7 +17,7 @@ IS_BUILTIN.sysexits= no IS_BUILTIN.sysexits= yes . endif .endif # IS_BUILTIN.sysexits -MAKEVARS+= IS_BUILTIN.sysexits +MAKEVARS+= IS_BUILTIN.sysexits ### ### Determine whether we should use the built-in implementation if it @@ -44,4 +44,4 @@ USE_BUILTIN.sysexits!= \ . endif . endif # PREFER.sysexits .endif -MAKEVARS+= USE_BUILTIN.sysexits +MAKEVARS+= USE_BUILTIN.sysexits diff --git a/devel/tailor/Makefile b/devel/tailor/Makefile index a86403e962c..ae98f6b97cc 100644 --- a/devel/tailor/Makefile +++ b/devel/tailor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2019/09/02 13:19:39 adam Exp $ +# $NetBSD: Makefile,v 1.32 2019/11/03 10:39:31 rillig Exp $ DISTNAME= tailor-0.9.35 PKGREVISION= 6 @@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v3 USE_LANGUAGES= #none -PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 0.9.35 +PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 0.9.35 REPLACE_PYTHON= tailor AUTO_MKDIRS= yes diff --git a/devel/tcl-tclcl/Makefile b/devel/tcl-tclcl/Makefile index c746400c68c..cd4c8787994 100644 --- a/devel/tcl-tclcl/Makefile +++ b/devel/tcl-tclcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2018/07/18 00:06:13 joerg Exp $ +# $NetBSD: Makefile,v 1.32 2019/11/03 10:39:31 rillig Exp $ DISTNAME= tclcl-src-1.20 PKGNAME= tcl-${DISTNAME:S/-src//} @@ -28,8 +28,8 @@ BUILDLINK_DEPMETHOD.libXt?= build .include "../../lang/tcl/Makefile.version" .include "../../x11/tk/Makefile.version" -CONFIGURE_ARGS+=--with-tcl-ver=${TCL_VERSION} -CONFIGURE_ARGS+=--with-tk-ver=${TK_VERSION} +CONFIGURE_ARGS+= --with-tcl-ver=${TCL_VERSION} +CONFIGURE_ARGS+= --with-tk-ver=${TK_VERSION} .include "../../lang/tcl/buildlink3.mk" .include "../../lang/tcl-otcl/buildlink3.mk" diff --git a/devel/teem/Makefile b/devel/teem/Makefile index d0bda0d022e..a4f92ff67aa 100644 --- a/devel/teem/Makefile +++ b/devel/teem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2013/02/16 11:20:51 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/03 10:39:31 rillig Exp $ # DISTNAME= teem-1.8.0-src @@ -17,22 +17,22 @@ USE_TOOLS+= gmake pax .if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" . if ${MACHINE_ARCH} == "i386" -NARCH=32 -LARCH=32 +NARCH= 32 +LARCH= 32 . elif ${MACHINE_ARCH} == "x86_64" -NARCH=64 -LARCH=amd64 +NARCH= 64 +LARCH= amd64 . else PKG_FAIL_REASON+= "Need configuration rules for ${MACHINE_ARCH}." . endif -TEEM_ARCH=netbsd.${NARCH} +TEEM_ARCH= netbsd.${NARCH} do-configure: cd ${WRKSRC} && ${CP} -pR linux.${LARCH} ${TEEM_ARCH} .elif ${OPSYS} == "Linux" && ${MACHINE_ARCH} == "i386" -TEEM_ARCH=linux.32 +TEEM_ARCH= linux.32 .else PKG_FAIL_REASON+= "Support for this platform has not yet been added." .endif diff --git a/devel/tet3/Makefile b/devel/tet3/Makefile index 9da2604aa5c..a5cd45dba15 100644 --- a/devel/tet3/Makefile +++ b/devel/tet3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2019/08/11 13:20:52 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2019/11/03 10:39:31 rillig Exp $ DISTNAME= tet3.7-unsup.src PKGNAME= tet3-3.7 @@ -12,7 +12,7 @@ HOMEPAGE= http://tetworks.opengroup.org/ COMMENT= The Open Group test harness LICENSE= artistic -WRKSRC= ${WRKDIR} +WRKSRC= ${WRKDIR} HAS_CONFIGURE= yes CONFIG_SHELL= ${SH} CONFIGURE_ARGS+= -t inet diff --git a/devel/tla/Makefile b/devel/tla/Makefile index e3b72586be5..0e8cc8ba73b 100644 --- a/devel/tla/Makefile +++ b/devel/tla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2017/09/06 10:40:26 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2019/11/03 10:39:31 rillig Exp $ # DISTNAME= tla-1.3.5 @@ -24,16 +24,16 @@ REPLACE_BASH+= src/tla/tests/changeset-tests/chmod_random USE_TOOLS+= bash USE_TOOLS+= gmake pax -HAS_CONFIGURE= yes +HAS_CONFIGURE= yes OVERRIDE_GNU_CONFIG_SCRIPTS= yes -OVERRIDE_DIRDEPTH= 3 -CONFIGURE_DIRS= src/=build -CONFIGURE_SCRIPT= ../configure -CONFIGURE_ARGS+= --prefix=${PREFIX} -CONFIGURE_ARGS+= --with-gnu-diff=${PREFIX}/bin/gdiff -CONFIGURE_ARGS+= --with-gnu-diff3=${PREFIX}/bin/gdiff3 -CONFIGURE_ARGS+= --with-gnu-patch=${PREFIX}/bin/gpatch -CONFIGURE_ARGS+= --with-gnu-tar=${PREFIX}/bin/gtar +OVERRIDE_DIRDEPTH= 3 +CONFIGURE_DIRS= src/=build +CONFIGURE_SCRIPT= ../configure +CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --with-gnu-diff=${PREFIX}/bin/gdiff +CONFIGURE_ARGS+= --with-gnu-diff3=${PREFIX}/bin/gdiff3 +CONFIGURE_ARGS+= --with-gnu-patch=${PREFIX}/bin/gpatch +CONFIGURE_ARGS+= --with-gnu-tar=${PREFIX}/bin/gtar DOCDIR= ${PREFIX}/share/doc/tla diff --git a/devel/ucl/Makefile b/devel/ucl/Makefile index d4752195b56..1d974b2fe79 100644 --- a/devel/ucl/Makefile +++ b/devel/ucl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2018/07/04 13:40:16 jperkin Exp $ +# $NetBSD: Makefile,v 1.25 2019/11/03 10:39:31 rillig Exp $ # DISTNAME= ucl-1.03 @@ -11,8 +11,8 @@ HOMEPAGE= http://www.oberhumer.com/opensource/ucl/ COMMENT= Portable lossless data compression library LICENSE= gnu-gpl-v2 -USE_LIBTOOL= YES -GNU_CONFIGURE= YES +USE_LIBTOOL= YES +GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-shared=yes # Avoid path to build directory in example Makefile diff --git a/devel/ucpp/Makefile b/devel/ucpp/Makefile index bcf6fab5533..bf3a66893eb 100644 --- a/devel/ucpp/Makefile +++ b/devel/ucpp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2018/07/04 13:40:16 jperkin Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/03 10:39:31 rillig Exp $ DISTNAME= ucpp-1.3.2 CATEGORIES= devel @@ -15,8 +15,8 @@ INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 .include "../../mk/bsd.prefs.mk" -CFLAGS+= -DSTD_MACROS=0 -DSTD_ASSERT=0 -DNO_UCPP_BUF -SUBST_CLASSES+= config +CFLAGS+= -DSTD_MACROS=0 -DSTD_ASSERT=0 -DNO_UCPP_BUF +SUBST_CLASSES+= config SUBST_STAGE.config= pre-configure SUBST_FILES.config= config.h # remove /usr/local/include from default path diff --git a/devel/uno/Makefile b/devel/uno/Makefile index 23e9d4229e6..38150a09d10 100644 --- a/devel/uno/Makefile +++ b/devel/uno/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2018/07/04 13:40:16 jperkin Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/03 10:39:32 rillig Exp $ # DISTNAME= uno_v213 @@ -24,11 +24,11 @@ NOT_FOR_PLATFORM+= *-*-alpha NOT_FOR_PLATFORM+= DragonFly-*-x86_64 # This package always issues -m32 from its makefile; remove it if 32-bit. -IS32=yes +IS32= yes .for P in ${LP64PLATFORMS} -.if ${MACHINE_PLATFORM:M${P}} -IS32=no -.endif +. if ${MACHINE_PLATFORM:M${P}} +IS32= no +. endif .endfor .if ${IS32} == "yes" BUILDLINK_TRANSFORM+= rm:-m32 diff --git a/devel/vtcl/Makefile b/devel/vtcl/Makefile index 84312d437c2..e1c0213b34b 100644 --- a/devel/vtcl/Makefile +++ b/devel/vtcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2018/03/12 11:16:21 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/03 10:39:32 rillig Exp $ DISTNAME= vtcl-1.6.0 PKGREVISION= 9 @@ -10,8 +10,8 @@ HOMEPAGE= http://vtcl.sourceforge.net/ COMMENT= Visual Tcl/Tk application development environment USE_TOOLS+= pax wish:run -HAS_CONFIGURE= yes -NO_BUILD= yes +HAS_CONFIGURE= yes +NO_BUILD= yes VTCLDIR= ${PREFIX}/lib/vtcl VTCLDOCDIR= ${PREFIX}/share/doc/vtcl diff --git a/devel/wayland/platform.mk b/devel/wayland/platform.mk index 3693749cfea..d190f557cba 100644 --- a/devel/wayland/platform.mk +++ b/devel/wayland/platform.mk @@ -1,18 +1,18 @@ -# $NetBSD: platform.mk,v 1.2 2019/09/01 09:35:05 nia Exp $ +# $NetBSD: platform.mk,v 1.3 2019/11/03 10:39:32 rillig Exp $ .if !defined(PLATFORM_SUPPORTS_WAYLAND) # Please only add operating systems here after verifying that both # devel/wayland and devel/wayland-protocols build. -.for _wayland_os in NetBSD Linux +. for _wayland_os in NetBSD Linux WAYLAND_PLATFORMS+= ${_wayland_os}-*-* -.endfor +. endfor -.for _wayland_platform in ${WAYLAND_PLATFORMS} -.if !empty(MACHINE_PLATFORM:M${_wayland_platform}) +. for _wayland_platform in ${WAYLAND_PLATFORMS} +. if !empty(MACHINE_PLATFORM:M${_wayland_platform}) PLATFORM_SUPPORTS_WAYLAND= yes -.endif -.endfor +. endif +. endfor PLATFORM_SUPPORTS_WAYLAND?= no .endif # !defined(PLATFORM_SUPPORTS_WAYLAND) diff --git a/devel/xdelta/Makefile b/devel/xdelta/Makefile index 3d95694e4c7..0ed16b7bef8 100644 --- a/devel/xdelta/Makefile +++ b/devel/xdelta/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2013/04/06 20:27:19 rodent Exp $ +# $NetBSD: Makefile,v 1.37 2019/11/03 10:39:32 rillig Exp $ # DISTNAME= xdelta-1.1.4 @@ -11,10 +11,10 @@ COMMENT= Enhanced diff that works on binary files BUILDLINK_API_DEPENDS.glib+= glib>=1.2.8 BUILDLINK_API_DEPENDS.zlib+= zlib>=1.1.3 -USE_LIBTOOL= yes -USE_TOOLS+= gmake -GNU_CONFIGURE= yes -INFO_FILES= yes +USE_LIBTOOL= yes +USE_TOOLS+= gmake +GNU_CONFIGURE= yes +INFO_FILES= yes .include "../../devel/glib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/devel/yajl/Makefile b/devel/yajl/Makefile index 52c686b8284..dc293cacee7 100644 --- a/devel/yajl/Makefile +++ b/devel/yajl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2014/04/18 12:16:57 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/03 10:39:32 rillig Exp $ DISTNAME= yajl-2.1.0 CATEGORIES= devel textproc @@ -11,9 +11,9 @@ LICENSE= modified-bsd WRKSRC= ${WRKDIR}/lloyd-yajl-66cb08c -USE_LANGUAGES= c -USE_LIBTOOL= yes -USE_CMAKE= yes +USE_LANGUAGES= c +USE_LIBTOOL= yes +USE_CMAKE= yes PKGCONFIG_OVERRIDE= src/yajl.pc.cmake .include "../../mk/bsd.pkg.mk" diff --git a/devel/z80-asm/Makefile b/devel/z80-asm/Makefile index 8d09a3a03ef..8f67f5264d6 100644 --- a/devel/z80-asm/Makefile +++ b/devel/z80-asm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2016/02/21 07:40:39 ryoon Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/03 10:39:32 rillig Exp $ # DISTNAME= z80-asm-2.3.7 @@ -23,7 +23,7 @@ INSTALL_MAKE_FLAGS+= MAN_DIR=${DESTDIR}${PREFIX}/${PKGMANDIR} INSTALL_TARGET= install-all INSTALLATION_DIRS+= share/doc/${PKGBASE} -Z80ASM_DOCS+= CHANGELOG README SRC_FILES TODO dizz80.dvi dizz80.ps \ +Z80ASM_DOCS+= CHANGELOG README SRC_FILES TODO dizz80.dvi dizz80.ps \ execute_timing.txt z80-asm.html Z80-cpu-pins z80-decoder.c \ z80-decoder.h z80-mon.html z80instructions.txt \ z80mnemonics.txt etc/ti86ports.txt diff --git a/devel/zlib/builtin.mk b/devel/zlib/builtin.mk index 99c9ea66a74..a2d2fcf9987 100644 --- a/devel/zlib/builtin.mk +++ b/devel/zlib/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.14 2018/06/08 07:51:33 leot Exp $ +# $NetBSD: builtin.mk,v 1.15 2019/11/03 10:39:32 rillig Exp $ BUILTIN_PKG:= zlib @@ -8,7 +8,7 @@ BUILTIN_FIND_HEADERS.H_ZLIB= zlib.h .include "../../mk/buildlink3/bsd.builtin.mk" .if ! empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*) -USE_BUILTIN.zlib=no +USE_BUILTIN.zlib= no .endif ### @@ -21,7 +21,7 @@ IS_BUILTIN.zlib= no IS_BUILTIN.zlib= yes . endif .endif -MAKEVARS+= IS_BUILTIN.zlib +MAKEVARS+= IS_BUILTIN.zlib ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -67,7 +67,7 @@ USE_BUILTIN.zlib!= \ . endif . endif # PREFER.zlib .endif -MAKEVARS+= USE_BUILTIN.zlib +MAKEVARS+= USE_BUILTIN.zlib # If USE_ZLIB is defined, then force the use of a true zlib # implementation. @@ -88,7 +88,7 @@ CHECK_BUILTIN.zlib?= no BUILDLINK_TARGETS+= fake-zlib-pc -_FAKE_ZLIB_PC=${BUILDLINK_DIR}/lib/pkgconfig/zlib.pc +_FAKE_ZLIB_PC= ${BUILDLINK_DIR}/lib/pkgconfig/zlib.pc fake-zlib-pc: ${RUN} \ diff --git a/devel/zzuf/Makefile b/devel/zzuf/Makefile index a7c45b4be70..56dc2e3f205 100644 --- a/devel/zzuf/Makefile +++ b/devel/zzuf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2018/07/04 13:40:16 jperkin Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/03 10:39:32 rillig Exp $ # DISTNAME= zzuf-0.15 @@ -18,11 +18,11 @@ SHLIBTOOL_OVERRIDE= # empty CONFIG_GUESS_OVERRIDE= .auto/config.guess CONFIG_SUB_OVERRIDE= .auto/config.sub -SUBST_CLASSES+= fix-paths -SUBST_FILES.fix-paths= doc/libzzuf.3.in -SUBST_MESSAGE.fix-paths=Fixing hard-coded pathnames -SUBST_SED.fix-paths= -e 's,/usr,${PREFIX},g' -SUBST_STAGE.fix-paths= pre-configure +SUBST_CLASSES+= fix-paths +SUBST_FILES.fix-paths= doc/libzzuf.3.in +SUBST_MESSAGE.fix-paths= Fixing hard-coded pathnames +SUBST_SED.fix-paths= -e 's,/usr,${PREFIX},g' +SUBST_STAGE.fix-paths= pre-configure .include "../../mk/bsd.fast.prefs.mk" |