diff options
| author | dwcjr <dwcjr@FreeBSD.org> | 2002-05-08 16:57:56 +0000 |
|---|---|---|
| committer | dwcjr <dwcjr@FreeBSD.org> | 2002-05-08 16:57:56 +0000 |
| commit | 8e1286c94c19f10dd637e423b1c0611026396980 (patch) | |
| tree | c52181d3a58e46f640cfd0c0efca479eba7e388e | |
| parent | f09e367c9d1c1f905cb4fe4498a2e506995ea523 (diff) | |
| download | FreeBSD-ports-8e1286c94c19f10dd637e423b1c0611026396980.zip FreeBSD-ports-8e1286c94c19f10dd637e423b1c0611026396980.tar.gz | |
Update to 1.12
Unbreak for -current
PR: 36139
Submitted by: maintainer
45 files changed, 579 insertions, 324 deletions
diff --git a/devel/hat/Makefile b/devel/hat/Makefile index ba776ec..9862aee 100644 --- a/devel/hat/Makefile +++ b/devel/hat/Makefile @@ -5,36 +5,32 @@ # $FreeBSD$ PORTNAME= nhc98 -PORTVERSION= 1.10 -PORTREVISION= 1 +PORTVERSION= 1.12 CATEGORIES= lang MASTER_SITES= ftp://ftp.cs.york.ac.uk/pub/haskell/${PORTNAME}/ DISTNAME= ${PORTNAME}src-${PORTVERSION} DIST_SUBDIR= nhc98 PATCH_SITES= ${MASTER_SITES} -PATCHFILES= patch-1.10-IO \ - patch-1.10-arrow \ - patch-1.10-blockbuffer \ - patch-1.10-commas \ - patch-1.10-counter \ - patch-1.10-hp2graph \ - patch-1.10-keywords \ - patch-1.10-lhs \ - patch-1.10-patterns \ - patch-1.10-hiding \ - patch-1.10-ghc5.02 +PATCHFILES= patch-1.12-ranlib \ + patch-1.12-hmake-config \ + patch-1.12-getEnv MAINTAINER= obraun@informatik.unibw-muenchen.de -FORBIDDEN= "Loops infinitely during build" - .if defined(WITH_TRACER) RUN_DEPENDS= ${LOCALBASE}/jdk1.1.8/bin/java:${PORTSDIR}/java/jdk BUILD_DEPENDS= ${LOCALBASE}/jdk1.1.8/bin/javac:${PORTSDIR}/java/jdk .endif +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500000 +BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc +.endif + WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +PLIST= ${WRKSRC}/pkg-plist .if !defined(WITH_TRACER) ALL_TARGET= basic @@ -47,6 +43,10 @@ MAKE_ENV+= PATH=${PREFIX}/jdk1.1.8/bin:$$PATH USE_GMAKE= yes HAS_CONFIGURE= yes +.if ${OSVERSION} >= 500000 +CONFIGURE_ARGS+= --buildwith=ghc +.endif + .if !defined(NOPORTDOCS) CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/nhc98 +docs .endif @@ -89,5 +89,16 @@ post-install: < ${WRKSRC}/man/nhc98.1 > ${WRKSRC}/man/nhc98.1.fix ${INSTALL_MAN} ${WRKSRC}/man/nhc98.1.fix ${PREFIX}/man/man1/nhc98.1 ${RM} ${WRKSRC}/man/nhc98.1.fix +.if !defined(NOPORTDOCS) +.for ending in aux log + ${RM} ${PREFIX}/share/doc/nhc98/hat/tutorial1.${ending} +.endfor +.for ending in aux log out toc + ${RM} ${PREFIX}/share/doc/nhc98/hat/hatuser.${ending} +.endfor +.for directory in . bugs examples hat hmake implementation-notes libs + ${RM} -r ${PREFIX}/share/doc/nhc98/${directory}/CVS +.endfor +.endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/devel/hat/distinfo b/devel/hat/distinfo index a0a85cb..233beff 100644 --- a/devel/hat/distinfo +++ b/devel/hat/distinfo @@ -1,12 +1,4 @@ -MD5 (nhc98/nhc98src-1.10.tar.gz) = 159e043a520d2eaa886213b53d50f666 -MD5 (nhc98/patch-1.10-IO) = 1b5ee9d82854217973d5a128f913b285 -MD5 (nhc98/patch-1.10-arrow) = d27deb1683c33d58a41c3eb28e9c0e9a -MD5 (nhc98/patch-1.10-blockbuffer) = f66a8885fd0bd037b68e8024942fc274 -MD5 (nhc98/patch-1.10-commas) = fda47aeaa34b6bcb981f93d905baf889 -MD5 (nhc98/patch-1.10-counter) = e78121249b077e57489f0b0ad72e6bad -MD5 (nhc98/patch-1.10-hp2graph) = 447391cc6f882caaf7f1ba64cff06e07 -MD5 (nhc98/patch-1.10-keywords) = 6d25095fa09626ce088daba7e7c70e48 -MD5 (nhc98/patch-1.10-lhs) = 99883604c9d7fabebf5d2c5932f4c090 -MD5 (nhc98/patch-1.10-patterns) = 605013e0a7678fe7789e5ccb917018bf -MD5 (nhc98/patch-1.10-hiding) = 9203ebd44bda7db58f5ba8cd92861645 -MD5 (nhc98/patch-1.10-ghc5.02) = f7eb18ac28feb431f651b5e571724bc9 +MD5 (nhc98/nhc98src-1.12.tar.gz) = cd10466ba0f06a19c55a67d3b9afd95c +MD5 (nhc98/patch-1.12-ranlib) = cdf4b449d96ca7b4caf25ac8176f1870 +MD5 (nhc98/patch-1.12-hmake-config) = 3d55e0f423cbf8a899d60b85cefcc844 +MD5 (nhc98/patch-1.12-getEnv) = deae8fae985674b5a477ee8da85160e6 diff --git a/devel/hat/files/patch-Makefile b/devel/hat/files/patch-Makefile index e963ec7..0df5f2d 100644 --- a/devel/hat/files/patch-Makefile +++ b/devel/hat/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig Thu Oct 4 10:21:53 2001 -+++ Makefile Thu Oct 4 10:22:02 2001 -@@ -148,14 +148,14 @@ +--- Makefile.orig Fri Mar 15 20:32:19 2002 ++++ Makefile Fri Mar 15 20:33:50 2002 +@@ -143,15 +143,15 @@ TARGDIR= targets TARGETS= runtime prelude greencard hp2graph hattools \ @@ -13,16 +13,17 @@ - compiler-nhc compiler-hbc compiler-ghc compiler-$(CC) \ - hmake-nhc hmake-hbc hmake-ghc hmake-$(CC) \ - greencard-nhc greencard-hbc greencard-ghc greencard-$(CC) \ -- prelude-$(CC) pragma-$(CC) + traceruntime traceprelude traceprelude-gcc \ + compiler-nhc compiler-hbc compiler-ghc compiler-gcc \ + hmake-nhc hmake-hbc hmake-ghc hmake-gcc \ + greencard-nhc greencard-hbc greencard-ghc greencard-gcc \ + hat-nhc hat-ghc \ +- prelude-$(CC) pragma-$(CC) + prelude-gcc pragma-gcc - .PHONY: default basic all tracer compiler help config install hattools + .PHONY: default basic all tracer compiler help config install hat hattools -@@ -188,8 +188,8 @@ +@@ -185,8 +185,8 @@ basic-nhc: $(PRAGMA) runtime hmake-nhc greencard-nhc compiler-nhc prelude basic-hbc: $(PRAGMA) runtime hmake-hbc greencard-hbc compiler-hbc prelude basic-ghc: $(PRAGMA) runtime hmake-ghc greencard-ghc compiler-ghc prelude @@ -31,10 +32,10 @@ +basic-gcc: runtime prelude-gcc pragma-gcc compiler-gcc \ + greencard-gcc hmake-gcc - all-$(BUILDCOMP): basic-$(BUILDCOMP) heapprofile timeprofile tracer lib/hood.jar + all-$(BUILDCOMP): basic-$(BUILDCOMP) heapprofile timeprofile tracer hoodui -@@ -209,9 +209,9 @@ - compiler-ghc traceruntime traceprelude hattools +@@ -206,9 +206,9 @@ + compiler-ghc traceruntime traceprelude hattools hat-ghc tracer-hbc: $(PRAGMA) runtime hmake-hbc greencard-hbc \ compiler-hbc traceruntime traceprelude hattools -tracer-$(CC): runtime prelude-$(CC) pragma-$(CC) compiler-$(CC) \ @@ -46,7 +47,7 @@ timetraceprofile: timetraceruntime timetraceprelude $(TARGETS): % : $(TARGDIR)/$(MACHINE)/% -@@ -324,44 +324,44 @@ +@@ -328,44 +328,44 @@ touch $(TARGDIR)/$(MACHINE)/timeprelude @@ -100,7 +101,7 @@ -$(TARGDIR)/$(MACHINE)/hmake-$(CC): $(HMAKEC) + touch $(TARGDIR)/$(MACHINE)/pragma-gcc +$(TARGDIR)/$(MACHINE)/hmake-gcc: $(HMAKEC) - cd src/hmake; $(MAKE) fromC + cd src/hmake; $(MAKE) fromC config cd src/interpreter; $(MAKE) fromC - touch $(TARGDIR)/$(MACHINE)/hmake-$(CC) + touch $(TARGDIR)/$(MACHINE)/hmake-gcc diff --git a/devel/hat/files/patch-include::Array.hi b/devel/hat/files/patch-include::Array.hi index 30613af..e69de29 100644 --- a/devel/hat/files/patch-include::Array.hi +++ b/devel/hat/files/patch-include::Array.hi @@ -1,12 +0,0 @@ -diff -ruN include.bak/Array.hi include/Array.hi ---- include.bak/Array.hi Tue Sep 18 12:50:40 2001 -+++ include/Array.hi Fri Dec 21 23:25:13 2001 -@@ -113,7 +113,7 @@ - {-# NEED _tupleRange #-} - _tupleRange{-# 3 #-}::(Ix a) => (a -> (a -> ([(a -> b)] -> [b]))); - --{-# NEED {Ix range index inRange} #-} -+{-# NEED {Ix range index inRange rangeSize} #-} - class (Prelude.Ord a) => Ix a where { - range{-# 1 #-}::((a,a) -> [a]); - index{-# 2 #-}::((a,a) -> (a -> Prelude.Int)); diff --git a/devel/hat/files/patch-include::localmalloc.h b/devel/hat/files/patch-include::localmalloc.h new file mode 100644 index 0000000..67a3ad4 --- /dev/null +++ b/devel/hat/files/patch-include::localmalloc.h @@ -0,0 +1,9 @@ +--- include/localmalloc.h.orig Sun Mar 17 21:18:36 2002 ++++ include/localmalloc.h Sun Mar 17 21:18:55 2002 +@@ -1,5 +1,5 @@ + #if defined(__APPLE__) + #include <sys/malloc.h> + #else +-#include <malloc.h> ++#include <stdlib.h> + #endif diff --git a/devel/hat/files/patch-script::confhat b/devel/hat/files/patch-script::confhat new file mode 100644 index 0000000..b117588 --- /dev/null +++ b/devel/hat/files/patch-script::confhat @@ -0,0 +1,9 @@ +--- script/confhat.orig Wed Mar 20 12:03:42 2002 ++++ script/confhat Wed Mar 20 12:35:43 2002 +@@ -14,5 +14,5 @@ + + cp -p lib/$MACHINE/libHShat.a $GHCLIBDIR + cp -p lib/hat/*.hi lib/hat/*.hx $GHCINCDIR/hat +-ghc-pkg --remove-package=hat || /bin/true ++ghc-pkg --remove-package=hat || /usr/bin/true + ghc-pkg --add-package <lib/hat/hat-package.conf diff --git a/devel/hat/files/patch-script::harch b/devel/hat/files/patch-script::harch new file mode 100644 index 0000000..b9da462 --- /dev/null +++ b/devel/hat/files/patch-script::harch @@ -0,0 +1,13 @@ +--- script/harch.orig Tue Mar 19 13:20:39 2002 ++++ script/harch Tue Mar 19 13:22:26 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 --git a/devel/hat/files/patch-src::greencard::Makefile b/devel/hat/files/patch-src::greencard::Makefile index 090ba9b..51d95c1 100644 --- a/devel/hat/files/patch-src::greencard::Makefile +++ b/devel/hat/files/patch-src::greencard::Makefile @@ -1,6 +1,5 @@ -diff -ruN src.bak/greencard/Makefile src/greencard/Makefile ---- src.bak/greencard/Makefile Tue May 29 16:22:46 2001 -+++ src/greencard/Makefile Mon Jun 18 16:31:45 2001 +--- src/greencard/Makefile.orig Fri Mar 15 21:04:02 2002 ++++ src/greencard/Makefile Fri Mar 15 21:06:49 2002 @@ -34,7 +34,7 @@ diff --git a/devel/hat/files/patch-src::hat::lib::Makefile b/devel/hat/files/patch-src::hat::lib::Makefile new file mode 100644 index 0000000..a181199 --- /dev/null +++ b/devel/hat/files/patch-src::hat::lib::Makefile @@ -0,0 +1,11 @@ +--- src/hat/lib/Makefile.orig Fri Mar 15 21:03:40 2002 ++++ src/hat/lib/Makefile Fri Mar 15 21:06:25 2002 +@@ -41,7 +41,7 @@ + all: $(OBJDIR) $(TARGET) + install: install-$(HC) + install-ghc: $(OBJDIR) $(TARGET) +- mkdir $(LIBDIR)/hat || /bin/true ++ mkdir $(LIBDIR)/hat || /usr/bin/true + $(INSTALL) *.hi *.hx hat-package.conf $(LIBDIR)/hat + install-nhc98: $(OBJDIR) $(TARGET) + $(INSTALL) *.hi *.hx $(INCDIR) diff --git a/devel/hat/files/patch-src::hmake::Makefile b/devel/hat/files/patch-src::hmake::Makefile index 26c1002..b3ce1c6 100644 --- a/devel/hat/files/patch-src::hmake::Makefile +++ b/devel/hat/files/patch-src::hmake::Makefile @@ -1,7 +1,6 @@ -diff -ruN src.bak/hmake/Makefile src/hmake/Makefile ---- src.bak/hmake/Makefile Tue May 29 16:29:07 2001 -+++ src/hmake/Makefile Mon Jun 18 16:32:21 2001 -@@ -48,7 +48,7 @@ +--- src/hmake/Makefile.orig Fri Mar 15 21:04:20 2002 ++++ src/hmake/Makefile Fri Mar 15 21:07:06 2002 +@@ -63,7 +63,7 @@ strip $@ $(OBJDIR): @@ -9,4 +8,4 @@ diff -ruN src.bak/hmake/Makefile src/hmake/Makefile + mkdir -p $(OBJDIR) || /usr/bin/true $(OBJS): $(OBJDIR)/%.$O : %.hs $(HC) $(HFLAGS) -c -o $@ $< - $(CPPOBJS) $(OBJDIR)/Older.$O: $(OBJDIR)/%.$O : %.hs + $(CPPOBJS) $(OBJDIR)/Older.$O $(OBJDIR)/MkConfig.$O: $(OBJDIR)/%.$O : %.hs diff --git a/devel/hat/files/patch-src::hp2graph::Makefile b/devel/hat/files/patch-src::hp2graph::Makefile index 218c9a0..109f73a 100644 --- a/devel/hat/files/patch-src::hp2graph::Makefile +++ b/devel/hat/files/patch-src::hp2graph::Makefile @@ -1,6 +1,5 @@ -diff -ruN src.bak/hp2graph/Makefile src/hp2graph/Makefile ---- src.bak/hp2graph/Makefile Mon Oct 11 13:50:38 1999 -+++ src/hp2graph/Makefile Mon Jun 18 16:32:04 2001 +--- src/hp2graph/Makefile.orig Fri Mar 15 21:04:12 2002 ++++ src/hp2graph/Makefile Fri Mar 15 21:06:58 2002 @@ -31,7 +31,7 @@ diff --git a/devel/hat/files/patch-src::prelude::Makefile b/devel/hat/files/patch-src::prelude::Makefile index 4c18f74..3ab0266 100644 --- a/devel/hat/files/patch-src::prelude::Makefile +++ b/devel/hat/files/patch-src::prelude::Makefile @@ -1,7 +1,6 @@ -diff -ruN src.bak/prelude/Makefile src/prelude/Makefile ---- src.bak/prelude/Makefile Mon Jun 4 12:40:41 2001 -+++ src/prelude/Makefile Mon Jun 18 16:31:24 2001 -@@ -80,7 +80,7 @@ +--- src/prelude/Makefile.orig Fri Mar 15 21:03:48 2002 ++++ src/prelude/Makefile Fri Mar 15 21:06:41 2002 +@@ -79,7 +79,7 @@ mkdir -p ${OBJDIR} ${OBJDIRS}: ${OBJDIR}/% : @@ -10,7 +9,7 @@ diff -ruN src.bak/prelude/Makefile src/prelude/Makefile ifeq "${TPROF}" "" -@@ -326,9 +326,9 @@ +@@ -328,9 +328,9 @@ ${OBJDIR}: @@ -20,5 +19,5 @@ diff -ruN src.bak/prelude/Makefile src/prelude/Makefile - mkdir -p $@ || /bin/true + mkdir -p $@ || /usr/bin/true - ${ARCHIVE}: ${OBJDIR} ${OBJDIRS} ${SUBDIRSMK} - rm -f $@ + ifeq "${TPROF}" "" + diff --git a/devel/hat/files/patch-src::runtime::Makefile b/devel/hat/files/patch-src::runtime::Makefile index 46b71c9..dfcbe2d 100644 --- a/devel/hat/files/patch-src::runtime::Makefile +++ b/devel/hat/files/patch-src::runtime::Makefile @@ -1,16 +1,15 @@ -diff -ruN src.bak/runtime/Makefile src/runtime/Makefile ---- src.bak/runtime/Makefile Thu Dec 16 11:58:42 1999 -+++ src/runtime/Makefile Mon Jun 18 16:30:56 2001 -@@ -9,7 +9,7 @@ +--- src/runtime/Makefile.orig Fri Mar 15 21:03:33 2002 ++++ src/runtime/Makefile Fri Mar 15 21:06:15 2002 +@@ -13,7 +13,7 @@ + SUF=.${CFG} + endif - LD = ld - LDFLAGS = -r -TRUE = /bin/true +TRUE = /usr/bin/true - CC = gcc - AR = ar + LDFLAGS = -r ARFLAGS = r -@@ -48,7 +48,7 @@ + +@@ -51,7 +51,7 @@ mkdir -p ${OBJDIR} ${OBJDIRS}: ${OBJDIR}/% : diff --git a/devel/hat/pkg-plist b/devel/hat/pkg-plist index f4a41b8..f62234c 100644 --- a/devel/hat/pkg-plist +++ b/devel/hat/pkg-plist @@ -1,12 +1,14 @@ bin/harch bin/nhc98 bin/hmake +bin/hmake-config bin/hi bin/hood bin/greencard-nhc98 bin/tprofprel bin/hp2graph -bin/hat-trail +bin/hat-trail-in-java +bin/hat-trans bin/hat-stack bin/hat-connect bin/hat-check @@ -14,6 +16,9 @@ bin/hat-observe bin/hat-detect bin/hat-checki bin/hat-port +bin/hat-view +bin/hat-names +bin/hat-trail lib/nhc98/hat-trail.jar lib/nhc98/hood.jar lib/nhc98/ix86-FreeBSD/Prelude.a @@ -21,7 +26,7 @@ lib/nhc98/ix86-FreeBSD/Runtime.a lib/nhc98/ix86-FreeBSD/config lib/nhc98/ix86-FreeBSD/greencard-nhc98 lib/nhc98/ix86-FreeBSD/hmake-PRAGMA -lib/nhc98/ix86-FreeBSD/hmake.config +lib/nhc98/ix86-FreeBSD/hmakerc lib/nhc98/ix86-FreeBSD/libdebug.a lib/nhc98/ix86-FreeBSD/main.o lib/nhc98/ix86-FreeBSD/mutator.o @@ -29,6 +34,7 @@ lib/nhc98/ix86-FreeBSD/mutlib.o lib/nhc98/ix86-FreeBSD/nhc98comp lib/nhc98/ix86-FreeBSD/nhc98heap lib/nhc98/ix86-FreeBSD/HInteractive +lib/nhc98/ix86-FreeBSD/MkConfig lib/nhc98/ix86-FreeBSD/MkProg lib/nhc98/ix86-FreeBSD/Older %%TRACER%%lib/nhc98/ix86-FreeBSD/hat-check @@ -37,6 +43,8 @@ lib/nhc98/ix86-FreeBSD/Older %%TRACER%%lib/nhc98/ix86-FreeBSD/hat-detect %%TRACER%%lib/nhc98/ix86-FreeBSD/hat-observe %%TRACER%%lib/nhc98/ix86-FreeBSD/hat-stack +%%TRACER%%lib/nhc98/ix86-FreeBSD/hat-trail +%%TRACER%%lib/nhc98/ix86-FreeBSD/hat-view %%TRACER%%lib/nhc98/ix86-FreeBSD/hp2graph %%TRACER%%lib/nhc98/ix86-FreeBSD/Array.z.a %%TRACER%%lib/nhc98/ix86-FreeBSD/BinArray.z.a @@ -98,68 +106,98 @@ lib/nhc98/ix86-FreeBSD/Older %%TRACER%%lib/nhc98/ix86-FreeBSD/tprofprel3.z.o include/nhc98/Array.T.hi include/nhc98/Array.hi +include/nhc98/Array.hx include/nhc98/BinArray.hi +include/nhc98/BinArray.hx include/nhc98/Binary.T.hi include/nhc98/Binary.hi +include/nhc98/Binary.hx include/nhc98/Bit.hi +include/nhc98/Bit.hx include/nhc98/CPUTime.T.hi include/nhc98/CPUTime.hi +include/nhc98/CPUTime.hx include/nhc98/Char.T.hi include/nhc98/Char.hi +include/nhc98/Char.hx include/nhc98/Complex.T.hi include/nhc98/Complex.hi +include/nhc98/Complex.hx include/nhc98/DPrelude.hi include/nhc98/DbgIface.hi include/nhc98/DbgStub.hi include/nhc98/Directory.T.hi include/nhc98/Directory.hi +include/nhc98/Directory.hx include/nhc98/FFI.T.hi include/nhc98/FFI.hi +include/nhc98/FFI.hx include/nhc98/FFIBuiltin.T.hi include/nhc98/FFIBuiltin.hi +include/nhc98/FFIBuiltin.hx include/nhc98/GreenCard.T.hi include/nhc98/GreenCard.gc include/nhc98/GreenCard.hi +include/nhc98/GreenCard.hx include/nhc98/Haskell.hi +include/nhc98/Haskell.hx include/nhc98/Hat.hi include/nhc98/HatBuiltin.hi include/nhc98/HsFFI.h include/nhc98/IO.T.hi include/nhc98/IO.hi +include/nhc98/IO.hx include/nhc98/IOExtras.T.hi include/nhc98/IOExtras.hi +include/nhc98/IOExtras.hx include/nhc98/Ix.T.hi include/nhc98/Ix.hi +include/nhc98/Ix.hx include/nhc98/List.T.hi include/nhc98/List.hi +include/nhc98/List.hx include/nhc98/Locale.hi +include/nhc98/Locale.hx include/nhc98/Maybe.T.hi include/nhc98/Maybe.hi +include/nhc98/Maybe.hx include/nhc98/Monad.T.hi include/nhc98/Monad.hi +include/nhc98/Monad.hx include/nhc98/NonStdEval.hi include/nhc98/NonStdGetPID.hi include/nhc98/NonStdProfile.hi include/nhc98/NonStdTrace.T.hi include/nhc98/NonStdTrace.hi +include/nhc98/NonStdTrace.hx include/nhc98/NonStdUnsafeCoerce.T.hi include/nhc98/NonStdUnsafeCoerce.hi include/nhc98/Numeric.T.hi include/nhc98/Numeric.hi +include/nhc98/Numeric.hx include/nhc98/Observe.hi include/nhc98/PackedString.T.hi include/nhc98/PackedString.hi +include/nhc98/PackedString.hx include/nhc98/Prelude.T.hi include/nhc98/Prelude.hi +include/nhc98/Prelude.hx include/nhc98/PreludeBuiltin.T.hi include/nhc98/PreludeBuiltin.hi +include/nhc98/PreludeBuiltin.hx +include/nhc98/Q8defs.h include/nhc98/Random.T.hi include/nhc98/Random.hi +include/nhc98/Random.hx include/nhc98/Ratio.T.hi include/nhc98/Ratio.hi +include/nhc98/Ratio.hx include/nhc98/System.T.hi include/nhc98/System.hi +include/nhc98/System.hx +include/nhc98/TChar.hi include/nhc98/Time.hi +include/nhc98/Time.hx include/nhc98/TPrelude.hi include/nhc98/Warning.hi include/nhc98/art.h @@ -195,6 +233,7 @@ include/nhc98/twopass.h %%PORTDOCS%%share/doc/nhc98/cvs.html %%PORTDOCS%%share/doc/nhc98/download.html %%PORTDOCS%%share/doc/nhc98/errmsgs.html +%%PORTDOCS%%share/doc/nhc98/extensions.html %%PORTDOCS%%share/doc/nhc98/ffi.html %%PORTDOCS%%share/doc/nhc98/fig2.html %%PORTDOCS%%share/doc/nhc98/fig3.html @@ -221,9 +260,6 @@ include/nhc98/twopass.h %%PORTDOCS%%share/doc/nhc98/fig1.gif %%PORTDOCS%%share/doc/nhc98/nhc13.gif %%PORTDOCS%%share/doc/nhc98/nhc98.gif -%%PORTDOCS%%share/doc/nhc98/CVS/Entries -%%PORTDOCS%%share/doc/nhc98/CVS/Repository -%%PORTDOCS%%share/doc/nhc98/CVS/Root %%PORTDOCS%%share/doc/nhc98/bugs/Nhc13Test1.hs %%PORTDOCS%%share/doc/nhc98/bugs/Nhc13Test10.hs %%PORTDOCS%%share/doc/nhc98/bugs/Nhc13Test13.hs @@ -253,20 +289,20 @@ include/nhc98/twopass.h %%PORTDOCS%%share/doc/nhc98/bugs/nhc98test22.hs %%PORTDOCS%%share/doc/nhc98/bugs/nhc98test23.hs %%PORTDOCS%%share/doc/nhc98/bugs/README -%%PORTDOCS%%share/doc/nhc98/bugs/CVS/Entries -%%PORTDOCS%%share/doc/nhc98/bugs/CVS/Repository -%%PORTDOCS%%share/doc/nhc98/bugs/CVS/Root %%PORTDOCS%%share/doc/nhc98/examples/ZooQuiz.hs -%%PORTDOCS%%share/doc/nhc98/examples/CVS/Entries -%%PORTDOCS%%share/doc/nhc98/examples/CVS/Repository -%%PORTDOCS%%share/doc/nhc98/examples/CVS/Root +%%PORTDOCS%%share/doc/nhc98/hat/BadInsort.hs +%%PORTDOCS%%share/doc/nhc98/hat/Insort.hs %%PORTDOCS%%share/doc/nhc98/hat/browser-detail.html +%%PORTDOCS%%share/doc/nhc98/hat/bugs-tools.html %%PORTDOCS%%share/doc/nhc98/hat/faq.html +%%PORTDOCS%%share/doc/nhc98/hat/fest-0202.bugs %%PORTDOCS%%share/doc/nhc98/hat/feature-table.html %%PORTDOCS%%share/doc/nhc98/hat/frejaHatHood.ps.gz %%PORTDOCS%%share/doc/nhc98/hat/hat-trail-1.eps +%%PORTDOCS%%share/doc/nhc98/hat/hat-trail-1.pdf %%PORTDOCS%%share/doc/nhc98/hat/hat-trail.gif %%PORTDOCS%%share/doc/nhc98/hat/hat.gif +%%PORTDOCS%%share/doc/nhc98/hat/hatuser.dvi %%PORTDOCS%%share/doc/nhc98/hat/hatuser.tex %%PORTDOCS%%share/doc/nhc98/hat/index.html %%PORTDOCS%%share/doc/nhc98/hat/limitations-detail.html @@ -275,50 +311,45 @@ include/nhc98/twopass.h %%PORTDOCS%%share/doc/nhc98/hat/old-tracing.html %%PORTDOCS%%share/doc/nhc98/hat/paper.dvi %%PORTDOCS%%share/doc/nhc98/hat/proposal.html +%%PORTDOCS%%share/doc/nhc98/hat/toolkitThesis.ps.gz %%PORTDOCS%%share/doc/nhc98/hat/tracing.html +%%PORTDOCS%%share/doc/nhc98/hat/tutorial1.dvi +%%PORTDOCS%%share/doc/nhc98/hat/tutorial1.html +%%PORTDOCS%%share/doc/nhc98/hat/tutorial1.hva +%%PORTDOCS%%share/doc/nhc98/hat/tutorial1.pdf +%%PORTDOCS%%share/doc/nhc98/hat/tutorial1.ps +%%PORTDOCS%%share/doc/nhc98/hat/tutorial1.tex %%PORTDOCS%%share/doc/nhc98/hat/hatuser.pdf +%%PORTDOCS%%share/doc/nhc98/hat/hatuser.html +%%PORTDOCS%%share/doc/nhc98/hat/hatuser001.gif %%PORTDOCS%%share/doc/nhc98/hat/hatuser.ps %%PORTDOCS%%share/doc/nhc98/hat/hw01-draft.ps.gz %%PORTDOCS%%share/doc/nhc98/hat/newhat.ps.gz -%%PORTDOCS%%share/doc/nhc98/hat/CVS/Entries -%%PORTDOCS%%share/doc/nhc98/hat/CVS/Repository -%%PORTDOCS%%share/doc/nhc98/hat/CVS/Root %%PORTDOCS%%share/doc/nhc98/hmake/changes.html +%%PORTDOCS%%share/doc/nhc98/hmake/hi-commands.html %%PORTDOCS%%share/doc/nhc98/hmake/hmake.html +%%PORTDOCS%%share/doc/nhc98/hmake/hmake-config.html %%PORTDOCS%%share/doc/nhc98/hmake/index.html %%PORTDOCS%%share/doc/nhc98/hmake/interactive.html %%PORTDOCS%%share/doc/nhc98/hmake/lineedit.html -%%PORTDOCS%%share/doc/nhc98/hmake/CVS/Entries -%%PORTDOCS%%share/doc/nhc98/hmake/CVS/Repository -%%PORTDOCS%%share/doc/nhc98/hmake/CVS/Root %%PORTDOCS%%share/doc/nhc98/implementation-notes/build-system %%PORTDOCS%%share/doc/nhc98/implementation-notes/index.html %%PORTDOCS%%share/doc/nhc98/implementation-notes/intro %%PORTDOCS%%share/doc/nhc98/implementation-notes/phases -%%PORTDOCS%%share/doc/nhc98/implementation-notes/CVS/Entries -%%PORTDOCS%%share/doc/nhc98/implementation-notes/CVS/Repository -%%PORTDOCS%%share/doc/nhc98/implementation-notes/CVS/Root %%PORTDOCS%%share/doc/nhc98/implementation-notes/space-efficient %%PORTDOCS%%share/doc/nhc98/libs/BinArray.html %%PORTDOCS%%share/doc/nhc98/libs/Binary.html %%PORTDOCS%%share/doc/nhc98/libs/Bit.html +%%PORTDOCS%%share/doc/nhc98/libs/FFI.html +%%PORTDOCS%%share/doc/nhc98/libs/IOExtras.html %%PORTDOCS%%share/doc/nhc98/libs/OldBinary.html +%%PORTDOCS%%share/doc/nhc98/libs/PackedString.html %%PORTDOCS%%share/doc/nhc98/libs/Time.html -%%PORTDOCS%%share/doc/nhc98/libs/CVS/Entries -%%PORTDOCS%%share/doc/nhc98/libs/CVS/Repository -%%PORTDOCS%%share/doc/nhc98/libs/CVS/Root %%PORTDOCS%%share/doc/nhc98/libs/index.html -%%PORTDOCS%%@dirrm share/doc/nhc98/bugs/CVS %%PORTDOCS%%@dirrm share/doc/nhc98/bugs -%%PORTDOCS%%@dirrm share/doc/nhc98/examples/CVS %%PORTDOCS%%@dirrm share/doc/nhc98/examples -%%PORTDOCS%%@dirrm share/doc/nhc98/hat/CVS %%PORTDOCS%%@dirrm share/doc/nhc98/hat -%%PORTDOCS%%@dirrm share/doc/nhc98/hmake/CVS %%PORTDOCS%%@dirrm share/doc/nhc98/hmake -%%PORTDOCS%%@dirrm share/doc/nhc98/implementation-notes/CVS %%PORTDOCS%%@dirrm share/doc/nhc98/implementation-notes -%%PORTDOCS%%@dirrm share/doc/nhc98/libs/CVS %%PORTDOCS%%@dirrm share/doc/nhc98/libs -%%PORTDOCS%%@dirrm share/doc/nhc98/CVS %%PORTDOCS%%@dirrm share/doc/nhc98 diff --git a/devel/hat/scripts/pre-install b/devel/hat/scripts/pre-install new file mode 100644 index 0000000..f7fcf3c --- /dev/null +++ b/devel/hat/scripts/pre-install @@ -0,0 +1,25 @@ +#!/bin/sh + +rm -f ${WRKSRC}/pkg-plist && touch ${WRKSRC}/pkg-plist + +MACHINE=`${WRKSRC}/script/harch` + +if [ `grep -c ghc ${WRKSRC}/lib/${MACHINE}/hmakerc` -gt 0 ] +then + echo "lib/nhc98/ix86-FreeBSD/hat-trans" >> ${WRKSRC}/pkg-plist + if [ ${WITH_TRACER} ] + then + ONEDIR=`grep ghc ${WRKSRC}/lib/${MACHINE}/hmakerc | grep import | head -1 | cut -d'"' -f2 | sed -e "s#${PREFIX}/##"` + GHCINCDIR=`dirname $ONEDIR` + GHCLIBDIR=`dirname $GHCINCDIR` + FILES=`ls ${WRKSRC}/lib/hat/ | grep 'hi$\|hx$' | sed -e "s#^.*/lib/hat/##g"` + echo "lib/nhc98/ix86-FreeBSD/libHShat.a" >> ${WRKSRC}/pkg-plist + echo "${GHCLIBDIR}/libHShat.a" >> ${WRKSRC}/pkg-plist + for file in ${FILES}; do + echo ${GHCINCDIR}/hat/${file} >> ${WRKSRC}/pkg-plist + done + echo "@dirrm ${GHCINCDIR}/hat" >> ${WRKSRC}/pkg-plist + fi +fi + +cat ${CURDIR}/pkg-plist >> ${WRKSRC}/pkg-plist diff --git a/devel/hs-hat/Makefile b/devel/hs-hat/Makefile index ba776ec..9862aee 100644 --- a/devel/hs-hat/Makefile +++ b/devel/hs-hat/Makefile @@ -5,36 +5,32 @@ # $FreeBSD$ PORTNAME= nhc98 -PORTVERSION= 1.10 -PORTREVISION= 1 +PORTVERSION= 1.12 CATEGORIES= lang MASTER_SITES= ftp://ftp.cs.york.ac.uk/pub/haskell/${PORTNAME}/ DISTNAME= ${PORTNAME}src-${PORTVERSION} DIST_SUBDIR= nhc98 PATCH_SITES= ${MASTER_SITES} -PATCHFILES= patch-1.10-IO \ - patch-1.10-arrow \ - patch-1.10-blockbuffer \ - patch-1.10-commas \ - patch-1.10-counter \ - patch-1.10-hp2graph \ - patch-1.10-keywords \ - patch-1.10-lhs \ - patch-1.10-patterns \ - patch-1.10-hiding \ - patch-1.10-ghc5.02 +PATCHFILES= patch-1.12-ranlib \ + patch-1.12-hmake-config \ + patch-1.12-getEnv MAINTAINER= obraun@informatik.unibw-muenchen.de -FORBIDDEN= "Loops infinitely during build" - .if defined(WITH_TRACER) RUN_DEPENDS= ${LOCALBASE}/jdk1.1.8/bin/java:${PORTSDIR}/java/jdk BUILD_DEPENDS= ${LOCALBASE}/jdk1.1.8/bin/javac:${PORTSDIR}/java/jdk .endif +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500000 +BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc +.endif + WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +PLIST= ${WRKSRC}/pkg-plist .if !defined(WITH_TRACER) ALL_TARGET= basic @@ -47,6 +43,10 @@ MAKE_ENV+= PATH=${PREFIX}/jdk1.1.8/bin:$$PATH USE_GMAKE= yes HAS_CONFIGURE= yes +.if ${OSVERSION} >= 500000 +CONFIGURE_ARGS+= --buildwith=ghc +.endif + .if !defined(NOPORTDOCS) CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/nhc98 +docs .endif @@ -89,5 +89,16 @@ post-install: < ${WRKSRC}/man/nhc98.1 > ${WRKSRC}/man/nhc98.1.fix ${INSTALL_MAN} ${WRKSRC}/man/nhc98.1.fix ${PREFIX}/man/man1/nhc98.1 ${RM} ${WRKSRC}/man/nhc98.1.fix +.if !defined(NOPORTDOCS) +.for ending in aux log + ${RM} ${PREFIX}/share/doc/nhc98/hat/tutorial1.${ending} +.endfor +.for ending in aux log out toc + ${RM} ${PREFIX}/share/doc/nhc98/hat/hatuser.${ending} +.endfor +.for directory in . bugs examples hat hmake implementation-notes libs + ${RM} -r ${PREFIX}/share/doc/nhc98/${directory}/CVS +.endfor +.endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/devel/hs-hat/distinfo b/devel/hs-hat/distinfo index a0a85cb..233beff 100644 --- a/devel/hs-hat/distinfo +++ b/devel/hs-hat/distinfo @@ -1,12 +1,4 @@ -MD5 (nhc98/nhc98src-1.10.tar.gz) = 159e043a520d2eaa886213b53d50f666 -MD5 (nhc98/patch-1.10-IO) = 1b5ee9d82854217973d5a128f913b285 -MD5 (nhc98/patch-1.10-arrow) = d27deb1683c33d58a41c3eb28e9c0e9a -MD5 (nhc98/patch-1.10-blockbuffer) = f66a8885fd0bd037b68e8024942fc274 -MD5 (nhc98/patch-1.10-commas) = fda47aeaa34b6bcb981f93d905baf889 -MD5 (nhc98/patch-1.10-counter) = e78121249b077e57489f0b0ad72e6bad -MD5 (nhc98/patch-1.10-hp2graph) = 447391cc6f882caaf7f1ba64cff06e07 -MD5 (nhc98/patch-1.10-keywords) = 6d25095fa09626ce088daba7e7c70e48 -MD5 (nhc98/patch-1.10-lhs) = 99883604c9d7fabebf5d2c5932f4c090 -MD5 (nhc98/patch-1.10-patterns) = 605013e0a7678fe7789e5ccb917018bf -MD5 (nhc98/patch-1.10-hiding) = 9203ebd44bda7db58f5ba8cd92861645 -MD5 (nhc98/patch-1.10-ghc5.02) = f7eb18ac28feb431f651b5e571724bc9 +MD5 (nhc98/nhc98src-1.12.tar.gz) = cd10466ba0f06a19c55a67d3b9afd95c +MD5 (nhc98/patch-1.12-ranlib) = cdf4b449d96ca7b4caf25ac8176f1870 +MD5 (nhc98/patch-1.12-hmake-config) = 3d55e0f423cbf8a899d60b85cefcc844 +MD5 (nhc98/patch-1.12-getEnv) = deae8fae985674b5a477ee8da85160e6 diff --git a/devel/hs-hat/files/patch-Makefile b/devel/hs-hat/files/patch-Makefile index e963ec7..0df5f2d 100644 --- a/devel/hs-hat/files/patch-Makefile +++ b/devel/hs-hat/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig Thu Oct 4 10:21:53 2001 -+++ Makefile Thu Oct 4 10:22:02 2001 -@@ -148,14 +148,14 @@ +--- Makefile.orig Fri Mar 15 20:32:19 2002 ++++ Makefile Fri Mar 15 20:33:50 2002 +@@ -143,15 +143,15 @@ TARGDIR= targets TARGETS= runtime prelude greencard hp2graph hattools \ @@ -13,16 +13,17 @@ - compiler-nhc compiler-hbc compiler-ghc compiler-$(CC) \ - hmake-nhc hmake-hbc hmake-ghc hmake-$(CC) \ - greencard-nhc greencard-hbc greencard-ghc greencard-$(CC) \ -- prelude-$(CC) pragma-$(CC) + traceruntime traceprelude traceprelude-gcc \ + compiler-nhc compiler-hbc compiler-ghc compiler-gcc \ + hmake-nhc hmake-hbc hmake-ghc hmake-gcc \ + greencard-nhc greencard-hbc greencard-ghc greencard-gcc \ + hat-nhc hat-ghc \ +- prelude-$(CC) pragma-$(CC) + prelude-gcc pragma-gcc - .PHONY: default basic all tracer compiler help config install hattools + .PHONY: default basic all tracer compiler help config install hat hattools -@@ -188,8 +188,8 @@ +@@ -185,8 +185,8 @@ basic-nhc: $(PRAGMA) runtime hmake-nhc greencard-nhc compiler-nhc prelude basic-hbc: $(PRAGMA) runtime hmake-hbc greencard-hbc compiler-hbc prelude basic-ghc: $(PRAGMA) runtime hmake-ghc greencard-ghc compiler-ghc prelude @@ -31,10 +32,10 @@ +basic-gcc: runtime prelude-gcc pragma-gcc compiler-gcc \ + greencard-gcc hmake-gcc - all-$(BUILDCOMP): basic-$(BUILDCOMP) heapprofile timeprofile tracer lib/hood.jar + all-$(BUILDCOMP): basic-$(BUILDCOMP) heapprofile timeprofile tracer hoodui -@@ -209,9 +209,9 @@ - compiler-ghc traceruntime traceprelude hattools +@@ -206,9 +206,9 @@ + compiler-ghc traceruntime traceprelude hattools hat-ghc tracer-hbc: $(PRAGMA) runtime hmake-hbc greencard-hbc \ compiler-hbc traceruntime traceprelude hattools -tracer-$(CC): runtime prelude-$(CC) pragma-$(CC) compiler-$(CC) \ @@ -46,7 +47,7 @@ timetraceprofile: timetraceruntime timetraceprelude $(TARGETS): % : $(TARGDIR)/$(MACHINE)/% -@@ -324,44 +324,44 @@ +@@ -328,44 +328,44 @@ touch $(TARGDIR)/$(MACHINE)/timeprelude @@ -100,7 +101,7 @@ -$(TARGDIR)/$(MACHINE)/hmake-$(CC): $(HMAKEC) + touch $(TARGDIR)/$(MACHINE)/pragma-gcc +$(TARGDIR)/$(MACHINE)/hmake-gcc: $(HMAKEC) - cd src/hmake; $(MAKE) fromC + cd src/hmake; $(MAKE) fromC config cd src/interpreter; $(MAKE) fromC - touch $(TARGDIR)/$(MACHINE)/hmake-$(CC) + touch $(TARGDIR)/$(MACHINE)/hmake-gcc diff --git a/devel/hs-hat/files/patch-include::Array.hi b/devel/hs-hat/files/patch-include::Array.hi index 30613af..e69de29 100644 --- a/devel/hs-hat/files/patch-include::Array.hi +++ b/devel/hs-hat/files/patch-include::Array.hi @@ -1,12 +0,0 @@ -diff -ruN include.bak/Array.hi include/Array.hi ---- include.bak/Array.hi Tue Sep 18 12:50:40 2001 -+++ include/Array.hi Fri Dec 21 23:25:13 2001 -@@ -113,7 +113,7 @@ - {-# NEED _tupleRange #-} - _tupleRange{-# 3 #-}::(Ix a) => (a -> (a -> ([(a -> b)] -> [b]))); - --{-# NEED {Ix range index inRange} #-} -+{-# NEED {Ix range index inRange rangeSize} #-} - class (Prelude.Ord a) => Ix a where { - range{-# 1 #-}::((a,a) -> [a]); - index{-# 2 #-}::((a,a) -> (a -> Prelude.Int)); diff --git a/devel/hs-hat/files/patch-include::localmalloc.h b/devel/hs-hat/files/patch-include::localmalloc.h new file mode 100644 index 0000000..67a3ad4 --- /dev/null +++ b/devel/hs-hat/files/patch-include::localmalloc.h @@ -0,0 +1,9 @@ +--- include/localmalloc.h.orig Sun Mar 17 21:18:36 2002 ++++ include/localmalloc.h Sun Mar 17 21:18:55 2002 +@@ -1,5 +1,5 @@ + #if defined(__APPLE__) + #include <sys/malloc.h> + #else +-#include <malloc.h> ++#include <stdlib.h> + #endif diff --git a/devel/hs-hat/files/patch-script::confhat b/devel/hs-hat/files/patch-script::confhat new file mode 100644 index 0000000..b117588 --- /dev/null +++ b/devel/hs-hat/files/patch-script::confhat @@ -0,0 +1,9 @@ +--- script/confhat.orig Wed Mar 20 12:03:42 2002 ++++ script/confhat Wed Mar 20 12:35:43 2002 +@@ -14,5 +14,5 @@ + + cp -p lib/$MACHINE/libHShat.a $GHCLIBDIR + cp -p lib/hat/*.hi lib/hat/*.hx $GHCINCDIR/hat +-ghc-pkg --remove-package=hat || /bin/true ++ghc-pkg --remove-package=hat || /usr/bin/true + ghc-pkg --add-package <lib/hat/hat-package.conf diff --git a/devel/hs-hat/files/patch-script::harch b/devel/hs-hat/files/patch-script::harch new file mode 100644 index 0000000..b9da462 --- /dev/null +++ b/devel/hs-hat/files/patch-script::harch @@ -0,0 +1,13 @@ +--- script/harch.orig Tue Mar 19 13:20:39 2002 ++++ script/harch Tue Mar 19 13:22:26 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 --git a/devel/hs-hat/files/patch-src::greencard::Makefile b/devel/hs-hat/files/patch-src::greencard::Makefile index 090ba9b..51d95c1 100644 --- a/devel/hs-hat/files/patch-src::greencard::Makefile +++ b/devel/hs-hat/files/patch-src::greencard::Makefile @@ -1,6 +1,5 @@ -diff -ruN src.bak/greencard/Makefile src/greencard/Makefile ---- src.bak/greencard/Makefile Tue May 29 16:22:46 2001 -+++ src/greencard/Makefile Mon Jun 18 16:31:45 2001 +--- src/greencard/Makefile.orig Fri Mar 15 21:04:02 2002 ++++ src/greencard/Makefile Fri Mar 15 21:06:49 2002 @@ -34,7 +34,7 @@ diff --git a/devel/hs-hat/files/patch-src::hat::lib::Makefile b/devel/hs-hat/files/patch-src::hat::lib::Makefile new file mode 100644 index 0000000..a181199 --- /dev/null +++ b/devel/hs-hat/files/patch-src::hat::lib::Makefile @@ -0,0 +1,11 @@ +--- src/hat/lib/Makefile.orig Fri Mar 15 21:03:40 2002 ++++ src/hat/lib/Makefile Fri Mar 15 21:06:25 2002 +@@ -41,7 +41,7 @@ + all: $(OBJDIR) $(TARGET) + install: install-$(HC) + install-ghc: $(OBJDIR) $(TARGET) +- mkdir $(LIBDIR)/hat || /bin/true ++ mkdir $(LIBDIR)/hat || /usr/bin/true + $(INSTALL) *.hi *.hx hat-package.conf $(LIBDIR)/hat + install-nhc98: $(OBJDIR) $(TARGET) + $(INSTALL) *.hi *.hx $(INCDIR) diff --git a/devel/hs-hat/files/patch-src::hmake::Makefile b/devel/hs-hat/files/patch-src::hmake::Makefile index 26c1002..b3ce1c6 100644 --- a/devel/hs-hat/files/patch-src::hmake::Makefile +++ b/devel/hs-hat/files/patch-src::hmake::Makefile @@ -1,7 +1,6 @@ -diff -ruN src.bak/hmake/Makefile src/hmake/Makefile ---- src.bak/hmake/Makefile Tue May 29 16:29:07 2001 -+++ src/hmake/Makefile Mon Jun 18 16:32:21 2001 -@@ -48,7 +48,7 @@ +--- src/hmake/Makefile.orig Fri Mar 15 21:04:20 2002 ++++ src/hmake/Makefile Fri Mar 15 21:07:06 2002 +@@ -63,7 +63,7 @@ strip $@ $(OBJDIR): @@ -9,4 +8,4 @@ diff -ruN src.bak/hmake/Makefile src/hmake/Makefile + mkdir -p $(OBJDIR) || /usr/bin/true $(OBJS): $(OBJDIR)/%.$O : %.hs $(HC) $(HFLAGS) -c -o $@ $< - $(CPPOBJS) $(OBJDIR)/Older.$O: $(OBJDIR)/%.$O : %.hs + $(CPPOBJS) $(OBJDIR)/Older.$O $(OBJDIR)/MkConfig.$O: $(OBJDIR)/%.$O : %.hs diff --git a/devel/hs-hat/files/patch-src::hp2graph::Makefile b/devel/hs-hat/files/patch-src::hp2graph::Makefile index 218c9a0..109f73a 100644 --- a/devel/hs-hat/files/patch-src::hp2graph::Makefile +++ b/devel/hs-hat/files/patch-src::hp2graph::Makefile @@ -1,6 +1,5 @@ -diff -ruN src.bak/hp2graph/Makefile src/hp2graph/Makefile ---- src.bak/hp2graph/Makefile Mon Oct 11 13:50:38 1999 -+++ src/hp2graph/Makefile Mon Jun 18 16:32:04 2001 +--- src/hp2graph/Makefile.orig Fri Mar 15 21:04:12 2002 ++++ src/hp2graph/Makefile Fri Mar 15 21:06:58 2002 @@ -31,7 +31,7 @@ diff --git a/devel/hs-hat/files/patch-src::prelude::Makefile b/devel/hs-hat/files/patch-src::prelude::Makefile index 4c18f74..3ab0266 100644 --- a/devel/hs-hat/files/patch-src::prelude::Makefile +++ b/devel/hs-hat/files/patch-src::prelude::Makefile @@ -1,7 +1,6 @@ -diff -ruN src.bak/prelude/Makefile src/prelude/Makefile ---- src.bak/prelude/Makefile Mon Jun 4 12:40:41 2001 -+++ src/prelude/Makefile Mon Jun 18 16:31:24 2001 -@@ -80,7 +80,7 @@ +--- src/prelude/Makefile.orig Fri Mar 15 21:03:48 2002 ++++ src/prelude/Makefile Fri Mar 15 21:06:41 2002 +@@ -79,7 +79,7 @@ mkdir -p ${OBJDIR} ${OBJDIRS}: ${OBJDIR}/% : @@ -10,7 +9,7 @@ diff -ruN src.bak/prelude/Makefile src/prelude/Makefile ifeq "${TPROF}" "" -@@ -326,9 +326,9 @@ +@@ -328,9 +328,9 @@ ${OBJDIR}: @@ -20,5 +19,5 @@ diff -ruN src.bak/prelude/Makefile src/prelude/Makefile - mkdir -p $@ || /bin/true + mkdir -p $@ || /usr/bin/true - ${ARCHIVE}: ${OBJDIR} ${OBJDIRS} ${SUBDIRSMK} - rm -f $@ + ifeq "${TPROF}" "" + diff --git a/devel/hs-hat/files/patch-src::runtime::Makefile b/devel/hs-hat/files/patch-src::runtime::Makefile index 46b71c9..dfcbe2d 100644 --- a/devel/hs-hat/files/patch-src::runtime::Makefile +++ b/devel/hs-hat/files/patch-src::runtime::Makefile @@ -1,16 +1,15 @@ -diff -ruN src.bak/runtime/Makefile src/runtime/Makefile ---- src.bak/runtime/Makefile Thu Dec 16 11:58:42 1999 -+++ src/runtime/Makefile Mon Jun 18 16:30:56 2001 -@@ -9,7 +9,7 @@ +--- src/runtime/Makefile.orig Fri Mar 15 21:03:33 2002 ++++ src/runtime/Makefile Fri Mar 15 21:06:15 2002 +@@ -13,7 +13,7 @@ + SUF=.${CFG} + endif - LD = ld - LDFLAGS = -r -TRUE = /bin/true +TRUE = /usr/bin/true - CC = gcc - AR = ar + LDFLAGS = -r ARFLAGS = r -@@ -48,7 +48,7 @@ + +@@ -51,7 +51,7 @@ mkdir -p ${OBJDIR} ${OBJDIRS}: ${OBJDIR}/% : diff --git a/devel/hs-hat/pkg-plist b/devel/hs-hat/pkg-plist index f4a41b8..f62234c 100644 --- a/devel/hs-hat/pkg-plist +++ b/devel/hs-hat/pkg-plist @@ -1,12 +1,14 @@ bin/harch bin/nhc98 bin/hmake +bin/hmake-config bin/hi bin/hood bin/greencard-nhc98 bin/tprofprel bin/hp2graph -bin/hat-trail +bin/hat-trail-in-java +bin/hat-trans bin/hat-stack bin/hat-connect bin/hat-check @@ -14,6 +16,9 @@ bin/hat-observe bin/hat-detect bin/hat-checki bin/hat-port +bin/hat-view +bin/hat-names +bin/hat-trail lib/nhc98/hat-trail.jar lib/nhc98/hood.jar lib/nhc98/ix86-FreeBSD/Prelude.a @@ -21,7 +26,7 @@ lib/nhc98/ix86-FreeBSD/Runtime.a lib/nhc98/ix86-FreeBSD/config lib/nhc98/ix86-FreeBSD/greencard-nhc98 lib/nhc98/ix86-FreeBSD/hmake-PRAGMA -lib/nhc98/ix86-FreeBSD/hmake.config +lib/nhc98/ix86-FreeBSD/hmakerc lib/nhc98/ix86-FreeBSD/libdebug.a lib/nhc98/ix86-FreeBSD/main.o lib/nhc98/ix86-FreeBSD/mutator.o @@ -29,6 +34,7 @@ lib/nhc98/ix86-FreeBSD/mutlib.o lib/nhc98/ix86-FreeBSD/nhc98comp lib/nhc98/ix86-FreeBSD/nhc98heap lib/nhc98/ix86-FreeBSD/HInteractive +lib/nhc98/ix86-FreeBSD/MkConfig lib/nhc98/ix86-FreeBSD/MkProg lib/nhc98/ix86-FreeBSD/Older %%TRACER%%lib/nhc98/ix86-FreeBSD/hat-check @@ -37,6 +43,8 @@ lib/nhc98/ix86-FreeBSD/Older %%TRACER%%lib/nhc98/ix86-FreeBSD/hat-detect %%TRACER%%lib/nhc98/ix86-FreeBSD/hat-observe %%TRACER%%lib/nhc98/ix86-FreeBSD/hat-stack +%%TRACER%%lib/nhc98/ix86-FreeBSD/hat-trail +%%TRACER%%lib/nhc98/ix86-FreeBSD/hat-view %%TRACER%%lib/nhc98/ix86-FreeBSD/hp2graph %%TRACER%%lib/nhc98/ix86-FreeBSD/Array.z.a %%TRACER%%lib/nhc98/ix86-FreeBSD/BinArray.z.a @@ -98,68 +106,98 @@ lib/nhc98/ix86-FreeBSD/Older %%TRACER%%lib/nhc98/ix86-FreeBSD/tprofprel3.z.o include/nhc98/Array.T.hi include/nhc98/Array.hi +include/nhc98/Array.hx include/nhc98/BinArray.hi +include/nhc98/BinArray.hx include/nhc98/Binary.T.hi include/nhc98/Binary.hi +include/nhc98/Binary.hx include/nhc98/Bit.hi +include/nhc98/Bit.hx include/nhc98/CPUTime.T.hi include/nhc98/CPUTime.hi +include/nhc98/CPUTime.hx include/nhc98/Char.T.hi include/nhc98/Char.hi +include/nhc98/Char.hx include/nhc98/Complex.T.hi include/nhc98/Complex.hi +include/nhc98/Complex.hx include/nhc98/DPrelude.hi include/nhc98/DbgIface.hi include/nhc98/DbgStub.hi include/nhc98/Directory.T.hi include/nhc98/Directory.hi +include/nhc98/Directory.hx include/nhc98/FFI.T.hi include/nhc98/FFI.hi +include/nhc98/FFI.hx include/nhc98/FFIBuiltin.T.hi include/nhc98/FFIBuiltin.hi +include/nhc98/FFIBuiltin.hx include/nhc98/GreenCard.T.hi include/nhc98/GreenCard.gc include/nhc98/GreenCard.hi +include/nhc98/GreenCard.hx include/nhc98/Haskell.hi +include/nhc98/Haskell.hx include/nhc98/Hat.hi include/nhc98/HatBuiltin.hi include/nhc98/HsFFI.h include/nhc98/IO.T.hi include/nhc98/IO.hi +include/nhc98/IO.hx include/nhc98/IOExtras.T.hi include/nhc98/IOExtras.hi +include/nhc98/IOExtras.hx include/nhc98/Ix.T.hi include/nhc98/Ix.hi +include/nhc98/Ix.hx include/nhc98/List.T.hi include/nhc98/List.hi +include/nhc98/List.hx include/nhc98/Locale.hi +include/nhc98/Locale.hx include/nhc98/Maybe.T.hi include/nhc98/Maybe.hi +include/nhc98/Maybe.hx include/nhc98/Monad.T.hi include/nhc98/Monad.hi +include/nhc98/Monad.hx include/nhc98/NonStdEval.hi include/nhc98/NonStdGetPID.hi include/nhc98/NonStdProfile.hi include/nhc98/NonStdTrace.T.hi include/nhc98/NonStdTrace.hi +include/nhc98/NonStdTrace.hx include/nhc98/NonStdUnsafeCoerce.T.hi include/nhc98/NonStdUnsafeCoerce.hi include/nhc98/Numeric.T.hi include/nhc98/Numeric.hi +include/nhc98/Numeric.hx include/nhc98/Observe.hi include/nhc98/PackedString.T.hi include/nhc98/PackedString.hi +include/nhc98/PackedString.hx include/nhc98/Prelude.T.hi include/nhc98/Prelude.hi +include/nhc98/Prelude.hx include/nhc98/PreludeBuiltin.T.hi include/nhc98/PreludeBuiltin.hi +include/nhc98/PreludeBuiltin.hx +include/nhc98/Q8defs.h include/nhc98/Random.T.hi include/nhc98/Random.hi +include/nhc98/Random.hx include/nhc98/Ratio.T.hi include/nhc98/Ratio.hi +include/nhc98/Ratio.hx include/nhc98/System.T.hi include/nhc98/System.hi +include/nhc98/System.hx +include/nhc98/TChar.hi include/nhc98/Time.hi +include/nhc98/Time.hx include/nhc98/TPrelude.hi include/nhc98/Warning.hi include/nhc98/art.h @@ -195,6 +233,7 @@ include/nhc98/twopass.h %%PORTDOCS%%share/doc/nhc98/cvs.html %%PORTDOCS%%share/doc/nhc98/download.html %%PORTDOCS%%share/doc/nhc98/errmsgs.html +%%PORTDOCS%%share/doc/nhc98/extensions.html %%PORTDOCS%%share/doc/nhc98/ffi.html %%PORTDOCS%%share/doc/nhc98/fig2.html %%PORTDOCS%%share/doc/nhc98/fig3.html @@ -221,9 +260,6 @@ include/nhc98/twopass.h %%PORTDOCS%%share/doc/nhc98/fig1.gif %%PORTDOCS%%share/doc/nhc98/nhc13.gif %%PORTDOCS%%share/doc/nhc98/nhc98.gif -%%PORTDOCS%%share/doc/nhc98/CVS/Entries -%%PORTDOCS%%share/doc/nhc98/CVS/Repository -%%PORTDOCS%%share/doc/nhc98/CVS/Root %%PORTDOCS%%share/doc/nhc98/bugs/Nhc13Test1.hs %%PORTDOCS%%share/doc/nhc98/bugs/Nhc13Test10.hs %%PORTDOCS%%share/doc/nhc98/bugs/Nhc13Test13.hs @@ -253,20 +289,20 @@ include/nhc98/twopass.h %%PORTDOCS%%share/doc/nhc98/bugs/nhc98test22.hs %%PORTDOCS%%share/doc/nhc98/bugs/nhc98test23.hs %%PORTDOCS%%share/doc/nhc98/bugs/README -%%PORTDOCS%%share/doc/nhc98/bugs/CVS/Entries -%%PORTDOCS%%share/doc/nhc98/bugs/CVS/Repository -%%PORTDOCS%%share/doc/nhc98/bugs/CVS/Root %%PORTDOCS%%share/doc/nhc98/examples/ZooQuiz.hs -%%PORTDOCS%%share/doc/nhc98/examples/CVS/Entries -%%PORTDOCS%%share/doc/nhc98/examples/CVS/Repository -%%PORTDOCS%%share/doc/nhc98/examples/CVS/Root +%%PORTDOCS%%share/doc/nhc98/hat/BadInsort.hs +%%PORTDOCS%%share/doc/nhc98/hat/Insort.hs %%PORTDOCS%%share/doc/nhc98/hat/browser-detail.html +%%PORTDOCS%%share/doc/nhc98/hat/bugs-tools.html %%PORTDOCS%%share/doc/nhc98/hat/faq.html +%%PORTDOCS%%share/doc/nhc98/hat/fest-0202.bugs %%PORTDOCS%%share/doc/nhc98/hat/feature-table.html %%PORTDOCS%%share/doc/nhc98/hat/frejaHatHood.ps.gz %%PORTDOCS%%share/doc/nhc98/hat/hat-trail-1.eps +%%PORTDOCS%%share/doc/nhc98/hat/hat-trail-1.pdf %%PORTDOCS%%share/doc/nhc98/hat/hat-trail.gif %%PORTDOCS%%share/doc/nhc98/hat/hat.gif +%%PORTDOCS%%share/doc/nhc98/hat/hatuser.dvi %%PORTDOCS%%share/doc/nhc98/hat/hatuser.tex %%PORTDOCS%%share/doc/nhc98/hat/index.html %%PORTDOCS%%share/doc/nhc98/hat/limitations-detail.html @@ -275,50 +311,45 @@ include/nhc98/twopass.h %%PORTDOCS%%share/doc/nhc98/hat/old-tracing.html %%PORTDOCS%%share/doc/nhc98/hat/paper.dvi %%PORTDOCS%%share/doc/nhc98/hat/proposal.html +%%PORTDOCS%%share/doc/nhc98/hat/toolkitThesis.ps.gz %%PORTDOCS%%share/doc/nhc98/hat/tracing.html +%%PORTDOCS%%share/doc/nhc98/hat/tutorial1.dvi +%%PORTDOCS%%share/doc/nhc98/hat/tutorial1.html +%%PORTDOCS%%share/doc/nhc98/hat/tutorial1.hva +%%PORTDOCS%%share/doc/nhc98/hat/tutorial1.pdf +%%PORTDOCS%%share/doc/nhc98/hat/tutorial1.ps +%%PORTDOCS%%share/doc/nhc98/hat/tutorial1.tex %%PORTDOCS%%share/doc/nhc98/hat/hatuser.pdf +%%PORTDOCS%%share/doc/nhc98/hat/hatuser.html +%%PORTDOCS%%share/doc/nhc98/hat/hatuser001.gif %%PORTDOCS%%share/doc/nhc98/hat/hatuser.ps %%PORTDOCS%%share/doc/nhc98/hat/hw01-draft.ps.gz %%PORTDOCS%%share/doc/nhc98/hat/newhat.ps.gz -%%PORTDOCS%%share/doc/nhc98/hat/CVS/Entries -%%PORTDOCS%%share/doc/nhc98/hat/CVS/Repository -%%PORTDOCS%%share/doc/nhc98/hat/CVS/Root %%PORTDOCS%%share/doc/nhc98/hmake/changes.html +%%PORTDOCS%%share/doc/nhc98/hmake/hi-commands.html %%PORTDOCS%%share/doc/nhc98/hmake/hmake.html +%%PORTDOCS%%share/doc/nhc98/hmake/hmake-config.html %%PORTDOCS%%share/doc/nhc98/hmake/index.html %%PORTDOCS%%share/doc/nhc98/hmake/interactive.html %%PORTDOCS%%share/doc/nhc98/hmake/lineedit.html -%%PORTDOCS%%share/doc/nhc98/hmake/CVS/Entries -%%PORTDOCS%%share/doc/nhc98/hmake/CVS/Repository -%%PORTDOCS%%share/doc/nhc98/hmake/CVS/Root %%PORTDOCS%%share/doc/nhc98/implementation-notes/build-system %%PORTDOCS%%share/doc/nhc98/implementation-notes/index.html %%PORTDOCS%%share/doc/nhc98/implementation-notes/intro %%PORTDOCS%%share/doc/nhc98/implementation-notes/phases -%%PORTDOCS%%share/doc/nhc98/implementation-notes/CVS/Entries -%%PORTDOCS%%share/doc/nhc98/implementation-notes/CVS/Repository -%%PORTDOCS%%share/doc/nhc98/implementation-notes/CVS/Root %%PORTDOCS%%share/doc/nhc98/implementation-notes/space-efficient %%PORTDOCS%%share/doc/nhc98/libs/BinArray.html %%PORTDOCS%%share/doc/nhc98/libs/Binary.html %%PORTDOCS%%share/doc/nhc98/libs/Bit.html +%%PORTDOCS%%share/doc/nhc98/libs/FFI.html +%%PORTDOCS%%share/doc/nhc98/libs/IOExtras.html %%PORTDOCS%%share/doc/nhc98/libs/OldBinary.html +%%PORTDOCS%%share/doc/nhc98/libs/PackedString.html %%PORTDOCS%%share/doc/nhc98/libs/Time.html -%%PORTDOCS%%share/doc/nhc98/libs/CVS/Entries -%%PORTDOCS%%share/doc/nhc98/libs/CVS/Repository -%%PORTDOCS%%share/doc/nhc98/libs/CVS/Root %%PORTDOCS%%share/doc/nhc98/libs/index.html -%%PORTDOCS%%@dirrm share/doc/nhc98/bugs/CVS %%PORTDOCS%%@dirrm share/doc/nhc98/bugs -%%PORTDOCS%%@dirrm share/doc/nhc98/examples/CVS %%PORTDOCS%%@dirrm share/doc/nhc98/examples -%%PORTDOCS%%@dirrm share/doc/nhc98/hat/CVS %%PORTDOCS%%@dirrm share/doc/nhc98/hat -%%PORTDOCS%%@dirrm share/doc/nhc98/hmake/CVS %%PORTDOCS%%@dirrm share/doc/nhc98/hmake -%%PORTDOCS%%@dirrm share/doc/nhc98/implementation-notes/CVS %%PORTDOCS%%@dirrm share/doc/nhc98/implementation-notes -%%PORTDOCS%%@dirrm share/doc/nhc98/libs/CVS %%PORTDOCS%%@dirrm share/doc/nhc98/libs -%%PORTDOCS%%@dirrm share/doc/nhc98/CVS %%PORTDOCS%%@dirrm share/doc/nhc98 diff --git a/devel/hs-hat/scripts/pre-install b/devel/hs-hat/scripts/pre-install new file mode 100644 index 0000000..f7fcf3c --- /dev/null +++ b/devel/hs-hat/scripts/pre-install @@ -0,0 +1,25 @@ +#!/bin/sh + +rm -f ${WRKSRC}/pkg-plist && touch ${WRKSRC}/pkg-plist + +MACHINE=`${WRKSRC}/script/harch` + +if [ `grep -c ghc ${WRKSRC}/lib/${MACHINE}/hmakerc` -gt 0 ] +then + echo "lib/nhc98/ix86-FreeBSD/hat-trans" >> ${WRKSRC}/pkg-plist + if [ ${WITH_TRACER} ] + then + ONEDIR=`grep ghc ${WRKSRC}/lib/${MACHINE}/hmakerc | grep import | head -1 | cut -d'"' -f2 | sed -e "s#${PREFIX}/##"` + GHCINCDIR=`dirname $ONEDIR` + GHCLIBDIR=`dirname $GHCINCDIR` + FILES=`ls ${WRKSRC}/lib/hat/ | grep 'hi$\|hx$' | sed -e "s#^.*/lib/hat/##g"` + echo "lib/nhc98/ix86-FreeBSD/libHShat.a" >> ${WRKSRC}/pkg-plist + echo "${GHCLIBDIR}/libHShat.a" >> ${WRKSRC}/pkg-plist + for file in ${FILES}; do + echo ${GHCINCDIR}/hat/${file} >> ${WRKSRC}/pkg-plist + done + echo "@dirrm ${GHCINCDIR}/hat" >> ${WRKSRC}/pkg-plist + fi +fi + +cat ${CURDIR}/pkg-plist >> ${WRKSRC}/pkg-plist diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile index ba776ec..9862aee 100644 --- a/lang/nhc98/Makefile +++ b/lang/nhc98/Makefile @@ -5,36 +5,32 @@ # $FreeBSD$ PORTNAME= nhc98 -PORTVERSION= 1.10 -PORTREVISION= 1 +PORTVERSION= 1.12 CATEGORIES= lang MASTER_SITES= ftp://ftp.cs.york.ac.uk/pub/haskell/${PORTNAME}/ DISTNAME= ${PORTNAME}src-${PORTVERSION} DIST_SUBDIR= nhc98 PATCH_SITES= ${MASTER_SITES} -PATCHFILES= patch-1.10-IO \ - patch-1.10-arrow \ - patch-1.10-blockbuffer \ - patch-1.10-commas \ - patch-1.10-counter \ - patch-1.10-hp2graph \ - patch-1.10-keywords \ - patch-1.10-lhs \ - patch-1.10-patterns \ - patch-1.10-hiding \ - patch-1.10-ghc5.02 +PATCHFILES= patch-1.12-ranlib \ + patch-1.12-hmake-config \ + patch-1.12-getEnv MAINTAINER= obraun@informatik.unibw-muenchen.de -FORBIDDEN= "Loops infinitely during build" - .if defined(WITH_TRACER) RUN_DEPENDS= ${LOCALBASE}/jdk1.1.8/bin/java:${PORTSDIR}/java/jdk BUILD_DEPENDS= ${LOCALBASE}/jdk1.1.8/bin/javac:${PORTSDIR}/java/jdk .endif +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500000 +BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc +.endif + WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +PLIST= ${WRKSRC}/pkg-plist .if !defined(WITH_TRACER) ALL_TARGET= basic @@ -47,6 +43,10 @@ MAKE_ENV+= PATH=${PREFIX}/jdk1.1.8/bin:$$PATH USE_GMAKE= yes HAS_CONFIGURE= yes +.if ${OSVERSION} >= 500000 +CONFIGURE_ARGS+= --buildwith=ghc +.endif + .if !defined(NOPORTDOCS) CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/nhc98 +docs .endif @@ -89,5 +89,16 @@ post-install: < ${WRKSRC}/man/nhc98.1 > ${WRKSRC}/man/nhc98.1.fix ${INSTALL_MAN} ${WRKSRC}/man/nhc98.1.fix ${PREFIX}/man/man1/nhc98.1 ${RM} ${WRKSRC}/man/nhc98.1.fix +.if !defined(NOPORTDOCS) +.for ending in aux log + ${RM} ${PREFIX}/share/doc/nhc98/hat/tutorial1.${ending} +.endfor +.for ending in aux log out toc + ${RM} ${PREFIX}/share/doc/nhc98/hat/hatuser.${ending} +.endfor +.for directory in . bugs examples hat hmake implementation-notes libs + ${RM} -r ${PREFIX}/share/doc/nhc98/${directory}/CVS +.endfor +.endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/lang/nhc98/distinfo b/lang/nhc98/distinfo index a0a85cb..233beff 100644 --- a/lang/nhc98/distinfo +++ b/lang/nhc98/distinfo @@ -1,12 +1,4 @@ -MD5 (nhc98/nhc98src-1.10.tar.gz) = 159e043a520d2eaa886213b53d50f666 -MD5 (nhc98/patch-1.10-IO) = 1b5ee9d82854217973d5a128f913b285 -MD5 (nhc98/patch-1.10-arrow) = d27deb1683c33d58a41c3eb28e9c0e9a -MD5 (nhc98/patch-1.10-blockbuffer) = f66a8885fd0bd037b68e8024942fc274 -MD5 (nhc98/patch-1.10-commas) = fda47aeaa34b6bcb981f93d905baf889 -MD5 (nhc98/patch-1.10-counter) = e78121249b077e57489f0b0ad72e6bad -MD5 (nhc98/patch-1.10-hp2graph) = 447391cc6f882caaf7f1ba64cff06e07 -MD5 (nhc98/patch-1.10-keywords) = 6d25095fa09626ce088daba7e7c70e48 -MD5 (nhc98/patch-1.10-lhs) = 99883604c9d7fabebf5d2c5932f4c090 -MD5 (nhc98/patch-1.10-patterns) = 605013e0a7678fe7789e5ccb917018bf -MD5 (nhc98/patch-1.10-hiding) = 9203ebd44bda7db58f5ba8cd92861645 -MD5 (nhc98/patch-1.10-ghc5.02) = f7eb18ac28feb431f651b5e571724bc9 +MD5 (nhc98/nhc98src-1.12.tar.gz) = cd10466ba0f06a19c55a67d3b9afd95c +MD5 (nhc98/patch-1.12-ranlib) = cdf4b449d96ca7b4caf25ac8176f1870 +MD5 (nhc98/patch-1.12-hmake-config) = 3d55e0f423cbf8a899d60b85cefcc844 +MD5 (nhc98/patch-1.12-getEnv) = deae8fae985674b5a477ee8da85160e6 diff --git a/lang/nhc98/files/patch-Makefile b/lang/nhc98/files/patch-Makefile index e963ec7..0df5f2d 100644 --- a/lang/nhc98/files/patch-Makefile +++ b/lang/nhc98/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig Thu Oct 4 10:21:53 2001 -+++ Makefile Thu Oct 4 10:22:02 2001 -@@ -148,14 +148,14 @@ +--- Makefile.orig Fri Mar 15 20:32:19 2002 ++++ Makefile Fri Mar 15 20:33:50 2002 +@@ -143,15 +143,15 @@ TARGDIR= targets TARGETS= runtime prelude greencard hp2graph hattools \ @@ -13,16 +13,17 @@ - compiler-nhc compiler-hbc compiler-ghc compiler-$(CC) \ - hmake-nhc hmake-hbc hmake-ghc hmake-$(CC) \ - greencard-nhc greencard-hbc greencard-ghc greencard-$(CC) \ -- prelude-$(CC) pragma-$(CC) + traceruntime traceprelude traceprelude-gcc \ + compiler-nhc compiler-hbc compiler-ghc compiler-gcc \ + hmake-nhc hmake-hbc hmake-ghc hmake-gcc \ + greencard-nhc greencard-hbc greencard-ghc greencard-gcc \ + hat-nhc hat-ghc \ +- prelude-$(CC) pragma-$(CC) + prelude-gcc pragma-gcc - .PHONY: default basic all tracer compiler help config install hattools + .PHONY: default basic all tracer compiler help config install hat hattools -@@ -188,8 +188,8 @@ +@@ -185,8 +185,8 @@ basic-nhc: $(PRAGMA) runtime hmake-nhc greencard-nhc compiler-nhc prelude basic-hbc: $(PRAGMA) runtime hmake-hbc greencard-hbc compiler-hbc prelude basic-ghc: $(PRAGMA) runtime hmake-ghc greencard-ghc compiler-ghc prelude @@ -31,10 +32,10 @@ +basic-gcc: runtime prelude-gcc pragma-gcc compiler-gcc \ + greencard-gcc hmake-gcc - all-$(BUILDCOMP): basic-$(BUILDCOMP) heapprofile timeprofile tracer lib/hood.jar + all-$(BUILDCOMP): basic-$(BUILDCOMP) heapprofile timeprofile tracer hoodui -@@ -209,9 +209,9 @@ - compiler-ghc traceruntime traceprelude hattools +@@ -206,9 +206,9 @@ + compiler-ghc traceruntime traceprelude hattools hat-ghc tracer-hbc: $(PRAGMA) runtime hmake-hbc greencard-hbc \ compiler-hbc traceruntime traceprelude hattools -tracer-$(CC): runtime prelude-$(CC) pragma-$(CC) compiler-$(CC) \ @@ -46,7 +47,7 @@ timetraceprofile: timetraceruntime timetraceprelude $(TARGETS): % : $(TARGDIR)/$(MACHINE)/% -@@ -324,44 +324,44 @@ +@@ -328,44 +328,44 @@ touch $(TARGDIR)/$(MACHINE)/timeprelude @@ -100,7 +101,7 @@ -$(TARGDIR)/$(MACHINE)/hmake-$(CC): $(HMAKEC) + touch $(TARGDIR)/$(MACHINE)/pragma-gcc +$(TARGDIR)/$(MACHINE)/hmake-gcc: $(HMAKEC) - cd src/hmake; $(MAKE) fromC + cd src/hmake; $(MAKE) fromC config cd src/interpreter; $(MAKE) fromC - touch $(TARGDIR)/$(MACHINE)/hmake-$(CC) + touch $(TARGDIR)/$(MACHINE)/hmake-gcc diff --git a/lang/nhc98/files/patch-include::Array.hi b/lang/nhc98/files/patch-include::Array.hi index 30613af..e69de29 100644 --- a/lang/nhc98/files/patch-include::Array.hi +++ b/lang/nhc98/files/patch-include::Array.hi @@ -1,12 +0,0 @@ -diff -ruN include.bak/Array.hi include/Array.hi ---- include.bak/Array.hi Tue Sep 18 12:50:40 2001 -+++ include/Array.hi Fri Dec 21 23:25:13 2001 -@@ -113,7 +113,7 @@ - {-# NEED _tupleRange #-} - _tupleRange{-# 3 #-}::(Ix a) => (a -> (a -> ([(a -> b)] -> [b]))); - --{-# NEED {Ix range index inRange} #-} -+{-# NEED {Ix range index inRange rangeSize} #-} - class (Prelude.Ord a) => Ix a where { - range{-# 1 #-}::((a,a) -> [a]); - index{-# 2 #-}::((a,a) -> (a -> Prelude.Int)); diff --git a/lang/nhc98/files/patch-include::localmalloc.h b/lang/nhc98/files/patch-include::localmalloc.h new file mode 100644 index 0000000..67a3ad4 --- /dev/null +++ b/lang/nhc98/files/patch-include::localmalloc.h @@ -0,0 +1,9 @@ +--- include/localmalloc.h.orig Sun Mar 17 21:18:36 2002 ++++ include/localmalloc.h Sun Mar 17 21:18:55 2002 +@@ -1,5 +1,5 @@ + #if defined(__APPLE__) + #include <sys/malloc.h> + #else +-#include <malloc.h> ++#include <stdlib.h> + #endif diff --git a/lang/nhc98/files/patch-script::confhat b/lang/nhc98/files/patch-script::confhat new file mode 100644 index 0000000..b117588 --- /dev/null +++ b/lang/nhc98/files/patch-script::confhat @@ -0,0 +1,9 @@ +--- script/confhat.orig Wed Mar 20 12:03:42 2002 ++++ script/confhat Wed Mar 20 12:35:43 2002 +@@ -14,5 +14,5 @@ + + cp -p lib/$MACHINE/libHShat.a $GHCLIBDIR + cp -p lib/hat/*.hi lib/hat/*.hx $GHCINCDIR/hat +-ghc-pkg --remove-package=hat || /bin/true ++ghc-pkg --remove-package=hat || /usr/bin/true + ghc-pkg --add-package <lib/hat/hat-package.conf diff --git a/lang/nhc98/files/patch-script::harch b/lang/nhc98/files/patch-script::harch new file mode 100644 index 0000000..b9da462 --- /dev/null +++ b/lang/nhc98/files/patch-script::harch @@ -0,0 +1,13 @@ +--- script/harch.orig Tue Mar 19 13:20:39 2002 ++++ script/harch Tue Mar 19 13:22:26 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 --git a/lang/nhc98/files/patch-src::greencard::Makefile b/lang/nhc98/files/patch-src::greencard::Makefile index 090ba9b..51d95c1 100644 --- a/lang/nhc98/files/patch-src::greencard::Makefile +++ b/lang/nhc98/files/patch-src::greencard::Makefile @@ -1,6 +1,5 @@ -diff -ruN src.bak/greencard/Makefile src/greencard/Makefile ---- src.bak/greencard/Makefile Tue May 29 16:22:46 2001 -+++ src/greencard/Makefile Mon Jun 18 16:31:45 2001 +--- src/greencard/Makefile.orig Fri Mar 15 21:04:02 2002 ++++ src/greencard/Makefile Fri Mar 15 21:06:49 2002 @@ -34,7 +34,7 @@ diff --git a/lang/nhc98/files/patch-src::hat::lib::Makefile b/lang/nhc98/files/patch-src::hat::lib::Makefile new file mode 100644 index 0000000..a181199 --- /dev/null +++ b/lang/nhc98/files/patch-src::hat::lib::Makefile @@ -0,0 +1,11 @@ +--- src/hat/lib/Makefile.orig Fri Mar 15 21:03:40 2002 ++++ src/hat/lib/Makefile Fri Mar 15 21:06:25 2002 +@@ -41,7 +41,7 @@ + all: $(OBJDIR) $(TARGET) + install: install-$(HC) + install-ghc: $(OBJDIR) $(TARGET) +- mkdir $(LIBDIR)/hat || /bin/true ++ mkdir $(LIBDIR)/hat || /usr/bin/true + $(INSTALL) *.hi *.hx hat-package.conf $(LIBDIR)/hat + install-nhc98: $(OBJDIR) $(TARGET) + $(INSTALL) *.hi *.hx $(INCDIR) diff --git a/lang/nhc98/files/patch-src::hmake::Makefile b/lang/nhc98/files/patch-src::hmake::Makefile index 26c1002..b3ce1c6 100644 --- a/lang/nhc98/files/patch-src::hmake::Makefile +++ b/lang/nhc98/files/patch-src::hmake::Makefile @@ -1,7 +1,6 @@ -diff -ruN src.bak/hmake/Makefile src/hmake/Makefile ---- src.bak/hmake/Makefile Tue May 29 16:29:07 2001 -+++ src/hmake/Makefile Mon Jun 18 16:32:21 2001 -@@ -48,7 +48,7 @@ +--- src/hmake/Makefile.orig Fri Mar 15 21:04:20 2002 ++++ src/hmake/Makefile Fri Mar 15 21:07:06 2002 +@@ -63,7 +63,7 @@ strip $@ $(OBJDIR): @@ -9,4 +8,4 @@ diff -ruN src.bak/hmake/Makefile src/hmake/Makefile + mkdir -p $(OBJDIR) || /usr/bin/true $(OBJS): $(OBJDIR)/%.$O : %.hs $(HC) $(HFLAGS) -c -o $@ $< - $(CPPOBJS) $(OBJDIR)/Older.$O: $(OBJDIR)/%.$O : %.hs + $(CPPOBJS) $(OBJDIR)/Older.$O $(OBJDIR)/MkConfig.$O: $(OBJDIR)/%.$O : %.hs diff --git a/lang/nhc98/files/patch-src::hp2graph::Makefile b/lang/nhc98/files/patch-src::hp2graph::Makefile index 218c9a0..109f73a 100644 --- a/lang/nhc98/files/patch-src::hp2graph::Makefile +++ b/lang/nhc98/files/patch-src::hp2graph::Makefile @@ -1,6 +1,5 @@ -diff -ruN src.bak/hp2graph/Makefile src/hp2graph/Makefile ---- src.bak/hp2graph/Makefile Mon Oct 11 13:50:38 1999 -+++ src/hp2graph/Makefile Mon Jun 18 16:32:04 2001 +--- src/hp2graph/Makefile.orig Fri Mar 15 21:04:12 2002 ++++ src/hp2graph/Makefile Fri Mar 15 21:06:58 2002 @@ -31,7 +31,7 @@ diff --git a/lang/nhc98/files/patch-src::prelude::Makefile b/lang/nhc98/files/patch-src::prelude::Makefile index 4c18f74..3ab0266 100644 --- a/lang/nhc98/files/patch-src::prelude::Makefile +++ b/lang/nhc98/files/patch-src::prelude::Makefile @@ -1,7 +1,6 @@ -diff -ruN src.bak/prelude/Makefile src/prelude/Makefile ---- src.bak/prelude/Makefile Mon Jun 4 12:40:41 2001 -+++ src/prelude/Makefile Mon Jun 18 16:31:24 2001 -@@ -80,7 +80,7 @@ +--- src/prelude/Makefile.orig Fri Mar 15 21:03:48 2002 ++++ src/prelude/Makefile Fri Mar 15 21:06:41 2002 +@@ -79,7 +79,7 @@ mkdir -p ${OBJDIR} ${OBJDIRS}: ${OBJDIR}/% : @@ -10,7 +9,7 @@ diff -ruN src.bak/prelude/Makefile src/prelude/Makefile ifeq "${TPROF}" "" -@@ -326,9 +326,9 @@ +@@ -328,9 +328,9 @@ ${OBJDIR}: @@ -20,5 +19,5 @@ diff -ruN src.bak/prelude/Makefile src/prelude/Makefile - mkdir -p $@ || /bin/true + mkdir -p $@ || /usr/bin/true - ${ARCHIVE}: ${OBJDIR} ${OBJDIRS} ${SUBDIRSMK} - rm -f $@ + ifeq "${TPROF}" "" + diff --git a/lang/nhc98/files/patch-src::runtime::Makefile b/lang/nhc98/files/patch-src::runtime::Makefile index 46b71c9..dfcbe2d 100644 --- a/lang/nhc98/files/patch-src::runtime::Makefile +++ b/lang/nhc98/files/patch-src::runtime::Makefile @@ -1,16 +1,15 @@ -diff -ruN src.bak/runtime/Makefile src/runtime/Makefile ---- src.bak/runtime/Makefile Thu Dec 16 11:58:42 1999 -+++ src/runtime/Makefile Mon Jun 18 16:30:56 2001 -@@ -9,7 +9,7 @@ +--- src/runtime/Makefile.orig Fri Mar 15 21:03:33 2002 ++++ src/runtime/Makefile Fri Mar 15 21:06:15 2002 +@@ -13,7 +13,7 @@ + SUF=.${CFG} + endif - LD = ld - LDFLAGS = -r -TRUE = /bin/true +TRUE = /usr/bin/true - CC = gcc - AR = ar + LDFLAGS = -r ARFLAGS = r -@@ -48,7 +48,7 @@ + +@@ -51,7 +51,7 @@ mkdir -p ${OBJDIR} ${OBJDIRS}: ${OBJDIR}/% : diff --git a/lang/nhc98/pkg-plist b/lang/nhc98/pkg-plist index f4a41b8..f62234c 100644 --- a/lang/nhc98/pkg-plist +++ b/lang/nhc98/pkg-plist @@ -1,12 +1,14 @@ bin/harch bin/nhc98 bin/hmake +bin/hmake-config bin/hi bin/hood bin/greencard-nhc98 bin/tprofprel bin/hp2graph -bin/hat-trail +bin/hat-trail-in-java +bin/hat-trans bin/hat-stack bin/hat-connect bin/hat-check @@ -14,6 +16,9 @@ bin/hat-observe bin/hat-detect bin/hat-checki bin/hat-port +bin/hat-view +bin/hat-names +bin/hat-trail lib/nhc98/hat-trail.jar lib/nhc98/hood.jar lib/nhc98/ix86-FreeBSD/Prelude.a @@ -21,7 +26,7 @@ lib/nhc98/ix86-FreeBSD/Runtime.a lib/nhc98/ix86-FreeBSD/config lib/nhc98/ix86-FreeBSD/greencard-nhc98 lib/nhc98/ix86-FreeBSD/hmake-PRAGMA -lib/nhc98/ix86-FreeBSD/hmake.config +lib/nhc98/ix86-FreeBSD/hmakerc lib/nhc98/ix86-FreeBSD/libdebug.a lib/nhc98/ix86-FreeBSD/main.o lib/nhc98/ix86-FreeBSD/mutator.o @@ -29,6 +34,7 @@ lib/nhc98/ix86-FreeBSD/mutlib.o lib/nhc98/ix86-FreeBSD/nhc98comp lib/nhc98/ix86-FreeBSD/nhc98heap lib/nhc98/ix86-FreeBSD/HInteractive +lib/nhc98/ix86-FreeBSD/MkConfig lib/nhc98/ix86-FreeBSD/MkProg lib/nhc98/ix86-FreeBSD/Older %%TRACER%%lib/nhc98/ix86-FreeBSD/hat-check @@ -37,6 +43,8 @@ lib/nhc98/ix86-FreeBSD/Older %%TRACER%%lib/nhc98/ix86-FreeBSD/hat-detect %%TRACER%%lib/nhc98/ix86-FreeBSD/hat-observe %%TRACER%%lib/nhc98/ix86-FreeBSD/hat-stack +%%TRACER%%lib/nhc98/ix86-FreeBSD/hat-trail +%%TRACER%%lib/nhc98/ix86-FreeBSD/hat-view %%TRACER%%lib/nhc98/ix86-FreeBSD/hp2graph %%TRACER%%lib/nhc98/ix86-FreeBSD/Array.z.a %%TRACER%%lib/nhc98/ix86-FreeBSD/BinArray.z.a @@ -98,68 +106,98 @@ lib/nhc98/ix86-FreeBSD/Older %%TRACER%%lib/nhc98/ix86-FreeBSD/tprofprel3.z.o include/nhc98/Array.T.hi include/nhc98/Array.hi +include/nhc98/Array.hx include/nhc98/BinArray.hi +include/nhc98/BinArray.hx include/nhc98/Binary.T.hi include/nhc98/Binary.hi +include/nhc98/Binary.hx include/nhc98/Bit.hi +include/nhc98/Bit.hx include/nhc98/CPUTime.T.hi include/nhc98/CPUTime.hi +include/nhc98/CPUTime.hx include/nhc98/Char.T.hi include/nhc98/Char.hi +include/nhc98/Char.hx include/nhc98/Complex.T.hi include/nhc98/Complex.hi +include/nhc98/Complex.hx include/nhc98/DPrelude.hi include/nhc98/DbgIface.hi include/nhc98/DbgStub.hi include/nhc98/Directory.T.hi include/nhc98/Directory.hi +include/nhc98/Directory.hx include/nhc98/FFI.T.hi include/nhc98/FFI.hi +include/nhc98/FFI.hx include/nhc98/FFIBuiltin.T.hi include/nhc98/FFIBuiltin.hi +include/nhc98/FFIBuiltin.hx include/nhc98/GreenCard.T.hi include/nhc98/GreenCard.gc include/nhc98/GreenCard.hi +include/nhc98/GreenCard.hx include/nhc98/Haskell.hi +include/nhc98/Haskell.hx include/nhc98/Hat.hi include/nhc98/HatBuiltin.hi include/nhc98/HsFFI.h include/nhc98/IO.T.hi include/nhc98/IO.hi +include/nhc98/IO.hx include/nhc98/IOExtras.T.hi include/nhc98/IOExtras.hi +include/nhc98/IOExtras.hx include/nhc98/Ix.T.hi include/nhc98/Ix.hi +include/nhc98/Ix.hx include/nhc98/List.T.hi include/nhc98/List.hi +include/nhc98/List.hx include/nhc98/Locale.hi +include/nhc98/Locale.hx include/nhc98/Maybe.T.hi include/nhc98/Maybe.hi +include/nhc98/Maybe.hx include/nhc98/Monad.T.hi include/nhc98/Monad.hi +include/nhc98/Monad.hx include/nhc98/NonStdEval.hi include/nhc98/NonStdGetPID.hi include/nhc98/NonStdProfile.hi include/nhc98/NonStdTrace.T.hi include/nhc98/NonStdTrace.hi +include/nhc98/NonStdTrace.hx include/nhc98/NonStdUnsafeCoerce.T.hi include/nhc98/NonStdUnsafeCoerce.hi include/nhc98/Numeric.T.hi include/nhc98/Numeric.hi +include/nhc98/Numeric.hx include/nhc98/Observe.hi include/nhc98/PackedString.T.hi include/nhc98/PackedString.hi +include/nhc98/PackedString.hx include/nhc98/Prelude.T.hi include/nhc98/Prelude.hi +include/nhc98/Prelude.hx include/nhc98/PreludeBuiltin.T.hi include/nhc98/PreludeBuiltin.hi +include/nhc98/PreludeBuiltin.hx +include/nhc98/Q8defs.h include/nhc98/Random.T.hi include/nhc98/Random.hi +include/nhc98/Random.hx include/nhc98/Ratio.T.hi include/nhc98/Ratio.hi +include/nhc98/Ratio.hx include/nhc98/System.T.hi include/nhc98/System.hi +include/nhc98/System.hx +include/nhc98/TChar.hi include/nhc98/Time.hi +include/nhc98/Time.hx include/nhc98/TPrelude.hi include/nhc98/Warning.hi include/nhc98/art.h @@ -195,6 +233,7 @@ include/nhc98/twopass.h %%PORTDOCS%%share/doc/nhc98/cvs.html %%PORTDOCS%%share/doc/nhc98/download.html %%PORTDOCS%%share/doc/nhc98/errmsgs.html +%%PORTDOCS%%share/doc/nhc98/extensions.html %%PORTDOCS%%share/doc/nhc98/ffi.html %%PORTDOCS%%share/doc/nhc98/fig2.html %%PORTDOCS%%share/doc/nhc98/fig3.html @@ -221,9 +260,6 @@ include/nhc98/twopass.h %%PORTDOCS%%share/doc/nhc98/fig1.gif %%PORTDOCS%%share/doc/nhc98/nhc13.gif %%PORTDOCS%%share/doc/nhc98/nhc98.gif -%%PORTDOCS%%share/doc/nhc98/CVS/Entries -%%PORTDOCS%%share/doc/nhc98/CVS/Repository -%%PORTDOCS%%share/doc/nhc98/CVS/Root %%PORTDOCS%%share/doc/nhc98/bugs/Nhc13Test1.hs %%PORTDOCS%%share/doc/nhc98/bugs/Nhc13Test10.hs %%PORTDOCS%%share/doc/nhc98/bugs/Nhc13Test13.hs @@ -253,20 +289,20 @@ include/nhc98/twopass.h %%PORTDOCS%%share/doc/nhc98/bugs/nhc98test22.hs %%PORTDOCS%%share/doc/nhc98/bugs/nhc98test23.hs %%PORTDOCS%%share/doc/nhc98/bugs/README -%%PORTDOCS%%share/doc/nhc98/bugs/CVS/Entries -%%PORTDOCS%%share/doc/nhc98/bugs/CVS/Repository -%%PORTDOCS%%share/doc/nhc98/bugs/CVS/Root %%PORTDOCS%%share/doc/nhc98/examples/ZooQuiz.hs -%%PORTDOCS%%share/doc/nhc98/examples/CVS/Entries -%%PORTDOCS%%share/doc/nhc98/examples/CVS/Repository -%%PORTDOCS%%share/doc/nhc98/examples/CVS/Root +%%PORTDOCS%%share/doc/nhc98/hat/BadInsort.hs +%%PORTDOCS%%share/doc/nhc98/hat/Insort.hs %%PORTDOCS%%share/doc/nhc98/hat/browser-detail.html +%%PORTDOCS%%share/doc/nhc98/hat/bugs-tools.html %%PORTDOCS%%share/doc/nhc98/hat/faq.html +%%PORTDOCS%%share/doc/nhc98/hat/fest-0202.bugs %%PORTDOCS%%share/doc/nhc98/hat/feature-table.html %%PORTDOCS%%share/doc/nhc98/hat/frejaHatHood.ps.gz %%PORTDOCS%%share/doc/nhc98/hat/hat-trail-1.eps +%%PORTDOCS%%share/doc/nhc98/hat/hat-trail-1.pdf %%PORTDOCS%%share/doc/nhc98/hat/hat-trail.gif %%PORTDOCS%%share/doc/nhc98/hat/hat.gif +%%PORTDOCS%%share/doc/nhc98/hat/hatuser.dvi %%PORTDOCS%%share/doc/nhc98/hat/hatuser.tex %%PORTDOCS%%share/doc/nhc98/hat/index.html %%PORTDOCS%%share/doc/nhc98/hat/limitations-detail.html @@ -275,50 +311,45 @@ include/nhc98/twopass.h %%PORTDOCS%%share/doc/nhc98/hat/old-tracing.html %%PORTDOCS%%share/doc/nhc98/hat/paper.dvi %%PORTDOCS%%share/doc/nhc98/hat/proposal.html +%%PORTDOCS%%share/doc/nhc98/hat/toolkitThesis.ps.gz %%PORTDOCS%%share/doc/nhc98/hat/tracing.html +%%PORTDOCS%%share/doc/nhc98/hat/tutorial1.dvi +%%PORTDOCS%%share/doc/nhc98/hat/tutorial1.html +%%PORTDOCS%%share/doc/nhc98/hat/tutorial1.hva +%%PORTDOCS%%share/doc/nhc98/hat/tutorial1.pdf +%%PORTDOCS%%share/doc/nhc98/hat/tutorial1.ps +%%PORTDOCS%%share/doc/nhc98/hat/tutorial1.tex %%PORTDOCS%%share/doc/nhc98/hat/hatuser.pdf +%%PORTDOCS%%share/doc/nhc98/hat/hatuser.html +%%PORTDOCS%%share/doc/nhc98/hat/hatuser001.gif %%PORTDOCS%%share/doc/nhc98/hat/hatuser.ps %%PORTDOCS%%share/doc/nhc98/hat/hw01-draft.ps.gz %%PORTDOCS%%share/doc/nhc98/hat/newhat.ps.gz -%%PORTDOCS%%share/doc/nhc98/hat/CVS/Entries -%%PORTDOCS%%share/doc/nhc98/hat/CVS/Repository -%%PORTDOCS%%share/doc/nhc98/hat/CVS/Root %%PORTDOCS%%share/doc/nhc98/hmake/changes.html +%%PORTDOCS%%share/doc/nhc98/hmake/hi-commands.html %%PORTDOCS%%share/doc/nhc98/hmake/hmake.html +%%PORTDOCS%%share/doc/nhc98/hmake/hmake-config.html %%PORTDOCS%%share/doc/nhc98/hmake/index.html %%PORTDOCS%%share/doc/nhc98/hmake/interactive.html %%PORTDOCS%%share/doc/nhc98/hmake/lineedit.html -%%PORTDOCS%%share/doc/nhc98/hmake/CVS/Entries -%%PORTDOCS%%share/doc/nhc98/hmake/CVS/Repository -%%PORTDOCS%%share/doc/nhc98/hmake/CVS/Root %%PORTDOCS%%share/doc/nhc98/implementation-notes/build-system %%PORTDOCS%%share/doc/nhc98/implementation-notes/index.html %%PORTDOCS%%share/doc/nhc98/implementation-notes/intro %%PORTDOCS%%share/doc/nhc98/implementation-notes/phases -%%PORTDOCS%%share/doc/nhc98/implementation-notes/CVS/Entries -%%PORTDOCS%%share/doc/nhc98/implementation-notes/CVS/Repository -%%PORTDOCS%%share/doc/nhc98/implementation-notes/CVS/Root %%PORTDOCS%%share/doc/nhc98/implementation-notes/space-efficient %%PORTDOCS%%share/doc/nhc98/libs/BinArray.html %%PORTDOCS%%share/doc/nhc98/libs/Binary.html %%PORTDOCS%%share/doc/nhc98/libs/Bit.html +%%PORTDOCS%%share/doc/nhc98/libs/FFI.html +%%PORTDOCS%%share/doc/nhc98/libs/IOExtras.html %%PORTDOCS%%share/doc/nhc98/libs/OldBinary.html +%%PORTDOCS%%share/doc/nhc98/libs/PackedString.html %%PORTDOCS%%share/doc/nhc98/libs/Time.html -%%PORTDOCS%%share/doc/nhc98/libs/CVS/Entries -%%PORTDOCS%%share/doc/nhc98/libs/CVS/Repository -%%PORTDOCS%%share/doc/nhc98/libs/CVS/Root %%PORTDOCS%%share/doc/nhc98/libs/index.html -%%PORTDOCS%%@dirrm share/doc/nhc98/bugs/CVS %%PORTDOCS%%@dirrm share/doc/nhc98/bugs -%%PORTDOCS%%@dirrm share/doc/nhc98/examples/CVS %%PORTDOCS%%@dirrm share/doc/nhc98/examples -%%PORTDOCS%%@dirrm share/doc/nhc98/hat/CVS %%PORTDOCS%%@dirrm share/doc/nhc98/hat -%%PORTDOCS%%@dirrm share/doc/nhc98/hmake/CVS %%PORTDOCS%%@dirrm share/doc/nhc98/hmake -%%PORTDOCS%%@dirrm share/doc/nhc98/implementation-notes/CVS %%PORTDOCS%%@dirrm share/doc/nhc98/implementation-notes -%%PORTDOCS%%@dirrm share/doc/nhc98/libs/CVS %%PORTDOCS%%@dirrm share/doc/nhc98/libs -%%PORTDOCS%%@dirrm share/doc/nhc98/CVS %%PORTDOCS%%@dirrm share/doc/nhc98 diff --git a/lang/nhc98/scripts/pre-install b/lang/nhc98/scripts/pre-install new file mode 100644 index 0000000..f7fcf3c --- /dev/null +++ b/lang/nhc98/scripts/pre-install @@ -0,0 +1,25 @@ +#!/bin/sh + +rm -f ${WRKSRC}/pkg-plist && touch ${WRKSRC}/pkg-plist + +MACHINE=`${WRKSRC}/script/harch` + +if [ `grep -c ghc ${WRKSRC}/lib/${MACHINE}/hmakerc` -gt 0 ] +then + echo "lib/nhc98/ix86-FreeBSD/hat-trans" >> ${WRKSRC}/pkg-plist + if [ ${WITH_TRACER} ] + then + ONEDIR=`grep ghc ${WRKSRC}/lib/${MACHINE}/hmakerc | grep import | head -1 | cut -d'"' -f2 | sed -e "s#${PREFIX}/##"` + GHCINCDIR=`dirname $ONEDIR` + GHCLIBDIR=`dirname $GHCINCDIR` + FILES=`ls ${WRKSRC}/lib/hat/ | grep 'hi$\|hx$' | sed -e "s#^.*/lib/hat/##g"` + echo "lib/nhc98/ix86-FreeBSD/libHShat.a" >> ${WRKSRC}/pkg-plist + echo "${GHCLIBDIR}/libHShat.a" >> ${WRKSRC}/pkg-plist + for file in ${FILES}; do + echo ${GHCINCDIR}/hat/${file} >> ${WRKSRC}/pkg-plist + done + echo "@dirrm ${GHCINCDIR}/hat" >> ${WRKSRC}/pkg-plist + fi +fi + +cat ${CURDIR}/pkg-plist >> ${WRKSRC}/pkg-plist |
