From lizard@informatik.unibw-muenchen.de  Mon May 27 03:10:37 2002
Return-Path: <lizard@informatik.unibw-muenchen.de>
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 <FreeBSD-gnats-submit@freebsd.org>; 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 <obraun@informatik.unibw-muenchen.de>
Reply-To: Oliver Braun <obraun@informatik.unibw-muenchen.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc: mwest@uct.ac.za
Subject: Update port: devel/hmake
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         38604
>Category:       ports
>Synopsis:       Update port: devel/hmake
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 27 03:20:01 PDT 2002
>Closed-Date:    Mon Jul 08 23:15:35 PDT 2002
>Last-Modified:  Mon Jul 08 23:15:35 PDT 2002
>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 <bsd.port.pre.mk>
+
 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 <bsd.port.mk>
+.include <bsd.port.post.mk>
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:

From: Matthew West <mwest@uct.ac.za>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Oliver Braun <obraun@informatik.unibw-muenchen.de>
Subject: Re: ports/38604: Update port: devel/hmake
Date: Wed, 5 Jun 2002 13:39:07 +0200

 On Mon, May 27, 2002 at 12:08:43PM +0200, Oliver Braun wrote:
 > Maintainer: If you agree with my patch, please approve it.
 
 Looks good to me.  Including the "patch-script::harch" file seperately
 instead of using diff's "-N" switch confused me initially though.
 
 Thanks!
 
 -- 
 mwest@uct.ac.za
 

From: Oliver Braun <obraun@informatik.unibw-muenchen.de>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/38604: Update port: devel/hmake
Date: Mon, 8 Jul 2002 23:26:43 +0200

 Please close this.
 
 It is superseded by PR ports/40356.
 
 Regards,
          Olli
 -- 
 IST & IIS _ INF _ UniBwM ___________ http://ist.unibw-muenchen.de/People/obraun/
 Tele-Consulting GmbH _______________ http://www.tele-consulting.com/ ___ obraun@
 FreeBSD: The Power To Serve ________ http://www.freebsd.org/ ___________________
State-Changed-From-To: open->closed 
State-Changed-By: ijliao 
State-Changed-When: Mon Jul 8 23:15:19 PDT 2002 
State-Changed-Why:  
superceded by pr/40356 

http://www.freebsd.org/cgi/query-pr.cgi?pr=38604 
>Unformatted:
