pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/ghc7 works with builtin curses (with NetBSD-6).
details: https://anonhg.NetBSD.org/pkgsrc/rev/02ec0bfafbb7
branches: trunk
changeset: 629874:02ec0bfafbb7
user: obache <obache%pkgsrc.org@localhost>
date: Thu Jan 30 07:57:35 2014 +0000
description:
works with builtin curses (with NetBSD-6).
Bump PKGREVISION.
diffstat:
lang/ghc7/Makefile | 12 +++++-------
lang/ghc7/bootstrap.mk | 4 ++--
lang/ghc7/buildlink3.mk | 4 ++--
lang/ghc7/files/bootstrap.build.mk | 4 ++--
4 files changed, 11 insertions(+), 13 deletions(-)
diffs (89 lines):
diff -r a8d8b26d4564 -r 02ec0bfafbb7 lang/ghc7/Makefile
--- a/lang/ghc7/Makefile Thu Jan 30 04:55:57 2014 +0000
+++ b/lang/ghc7/Makefile Thu Jan 30 07:57:35 2014 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2013/12/17 01:08:30 obache Exp $
+# $NetBSD: Makefile,v 1.5 2014/01/30 07:57:35 obache Exp $
# -----------------------------------------------------------------------------
# Package metadata
#
DISTNAME= ghc-${VERSION}
VERSION= 7.6.3
+PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= http://www.haskell.org/ghc/dist/${VERSION}/
MAINTAINER= pho%cielonegro.org@localhost
@@ -104,8 +105,8 @@
# in a non-standard path. Without that, the resulting GHC tries to
# link programs by executing ld(1) without passing it -L${PREFIX:Q}/lib.
${RUN} ${ECHO} "libraries/terminfo_CONFIGURE_OPTS += \
- --configure-option=--with-curses-includes=${BUILDLINK_PREFIX.ncurses:Q}/include \
- --configure-option=--with-curses-libraries=${BUILDLINK_PREFIX.ncurses:Q}/lib" >> ${WRKSRC:Q}/mk/build.mk
+ --configure-option=--with-curses-includes=${BUILDLINK_PREFIX.curses:Q}/include \
+ --configure-option=--with-curses-libraries=${BUILDLINK_PREFIX.curses:Q}/lib" >> ${WRKSRC:Q}/mk/build.mk
# The ghc compiler does normally split the generated asm files into small
# parts before sending them to gcc, to enable the linker to eliminate
@@ -178,14 +179,11 @@
# Dependencies
#
-# I guess pdcurses works well but not tested.
-USE_NCURSES= yes
-
BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gmp/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r a8d8b26d4564 -r 02ec0bfafbb7 lang/ghc7/bootstrap.mk
--- a/lang/ghc7/bootstrap.mk Thu Jan 30 04:55:57 2014 +0000
+++ b/lang/ghc7/bootstrap.mk Thu Jan 30 07:57:35 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.2 2013/12/16 06:23:09 obache Exp $
+# $NetBSD: bootstrap.mk,v 1.3 2014/01/30 07:57:35 obache Exp $
# -----------------------------------------------------------------------------
# Select a bindist of bootstrapping compiler based on a per-platform
# basis.
@@ -123,7 +123,7 @@
CONF_GCC_LINKER_OPTS_STAGE2="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib" \
CONF_LD_LINKER_OPTS_STAGE2="-L${PREFIX}/lib ${LINKER_RPATH_FLAG}${PREFIX}/lib" \
${SH} ./configure && \
- ${SED} -e "s,@NCURSES_PREFIX@,${BUILDLINK_PREFIX.ncurses:Q},g" /${FILESDIR:Q}/bootstrap.build.mk > mk/build.mk
+ ${SED} -e "s,@CURSES_PREFIX@,${BUILDLINK_PREFIX.curses:Q},g" /${FILESDIR:Q}/bootstrap.build.mk > mk/build.mk
${TOUCH} ${.TARGET}
${WRKDIR}/stamp-build-boot: ${WRKDIR}/stamp-configure-boot
diff -r a8d8b26d4564 -r 02ec0bfafbb7 lang/ghc7/buildlink3.mk
--- a/lang/ghc7/buildlink3.mk Thu Jan 30 04:55:57 2014 +0000
+++ b/lang/ghc7/buildlink3.mk Thu Jan 30 07:57:35 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2013/12/12 12:47:17 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2014/01/30 07:57:35 obache Exp $
BUILDLINK_TREE+= ghc
@@ -10,7 +10,7 @@
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gmp/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/curses/buildlink3.mk"
.endif # GHC_BUILDLINK3_MK
BUILDLINK_TREE+= -ghc
diff -r a8d8b26d4564 -r 02ec0bfafbb7 lang/ghc7/files/bootstrap.build.mk
--- a/lang/ghc7/files/bootstrap.build.mk Thu Jan 30 04:55:57 2014 +0000
+++ b/lang/ghc7/files/bootstrap.build.mk Thu Jan 30 07:57:35 2014 +0000
@@ -31,5 +31,5 @@
BIN_DIST_NAME = ghc-$(ProjectVersion)-boot
libraries/terminfo_CONFIGURE_OPTS += \
- --configure-option=--with-curses-includes=@NCURSES_PREFIX@/include \
- --configure-option=--with-curses-libraries=@NCURSES_PREFIX@/lib
+ --configure-option=--with-curses-includes=@CURSES_PREFIX@/include \
+ --configure-option=--with-curses-libraries=@CURSES_PREFIX@/lib
Home |
Main Index |
Thread Index |
Old Index