diff --git a/devel/hs-hmake/Makefile b/devel/hs-hmake/Makefile index 49770d6c8ad4..e8fa27957fdb 100644 --- a/devel/hs-hmake/Makefile +++ b/devel/hs-hmake/Makefile @@ -6,8 +6,7 @@ # PORTNAME= hmake -PORTVERSION= 3.10 -PORTREVISION= 2 +PORTVERSION= 3.11 CATEGORIES= devel haskell MASTER_SITES= http://www.haskell.org/hmake/ \ ftp://ftp.cs.york.ac.uk/pub/haskell/hmake/ \ @@ -17,8 +16,6 @@ PKGNAMEPREFIX= hs- MAINTAINER= haskell@FreeBSD.org COMMENT= Intelligent compilation management tool for Haskell programs -.include - BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc .if exists(${LOCALBASE}/lib/libreadline.so) LIB_DEPENDS= readline.5:${PORTSDIR}/devel/readline @@ -33,8 +30,11 @@ do-install: # cheat a bit, otherwise LIBDIR gets clobbered (cd ${WRKSRC} && ./configure --install) +post-install: + @${STRIP_CMD} ${PREFIX}/bin/runhs + MAN1= hmake.1 CONFLICTS= nhc98-[0-9]* -.include +.include diff --git a/devel/hs-hmake/distinfo b/devel/hs-hmake/distinfo index f8a2e30dc3a6..e78e06a54ef6 100644 --- a/devel/hs-hmake/distinfo +++ b/devel/hs-hmake/distinfo @@ -1,3 +1,3 @@ -MD5 (hmake-3.10.tar.gz) = 32c8fea53feaa9b2ead1622609ec052a -SHA256 (hmake-3.10.tar.gz) = 309abe82803f50441caad64c4d5eddea424c5d9d89659c6e473cc4404cc90c48 -SIZE (hmake-3.10.tar.gz) = 104656 +MD5 (hmake-3.11.tar.gz) = 643c639048ba894d66ed88cc1f0dc239 +SHA256 (hmake-3.11.tar.gz) = 2a120adea7c5cb246d91ba3d8f7be858c3ba184c5f638e316f24271484c64720 +SIZE (hmake-3.11.tar.gz) = 104443 diff --git a/devel/hs-hmake/files/patch-configure b/devel/hs-hmake/files/patch-configure new file mode 100644 index 000000000000..99013180346b --- /dev/null +++ b/devel/hs-hmake/files/patch-configure @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- configure.orig ++++ configure +@@ -453,7 +453,7 @@ + then mkdir -p $DESTDIR$CONFDIR/$MACHINE; echo ' (created)' + else echo ' (exists)' + fi +- cp $DESTDIR$LIBDIR/$MACHINE/runhs $DESTDIR$BINDIR ++ ln -f $DESTDIR$LIBDIR/$MACHINE/runhs $DESTDIR$BINDIR + mv $DESTDIR$LIBDIR/$MACHINE/hmakerc $DESTDIR$CONFDIR/$MACHINE || true + echo + else diff --git a/devel/hs-hmake/files/patch-src::interpreter::HInteractive.hs b/devel/hs-hmake/files/patch-src::interpreter::HInteractive.hs deleted file mode 100644 index 951eb4f93ca6..000000000000 --- a/devel/hs-hmake/files/patch-src::interpreter::HInteractive.hs +++ /dev/null @@ -1,73 +0,0 @@ ---- src/interpreter/HInteractive.hs.orig Tue Feb 1 23:15:37 2005 -+++ src/interpreter/HInteractive.hs Tue Feb 1 23:22:21 2005 -@@ -347,39 +347,37 @@ - help = "hi - help command does not work in hbc < 0.9999.5" - - #else --banner = "\ --\__ __ __ _____________________________________\n\ --\|| || ______ ___ || _ ____ hmake interactive (hi):\n\ --\||___|| || || || ___|| ||/ ||__|| Copyright (c) May 2000\n\ --\||---|| || || || ||__|| ||\\_ ||__ http://www.cs.york.ac.uk/fp/hmake/\n\ --\|| || Report bugs to: malcolm@cs.york.ac.uk\n\ --\|| || Version: "++hmakeVersion++" -------------------------------------" -+banner = "__ __ __ _____________________________________\n" ++ -+ "|| || ______ ___ || _ ____ hmake interactive (hi):\n" ++ -+ "||___|| || || || ___|| ||/ ||__|| Copyright (c) May 2000\n" ++ -+ "||---|| || || || ||__|| ||\\_ ||__ http://www.cs.york.ac.uk/fp/hmake/\n" ++ -+ "|| || Report bugs to: malcolm@cs.york.ac.uk\n" ++ -+ "|| || Version: "++hmakeVersion++" -------------------------------------" - - --help = "\ --\Commands (can be abbreviated to first letter):\n\ --\ evaluate expression\n\ --\ :type show type of expression [nhc98 only]\n\ --\ :quit quit\n\ --\ :Quit quit\n\ --\ :load mod [mod...] load modules (note, not filenames)\n\ --\ :load clear all modules\n\ --\ :also mod [mod...] load additional modules (note, not filenames)\n\ --\ :reload repeat last load command\n\ --\ :freshen remove, recompile, and reload all current modules\n\ --\ :module mod set module scope for evaluating expressions\n\ --\ :edit file edit filename\n\ --\ :edit edit current module\n\ --\ :cd dir change directory\n\ --\ :cd show current directory\n\ --\ :dir list current directory\n\ --\ :hc compiler set Haskell compiler to use\n\ --\ :hc show current compiler and other available compilers\n\ --\ :set options set hmake/compiler options\n\ --\ :unset options remove hmake/compiler options\n\ --\ :observe name debug function 'name' with 'Hood' [coming soon]\n\ --\ :trace [on|off] switch on/off debugging with 'Hat' [nhc98 only]\n\ --\ :!command shell escape\n\ --\ :version show hmake version\n\ --\ :? display this list of commands" -+help = "Commands (can be abbreviated to first letter):\n" ++ -+ " evaluate expression\n" ++ -+ " :type show type of expression [nhc98 only]\n" ++ -+ " :quit quit\n" ++ -+ " :Quit quit\n" ++ -+ " :load mod [mod...] load modules (note, not filenames)\n" ++ -+ " :load clear all modules\n" ++ -+ " :also mod [mod...] load additional modules (note, not filenames)\n" ++ -+ " :reload repeat last load command\n" ++ -+ " :freshen remove, recompile, and reload all current modules\n" ++ -+ " :module mod set module scope for evaluating expressions\n" ++ -+ " :edit file edit filename\n" ++ -+ " :edit edit current module\n" ++ -+ " :cd dir change directory\n" ++ -+ " :cd show current directory\n" ++ -+ " :dir list current directory\n" ++ -+ " :hc compiler set Haskell compiler to use\n" ++ -+ " :hc show current compiler and other available compilers\n" ++ -+ " :set options set hmake/compiler options\n" ++ -+ " :unset options remove hmake/compiler options\n" ++ -+ " :observe name debug function 'name' with 'Hood' [coming soon]\n" ++ -+ " :trace [on|off] switch on/off debugging with 'Hat' [nhc98 only]\n" ++ -+ " :!command shell escape\n" ++ -+ " :version show hmake version\n" ++ -+ " :? display this list of commands" - #endif diff --git a/devel/hs-hmake/pkg-plist b/devel/hs-hmake/pkg-plist index a9acf940e221..17ed5ece278f 100644 --- a/devel/hs-hmake/pkg-plist +++ b/devel/hs-hmake/pkg-plist @@ -2,11 +2,13 @@ bin/harch bin/hi bin/hmake bin/hmake-config +bin/runhs lib/hmake/ix86-FreeBSD/HInteractive lib/hmake/ix86-FreeBSD/MkProg lib/hmake/ix86-FreeBSD/Older lib/hmake/ix86-FreeBSD/config lib/hmake/ix86-FreeBSD/MkConfig lib/hmake/ix86-FreeBSD/hmakerc +lib/hmake/ix86-FreeBSD/runhs @dirrm lib/hmake/ix86-FreeBSD @dirrm lib/hmake