Received: by mail.netbsd.org (Postfix, from userid 605)
	id A1A7984D59; Thu,  2 Jan 2020 16:34:48 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id 2BC0C84D54
	for <pkgsrc-changes@NetBSD.org>; Thu,  2 Jan 2020 16:34:48 +0000 (UTC)
X-Virus-Scanned: amavisd-new at netbsd.org
Received: from mail.netbsd.org ([IPv6:::1])
	by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025)
	with ESMTP id LrFnWBXhn9yx for <pkgsrc-changes@netbsd.org>;
	Thu,  2 Jan 2020 16:34:47 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197])
	by mail.netbsd.org (Postfix) with ESMTP id AE3B884CD5
	for <pkgsrc-changes@NetBSD.org>; Thu,  2 Jan 2020 16:34:47 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id AB7BFFA97; Thu,  2 Jan 2020 16:34:47 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1577982887106860"
MIME-Version: 1.0
Date: Thu, 2 Jan 2020 16:34:47 +0000
From: "Masatake Daimon" <pho@netbsd.org>
Subject: CVS commit: pkgsrc/mk
To: pkgsrc-changes@NetBSD.org
Reply-To: pho@netbsd.org
X-Mailer: log_accum
Message-Id: <20200102163447.AB7BFFA97@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
List-Id: pkgsrc-changes.NetBSD.org
Precedence: bulk
List-Unsubscribe: <mailto:majordomo@NetBSD.org?subject=Unsubscribe%20pkgsrc-changes&body=unsubscribe%20pkgsrc-changes>

This is a multi-part message in MIME format.

--_----------=_1577982887106860
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	pho
Date:		Thu Jan  2 16:34:47 UTC 2020

Modified Files:
	pkgsrc/mk: haskell.mk

Log Message:
Pass -v to ./Setup when PKG_VERBOSE is defined


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

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


--_----------=_1577982887106860
Content-Disposition: inline
Content-Length: 1767
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/mk/haskell.mk
diff -u pkgsrc/mk/haskell.mk:1.8 pkgsrc/mk/haskell.mk:1.9
--- pkgsrc/mk/haskell.mk:1.8	Wed Jan  1 04:54:10 2020
+++ pkgsrc/mk/haskell.mk	Thu Jan  2 16:34:47 2020
@@ -1,4 +1,4 @@
-# $NetBSD: haskell.mk,v 1.8 2020/01/01 04:54:10 pho Exp $
+# $NetBSD: haskell.mk,v 1.9 2020/01/02 16:34:47 pho Exp $
 #
 # This Makefile fragment handles Haskell Cabal packages.
 # See: http://www.haskell.org/cabal/
@@ -222,15 +222,15 @@ ${WRKSRC}/Setup:
 do-configure:
 	${RUN}cd ${WRKSRC:Q} && \
 		${SETENV} ${CONFIGURE_ENV} \
-			./Setup configure ${CONFIGURE_ARGS}
+			./Setup configure ${PKG_VERBOSE:D-v} ${CONFIGURE_ARGS}
 
 # Define build target.
 do-build:
 	${RUN}cd ${WRKSRC:Q} && \
-		./Setup build
+		./Setup build ${PKG_VERBOSE:D-v}
 .if ${HASKELL_ENABLE_HADDOCK_DOCUMENTATION} == "yes"
 	${RUN}cd ${WRKSRC:Q} && \
-		./Setup haddock
+		./Setup haddock ${PKG_VERBOSE:D-v}
 .endif
 
 # Define install target. We need installed-pkg-config to be installed
@@ -241,8 +241,8 @@ _HASKELL_PKG_DESCR_FILE=	${_HASKELL_PKG_
 INSTALLATION_DIRS+=		${_HASKELL_PKG_DESCR_DIR}
 do-install:
 	${RUN}cd ${WRKSRC} && \
-		./Setup register --gen-pkg-config=dist/package-description && \
-		./Setup copy --destdir=${DESTDIR:Q} && \
+		./Setup register ${PKG_VERBOSE:D-v} --gen-pkg-config=dist/package-description && \
+		./Setup copy ${PKG_VERBOSE:D-v} --destdir=${DESTDIR:Q} && \
 		if [ -f dist/package-description ]; then \
 			${INSTALL_DATA} dist/package-description ${DESTDIR:Q}${_HASKELL_PKG_DESCR_FILE:Q}; \
 		fi \
@@ -250,7 +250,7 @@ do-install:
 # Define test target.
 do-test:
 	${RUN}cd ${WRKSRC} && \
-		./Setup test
+		./Setup test ${PKG_VERBOSE:D-v}
 
 # Substitutions for INSTALL and DEINSTALL.
 FILES_SUBST+=	DISTNAME=${DISTNAME}


--_----------=_1577982887106860--