[Midnightbsd-cvs] mports [23375] trunk/lang/ghc: update ghc

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat May 5 17:42:28 EDT 2018 

Revision: 23375
          http://svnweb.midnightbsd.org/mports/?rev=23375
Author:   laffer1
Date:     2018-05-05 17:42:27 -0400 (Sat, 05 May 2018)
Log Message:
-----------
update ghc

Modified Paths:
--------------
    trunk/lang/ghc/Makefile
    trunk/lang/ghc/distinfo
    trunk/lang/ghc/files/patch-aclocal.m4
    trunk/lang/ghc/files/patch-configure.ac
    trunk/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
    trunk/lang/ghc/pkg-plist

Added Paths:
-----------
    trunk/lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs

Modified: trunk/lang/ghc/Makefile
===================================================================
--- trunk/lang/ghc/Makefile	2018-05-05 21:38:32 UTC (rev 23374)
+++ trunk/lang/ghc/Makefile	2018-05-05 21:42:27 UTC (rev 23375)
@@ -1,10 +1,10 @@
 # $MidnightBSD$
 
 PORTNAME=	ghc
-PORTVERSION=	7.8.3
+PORTVERSION=	7.10.2
 CATEGORIES=	lang haskell
 MASTER_SITES=	http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
-		FREEBSD_LOCAL/pgj/:boot
+		LOCAL/pgj/:boot
 DISTFILES=	ghc-${PORTVERSION}-src${EXTRACT_SUFX}:source
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -11,29 +11,31 @@
 COMMENT=	Compiler for the functional language Haskell
 
 LICENSE=	bsd3
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
+ONLY_FOR_ARCHS=	i386 amd64
+
 MAKE_JOBS_NUMBER_LIMIT=		4
+NO_CCACHE=	yes
 
 GHC_VERSION=		${PORTVERSION}
-HSCOLOUR_VERSION=	1.20.3
+HSCOLOUR_VERSION=	1.23
+LLVM_VERSION=		35
 
 DATADIR=	${PREFIX}/share/ghc-${GHC_VERSION}
 EXAMPLESDIR=	${PREFIX}/share/examples/ghc-${GHC_VERSION}
 
-CONFLICTS=	ghc-6.* ghc-7.0.* ghc-7.2.* ghc-7.4.* ghc-7.6.* ghc-7.7.*
+CONFLICTS=	ghc-7.4.* ghc-7.6.* ghc-7.8.*
 
-LIB_DEPENDS+=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS+=	libgmp.so:math/gmp
 
-USE_AUTOTOOLS=		autoconf autoheader
 USE_PERL5=		build
-USES=			gmake iconv:translit perl5 ncurses tar:bzip2
-USE_BINUTILS=		yes
-USE_GCC=		yes
+USES=			autoreconf gmake iconv:translit ncurses perl5 tar:xz
 
-LICENSE_FILE=	${WRKSRC}/LICENSE
+MAKE_ENV+=	LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8
+# This is needed on FreeBSD 9.x due to the bootstrap tarball.
+TAR=		env LC_ALL=en_US.UTF-8 /usr/bin/tar
 
-MAKE_ENV=	LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8
-
 # The configure process accepts,filters and canonicalises
 # the CONFIGURE_TARGET variable. You can read the files
 # ${WRKSRC}/configure and ${WRKSRC}/config.sub.
@@ -41,11 +43,16 @@
 # You can view below.
 GNU_CONFIGURE=	yes
 
-OPTIONS_DEFINE=		PROFILE DYNAMIC LLVM DOCS
-OPTIONS_DEFAULT=	PROFILE DYNAMIC DOCS
+OPTIONS_DEFINE=			PROFILE DYNAMIC LLVM DOCS
+OPTIONS_SINGLE=			C_Compiler
+OPTIONS_SINGLE_C_Compiler=	GCC PCLANG BCLANG
 
+OPTIONS_DEFAULT=	PROFILE DYNAMIC GCC
+
 BOOT_DESC=		Use installed GHC for bootstrapping
 BOOTH_DESC=		Use installed HsColour for bootstrapping
