Update with vendor-patches:

- 'newtype'-bugfix
- install interface files for hierarchical libraries
- use generic URL in pkg-descr

4 files changed, 156 insertions, 2 deletions

diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile
index e8dcb18db744..7ee85534aca4 100644
--- a/lang/nhc98/Makefile
+++ b/lang/nhc98/Makefile
@@ -6,10 +6,13 @@
 
 PORTNAME=	nhc98
 PORTVERSION=	1.18
+PORTREVISION=	1
 CATEGORIES=	lang haskell
 MASTER_SITES=	ftp://ftp.cs.york.ac.uk/pub/haskell/${PORTNAME}/
-DISTNAME=	${PORTNAME}src-${PORTVERSION}
+DISTFILES=	${PORTNAME}src-${PORTVERSION}${EXTRACT_SUFX} ${PORTNAME}-${PORTVERSION}-library-interfaces${EXTRACT_SUFX}
 DIST_SUBDIR=	nhc98
+PATCH_SITES=	${MASTER_SITES}
+PATCHFILES=	patch-1.18-newtype
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	A fully-fledged compiler for Haskell 98
diff --git a/lang/nhc98/distinfo b/lang/nhc98/distinfo
index 43a9aae12c96..5a7b4f4e913d 100644
--- a/lang/nhc98/distinfo
+++ b/lang/nhc98/distinfo
@@ -1,2 +1,6 @@
 MD5 (nhc98/nhc98src-1.18.tar.gz) = f38b74481ec01a066cc9314b7bd18c90
 SIZE (nhc98/nhc98src-1.18.tar.gz) = 14509719
+MD5 (nhc98/nhc98-1.18-library-interfaces.tar.gz) = f99f413a85462fe719ea634fd319d94f
+SIZE (nhc98/nhc98-1.18-library-interfaces.tar.gz) = 116668
+MD5 (nhc98/patch-1.18-newtype) = b5e714c2065a622678fa8fe5fe970056
+SIZE (nhc98/patch-1.18-newtype) = 824
diff --git a/lang/nhc98/pkg-descr b/lang/nhc98/pkg-descr
index 0240db7f1c26..e7884c2fd9d3 100644
--- a/lang/nhc98/pkg-descr
+++ b/lang/nhc98/pkg-descr
@@ -4,7 +4,7 @@ aims to produce small executables that run in small amounts of memory. It comes
 with extensive tool support for automatic compilation, foreign language
 interfacing, heap and time profiling, tracing, and debugging.
 
-WWW: http://www.cs.york.ac.uk/fp/nhc98/
+WWW: http://www.haskell.org/nhc98/
 
 -- Oliver Braun
 obraun@informatik.unibw-muenchen.de
diff --git a/lang/nhc98/pkg-plist b/lang/nhc98/pkg-plist
index c6915b995ce9..23b2f9dc38b1 100644
--- a/lang/nhc98/pkg-plist
+++ b/lang/nhc98/pkg-plist
@@ -61,6 +61,153 @@ include/nhc98/mutlib.h
 include/nhc98/newbytecode.h
 include/nhc98/newmacros.h
 include/nhc98/node.h
