diff options
| -rw-r--r-- | devel/hmake/Makefile | 21 | ||||
| -rw-r--r-- | devel/hmake/distinfo | 2 | ||||
| -rw-r--r-- | devel/hmake/pkg-plist | 3 | ||||
| -rw-r--r-- | devel/hs-hmake/Makefile | 21 | ||||
| -rw-r--r-- | devel/hs-hmake/distinfo | 2 | ||||
| -rw-r--r-- | devel/hs-hmake/pkg-plist | 3 |
6 files changed, 38 insertions, 14 deletions
diff --git a/devel/hmake/Makefile b/devel/hmake/Makefile index 5024f67f4f64..5cb590bbe61a 100644 --- a/devel/hmake/Makefile +++ b/devel/hmake/Makefile @@ -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 @@ MAINTAINER= mwest@uct.ac.za 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 --git a/devel/hmake/distinfo b/devel/hmake/distinfo index 2b58f9a70a86..685feb464056 100644 --- a/devel/hmake/distinfo +++ b/devel/hmake/distinfo @@ -1 +1 @@ -MD5 (hmake-2.03.tar.gz) = f875df33882478b1f26be703271f2864 +MD5 (hmake-3.05.tar.gz) = 99c53f39034b079a6d69f2118a33317c diff --git a/devel/hmake/pkg-plist b/devel/hmake/pkg-plist index e0a885d2e979..b1f902a9e649 100644 --- a/devel/hmake/pkg-plist +++ b/devel/hmake/pkg-plist @@ -5,6 +5,7 @@ lib/hmake/ix86-FreeBSD/HInteractive 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 diff --git a/devel/hs-hmake/Makefile b/devel/hs-hmake/Makefile index 5024f67f4f64..5cb590bbe61a 100644 --- a/devel/hs-hmake/Makefile +++ b/devel/hs-hmake/Makefile @@ -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 @@ MAINTAINER= mwest@uct.ac.za 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 --git a/devel/hs-hmake/distinfo b/devel/hs-hmake/distinfo index 2b58f9a70a86..685feb464056 100644 --- a/devel/hs-hmake/distinfo +++ b/devel/hs-hmake/distinfo @@ -1 +1 @@ -MD5 (hmake-2.03.tar.gz) = f875df33882478b1f26be703271f2864 +MD5 (hmake-3.05.tar.gz) = 99c53f39034b079a6d69f2118a33317c diff --git a/devel/hs-hmake/pkg-plist b/devel/hs-hmake/pkg-plist index e0a885d2e979..b1f902a9e649 100644 --- a/devel/hs-hmake/pkg-plist +++ b/devel/hs-hmake/pkg-plist @@ -5,6 +5,7 @@ lib/hmake/ix86-FreeBSD/HInteractive 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 |