* Add upstream patch file.

* Add ONLY_FOR_ARCHS=i386.
* Utilize DOCSDIR.
* Use CONFLICTS instead of checking conflict with hs-hmake in the ports
  Makefile.

3 files changed, 104 insertions, 108 deletions

diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile
index a5dd038b264..977984ec171 100644
--- a/lang/nhc98/Makefile
+++ b/lang/nhc98/Makefile
@@ -13,11 +13,14 @@ DISTNAME=	${PORTNAME}src-${PORTVERSION}
 DIST_SUBDIR=	nhc98
 
 PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	patch-1.16-typesyn
+PATCHFILES=	patch-1.16-typesyn \
+		patch-1.16-ghc6
 
 MAINTAINER=	obraun@FreeBSD.org
 COMMENT=	A fully-fledged compiler for Haskell 98
 
+ONLY_FOR_ARCHS=	i386
+
 USE_REINPLACE=	yes
 
 .include <bsd.port.pre.mk>
@@ -36,11 +39,13 @@ CONFIGURE_ARGS+=	--buildwith=ghc
 .endif
 
 .if !defined(NOPORTDOCS)
-CONFIGURE_ARGS+=	--docdir=${PREFIX}/share/doc/nhc98 +docs
+CONFIGURE_ARGS+=	--docdir=${DOCSDIR} +docs
 .endif
 
 MAN1=		harch.1 hmake.1 hp2graph.1 nhc98.1
 
+CONFLICTS=	hs-hmake-*
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O3|${CFLAGS}|' ${WRKSRC}/Makefile.inc
 .for file in Decl FillIn Process
@@ -52,16 +57,6 @@ post-configure:
 	@${ECHO} "LIBDIR=${PREFIX}/lib/nhc98" \
 		>> ${WRKSRC}/targets/ix86-FreeBSD/config.cache
 
-pre-install:
-.if exists(${PREFIX}/bin/hmake) && !defined(OVERRIDE_HMAKE)
-	@${ECHO} ""
-	@${ECHO} "It seems that there is already a version of hmake installed on"
-	@${ECHO} "this system. Since hmake is part of nhc98, please deinstall it,"
-	@${ECHO} "or define OVERRIDE_HMAKE to override the installed version."
-	@${ECHO} ""
-	@${FALSE}
-.endif
-
 post-install:
 	${SED} -e "s#/usr/doc/nhc98#${PREFIX}/share/doc/nhc98#" \
 	       < ${WRKSRC}/man/nhc98.1 > ${WRKSRC}/man/nhc98.1.fix
@@ -69,7 +64,7 @@ post-install:
 	${RM} ${WRKSRC}/man/nhc98.1.fix
 .if !defined(NOPORTDOCS)
 .for directory in . bugs examples hmake implementation-notes libs
-	${RM} -r ${PREFIX}/share/doc/nhc98/${directory}/CVS
+	${RM} -r ${DOCSDIR}/${directory}/CVS
 .endfor
 .endif
 
diff --git a/lang/nhc98/distinfo b/lang/nhc98/distinfo
index 78740812b13..fd6dbbf5a76 100644
--- a/lang/nhc98/distinfo
+++ b/lang/nhc98/distinfo
@@ -1,2 +1,3 @@
 MD5 (nhc98/nhc98src-1.16.tar.gz) = a62866b8d966108cba325d0322a3010d
 MD5 (nhc98/patch-1.16-typesyn) = 38b1505acbcbc5a91e077304e978ab82
+MD5 (nhc98/patch-1.16-ghc6) = 4776727cd16c4ba932110119b06c0064
diff --git a/lang/nhc98/pkg-plist b/lang/nhc98/pkg-plist
index 5098fcc71c2..c62cdae6dbb 100644
--- a/lang/nhc98/pkg-plist
+++ b/lang/nhc98/pkg-plist
@@ -201,101 +201,101 @@ lib/hmake/ix86-FreeBSD/MkConfig
 lib/hmake/ix86-FreeBSD/MkProg
 lib/hmake/ix86-FreeBSD/Older
 lib/hmake/ix86-FreeBSD/hmakerc