+include/nhc98/packages/Cabal/Distribution/Compat/Directory.hi
+include/nhc98/packages/Cabal/Distribution/Compat/Exception.hi
+include/nhc98/packages/Cabal/Distribution/Compat/FilePath.hi
+include/nhc98/packages/Cabal/Distribution/Compat/RawSystem.hi
+include/nhc98/packages/Cabal/Distribution/Compat/ReadP.hi
+include/nhc98/packages/Cabal/Distribution/Extension.hi
+include/nhc98/packages/Cabal/Distribution/GetOpt.hi
+include/nhc98/packages/Cabal/Distribution/InstalledPackageInfo.hi
+include/nhc98/packages/Cabal/Distribution/License.hi
+include/nhc98/packages/Cabal/Distribution/Make.hi
+include/nhc98/packages/Cabal/Distribution/Package.hi
+include/nhc98/packages/Cabal/Distribution/PackageDescription.hi
+include/nhc98/packages/Cabal/Distribution/ParseUtils.hi
+include/nhc98/packages/Cabal/Distribution/PreProcess.hi
+include/nhc98/packages/Cabal/Distribution/PreProcess/Unlit.hi
+include/nhc98/packages/Cabal/Distribution/Setup.hi
+include/nhc98/packages/Cabal/Distribution/Simple.hi
+include/nhc98/packages/Cabal/Distribution/Simple/Build.hi
+include/nhc98/packages/Cabal/Distribution/Simple/Configure.hi
+include/nhc98/packages/Cabal/Distribution/Simple/GHCPackageConfig.hi
+include/nhc98/packages/Cabal/Distribution/Simple/Install.hi
+include/nhc98/packages/Cabal/Distribution/Simple/LocalBuildInfo.hi
+include/nhc98/packages/Cabal/Distribution/Simple/Register.hi
+include/nhc98/packages/Cabal/Distribution/Simple/SrcDist.hi
+include/nhc98/packages/Cabal/Distribution/Simple/Utils.hi
+include/nhc98/packages/Cabal/Distribution/Version.hi
+include/nhc98/packages/HUnit/Test/HUnit.hi
+include/nhc98/packages/HUnit/Test/HUnit/Base.hi
+include/nhc98/packages/HUnit/Test/HUnit/Lang.hi
+include/nhc98/packages/HUnit/Test/HUnit/Terminal.hi
+include/nhc98/packages/HUnit/Test/HUnit/Text.hi
+include/nhc98/packages/HaXml/Text/ParserCombinators/HuttonMeijerWallace.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/Combinators.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/Escape.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/Haskell2Xml.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/Html/Generate.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/Html/Parse.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/Html/Pretty.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/Lex.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/OneOfN.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/Parse.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/Pretty.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/Types.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/Validate.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/Verbatim.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/Wrappers.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/Xml2Haskell.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/Xtract/Combinators.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/Xtract/Lex.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/Xtract/Parse.hi
+include/nhc98/packages/QuickCheck/Debug/QuickCheck.hi
+include/nhc98/packages/QuickCheck/Debug/QuickCheck/Poly.hi
+include/nhc98/packages/QuickCheck/Debug/QuickCheck/Utils.hi
+include/nhc98/packages/QuickCheck/Test/QuickCheck.hi
+include/nhc98/packages/QuickCheck/Test/QuickCheck/Poly.hi
+include/nhc98/packages/QuickCheck/Test/QuickCheck/Utils.hi
+include/nhc98/packages/base/Control/Arrow.hi
+include/nhc98/packages/base/Control/Monad.hi
+include/nhc98/packages/base/Control/Monad/Fix.hi
+include/nhc98/packages/base/Data/Array.hi
+include/nhc98/packages/base/Data/Bits.hi
+include/nhc98/packages/base/Data/Bool.hi
+include/nhc98/packages/base/Data/Char.hi
+include/nhc98/packages/base/Data/Complex.hi
+include/nhc98/packages/base/Data/Dynamic.hi
+include/nhc98/packages/base/Data/Either.hi
+include/nhc98/packages/base/Data/Eq.hi
+include/nhc98/packages/base/Data/FiniteMap.hi
+include/nhc98/packages/base/Data/FunctorM.hi
+include/nhc98/packages/base/Data/HashTable.hi
+include/nhc98/packages/base/Data/IORef.hi
+include/nhc98/packages/base/Data/Int.hi
+include/nhc98/packages/base/Data/IntMap.hi
+include/nhc98/packages/base/Data/IntSet.hi
+include/nhc98/packages/base/Data/Ix.hi
+include/nhc98/packages/base/Data/List.hi
+include/nhc98/packages/base/Data/Map.hi
+include/nhc98/packages/base/Data/Maybe.hi
+include/nhc98/packages/base/Data/Monoid.hi
+include/nhc98/packages/base/Data/Ord.hi
+include/nhc98/packages/base/Data/PackedString.hi
+include/nhc98/packages/base/Data/Queue.hi
+include/nhc98/packages/base/Data/Ratio.hi
+include/nhc98/packages/base/Data/Set.hi
+include/nhc98/packages/base/Data/Tree.hi
+include/nhc98/packages/base/Data/Tuple.hi
+include/nhc98/packages/base/Data/Typeable.hi
+include/nhc98/packages/base/Data/Version.hi
+include/nhc98/packages/base/Data/Word.hi
+include/nhc98/packages/base/Debug/Trace.hi
+include/nhc98/packages/base/Foreign.hi
+include/nhc98/packages/base/Foreign/C.hi
+include/nhc98/packages/base/Foreign/C/Error.hi
+include/nhc98/packages/base/Foreign/C/String.hi
+include/nhc98/packages/base/Foreign/C/Types.hi
+include/nhc98/packages/base/Foreign/ForeignPtr.hi
+include/nhc98/packages/base/Foreign/Marshal.hi
+include/nhc98/packages/base/Foreign/Marshal/Alloc.hi
+include/nhc98/packages/base/Foreign/Marshal/Array.hi
+include/nhc98/packages/base/Foreign/Marshal/Error.hi
+include/nhc98/packages/base/Foreign/Marshal/Pool.hi
+include/nhc98/packages/base/Foreign/Marshal/Utils.hi
+include/nhc98/packages/base/Foreign/Ptr.hi
+include/nhc98/packages/base/Foreign/StablePtr.hi
+include/nhc98/packages/base/Foreign/Storable.hi
+include/nhc98/packages/base/NHC/SizedTypes.hi
+include/nhc98/packages/base/System/CPUTime.hi
+include/nhc98/packages/base/System/Cmd.hi
+include/nhc98/packages/base/System/Console/GetOpt.hi
+include/nhc98/packages/base/System/Directory.hi
+include/nhc98/packages/base/System/Directory/Internals.hi
+include/nhc98/packages/base/System/Environment.hi
+include/nhc98/packages/base/System/Exit.hi
+include/nhc98/packages/base/System/IO.hi
+include/nhc98/packages/base/System/IO/Error.hi
+include/nhc98/packages/base/System/IO/Unsafe.hi
+include/nhc98/packages/base/System/Info.hi
+include/nhc98/packages/base/System/Locale.hi
+include/nhc98/packages/base/System/Mem.hi
+include/nhc98/packages/base/System/Random.hi
+include/nhc98/packages/base/System/Time.hi
+include/nhc98/packages/base/Text/Html.hi
+include/nhc98/packages/base/Text/Html/BlockTable.hi
+include/nhc98/packages/base/Text/ParserCombinators/ReadP.hi
+include/nhc98/packages/base/Text/PrettyPrint.hi
+include/nhc98/packages/base/Text/PrettyPrint/HughesPJ.hi
+include/nhc98/packages/base/Text/Printf.hi
+include/nhc98/packages/base/Text/Read.hi
+include/nhc98/packages/base/Text/Regex.hi
+include/nhc98/packages/base/Text/Regex/Posix.hi
+include/nhc98/packages/base/Text/Show.hi
+include/nhc98/packages/base/Text/Show/Functions.hi
+include/nhc98/packages/haskell-src/Language/Haskell/Lexer.hi
+include/nhc98/packages/haskell-src/Language/Haskell/ParseMonad.hi
+include/nhc98/packages/haskell-src/Language/Haskell/ParseUtils.hi
+include/nhc98/packages/haskell-src/Language/Haskell/Parser.hi
+include/nhc98/packages/haskell-src/Language/Haskell/Pretty.hi
+include/nhc98/packages/haskell-src/Language/Haskell/Syntax.hi
+include/nhc98/packages/parsec/Text/ParserCombinators/Parsec.hi
+include/nhc98/packages/parsec/Text/ParserCombinators/Parsec/Char.hi
+include/nhc98/packages/parsec/Text/ParserCombinators/Parsec/Combinator.hi
+include/nhc98/packages/parsec/Text/ParserCombinators/Parsec/Error.hi
+include/nhc98/packages/parsec/Text/ParserCombinators/Parsec/Expr.hi
+include/nhc98/packages/parsec/Text/ParserCombinators/Parsec/Perm.hi
+include/nhc98/packages/parsec/Text/ParserCombinators/Parsec/Pos.hi
+include/nhc98/packages/parsec/Text/ParserCombinators/Parsec/Prim.hi
 include/nhc98/runtime.h
 include/nhc98/stableptr.h
 include/nhc98/twopass.h