summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2020-07-01 15:07:25 +0000
committerrillig <rillig@pkgsrc.org>2020-07-01 15:07:25 +0000
commit7a2d7e821d8440f645c462874b8e89014cfeca38 (patch)
tree6af631082cf666a37788a96b67399d0dd04d379b
parent8fb3a466e37b94d2097027d2f5bff528e12caf76 (diff)
downloadpkgsrc-7a2d7e821d8440f645c462874b8e89014cfeca38.tar.gz
mk/haskell.mk: clean up _VARGROUPS section and unused variables
-rw-r--r--mk/haskell.mk32
1 files changed, 22 insertions, 10 deletions
diff --git a/mk/haskell.mk b/mk/haskell.mk
index 12bf54e40b5..bf299fc5661 100644
--- a/mk/haskell.mk
+++ b/mk/haskell.mk
@@ -1,4 +1,4 @@
-# $NetBSD: haskell.mk,v 1.26 2020/07/01 14:58:43 rillig Exp $
+# $NetBSD: haskell.mk,v 1.27 2020/07/01 15:07:25 rillig Exp $
#
# This Makefile fragment handles Haskell Cabal packages.
# Package configuration, building, installation, registration and
@@ -56,21 +56,37 @@ _VARGROUPS+= haskell
_USER_VARS.haskell= \
HASKELL_ENABLE_SHARED_LIBRARY \
HASKELL_ENABLE_LIBRARY_PROFILING \
- HASKELL_ENABLE_HADDOCK_DOCUMENTATION
+ HASKELL_ENABLE_HADDOCK_DOCUMENTATION \
+ HS_UPDATE_PLIST
_SYS_VARS.haskell= \
PKGNAME DISTNAME MASTER_SITES MASTER_SITE_HASKELL_HACKAGE \
HOMEPAGE UNLIMIT_RESOURCES PREFIX
_DEF_VARS.haskell= \
HASKELL_OPTIMIZATION_LEVEL \
HASKELL_PKG_NAME \
+ USE_LANGUAGES \
+ CONFIGURE_ARGS \
+ PLIST_SUBST \
+ PRINT_PLIST_AWK \
+ GENERATE_PLIST \
+ PLIST_SRC \
+ FILES_SUBST \
+ INSTALLATION_DIRS \
+ INSTALL_TEMPLATES \
+ DEINSTALL_TEMPLATES \
_HASKELL_VERSION_CMD \
_HASKELL_BIN \
_HASKELL_PKG_BIN \
_HASKELL_PKG_DESCR_FILE \
_HASKELL_PKG_ID_FILE \
_HASKELL_VERSION
+_USE_VARS.haskell= \
+ PKG_VERBOSE \
+ BUILDLINK_PREFIX.ghc \
+ PKGDIR DESTDIR \
+ WRKSRC
_IGN_VARS.haskell= \
- USE_TOOLS _*
+ USE_TOOLS CONFIGURE_ENV MAKE_ENV WARNINGS _*
PKGNAME?= hs-${DISTNAME}
MASTER_SITES?= ${MASTER_SITE_HASKELL_HACKAGE:=${DISTNAME}/}
@@ -97,10 +113,6 @@ _HASKELL_PKG_BIN= ${BUILDLINK_PREFIX.ghc:U${PREFIX}}/bin/ghc-pkg
_HASKELL_VERSION_CMD= ${_HASKELL_BIN} -V 2>/dev/null | ${CUT} -d ' ' -f 8
_HASKELL_VERSION= ghc-${_HASKELL_VERSION_CMD:sh}
-# Determine GHC shlib suffix
-_HASKELL_SHLIB_SUFFIX.dylib= dylib
-_HASKELL_SHLIB_SUFFIX= ${_HASKELL_SHLIB_SUFFIX.${SHLIB_TYPE}:Uso}
-
# GHC requires C compiler.
USE_LANGUAGES+= c
@@ -176,12 +188,12 @@ PRINT_PLIST_AWK+= ${exists(${DESTDIR}${_HASKELL_PKG_DESCR_FILE}):?${_HS_PRINT_PL
.if ${_HS_PLIST_STATUS} == missing || ${_HS_PLIST_STATUS} == outdated
. if ${HS_UPDATE_PLIST} == yes
-GENERATE_PLIST+= ${MAKE} print-PLIST > ${PKGDIR}/PLIST;
+GENERATE_PLIST+= ${MAKE} print-PLIST > ${PKGDIR}/PLIST;
. endif
-GENERATE_PLIST+= \
+GENERATE_PLIST+= \
cd ${DESTDIR:Q}${PREFIX:Q} && \
${FIND} * \( -type f -o -type l \) | ${SORT};
-PLIST_SRC= # none
+PLIST_SRC= # none
.endif
.if ${_HS_PLIST_STATUS} == outdated && ${HS_UPDATE_PLIST} == no