Index: shells/Makefile
===================================================================
--- shells/Makefile
+++ shells/Makefile
@@ -5,9 +5,9 @@
 
     SUBDIR += 44bsd-csh
     SUBDIR += ambit
-    SUBDIR += bash
+    SUBDIR += bash/dynamic
+    SUBDIR += bash/static
     SUBDIR += bash-completion
-    SUBDIR += bash-static
     SUBDIR += bashc
     SUBDIR += ch
     SUBDIR += dash
Index: shells/bash/Makefile
===================================================================
--- shells/bash/Makefile
+++ shells/bash/Makefile
@@ -19,9 +19,11 @@
 MAINTAINER=		ehaupt@FreeBSD.org
 COMMENT=		GNU Project's Bourne Again SHell
 
+FLAVORS=		dynamic static
+
 LICENSE=		GPLv3
 
-OPTIONS_DEFINE=		COLONBREAKSWORDS HELP NLS STATIC SYSLOG DOCS
+OPTIONS_DEFINE=		COLONBREAKSWORDS HELP NLS SYSLOG DOCS
 COLONBREAKSWORDS_DESC=	Colons break words
 HELP_DESC=		Enable builtin help
 
@@ -56,15 +58,6 @@
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MSTATIC} || defined(NO_DYNAMICROOT) || (defined(NOSHARED) && ${NOSHARED:tl} != "no")
-CONFIGURE_ARGS+=	--enable-static-link
-.else
-CONFIGURE_ARGS+=	--disable-static-link
-# Bash symbols must be exported in order to link runtime plugins, i.e.,
-# "enable -f". (Plugins are not supported for bash-static.)
-CFLAGS+=		-Wl,-export-dynamic
-.endif
-
 post-patch:
 # Ensure y.tab.c is regenerated
 	${TOUCH} ${WRKSRC}/parse.y
Index: shells/bash/dynamic/Makefile
===================================================================
--- /dev/null
+++ shells/bash/dynamic/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+FLAVOR=	yes
+CONFIGURE_ARGS=	--disable-static-link
+# Bash symbols must be exported in order to link runtime plugins, i.e.,
+# # "enable -f". (Plugins are not supported for bash-static.)
+CFLAGS+=	--Wl,-export-dynamic
+PLIST_SUB=	NO_STATIC=""
+
+.include "${.CURDIR:H}/Makefile"
Index: shells/bash/static/Makefile
===================================================================
--- /dev/null
+++ shells/bash/static/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+FLAVOR=	yes
+CONFIGURE_ARGS=	--enable-static-link
+PKGNAMESUFFIX=	-static
+PLIST_SUB=	NO_STATIC="@comment "
+
+.include "${.CURDIR:H}/Makefile"