From 10f5251cfe656e3ce1bde19507f1c80a58dcbd8f Mon Sep 17 00:00:00 2001 From: Oliver Braun Date: Wed, 21 Aug 2002 15:28:54 +0000 Subject: [PATCH] Change MAINTAINER to my FreeBSD address. Do not allow building with ghc-5.04 due to errors. Add patch to fix build on bento. PR: ports/40828 Approved by: dwcjr (mentor) --- devel/hat/Makefile | 15 ++++++++++++--- devel/hat/files/patch-script::harch | 13 +++++++++++++ devel/hs-hat/Makefile | 15 ++++++++++++--- devel/hs-hat/files/patch-script::harch | 13 +++++++++++++ 4 files changed, 50 insertions(+), 6 deletions(-) create mode 100644 devel/hat/files/patch-script::harch create mode 100644 devel/hs-hat/files/patch-script::harch diff --git a/devel/hat/Makefile b/devel/hat/Makefile index 140c6477ee27..204daf5bb5b5 100644 --- a/devel/hat/Makefile +++ b/devel/hat/Makefile @@ -10,7 +10,15 @@ PORTVERSION= 2.00 CATEGORIES= devel MASTER_SITES= ftp://ftp.cs.york.ac.uk/pub/haskell/${PORTNAME}/ -MAINTAINER= obraun@informatik.unibw-muenchen.de +MAINTAINER= obraun@FreeBSD.org + +.if defined(WITHOUT_NHC98) +FORBIDDEN= does not build with ghc-5.04 for the time being +.endif + +.if defined(WITH_GHC) +.undef WITH_GHC +.endif .if !defined(WITHOUT_NHC98) BUILD_DEPENDS= nhc98:${PORTSDIR}/lang/nhc98 @@ -63,8 +71,9 @@ pre-everything:: @${ECHO_CMD} " HAT will be built and installed for ghc only." .else @${ECHO_CMD} " HAT will be built and installed for nhc98 only." - @${ECHO_CMD} " Define WITH_GHC to install for ghc, too." - @${ECHO_CMD} " Define WITHOUT_NHC98 to install for ghc only." +# @${ECHO_CMD} " Define WITH_GHC to install for ghc, too." +# @${ECHO_CMD} " Define WITHOUT_NHC98 to install for ghc only." + @${ECHO_CMD} " HAT does not build with ghc-5.04 for the time being." .endif @${ECHO_CMD} "" diff --git a/devel/hat/files/patch-script::harch b/devel/hat/files/patch-script::harch new file mode 100644 index 000000000000..df33c71c6959 --- /dev/null +++ b/devel/hat/files/patch-script::harch @@ -0,0 +1,13 @@ +--- script/harch.orig Mon May 27 10:30:55 2002 ++++ script/harch Mon May 27 10:31:11 2002 +@@ -13,8 +13,8 @@ + + if uname >/dev/null 2>&1 + then +- if uname -p >/dev/null 2>&1 +- then PROCESSOR=`uname -p` ++ if uname -m >/dev/null 2>&1 ++ then PROCESSOR=`uname -m` + case "$PROCESSOR" in + unknown|*\ *) + PROCESSOR=`uname -m` diff --git a/devel/hs-hat/Makefile b/devel/hs-hat/Makefile index 140c6477ee27..204daf5bb5b5 100644 --- a/devel/hs-hat/Makefile +++ b/devel/hs-hat/Makefile @@ -10,7 +10,15 @@ PORTVERSION= 2.00 CATEGORIES= devel MASTER_SITES= ftp://ftp.cs.york.ac.uk/pub/haskell/${PORTNAME}/ -MAINTAINER= obraun@informatik.unibw-muenchen.de +MAINTAINER= obraun@FreeBSD.org + +.if defined(WITHOUT_NHC98) +FORBIDDEN= does not build with ghc-5.04 for the time being +.endif + +.if defined(WITH_GHC) +.undef WITH_GHC +.endif .if !defined(WITHOUT_NHC98) BUILD_DEPENDS= nhc98:${PORTSDIR}/lang/nhc98 @@ -63,8 +71,9 @@ pre-everything:: @${ECHO_CMD} " HAT will be built and installed for ghc only." .else @${ECHO_CMD} " HAT will be built and installed for nhc98 only." - @${ECHO_CMD} " Define WITH_GHC to install for ghc, too." - @${ECHO_CMD} " Define WITHOUT_NHC98 to install for ghc only." +# @${ECHO_CMD} " Define WITH_GHC to install for ghc, too." +# @${ECHO_CMD} " Define WITHOUT_NHC98 to install for ghc only." + @${ECHO_CMD} " HAT does not build with ghc-5.04 for the time being." .endif @${ECHO_CMD} "" diff --git a/devel/hs-hat/files/patch-script::harch b/devel/hs-hat/files/patch-script::harch new file mode 100644 index 000000000000..df33c71c6959 --- /dev/null +++ b/devel/hs-hat/files/patch-script::harch @@ -0,0 +1,13 @@ +--- script/harch.orig Mon May 27 10:30:55 2002 ++++ script/harch Mon May 27 10:31:11 2002 +@@ -13,8 +13,8 @@ + + if uname >/dev/null 2>&1 + then +- if uname -p >/dev/null 2>&1 +- then PROCESSOR=`uname -p` ++ if uname -m >/dev/null 2>&1 ++ then PROCESSOR=`uname -m` + case "$PROCESSOR" in + unknown|*\ *) + PROCESSOR=`uname -m`