Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -13457,3 +13457,4 @@
 www/p5-WWW-Mechanize-PhantomJS||2019-11-02|Has expired: uses expired lang/phantomjs
 x11/xfwp||2019-11-06|Has expired: Deprecated upstream
 x11/xfindproxy||2019-11-06|Has expired: Deprecated upstream
+lang/ponyc-static|lang/ponyc@llvm_static|2019-11-09|Flavored
Index: lang/Makefile
===================================================================
--- lang/Makefile
+++ lang/Makefile
@@ -286,7 +286,6 @@
     SUBDIR += pocl
     SUBDIR += polyml
     SUBDIR += ponyc
-    SUBDIR += ponyc-static
     SUBDIR += ptoc
     SUBDIR += purescript
     SUBDIR += py-hy
Index: lang/ponyc-static/Makefile
===================================================================
--- lang/ponyc-static/Makefile
+++ lang/ponyc-static/Makefile
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-PKGNAMESUFFIX=	-static
-COMMENT=	Pony language compiler (statically linked with LLVM)
-CONFLICTS_INSTALL=	ponyc
-MASTERDIR=	${.CURDIR}/../ponyc
-OPTIONS_SLAVE=	STATIC
-
-.include "${MASTERDIR}/Makefile"
Index: lang/ponyc/Makefile
===================================================================
--- lang/ponyc/Makefile
+++ lang/ponyc/Makefile
@@ -5,7 +5,7 @@
 CATEGORIES=	lang
 
 MAINTAINER=	greg@unrelenting.technology
-COMMENT?=	Pony language compiler
+COMMENT=	Pony language compiler
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -15,6 +15,16 @@
 
 BUILD_DEPENDS=	llvm-link${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
 
+FLAVORS=	llvm_dynamic llvm_static
+FLAVOR?=	${FLAVORS:[1]}
+
+llvm_dynamic_CONFLICTS_INSTALL=	ponyc-static
+llvm_static_PKGNAMESUFFIX=	-static
+llvm_static_CONFLICTS_INSTALL=	ponyc
+.if ${FLAVOR} == llvm_static
+COMMENT+=			(statically linked with LLVM)
+.endif
+
 USES=		gmake ncurses compiler:c++11-lang
 
 LLVM_VERSION?=	70
@@ -31,12 +41,13 @@
 		prefix=${PREFIX} arch=${PONYARCH} \
 		LLVM_CONFIG=llvm-config${LLVM_VERSION}
 
-CONFLICTS_INSTALL?=	ponyc-static
-
 OPTIONS_DEFINE=			DOCS DTRACE EXAMPLES STATIC
 OPTIONS_EXCLUDE_aarch64=	DTRACE
 # Not enabling DTrace by default yet because it breaks --runtimebc ("super LTO"):
 # https://github.com/ponylang/ponyc/issues/2915
+.if ${FLAVOR} == llvm_static
+OPTIONS_SLAVE=			STATIC
+.endif
 
 DTRACE_MAKE_ENV=		use=dtrace