From 2c49d2bc15f104cac75a02960684cd1b663c8b95 Mon Sep 17 00:00:00 2001 From: kristerw Date: Thu, 12 May 2005 17:53:29 +0000 Subject: Correct PLIST for ports other than i386. Fix a build issue for Darwin. Bump PKGREVISION. --- lang/nhc98/Makefile | 3 +- lang/nhc98/PLIST | 178 ++++++++++++++++++++++---------------------- lang/nhc98/distinfo | 4 +- lang/nhc98/patches/patch-aa | 20 +++-- 4 files changed, 108 insertions(+), 97 deletions(-) (limited to 'lang') diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile index 4b709a6e293..ccaaf47ce30 100644 --- a/lang/nhc98/Makefile +++ b/lang/nhc98/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.34 2005/05/01 22:55:07 kristerw Exp $ +# $NetBSD: Makefile,v 1.35 2005/05/12 17:53:29 kristerw Exp $ DISTNAME= nhc98src-1.18.tar.gz PKGNAME= nhc98-1.18 +PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= ftp://ftp.cs.york.ac.uk/pub/haskell/nhc98/ DISTFILES= nhc98src-1.18.tar.gz \ diff --git a/lang/nhc98/PLIST b/lang/nhc98/PLIST index 07916ba45e5..d0f74974935 100644 --- a/lang/nhc98/PLIST +++ b/lang/nhc98/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2005/05/01 22:55:07 kristerw Exp $ +@comment $NetBSD: PLIST,v 1.7 2005/05/12 17:53:29 kristerw Exp $ bin/cpphs bin/greencard-nhc98 bin/harch @@ -212,93 +212,93 @@ include/nhc98/packages/parsec/Text/ParserCombinators/Parsec/Prim.hi include/nhc98/runtime.h include/nhc98/stableptr.h include/nhc98/twopass.h -lib/hmake/ix86-${OPSYS}/HInteractive -lib/hmake/ix86-${OPSYS}/MkConfig -lib/hmake/ix86-${OPSYS}/MkProg -lib/hmake/ix86-${OPSYS}/Older -lib/hmake/ix86-${OPSYS}/hmakerc +lib/hmake/${HARCH}/HInteractive +lib/hmake/${HARCH}/MkConfig +lib/hmake/${HARCH}/MkProg +lib/hmake/${HARCH}/Older +lib/hmake/${HARCH}/hmakerc lib/nhc98/hood.jar -lib/nhc98/ix86-${OPSYS}/Array.z.a -lib/nhc98/ix86-${OPSYS}/BinArray.z.a -lib/nhc98/ix86-${OPSYS}/Binary.z.a -lib/nhc98/ix86-${OPSYS}/Bit.z.a -lib/nhc98/ix86-${OPSYS}/CPUTime.z.a -lib/nhc98/ix86-${OPSYS}/CString.z.a -lib/nhc98/ix86-${OPSYS}/Char.z.a -lib/nhc98/ix86-${OPSYS}/Complex.z.a -lib/nhc98/ix86-${OPSYS}/DErrNo.z.a -lib/nhc98/ix86-${OPSYS}/Directory.z.a -lib/nhc98/ix86-${OPSYS}/Driver.z.a -lib/nhc98/ix86-${OPSYS}/FFI.z.a -lib/nhc98/ix86-${OPSYS}/GreenCard.z.a -lib/nhc98/ix86-${OPSYS}/IO.z.a -lib/nhc98/ix86-${OPSYS}/IOExtras.z.a -lib/nhc98/ix86-${OPSYS}/Ix.z.a -lib/nhc98/ix86-${OPSYS}/List.z.a -lib/nhc98/ix86-${OPSYS}/Locale.z.a -lib/nhc98/ix86-${OPSYS}/Maybe.z.a -lib/nhc98/ix86-${OPSYS}/Monad.z.a -lib/nhc98/ix86-${OPSYS}/NonStdEval.z.a -lib/nhc98/ix86-${OPSYS}/NonStdGetPID.z.a -lib/nhc98/ix86-${OPSYS}/NonStdProfile.z.a -lib/nhc98/ix86-${OPSYS}/NonStdTrace.z.a -lib/nhc98/ix86-${OPSYS}/NonStdUnsafeCoerce.z.a -lib/nhc98/ix86-${OPSYS}/Numeric.z.a -lib/nhc98/ix86-${OPSYS}/Observe.z.a -lib/nhc98/ix86-${OPSYS}/PackedString.z.a -lib/nhc98/ix86-${OPSYS}/Prelude.a -lib/nhc98/ix86-${OPSYS}/Prelude.p.a -lib/nhc98/ix86-${OPSYS}/PreludeAll.z.a -lib/nhc98/ix86-${OPSYS}/Random.z.a -lib/nhc98/ix86-${OPSYS}/Ratio.z.a -lib/nhc98/ix86-${OPSYS}/Runtime.a -lib/nhc98/ix86-${OPSYS}/Runtime.p.a -lib/nhc98/ix86-${OPSYS}/Runtime.z.a -lib/nhc98/ix86-${OPSYS}/System.z.a -lib/nhc98/ix86-${OPSYS}/Time.z.a -lib/nhc98/ix86-${OPSYS}/UnboxedArray.z.a -lib/nhc98/ix86-${OPSYS}/Warning.z.a -lib/nhc98/ix86-${OPSYS}/config -lib/nhc98/ix86-${OPSYS}/cpphs -lib/nhc98/ix86-${OPSYS}/greencard-nhc98 -lib/nhc98/ix86-${OPSYS}/hmake-PRAGMA -lib/nhc98/ix86-${OPSYS}/hp2graph -lib/nhc98/ix86-${OPSYS}/hsc2hs -lib/nhc98/ix86-${OPSYS}/libHSCabal.a -lib/nhc98/ix86-${OPSYS}/libHSCabal.p.a -lib/nhc98/ix86-${OPSYS}/libHSCabal.z.a -lib/nhc98/ix86-${OPSYS}/libHSHUnit.a -lib/nhc98/ix86-${OPSYS}/libHSHUnit.p.a -lib/nhc98/ix86-${OPSYS}/libHSHUnit.z.a -lib/nhc98/ix86-${OPSYS}/libHSHaXml.a -lib/nhc98/ix86-${OPSYS}/libHSHaXml.p.a -lib/nhc98/ix86-${OPSYS}/libHSHaXml.z.a -lib/nhc98/ix86-${OPSYS}/libHSQuickCheck.a -lib/nhc98/ix86-${OPSYS}/libHSQuickCheck.p.a -lib/nhc98/ix86-${OPSYS}/libHSQuickCheck.z.a -lib/nhc98/ix86-${OPSYS}/libHSbase.a -lib/nhc98/ix86-${OPSYS}/libHSbase.p.a -lib/nhc98/ix86-${OPSYS}/libHSbase.z.a -lib/nhc98/ix86-${OPSYS}/libHShaskell-src.a -lib/nhc98/ix86-${OPSYS}/libHShaskell-src.p.a -lib/nhc98/ix86-${OPSYS}/libHShaskell-src.z.a -lib/nhc98/ix86-${OPSYS}/libHSparsec.a -lib/nhc98/ix86-${OPSYS}/libHSparsec.p.a -lib/nhc98/ix86-${OPSYS}/libHSparsec.z.a -lib/nhc98/ix86-${OPSYS}/main.o -lib/nhc98/ix86-${OPSYS}/main.p.o -lib/nhc98/ix86-${OPSYS}/main.z.o -lib/nhc98/ix86-${OPSYS}/mutator.o -lib/nhc98/ix86-${OPSYS}/mutator.p.o -lib/nhc98/ix86-${OPSYS}/mutator.z.o -lib/nhc98/ix86-${OPSYS}/mutlib.o -lib/nhc98/ix86-${OPSYS}/mutlib.p.o -lib/nhc98/ix86-${OPSYS}/mutlib.z.o -lib/nhc98/ix86-${OPSYS}/nhc98comp -lib/nhc98/ix86-${OPSYS}/nhc98heap -lib/nhc98/ix86-${OPSYS}/tprofprel1.z.o -lib/nhc98/ix86-${OPSYS}/tprofprel2.z.o -lib/nhc98/ix86-${OPSYS}/tprofprel3.z.o +lib/nhc98/${HARCH}/Array.z.a +lib/nhc98/${HARCH}/BinArray.z.a +lib/nhc98/${HARCH}/Binary.z.a +lib/nhc98/${HARCH}/Bit.z.a +lib/nhc98/${HARCH}/CPUTime.z.a +lib/nhc98/${HARCH}/CString.z.a +lib/nhc98/${HARCH}/Char.z.a +lib/nhc98/${HARCH}/Complex.z.a +lib/nhc98/${HARCH}/DErrNo.z.a +lib/nhc98/${HARCH}/Directory.z.a +lib/nhc98/${HARCH}/Driver.z.a +lib/nhc98/${HARCH}/FFI.z.a +lib/nhc98/${HARCH}/GreenCard.z.a +lib/nhc98/${HARCH}/IO.z.a +lib/nhc98/${HARCH}/IOExtras.z.a +lib/nhc98/${HARCH}/Ix.z.a +lib/nhc98/${HARCH}/List.z.a +lib/nhc98/${HARCH}/Locale.z.a +lib/nhc98/${HARCH}/Maybe.z.a +lib/nhc98/${HARCH}/Monad.z.a +lib/nhc98/${HARCH}/NonStdEval.z.a +lib/nhc98/${HARCH}/NonStdGetPID.z.a +lib/nhc98/${HARCH}/NonStdProfile.z.a +lib/nhc98/${HARCH}/NonStdTrace.z.a +lib/nhc98/${HARCH}/NonStdUnsafeCoerce.z.a +lib/nhc98/${HARCH}/Numeric.z.a +lib/nhc98/${HARCH}/Observe.z.a +lib/nhc98/${HARCH}/PackedString.z.a +lib/nhc98/${HARCH}/Prelude.a +lib/nhc98/${HARCH}/Prelude.p.a +lib/nhc98/${HARCH}/PreludeAll.z.a +lib/nhc98/${HARCH}/Random.z.a +lib/nhc98/${HARCH}/Ratio.z.a +lib/nhc98/${HARCH}/Runtime.a +lib/nhc98/${HARCH}/Runtime.p.a +lib/nhc98/${HARCH}/Runtime.z.a +lib/nhc98/${HARCH}/System.z.a +lib/nhc98/${HARCH}/Time.z.a +lib/nhc98/${HARCH}/UnboxedArray.z.a +lib/nhc98/${HARCH}/Warning.z.a +lib/nhc98/${HARCH}/config +lib/nhc98/${HARCH}/cpphs +lib/nhc98/${HARCH}/greencard-nhc98 +lib/nhc98/${HARCH}/hmake-PRAGMA +lib/nhc98/${HARCH}/hp2graph +lib/nhc98/${HARCH}/hsc2hs +lib/nhc98/${HARCH}/libHSCabal.a +lib/nhc98/${HARCH}/libHSCabal.p.a +lib/nhc98/${HARCH}/libHSCabal.z.a +lib/nhc98/${HARCH}/libHSHUnit.a +lib/nhc98/${HARCH}/libHSHUnit.p.a +lib/nhc98/${HARCH}/libHSHUnit.z.a +lib/nhc98/${HARCH}/libHSHaXml.a +lib/nhc98/${HARCH}/libHSHaXml.p.a +lib/nhc98/${HARCH}/libHSHaXml.z.a +lib/nhc98/${HARCH}/libHSQuickCheck.a +lib/nhc98/${HARCH}/libHSQuickCheck.p.a +lib/nhc98/${HARCH}/libHSQuickCheck.z.a +lib/nhc98/${HARCH}/libHSbase.a +lib/nhc98/${HARCH}/libHSbase.p.a +lib/nhc98/${HARCH}/libHSbase.z.a +lib/nhc98/${HARCH}/libHShaskell-src.a +lib/nhc98/${HARCH}/libHShaskell-src.p.a +lib/nhc98/${HARCH}/libHShaskell-src.z.a +lib/nhc98/${HARCH}/libHSparsec.a +lib/nhc98/${HARCH}/libHSparsec.p.a +lib/nhc98/${HARCH}/libHSparsec.z.a +lib/nhc98/${HARCH}/main.o +lib/nhc98/${HARCH}/main.p.o +lib/nhc98/${HARCH}/main.z.o +lib/nhc98/${HARCH}/mutator.o +lib/nhc98/${HARCH}/mutator.p.o +lib/nhc98/${HARCH}/mutator.z.o +lib/nhc98/${HARCH}/mutlib.o +lib/nhc98/${HARCH}/mutlib.p.o +lib/nhc98/${HARCH}/mutlib.z.o +lib/nhc98/${HARCH}/nhc98comp +lib/nhc98/${HARCH}/nhc98heap +lib/nhc98/${HARCH}/tprofprel1.z.o +lib/nhc98/${HARCH}/tprofprel2.z.o +lib/nhc98/${HARCH}/tprofprel3.z.o man/man1/harch.1 man/man1/hi.1 man/man1/hmake.1 @@ -404,9 +404,9 @@ share/doc/nhc98/york-release.html @dirrm share/doc/nhc98/implementation-notes @dirrm share/doc/nhc98/libs @dirrm share/doc/nhc98 -@dirrm lib/nhc98/ix86-${OPSYS} +@dirrm lib/nhc98/${HARCH} @dirrm lib/nhc98 -@dirrm lib/hmake/ix86-${OPSYS} +@dirrm lib/hmake/${HARCH} @dirrm lib/hmake @dirrm include/nhc98/packages/parsec/Text/ParserCombinators/Parsec @dirrm include/nhc98/packages/parsec/Text/ParserCombinators diff --git a/lang/nhc98/distinfo b/lang/nhc98/distinfo index 906477d1c2f..768d39778ad 100644 --- a/lang/nhc98/distinfo +++ b/lang/nhc98/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2005/05/01 22:55:07 kristerw Exp $ +$NetBSD: distinfo,v 1.15 2005/05/12 17:53:29 kristerw Exp $ SHA1 (nhc98src-1.18.tar.gz) = 7de78b449f1e7efc9a12107ff26b441e35b34625 RMD160 (nhc98src-1.18.tar.gz) = 7b643958cd68c7417c50a66374e1ab20d90d433d @@ -6,6 +6,6 @@ Size (nhc98src-1.18.tar.gz) = 14509719 bytes SHA1 (nhc98-1.18-library-interfaces.tar.gz) = 1a149fc6d01a4fcab4ec65f07b00f1d13cdbe3d5 RMD160 (nhc98-1.18-library-interfaces.tar.gz) = 480e8c8f9985d396e29661dedf489a5e1bb9c9ba Size (nhc98-1.18-library-interfaces.tar.gz) = 116668 bytes -SHA1 (patch-aa) = ba484e67af2574abda0708f882e4c5f973ef125e +SHA1 (patch-aa) = b7fe50f0a79c935e980daa9b2d5bb163bf31124e SHA1 (patch-ag) = 0c92edc1d6938afe178b5acaacec889e699f4b51 SHA1 (patch-ah) = 9121f63bbc3d1de26a1b57bab53787e4e8f9a327 diff --git a/lang/nhc98/patches/patch-aa b/lang/nhc98/patches/patch-aa index 5a5ed252221..f8585d20e32 100644 --- a/lang/nhc98/patches/patch-aa +++ b/lang/nhc98/patches/patch-aa @@ -1,7 +1,17 @@ -$NetBSD: patch-aa,v 1.6 2003/03/19 23:14:35 kristerw Exp $ ---- configure.orig Wed Mar 12 23:55:24 2003 -+++ configure Wed Mar 12 23:57:47 2003 -@@ -363,13 +363,13 @@ +$NetBSD: patch-aa,v 1.7 2005/05/12 17:53:29 kristerw Exp $ + +--- configure.orig Fri Mar 11 10:32:56 2005 ++++ configure Wed May 11 20:49:48 2005 +@@ -42,7 +42,7 @@ + USER=${USER-`whoami 2>/dev/null`} + MACHINE=`script/harch` + case $MACHINE in +- powerpc-Darwin[56]) CCC=${CC-cc};; ++ powerpc-Darwin*) CCC=gcc;; + *) CCC=${CC-gcc};; + esac + PWD=`pwd` +@@ -382,13 +382,13 @@ if $CCC -o curses curses.c >/dev/null 2>/dev/null then CURSES="" else @@ -18,7 +28,7 @@ $NetBSD: patch-aa,v 1.6 2003/03/19 23:14:35 kristerw Exp $ then CURSES="-lcurses -ltermcap" else CURSES="-ltermcap -lcurses" # don't know a good default? fi -@@ -386,10 +386,10 @@ +@@ -405,10 +405,10 @@ echo -n "Testing for the readline library: " echo 'main(){readline();}' >rd.c -- cgit v1.2.3