Uses/cabal.mk: Rename EXECUTABLES to CABAL_EXECUTABLES.

Approved by: tcberner

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

Author: arrowd

Mk/Uses/cabal.mk

@@ -23,17 +23,20 @@
 #			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.
 #  opt_CABAL_FLAGS	Variant of CABAL_FLAGS to be used with options framework.
 #			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}

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 \

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>

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>

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>

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}

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

devel/hs-alex/Makefile

@@ -10,7 +10,7 @@ LICENSE=	BSD3CLAUSE
 
 USES=		cabal
 
-CABAL_WRAPPER_SCRIPTS=	${EXECUTABLES}
+CABAL_WRAPPER_SCRIPTS=	${CABAL_EXECUTABLES}
 
 OPTIONS_DEFINE=	EXAMPLES
 

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:

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/*