svn commit: r502898 - in head: . devel/hs-data-default devel/hs-data-default-class devel/hs-data-default-instances-base devel/hs-data-default-instances-containers devel/hs-data-default-instances-dl...
Gleb Popov
arrowd at FreeBSD.org
Tue May 28 15:53:11 UTC 2019
Author: arrowd
Date: Tue May 28 15:53:04 2019
New Revision: 502898
URL: https://svnweb.freebsd.org/changeset/ports/502898
Log:
Merge lang/ghcXXX ports into lang/ghc.
Remove OPTIONS support from library Haskell ports.
Do not install documentation by library Haskell ports.
Remove deprecation notice from library ports, that still needed.
PR: 224083
Approved by: tcberner (mentor)
Differential Revision: https://reviews.freebsd.org/D20247
Added:
head/lang/ghc/files843/
head/lang/ghc/files843/build.mk.in (contents, props changed)
head/lang/ghc/files843/extra-patch-aclocal.m4 (contents, props changed)
head/lang/ghc/files843/patch-configure (contents, props changed)
head/lang/ghc/files843/patch-configure.ac (contents, props changed)
head/lang/ghc/files843/patch-ghc.mk (contents, props changed)
head/lang/ghc/files843/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs (contents, props changed)
head/lang/ghc/files843/patch-llvm-targets (contents, props changed)
head/lang/ghc/files843/wrap.c (contents, props changed)
head/lang/ghc/files844/
head/lang/ghc/files844/build.mk.in (contents, props changed)
head/lang/ghc/files844/extra-patch-aclocal.m4 (contents, props changed)
head/lang/ghc/files844/patch-configure (contents, props changed)
head/lang/ghc/files844/patch-configure.ac (contents, props changed)
head/lang/ghc/files844/patch-fix-build-on-arm (contents, props changed)
head/lang/ghc/files844/patch-ghc.mk (contents, props changed)
head/lang/ghc/files844/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs (contents, props changed)
head/lang/ghc/files844/patch-llvm-targets (contents, props changed)
head/lang/ghc/files844/patch-rts_posix_OSMem.c (contents, props changed)
head/lang/ghc/files844/wrap.c (contents, props changed)
head/lang/ghc/files862/
head/lang/ghc/files862/build.mk.in (contents, props changed)
head/lang/ghc/files862/extra-patch-aclocal.m4 (contents, props changed)
head/lang/ghc/files862/patch-configure.ac (contents, props changed)
head/lang/ghc/files862/patch-ghc.mk (contents, props changed)
head/lang/ghc/files862/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs (contents, props changed)
head/lang/ghc/files862/patch-ppc64 (contents, props changed)
head/lang/ghc/files862/wrap.c (contents, props changed)
Deleted:
head/lang/ghc/bsd.ghc.mk
head/lang/ghc843/
head/lang/ghc844/
head/lang/ghc862/
Modified:
head/MOVED
head/devel/hs-data-default-class/Makefile
head/devel/hs-data-default-instances-base/Makefile
head/devel/hs-data-default-instances-containers/Makefile
head/devel/hs-data-default-instances-dlist/Makefile
head/devel/hs-data-default-instances-old-locale/Makefile
head/devel/hs-data-default/Makefile
head/devel/hs-dlist/Makefile
head/devel/hs-extensible-exceptions/Makefile
head/devel/hs-haddock/Makefile
head/devel/hs-hashable/Makefile
head/devel/hs-mtl/Makefile
head/devel/hs-old-locale/Makefile
head/devel/hs-old-time/Makefile
head/devel/hs-random/Makefile
head/devel/hs-setlocale/Makefile
head/devel/hs-transformers-compat/Makefile
head/devel/hs-unordered-containers/Makefile
head/devel/hs-utf8-string/Makefile
head/lang/Makefile
head/lang/ghc/Makefile
head/lang/ghc/bsd.cabal.mk
head/lang/ghc/bsd.cabal.options.mk
head/lang/ghc/distinfo
head/lang/ghc/pkg-plist
head/math/hs-semigroups/Makefile
head/net/hs-network/Makefile
head/x11-wm/hs-xmonad-contrib/Makefile
head/x11-wm/hs-xmonad/Makefile
head/x11/hs-X11-xft/Makefile
head/x11/hs-X11/Makefile
Modified: head/MOVED
==============================================================================
--- head/MOVED Tue May 28 14:08:12 2019 (r502897)
+++ head/MOVED Tue May 28 15:53:04 2019 (r502898)
@@ -12772,3 +12772,6 @@ devel/rubygem-peek-rblineprof-rails50|devel/rubygem-pe
devel/rubygem-peek-redis-rails50|devel/rubygem-peek-redis-rails5|2019-05-28|Obsolete by gitlab-ce upgrade, use devel/rubygem-peek-redis-rails5 instead
mail/rubygem-premailer-rails19-rails50|mail/rubygem-premailer-rails19-rails5|2019-05-28|Obsolete by gitlab-ce upgrade, use mail/rubygem-premailer-rails19-rails5 instead
www/rubygem-webpack-rails-rails50|www/rubygem-webpack-rails-rails5|2019-05-28|Obsolete by gitlab-ce upgrade, use www/rubygem-webpack-rails-rails5 instead
+lang/ghc843||2019-05-28|Old versions of GHC are removed from ports. Use devel/stack and appropriate resolver to install this version of GHC for your user only
+lang/ghc844||2019-05-28|Old versions of GHC are removed from ports. Use devel/stack and appropriate resolver to install this version of GHC for your user only
+lang/ghc862||2019-05-28|Old versions of GHC are removed from ports. Use devel/stack and appropriate resolver to install this version of GHC for your user only
Modified: head/devel/hs-data-default-class/Makefile
==============================================================================
--- head/devel/hs-data-default-class/Makefile Tue May 28 14:08:12 2019 (r502897)
+++ head/devel/hs-data-default-class/Makefile Tue May 28 15:53:04 2019 (r502898)
@@ -2,16 +2,13 @@
PORTNAME= data-default-class
PORTVERSION= 0.1.2.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell at FreeBSD.org
COMMENT= Class for types with a default value
LICENSE= BSD3CLAUSE
-
-DEPRECATED= Haskell libraries are getting pushed out of the ports tree. If you are using this port for development, consider switching to cabal sandboxes (old way), cabal new-build (new way), or use devel/stack. If you believe this port shouldn't be removed, contact haskell at FreeBSD.org
-EXPIRATION_DATE= 2019-04-14
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
Modified: head/devel/hs-data-default-instances-base/Makefile
==============================================================================
--- head/devel/hs-data-default-instances-base/Makefile Tue May 28 14:08:12 2019 (r502897)
+++ head/devel/hs-data-default-instances-base/Makefile Tue May 28 15:53:04 2019 (r502898)
@@ -2,16 +2,13 @@
PORTNAME= data-default-instances-base
PORTVERSION= 0.1.0.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell at FreeBSD.org
COMMENT= Default instances for types in base
LICENSE= BSD3CLAUSE
-
-DEPRECATED= Haskell libraries are getting pushed out of the ports tree. If you are using this port for development, consider switching to cabal sandboxes (old way), cabal new-build (new way), or use devel/stack. If you believe this port shouldn't be removed, contact haskell at FreeBSD.org
-EXPIRATION_DATE= 2019-04-14
USE_CABAL= data-default-class
Modified: head/devel/hs-data-default-instances-containers/Makefile
==============================================================================
--- head/devel/hs-data-default-instances-containers/Makefile Tue May 28 14:08:12 2019 (r502897)
+++ head/devel/hs-data-default-instances-containers/Makefile Tue May 28 15:53:04 2019 (r502898)
@@ -2,16 +2,13 @@
PORTNAME= data-default-instances-containers
PORTVERSION= 0.0.1
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= devel haskell
MAINTAINER= haskell at FreeBSD.org
COMMENT= Default instances for types in containers
LICENSE= BSD3CLAUSE
-
-DEPRECATED= Haskell libraries are getting pushed out of the ports tree. If you are using this port for development, consider switching to cabal sandboxes (old way), cabal new-build (new way), or use devel/stack. If you believe this port shouldn't be removed, contact haskell at FreeBSD.org
-EXPIRATION_DATE= 2019-04-14
USE_CABAL= data-default-class
Modified: head/devel/hs-data-default-instances-dlist/Makefile
==============================================================================
--- head/devel/hs-data-default-instances-dlist/Makefile Tue May 28 14:08:12 2019 (r502897)
+++ head/devel/hs-data-default-instances-dlist/Makefile Tue May 28 15:53:04 2019 (r502898)
@@ -2,16 +2,13 @@
PORTNAME= data-default-instances-dlist
PORTVERSION= 0.0.1
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= devel haskell
MAINTAINER= haskell at FreeBSD.org
COMMENT= Default instances for types in dlist
LICENSE= BSD3CLAUSE
-
-DEPRECATED= Haskell libraries are getting pushed out of the ports tree. If you are using this port for development, consider switching to cabal sandboxes (old way), cabal new-build (new way), or use devel/stack. If you believe this port shouldn't be removed, contact haskell at FreeBSD.org
-EXPIRATION_DATE= 2019-04-14
USE_CABAL= data-default-class dlist
Modified: head/devel/hs-data-default-instances-old-locale/Makefile
==============================================================================
--- head/devel/hs-data-default-instances-old-locale/Makefile Tue May 28 14:08:12 2019 (r502897)
+++ head/devel/hs-data-default-instances-old-locale/Makefile Tue May 28 15:53:04 2019 (r502898)
@@ -2,16 +2,13 @@
PORTNAME= data-default-instances-old-locale
PORTVERSION= 0.0.1
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= devel haskell
MAINTAINER= haskell at FreeBSD.org
COMMENT= Default instances for types in old-locale
LICENSE= BSD3CLAUSE
-
-DEPRECATED= Haskell libraries are getting pushed out of the ports tree. If you are using this port for development, consider switching to cabal sandboxes (old way), cabal new-build (new way), or use devel/stack. If you believe this port shouldn't be removed, contact haskell at FreeBSD.org
-EXPIRATION_DATE= 2019-04-14
USE_CABAL= data-default-class old-locale
Modified: head/devel/hs-data-default/Makefile
==============================================================================
--- head/devel/hs-data-default/Makefile Tue May 28 14:08:12 2019 (r502897)
+++ head/devel/hs-data-default/Makefile Tue May 28 15:53:04 2019 (r502898)
@@ -2,16 +2,13 @@
PORTNAME= data-default
PORTVERSION= 0.7.1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell at FreeBSD.org
COMMENT= Class for types with a default value
LICENSE= BSD3CLAUSE
-
-DEPRECATED= Haskell libraries are getting pushed out of the ports tree. If you are using this port for development, consider switching to cabal sandboxes (old way), cabal new-build (new way), or use devel/stack. If you believe this port shouldn't be removed, contact haskell at FreeBSD.org
-EXPIRATION_DATE= 2019-04-14
USE_CABAL= data-default-class data-default-instances-base \
data-default-instances-containers data-default-instances-dlist \
Modified: head/devel/hs-dlist/Makefile
==============================================================================
--- head/devel/hs-dlist/Makefile Tue May 28 14:08:12 2019 (r502897)
+++ head/devel/hs-dlist/Makefile Tue May 28 15:53:04 2019 (r502898)
@@ -3,16 +3,13 @@
PORTNAME= dlist
PORTVERSION= 0.8.0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell at FreeBSD.org
COMMENT= Difference lists
LICENSE= BSD3CLAUSE
-
-DEPRECATED= Haskell libraries are getting pushed out of the ports tree. If you are using this port for development, consider switching to cabal sandboxes (old way), cabal new-build (new way), or use devel/stack. If you believe this port shouldn't be removed, contact haskell at FreeBSD.org
-EXPIRATION_DATE= 2019-04-14
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
Modified: head/devel/hs-extensible-exceptions/Makefile
==============================================================================
--- head/devel/hs-extensible-exceptions/Makefile Tue May 28 14:08:12 2019 (r502897)
+++ head/devel/hs-extensible-exceptions/Makefile Tue May 28 15:53:04 2019 (r502898)
@@ -2,16 +2,13 @@
PORTNAME= extensible-exceptions
PORTVERSION= 0.1.1.4
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= devel haskell
MAINTAINER= haskell at FreeBSD.org
COMMENT= Extensible exceptions
LICENSE= BSD3CLAUSE
-
-DEPRECATED= Haskell libraries are getting pushed out of the ports tree. If you are using this port for development, consider switching to cabal sandboxes (old way), cabal new-build (new way), or use devel/stack. If you believe this port shouldn't be removed, contact haskell at FreeBSD.org
-EXPIRATION_DATE= 2019-04-14
CABAL_SETUP= Setup.hs
Modified: head/devel/hs-haddock/Makefile
==============================================================================
--- head/devel/hs-haddock/Makefile Tue May 28 14:08:12 2019 (r502897)
+++ head/devel/hs-haddock/Makefile Tue May 28 15:53:04 2019 (r502898)
@@ -3,7 +3,7 @@
PORTNAME= haddock
PORTVERSION= 2.21.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell at FreeBSD.org
@@ -14,15 +14,5 @@ LICENSE= BSD3CLAUSE
USES= cabal
USE_CABAL= ghc-paths-0.1.0.9_4 haddock-api-2.21.0 haddock-library-1.7.0
-SKIP_CABAL_PLIST= yes
-
-# new-cabal doesn't seem to support this yet
-#CONFIGURE_ARGS+= --program-suffix=-${PORTVERSION}
-
-post-stage:
- ${MV} ${STAGEDIR}/${PREFIX}/bin/haddock ${STAGEDIR}/${PREFIX}/bin/haddock-${PORTVERSION}
-
-post-install-script:
- ${ECHO_CMD} 'bin/haddock-${PORTVERSION}' >> ${TMPPLIST}
.include <bsd.port.mk>
Modified: head/devel/hs-hashable/Makefile
==============================================================================
--- head/devel/hs-hashable/Makefile Tue May 28 14:08:12 2019 (r502897)
+++ head/devel/hs-hashable/Makefile Tue May 28 15:53:04 2019 (r502898)
@@ -2,7 +2,7 @@
PORTNAME= hashable
PORTVERSION= 1.2.7.0
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= devel haskell
@@ -10,9 +10,6 @@ MAINTAINER= haskell at FreeBSD.org
COMMENT= Class for types that can be converted to a hash value
LICENSE= BSD3CLAUSE
-
-DEPRECATED= Haskell libraries are getting pushed out of the ports tree. If you are using this port for development, consider switching to cabal sandboxes (old way), cabal new-build (new way), or use devel/stack. If you believe this port shouldn't be removed, contact haskell at FreeBSD.org
-EXPIRATION_DATE= 2019-04-14
FLAGS_DEFINE= INTEGER_GMP SSE2 SSE41
FLAGS_DEFAULT_amd64= INTEGER_GMP SSE2
Modified: head/devel/hs-mtl/Makefile
==============================================================================
--- head/devel/hs-mtl/Makefile Tue May 28 14:08:12 2019 (r502897)
+++ head/devel/hs-mtl/Makefile Tue May 28 15:53:04 2019 (r502898)
@@ -2,16 +2,13 @@
PORTNAME= mtl
PORTVERSION= 2.2.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell at FreeBSD.org
COMMENT= Monad classes, using functional dependencies
LICENSE= BSD3CLAUSE
-
-DEPRECATED= Haskell libraries are getting pushed out of the ports tree. If you are using this port for development, consider switching to cabal sandboxes (old way), cabal new-build (new way), or use devel/stack. If you believe this port shouldn't be removed, contact haskell at FreeBSD.org
-EXPIRATION_DATE= 2019-04-14
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
Modified: head/devel/hs-old-locale/Makefile
==============================================================================
--- head/devel/hs-old-locale/Makefile Tue May 28 14:08:12 2019 (r502897)
+++ head/devel/hs-old-locale/Makefile Tue May 28 15:53:04 2019 (r502898)
@@ -2,16 +2,13 @@
PORTNAME= old-locale
PORTVERSION= 1.0.0.7
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell at FreeBSD.org
COMMENT= Locale library
LICENSE= BSD3CLAUSE
-
-DEPRECATED= Haskell libraries are getting pushed out of the ports tree. If you are using this port for development, consider switching to cabal sandboxes (old way), cabal new-build (new way), or use devel/stack. If you believe this port shouldn't be removed, contact haskell at FreeBSD.org
-EXPIRATION_DATE= 2019-04-14
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
Modified: head/devel/hs-old-time/Makefile
==============================================================================
--- head/devel/hs-old-time/Makefile Tue May 28 14:08:12 2019 (r502897)
+++ head/devel/hs-old-time/Makefile Tue May 28 15:53:04 2019 (r502898)
@@ -2,16 +2,13 @@
PORTNAME= old-time
PORTVERSION= 1.1.0.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell at FreeBSD.org
COMMENT= Time library
LICENSE= BSD3CLAUSE
-
-DEPRECATED= Haskell libraries are getting pushed out of the ports tree. If you are using this port for development, consider switching to cabal sandboxes (old way), cabal new-build (new way), or use devel/stack. If you believe this port shouldn't be removed, contact haskell at FreeBSD.org
-EXPIRATION_DATE= 2019-04-14
USE_CABAL= old-locale>=1.0
Modified: head/devel/hs-random/Makefile
==============================================================================
--- head/devel/hs-random/Makefile Tue May 28 14:08:12 2019 (r502897)
+++ head/devel/hs-random/Makefile Tue May 28 15:53:04 2019 (r502898)
@@ -2,16 +2,13 @@
PORTNAME= random
PORTVERSION= 1.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell at FreeBSD.org
COMMENT= Random number library
LICENSE= BSD3CLAUSE
-
-DEPRECATED= Haskell libraries are getting pushed out of the ports tree. If you are using this port for development, consider switching to cabal sandboxes (old way), cabal new-build (new way), or use devel/stack. If you believe this port shouldn't be removed, contact haskell at FreeBSD.org
-EXPIRATION_DATE= 2019-04-14
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
Modified: head/devel/hs-setlocale/Makefile
==============================================================================
--- head/devel/hs-setlocale/Makefile Tue May 28 14:08:12 2019 (r502897)
+++ head/devel/hs-setlocale/Makefile Tue May 28 15:53:04 2019 (r502898)
@@ -2,16 +2,13 @@
PORTNAME= setlocale
PORTVERSION= 1.0.0.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell at FreeBSD.org
COMMENT= Haskell setlocale package
LICENSE= BSD3CLAUSE
-
-DEPRECATED= Haskell libraries are getting pushed out of the ports tree. If you are using this port for development, consider switching to cabal sandboxes (old way), cabal new-build (new way), or use devel/stack. If you believe this port shouldn't be removed, contact haskell at FreeBSD.org
-EXPIRATION_DATE= 2019-04-14
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
Modified: head/devel/hs-transformers-compat/Makefile
==============================================================================
--- head/devel/hs-transformers-compat/Makefile Tue May 28 14:08:12 2019 (r502897)
+++ head/devel/hs-transformers-compat/Makefile Tue May 28 15:53:04 2019 (r502898)
@@ -2,16 +2,13 @@
PORTNAME= transformers-compat
PORTVERSION= 0.5.1.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell at FreeBSD.org
COMMENT= Compatibility shim exposing the new types from transformers 0.3 and 0.4
LICENSE= BSD3CLAUSE
-
-DEPRECATED= Haskell libraries are getting pushed out of the ports tree. If you are using this port for development, consider switching to cabal sandboxes (old way), cabal new-build (new way), or use devel/stack. If you believe this port shouldn't be removed, contact haskell at FreeBSD.org
-EXPIRATION_DATE= 2019-04-14
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
Modified: head/devel/hs-unordered-containers/Makefile
==============================================================================
--- head/devel/hs-unordered-containers/Makefile Tue May 28 14:08:12 2019 (r502897)
+++ head/devel/hs-unordered-containers/Makefile Tue May 28 15:53:04 2019 (r502898)
@@ -2,16 +2,13 @@
PORTNAME= unordered-containers
PORTVERSION= 0.2.9.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell at FreeBSD.org
COMMENT= Efficient hashing-based container types
LICENSE= BSD3CLAUSE
-
-DEPRECATED= Haskell libraries are getting pushed out of the ports tree. If you are using this port for development, consider switching to cabal sandboxes (old way), cabal new-build (new way), or use devel/stack. If you believe this port shouldn't be removed, contact haskell at FreeBSD.org
-EXPIRATION_DATE= 2019-04-14
USE_CABAL= hashable>=1.0.1.1
Modified: head/devel/hs-utf8-string/Makefile
==============================================================================
--- head/devel/hs-utf8-string/Makefile Tue May 28 14:08:12 2019 (r502897)
+++ head/devel/hs-utf8-string/Makefile Tue May 28 15:53:04 2019 (r502898)
@@ -2,16 +2,13 @@
PORTNAME= utf8-string
PORTVERSION= 1.0.1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell at FreeBSD.org
COMMENT= Support for reading and writing UTF-8 strings
LICENSE= BSD3CLAUSE
-
-DEPRECATED= Haskell libraries are getting pushed out of the ports tree. If you are using this port for development, consider switching to cabal sandboxes (old way), cabal new-build (new way), or use devel/stack. If you believe this port shouldn't be removed, contact haskell at FreeBSD.org
-EXPIRATION_DATE= 2019-04-14
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
Modified: head/lang/Makefile
==============================================================================
--- head/lang/Makefile Tue May 28 14:08:12 2019 (r502897)
+++ head/lang/Makefile Tue May 28 15:53:04 2019 (r502898)
@@ -113,9 +113,6 @@
SUBDIR += gcc9-devel
SUBDIR += gforth
SUBDIR += ghc
- SUBDIR += ghc843
- SUBDIR += ghc844
- SUBDIR += ghc862
SUBDIR += gjs
SUBDIR += gnat_util
SUBDIR += gnatcross-aarch64
Modified: head/lang/ghc/Makefile
==============================================================================
--- head/lang/ghc/Makefile Tue May 28 14:08:12 2019 (r502897)
+++ head/lang/ghc/Makefile Tue May 28 15:53:04 2019 (r502898)
@@ -3,11 +3,11 @@
PORTNAME= ghc
PORTVERSION= ${GHC_VERSION}
+PORTREVISION= 1
CATEGORIES= lang haskell
-MASTER_SITES= http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
+MASTER_SITES= https://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
LOCAL/arrowd/:boot \
- ${HACKAGE_SITE}hscolour-${HSCOLOUR_VERSION}/:docs
-
+ https://hackage.haskell.org/package/hscolour-${HSCOLOUR_VERSION}/:docs
DISTFILES= ghc-${PORTVERSION}-src${EXTRACT_SUFX}:source \
hscolour-${HSCOLOUR_VERSION}.tar.gz:docs
EXTRACT_ONLY= ${_DISTFILES:C/hscolour.*$//g}
@@ -18,12 +18,314 @@ COMMENT= Compiler for the functional language Haskell
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-GHC_VERSION= 8.6.3
+# other supported arches are added based on GHC_VERSION below
+ONLY_FOR_ARCHS= amd64 i386
+
+USES= autoreconf gmake iconv:translit localbase:ldflags ncurses perl5 tar:xz
+USE_LOCALE= en_US.UTF-8
+USE_PERL5= build
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --with-iconv-includes=${LOCALBASE}/include \
+ --with-iconv-libraries=${LOCALBASE}/lib
+CONFIGURE_ENV= CC=${CC} LD=${LD} PATH=${SLAVES_PREFIX}/bin:${PATH}
+MAKE_ENV= PATH=${SLAVES_PREFIX}/bin:${PATH}
+# Turn off for a while, see PR 228727
+CONFIGURE_ARGS+= --enable-dtrace=0
+
+SUB_FILES= build.mk
+SUB_LIST= GHC_VERSION=${GHC_VERSION} \
+ NCURSESINC="${NCURSESBASE}/include" NCURSESLIB="${NCURSESLIB}" \
+ CFLAGS="${CFLAGS}"
+
+OPTIONS_GROUP= BOOTSTRAP
+BOOTSTRAP_DESC= Bootsrap using installed ghc
+OPTIONS_GROUP_BOOTSTRAP=BOOT
+OPTIONS_DEFINE= DYNAMIC GMP PROFILE DOCS
+OPTIONS_SUB= yes
+
+OPTIONS_DEFAULT= DYNAMIC PROFILE GMP
+
+BOOT_DESC= Use installed GHC for bootstrapping
+DOCS_DESC= Install HTML documentation
+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"
+
+DYNAMIC_CONFIGURE_WITH= system-libffi \
+ ffi-includes=${LOCALBASE}/include \
+ ffi-libraries=${LOCALBASE}/lib
+# The version number is needed as lang/gcc installs a different version
+DYNAMIC_LIB_DEPENDS= libffi.so.6:devel/libffi
+DYNAMIC_SUB_LIST= WITH_DYNAMIC="YES"
+DYNAMIC_SUB_LIST_OFF= WITH_DYNAMIC="NO"
+
+GMP_CONFIGURE_WITH= gmp-includes=${LOCALBASE}/include \
+ gmp-libraries=${LOCALBASE}/lib
+GMP_LIB_DEPENDS= libgmp.so:math/gmp
+GMP_SUB_LIST= INTEGER_LIBRARY="integer-gmp"
+GMP_SUB_LIST_OFF= INTEGER_LIBRARY="integer-simple"
+
+# Append substitutions for build.mk
+BOOT_SUB_LIST= HSC2HS=${LOCALBASE}/bin/hsc2hs
+BOOT_SUB_LIST_OFF= HSC2HS=${BOOT_HSC2HS}
+
+PROFILE_SUB_LIST= WITH_PROFILE="YES"
+PROFILE_SUB_LIST_OFF= WITH_PROFILE="NO"
+
+GHC_VERSION?= ${GHC_VERSION_DEFAULT}
+GHC_VERSION_DEFAULT= 8.6.3
+GHC_VERSION_MAJOR= ${GHC_VERSION:S/./ /g:[1]}
+GHC_VERSION_MINOR= ${GHC_VERSION:S/./ /g:[2]}
+
HSCOLOUR_VERSION= 1.24.4
+
+.if ${GHC_VERSION_MAJOR} >= 8 && ${GHC_VERSION_MINOR} >= 6
+ONLY_FOR_ARCHS+= aarch64 armv6 armv7 powerpc64
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${GHC_VERSION_MAJOR} == 8 && ${GHC_VERSION_MINOR} <= 4
+LLVM_VERSION= 50
+.else
LLVM_VERSION= 60
+.endif
-CONFLICTS_INSTALL= ghc-7.4.* ghc-7.6.* ghc-7.8.* ghc-7.10.* ghc-8.0.* ghc-8.4.* ghc-8.6.2
+.if ${ARCH} == amd64 || ${ARCH} == i386
+BOOT_GHC_VERSION= 8.4.3
+.else
+BOOT_GHC_VERSION= 8.6.3
+.endif
-.include "${.CURDIR}/../../lang/ghc/bsd.ghc.mk"
+# LLVM version that bootstrap compiler uses
+BOOT_LLVM_VERSION= 60
-.include <bsd.port.mk>
+.if "${GHC_VERSION}" != "${GHC_VERSION_DEFAULT}"
+PATCHDIR= ${.CURDIR}/files${GHC_VERSION:S/.//g}/
+.endif
+
+NO_CCACHE= ccache: error: Failed to create directory /nonexistent/.ccache/tmp: Permission denied
+
+DOCSDIR= ${PREFIX}/share/doc/${DISTNAME}
+DATADIR= ${PREFIX}/share/ghc-${GHC_VERSION}
+EXAMPLESDIR= ${PREFIX}/share/examples/ghc-${GHC_VERSION}
+GHC_ARCH= ${ARCH:S/amd64/x86_64/:C/armv.*/arm/}
+GHC_LIBDIR= ${STAGEDIR}${PREFIX}/lib/ghc-${GHC_VERSION}
+GHC_LIBDIR_REL= lib/ghc-${GHC_VERSION}
+
+_EXECUTABLES= ${GHC_LIBDIR}/bin/unlit \
+ ${GHC_LIBDIR}/bin/hpc \
+ ${GHC_LIBDIR}/bin/ghc-iserv \
+ ${GHC_LIBDIR}/bin/ghc-pkg \
+ ${GHC_LIBDIR}/bin/hsc2hs \
+ ${GHC_LIBDIR}/bin/runghc \
+ ${GHC_LIBDIR}/bin/ghc \
+ ${GHC_LIBDIR}/bin/hp2ps \
+ ${GHC_LIBDIR}/bin/haddock
+
+.if ${PORT_OPTIONS:MPROFILE}
+_EXECUTABLES+= ${GHC_LIBDIR}/bin/ghc-iserv-prof
+.endif
+.if ${PORT_OPTIONS:MDYNAMIC}
+_EXECUTABLES+= ${GHC_LIBDIR}/bin/ghc-iserv-dyn
+.endif
+
+.include <bsd.port.options.mk>
+
+.if empty(PORT_OPTIONS:MBOOT)
+
+DISTFILES+= ghc-${BOOT_GHC_VERSION}-boot-${ARCH}-freebsd${EXTRACT_SUFX}:boot
+.endif # MBOOT
+
+.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
+# CONFIGURE_TARGET must to be the same as the llvm triple
+CONFIGURE_TARGET= ${ARCH}-unknown-freebsd${"${ARCH:Maarch64}" != "":?:-gnueabihf}
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-aclocal.m4
+BUILD_DEPENDS+= ld.gold:devel/binutils \
+ llc${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
+RUN_DEPENDS+= ld.gold:devel/binutils \
+ llc${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
+USE_GCC= yes
+
+# When GHC being compiled and GHC used for bootstrapping support different
+# LLVM versions, we have to pull in both. Luckily, this is relatively rare.
+. if ${BOOT_LLVM_VERSION} != ${LLVM_VERSION}
+BUILD_DEPENDS+= llc${BOOT_LLVM_VERSION}:devel/llvm${BOOT_LLVM_VERSION}
+RUN_DEPENDS+= llc${BOOT_LLVM_VERSION}:devel/llvm${BOOT_LLVM_VERSION}
+. endif
+
+. if ${OSVERSION} < 1200064
+IGNORE= lang/ghc on ARM requires at least __FreeBSD_version 1200064
+. endif
+
+. ifdef QEMU_EMULATING
+IGNORE= qemu-user-static isn't able to build lang/ghc, but it builds fine on a real hardware
+. endif
+.endif
+
+.if ${ARCH} == powerpc64
+USE_GCC= yes
+
+. if ${OSVERSION} < 1200086
+IGNORE= lang/ghc on powerpc64 requires at least __FreeBSD_version 1200086
+. endif
+.endif
+
+# Use binutils strip if we are using gcc, as it is faster that base one. See PR 234949
+.if defined(USE_GCC)
+CONFIGURE_ENV+= STRIP=${LOCALBASE}/bin/strip
+.endif
+
+PLIST_SUB+= GHC_VERSION=${GHC_VERSION} GHC_LIBDIR=${GHC_LIBDIR_REL}
+
+.if empty(PORT_OPTIONS:MBOOT)
+BOOT_DIR= ${WRKDIR}/ghc-${BOOT_GHC_VERSION}-boot
+BOOT_GHC= ${BOOT_DIR}/bin/ghc-${BOOT_GHC_VERSION}
+BOOT_GHC-PKG= ${BOOT_DIR}/bin/ghc-pkg-${BOOT_GHC_VERSION}
+BOOT_HSC2HS= ${BOOT_DIR}/bin/hsc2hs
+
+SLAVE_ENV= ${SETENV} PATH=${BOOT_DIR}/bin:${PATH}
+
+CONFIGURE_ARGS+= --with-ghc=${BOOT_GHC}
+.else # MBOOT
+SLAVE_ENV= # empty
+CONFIGURE_ARGS+= --with-ghc=${LOCALBASE}/bin/ghc
+.endif # MBOOT
+
+# override TMPDIR because /tmp often doesn't have enough space
+# to build some of the larger libraries.
+#TMPDIR= ${WRKSRC}/tmp
+
+SLAVES_PREFIX= ${WRKDIR}/slaves_prefix
+SLAVES_WRKDIRPREFIX= ${WRKDIR}/slaves_wrkdirprefix
+
+post-extract:
+# Use the "wrap" trick on arches that have to use pre-ino64 bootstrap binaries
+.if empty(PORT_OPTIONS:MBOOT) && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200031 && \
+ (${ARCH} == amd64 || ${ARCH} == i386)
+ @${REINPLACE_CMD} -e 's|@SettingsCCompilerLinkFlags@|& -Wl,--wrap=readdir_r,--wrap=stat,--wrap=lstat,--wrap=fstat,--wrap=mknod|' ${BOOT_DIR}/settings.in
+.endif
+
+# %%PORTDOCS%%%%DOCSDIR%%/html/libraries/doc-index-V.html
+post-install-script:
+ ${FIND} -ds ${GHC_LIBDIR} -type f -print | ${SED} -E \
+ -e 's,^${STAGEDIR}${PREFIX}/?,,' \
+ -e '/^${GHC_LIBDIR:C/\//\\\//g}\/package.conf.d\/package\.cache/s|^|@comment |g' \
+ >> ${TMPPLIST}
+ ${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}
+ ${ECHO} "@postunexec ${RM} %D/${DOCSDIR_REL}/html/libraries/*.png" >> ${TMPPLIST}
+.endif
+ ${ECHO} '@postunexec ${RM} %D/${GHC_LIBDIR_REL}/package.conf.d/package.cache' >>${TMPPLIST}
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|; \
+ s|%%AR%%|${AR}|; \
+ s|%%LD%%|${LD}|' \
+ ${WRKSRC}/libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs
+# we must use binutils:ld on arm
+.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
+ @${REINPLACE_CMD} -e 's|LD_NO_GOLD=ld|LD_NO_GOLD=${LOCALBASE}/bin/ld|' \
+ ${WRKSRC}/aclocal.m4
+.endif
+
+ @${REINPLACE_CMD} -e 's/@SettingsLlcCommand@/llc${LLVM_VERSION}/' ${WRKSRC}/settings.in
+ @${REINPLACE_CMD} -e 's/@SettingsOptCommand@/opt${LLVM_VERSION}/' ${WRKSRC}/settings.in
+
+.if empty(PORT_OPTIONS:MBOOT)
+ @${REINPLACE_CMD} -e '/^mandir/d' ${BOOT_DIR}/mk/build.mk
+ @${REINPLACE_CMD} -e '/^infodir/d' ${BOOT_DIR}/mk/build.mk
+ @${REINPLACE_CMD} -e '/^docdir/d' ${BOOT_DIR}/mk/build.mk
+ @${REINPLACE_CMD} -e '/^htmldir/d' ${BOOT_DIR}/mk/build.mk
+.endif
+
+pre-configure: apply-slist
+ # Copy the subbed build.mk to the proper position
+ ${CP} ${WRKDIR}/build.mk ${WRKSRC}/mk/build.mk
+
+# Use the "wrap" trick on arches that have to use pre-ino64 bootstrap binaries
+.if empty(PORT_OPTIONS:MBOOT) && ${OPSYS} == FreeBSD && \
+ ${OSVERSION} >= 1200031 && \
+ (${ARCH} == amd64 || ${ARCH} == i386)
+ ${CC} ${CFLAGS} -c -o ${BOOT_DIR}/wrap.o ${PATCHDIR}/wrap.c
+ for x in ${BOOT_DIR}/rts/dist/build/libCffi*.a; do \
+ ${AR} q $$x ${BOOT_DIR}/wrap.o; ${RANLIB} $$x; \
+ done
+ ${RM} ${BOOT_DIR}/wrap.o
+.endif
+# If we are using bootstrap compiler, configure and install it into ${BOOT_DIR}
+.if empty(PORT_OPTIONS:MBOOT)
+ cd ${BOOT_DIR} && ${CONFIGURE_ENV} ${CONFIGURE_CMD} --prefix=${BOOT_DIR}
+ cd ${BOOT_DIR} && PACKAGES='' ${MAKE_CMD} install
+.endif
+# If DOCS are set, install HsColour in-place
+.if ${PORT_OPTIONS:MDOCS}
+ ${MKDIR} ${SLAVES_PREFIX}
+ ${MKDIR} ${SLAVES_WRKDIRPREFIX}
+
+ cd ${SLAVES_WRKDIRPREFIX} && \
+ ${TAR} xvf ${DISTDIR}/hscolour-${HSCOLOUR_VERSION}.tar.gz && \
+ cd hscolour-${HSCOLOUR_VERSION} && \
+ ${SLAVE_ENV} ghc --make -o Setup Setup.hs -package Cabal && \
+ ${SLAVE_ENV} ./Setup configure --ghc --prefix=${SLAVES_PREFIX} --with-gcc=${CC} --with-ld=${LD} && \
+ ${SLAVE_ENV} ./Setup build && \
+ ${SLAVE_ENV} ./Setup install
+.endif
+
+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
+
+# Create a bootstrap compiler tar ball: run this in an interactive poudriere jail
+.PHONY: create-bootstrap
+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 \
+ && ${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
+
+ cd /tmp \
+ && sha256 ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz \
+ && ${ECHO} -n "SIZE (ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz) = " \
+ && ${STAT} -f %z ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz
+
+# Much like create-bootstrap, just different naming and output format
+.PHONY: create-stack-bindist
+create-stack-bindist:
+ ${REINPLACE_CMD} -e '/^mandir/d' \
+ -e '/^infodir/d' \
+ -e '/^docdir/d' \
+ -e '/^htmldir/d' \
+ ${WRKSRC}/mk/build.mk
+
+ cd ${WRKSRC} \
+ && ${GMAKE} binary-dist TAR_COMP=xz \
+ && ${MV} ${WRKSRC}/ghc-${GHC_VERSION}-${GHC_ARCH}-portbld-freebsd.tar.xz /tmp/
+
+ cd /tmp \
+ && ${ECHO} "${GHC_VERSION}:" \
+ && ${ECHO} "url: \"http://distcache.FreeBSD.org/local-distfiles/arrowd/stack-bindists/ghc-${GHC_VERSION}-${GHC_ARCH}-portbld-freebsd.tar.xz\"" \
+ && ${ECHO} -n "content-length: " \
+ && ${STAT} -f %z ghc-${GHC_VERSION}-${GHC_ARCH}-portbld-freebsd.tar.xz \
+ && ${ECHO} -n "sha1: " \
+ && sha1 -q ghc-${GHC_VERSION}-${GHC_ARCH}-portbld-freebsd.tar.xz \
+ && ${ECHO} -n "sha256: " \
+ && sha256 -q ghc-${GHC_VERSION}-${GHC_ARCH}-portbld-freebsd.tar.xz
+
+.include <bsd.port.post.mk>
Modified: head/lang/ghc/bsd.cabal.mk
==============================================================================
--- head/lang/ghc/bsd.cabal.mk Tue May 28 14:08:12 2019 (r502897)
+++ head/lang/ghc/bsd.cabal.mk Tue May 28 15:53:04 2019 (r502898)
@@ -151,68 +151,19 @@ IGNORE?= dependency fail: ${__u_h_r_package} is part
BUILD_DEPENDS+= ${dependencies}
-. if !defined(STANDALONE) || ${PORT_OPTIONS:MDYNAMIC}
+. if !defined(STANDALONE)
RUN_DEPENDS+= ${dependencies}
. endif
.endif
-.if ${PORT_OPTIONS:MDOCS}
-. if !defined(XMLDOCS)
-
-. if defined(HADDOCK_AVAILABLE)
-HADDOCK_OPTS= # empty
-
-. if ${PORT_OPTIONS:MHSCOLOUR}
-BUILD_DEPENDS+= HsColour:print/hs-hscolour
-
-HSCOLOUR_DATADIR= ${LOCALBASE}/share/cabal/ghc-${GHC_VERSION}/hscolour-${HSCOLOUR_VERSION}
-HADDOCK_OPTS+= --hyperlink-source --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
-. endif # HSCOLOUR
-. endif # HADDOCK_AVAILABLE
-
-. endif # !XMLDOCS
-
-. if defined(XMLDOCS)
-BUILD_DEPENDS+= docbook-xsl>0:textproc/docbook-xsl \
- ${LOCALBASE}/bin/xsltproc:textproc/libxslt
-
-. if defined(XMLDOCS_CONF)
-BUILD_DEPENDS+= autoconf>0:devel/autoconf
-. endif
-
-USES+= gmake
-
-. endif # XMLDOCS
-
-.endif # DOCS
-
__handle_datadir__= --datadir='${DATADIR}' --datasubdir='' --docdir='${DOCSDIR}'
-.if defined(HADDOCK_AVAILABLE) && !defined(XMLDOCS) && ${PORT_OPTIONS:MDOCS}
-CONFIGURE_ARGS+= --haddock-options=-w --with-haddock=${HADDOCK_CMD}
-.endif
+CONFIGURE_ARGS+= --disable-executable-dynamic \
+ --disable-profiling --disable-library-profiling
-.if ${PORT_OPTIONS:MDYNAMIC}
-CONFIGURE_ARGS+= --enable-shared --enable-executable-dynamic
-.else
-CONFIGURE_ARGS+= --disable-shared --disable-executable-dynamic
-.endif
-
-.if ${PORT_OPTIONS:MPROFILE}
-CONFIGURE_ARGS+= --enable-executable-profiling --enable-library-profiling
-.else
-CONFIGURE_ARGS+= --disable-profiling --disable-library-profiling
-.endif
-
.SILENT:
-post-patch::
-.if defined(XMLDOCS) && defined(XMLDOCS_CONF)
- @${REINPLACE_CMD} -e 's|/usr/local/share/xsl/docbook|${LOCALBASE}/share/xsl/docbook|' \
- ${WRKSRC}/doc/configure.ac
-.endif
-
_BUILD_SETUP= ${GHC_CMD} -o ${SETUP_CMD} -package Cabal --make
.if !defined(METAPORT)
@@ -232,12 +183,6 @@ do-configure:
${ECHO_MSG} "===> ${PKGNAME} configure fails: no setup program could be created."; \
exit 1; \
fi
-
-. if ${PORT_OPTIONS:MDOCS}
-. if defined(XMLDOCS) && defined(XMLDOCS_CONF)
- cd ${WRKSRC}/doc && ${LOCALBASE}/bin/autoconf && ./configure --prefix=${PREFIX}
-. endif
-. endif # DOCS
. endif # target(do-configure)
.endif # !METAPORT
@@ -248,15 +193,6 @@ do-build:
. if !defined(STANDALONE)
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} register --gen-script
. endif
-
-. if ${PORT_OPTIONS:MDOCS}
-. if defined(HADDOCK_AVAILABLE) && !defined(XMLDOCS) && !defined(STANDALONE) && ${PORT_OPTIONS:MDOCS}
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} haddock ${HADDOCK_OPTS}
-. endif # STANDALONE
-. if defined(XMLDOCS)
- @(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} html)
-. endif # XMLDOCS
-. endif # DOCS
. endif # target(do-build)
.endif # !METAPORT
@@ -296,13 +232,6 @@ do-install:
. endif # MAN${sect}SRC
. endfor
-. if ${PORT_OPTIONS:MDOCS}
-. if !empty(XMLDOCS)
-. for xmldoc in ${XMLDOCS}
- @(cd ${WRKSRC}/${xmldoc:C/:.*$//g} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}/${xmldoc:C/^.*://g})
-. endfor
-. endif # XMLDOCS
-. endif # DOCS
. endif # target(do-install)
.endif # !METAPORT
@@ -326,18 +255,6 @@ add-plist-cabal:
. if !defined(STANDALONE)
@${ECHO_CMD} '@postunexec ${LOCALBASE}/bin/ghc-pkg unregister --no-user-package-db --force ${PORTNAME}-${PORTVERSION}' >> ${TMPPLIST}
-. endif
-
-. if defined(HADDOCK_AVAILABLE) && ${PORT_OPTIONS:MDOCS}
-# GHC_LIB_DOCSDIR_REL= share/doc/ghc-${GHC_VERSION}/html/libraries
- (${ECHO} '@postexec ${LN} -s ${DOCSDIR}/html ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL}/${PACKAGE} && \
- cd ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL} && \
- ${RM} doc-index*.html && ./gen_contents_index') >> ${TMPPLIST}
- (${ECHO} '@postunexec ${RM} -r ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL}/${PACKAGE}' ; \
- ${ECHO} '@postunexec cd ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL} && \
- ${RM} doc-index*.html && ./gen_contents_index') >> ${TMPPLIST}
-# Don't install index files
- ${ECHO} "@comment share/doc/ghc-%%GHC_VERSION%%/html/libraries/index.html" >> ${TMPPLIST}
. endif
. if !defined(STANDALONE)
Modified: head/lang/ghc/bsd.cabal.options.mk
==============================================================================
--- head/lang/ghc/bsd.cabal.options.mk Tue May 28 14:08:12 2019 (r502897)
+++ head/lang/ghc/bsd.cabal.options.mk Tue May 28 15:53:04 2019 (r502898)
@@ -20,30 +20,6 @@ HSCOLOUR_CMD?= ${LOCALBASE}/bin/HsColour
GHC_VERSION?= 8.6.3
-HSCOLOUR_VERSION= 1.24.4
-
-HSCOLOUR_DESC?= Colorize generated documentation by HsColour
-DYNAMIC_DESC?= Add support for dynamic linking
-PROFILE_DESC?= Add support for profiling
-
-.if (!exists(${GHC_CMD}) || exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/rts/libHSrts-ghc${GHC_VERSION}.so)) && !defined(IGNORE_DYNAMIC)
-OPTIONS_DEFINE+= DYNAMIC
-OPTIONS_DEFAULT+= DYNAMIC
-.endif
-
-.if (!exists(${GHC_CMD}) || exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/rts/libHSrts_p.a)) && !defined(IGNORE_PROFILE)
-OPTIONS_DEFINE+= PROFILE
-.endif
-
-.if ((!exists(${GHC_CMD}) || exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/html)) || exists(${HADDOCK_CMD})) && !defined(IGNORE_DOCS)
-OPTIONS_DEFINE+= DOCS
-HADDOCK_AVAILABLE= yes
-
-.if (${PORTNAME} != hscolour || exists(${HSCOLOUR_CMD})) && !defined(IGNORE_HSCOLOUR)
-OPTIONS_DEFINE+= HSCOLOUR
-.endif
-.endif
-
.if defined(OPTIONSMKINCLUDED)
IGNORE?= options fail: bsd.cabal.mk already includes bsd.options.mk
.endif
Modified: head/lang/ghc/distinfo
==============================================================================
--- head/lang/ghc/distinfo Tue May 28 14:08:12 2019 (r502897)
+++ head/lang/ghc/distinfo Tue May 28 15:53:04 2019 (r502898)
@@ -1,12 +1,16 @@
TIMESTAMP = 1541010523
SHA256 (ghc-8.6.3-src.tar.xz) = 9f9e37b7971935d88ba80426c36af14b1e0b3ec1d9c860f44a4391771bc07f23
SIZE (ghc-8.6.3-src.tar.xz) = 19138116
+SHA256 (ghc-8.6.2-src.tar.xz) = caaa819d21280ecde90a4773143dee188711e9ff175a27cfbaee56eb851d76d5
+SIZE (ghc-8.6.2-src.tar.xz) = 19024236
+SHA256 (ghc-8.4.4-src.tar.xz) = 11117735a58e507c481c09f3f39ae5a314e9fbf49fc3109528f99ea7959004b2
+SIZE (ghc-8.4.4-src.tar.xz) = 11319500
+SHA256 (ghc-8.4.3-src.tar.xz) = ae47afda985830de8811243255aa3744dfb9207cb980af74393298b2b62160d6
+SIZE (ghc-8.4.3-src.tar.xz) = 11315068
SHA256 (ghc-8.4.3-boot-amd64-freebsd.tar.xz) = 0e0324a539d471a813ed4d18c537fb19be22a4e250bd5434a3a911b9d5343724
SIZE (ghc-8.4.3-boot-amd64-freebsd.tar.xz) = 67718400
SHA256 (ghc-8.4.3-boot-i386-freebsd.tar.xz) = 65fcd48b1c0166e028b3f6d50ad295525e6b84490da82663ec66165e57e87972
SIZE (ghc-8.4.3-boot-i386-freebsd.tar.xz) = 66143592
-SHA256 (hscolour-1.24.4.tar.gz) = 243332b082294117f37b2c2c68079fa61af68b36223b3fc07594f245e0e5321d
-SIZE (hscolour-1.24.4.tar.gz) = 28729
SHA256 (ghc-8.6.3-boot-aarch64-freebsd.tar.xz) = 5a1f043ada7262cf4eac4a900b7d5af965e5f6f89939e635ad0c10b0185a15b7
SIZE (ghc-8.6.3-boot-aarch64-freebsd.tar.xz) = 104631584
SHA256 (ghc-8.6.3-boot-armv6-freebsd.tar.xz) = 5260987646c9f6102f35a7cdedfde785227c4f317fb3ccc52d06cae6a0950a68
@@ -15,3 +19,5 @@ SHA256 (ghc-8.6.3-boot-armv7-freebsd.tar.xz) = 765d011
SIZE (ghc-8.6.3-boot-armv7-freebsd.tar.xz) = 114046668
SHA256 (ghc-8.6.3-boot-powerpc64-freebsd.tar.xz) = fb9bd4bad3a54722b7012c0a531cbdfe71b3b20a0b92cbd52195a526dc5ccde4
SIZE (ghc-8.6.3-boot-powerpc64-freebsd.tar.xz) = 112652192
+SHA256 (hscolour-1.24.4.tar.gz) = 243332b082294117f37b2c2c68079fa61af68b36223b3fc07594f245e0e5321d
+SIZE (hscolour-1.24.4.tar.gz) = 28729
Added: head/lang/ghc/files843/build.mk.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/ghc/files843/build.mk.in Tue May 28 15:53:04 2019 (r502898)
@@ -0,0 +1,20 @@
+docdir = %%PREFIX%%/share/doc/ghc-%%GHC_VERSION%%
+htmldir = %%PREFIX%%/share/doc/ghc-%%GHC_VERSION%%
+mandir = %%PREFIX%%/man
+infodir = %%PREFIX%%/info
+DYNAMIC_GHC_PROGRAMS = %%WITH_DYNAMIC%%
+BUILD_PROF_LIBS = %%WITH_PROFILE%%
+HADDOCK_DOCS = %%WITH_DOCS%%
+HSCOLOUR_SRCS = %%WITH_DOCS%%
+INTEGER_LIBRARY = %%INTEGER_LIBRARY%%
+# disable xelatex: PR 231438
+BUILD_SPHINX_PDF = NO
+BSD_PATH_TO_HSC2HS = %%HSC2HS%%
+SRC_HC_OPTS += -I%%NCURSESINC%% -L%%NCURSESLIB%% -I%%LOCALBASE%%/include -L%%LOCALBASE%%/lib
+SRC_CC_OPTS += %%CFLAGS%%
+EXTRA_HSC2HS_OPTS += -I%%LOCALBASE%%/include --lflag=-L%%LOCALBASE%%/lib
+EXTRA_LD_OPTS += -L%%LOCALBASE%%/lib
+EXTRA_CABAL_CONFIGURE_FLAGS += --extra-include-dirs=%%LOCALBASE%%/include
+EXTRA_CABAL_CONFIGURE_FLAGS += --extra-lib-dirs=%%LOCALBASE%%/lib
+libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes=%%NCURSESINC%% --configure-option=--with-curses-libraries=%%NCURSESLIB%%
+V = 0
Added: head/lang/ghc/files843/extra-patch-aclocal.m4
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/ghc/files843/extra-patch-aclocal.m4 Tue May 28 15:53:04 2019 (r502898)
@@ -0,0 +1,54 @@
+--- aclocal.m4.orig 2018-03-25 21:22:32 UTC
++++ aclocal.m4
+@@ -648,6 +648,14 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
+ $3="$$3 -D_HPUX_SOURCE"
+ $5="$$5 -D_HPUX_SOURCE"
+ ;;
++ arm*freebsd*)
++ # On arm/freebsd, tell gcc to generate Arm
++ # instructions (ie not Thumb) and to link using the gold linker.
++ # Forcing LD to be ld.gold is done in FIND_LD m4 macro.
++ $2="$$2 -marm"
++ $3="$$3 -Wl,-z,noexecstack"
++ $4="$$4 -z noexecstack"
++ ;;
+ arm*linux*)
+ # On arm/linux and arm/android, tell gcc to generate Arm
+ # instructions (ie not Thumb).
+@@ -656,6 +664,11 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
+ $4="$$4 -z noexecstack"
+ ;;
+
++ aarch64*freebsd*)
++ $3="$$3 -Wl,-z,noexecstack"
++ $4="$$4 -z noexecstack"
++ ;;
++
+ aarch64*linux*)
+ $3="$$3 -Wl,-z,noexecstack"
+ $4="$$4 -z noexecstack"
+@@ -1917,6 +1930,10 @@ case "$1" in
+ # converts the canonicalized target into someting llvm can understand
+ AC_DEFUN([GHC_LLVM_TARGET], [
+ case "$2-$3" in
++ *-freebsd*-gnueabihf)
++ llvm_target_vendor="unknown"
++ llvm_target_os="freebsd-gnueabihf"
++ ;;
+ hardfloat-*eabi)
+ llvm_target_vendor="unknown"
+ llvm_target_os="$3""hf"
+@@ -2361,13 +2378,6 @@ AC_DEFUN([FIND_LD],[
+ [enable_ld_override=yes])
+
+ find_ld() {
+- # Make sure the user didn't specify LD manually.
+- if test "z$LD" != "z"; then
+- AC_CHECK_TARGET_TOOL([LD], [ld])
+- LD_NO_GOLD=$LD
+- return
+- fi
+-
+ # Manually iterate over possible names since we want to ensure that, e.g.,
+ # if ld.lld is installed but gcc doesn't support -fuse-ld=lld, that we
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list