Uses/cabal.mk: Rename `EXECUTABLES` to `CABAL_EXECUTABLES`.

Approved by: tcberner

Differential Revision: https://reviews.freebsd.org/D36079

25 files changed, 44 insertions, 45 deletions

diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk
index 929b3d053cf5..09724cedbcd2 100644
--- a/Mk/Uses/cabal.mk
+++ b/Mk/Uses/cabal.mk
@@ -23,7 +23,9 @@
 #			argument of cabal-install utility. Used for both
 #			cabal configure and cabal build.
 #
-#  EXECUTABLES		List of executable Cabal targets to be built and installed.
+#  CABAL_EXECUTABLES	List of executable Cabal targets to be built and installed.
+#			Consult the .cabal file of the project being ported to find
+#			out possible values for this variable.
 #					default: ${PORTNAME}
 #
 #  opt_USE_CABAL	Variant of USE_CABAL to be used with options framework.
@@ -31,9 +33,10 @@
 #			Note that it works a bit differently from CABAL_FLAGS:
 #			it appends "${opt_CABAL_FLAGS}" when the option is enabled
 #			and "-${opt_CABAL_FLAGS}" otherwise.
-#  opt_EXECUTABLES	Variant of EXECUTABLES to be used with options framework.
+#  opt_CABAL_EXECUTABLES	Variant of CABAL_EXECUTABLES to be used with
+#			options framework.
 #
-#  CABAL_WRAPPER_SCRIPTS	A subset of ${EXECUTABLES} containing Haskell
+#  CABAL_WRAPPER_SCRIPTS	A subset of ${CABAL_EXECUTABLES} containing Haskell
 #			programs to be wrapped into a shell script that sets
 #			*_datadir environment variables before running the program.
 #			This is needed for Haskell programs that install their
@@ -73,7 +76,7 @@ BROKEN=		basement-0.0.14 package doesn't compile on i386
 
 PKGNAMEPREFIX?=	hs-
 
-EXECUTABLES?=	${PORTNAME}
+CABAL_EXECUTABLES?=	${PORTNAME}
 
 CABAL_CMD?=	cabal
 CABAL_PORT=	devel/hs-cabal-install
@@ -128,7 +131,7 @@ _USES_patch=	701:cabal-post-patch
 _USES_configure=301:cabal-pre-configure
 _USES_stage=	751:cabal-post-install-script
 
-BUILD_TARGET?=	${EXECUTABLES:S/^/exe:&/}
+BUILD_TARGET?=	${CABAL_EXECUTABLES:S/^/exe:&/}
 
 _use_cabal=	${USE_CABAL:O:u}
 
@@ -276,7 +279,7 @@ do-install:
 .    if defined(CABAL_WRAPPER_SCRIPTS) && !empty(CABAL_WRAPPER_SCRIPTS)
 	${MKDIR} ${STAGEDIR}${PREFIX}/${CABAL_LIBEXEC}
 .    endif
-.    for exe in ${EXECUTABLES}
+.    for exe in ${CABAL_EXECUTABLES}
 .      if defined(CABAL_WRAPPER_SCRIPTS) && ${CABAL_WRAPPER_SCRIPTS:M${exe}}
 	${INSTALL_PROGRAM} \
 		$$(find ${WRKSRC}/dist-newstyle -name ${exe} -type f -perm +111) \
@@ -300,7 +303,7 @@ do-install:
 
 .  if !defined(SKIP_CABAL_PLIST)
 cabal-post-install-script:
-.      for exe in ${EXECUTABLES}
+.      for exe in ${CABAL_EXECUTABLES}
 		${ECHO_CMD} 'bin/${exe}' >> ${TMPPLIST}
 .        if defined(CABAL_WRAPPER_SCRIPTS) && ${CABAL_WRAPPER_SCRIPTS:M${exe}}
 		${ECHO_CMD} '${CABAL_LIBEXEC}/${exe}' >> ${TMPPLIST}
