From ef5c8ed42b5f83bfa34699052d684f23e761e43e Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 9 Oct 2014 14:05:50 +0000 Subject: Remove pkgviews: don't set PKG_INSTALLATION_TYPES in Makefiles. --- shells/bash/Makefile | 4 +--- shells/bash2/Makefile | 4 +--- shells/mksh/Makefile | 4 +--- shells/osh/Makefile | 4 +--- shells/pdksh/Makefile | 3 +-- shells/posh/Makefile | 4 +--- shells/zsh/Makefile.common | 4 +--- 7 files changed, 7 insertions(+), 20 deletions(-) (limited to 'shells') diff --git a/shells/bash/Makefile b/shells/bash/Makefile index 2ab85d49d0c..4a2eda1c694 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.72 2014/10/07 00:16:52 wiz Exp $ +# $NetBSD: Makefile,v 1.73 2014/10/09 14:06:56 wiz Exp $ BASH_VERSION= 4.3 BASH_PATCHLEVEL= 030 @@ -24,8 +24,6 @@ LICENSE= gnu-gpl-v3 CONFLICTS= static-bash-[0-9]* -PKG_INSTALLATION_TYPES= overwrite pkgviews - USE_TOOLS+= makeinfo bison USE_PKGLOCALEDIR= yes TEXINFO_REQD= 4.1 diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile index 5cd34faabf8..3f417404365 100644 --- a/shells/bash2/Makefile +++ b/shells/bash2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.86 2014/09/30 18:27:40 christos Exp $ +# $NetBSD: Makefile,v 1.87 2014/10/09 14:06:56 wiz Exp $ # DISTNAME= bash-2.05b @@ -19,8 +19,6 @@ COMMENT= The GNU Bourne Again Shell (version 2) CONFLICTS= static-bash-[0-9]* -PKG_INSTALLATION_TYPES= overwrite pkgviews - GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-installed-readline MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} diff --git a/shells/mksh/Makefile b/shells/mksh/Makefile index 353f4e68dff..d980a3e0028 100644 --- a/shells/mksh/Makefile +++ b/shells/mksh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2014/10/07 18:51:02 bsiegert Exp $ +# $NetBSD: Makefile,v 1.29 2014/10/09 14:06:56 wiz Exp $ DISTNAME= mksh-R50d PKGNAME= ${DISTNAME:S/-R/-/} @@ -17,8 +17,6 @@ LICENSE= miros WRKSRC= ${WRKDIR}/mksh WRKBUILD?= ${WRKSRC} -PKG_INSTALLATION_TYPES= pkgviews overwrite - PKG_SHELL= bin/mksh LIBS.Interix+= -lcrypt diff --git a/shells/osh/Makefile b/shells/osh/Makefile index 41220a8bfc9..d4223d3961f 100644 --- a/shells/osh/Makefile +++ b/shells/osh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2012/09/11 23:25:08 asau Exp $ +# $NetBSD: Makefile,v 1.31 2014/10/09 14:06:56 wiz Exp $ DISTNAME= osh-20100430 PKGREVISION= 1 @@ -10,8 +10,6 @@ HOMEPAGE= http://v6shell.org/ COMMENT= Port of the Sixth Edition UNIX shell LICENSE= original-bsd -PKG_INSTALLATION_TYPES= overwrite pkgviews - PKG_SHELL= bin/osh BUILD_TARGET= oshall diff --git a/shells/pdksh/Makefile b/shells/pdksh/Makefile index ecdcf7f9777..d348da6d5f0 100644 --- a/shells/pdksh/Makefile +++ b/shells/pdksh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2012/09/11 23:25:09 asau Exp $ +# $NetBSD: Makefile,v 1.22 2014/10/09 14:06:56 wiz Exp $ # DISTNAME= pdksh-5.2.14 @@ -15,7 +15,6 @@ MAINTAINER= schmonz@NetBSD.org HOMEPAGE= http://web.cs.mun.ca/~michael/pdksh/ COMMENT= Free clone of the AT&T Korn shell -PKG_INSTALLATION_TYPES= overwrite pkgviews BOOTSTRAP_PKG= yes GNU_CONFIGURE= yes diff --git a/shells/posh/Makefile b/shells/posh/Makefile index 146cbc4e340..597feb97448 100644 --- a/shells/posh/Makefile +++ b/shells/posh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2014/10/07 14:50:58 mef Exp $ +# $NetBSD: Makefile,v 1.18 2014/10/09 14:06:56 wiz Exp $ # DISTNAME= posh_0.12.3 @@ -12,8 +12,6 @@ HOMEPAGE= http://packages.debian.org/posh COMMENT= Debian Policy-compliant Ordinary SHell LICENSE= gnu-gpl-v2 -PKG_INSTALLATION_TYPES= overwrite pkgviews - GNU_CONFIGURE= YES PKG_SHELL= bin/posh WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common index 4d17d73f593..82f4394753d 100644 --- a/shells/zsh/Makefile.common +++ b/shells/zsh/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.72 2014/01/08 16:30:01 ryoon Exp $ +# $NetBSD: Makefile.common,v 1.73 2014/10/09 14:06:56 wiz Exp $ # used by shells/zsh/Makefile # used by shells/zsh-current/Makefile @@ -19,8 +19,6 @@ USE_TOOLS+= makeinfo INFO_FILES= yes TEXINFO_REQD= 4.0 -PKG_INSTALLATION_TYPES= overwrite pkgviews - .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "Darwin" -- cgit v1.2.3