+PCLANG_DESC=		Build with Clang from ports
+BCLANG_DESC=		Build with Clang from base
 PROFILE_DESC=		Add support for performance profiling
 DYNAMIC_DESC=		Add support for dynamic linking
 LLVM_DESC=		Add support for generating code via LLVM
@@ -65,33 +72,43 @@
 
 .if ${PORT_OPTIONS:MDYNAMIC}
 # The version number is needed as lang/gcc installs a different version
-LIB_DEPENDS+=	libffi.so.6:${PORTSDIR}/devel/libffi
+LIB_DEPENDS+=	libffi.so.6:devel/libffi
 .endif
 
 .if empty(PORT_OPTIONS:MBOOT)
 
-BOOT_GHC_VERSION=	7.6.3
+BOOT_GHC_VERSION=	7.10.2
+DISTFILES+=		ghc-${BOOT_GHC_VERSION}-boot-${ARCH}-freebsd${EXTRACT_SUFX}:boot
 
-.if ${ARCH} == "i386"
+.endif # MBOOT
 
-.if ${OSVERSION} >= 4015
-DISTFILES+=	ghc-${BOOT_GHC_VERSION}-i386-freebsd9-boot${EXTRACT_SUFX}:boot
-.else
-DISTFILES+=	ghc-${BOOT_GHC_VERSION}-i386-freebsd8-boot${EXTRACT_SUFX}:boot
+.if ${PORT_OPTIONS:MPCLANG}
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang${LLVM_VERSION}:lang/clang${LLVM_VERSION}
+RUN_DEPENDS+=	${LOCALBASE}/bin/clang${LLVM_VERSION}:lang/clang${LLVM_VERSION}
+CC=		${LOCALBASE}/bin/clang${LLVM_VERSION}
+CXX=		${LOCALBASE}/bin/clang++${LLVM_VERSION}
+CPP=		${LOCALBASE}/bin/clang-cpp${LLVM_VERSION}
+LDFLAGS+=	-B${LOCALBASE}/bin
+CFLAGS+=	-Qunused-arguments
+CONFIGURE_ARGS+=	--with-clang=${CC} --with-gcc=${CC}
+USE_BINUTILS=		yes
+.if empty(PORT_OPTIONS:MBOOT)
+CONFIGURE_ARGS_BOOT+=	--with-clang=${CC} --with-gcc=${CC}
 .endif
-
-.elif ${ARCH} == "amd64"
-
-.if ${OSVERSION} >= 4015
-DISTFILES+=	ghc-${BOOT_GHC_VERSION}-amd64-freebsd9-boot${EXTRACT_SUFX}:boot
-.else
-DISTFILES+=	ghc-${BOOT_GHC_VERSION}-amd64-freebsd8-boot${EXTRACT_SUFX}:boot
+.elif ${PORT_OPTIONS:MBCLANG}
+CC=		/usr/bin/clang
+CXX=		/usr/bin/clang++
+CPP=		/usr/bin/clang-cpp
+CFLAGS+=	-Qunused-arguments
+CONFIGURE_ARGS+=	--with-clang=${CC} --with-gcc=${CC}
+.else # GCC
+USE_GCC=	yes
+CONFIGURE_ARGS+=	--with-gcc=${CC}
+.if empty(PORT_OPTIONS:MBOOT)
+CONFIGURE_ARGS_BOOT+=	--with-gcc=${CC}
 .endif
-
 .endif
 
-.endif # MBOOT
-
 DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
 GHC_LIBDIR=	${STAGEDIR}${PREFIX}/lib/ghc-${GHC_VERSION}
 GHC_LIBDIR_REL=	lib/ghc-${GHC_VERSION}
@@ -100,8 +117,7 @@
 
 HACKAGE_SITE?=		http://hackage.haskell.org/package/
 
-CONFIGURE_ARGS=		--with-gcc=${CC} \
-			--with-ld=${LD} \
+CONFIGURE_ARGS+=	--with-ld=${LD} \
 			--with-gmp-includes=${LOCALBASE}/include \
 			--with-gmp-libraries=${LOCALBASE}/lib
 
@@ -115,11 +131,11 @@
 .endif
 
 .if ${PORT_OPTIONS:MLLVM}
