Date: Mon, 8 Jul 2002 23:15:54 +0200 (CEST) From: Oliver Braun <obraun@informatik.unibw-muenchen.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: mwest@uct.ac.za Subject: ports/40356: Update port: devel/hmake -> 3.05 Message-ID: <20020708211554.9D149F3@unsane.de>
next in thread | raw e-mail | index | archive | help
>Number: 40356
>Category: ports
>Synopsis: Update port: devel/hmake -> 3.05
>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 Jul 08 14:20:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Oliver Braun
>Release: FreeBSD 4.6-STABLE i386
>Organization:
>Environment:
System: FreeBSD galore.unsane.de 4.6-STABLE FreeBSD 4.6-STABLE #0: Thu Jul 4 18:08:29 CEST 2002 root@galore.unsane.de:/usr/obj/usr/src/sys/GALORE_OB i386
>Description:
[CC maintainer]
[This PR supersedes Problem Report ports/38604]
* update to 3.05
* 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.
Only diff to ports/38604 is PORTVERSION and distinfo.
Regards,
Olli
>How-To-Repeat:
>Fix:
diff -ruN /usr/ports/devel/hmake/Makefile hmake/Makefile
--- /usr/ports/devel/hmake/Makefile Fri May 17 11:32:00 2002
+++ hmake/Makefile Mon Jul 8 23:05:49 2002
@@ -6,7 +6,7 @@
#
PORTNAME= hmake
-PORTVERSION= 2.03
+PORTVERSION= 3.05
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>
diff -ruN /usr/ports/devel/hmake/distinfo hmake/distinfo
--- /usr/ports/devel/hmake/distinfo Sat Mar 30 12:38:21 2002
+++ hmake/distinfo Mon Jul 8 23:05:56 2002
@@ -1 +1 @@
-MD5 (hmake-2.03.tar.gz) = f875df33882478b1f26be703271f2864
+MD5 (hmake-3.05.tar.gz) = 99c53f39034b079a6d69f2118a33317c
diff -ruN /usr/ports/devel/hmake/files/patch-script::harch hmake/files/patch-script::harch
--- /usr/ports/devel/hmake/files/patch-script::harch Thu Jan 1 01:00:00 1970
+++ hmake/files/patch-script::harch Mon Jul 8 23:04:57 2002
@@ -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 -ruN /usr/ports/devel/hmake/pkg-plist hmake/pkg-plist
--- /usr/ports/devel/hmake/pkg-plist Sat Mar 30 12:38:21 2002
+++ hmake/pkg-plist Mon Jul 8 23:05:23 2002
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020708211554.9D149F3>