diff --git a/Mk/bsd.options.mk b/Mk/bsd.options.mk
index a1934d5f19f3..90af39e1bed5 100644
--- a/Mk/bsd.options.mk
+++ b/Mk/bsd.options.mk
@@ -180,9 +180,9 @@ OPTIONSMKINCLUDED=	bsd.options.mk
 OPTIONS_NAME?=	${PKGORIGIN:S/\//_/}
 OPTIONS_FILE?=	${PORT_DBDIR}/${OPTIONS_NAME}/options
 
-_OPTIONS_FLAGS=	ALL_TARGET BROKEN CATEGORIES CFLAGS CONFIGURE_ENV CONFLICTS \
-		CONFLICTS_BUILD CONFLICTS_INSTALL CPPFLAGS CXXFLAGS \
-		DESKTOP_ENTRIES DISTFILES EXECUTABLES EXTRA_PATCHES EXTRACT_ONLY \
+_OPTIONS_FLAGS=	ALL_TARGET BROKEN CABAL_EXECUTABLES CATEGORIES CFLAGS CONFIGURE_ENV \
+		CONFLICTS CONFLICTS_BUILD CONFLICTS_INSTALL CPPFLAGS CXXFLAGS \
+		DESKTOP_ENTRIES DISTFILES EXTRA_PATCHES EXTRACT_ONLY \
 		GH_ACCOUNT GH_PROJECT GH_SUBDIR GH_TAGNAME GH_TUPLE \
 		GL_ACCOUNT GL_COMMIT GL_PROJECT GL_SITE GL_SUBDIR GL_TUPLE \
 		IGNORE INFO INSTALL_TARGET LDFLAGS LIBS MAKE_ARGS MAKE_ENV \
diff --git a/converters/hs-dhall-bash/Makefile b/converters/hs-dhall-bash/Makefile
index 8fe9bc72b89d..5ed4a6a17f41 100644
--- a/converters/hs-dhall-bash/Makefile
+++ b/converters/hs-dhall-bash/Makefile
@@ -122,8 +122,7 @@ USE_CABAL=	Diff-0.4.1 \
 		x509-validation-1.6.12 \
 		zlib-0.6.3.0
 
-EXECUTABLES=	dhall-to-bash
-
-CABAL_PROJECT=	remove
+CABAL_EXECUTABLES=	dhall-to-bash
+CABAL_PROJECT=		remove
 
 .include <bsd.port.mk>
diff --git a/converters/hs-dhall-json/Makefile b/converters/hs-dhall-json/Makefile
index 069fe3d097cf..d3fe92586ac2 100644
--- a/converters/hs-dhall-json/Makefile
+++ b/converters/hs-dhall-json/Makefile
@@ -117,8 +117,7 @@ USE_CABAL=	Diff-0.4.1 \
 		x509-validation-1.6.12 \
 		zlib-0.6.3.0
 
-EXECUTABLES=	dhall-to-json json-to-dhall
-
-CABAL_PROJECT=	remove
+CABAL_EXECUTABLES=	dhall-to-json json-to-dhall
+CABAL_PROJECT=		remove
 
 .include <bsd.port.mk>
diff --git a/converters/hs-dhall-yaml/Makefile b/converters/hs-dhall-yaml/Makefile
index 3bb277f0ac2d..79da29ab6612 100644
--- a/converters/hs-dhall-yaml/Makefile
+++ b/converters/hs-dhall-yaml/Makefile
@@ -120,8 +120,7 @@ USE_CABAL=	Diff-0.4.1 \
 		x509-validation-1.6.12 \
 		zlib-0.6.3.0
 
-EXECUTABLES=	dhall-to-yaml-ng yaml-to-dhall
-
-CABAL_PROJECT=	remove
+CABAL_EXECUTABLES=	dhall-to-yaml-ng yaml-to-dhall
+CABAL_PROJECT=		remove
 
 .include <bsd.port.mk>
diff --git a/deskutils/hs-arbtt/Makefile b/deskutils/hs-arbtt/Makefile
index bc9c4e7d35c4..85e482ff2fd4 100644
--- a/deskutils/hs-arbtt/Makefile
+++ b/deskutils/hs-arbtt/Makefile
@@ -63,7 +63,7 @@ USE_CABAL=		OneTuple-0.3.1_2 \
 			vector-algorithms-0.8.0.4_1 \
 			witherable-0.4.2_2
 
-EXECUTABLES=		arbtt-capture arbtt-stats arbtt-recover arbtt-import arbtt-dump
+CABAL_EXECUTABLES=	arbtt-capture arbtt-stats arbtt-recover arbtt-import arbtt-dump
 
 SUB_FILES=		pkg-message
 SUB_LIST=		EXAMPLESDIR=${EXAMPLESDIR}
diff --git a/devel/hs-ShellCheck/Makefile b/devel/hs-ShellCheck/Makefile
index 451a93c8c9f5..0d0d79b4bce3 100644
--- a/devel/hs-ShellCheck/Makefile
+++ b/devel/hs-ShellCheck/Makefile
@@ -51,7 +51,7 @@ USE_CABAL=	Diff-0.4.1 \
 		vector-0.12.3.1_2 \
 		witherable-0.4.2_2
 
-EXECUTABLES=	shellcheck
+CABAL_EXECUTABLES=	shellcheck
 
 OPTIONS_DEFINE=		MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
diff --git a/devel/hs-alex/Makefile b/devel/hs-alex/Makefile
index 23b7954770c1..b14159878a17 100644
--- a/devel/hs-alex/Makefile
+++ b/devel/hs-alex/Makefile
@@ -10,7 +10,7 @@ LICENSE=	BSD3CLAUSE
 
 USES=		cabal
 
-CABAL_WRAPPER_SCRIPTS=	${EXECUTABLES}
+CABAL_WRAPPER_SCRIPTS=	${CABAL_EXECUTABLES}
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/devel/hs-cabal-install/Makefile b/devel/hs-cabal-install/Makefile
index 53ec3ffcd5a3..a5d6a77bf28c 100644
--- a/devel/hs-cabal-install/Makefile
+++ b/devel/hs-cabal-install/Makefile
@@ -38,7 +38,7 @@ USE_CABAL=	async-2.2.4 \
 		th-compat-0.1.3 \
 		zlib-0.6.2.3_1
 
-EXECUTABLES=		cabal
+CABAL_EXECUTABLES=	cabal
 SKIP_CABAL_EXTRACT=	yes
 
 post-extract:
diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile
index 4b115d7569d5..710cc9bb8131 100644
--- a/devel/hs-happy/Makefile
+++ b/devel/hs-happy/Makefile
@@ -10,7 +10,7 @@ LICENSE=	BSD3CLAUSE
 
 USES=		cabal
 
-CABAL_WRAPPER_SCRIPTS=	${EXECUTABLES}
+CABAL_WRAPPER_SCRIPTS=	${CABAL_EXECUTABLES}
 
 PORTEXAMPLES=	*.ly README glr/* igloo/*
 
diff --git a/devel/hs-haskell-language-server/Makefile b/devel/hs-haskell-language-server/Makefile
index 5ed57b112881..218b4628d5c6 100644
--- a/devel/hs-haskell-language-server/Makefile
+++ b/devel/hs-haskell-language-server/Makefile
@@ -284,8 +284,7 @@ USE_CABAL=	Boolean-0.2.4 \
 
 CABAL_PROJECT=		append
 CABAL_FLAGS=		-dynamic
-
-EXECUTABLES=		${PORTNAME} \
+CABAL_EXECUTABLES=	${PORTNAME} \
 			${PORTNAME}-wrapper
 
 NOT_FOR_ARCHS=		i386
diff --git a/devel/hs-mueval/Makefile b/devel/hs-mueval/Makefile
index 4273266f76c8..7390e4ebc268 100644
--- a/devel/hs-mueval/Makefile
+++ b/devel/hs-mueval/Makefile
@@ -21,6 +21,6 @@ USE_CABAL=	QuickCheck-2.14.2 \
 		syb-0.7.2.1 \
 		temporary-1.3
 
-EXECUTABLES=	mueval mueval-core
+CABAL_EXECUTABLES=	mueval mueval-core
 
 .include <bsd.port.mk>
diff --git a/devel/hs-profiteur/Makefile b/devel/hs-profiteur/Makefile
index f918854e81b0..f0c2db81155d 100644
--- a/devel/hs-profiteur/Makefile
+++ b/devel/hs-profiteur/Makefile
@@ -49,7 +49,7 @@ USE_CABAL=	OneTuple-0.3.1_2 \
 		vector-0.12.3.1_2 \
 		witherable-0.4.2_3
 
-CABAL_WRAPPER_SCRIPTS=		${EXECUTABLES}
+CABAL_WRAPPER_SCRIPTS=		${CABAL_EXECUTABLES}
 profiteur_DATADIR_VARS=		js-jquery
 
 post-install:
diff --git a/games/hedgewars-server/Makefile b/games/hedgewars-server/Makefile
index f9c5c608cc9b..621a36160638 100644
--- a/games/hedgewars-server/Makefile
+++ b/games/hedgewars-server/Makefile
@@ -67,6 +67,6 @@ USE_CABAL=	ConfigFile-1.1.4 \
 		yaml-0.11.4.0 \
 		zlib-0.6.2.1_1
 
-EXECUTABLES=	hedgewars-server checker
+CABAL_EXECUTABLES=	hedgewars-server checker
 
 .include <bsd.port.mk>
diff --git a/lang/hs-brainfuck/Makefile b/lang/hs-brainfuck/Makefile
index 6e7b2bc1ee0b..bf340529e76d 100644
--- a/lang/hs-brainfuck/Makefile
+++ b/lang/hs-brainfuck/Makefile
@@ -10,6 +10,6 @@ LICENSE=	GPLv2
 
 USES=		cabal
 
-EXECUTABLES=	bf
+CABAL_EXECUTABLES=	bf
 
 .include <bsd.port.mk>
diff --git a/lang/purescript/Makefile b/lang/purescript/Makefile
index 93b5b19e9aef..c6f6e13ea53f 100644
--- a/lang/purescript/Makefile
+++ b/lang/purescript/Makefile
@@ -145,7 +145,7 @@ USE_CABAL=	Cabal-3.6.3.0 \
 		xss-sanitize-0.3.7_1 \
 		zlib-0.6.3.0
 
-EXECUTABLES=	purs
-CABAL_FLAGS=	release
+CABAL_EXECUTABLES=	purs
+CABAL_FLAGS=		release
 
 .include <bsd.port.mk>
diff --git a/print/hs-hscolour/Makefile b/print/hs-hscolour/Makefile
index 320b69a5f714..0cddebad5e18 100644
--- a/print/hs-hscolour/Makefile
+++ b/print/hs-hscolour/Makefile
@@ -11,6 +11,6 @@ LICENSE=	GPLv2
 
 USES=		cabal
 
-EXECUTABLES=	HsColour
+CABAL_EXECUTABLES=	HsColour
 
 .include <bsd.port.mk>
diff --git a/security/hs-cryptol/Makefile b/security/hs-cryptol/Makefile
index 87bfe3ce028e..5f3dae277a77 100644
--- a/security/hs-cryptol/Makefile
+++ b/security/hs-cryptol/Makefile
@@ -122,8 +122,8 @@ USE_CABAL=	GraphSCC-1.0.4 \
 		zlib-0.6.3.0 \
 		zlib-bindings-0.1.1.5_2
 
-EXECUTABLES=		cryptol cryptol-html
-CABAL_WRAPPER_SCRIPTS=	${EXECUTABLES}
+CABAL_EXECUTABLES=	cryptol cryptol-html
+CABAL_WRAPPER_SCRIPTS=	${CABAL_EXECUTABLES}
 
 post-install:
 	cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
diff --git a/textproc/hs-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile
index 28c20ee85842..13debd06ebfc 100644
--- a/textproc/hs-lhs2tex/Makefile
+++ b/textproc/hs-lhs2tex/Makefile
@@ -16,6 +16,6 @@ USE_CABAL=	regex-base-0.94.0.2 \
 		regex-compat-0.95.2.1_1 \
 		regex-posix-0.96.0.1
 
-EXECUTABLES=	lhs2TeX
+CABAL_EXECUTABLES=	lhs2TeX
 
 .include <bsd.port.mk>
diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile
index 73972b841859..476698e6b107 100644
--- a/textproc/hs-pandoc/Makefile
+++ b/textproc/hs-pandoc/Makefile
@@ -26,7 +26,7 @@ TRYPANDOC_USE_CABAL=	HUnit-1.6.2.0 auto-update-0.1.6 byteorder-1.0.4 \
 			time-manager-0.0.0 unix-compat-0.6 unix-time-0.4.7 \
 			unliftio-core-0.2.0.1_2 vault-0.3.1.5_1 void-0.7.3 \
 			wai-3.2.3 wai-extra-3.1.12.1 wai-logger-2.4.0 word8-0.1.3
-TRYPANDOC_EXECUTABLES=	trypandoc
+TRYPANDOC_CABAL_EXECUTABLES=	trypandoc
 
 USE_CABAL=	Glob-0.10.2_3 \
 		HsYAML-0.2.1.1 \
@@ -177,7 +177,7 @@ USE_CABAL=	Glob-0.10.2_3 \
 		zlib-0.6.3.0
 
 CABAL_PROJECT=		remove
-EXECUTABLES=		pandoc
+CABAL_EXECUTABLES=	pandoc
 CABAL_WRAPPER_SCRIPTS=	${EXECUTABLES}
 
 OPTIONS_SUB=	yes
diff --git a/textproc/hs-yaml/Makefile b/textproc/hs-yaml/Makefile
index 6e9ce4183ff3..159a36ed0c51 100644
--- a/textproc/hs-yaml/Makefile
+++ b/textproc/hs-yaml/Makefile
@@ -59,7 +59,7 @@ USE_CABAL=	OneTuple-0.3.1_2 \
 		vector-algorithms-0.8.0.4_1 \
 		witherable-0.4.2_2
 
-EXECUTABLES=	json2yaml yaml2json
-CABAL_FLAGS=	-no-exe
+CABAL_EXECUTABLES=	json2yaml yaml2json
+CABAL_FLAGS=		-no-exe
 
 .include <bsd.port.mk>
diff --git a/www/hs-DAV/Makefile b/www/hs-DAV/Makefile
index a453417f7899..4d70efa55044 100644
--- a/www/hs-DAV/Makefile
+++ b/www/hs-DAV/Makefile
@@ -121,6 +121,6 @@ USE_CABAL=	OneTuple-0.3.1_2 \
 		xml-types-0.3.8 \
 		zlib-0.6.3.0
 
-EXECUTABLES=	hdav
+CABAL_EXECUTABLES=	hdav
 
 .include <bsd.port.mk>
diff --git a/www/hs-postgrest/Makefile b/www/hs-postgrest/Makefile
index f1b3870600e8..a1eb4a5d1192 100644
--- a/www/hs-postgrest/Makefile
+++ b/www/hs-postgrest/Makefile
@@ -47,7 +47,7 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKDIR}/default.conf ${STAGEDIR}${ETCDIR}/default.conf.sample
 	${INSTALL_PROGRAM} \
-		$$(find ${WRKSRC}/dist-newstyle -name ${EXECUTABLES} -type f -perm +111) \
-		${STAGEDIR}${PREFIX}/sbin/${EXECUTABLES}
+		$$(find ${WRKSRC}/dist-newstyle -name ${PORTNAME} -type f -perm +111) \
+		${STAGEDIR}${PREFIX}/sbin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/www/hs-wai-app-static/Makefile b/www/hs-wai-app-static/Makefile
index 72db5347c4e1..e9bc8dcf88ec 100644
--- a/www/hs-wai-app-static/Makefile
+++ b/www/hs-wai-app-static/Makefile
@@ -103,6 +103,6 @@ USE_CABAL=	HUnit-1.6.2.0 \
 		x509-1.7.6 \
 		zlib-0.6.3.0
 
-EXECUTABLES=	warp
+CABAL_EXECUTABLES=	warp
 
 .include <bsd.port.mk>
diff --git a/www/hs-yesod-bin/Makefile b/www/hs-yesod-bin/Makefile
index d44cb780b4a6..301b00684238 100644
--- a/www/hs-yesod-bin/Makefile
+++ b/www/hs-yesod-bin/Makefile
@@ -129,6 +129,6 @@ USE_CABAL=	HUnit-1.6.2.0 \
 		yaml-0.11.8.0 \
 		zlib-0.6.3.0
 
-EXECUTABLES=	yesod
+CABAL_EXECUTABLES=	yesod
 
 .include <bsd.port.mk>