svn commit: r526613 - in head/lang/ghc: . files files843 files844 files862 files863 files864

Gleb Popov arrowd at FreeBSD.org
Fri Feb 21 08:10:03 UTC 2020 

Author: arrowd
Date: Fri Feb 21 08:09:59 2020
New Revision: 526613
URL: https://svnweb.freebsd.org/changeset/ports/526613

Log:
  lang/ghc: Install haddock even when WITH_DOCS=NO. Do this by actually building WITH_DOCS=YES and omitting docs during staging.
  
  Also, don't pack documentation when creating bootstrap tarball.

Modified:
  head/lang/ghc/Makefile
  head/lang/ghc/files/build.mk.in
  head/lang/ghc/files/patch-ghc.mk
  head/lang/ghc/files843/build.mk.in
  head/lang/ghc/files843/patch-ghc.mk
  head/lang/ghc/files844/build.mk.in
  head/lang/ghc/files844/patch-ghc.mk
  head/lang/ghc/files862/build.mk.in
  head/lang/ghc/files862/patch-ghc.mk
  head/lang/ghc/files863/build.mk.in
  head/lang/ghc/files863/patch-ghc.mk
  head/lang/ghc/files864/build.mk.in
  head/lang/ghc/files864/patch-ghc.mk
  head/lang/ghc/pkg-plist

