Some improvements and changes for Haskell Cabal support.

* HASKELL_ENABLE_LIBRARY_PROFILING and HASKELL_ENABLE_HADDOCK_DOCUMENTATION
  are "User-settable variables", not "Package-settable variables".
* Change to HASKELL_ENABLE_HADDOCK_DOCUMENTATION=yes by default.
* Add HASKELL_ENABLE_SHARED_LIBRARY("yes" by default), to enable shlib support.
* Add support for dynamically conditional PLIST entries handling for
  HASKELL_ENABLE_SHARED_LIBRARY and HASKELL_ENABLE_LIBRARY_PROFILING.

discussed with pho@ and szptvlfn@.

2 files changed, 132 insertions, 8 deletions

diff --git a/mk/haskell.mk b/mk/haskell.mk
index 4de34cae598..7b3fbfab0d8 100644
--- a/mk/haskell.mk
+++ b/mk/haskell.mk
@@ -1,4 +1,4 @@
-# $NetBSD: haskell.mk,v 1.1 2014/02/05 07:02:30 obache Exp $
+# $NetBSD: haskell.mk,v 1.2 2014/04/18 13:42:59 obache Exp $
 #
 # This Makefile fragment handles Haskell Cabal packages.
 # See: http://www.haskell.org/cabal/
@@ -56,7 +56,13 @@
 #       Default value:
 #           ghc
 #
-# Package-settable variables:
+#   HASKELL_ENABLE_SHARED_LIBRARY
+#       Description:
+#           Whether shared library should be built or not.
+#       Possible values:
+#           yes, no
+#       Default value:
+#           yes
 #
 #   HASKELL_ENABLE_LIBRARY_PROFILING
 #       Description:
@@ -72,7 +78,7 @@
 #       Possible values:
 #           yes, no
 #       Default value:
-#           no
+#           yes
 
 .if !defined(HASKELL_MK)
 HASKELL_MK=	# defined
@@ -83,6 +89,9 @@ HASKELL_MK=	# defined
 # Declare HASKELL_COMPILER as one of BUILD_DEFS variables. See
 # ../../mk/misc/show.mk
 BUILD_DEFS+=	HASKELL_COMPILER
+BUILD_DEFS+=	HASKELL_ENABLE_SHARED_LIBRARY
+BUILD_DEFS+=	HASKELL_ENABLE_LIBRARY_PROFILING
+BUILD_DEFS+=	HASKELL_ENABLE_HADDOCK_DOCUMENTATION
 
 
 # Declarations for ../../mk/misc/show.mk
@@ -95,11 +104,14 @@ _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
-_PKG_VARS.haskell= \
+	_HASKELL_VERSION \
+	_HASKELL_VERSION_SUFFIX
+_USER_VARS.haskell= \
+	HASKELL_ENABLE_SHARED_LIBRARY \
 	HASKELL_ENABLE_LIBRARY_PROFILING \
 	HASKELL_ENABLE_HADDOCK_DOCUMENTATION
 
@@ -118,11 +130,14 @@ HOMEPAGE?=	http://hackage.haskell.org/cgi-bin/hackage-scripts/package/${_DISTBAS
 # that. (PHO: I think that should be handled by url2pkg (2009-05-20))
 USE_TOOLS+=	pkg-config
 
+# Default value of HASKELL_ENABLE_SHARED_LIBRARY
+HASKELL_ENABLE_SHARED_LIBRARY?=		yes
+
 # Default value of HASKELL_ENABLE_LIBRARY_PROFILING
 HASKELL_ENABLE_LIBRARY_PROFILING?=	yes
 
 # Default value of HASKELL_ENABLE_HADDOCK_DOCUMENTATION
-HASKELL_ENABLE_HADDOCK_DOCUMENTATION?=	no
+HASKELL_ENABLE_HADDOCK_DOCUMENTATION?=	yes
 
 # Compiler specific variables and targets.
 .if ${HASKELL_COMPILER} == "ghc"
@@ -139,9 +154,16 @@ _HASKELL_PKG_BIN=	${_GHC_PKG_BIN} # Expose to the outer scope.
 # Determine GHC version.
 _GHC_VERSION_CMD=	${_GHC_BIN} -V | ${CUT} -d ' ' -f 8
 _GHC_VERSION=		${_GHC_VERSION_CMD:sh}
+_GHC_VERSION_SUFFIX=	ghc${_GHC_VERSION}
 _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
+_GHC_SHLIB_SUFFIX.dylib=	dylib	
+_GHC_SHLIB_SUFFIX=		${_GHC_SHLIB_SUFFIX.${SHLIB_TYPE}:Uso}
+_HASKELL_SHLIB_SUFFIX=		${_GHC_SHLIB_SUFFIX}
+
 # GHC requires C compiler.
 USE_LANGUAGES+=	c
 
@@ -152,11 +174,16 @@ CONFIGURE_ARGS+=	--with-hc-pkg=${_GHC_PKG_BIN}
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 .endif # ${HASKELL_COMPILER}
 
+# Shared libraries
+.if ${HASKELL_ENABLE_SHARED_LIBRARY} == "yes"
+CONFIGURE_ARGS+=	--enable-shared --enable-executable-dynamic
+CONFIGURE_ARGS+=	"--ghc-option=-optl ${COMPILER_RPATH_FLAG}"
+CONFIGURE_ARGS+=	"--ghc-option=-optl ${PREFIX}/lib/${_GHC_VERSION_FULL}/${DISTNAME}"
+.endif
+
 # Library profiling
