From owner-svn-ports-head@FreeBSD.ORG Mon Aug 25 18:19:11 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 24237AA5; Mon, 25 Aug 2014 18:19:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0FBD23A9C; Mon, 25 Aug 2014 18:19:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PIJAFQ049173; Mon, 25 Aug 2014 18:19:10 GMT (envelope-from pgj@FreeBSD.org) Received: (from pgj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PIJAPZ049172; Mon, 25 Aug 2014 18:19:10 GMT (envelope-from pgj@FreeBSD.org) Message-Id: <201408251819.s7PIJAPZ049172@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pgj set sender to pgj@FreeBSD.org using -f From: Gabor Pali Date: Mon, 25 Aug 2014 18:19:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366118 - head/lang/ghc X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 18:19:11 -0000 Author: pgj Date: Mon Aug 25 18:19:10 2014 New Revision: 366118 URL: http://svnweb.freebsd.org/changeset/ports/366118 QAT: https://qat.redports.org/buildarchive/r366118/ Log: - Add support for specifying TMPDIR when building hs- ports [1] - Rework manual pages support - Work around a possible pkg(8) bug (see pkg #985) PR: 192940 [1] Reported by: marino [1] Obtained from: FreeBSD Haskell Modified: head/lang/ghc/bsd.cabal.mk Modified: head/lang/ghc/bsd.cabal.mk ============================================================================== --- head/lang/ghc/bsd.cabal.mk Mon Aug 25 18:14:07 2014 (r366117) +++ head/lang/ghc/bsd.cabal.mk Mon Aug 25 18:19:10 2014 (r366118) @@ -22,7 +22,8 @@ NO_INSTALL= yes NO_MTREE= yes .endif # !METAPORT -MAKE_ENV+= LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 DESTDIR=${STAGEDIR} +MAKE_ENV+= LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 DESTDIR=${STAGEDIR} \ + TMPDIR=${TMPDIR} SETUP_CMD?= ./setup @@ -63,6 +64,7 @@ INSTALL_PORTDATA?= INSTALL_PORTEXAMPLES?= LOCALBASE?= /usr/local +TMPDIR?= ${WRKDIR}/tmp .if !defined(CABALOPTIONSMKINCLUDED) .include "bsd.cabal.options.mk" @@ -208,6 +210,7 @@ _BUILD_SETUP= ${GHC_CMD} -o ${SETUP_CMD} .if !defined(METAPORT) .if !target(do-configure) do-configure: + @${MKDIR} ${TMPDIR} @if [ -f ${WRKSRC}/Setup.hs ]; then \ cd ${WRKSRC} && ${_BUILD_SETUP} Setup.hs; fi @if [ -f ${WRKSRC}/Setup.lhs ]; then \ @@ -249,17 +252,13 @@ do-build: .endif # target(do-build) .endif # !METAPORT -.if defined(MAN1PAGES) -.for man in ${MAN1PAGES} -PLIST_FILES+= man/man1/${man}.gz +.for sect in 1 2 3 4 5 6 7 8 9 +.if defined(MAN${sect}PAGES) +.for man in ${MAN${sect}PAGES} +PLIST_FILES+= man/man${sect}/${man}.gz .endfor .endif - -.if defined(MAN5PAGES) -.for man in ${MAN5PAGES} -PLIST_FILES+= man/man5/${man}.gz .endfor -.endif .if !defined(METAPORT) .if !target(do-install) @@ -280,11 +279,13 @@ do-install: ${INSTALL_PORTEXAMPLES} .endif -.if defined(MAN1SRC) -.for man in ${MAN1PAGES} - @${INSTALL_MAN} ${WRKSRC}/${MAN1SRC}/${man} ${STAGEDIR}${MANPREFIX}/man/man1 +.for sect in 1 2 3 4 5 6 7 8 9 +.if defined(MAN${sect}SRC) +.for man in ${MAN${sect}PAGES} + @${INSTALL_MAN} ${WRKSRC}/${MAN${sect}SRC}/${man} ${STAGEDIR}${MANPREFIX}/man/man${sect} +.endfor +.endif # MAN${sect}SRC .endfor -.endif # MAN1SRC .if ${PORT_OPTIONS:MDOCS} .if !empty(XMLDOCS) @@ -298,10 +299,6 @@ do-install: .if !target(post-install-script) post-install-script: - @for dir in ${CABAL_DIRS}; do if [ -d ${STAGEDIR}$${dir} ]; then ${FIND} -ds ${STAGEDIR}$${dir} \ - -type f -print | ${SED} -E -e 's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}; fi ; \ - if [ -d ${STAGEDIR}$${dir} ]; then ${FIND} -ds ${STAGEDIR}$${dir} \ - -type d -print | ${SED} -E -e 's,^${STAGEDIR}${PREFIX}/?,@dirrm ,' >> ${TMPPLIST}; fi ; done .if defined(EXECUTABLE) .for exe in ${EXECUTABLE} @${ECHO_CMD} 'bin/${exe}' >>${TMPPLIST} @@ -313,8 +310,11 @@ post-install-script: if [ -d ${STAGEDIR}${PREFIX}/$${dir}/cabal ]; then \ echo "@dirrmtry $${dir}/cabal" >> ${TMPPLIST}; fi ; done .endif -.endif - +.endif # EXECUTABLE + @for dir in ${CABAL_DIRS}; do if [ -d ${STAGEDIR}$${dir} ]; then ${FIND} -ds ${STAGEDIR}$${dir} \ + -type f -print | ${SED} -E -e 's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}; fi ; \ + if [ -d ${STAGEDIR}$${dir} ]; then ${FIND} -ds ${STAGEDIR}$${dir} \ + -type d -print | ${SED} -E -e 's,^${STAGEDIR}${PREFIX}/?,@dirrm ,' >> ${TMPPLIST}; fi ; done .endif # target(post-install-script) .if !defined(METAPORT) @@ -326,9 +326,9 @@ add-plist-cabal: .endif .if defined(HADDOCK_AVAILABLE) && ${PORT_OPTIONS:MDOCS} - @(${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL}/${DISTNAME}' ; \ + @(${ECHO_CMD} '@unexec ${RM} ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL}/${DISTNAME}' ; \ ${ECHO_CMD} '@unexec cd ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL} && \ - ${RM} -f doc-index*.html && ./gen_contents_index') >> ${TMPPLIST} + ${RM} doc-index*.html && ./gen_contents_index') >> ${TMPPLIST} .endif .if !defined(STANDALONE) @@ -338,7 +338,7 @@ add-plist-cabal: .if defined(HADDOCK_AVAILABLE) && ${PORT_OPTIONS:MDOCS} @(${ECHO_CMD} '@exec ${LN} -s ${DOCSDIR}/html ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL}/${DISTNAME} && \ cd ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL} && \ - ${RM} -f doc-index*.html && ./gen_contents_index') >> ${TMPPLIST} + ${RM} doc-index*.html && ./gen_contents_index') >> ${TMPPLIST} .endif .endif # !METAPORT