Fix bash-static slave ports with bash being now using new options framework

This commit is contained in:
Baptiste Daroussin 2013-05-05 08:39:30 +00:00
parent ba05dde78b
commit ef5b0dd161
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=317405
2 changed files with 3 additions and 7 deletions

View file

@ -1,12 +1,8 @@
# Ports collection makefile for: bash-static
# Date created: 22 Jan 2009
# Whom: Emanuel Haupt <ehaupt@FreeBSD.org>
#
# Created by: Emanuel Haupt <ehaupt@FreeBSD.org>
# $FreeBSD$
#
MASTERDIR= ${.CURDIR}/../../shells/bash
WITH_STATIC_BASH= yes
OPTIONS_SLAVE= STATIC
.include "${MASTERDIR}/Makefile"

View file

@ -61,7 +61,7 @@ CONFIGURE_ARGS= --without-bash-malloc \
--disable-rpath \
--enable-disabled-builtins
.if ${PORT_OPTIONS:MSTATIC_BASH} || defined(NO_DYNAMICROOT) || (defined(NOSHARED) && ${NOSHARED:L} != "no")
.if ${PORT_OPTIONS:MSTATIC} || defined(NO_DYNAMICROOT) || (defined(NOSHARED) && ${NOSHARED:L} != "no")
CONFIGURE_ARGS+= --enable-static-link
PKGNAMESUFFIX= -static
CONFLICTS+= bash-[0-9]* bash-devel-[0-9]* bash-static-devel-[0-9]*