-%%PORTDOCS%%share/doc/nhc98/98.html
-%%PORTDOCS%%share/doc/nhc98/CcallingHaskell.html
-%%PORTDOCS%%share/doc/nhc98/bugs.html
-%%PORTDOCS%%share/doc/nhc98/compiler-options.html
-%%PORTDOCS%%share/doc/nhc98/config.html
-%%PORTDOCS%%share/doc/nhc98/contrib.html
-%%PORTDOCS%%share/doc/nhc98/copyright.html
-%%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/fig1.gif
-%%PORTDOCS%%share/doc/nhc98/fig2.html
-%%PORTDOCS%%share/doc/nhc98/fig3.html
-%%PORTDOCS%%share/doc/nhc98/fig4.html
-%%PORTDOCS%%share/doc/nhc98/greencard-york.html
-%%PORTDOCS%%share/doc/nhc98/greencard.html
-%%PORTDOCS%%share/doc/nhc98/heapprof.html
-%%PORTDOCS%%share/doc/nhc98/history.html
-%%PORTDOCS%%share/doc/nhc98/history98.html
-%%PORTDOCS%%share/doc/nhc98/index.html
-%%PORTDOCS%%share/doc/nhc98/install.html
-%%PORTDOCS%%share/doc/nhc98/libraries.html
-%%PORTDOCS%%share/doc/nhc98/limits.html
-%%PORTDOCS%%share/doc/nhc98/limits.html.inst
-%%PORTDOCS%%share/doc/nhc98/maillist.html
-%%PORTDOCS%%share/doc/nhc98/new_tiny.gif
-%%PORTDOCS%%share/doc/nhc98/nhc13.gif
-%%PORTDOCS%%share/doc/nhc98/nhc98.gif
-%%PORTDOCS%%share/doc/nhc98/runtime-options.html
-%%PORTDOCS%%share/doc/nhc98/status.html
-%%PORTDOCS%%share/doc/nhc98/todo.html
-%%PORTDOCS%%share/doc/nhc98/tprof.html
-%%PORTDOCS%%share/doc/nhc98/tracer.html
-%%PORTDOCS%%share/doc/nhc98/windows.html
-%%PORTDOCS%%share/doc/nhc98/york-release.html
-%%PORTDOCS%%share/doc/nhc98/bugs/Nhc13Test1.hs
-%%PORTDOCS%%share/doc/nhc98/bugs/Nhc13Test10.hs
-%%PORTDOCS%%share/doc/nhc98/bugs/Nhc13Test13.hs
-%%PORTDOCS%%share/doc/nhc98/bugs/README
-%%PORTDOCS%%share/doc/nhc98/bugs/nhc13test1.hs
-%%PORTDOCS%%share/doc/nhc98/bugs/nhc13test10.hs
-%%PORTDOCS%%share/doc/nhc98/bugs/nhc13test11.hs
-%%PORTDOCS%%share/doc/nhc98/bugs/nhc13test12.hs
-%%PORTDOCS%%share/doc/nhc98/bugs/nhc13test13.hs
-%%PORTDOCS%%share/doc/nhc98/bugs/nhc13test14.hs
-%%PORTDOCS%%share/doc/nhc98/bugs/nhc13test15.hs
-%%PORTDOCS%%share/doc/nhc98/bugs/nhc13test16.hs
-%%PORTDOCS%%share/doc/nhc98/bugs/nhc13test17.hs
-%%PORTDOCS%%share/doc/nhc98/bugs/nhc13test18.hs
-%%PORTDOCS%%share/doc/nhc98/bugs/nhc13test19.hs
-%%PORTDOCS%%share/doc/nhc98/bugs/nhc13test2.hs
-%%PORTDOCS%%share/doc/nhc98/bugs/nhc13test20.hs
-%%PORTDOCS%%share/doc/nhc98/bugs/nhc13test3.hs
-%%PORTDOCS%%share/doc/nhc98/bugs/nhc13test4.hs
-%%PORTDOCS%%share/doc/nhc98/bugs/nhc13test5.hs
-%%PORTDOCS%%share/doc/nhc98/bugs/nhc13test6.hs
-%%PORTDOCS%%share/doc/nhc98/bugs/nhc13test7.hs
-%%PORTDOCS%%share/doc/nhc98/bugs/nhc13test8.hs
-%%PORTDOCS%%share/doc/nhc98/bugs/nhc13test9.hs
-%%PORTDOCS%%share/doc/nhc98/bugs/nhc98test19.hs
-%%PORTDOCS%%share/doc/nhc98/bugs/nhc98test20.hs
-%%PORTDOCS%%share/doc/nhc98/bugs/nhc98test21.hs
-%%PORTDOCS%%share/doc/nhc98/bugs/nhc98test22.hs
-%%PORTDOCS%%share/doc/nhc98/bugs/nhc98test23.hs
-%%PORTDOCS%%share/doc/nhc98/examples/ZooQuiz.hs
-%%PORTDOCS%%share/doc/nhc98/hmake/bugs.html
-%%PORTDOCS%%share/doc/nhc98/hmake/changes.html
-%%PORTDOCS%%share/doc/nhc98/hmake/hi-commands.html
-%%PORTDOCS%%share/doc/nhc98/hmake/hmake-config.html
-%%PORTDOCS%%share/doc/nhc98/hmake/hmake.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/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/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/index.html
-%%PORTDOCS%%@dirrm share/doc/nhc98/bugs
-%%PORTDOCS%%@dirrm share/doc/nhc98/examples
-%%PORTDOCS%%@dirrm share/doc/nhc98/hmake
-%%PORTDOCS%%@dirrm share/doc/nhc98/implementation-notes
-%%PORTDOCS%%@dirrm share/doc/nhc98/libs
-%%PORTDOCS%%@dirrm share/doc/nhc98
+%%PORTDOCS%%%%DOCSDIR%%/98.html
+%%PORTDOCS%%%%DOCSDIR%%/CcallingHaskell.html
+%%PORTDOCS%%%%DOCSDIR%%/bugs.html
+%%PORTDOCS%%%%DOCSDIR%%/compiler-options.html
+%%PORTDOCS%%%%DOCSDIR%%/config.html
+%%PORTDOCS%%%%DOCSDIR%%/contrib.html
+%%PORTDOCS%%%%DOCSDIR%%/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/cvs.html
+%%PORTDOCS%%%%DOCSDIR%%/download.html
+%%PORTDOCS%%%%DOCSDIR%%/errmsgs.html
+%%PORTDOCS%%%%DOCSDIR%%/extensions.html
+%%PORTDOCS%%%%DOCSDIR%%/ffi.html
+%%PORTDOCS%%%%DOCSDIR%%/fig1.gif
+%%PORTDOCS%%%%DOCSDIR%%/fig2.html
+%%PORTDOCS%%%%DOCSDIR%%/fig3.html
+%%PORTDOCS%%%%DOCSDIR%%/fig4.html
+%%PORTDOCS%%%%DOCSDIR%%/greencard-york.html
+%%PORTDOCS%%%%DOCSDIR%%/greencard.html
+%%PORTDOCS%%%%DOCSDIR%%/heapprof.html
+%%PORTDOCS%%%%DOCSDIR%%/history.html
+%%PORTDOCS%%%%DOCSDIR%%/history98.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/install.html
+%%PORTDOCS%%%%DOCSDIR%%/libraries.html
+%%PORTDOCS%%%%DOCSDIR%%/limits.html
+%%PORTDOCS%%%%DOCSDIR%%/limits.html.inst
+%%PORTDOCS%%%%DOCSDIR%%/maillist.html
+%%PORTDOCS%%%%DOCSDIR%%/new_tiny.gif
+%%PORTDOCS%%%%DOCSDIR%%/nhc13.gif
+%%PORTDOCS%%%%DOCSDIR%%/nhc98.gif
+%%PORTDOCS%%%%DOCSDIR%%/runtime-options.html
+%%PORTDOCS%%%%DOCSDIR%%/status.html
+%%PORTDOCS%%%%DOCSDIR%%/todo.html
+%%PORTDOCS%%%%DOCSDIR%%/tprof.html
+%%PORTDOCS%%%%DOCSDIR%%/tracer.html
+%%PORTDOCS%%%%DOCSDIR%%/windows.html
+%%PORTDOCS%%%%DOCSDIR%%/york-release.html
+%%PORTDOCS%%%%DOCSDIR%%/bugs/Nhc13Test1.hs
+%%PORTDOCS%%%%DOCSDIR%%/bugs/Nhc13Test10.hs
+%%PORTDOCS%%%%DOCSDIR%%/bugs/Nhc13Test13.hs
+%%PORTDOCS%%%%DOCSDIR%%/bugs/README
+%%PORTDOCS%%%%DOCSDIR%%/bugs/nhc13test1.hs
+%%PORTDOCS%%%%DOCSDIR%%/bugs/nhc13test10.hs
+%%PORTDOCS%%%%DOCSDIR%%/bugs/nhc13test11.hs
+%%PORTDOCS%%%%DOCSDIR%%/bugs/nhc13test12.hs
+%%PORTDOCS%%%%DOCSDIR%%/bugs/nhc13test13.hs
+%%PORTDOCS%%%%DOCSDIR%%/bugs/nhc13test14.hs
+%%PORTDOCS%%%%DOCSDIR%%/bugs/nhc13test15.hs
+%%PORTDOCS%%%%DOCSDIR%%/bugs/nhc13test16.hs
+%%PORTDOCS%%%%DOCSDIR%%/bugs/nhc13test17.hs
+%%PORTDOCS%%%%DOCSDIR%%/bugs/nhc13test18.hs
+%%PORTDOCS%%%%DOCSDIR%%/bugs/nhc13test19.hs
+%%PORTDOCS%%%%DOCSDIR%%/bugs/nhc13test2.hs
+%%PORTDOCS%%%%DOCSDIR%%/bugs/nhc13test20.hs
+%%PORTDOCS%%%%DOCSDIR%%/bugs/nhc13test3.hs
+%%PORTDOCS%%%%DOCSDIR%%/bugs/nhc13test4.hs
+%%PORTDOCS%%%%DOCSDIR%%/bugs/nhc13test5.hs
+%%PORTDOCS%%%%DOCSDIR%%/bugs/nhc13test6.hs
+%%PORTDOCS%%%%DOCSDIR%%/bugs/nhc13test7.hs
+%%PORTDOCS%%%%DOCSDIR%%/bugs/nhc13test8.hs
+%%PORTDOCS%%%%DOCSDIR%%/bugs/nhc13test9.hs
+%%PORTDOCS%%%%DOCSDIR%%/bugs/nhc98test19.hs
+%%PORTDOCS%%%%DOCSDIR%%/bugs/nhc98test20.hs
+%%PORTDOCS%%%%DOCSDIR%%/bugs/nhc98test21.hs
+%%PORTDOCS%%%%DOCSDIR%%/bugs/nhc98test22.hs
+%%PORTDOCS%%%%DOCSDIR%%/bugs/nhc98test23.hs
+%%PORTDOCS%%%%DOCSDIR%%/examples/ZooQuiz.hs
+%%PORTDOCS%%%%DOCSDIR%%/hmake/bugs.html
+%%PORTDOCS%%%%DOCSDIR%%/hmake/changes.html
+%%PORTDOCS%%%%DOCSDIR%%/hmake/hi-commands.html
+%%PORTDOCS%%%%DOCSDIR%%/hmake/hmake-config.html
+%%PORTDOCS%%%%DOCSDIR%%/hmake/hmake.html
+%%PORTDOCS%%%%DOCSDIR%%/hmake/index.html
+%%PORTDOCS%%%%DOCSDIR%%/hmake/interactive.html
+%%PORTDOCS%%%%DOCSDIR%%/hmake/lineedit.html
+%%PORTDOCS%%%%DOCSDIR%%/implementation-notes/build-system
+%%PORTDOCS%%%%DOCSDIR%%/implementation-notes/index.html
+%%PORTDOCS%%%%DOCSDIR%%/implementation-notes/intro
+%%PORTDOCS%%%%DOCSDIR%%/implementation-notes/phases
+%%PORTDOCS%%%%DOCSDIR%%/implementation-notes/space-efficient
+%%PORTDOCS%%%%DOCSDIR%%/libs/BinArray.html
+%%PORTDOCS%%%%DOCSDIR%%/libs/Binary.html
+%%PORTDOCS%%%%DOCSDIR%%/libs/Bit.html
+%%PORTDOCS%%%%DOCSDIR%%/libs/FFI.html
+%%PORTDOCS%%%%DOCSDIR%%/libs/IOExtras.html
+%%PORTDOCS%%%%DOCSDIR%%/libs/OldBinary.html
+%%PORTDOCS%%%%DOCSDIR%%/libs/PackedString.html
+%%PORTDOCS%%%%DOCSDIR%%/libs/Time.html
+%%PORTDOCS%%%%DOCSDIR%%/libs/index.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/bugs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/hmake
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/implementation-notes
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/libs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/nhc98/base/Control/Monad
 @dirrm include/nhc98/base/Control
 @dirrm include/nhc98/base/Data