-PLIST_VARS+=		prof
 .if ${HASKELL_ENABLE_LIBRARY_PROFILING} == "yes"
 CONFIGURE_ARGS+=	-p
-PLIST.prof=		yes
 .endif
 
 
@@ -176,8 +203,21 @@ PRINT_PLIST_AWK+= \
 
 # _HASKELL_VERSION should be substituted in PLIST.
 PLIST_SUBST+=	HASKELL_VERSION=${_HASKELL_VERSION}
+PLIST_SUBST+=	HASKELL_VERSION_SUFFIX=${_HASKELL_VERSION_SUFFIX}
 PRINT_PLIST_AWK+= \
+	($$0 ~ /-${_HASKELL_VERSION_SUFFIX}\.${_HASKELL_SHLIB_SUFFIX}$$/) { next; } \
+	($$0 ~ /lib\/.*_p\.a$$/) { next; } \
+	($$0 ~ /\.dyn_hi$$/) { next; } \
+	($$0 ~ /\.p_hi$$/) { next; } \
+	($$0 ~ /^share\/doc\/${DISTNAME}\/html\//) \
+	{ $$0 = "$${PLIST.doc}" $$0; } \
+	{ gsub(/${_HASKELL_VERSION_SUFFIX}/, "$${HASKELL_VERSION_SUFFIX}"); } \
 	{ gsub(/${_HASKELL_VERSION}/, "$${HASKELL_VERSION}"); }
+PLIST_AWK+=	-f ${PKGSRCDIR}/mk/plist/plist-haskell.awk
+PLIST_AWK_ENV+=	HASKELL_VERSION_SUFFIX=${_HASKELL_VERSION_SUFFIX}
+PLIST_AWK_ENV+=	HASKELL_SHLIB_SUFFIX=${_HASKELL_SHLIB_SUFFIX}
+PLIST_AWK_ENV+=	HASKELL_ENABLE_SHARED_LIBRARY=${HASKELL_ENABLE_SHARED_LIBRARY}
+PLIST_AWK_ENV+=	HASKELL_ENABLE_LIBRARY_PROFILING=${HASKELL_ENABLE_LIBRARY_PROFILING}
 
 # We might not have any working Haskell interpreter so compile
 # Setup.?hs to a binary.
diff --git a/mk/plist/plist-haskell.awk b/mk/plist/plist-haskell.awk
new file mode 100644
index 00000000000..495ef05180c
--- /dev/null
+++ b/mk/plist/plist-haskell.awk
@@ -0,0 +1,84 @@
+# $NetBSD: plist-haskell.awk,v 1.1 2014/04/18 13:42:59 obache Exp $
+#
+# Copyright (c) 2014 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jonathan Perkin
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+### This awk script handles haskell related entries in PLISTs.  This script
+### requires the following scripts to be included:
+###
+###     plist-functions.awk (print_entry)
+###
+### Certain environment variables must be set prior to running this script:
+###
+###   HASKELL_VERSION_SUFFIX is the haskell shlib version suffix.
+###   HASKELL_SHLIB_SUFFIX is the haskell shlib suffix.
+###   HASKELL_ENABLE_SHARED_LIBRARY is a yes/no variable indicating whether
+###	shared library should be built or not.
+###   HASKELL_ENABLE_LIBRARY_PROFILING is a yes/no variable indicating whether
+###	profiling library should be built or not.
+###
+BEGIN {
+	HASKELL_VERSION_SUFFIX = ENVIRON["HASKELL_VERSION_SUFFIX"]
+	HASKELL_SHLIB_SUFFIX = ENVIRON["HASKELL_SHLIB_SUFFIX"]
+	HASKELL_ENABLE_SHARED_LIBRARY = ENVIRON["HASKELL_ENABLE_SHARED_LIBRARY"]
+	HASKELL_ENABLE_LIBRARY_PROFILING = ENVIRON["HASKELL_ENABLE_LIBRARY_PROFILING"]
+}
+
+###
+### Convert .hi
+###
+/^[^@]/ && \
+/^lib\/.*\.hi$/ {
+	if (HASKELL_ENABLE_SHARED_LIBRARY ~ /[yY][eE][sS]/) {
+		dyn_hi = $0;
+		sub(/\.hi$/, ".dyn_hi", dyn_hi);
+		print_entry(dyn_hi);
+	}
+	if (HASKELL_ENABLE_LIBRARY_PROFILING ~ /[yY][eE][sS]/) {
+		p_hi = $0;
+		sub(/\.hi$/, ".p_hi", p_hi);
+		print_entry(p_hi);
+	}
+}
+
+###
+### Convert .a
+###
+/^[^@]/ && \
+/^lib\/.*\/lib[^\/]*\.a$/ {
+	if (HASKELL_ENABLE_SHARED_LIBRARY ~ /[yY][eE][sS]/) {
+		dyn_ar = $0;
+		sub(/\.a$/, "-" HASKELL_VERSION_SUFFIX "." HASKELL_SHLIB_SUFFIX, dyn_ar);
+		print_entry(dyn_ar);
+	}
+	if (HASKELL_ENABLE_LIBRARY_PROFILING ~ /[yY][eE][sS]/) {
+		p_ar = $0;
+		sub(/\.a$/, "_p.a", p_ar);
+		print_entry(p_ar);
+	}
+}
+