Modified: head/lang/ghc/Makefile
==============================================================================
--- head/lang/ghc/Makefile	Fri Feb 21 08:08:22 2020	(r526612)
+++ head/lang/ghc/Makefile	Fri Feb 21 08:09:59 2020	(r526613)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ghc
 PORTVERSION=	${GHC_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang haskell
 MASTER_SITES=	https://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
 		LOCAL/arrowd/:boot \
@@ -49,9 +49,7 @@ DYNAMIC_DESC=		Add support for dynamic linking
 GMP_DESC=		Use GNU Multi-precision Library for big integers support
 PROFILE_DESC=		Add support for performance profiling
 
-DOCS_BUILD_DEPENDS+=	sphinx-build:textproc/py-sphinx
-DOCS_SUB_LIST=		WITH_DOCS="YES"
-DOCS_SUB_LIST_OFF=	WITH_DOCS="NO"
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 
 DYNAMIC_CONFIGURE_WITH=	system-libffi \
 			ffi-includes=${LOCALBASE}/include \
@@ -128,11 +126,9 @@ _EXECUTABLES=	${GHC_LIBDIR}/bin/unlit \
 		${GHC_LIBDIR}/bin/hsc2hs \
 		${GHC_LIBDIR}/bin/runghc \
 		${GHC_LIBDIR}/bin/ghc \
+		${GHC_LIBDIR}/bin/haddock \
 		${GHC_LIBDIR}/bin/hp2ps
 
-.if ${PORT_OPTIONS:MDOCS}
-_EXECUTABLES+=	${GHC_LIBDIR}/bin/haddock
-.endif
 .if ${PORT_OPTIONS:MPROFILE}
 _EXECUTABLES+=	${GHC_LIBDIR}/bin/ghc-iserv-prof
 .endif
@@ -211,13 +207,14 @@ post-install-script:
 		-e 's,^${STAGEDIR}${PREFIX}/?,,' \
 		-e '/^${GHC_LIBDIR:C/\//\\\//g}\/package.conf.d\/package\.cache/s|^|@comment |g' \
 		>> ${TMPPLIST}
+.if ${PORT_OPTIONS:MDOCS}
 	${FIND} -ds ${STAGEDIR}${DOCSDIR} -type f -print | ${SED} -E \
 		-e 's,^${STAGEDIR}${PREFIX}/?,,' \
 		-e '/^${STAGEDIR:C/\//\\\//g}${DOCSDIR:C/\//\\\//g}\/html\/libraries\/doc-index-[^.]+\.html/s|^|@comment |g' \
 		-e '/^${STAGEDIR:C/\//\\\//g}${DOCSDIR:C/\//\\\//g}\/html\/libraries\/index[^\/.]*\.html/s|^|@comment|g' \
 		-e '/^${STAGEDIR:C/\//\\\//g}${DOCSDIR:C/\//\\\//g}\/html\/libraries\/[^\/]+\.png/s|^|@comment |g' \
 		>> ${TMPPLIST}
-.if ${PORT_OPTIONS:MDOCS}
+
 	# Cleanup the indexen created by gen_contents_index
 	${ECHO} "@postunexec ${RM} %D/${DOCSDIR_REL}/html/libraries/doc-index-*.html" >> ${TMPPLIST}
 	${ECHO} "@postunexec ${RM} %D/${DOCSDIR_REL}/html/libraries/index*.html" >> ${TMPPLIST}
@@ -277,9 +274,7 @@ pre-configure: apply-slist
 post-install:
 	(for f in ${_EXECUTABLES} $$(${FIND} ${GHC_LIBDIR} -name '*.so*'); do \
 		${STRIP_CMD} $$f; done)
-.if ${PORT_OPTIONS:MDOCS}
-	${MV} ${STAGEDIR}${PREFIX}/bin/haddock ${STAGEDIR}${PREFIX}/bin/haddock-ghc-${GHC_VERSION}
-.endif
+	${RM} ${STAGEDIR}${PREFIX}/bin/haddock
 
 # Create a bootstrap compiler tar ball: run this in an interactive poudriere jail
 .PHONY: create-bootstrap
@@ -287,6 +282,7 @@ create-bootstrap:
 	cd ${WRKSRC} \
 		&& ${ECHO} "BIN_DIST_NAME=ghc-${GHC_VERSION}-boot" >> mk/build.mk \
 		&& ${ECHO} "BIN_DIST_TAR=ghc-${GHC_VERSION}-boot.tar" >> mk/build.mk \
+		&& ${ECHO} "HADDOCK_DOCS=NO" >> mk/build.mk \
 		&& ${GMAKE} binary-dist TAR_COMP=xz \
 		&& ${MV} ${WRKSRC}/ghc-${GHC_VERSION}-boot-${GHC_ARCH}-portbld-freebsd.tar.xz /tmp/ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz
 

Modified: head/lang/ghc/files/build.mk.in
==============================================================================
--- head/lang/ghc/files/build.mk.in	Fri Feb 21 08:08:22 2020	(r526612)
+++ head/lang/ghc/files/build.mk.in	Fri Feb 21 08:09:59 2020	(r526613)
@@ -4,7 +4,7 @@ mandir = %%PREFIX%%/man
 infodir = %%PREFIX%%/info
 DYNAMIC_GHC_PROGRAMS = %%WITH_DYNAMIC%%
 BUILD_PROF_LIBS = %%WITH_PROFILE%%
-HADDOCK_DOCS = %%WITH_DOCS%%
+HADDOCK_DOCS = YES
 HSCOLOUR_SRCS = %%WITH_DOCS%%
 INTEGER_LIBRARY = %%INTEGER_LIBRARY%%
 # disable xelatex: PR 231438

Modified: head/lang/ghc/files/patch-ghc.mk
==============================================================================
--- head/lang/ghc/files/patch-ghc.mk	Fri Feb 21 08:08:22 2020	(r526612)
+++ head/lang/ghc/files/patch-ghc.mk	Fri Feb 21 08:09:59 2020	(r526613)
@@ -8,13 +8,4 @@
  else
  $(error Make has restarted itself $(MAKE_RESTARTS) times; is there a makefile bug? See http://ghc.haskell.org/trac/ghc/wiki/Building/Troubleshooting#Makehasrestarteditself3timesisthereamakefilebug for details)
  endif
-@@ -461,9 +462,7 @@ PACKAGES_STAGE1 += template-haskell
- PACKAGES_STAGE1 += ghc-compact
- PACKAGES_STAGE1 += ghc-heap
 
--ifeq "$(HADDOCK_DOCS)" "YES"
- PACKAGES_STAGE1 += xhtml
--endif
-
- ifeq "$(WITH_TERMINFO)" "YES"
- PACKAGES_STAGE1 += terminfo

Modified: head/lang/ghc/files843/build.mk.in
==============================================================================
--- head/lang/ghc/files843/build.mk.in	Fri Feb 21 08:08:22 2020	(r526612)
+++ head/lang/ghc/files843/build.mk.in	Fri Feb 21 08:09:59 2020	(r526613)
@@ -4,7 +4,7 @@ mandir = %%PREFIX%%/man
 infodir = %%PREFIX%%/info
 DYNAMIC_GHC_PROGRAMS = %%WITH_DYNAMIC%%
 BUILD_PROF_LIBS = %%WITH_PROFILE%%
-HADDOCK_DOCS = %%WITH_DOCS%%
+HADDOCK_DOCS = YES
 HSCOLOUR_SRCS = %%WITH_DOCS%%
 INTEGER_LIBRARY = %%INTEGER_LIBRARY%%
 # disable xelatex: PR 231438

Modified: head/lang/ghc/files843/patch-ghc.mk
==============================================================================
--- head/lang/ghc/files843/patch-ghc.mk	Fri Feb 21 08:08:22 2020	(r526612)
+++ head/lang/ghc/files843/patch-ghc.mk	Fri Feb 21 08:09:59 2020	(r526613)
@@ -8,14 +8,4 @@
  else
  $(error Make has restarted itself $(MAKE_RESTARTS) times; is there a makefile bug? See http://ghc.haskell.org/trac/ghc/wiki/Building/Troubleshooting#Makehasrestarteditself3timesisthereamakefilebug for details)
  endif
-@@ -459,10 +460,7 @@ PACKAGES_STAGE1 += ghc-boot-th
- PACKAGES_STAGE1 += ghc-boot
- PACKAGES_STAGE1 += template-haskell
- PACKAGES_STAGE1 += ghc-compact
--
--ifeq "$(HADDOCK_DOCS)" "YES"
- PACKAGES_STAGE1 += xhtml
--endif
- 
- ifeq "$(WITH_TERMINFO)" "YES"
- PACKAGES_STAGE1 += terminfo
+

Modified: head/lang/ghc/files844/build.mk.in
==============================================================================
--- head/lang/ghc/files844/build.mk.in	Fri Feb 21 08:08:22 2020	(r526612)
+++ head/lang/ghc/files844/build.mk.in	Fri Feb 21 08:09:59 2020	(r526613)
@@ -4,7 +4,7 @@ mandir = %%PREFIX%%/man
 infodir = %%PREFIX%%/info
 DYNAMIC_GHC_PROGRAMS = %%WITH_DYNAMIC%%
 BUILD_PROF_LIBS = %%WITH_PROFILE%%
-HADDOCK_DOCS = %%WITH_DOCS%%
+HADDOCK_DOCS = YES
 HSCOLOUR_SRCS = %%WITH_DOCS%%
 INTEGER_LIBRARY = %%INTEGER_LIBRARY%%
 # disable xelatex: PR 231438

Modified: head/lang/ghc/files844/patch-ghc.mk
==============================================================================
--- head/lang/ghc/files844/patch-ghc.mk	Fri Feb 21 08:08:22 2020	(r526612)
+++ head/lang/ghc/files844/patch-ghc.mk	Fri Feb 21 08:09:59 2020	(r526613)
@@ -8,14 +8,4 @@
  else
  $(error Make has restarted itself $(MAKE_RESTARTS) times; is there a makefile bug? See http://ghc.haskell.org/trac/ghc/wiki/Building/Troubleshooting#Makehasrestarteditself3timesisthereamakefilebug for details)
  endif
-@@ -459,10 +460,7 @@ PACKAGES_STAGE1 += ghc-boot-th
- PACKAGES_STAGE1 += ghc-boot
- PACKAGES_STAGE1 += template-haskell
- PACKAGES_STAGE1 += ghc-compact
--
--ifeq "$(HADDOCK_DOCS)" "YES"
- PACKAGES_STAGE1 += xhtml
--endif
- 
- ifeq "$(WITH_TERMINFO)" "YES"
- PACKAGES_STAGE1 += terminfo
+

Modified: head/lang/ghc/files862/build.mk.in
==============================================================================
--- head/lang/ghc/files862/build.mk.in	Fri Feb 21 08:08:22 2020	(r526612)
+++ head/lang/ghc/files862/build.mk.in	Fri Feb 21 08:09:59 2020	(r526613)
@@ -4,7 +4,7 @@ mandir = %%PREFIX%%/man
 infodir = %%PREFIX%%/info
 DYNAMIC_GHC_PROGRAMS = %%WITH_DYNAMIC%%
 BUILD_PROF_LIBS = %%WITH_PROFILE%%
-HADDOCK_DOCS = %%WITH_DOCS%%
+HADDOCK_DOCS = YES
 HSCOLOUR_SRCS = %%WITH_DOCS%%
 INTEGER_LIBRARY = %%INTEGER_LIBRARY%%
 # disable xelatex: PR 231438

Modified: head/lang/ghc/files862/patch-ghc.mk
==============================================================================
--- head/lang/ghc/files862/patch-ghc.mk	Fri Feb 21 08:08:22 2020	(r526612)
+++ head/lang/ghc/files862/patch-ghc.mk	Fri Feb 21 08:09:59 2020	(r526613)
@@ -8,13 +8,4 @@
  else
  $(error Make has restarted itself $(MAKE_RESTARTS) times; is there a makefile bug? See http://ghc.haskell.org/trac/ghc/wiki/Building/Troubleshooting#Makehasrestarteditself3timesisthereamakefilebug for details)
  endif
-@@ -461,9 +462,7 @@ PACKAGES_STAGE1 += template-haskell
- PACKAGES_STAGE1 += ghc-compact
- PACKAGES_STAGE1 += ghc-heap
 
--ifeq "$(HADDOCK_DOCS)" "YES"
- PACKAGES_STAGE1 += xhtml
--endif
-
- ifeq "$(WITH_TERMINFO)" "YES"
- PACKAGES_STAGE1 += terminfo

Modified: head/lang/ghc/files863/build.mk.in
==============================================================================
--- head/lang/ghc/files863/build.mk.in	Fri Feb 21 08:08:22 2020	(r526612)
+++ head/lang/ghc/files863/build.mk.in	Fri Feb 21 08:09:59 2020	(r526613)
@@ -4,7 +4,7 @@ mandir = %%PREFIX%%/man
 infodir = %%PREFIX%%/info
 DYNAMIC_GHC_PROGRAMS = %%WITH_DYNAMIC%%
 BUILD_PROF_LIBS = %%WITH_PROFILE%%
-HADDOCK_DOCS = %%WITH_DOCS%%
+HADDOCK_DOCS = YES
 HSCOLOUR_SRCS = %%WITH_DOCS%%
 INTEGER_LIBRARY = %%INTEGER_LIBRARY%%
 # disable xelatex: PR 231438

Modified: head/lang/ghc/files863/patch-ghc.mk
==============================================================================
--- head/lang/ghc/files863/patch-ghc.mk	Fri Feb 21 08:08:22 2020	(r526612)
+++ head/lang/ghc/files863/patch-ghc.mk	Fri Feb 21 08:09:59 2020	(r526613)
@@ -8,13 +8,4 @@
  else
  $(error Make has restarted itself $(MAKE_RESTARTS) times; is there a makefile bug? See http://ghc.haskell.org/trac/ghc/wiki/Building/Troubleshooting#Makehasrestarteditself3timesisthereamakefilebug for details)
  endif
-@@ -461,9 +462,7 @@ PACKAGES_STAGE1 += template-haskell
- PACKAGES_STAGE1 += ghc-compact
- PACKAGES_STAGE1 += ghc-heap
 
--ifeq "$(HADDOCK_DOCS)" "YES"
- PACKAGES_STAGE1 += xhtml
--endif
-
- ifeq "$(WITH_TERMINFO)" "YES"
- PACKAGES_STAGE1 += terminfo

Modified: head/lang/ghc/files864/build.mk.in
==============================================================================
--- head/lang/ghc/files864/build.mk.in	Fri Feb 21 08:08:22 2020	(r526612)
+++ head/lang/ghc/files864/build.mk.in	Fri Feb 21 08:09:59 2020	(r526613)
@@ -4,7 +4,7 @@ mandir = %%PREFIX%%/man
 infodir = %%PREFIX%%/info
 DYNAMIC_GHC_PROGRAMS = %%WITH_DYNAMIC%%
 BUILD_PROF_LIBS = %%WITH_PROFILE%%
-HADDOCK_DOCS = %%WITH_DOCS%%
+HADDOCK_DOCS = YES
 HSCOLOUR_SRCS = %%WITH_DOCS%%
 INTEGER_LIBRARY = %%INTEGER_LIBRARY%%
 # disable xelatex: PR 231438

Modified: head/lang/ghc/files864/patch-ghc.mk
==============================================================================
--- head/lang/ghc/files864/patch-ghc.mk	Fri Feb 21 08:08:22 2020	(r526612)
+++ head/lang/ghc/files864/patch-ghc.mk	Fri Feb 21 08:09:59 2020	(r526613)
@@ -8,13 +8,4 @@
  else
  $(error Make has restarted itself $(MAKE_RESTARTS) times; is there a makefile bug? See http://ghc.haskell.org/trac/ghc/wiki/Building/Troubleshooting#Makehasrestarteditself3timesisthereamakefilebug for details)
  endif
-@@ -461,9 +462,7 @@ PACKAGES_STAGE1 += template-haskell
- PACKAGES_STAGE1 += ghc-compact
- PACKAGES_STAGE1 += ghc-heap
 
--ifeq "$(HADDOCK_DOCS)" "YES"
- PACKAGES_STAGE1 += xhtml
--endif
-
- ifeq "$(WITH_TERMINFO)" "YES"
- PACKAGES_STAGE1 += terminfo

Modified: head/lang/ghc/pkg-plist
==============================================================================
--- head/lang/ghc/pkg-plist	Fri Feb 21 08:08:22 2020	(r526612)
+++ head/lang/ghc/pkg-plist	Fri Feb 21 08:09:59 2020	(r526613)
@@ -3,7 +3,7 @@ bin/ghci
 bin/ghc-pkg
 bin/runhaskell
 bin/runghc
-%%DOCS%%bin/haddock-ghc-%%GHC_VERSION%%
+bin/haddock-ghc-%%GHC_VERSION%%
 bin/hp2ps
 bin/hpc
 bin/hsc2hs

More information about the svn-ports-head mailing list