From de4a6f5935c7c0b2407da2cc84c23eee19099cf8 Mon Sep 17 00:00:00 2001 From: ijliao Date: Sun, 16 Jun 2002 19:13:20 +0000 Subject: upgrade to 1.14 PR: 39368 Submitted by: maintainer --- lang/nhc98/Makefile | 50 +---- lang/nhc98/distinfo | 5 +- lang/nhc98/files/patch-Makefile | 12 +- lang/nhc98/files/patch-include::localmalloc.h | 9 - lang/nhc98/files/patch-script::confhat | 9 - lang/nhc98/files/patch-src::greencard::Makefile | 11 -- lang/nhc98/files/patch-src::hat::lib::Makefile | 11 -- lang/nhc98/files/patch-src::hmake::Makefile | 11 -- lang/nhc98/files/patch-src::hp2graph::Makefile | 11 -- lang/nhc98/files/patch-src::prelude::Makefile | 23 --- lang/nhc98/files/patch-src::runtime::Makefile | 20 -- lang/nhc98/pkg-plist | 239 ++++++++++-------------- lang/nhc98/scripts/pre-install | 25 --- 13 files changed, 107 insertions(+), 329 deletions(-) delete mode 100644 lang/nhc98/files/patch-include::localmalloc.h delete mode 100644 lang/nhc98/files/patch-script::confhat delete mode 100644 lang/nhc98/files/patch-src::greencard::Makefile delete mode 100644 lang/nhc98/files/patch-src::hat::lib::Makefile delete mode 100644 lang/nhc98/files/patch-src::hmake::Makefile delete mode 100644 lang/nhc98/files/patch-src::hp2graph::Makefile delete mode 100644 lang/nhc98/files/patch-src::prelude::Makefile delete mode 100644 lang/nhc98/files/patch-src::runtime::Makefile delete mode 100644 lang/nhc98/scripts/pre-install (limited to 'lang') diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile index 90115ce..e3a9d764 100644 --- a/lang/nhc98/Makefile +++ b/lang/nhc98/Makefile @@ -5,24 +5,14 @@ # $FreeBSD$ PORTNAME= nhc98 -PORTVERSION= 1.12 +PORTVERSION= 1.14 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.12-ranlib \ - patch-1.12-hmake-config \ - patch-1.12-getEnv - MAINTAINER= obraun@informatik.unibw-muenchen.de -.if defined(WITH_TRACER) -RUN_DEPENDS= ${LOCALBASE}/jdk1.1.8/bin/java:${PORTSDIR}/java/jdk11 -BUILD_DEPENDS= ${LOCALBASE}/jdk1.1.8/bin/javac:${PORTSDIR}/java/jdk11 -.endif - .include .if ${OSVERSION} >= 500000 @@ -30,15 +20,6 @@ BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc .endif WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -PLIST= ${WRKSRC}/pkg-plist - -.if !defined(WITH_TRACER) -ALL_TARGET= basic -PLIST_SUB+= TRACER="@comment " -.else -PLIST_SUB+= TRACER="" -MAKE_ENV+= PATH=${PREFIX}/jdk1.1.8/bin:$$PATH -.endif USE_GMAKE= yes HAS_CONFIGURE= yes @@ -54,21 +35,13 @@ CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/nhc98 +docs MAN1= harch.1 hmake.1 hp2graph.1 nhc98.1 \ hat-detect.1 hat-observe.1 hat-stack.1 hat-trail.1 -pre-fetch: -.if !defined(WITH_TRACER) - @${ECHO} "" - @${ECHO} " To build nhc98 with the tracer (requires JAVA)" - @${ECHO} " define WITH_TRACER" - @${ECHO} "" -.else - @${ECHO} "" - @${ECHO} " Building nhc98 with the tracer (requires JAVA)" - @${ECHO} "" -.endif - post-patch: @${REINPLACE_CMD} -e 's|-O3|${CFLAGS}|' ${WRKSRC}/Makefile.inc +post-configure: + @${ECHO} "LIBDIR=${PREFIX}/lib/nhc98" \ + >> ${WRKSRC}/targets/ix86-FreeBSD/config.cache + pre-install: .if exists(${PREFIX}/bin/hmake) && !defined(OVERRIDE_HMAKE) @${ECHO} "" @@ -78,19 +51,6 @@ pre-install: @${ECHO} "" @${FALSE} .endif -# We need this to ensure that the libs will be installed into -# ${PREFIX}/lib/nhc98. Otherwise the libs will be installed -# into the build directory. The configure option won't work in the -# ports system. - ${RM} -f ${WRKSRC}/include/*.orig - ${SED} -e "s#LIBDIR=.*##" \ - < ${WRKSRC}/targets/ix86-FreeBSD/config.cache \ - > ${WRKSRC}/targets/ix86-FreeBSD/config.cache.fix1 - ${ECHO} "LIBDIR=${PREFIX}/lib/nhc98" \ - >> ${WRKSRC}/targets/ix86-FreeBSD/config.cache.fix1 - ${RM} ${WRKSRC}/targets/ix86-FreeBSD/config.cache - ${MV} ${WRKSRC}/targets/ix86-FreeBSD/config.cache.fix1 \ - ${WRKSRC}/targets/ix86-FreeBSD/config.cache post-install: ${SED} -e "s#/usr/doc/nhc98#${PREFIX}/share/doc/nhc98#" \ diff --git a/lang/nhc98/distinfo b/lang/nhc98/distinfo index 233beff..62b2d02 100644 --- a/lang/nhc98/distinfo +++ b/lang/nhc98/distinfo @@ -1,4 +1 @@ -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 +MD5 (nhc98/nhc98src-1.14.tar.gz) = 2d19e65360e0370cb88cb0adad3014bb diff --git a/lang/nhc98/files/patch-Makefile b/lang/nhc98/files/patch-Makefile index 0df5f2d..944bdf4 100644 --- a/lang/nhc98/files/patch-Makefile +++ b/lang/nhc98/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig Fri Mar 15 20:32:19 2002 -+++ Makefile Fri Mar 15 20:33:50 2002 -@@ -143,15 +143,15 @@ +--- Makefile.orig Fri Jun 14 18:23:12 2002 ++++ Makefile Fri Jun 14 18:24:00 2002 +@@ -141,15 +141,15 @@ TARGDIR= targets TARGETS= runtime prelude greencard hp2graph hattools \ @@ -23,7 +23,7 @@ .PHONY: default basic all tracer compiler help config install hat hattools -@@ -185,8 +185,8 @@ +@@ -183,8 +183,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 @@ -32,9 +32,9 @@ +basic-gcc: runtime prelude-gcc pragma-gcc compiler-gcc \ + greencard-gcc hmake-gcc - all-$(BUILDCOMP): basic-$(BUILDCOMP) heapprofile timeprofile tracer hoodui + all-$(BUILDCOMP): basic-$(BUILDCOMP) heapprofile timeprofile #tracer #hoodui -@@ -206,9 +206,9 @@ +@@ -204,9 +204,9 @@ compiler-ghc traceruntime traceprelude hattools hat-ghc tracer-hbc: $(PRAGMA) runtime hmake-hbc greencard-hbc \ compiler-hbc traceruntime traceprelude hattools diff --git a/lang/nhc98/files/patch-include::localmalloc.h b/lang/nhc98/files/patch-include::localmalloc.h deleted file mode 100644 index 67a3ad4..0000000 --- a/lang/nhc98/files/patch-include::localmalloc.h +++ /dev/null @@ -1,9 +0,0 @@ ---- 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 - #else --#include -+#include - #endif diff --git a/lang/nhc98/files/patch-script::confhat b/lang/nhc98/files/patch-script::confhat deleted file mode 100644 index b117588..0000000 --- a/lang/nhc98/files/patch-script::confhat +++ /dev/null @@ -1,9 +0,0 @@ ---- 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 > ${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 -- cgit v1.1