From owner-freebsd-ports Mon May 27 3:20:25 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E35A337B406 for ; Mon, 27 May 2002 03:20:01 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4RAK1v83766; Mon, 27 May 2002 03:20:01 -0700 (PDT) (envelope-from gnats) Received: from gatesrv.RZ.UniBw-Muenchen.de (gatesrv.RZ.UniBw-Muenchen.de [137.193.11.27]) by hub.freebsd.org (Postfix) with ESMTP id 5210A37B406 for ; Mon, 27 May 2002 03:10:35 -0700 (PDT) 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 g4RA8jN22498; Mon, 27 May 2002 12:08:47 +0200 (MEST) Received: from localhost (localhost.informatik.unibw-muenchen.de [127.0.0.1]) by nemesis.informatik.unibw-muenchen.de (Postfix) with ESMTP id E41185A547; Mon, 27 May 2002 12:08:44 +0200 (CEST) Received: by nemesis.informatik.unibw-muenchen.de (Postfix, from userid 1001) id 62B065A549; Mon, 27 May 2002 12:08:43 +0200 (CEST) Message-Id: <20020527100843.62B065A549@nemesis.informatik.unibw-muenchen.de> Date: Mon, 27 May 2002 12:08:43 +0200 (CEST) From: Oliver Braun Reply-To: Oliver Braun To: FreeBSD-gnats-submit@FreeBSD.org Cc: mwest@uct.ac.za X-Send-Pr-Version: 3.113 Subject: ports/38604: Update port: devel/hmake 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: 38604 >Category: ports >Synopsis: Update port: devel/hmake >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon May 27 03:20:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Oliver Braun >Release: FreeBSD 4.6-PRERELEASE i386 >Organization: >Environment: System: FreeBSD nemesis.informatik.unibw-muenchen.de 4.6-PRERELEASE FreeBSD 4.6-PRERELEASE #0: Thu May 2 11:59:09 CEST 2002 root@nemesis.informatik.unibw-muenchen.de:/usr/obj/usr/src/sys/NEMESIS_OB i386 >Description: [CC Maintainer] * update to 3.04 * added files/patch-script::harch (see below) to fix bentos problem (bento does not recognise `uname -p`) * remove BROKEN * do not install hmake if ${PREFIX}/bin/hmake exists, unless defined(OVERRIDE_HMAKE) Maintainer: If you agree with my patch, please approve it. Regards, Olli >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/devel/hmake/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- Makefile 17 May 2002 09:32:00 -0000 1.2 +++ Makefile 27 May 2002 10:02:57 -0000 @@ -6,7 +6,7 @@ # PORTNAME= hmake -PORTVERSION= 2.03 +PORTVERSION= 3.04 CATEGORIES= devel MASTER_SITES= ftp://ftp.cs.york.ac.uk/pub/haskell/hmake/ @@ -14,16 +14,27 @@ BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc -BROKEN= "Does not build" - HAS_CONFIGURE= YES CONFIGURE_ARGS+= --prefix=${PREFIX} USE_GMAKE= YES -# cheat a bit, otherwise LIBDIR gets clobbered +.include + do-install: +.if exists(${PREFIX}/bin/hmake) && !defined(OVERRIDE_HMAKE) + @${ECHO} "" + @${ECHO} "It seems that there is already a version of hmake installed on" + @${ECHO} "this system. Please deinstall it, or define OVERRIDE_HMAKE to" + @${ECHO} "override the installed version." + @${ECHO} "" + @${ECHO} "NOTE: hmake is part of nhc98" + @${ECHO} "" + @${FALSE} +.else +# cheat a bit, otherwise LIBDIR gets clobbered (cd ${WRKSRC} && ./configure --install) +.endif MAN1= hmake.1 -.include +.include Index: distinfo =================================================================== RCS file: /home/ncvs/ports/devel/hmake/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- distinfo 30 Mar 2002 11:38:21 -0000 1.1 +++ distinfo 27 May 2002 10:02:57 -0000 @@ -1 +1 @@ -MD5 (hmake-2.03.tar.gz) = f875df33882478b1f26be703271f2864 +MD5 (hmake-3.04.tar.gz) = e94709811eb004c0850fdca0e7f2721e Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/devel/hmake/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- pkg-plist 30 Mar 2002 11:38:21 -0000 1.1 +++ pkg-plist 27 May 2002 10:02:57 -0000 @@ -5,6 +5,7 @@ lib/hmake/ix86-FreeBSD/MkProg lib/hmake/ix86-FreeBSD/Older lib/hmake/ix86-FreeBSD/config -lib/hmake/ix86-FreeBSD/hmake.config +lib/hmake/ix86-FreeBSD/MkConfig +lib/hmake/ix86-FreeBSD/hmakerc @dirrm lib/hmake/ix86-FreeBSD @dirrm lib/hmake ****************************************************************************** * files/patch-script::harch ****************************************************************************** --- 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` >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message