Date: Sun, 5 May 2013 08:39:31 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317405 - in head/shells: bash bash-static Message-ID: <201305050839.r458dVmX090374@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sun May 5 08:39:30 2013 New Revision: 317405 URL: http://svnweb.freebsd.org/changeset/ports/317405 Log: Fix bash-static slave ports with bash being now using new options framework Modified: head/shells/bash-static/Makefile head/shells/bash/Makefile Modified: head/shells/bash-static/Makefile ============================================================================== --- head/shells/bash-static/Makefile Sun May 5 08:26:08 2013 (r317404) +++ head/shells/bash-static/Makefile Sun May 5 08:39:30 2013 (r317405) @@ -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" Modified: head/shells/bash/Makefile ============================================================================== --- head/shells/bash/Makefile Sun May 5 08:26:08 2013 (r317404) +++ head/shells/bash/Makefile Sun May 5 08:39:30 2013 (r317405) @@ -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]*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305050839.r458dVmX090374>