diff --git a/shells/bash-static/Makefile b/shells/bash-static/Makefile --- a/shells/bash-static/Makefile +++ b/shells/bash-static/Makefile @@ -1,6 +1,7 @@ MASTERDIR= ${.CURDIR}/../../shells/bash OPTIONS_SLAVE= STATIC +OPTIONS_EXCLUDE=PORTS_READLINE NLS PKGNAMESUFFIX= -static diff --git a/shells/bash/Makefile b/shells/bash/Makefile --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -1,6 +1,7 @@ PORTNAME= bash PATCHLEVEL= 37 PORTVERSION= 5.2.${PATCHLEVEL:S/^0//g} +PORTREVISION= 1 CATEGORIES= shells MASTER_SITES= GNU DISTNAME= ${PORTNAME}-${PORTVERSION:R} @@ -36,6 +37,7 @@ OPTIONS_DEFINE= FDESCFS PORTS_READLINE HELP NLS STATIC SYSBASHRC \ SYSLOG DOCS OPTIONS_DEFAULT= HELP PORTS_READLINE + OPTIONS_SUB= yes FDESCFS_DESC= Enable use of /dev/fd @@ -54,6 +56,9 @@ PORTS_READLINE_USES= readline PORTS_READLINE_CONFIGURE_WITH= installed-readline +STATIC_PREVENTS= PORTS_READLINE NLS +STATIC_PREVENTS_MSG= "STATIC and PORTS_READLINE/NLS options are mutually exclusive" + .if empty(PKGNAMESUFFIX) CONFLICTS+= bash-static bash52-static .else