diff options
-rw-r--r-- | shells/bash-completion/Makefile | 4 | ||||
-rw-r--r-- | shells/bash2/Makefile | 18 | ||||
-rw-r--r-- | shells/eltclsh/options.mk | 8 | ||||
-rw-r--r-- | shells/rssh/Makefile | 4 | ||||
-rw-r--r-- | shells/scsh/Makefile | 8 | ||||
-rw-r--r-- | shells/static-ast-ksh/Makefile | 4 | ||||
-rw-r--r-- | shells/xsh/Makefile | 4 | ||||
-rw-r--r-- | shells/zsh/Makefile | 8 |
8 files changed, 29 insertions, 29 deletions
diff --git a/shells/bash-completion/Makefile b/shells/bash-completion/Makefile index df07e50b4a7..a5b7f74f7a4 100644 --- a/shells/bash-completion/Makefile +++ b/shells/bash-completion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2018/12/02 07:06:20 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2019/11/04 21:14:06 rillig Exp $ # # Note to packagers: # packages installing additional completion files should drop @@ -9,7 +9,7 @@ DISTNAME= bash-completion-2.8 PKGREVISION= 1 CATEGORIES= shells MASTER_SITES= ${MASTER_SITE_GITHUB:=scop/} -GITHUB_RELEASE= ${PKGVERSION_NOREV} +GITHUB_RELEASE= ${PKGVERSION_NOREV} EXTRACT_SUFX= .tar.xz MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile index 8682d0f73d1..4a648ab05f9 100644 --- a/shells/bash2/Makefile +++ b/shells/bash2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.91 2017/01/19 18:52:25 agc Exp $ +# $NetBSD: Makefile,v 1.92 2019/11/04 21:14:06 rillig Exp $ # DISTNAME= bash-2.05b @@ -19,13 +19,13 @@ COMMENT= The GNU Bourne Again Shell (version 2) CONFLICTS= static-bash-[0-9]* -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-installed-readline -USE_TOOLS+= yacc -MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} -CPPFLAGS+= -DDEFAULT_PATH_VALUE="\"/usr/bin:/bin:${LOCALBASE}/bin:/usr/local/bin\"" -TEST_TARGET= test -MAKE_JOBS_SAFE= no +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-installed-readline +USE_TOOLS+= yacc +MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} +CPPFLAGS+= -DDEFAULT_PATH_VALUE="\"/usr/bin:/bin:${LOCALBASE}/bin:/usr/local/bin\"" +TEST_TARGET= test +MAKE_JOBS_SAFE= no BROKEN_GETTEXT_DETECTION= yes PKG_SHELL= bin/bash @@ -44,7 +44,7 @@ PKG_SUGGESTED_OPTIONS= multibyte ## Static link ## .if !empty(PKG_OPTIONS:Mstatic) -CONFIGURE_ARGS+= --enable-static-link +CONFIGURE_ARGS+= --enable-static-link BUILDLINK_DEPMETHOD.gettext= build BUILDLINK_DEPMETHOD.readline= build .endif diff --git a/shells/eltclsh/options.mk b/shells/eltclsh/options.mk index 7c81d8cac22..c9c9af1e69a 100644 --- a/shells/eltclsh/options.mk +++ b/shells/eltclsh/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.1 2008/08/22 07:44:00 obache Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.eltclsh -PKG_SUPPORTED_OPTIONS= tk -PKG_SUGGESTED_OPTIONS= tk +# $NetBSD: options.mk,v 1.2 2019/11/04 21:14:06 rillig Exp $ +PKG_OPTIONS_VAR= PKG_OPTIONS.eltclsh +PKG_SUPPORTED_OPTIONS= tk +PKG_SUGGESTED_OPTIONS= tk .include "../../mk/bsd.options.mk" diff --git a/shells/rssh/Makefile b/shells/rssh/Makefile index 429db427221..73bd952ad89 100644 --- a/shells/rssh/Makefile +++ b/shells/rssh/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2018/04/13 16:59:13 he Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/04 21:14:07 rillig Exp $ DISTNAME= rssh-2.3.4 -PKGREVISION= 2 +PKGREVISION= 2 CATEGORIES= shells security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rssh/} diff --git a/shells/scsh/Makefile b/shells/scsh/Makefile index c65292bb447..3e8d94a3cdd 100644 --- a/shells/scsh/Makefile +++ b/shells/scsh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2017/01/19 18:52:25 agc Exp $ +# $NetBSD: Makefile,v 1.46 2019/11/04 21:14:07 rillig Exp $ DISTNAME= scsh-0.6.7 PKGREVISION= 1 @@ -7,9 +7,9 @@ MASTER_SITES= http://ftp.scsh.net/pub/scsh/0.6/ MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=scsh/} MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.scsh.net/ -COMMENT= Unix shell embedded into Scheme, with access to all Posix calls -LICENSE= modified-bsd +HOMEPAGE= http://www.scsh.net/ +COMMENT= Unix shell embedded into Scheme, with access to all Posix calls +LICENSE= modified-bsd BROKEN_ON_PLATFORM= ${LP64PLATFORMS} # Not 64-bit clean. diff --git a/shells/static-ast-ksh/Makefile b/shells/static-ast-ksh/Makefile index f04f9583017..4f9a58e0fcf 100644 --- a/shells/static-ast-ksh/Makefile +++ b/shells/static-ast-ksh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2014/11/06 12:25:36 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/04 21:14:07 rillig Exp $ # .include "../../shells/ast-ksh/Makefile.common" @@ -17,6 +17,6 @@ COMMENT:= Statically-linked version of the ${COMMENT} # SunOS 5.10 stopped shipping static libraries NOT_FOR_PLATFORM+= SunOS-5.1[0-9]-* -KSH93_MAKEFLAGS=LDFLAGS=-static +KSH93_MAKEFLAGS= LDFLAGS=-static .include "../../mk/bsd.pkg.mk" diff --git a/shells/xsh/Makefile b/shells/xsh/Makefile index 8606ed8172a..1ec9396124a 100644 --- a/shells/xsh/Makefile +++ b/shells/xsh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2019/08/11 13:23:02 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2019/11/04 21:14:07 rillig Exp $ DISTNAME= XML-XSH-1.8.2 PKGNAME= ${DISTNAME:S/XML-XSH/xsh/} @@ -19,7 +19,7 @@ DEPENDS+= p5-XML-NodeFilter-[0-9]*:../../textproc/p5-XML-NodeFilter USE_TOOLS+= gmake PKG_SHELL= bin/xsh -PERL5_PACKLIST= auto/XML/XSH/.packlist +PERL5_PACKLIST= auto/XML/XSH/.packlist .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile index 66b2e73b798..153b786b1c3 100644 --- a/shells/zsh/Makefile +++ b/shells/zsh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.92 2019/03/16 14:01:45 wiz Exp $ +# $NetBSD: Makefile,v 1.93 2019/11/04 21:14:07 rillig Exp $ DISTNAME= zsh-5.7.1 PKGREVISION= 1 @@ -21,7 +21,7 @@ CONFIGURE_ARGS+= --disable-gdbm CONFIGURE_ARGS+= --enable-etcdir=${PKG_SYSCONFDIR:Q} # Ensure we can find initscr(3) otherwise the curses module will not be built. -CONFIGURE_ARGS+= --with-term-lib="${BUILDLINK_LIBNAME.curses} ${BUILDLINK_LIBNAME.terminfo}" +CONFIGURE_ARGS+= --with-term-lib="${BUILDLINK_LIBNAME.curses} ${BUILDLINK_LIBNAME.terminfo}" .include "../../mk/bsd.prefs.mk" @@ -43,11 +43,11 @@ CONFIGURE_ENV.NetBSD+= zsh_cv_sys_dynamic_execsyms=yes INSTALLATION_DIRS+= share/doc/zsh -PLIST_VARS+= xattr +PLIST_VARS+= xattr .if exists(/usr/include/sys/xattr.h) || \ exists(/usr/include/${NATIVE_MACHINE_GNU_ARCH}-${LOWER_OPSYS}-gnu/sys/xattr.h) || \ defined(OSX_SDK_PATH) && exists(${OSX_SDK_PATH}/usr/include/sys/xattr.h) -PLIST.xattr= yes +PLIST.xattr= yes .endif PRINT_PLIST_AWK+= {if ($$0 ~ /attr.so/) {$$0 = "$${PLIST.xattr}" $$0;}} |