- Update to 2.14.3 to match with the version shipped with lang/ghc

- Fix build to avoid requiring root privileges on staging [1]

Reported by:	Andrzej Tobola <ato@iem.pw.edu.pl> [1]
Obtained from:	FreeBSD Haskell

4 files changed, 4 insertions, 42 deletions

diff --git a/devel/hs-haddock/Makefile b/devel/hs-haddock/Makefile
index 509b9dff4770..46e77ac2f7d1 100644
--- a/devel/hs-haddock/Makefile
+++ b/devel/hs-haddock/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	haddock
-PORTVERSION=	2.14.2
+PORTVERSION=	2.14.3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -17,12 +17,9 @@ USE_HAPPY=	true
 
 EXECUTABLE=	haddock-${PORTVERSION}
 
-PLIST_SUB+=	GHC_HADDOCK_CMD=${GHC_HADDOCK_CMD} HADDOCK=${PREFIX}/bin/haddock EXECUTABLE=${PREFIX}/bin/${EXECUTABLE}
+PLIST_SUB+=	GHC_HADDOCK_CMD=${GHC_HADDOCK_CMD} HADDOCK=${PREFIX}/bin/haddock EXECUTABLE=${PREFIX}/bin/haddock-${PORTVERSION}
 
 CONFIGURE_ARGS+=	--program-suffix=-${PORTVERSION}
 
-post-install::
-	@${LN} -sf ${PREFIX}/bin/${EXECUTABLE} ${PREFIX}/bin/haddock
-
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-haddock/distinfo b/devel/hs-haddock/distinfo
index 3d28abb0fb92..631bfb17014a 100644
--- a/devel/hs-haddock/distinfo
+++ b/devel/hs-haddock/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/haddock-2.14.2.tar.gz) = 33df230cd8baeed87caa31fc13257a921778b6b700c78bd9237024e08d942641
-SIZE (cabal/haddock-2.14.2.tar.gz) = 230365
+SHA256 (cabal/haddock-2.14.3.tar.gz) = d454f64ed0ea79ec9a94d4d79c8635be74d752d028b737dbe3b5deb9749e310c
+SIZE (cabal/haddock-2.14.3.tar.gz) = 232158
diff --git a/devel/hs-haddock/files/patch-src__Haddock__Convert.hs b/devel/hs-haddock/files/patch-src__Haddock__Convert.hs
deleted file mode 100644
index 860c2384bec6..000000000000
--- a/devel/hs-haddock/files/patch-src__Haddock__Convert.hs
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./src/Haddock/Convert.hs.orig	2014-04-02 23:25:15.000000000 +0200
-+++ ./src/Haddock/Convert.hs	2014-07-14 06:39:49.000000000 +0200
-@@ -94,10 +94,10 @@
-     (synifyType ImplicitizeForAll (dataConUserType dc)))
- 
-   AConLike (PatSynCon ps) ->
--      let (_, _, (req_theta, prov_theta)) = patSynSig ps
-+      let (_, _, req_theta, prov_theta,_, res_ty) = patSynSig ps
-       in SigD $ PatSynSig (synifyName ps)
-                           (fmap (synifyType WithinType) (patSynTyDetails ps))
--                          (synifyType WithinType (patSynType ps))
-+                          (synifyType WithinType res_ty)
-                           (synifyCtx req_theta)
-                           (synifyCtx prov_theta)
- 
diff --git a/devel/hs-haddock/files/patch-src__Haddock__Interface__Create.hs b/devel/hs-haddock/files/patch-src__Haddock__Interface__Create.hs
deleted file mode 100644
index 919d0d5271af..000000000000
--- a/devel/hs-haddock/files/patch-src__Haddock__Interface__Create.hs
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./src/Haddock/Interface/Create.hs.orig	2014-04-02 23:25:15.000000000 +0200
-+++ ./src/Haddock/Interface/Create.hs	2014-07-14 06:40:22.000000000 +0200
-@@ -364,7 +364,7 @@
-   where
-     decls = docs ++ defs ++ sigs ++ ats
-     docs  = mkDecls tcdDocs DocD class_
--    defs  = mkDecls (map snd . bagToList . tcdMeths) ValD class_
-+    defs  = mkDecls (bagToList . tcdMeths) ValD class_
-     sigs  = mkDecls tcdSigs SigD class_
-     ats   = mkDecls tcdATs (TyClD . FamDecl) class_
- 
-@@ -390,7 +390,7 @@
-   mkDecls hs_docs                          DocD   group_ ++
-   mkDecls hs_instds                        InstD  group_ ++
-   mkDecls (typesigs . hs_valds)            SigD   group_ ++
--  mkDecls (map snd . valbinds . hs_valds)  ValD   group_
-+  mkDecls (valbinds . hs_valds)  ValD   group_
-   where
-     typesigs (ValBindsOut _ sigs) = filter isVanillaLSig sigs
-     typesigs _ = error "expected ValBindsOut"