svn commit: r309584 - in head: devel/hs-terminfo lang/ghc

[Gabor Pali]

Author: pgj
Date: Fri Dec 28 20:05:44 2012
New Revision: 309584
URL: http://svnweb.freebsd.org/changeset/ports/309584

Log:
  - Make dependency on base-system ncurses explicit -- this fixes potential
    build errors when devel/ncurses is also installed
  
  PR:		ports/174703
  Reported by:	Finn <bash.org at gmail.com>
  Obtained from:	FreeBSD Haskell

Modified:
  head/devel/hs-terminfo/Makefile
  head/lang/ghc/Makefile

Modified: head/devel/hs-terminfo/Makefile
==============================================================================
--- head/devel/hs-terminfo/Makefile	Fri Dec 28 19:59:17 2012	(r309583)
+++ head/devel/hs-terminfo/Makefile	Fri Dec 28 20:05:44 2012	(r309584)
@@ -9,5 +9,8 @@ COMMENT=	Haskell bindings to the terminf
 
 LICENSE=	BSD
 
+CONFIGURE_ARGS+=	--configure-option=--with-curses-includes=/usr/include \
+			--configure-option=--with-curses-libraries=/usr/lib
+
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>

Modified: head/lang/ghc/Makefile
==============================================================================
--- head/lang/ghc/Makefile	Fri Dec 28 19:59:17 2012	(r309583)
+++ head/lang/ghc/Makefile	Fri Dec 28 20:05:44 2012	(r309584)
@@ -201,12 +201,13 @@ post-extract:
 .else
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "BSD_PATH_TO_HSC2HS = ${BOOT_HSC2HS}"
 .endif
-	@${ECHO} >> ${WRKSRC}/mk/build.mk "SRC_HC_OPTS += -I${LOCALBASE}/include -L${LOCALBASE}/lib"
+	@${ECHO} >> ${WRKSRC}/mk/build.mk "SRC_HC_OPTS += -I/usr/include -L/usr/lib -I${LOCALBASE}/include -L${LOCALBASE}/lib"
 	@${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"
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "EXTRA_CABAL_CONFIGURE_FLAGS += --extra-include-dirs=${LOCALBASE}/include"
 	@${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=/usr/include --configure-option=--with-curses-libraries=/usr/lib"
 #	@${ECHO} >> ${WRKSRC}/mk/build.mk "BIN_DIST_NAME = ghc-\$$(ProjectVersion)-boot"
 #	@${ECHO} >> ${WRKSRC}/mk/build.mk "BIN_DIST_TAR  = ghc-\$$(ProjectVersion)-amd64-ash0-freebsd8-boot.tar"