From owner-freebsd-ports Wed Jul 10 4:10:29 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5465037B401 for ; Wed, 10 Jul 2002 04:10:05 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 36A3843E58 for ; Wed, 10 Jul 2002 04:10:03 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6ABA3JU032631 for ; Wed, 10 Jul 2002 04:10:03 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6ABA2xP032630; Wed, 10 Jul 2002 04:10:02 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E491437B400 for ; Wed, 10 Jul 2002 04:02:32 -0700 (PDT) Received: from gatesrv.RZ.UniBw-Muenchen.de (gatesrv.RZ.UniBw-Muenchen.de [137.193.11.27]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0432E43E52 for ; Wed, 10 Jul 2002 04:02:32 -0700 (PDT) (envelope-from lizard@informatik.unibw-muenchen.de) Received: from nemesis.informatik.unibw-muenchen.de (nemesis.Informatik.UniBw-Muenchen.de [137.193.60.30]) by gatesrv.RZ.UniBw-Muenchen.de (8.11.2/8.11.2) with ESMTP id g6AAwRT19675 for ; Wed, 10 Jul 2002 12:58:28 +0200 (MEST) Received: from localhost (localhost.informatik.unibw-muenchen.de [127.0.0.1]) by nemesis.informatik.unibw-muenchen.de (Postfix) with ESMTP id F126F5A545 for ; Wed, 10 Jul 2002 12:58:26 +0200 (CEST) Received: by nemesis.informatik.unibw-muenchen.de (Postfix, from userid 1001) id 60A8C5A549; Wed, 10 Jul 2002 12:58:26 +0200 (CEST) Message-Id: <20020710105826.60A8C5A549@nemesis.informatik.unibw-muenchen.de> Date: Wed, 10 Jul 2002 12:58:26 +0200 (CEST) From: Oliver Braun To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/40410: [MAINTAINER UPDATE] Update port: devel/hat Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 40410 >Category: ports >Synopsis: [MAINTAINER UPDATE] Update port: devel/hat >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Jul 10 04:10:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Oliver Braun >Release: FreeBSD 4.6-STABLE i386 >Organization: >Environment: System: FreeBSD nemesis.informatik.unibw-muenchen.de 4.6-STABLE FreeBSD 4.6-STABLE #0: Thu Jul 4 15:04:42 CEST 2002 root@nemesis.informatik.unibw-muenchen.de:/usr/obj/usr/src/sys/NEMESIS_OB i386 >Description: After upgrading devel/hmake to 3.05, which was committed yesterday, it is now possible to build and install devel/hat only for ghc. This update introduces the knob WITHOUT_NHC98. Regards, Olli >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/devel/hat/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- Makefile 8 Jul 2002 19:35:18 -0000 1.13 +++ Makefile 10 Jul 2002 10:51:47 -0000 @@ -12,8 +12,13 @@ MAINTAINER= obraun@informatik.unibw-muenchen.de +.if !defined(WITHOUT_NHC98) BUILD_DEPENDS= nhc98:${PORTSDIR}/lang/nhc98 RUN_DEPENDS= nhc98:${PORTSDIR}/lang/nhc98 +.else +WITH_GHC= yes +BUILD_DEPENDS+= hmake:${PORTSDIR}/devel/hmake +.endif .if defined(WITH_GHC) BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc @@ -23,15 +28,26 @@ HAS_CONFIGURE= yes USE_REINPLACE= yes USE_GLIB= yes +.if !defined(WITH_GHC) || defined(WITHOUT_NHC98) +ALL_TARGET= hat +.endif +.if !defined(WITHOUT_NHC98) +PLIST_SUB+= NHC98="" +.else +PLIST_SUB+= NHC98="@comment " +.endif .if defined(WITH_GHC) -PLIST_SUB= GHC="" +PLIST_SUB+= GHC="" .else -ALL_TARGET= hat -PLIST_SUB= GHC="@comment " +PLIST_SUB+= GHC="@comment " .endif -CONFIGURE_ARGS= --prefix=${PREFIX} -CONFIGURE_ARGS+= --buildwith=nhc98 --libdir=${PREFIX}/lib +CONFIGURE_ARGS= --prefix=${PREFIX} --libdir=${PREFIX}/lib +.if !defined(WITHOUT_NHC98) +CONFIGURE_ARGS+= --buildwith=nhc98 +.else +CONFIGURE_ARGS+= --buildwith=ghc +.endif .if !defined(NOPORTDOCS) CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc +docs .endif @@ -40,11 +56,14 @@ pre-everything:: @${ECHO_CMD} "" -.if defined(WITH_GHC) - @${ECHO_CMD} " HAT will build and install for both nhc98 and ghc." +.if defined(WITH_GHC) && !defined(WITHOUT_NHC98) + @${ECHO_CMD} " HAT will be built and installed for both nhc98 and ghc." +.elif defined(WITHOUT_NHC98) + @${ECHO_CMD} " HAT will be built and installed for ghc only." .else - @${ECHO_CMD} " HAT will build and install for nhc98 only." - @${ECHO_CMD} " Define WITH_GHC to install for ghc, too." + @${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." .endif @${ECHO_CMD} "" Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/devel/hat/pkg-plist,v retrieving revision 1.5 diff -u -r1.5 pkg-plist --- pkg-plist 8 Jul 2002 19:35:18 -0000 1.5 +++ pkg-plist 10 Jul 2002 10:51:47 -0000 @@ -35,69 +35,69 @@ include/hat/Time.hx include/hat/TimeBuiltin.hx include/hat/TimeBuiltinTypes.hx -include/nhc98/hat/Hat.hi -include/nhc98/hat/TArray.hi -include/nhc98/hat/TCPUTime.hi -include/nhc98/hat/TChar.hi -include/nhc98/hat/TComplex.hi -include/nhc98/hat/TDirectory.hi -include/nhc98/hat/TDirectoryBuiltin.hi -include/nhc98/hat/TDirectoryBuiltinTypes.hi -include/nhc98/hat/TIO.hi -include/nhc98/hat/TIOBuiltin.hi -include/nhc98/hat/TIOBuiltinTypes.hi -include/nhc98/hat/TIx.hi -include/nhc98/hat/TList.hi -include/nhc98/hat/TLocale.hi -include/nhc98/hat/TMaybe.hi -include/nhc98/hat/TMonad.hi -include/nhc98/hat/TNumeric.hi -include/nhc98/hat/TPrelude.hi -include/nhc98/hat/TPreludeBasic.hi -include/nhc98/hat/TPreludeBuiltin.hi -include/nhc98/hat/TPreludeBuiltinTypes.hi -include/nhc98/hat/TRandom.hi -include/nhc98/hat/TRandomBuiltin.hi -include/nhc98/hat/TRatio.hi -include/nhc98/hat/TSystem.hi -include/nhc98/hat/TSystemBuiltin.hi -include/nhc98/hat/TSystemBuiltinTypes.hi -include/nhc98/hat/TTime.hi -include/nhc98/hat/TTimeBuiltin.hi -include/nhc98/hat/TTimeBuiltinTypes.hi +%%NHC98%%include/nhc98/hat/Hat.hi +%%NHC98%%include/nhc98/hat/TArray.hi +%%NHC98%%include/nhc98/hat/TCPUTime.hi +%%NHC98%%include/nhc98/hat/TChar.hi +%%NHC98%%include/nhc98/hat/TComplex.hi +%%NHC98%%include/nhc98/hat/TDirectory.hi +%%NHC98%%include/nhc98/hat/TDirectoryBuiltin.hi +%%NHC98%%include/nhc98/hat/TDirectoryBuiltinTypes.hi +%%NHC98%%include/nhc98/hat/TIO.hi +%%NHC98%%include/nhc98/hat/TIOBuiltin.hi +%%NHC98%%include/nhc98/hat/TIOBuiltinTypes.hi +%%NHC98%%include/nhc98/hat/TIx.hi +%%NHC98%%include/nhc98/hat/TList.hi +%%NHC98%%include/nhc98/hat/TLocale.hi +%%NHC98%%include/nhc98/hat/TMaybe.hi +%%NHC98%%include/nhc98/hat/TMonad.hi +%%NHC98%%include/nhc98/hat/TNumeric.hi +%%NHC98%%include/nhc98/hat/TPrelude.hi +%%NHC98%%include/nhc98/hat/TPreludeBasic.hi +%%NHC98%%include/nhc98/hat/TPreludeBuiltin.hi +%%NHC98%%include/nhc98/hat/TPreludeBuiltinTypes.hi +%%NHC98%%include/nhc98/hat/TRandom.hi +%%NHC98%%include/nhc98/hat/TRandomBuiltin.hi +%%NHC98%%include/nhc98/hat/TRatio.hi +%%NHC98%%include/nhc98/hat/TSystem.hi +%%NHC98%%include/nhc98/hat/TSystemBuiltin.hi +%%NHC98%%include/nhc98/hat/TSystemBuiltinTypes.hi +%%NHC98%%include/nhc98/hat/TTime.hi +%%NHC98%%include/nhc98/hat/TTimeBuiltin.hi +%%NHC98%%include/nhc98/hat/TTimeBuiltinTypes.hi lib/ix86-FreeBSD/config lib/ix86-FreeBSD/hat-trans -lib/ix86-FreeBSD/hatlib/nhc98/libHShat.a -lib/ix86-FreeBSD/hatlib/nhc98/Hat.hi -lib/ix86-FreeBSD/hatlib/nhc98/TTimeBuiltin.hi -lib/ix86-FreeBSD/hatlib/nhc98/TTime.hi -lib/ix86-FreeBSD/hatlib/nhc98/TSystemBuiltinTypes.hi -lib/ix86-FreeBSD/hatlib/nhc98/TSystemBuiltin.hi -lib/ix86-FreeBSD/hatlib/nhc98/TSystem.hi -lib/ix86-FreeBSD/hatlib/nhc98/TRatio.hi -lib/ix86-FreeBSD/hatlib/nhc98/TRandomBuiltin.hi -lib/ix86-FreeBSD/hatlib/nhc98/TRandom.hi -lib/ix86-FreeBSD/hatlib/nhc98/TPreludeBuiltinTypes.hi -lib/ix86-FreeBSD/hatlib/nhc98/TPreludeBuiltin.hi -lib/ix86-FreeBSD/hatlib/nhc98/TPreludeBasic.hi -lib/ix86-FreeBSD/hatlib/nhc98/TPrelude.hi -lib/ix86-FreeBSD/hatlib/nhc98/TNumeric.hi -lib/ix86-FreeBSD/hatlib/nhc98/TMonad.hi -lib/ix86-FreeBSD/hatlib/nhc98/TMaybe.hi -lib/ix86-FreeBSD/hatlib/nhc98/TLocale.hi -lib/ix86-FreeBSD/hatlib/nhc98/TList.hi -lib/ix86-FreeBSD/hatlib/nhc98/TIx.hi -lib/ix86-FreeBSD/hatlib/nhc98/TIOBuiltinTypes.hi -lib/ix86-FreeBSD/hatlib/nhc98/TIOBuiltin.hi -lib/ix86-FreeBSD/hatlib/nhc98/TIO.hi -lib/ix86-FreeBSD/hatlib/nhc98/TDirectoryBuiltinTypes.hi -lib/ix86-FreeBSD/hatlib/nhc98/TDirectoryBuiltin.hi -lib/ix86-FreeBSD/hatlib/nhc98/TDirectory.hi -lib/ix86-FreeBSD/hatlib/nhc98/TComplex.hi -lib/ix86-FreeBSD/hatlib/nhc98/TChar.hi -lib/ix86-FreeBSD/hatlib/nhc98/TCPUTime.hi -lib/ix86-FreeBSD/hatlib/nhc98/TArray.hi -lib/ix86-FreeBSD/hatlib/nhc98/TTimeBuiltinTypes.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/libHShat.a +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/Hat.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TTimeBuiltin.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TTime.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TSystemBuiltinTypes.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TSystemBuiltin.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TSystem.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TRatio.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TRandomBuiltin.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TRandom.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TPreludeBuiltinTypes.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TPreludeBuiltin.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TPreludeBasic.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TPrelude.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TNumeric.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TMonad.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TMaybe.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TLocale.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TList.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TIx.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TIOBuiltinTypes.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TIOBuiltin.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TIO.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TDirectoryBuiltinTypes.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TDirectoryBuiltin.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TDirectory.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TComplex.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TChar.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TCPUTime.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TArray.hi +%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TTimeBuiltinTypes.hi %%GHC%%lib/ix86-FreeBSD/hatlib/ghc/Hat.hi %%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TArray.hi %%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TCPUTime.hi @@ -136,7 +136,7 @@ lib/ix86-FreeBSD/hat-view lib/ix86-FreeBSD/hat-trail lib/ix86-FreeBSD/hat-observe -lib/nhc98/ix86-FreeBSD/libHShat.a +%%NHC98%%lib/nhc98/ix86-FreeBSD/libHShat.a %%GHC%%lib/ghc-5.02.2/imports/hat/Hat.hi %%GHC%%lib/ghc-5.02.2/imports/hat/TArray.hi %%GHC%%lib/ghc-5.02.2/imports/hat/TCPUTime.hi @@ -216,8 +216,8 @@ %%PORTDOCS%%share/doc/hat/tutorial1.ps %%PORTDOCS%%share/doc/hat/tutorial1.tex @dirrm include/hat -@dirrm include/nhc98/hat -@dirrm lib/ix86-FreeBSD/hatlib/nhc98 +%%NHC98%%@dirrm include/nhc98/hat +%%NHC98%%@dirrm lib/ix86-FreeBSD/hatlib/nhc98 %%GHC%%@dirrm lib/ix86-FreeBSD/hatlib/ghc @dirrm lib/ix86-FreeBSD/hatlib %%PORTDOCS%%@dirrm share/doc/hat >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message