CVS commit: pkgsrc/mk

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Wed Jan  1 04:35:29 UTC 2020

Modified Files:
        pkgsrc/mk: haskell.mk

Log Message:
Remove unused variables


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/mk/haskell.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/haskell.mk
diff -u pkgsrc/mk/haskell.mk:1.6 pkgsrc/mk/haskell.mk:1.7
--- pkgsrc/mk/haskell.mk:1.6    Tue Dec 31 07:16:25 2019
+++ pkgsrc/mk/haskell.mk        Wed Jan  1 04:35:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: haskell.mk,v 1.6 2019/12/31 07:16:25 pho Exp $
+# $NetBSD: haskell.mk,v 1.7 2020/01/01 04:35:29 pho Exp $
 #
 # This Makefile fragment handles Haskell Cabal packages.
 # See: http://www.haskell.org/cabal/
@@ -104,12 +104,10 @@ _DEF_VARS.haskell= \
        _GHC_VERSION \
        _GHC_VERSION_CMD \
        _GHC_VERSION_FULL \
-       _GHC_VERSION_SUFFIX \
        _HASKELL_BIN \
        _HASKELL_PKG_BIN \
        _HASKELL_PKG_DESCR_FILE \
-       _HASKELL_VERSION \
-       _HASKELL_VERSION_SUFFIX
+       _HASKELL_VERSION
 _USER_VARS.haskell= \
        HASKELL_ENABLE_SHARED_LIBRARY \
        HASKELL_ENABLE_LIBRARY_PROFILING \
@@ -152,12 +150,9 @@ _HASKELL_BIN=              ${_GHC_BIN} # Expose to t
 _HASKELL_PKG_BIN=      ${_GHC_PKG_BIN} # Expose to the outer scope.
 
 # Determine GHC version.
-.if exists(${_GHC_BIN})
-_GHC_VERSION!=         ${_GHC_BIN} -V | ${CUT} -d ' ' -f 8
-.endif
-_GHC_VERSION_SUFFIX=   ghc${_GHC_VERSION}
+_GHC_VERSION_CMD=      ${_GHC_BIN} -V | ${CUT} -d ' ' -f 8
+_GHC_VERSION=          ${_GHC_VERSION_CMD:sh}
 _GHC_VERSION_FULL=     ghc-${_GHC_VERSION}
-_HASKELL_VERSION_SUFFIX=       ${_GHC_VERSION_SUFFIX}
 _HASKELL_VERSION=      ${_GHC_VERSION_FULL} # Expose to the outer scope.
 
 # Determine GHC shlib suffix