-BUILD_DEPENDS+=		${LOCALBASE}/bin/opt34:${PORTSDIR}/devel/llvm34
-RUN_DEPENDS+=		${LOCALBASE}/bin/opt34:${PORTSDIR}/devel/llvm34
+BUILD_DEPENDS+=		${LOCALBASE}/bin/opt${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
+RUN_DEPENDS+=		${LOCALBASE}/bin/opt${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
 
-CONFIGURE_ARGS+=	--with-opt=${LOCALBASE}/bin/opt34 \
-			--with-llc=${LOCALBASE}/bin/llc34
+CONFIGURE_ARGS+=	--with-opt=${LOCALBASE}/bin/opt${LLVM_VERSION} \
+			--with-llc=${LOCALBASE}/bin/llc${LLVM_VERSION}
 .endif
 
 .if empty(PORT_OPTIONS:MBOOT)
@@ -131,7 +147,7 @@
 
 SLAVE_CMD=	${SETENV} PATH=${BOOT_DIR}/bin:${PATH}
 
-CONFIGURE_ARGS_BOOT=	--prefix=${BOOT_DIR} --with-gcc=${CC} --with-ld=${LD}
+CONFIGURE_ARGS_BOOT+=	--prefix=${BOOT_DIR} --with-ld=${LD}
 CONFIGURE_ARGS+=	--with-ghc=${BOOT_GHC}
 
 .else # MBOOT
@@ -149,7 +165,6 @@
 # override TMPDIR because /tmp often doesn't have enough space
 # to build some of the larger libraries.
 TMPDIR=		${WRKSRC}/tmp
-MAKE_ENV+=	TMPDIR=${TMPDIR}
 
 # Defining with documentation:
 # An in place installation and registration of hscolour will be
@@ -174,13 +189,12 @@
 SLAVES_WRKDIRPREFIX=	${WRKDIR}/slaves_wrkdirprefix
 
 MAKE_ENV+=	PATH=${SLAVES_PREFIX}/bin:${PATH}
-MAKE_ENV+=	LC_ALL=en_US.UTF-8
 CONFIGURE_ENV+=	PATH=${SLAVES_PREFIX}/bin:${PATH}
 
 .endif # MBOOTH
 
-BUILD_DEPENDS+=	docbook-xsl>0:${PORTSDIR}/textproc/docbook-xsl \
-		${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS+=	docbook-xsl>0:textproc/docbook-xsl \
+		${LOCALBASE}/bin/xsltproc:textproc/libxslt
 .endif
 
 post-extract:
@@ -210,6 +224,9 @@
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "BSD_PATH_TO_HSC2HS = ${BOOT_HSC2HS}"
 .endif
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "SRC_HC_OPTS += -I${NCURSESINC} -L${NCURSESLIB} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
+.if ${PORT_OPTIONS:MPCLANG}
+	@${ECHO} >> ${WRKSRC}/mk/build.mk "SRC_HC_OPTS += -optl=-B${LOCALBASE}/bin"
+.endif
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "SRC_CC_OPTS += ${CFLAGS}"
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "EXTRA_HSC2HS_OPTS += -I${LOCALBASE}/include --lflag=-L${LOCALBASE}/lib"
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "EXTRA_LD_OPTS += -L${LOCALBASE}/lib"
@@ -217,6 +234,12 @@
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "EXTRA_CABAL_CONFIGURE_FLAGS += --extra-lib-dirs=${LOCALBASE}/lib"
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes=${NCURSESINC} --configure-option=--with-curses-libraries=${NCURSESLIB}"
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "V = 0"
+.if ${PORT_OPTIONS:MBCLANG} || ${PORT_OPTIONS:MPCLANG}
+	@${REINPLACE_CMD} -e 's|@SettingsCCompilerFlags@|& -Qunused-arguments|' ${WRKSRC}/settings.in
+.if empty(PORT_OPTIONS:MBOOT)
+	@${REINPLACE_CMD} -e 's|@SettingsCCompilerFlags@|& -Qunused-arguments|' ${BOOT_DIR}/settings.in
+.endif
+.endif
 
 post-install-script:
 	@${FIND} -ds ${GHC_LIBDIR} -type f -print | ${SED} -E -e \
@@ -229,11 +252,11 @@
 		's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
 .if ${PORT_OPTIONS:MDOCS}
 	# Cleanup the indexen created by gen_contents_index
-	@${ECHO} "@unexec ${RM} -f %D/${DOCSDIR_REL}/html/libraries/doc-index-*.html" >> ${TMPPLIST}
-	@${ECHO} "@unexec ${RM} -f %D/${DOCSDIR_REL}/html/libraries/index*.html" >> ${TMPPLIST}
-	@${ECHO} "@unexec ${RM} -f %D/${DOCSDIR_REL}/html/libraries/*.png" >> ${TMPPLIST}
+	@${ECHO} "@unexec ${RM} %D/${DOCSDIR_REL}/html/libraries/doc-index-*.html" >> ${TMPPLIST}
+	@${ECHO} "@unexec ${RM} %D/${DOCSDIR_REL}/html/libraries/index*.html" >> ${TMPPLIST}
+	@${ECHO} "@unexec ${RM} %D/${DOCSDIR_REL}/html/libraries/*.png" >> ${TMPPLIST}
 .endif
-	@${ECHO} '@unexec ${RM} -f %D/${GHC_LIBDIR_REL}/package.conf.d/package.cache' >>${TMPPLIST}
+	@${ECHO} '@unexec ${RM} %D/${GHC_LIBDIR_REL}/package.conf.d/package.cache' >>${TMPPLIST}
 	@${ECHO} "@exec %D/bin/ghc-pkg recache" >>${TMPPLIST}
 .if ${PORT_OPTIONS:MDOCS}
 	@${ECHO} '@exec ${SH} -c "cd %D/${DOCSDIR_REL}/html/libraries && ./gen_contents_index"' >> ${TMPPLIST}
@@ -242,7 +265,6 @@
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|; \
 		s|%%AR%%|${AR}|; \
-		s|%%RANLIB%%|${RANLIB}|; \
 		s|%%LD%%|${LD}|' \
 		${WRKSRC}/libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs
 
@@ -249,13 +271,10 @@
 pre-configure:
 	@${MKDIR} ${TMPDIR}
 .if empty(PORT_OPTIONS:MBOOT)
-	@(cd ${BOOT_DIR} && ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS_BOOT})
+	@(cd ${BOOT_DIR} && ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS_BOOT})
 	@(cd ${BOOT_DIR} && PACKAGES='' ${MAKE_CMD} install)
 .endif
 
-# Defining with documentation:
-# Defining "SLAVE" in devel/hs-haddock and print/hs-hscolour flips the building process
-# functionally to this port.
 .if ${PORT_OPTIONS:MDOCS} && empty(PORT_OPTIONS:MBOOTH)
 	@${ECHO_MSG} -e "\a"
 	@${ECHO_MSG} "======================================================================"
@@ -279,11 +298,11 @@
 .endif
 
 post-install:
-	@${RM} -f ${STAGEDIR}${PREFIX}/bin/haddock
+	@${RM} ${STAGEDIR}${PREFIX}/bin/haddock
 .if ${PORT_OPTIONS:MDOCS}
 	@${LN} -sf haddock-ghc-${GHC_VERSION} ${STAGEDIR}${PREFIX}/bin/haddock
 .endif
-	@(for f in ${STAGEDIR}${PREFIX}/bin/hp2ps ${GHC_LIBDIR}/unlit ${GHC_LIBDIR}/mkGmpDerivedConstants \
+	@(for f in ${STAGEDIR}${PREFIX}/bin/hp2ps ${GHC_LIBDIR}/unlit \
 	    $$(${FIND} ${GHC_LIBDIR}/bin -type f; ${FIND} ${GHC_LIBDIR} -name '*.so'); do \
 	    ${STRIP_CMD} $$f; done)
 

Modified: trunk/lang/ghc/distinfo
===================================================================
--- trunk/lang/ghc/distinfo	2018-05-05 21:38:32 UTC (rev 23374)
+++ trunk/lang/ghc/distinfo	2018-05-05 21:42:27 UTC (rev 23375)
@@ -1,16 +1,8 @@
-SHA256 (ghc-7.8.3-src.tar.bz2) = 2358826f8424bf571dcc313bd882422fe108a340d6e37db4339ff6d5d6ac3f37
-SIZE (ghc-7.8.3-src.tar.bz2) = 10696541
-SHA256 (hscolour-1.20.3.tar.gz) = 3adb816fba3ecdf9f1ee5fb23feb0611b0762f7e8c2a282c2def5cc2f5483d96
-SIZE (hscolour-1.20.3.tar.gz) = 25810
-SHA256 (ghc-7.6.3-i386-freebsd8-boot.tar.bz2) = efdb68255cdcdeabbec1031a44f631cf8d0a619f9687b09d5a00230d3b871148
-SIZE (ghc-7.6.3-i386-freebsd8-boot.tar.bz2) = 55495926
-SHA256 (ghc-7.6.3-amd64-freebsd8-boot.tar.bz2) = 15ab9262d0f7ba213431b73e1a21318d5a420fb298b3f7cb28da1c8562241dcd
-SIZE (ghc-7.6.3-amd64-freebsd8-boot.tar.bz2) = 55410502
-SHA256 (ghc-7.6.3-i386-freebsd9-boot.tar.bz2) = 2a10cc8aa24282612c1ba9a8dd2234192bef2f307fd70fa209b32bb97a1d73a2
-SIZE (ghc-7.6.3-i386-freebsd9-boot.tar.bz2) = 55500650
-SHA256 (ghc-7.6.3-amd64-freebsd9-boot.tar.bz2) = a0e21b166c94994a22005d0bb15822d16c10e79856f57b500466e23d8f5c13a6
-SIZE (ghc-7.6.3-amd64-freebsd9-boot.tar.bz2) = 55418614
-SHA256 (ghc-7.6.3-i386-freebsd10-boot.tar.bz2) = 4ab59ac9642641d612fdb636e544248ee2e74834bafe1d29ef556215ea097409
-SIZE (ghc-7.6.3-i386-freebsd10-boot.tar.bz2) = 55512004
-SHA256 (ghc-7.6.3-amd64-freebsd10-boot.tar.bz2) = 8ce856cbd5b9fa230d17bc3d28b96206d84dce4aa3c1c9c7016262ff132271ad
-SIZE (ghc-7.6.3-amd64-freebsd10-boot.tar.bz2) = 55418435
+SHA256 (ghc-7.10.2-src.tar.xz) = 54cd73755b784d78e2f13d5eb161bfa38d3efee9e8a56f7eb6cd9f2d6e2615f5
+SIZE (ghc-7.10.2-src.tar.xz) = 11113204
+SHA256 (hscolour-1.23.tar.gz) = 97167eaecc309eff51317d6e925881bc9f27921bd52692121f0fc5aaee1791b0
+SIZE (hscolour-1.23.tar.gz) = 26027
+SHA256 (ghc-7.10.2-boot-i386-freebsd.tar.xz) = 5cadd55316fe6c1bf275d0f44f10b46342096922a15ecb9fb78c80fc293f901a
+SIZE (ghc-7.10.2-boot-i386-freebsd.tar.xz) = 39858716
+SHA256 (ghc-7.10.2-boot-amd64-freebsd.tar.xz) = 4af0ee0795537baa11a96fba23477f8390ccb5f45910cda119d0a16bdebaedc8
+SIZE (ghc-7.10.2-boot-amd64-freebsd.tar.xz) = 49833224

Modified: trunk/lang/ghc/files/patch-aclocal.m4
===================================================================
--- trunk/lang/ghc/files/patch-aclocal.m4	2018-05-05 21:38:32 UTC (rev 23374)
+++ trunk/lang/ghc/files/patch-aclocal.m4	2018-05-05 21:42:27 UTC (rev 23375)
@@ -1,20 +1,39 @@
---- ./aclocal.m4.orig	2014-07-10 06:27:16.000000000 +0200
-+++ ./aclocal.m4	2014-07-11 11:23:41.000000000 +0200
-@@ -47,6 +47,8 @@
-     # In bindists, we haven't called AC_CANONICAL_{BUILD,HOST,TARGET}
-     # so this justs uses $bootstrap_target.
+--- aclocal.m4.orig	2015-07-21 13:52:50 UTC
++++ aclocal.m4
+@@ -1718,36 +1718,6 @@ int main(int argc, char *argv[])
+     }
+     alarm(1);
  
-+    bootstrap_target=`echo "$bootstrap_target" | sed -e 's/-unknown-/-portbld-/g'`
-+
-     if test "$build_alias" = ""
-     then
-         if test "$bootstrap_target" != ""
-@@ -1817,7 +1819,7 @@
-     dnl If special linker flags are needed to build things, then allow
-     dnl the user to pass them in via LDFLAGS.
-     changequote(, )dnl
--    GHC_LDFLAGS=`echo $LDFLAGS | sed 's/\(^\| \)\([^ ]\)/\1-optl\2/g'`
-+    GHC_LDFLAGS=`echo $LDFLAGS | sed -r 's/(^| )([^ ])/\1-optl\2/g'`
-     changequote([, ])dnl
-     if ! "$WithGhc" $GHC_LDFLAGS -v0 -no-user-$GHC_PACKAGE_DB_FLAG -hidir utils/ghc-pwd/dist-boot -odir utils/ghc-pwd/dist-boot -stubdir utils/ghc-pwd/dist-boot --make utils/ghc-pwd/Main.hs -o utils/ghc-pwd/dist-boot/ghc-pwd
-     then
+-    if (timer_create(CLOCK_PROCESS_CPUTIME_ID, &ev, &timer) != 0) {
+-        fprintf(stderr,"No CLOCK_PROCESS_CPUTIME_ID timer\n");
+-       exit(1);
+-    }
+-
+-    it.it_value.tv_sec = 0;
+-    it.it_value.tv_nsec = 1;
+-    it.it_interval = it.it_value;
+-    if (timer_settime(timer, 0, &it, NULL) != 0) {
+-        fprintf(stderr,"settime problem\n");
+-        exit(4);
+-    }
+-
+-    tock = 0;
+-
+-    for(n = 3; n < 20000; n++){
+-        for(m = 2; m <= n/2; m++){
+-            if (!(n%m)) count++;
+-            if (tock) goto out;
+-        }
+-    }
+-out:
+-
+-    if (!tock) {
+-        fprintf(stderr,"no CLOCK_PROCESS_CPUTIME_ID signal\n");
+-        exit(5);
+-    }
+-
+-    timer_delete(timer);
+-
+     if (timer_create(CLOCK_REALTIME, &ev, &timer) != 0) {
+         fprintf(stderr,"No CLOCK_REALTIME timer\n");
+         exit(2);

Modified: trunk/lang/ghc/files/patch-configure.ac
===================================================================
--- trunk/lang/ghc/files/patch-configure.ac	2018-05-05 21:38:32 UTC (rev 23374)
+++ trunk/lang/ghc/files/patch-configure.ac	2018-05-05 21:42:27 UTC (rev 23375)
@@ -1,6 +1,6 @@
---- ./configure.ac.orig	2014-07-10 07:04:42.000000000 +0200
-+++ ./configure.ac	2014-07-11 10:27:40.000000000 +0200
-@@ -435,6 +435,9 @@
+--- configure.ac.orig	2015-07-21 19:50:11 UTC
++++ configure.ac
+@@ -383,6 +383,9 @@ AC_SUBST([SplitObjsBroken])
  dnl ** Building a cross compiler?
  dnl --------------------------------------------------------------
  CrossCompiling=NO
@@ -10,11 +10,3 @@
  # If 'host' and 'target' differ, then this means we are building a cross-compiler.
  if test "$target" != "$host" ; then
      CrossCompiling=YES
-@@ -914,7 +917,6 @@
- FP_VISIBILITY_HIDDEN
- 
- dnl ** check for librt
--AC_CHECK_LIB(rt, clock_gettime)
- AC_CHECK_FUNCS(clock_gettime timer_settime)
- FP_CHECK_TIMER_CREATE
- 

Added: trunk/lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs
===================================================================
--- trunk/lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs	                        (rev 0)
+++ trunk/lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs	2018-05-05 21:42:27 UTC (rev 23375)
@@ -0,0 +1,11 @@
+--- libraries/Cabal/Cabal/Distribution/Simple/GHC.hs.orig	2015-04-01 00:24:45 UTC
++++ libraries/Cabal/Cabal/Distribution/Simple/GHC.hs
+@@ -875,7 +875,7 @@ getRPaths lbi clbi | supportRPaths hostO
+     supportRPaths Linux       = True
+     supportRPaths Windows     = False
+     supportRPaths OSX         = True
+-    supportRPaths FreeBSD     = False
++    supportRPaths FreeBSD     = True
+     supportRPaths OpenBSD     = False
+     supportRPaths NetBSD      = False
+     supportRPaths DragonFly   = False


Property changes on: trunk/lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
===================================================================
--- trunk/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs	2018-05-05 21:38:32 UTC (rev 23374)
+++ trunk/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs	2018-05-05 21:42:27 UTC (rev 23375)
@@ -1,6 +1,6 @@
---- ./libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs.orig	2014-07-10 06:34:21.000000000 +0200
-+++ ./libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs	2014-07-26 23:57:20.869626927 +0200
-@@ -198,13 +198,18 @@
+--- libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs.orig	2015-06-19 10:36:50 UTC
++++ libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs
+@@ -261,10 +261,13 @@ alexProgram = (simpleProgram "alex") {
  gccProgram :: Program
  gccProgram = (simpleProgram "gcc") {
      programFindVersion = findProgramVersion "-dumpversion" id
@@ -7,12 +7,6 @@
 +  , programFindLocation = \v p -> findProgramOnSearchPath v p "%%CC%%"
    }
  
- ranlibProgram :: Program
--ranlibProgram = simpleProgram "ranlib"
-+ranlibProgram = (simpleProgram "ranlib") {
-+    programFindLocation = \_v _p -> return (Just "%%RANLIB%%")
-+  }
- 
  arProgram :: Program
 -arProgram = simpleProgram "ar"
 +arProgram = (simpleProgram "ar") {
@@ -20,8 +14,8 @@
 +  }
  
  stripProgram :: Program
- stripProgram = simpleProgram "strip"
-@@ -257,7 +262,9 @@
+ stripProgram = (simpleProgram "strip") {
+@@ -336,7 +339,9 @@ greencardProgram :: Program
  greencardProgram = simpleProgram "greencard"
  
  ldProgram :: Program
@@ -31,4 +25,4 @@
 +  }
  
  tarProgram :: Program
- tarProgram = simpleProgram "tar"
+ tarProgram = (simpleProgram "tar") {

Modified: trunk/lang/ghc/pkg-plist
===================================================================
--- trunk/lang/ghc/pkg-plist	2018-05-05 21:38:32 UTC (rev 23374)
+++ trunk/lang/ghc/pkg-plist	2018-05-05 21:42:27 UTC (rev 23375)
@@ -14,15 +14,3 @@
 %%PORTDOCS%%man/man1/ghc.1.gz
 @exec /bin/ln -sf %D/bin/haddock-ghc-%%GHC_VERSION%% %D/bin/haddock || return true
 @unexec /bin/rm -f %D/bin/haddock || return true
- at exec /bin/mkdir -p %D/lib/cabal/ghc-%%GHC_VERSION%%             || return true
- at exec /bin/mkdir -p %D/share/cabal/ghc-%%GHC_VERSION%%           || return true
- at exec /bin/mkdir -p %D/share/doc/cabal/ghc-%%GHC_VERSION%%       || return true
- at exec /bin/mkdir -p %D/share/examples/cabal/ghc-%%GHC_VERSION%%  || return true
- at dirrmtry lib/cabal/ghc-%%GHC_VERSION%%
- at dirrmtry lib/cabal
- at dirrmtry share/cabal/ghc-%%GHC_VERSION%%
- at dirrmtry share/cabal
- at dirrmtry share/doc/cabal/ghc-%%GHC_VERSION%%
- at dirrmtry share/doc/cabal
- at dirrmtry share/examples/cabal/ghc-%%GHC_VERSION%%
- at dirrmtry share/examples/cabal

More information about the Midnightbsd-cvs mailing list