ports/142071: [patch]: update of: haddock to 2.5.0, ghc-paths to 0.1.0.6; revision of: ghc, hscolour
Jacula Modyun
jacula at gmail.com
Sun Dec 27 14:20:01 UTC 2009
>Number: 142071
>Category: ports
>Synopsis: [patch]: update of: haddock to 2.5.0, ghc-paths to 0.1.0.6; revision of: ghc, hscolour
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Dec 27 14:20:00 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Jacula Modyun
>Release: FreeBSD 7.1-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD splork.wirewater.yow 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #0: Sat Oct 18 11:22:07 UTC 2008 root at splork.wirewater.yow:/usr/obj/usr/src/sys/JACULA i386
>Description:
this patchset updates:
devel/hs-haddock: 2.4.2 to 2.5.0
devel/hs-haddock-docs: 2.4.2 to 2.5.0
devel/hs-ghc-paths: 0.1.0.5 to 0.1.0.6
devel/hs-ghc-paths-docs: 0.1.0.5 to 0.1.0.6
print/hs-hscolour: 1.15,1 to 1.15.1,1
print/hs-hscolour-docs: 1.15,1 to 1.15.1,1
lang/ghc: 6.10.4_1 to 6.10.4_2
>How-To-Repeat:
>Fix:
--- patch-ghc begins here ---
diff -uNr ghc.orig/Makefile ghc/Makefile
--- ghc.orig/Makefile 2009-12-06 20:56:52.000000000 +0000
+++ ghc/Makefile 2009-12-26 19:56:51.000000000 +0000
@@ -6,7 +6,7 @@
PORTNAME= ghc
PORTVERSION= 6.10.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang haskell
MASTER_SITES= http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
${MASTER_SITE_LOCAL:S/$/:boot/} \
@@ -23,11 +23,11 @@
GHC_VERSION= ${PORTVERSION}
BOOT_GHC_VERSION= ${GHC_VERSION}
-HADDOCK_VERSION= 2.4.2
+HADDOCK_VERSION= 2.5.0
PORT_HADDOCK_VERSION= ${HADDOCK_VERSION}
-BOOT_HADDOCK_VERSION= ${HADDOCK_VERSION}
+BOOT_HADDOCK_VERSION= 2.4.2
HSCOLOUR_VERSION= 1.15
-GHCPATH_VERSION= 0.1.0.5
+GHCPATH_VERSION= 0.1.0.6
USE_AUTOTOOLS= autoconf:262:env
USE_BZIP2= yes
diff -uNr ghc.orig/distinfo ghc/distinfo
--- ghc.orig/distinfo 2009-12-06 20:56:52.000000000 +0000
+++ ghc/distinfo 2009-12-26 19:18:14.000000000 +0000
@@ -10,12 +10,12 @@
MD5 (hscolour-1.15.tar.gz) = ae1f3d4b1b9911ca80735548b0a622d5
SHA256 (hscolour-1.15.tar.gz) = 762f07977d971939360e2a418dfad2a8e5f908b9a88f3a861fa13937cbcfef1e
SIZE (hscolour-1.15.tar.gz) = 56472
-MD5 (ghc-paths-0.1.0.5.tar.gz) = 8fdc122e65845d2d53734f78e22c5155
-SHA256 (ghc-paths-0.1.0.5.tar.gz) = ea9e97425894e3dbd7915e00e107e2e7fc07b6e8293fd2dd66a813f0673cba10
-SIZE (ghc-paths-0.1.0.5.tar.gz) = 2304
-MD5 (haddock-2.4.2.tar.gz) = c1d5238faac72727921130eb792041a2
-SHA256 (haddock-2.4.2.tar.gz) = dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547
-SIZE (haddock-2.4.2.tar.gz) = 103033
+MD5 (ghc-paths-0.1.0.6.tar.gz) = 3a53051b128953105ae36e58e4d21d0f
+SHA256 (ghc-paths-0.1.0.6.tar.gz) = 95d8c0e6ce2f182d792e910149b3c81c381b7d2c2052ffc6d96128b071c55243
+SIZE (ghc-paths-0.1.0.6.tar.gz) = 2291
+MD5 (haddock-2.5.0.tar.gz) = ec674a6854667f6e6fcb3d0cc3d784bb
+SHA256 (haddock-2.5.0.tar.gz) = 038ebe46d3565903e6133284ba4588d51cd90c29185519f034198142a828646c
+SIZE (haddock-2.5.0.tar.gz) = 104639
MD5 (ghc-6.10.4-i386-jm0-freebsd6-boot.tar.bz2) = e528ad305e12ec45b051acf22a41929f
SHA256 (ghc-6.10.4-i386-jm0-freebsd6-boot.tar.bz2) = ff39d911930e0afd79dcd312583b2ade830e0f4f11db2d6c9ee5658732332ac3
SIZE (ghc-6.10.4-i386-jm0-freebsd6-boot.tar.bz2) = 47466113
--- patch-ghc ends here ---
--- patch-hs-ghc-paths begins here ---
diff -uNr hs-ghc-paths.orig/Makefile hs-ghc-paths/Makefile
--- hs-ghc-paths.orig/Makefile 2009-09-02 15:38:34.000000000 +0000
+++ hs-ghc-paths/Makefile 2009-12-16 21:47:56.000000000 +0000
@@ -5,7 +5,7 @@
# $FreeBSD: ports/devel/hs-ghc-paths/Makefile,v 1.1 2009/09/02 15:38:34 pgj Exp $
PORTNAME= ghc-paths
-PORTVERSION= 0.1.0.5
+PORTVERSION= 0.1.0.6
CATEGORIES= devel haskell
MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
PKGNAMEPREFIX= hs-
diff -uNr hs-ghc-paths.orig/distinfo hs-ghc-paths/distinfo
--- hs-ghc-paths.orig/distinfo 2009-09-02 15:38:34.000000000 +0000
+++ hs-ghc-paths/distinfo 2009-12-16 21:43:36.000000000 +0000
@@ -1,3 +1,3 @@
-MD5 (ghc-paths-0.1.0.5.tar.gz) = 8fdc122e65845d2d53734f78e22c5155
-SHA256 (ghc-paths-0.1.0.5.tar.gz) = ea9e97425894e3dbd7915e00e107e2e7fc07b6e8293fd2dd66a813f0673cba10
-SIZE (ghc-paths-0.1.0.5.tar.gz) = 2304
+MD5 (ghc-paths-0.1.0.6.tar.gz) = 3a53051b128953105ae36e58e4d21d0f
+SHA256 (ghc-paths-0.1.0.6.tar.gz) = 95d8c0e6ce2f182d792e910149b3c81c381b7d2c2052ffc6d96128b071c55243
+SIZE (ghc-paths-0.1.0.6.tar.gz) = 2291
--- patch-hs-ghc-paths ends here ---
--- patch-hs-ghc-paths-docs begins here ---
diff -uNr hs-ghc-paths-docs.orig/Makefile hs-ghc-paths-docs/Makefile
--- hs-ghc-paths-docs.orig/Makefile 2009-12-06 20:56:50.000000000 +0000
+++ hs-ghc-paths-docs/Makefile 2009-12-27 11:03:55.000000000 +0000
@@ -2,15 +2,14 @@
# Date created: July 09 2009
# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula at gmail.com>
#
-# $FreeBSD: ports/devel/hs-ghc-paths-docs/Makefile,v 1.2 2009/12/06 20:56:50 pgj Exp $
+# $FreeBSD: ports/devel/hs-ghc-paths-docs/Makefile,v 1.1 2009/09/02 15:38:34 pgj Exp $
PORTNAME= ghc-paths
-PORTVERSION= 0.1.0.5
-PORTREVISION= 1
+PORTVERSION= 0.1.0.6
CATEGORIES= devel haskell
MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
PKGNAMEPREFIX= hs-
-PKGNAMESUFFIX= -doc
+PKGNAMESUFFIX= -docs
MAINTAINER= jacula at gmail.com
COMMENT= Documentation for ghc-paths
diff -uNr hs-ghc-paths-docs.orig/distinfo hs-ghc-paths-docs/distinfo
--- hs-ghc-paths-docs.orig/distinfo 2009-09-02 15:38:34.000000000 +0000
+++ hs-ghc-paths-docs/distinfo 2009-12-17 17:29:42.000000000 +0000
@@ -1,3 +1,3 @@
-MD5 (ghc-paths-0.1.0.5.tar.gz) = 8fdc122e65845d2d53734f78e22c5155
-SHA256 (ghc-paths-0.1.0.5.tar.gz) = ea9e97425894e3dbd7915e00e107e2e7fc07b6e8293fd2dd66a813f0673cba10
-SIZE (ghc-paths-0.1.0.5.tar.gz) = 2304
+MD5 (ghc-paths-0.1.0.6.tar.gz) = 3a53051b128953105ae36e58e4d21d0f
+SHA256 (ghc-paths-0.1.0.6.tar.gz) = 95d8c0e6ce2f182d792e910149b3c81c381b7d2c2052ffc6d96128b071c55243
+SIZE (ghc-paths-0.1.0.6.tar.gz) = 2291
--- patch-hs-ghc-paths-docs ends here ---
--- patch-hs-haddock begins here ---
diff -uNr hs-haddock.orig/Makefile hs-haddock/Makefile
--- hs-haddock.orig/Makefile 2009-09-02 15:38:35.000000000 +0000
+++ hs-haddock/Makefile 2009-12-17 17:18:41.000000000 +0000
@@ -5,7 +5,7 @@
# $FreeBSD: ports/devel/hs-haddock/Makefile,v 1.35 2009/09/02 15:38:35 pgj Exp $
PORTNAME= haddock
-PORTVERSION= 2.4.2
+PORTVERSION= 2.5.0
CATEGORIES= devel haskell
MASTER_SITES= http://www.haskell.org/haddock/dist/ \
http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
@@ -65,6 +65,7 @@
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
${WRKSRC}/doc/configure.ac
+ @${RM} ${WRKSRC}/src/Haddock/Utils/FastMutInt2.hs
do-configure:
cd ${WRKSRC} && ${CABAL_CMD} configure --ghc --prefix=${PREFIX}
diff -uNr hs-haddock.orig/distinfo hs-haddock/distinfo
--- hs-haddock.orig/distinfo 2009-09-02 15:38:35.000000000 +0000
+++ hs-haddock/distinfo 2009-12-16 21:50:01.000000000 +0000
@@ -1,3 +1,3 @@
-MD5 (haddock-2.4.2.tar.gz) = c1d5238faac72727921130eb792041a2
-SHA256 (haddock-2.4.2.tar.gz) = dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547
-SIZE (haddock-2.4.2.tar.gz) = 103033
+MD5 (haddock-2.5.0.tar.gz) = ec674a6854667f6e6fcb3d0cc3d784bb
+SHA256 (haddock-2.5.0.tar.gz) = 038ebe46d3565903e6133284ba4588d51cd90c29185519f034198142a828646c
+SIZE (haddock-2.5.0.tar.gz) = 104639
diff -uNr hs-haddock.orig/files/patch-haddock.cabal hs-haddock/files/patch-haddock.cabal
--- hs-haddock.orig/files/patch-haddock.cabal 1970-01-01 00:00:00.000000000 +0000
+++ hs-haddock/files/patch-haddock.cabal 2009-12-17 17:07:39.000000000 +0000
@@ -0,0 +1,10 @@
+--- haddock.cabal.orig 2009-12-17 17:07:09.000000000 +0000
++++ haddock.cabal 2009-12-17 17:07:18.000000000 +0000
+@@ -92,7 +92,6 @@
+ Haddock.Interface.Rename
+ Haddock.Interface.Create
+ Haddock.Interface.AttachInstances
+- Haddock.Utils.FastMutInt2
+ Haddock.Utils.BlockTable
+ Haddock.Utils.Html
+ Haddock.Utils
diff -uNr hs-haddock.orig/pkg-plist hs-haddock/pkg-plist
--- hs-haddock.orig/pkg-plist 2009-09-02 15:38:35.000000000 +0000
+++ hs-haddock/pkg-plist 2009-12-16 21:58:28.000000000 +0000
@@ -2,9 +2,7 @@
bin/haddock
%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution/Haddock.hi
%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HShaddock-%%HADDOCK_VERSION%%.o
-%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/DocName.hi
-%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/Exception.hi
-%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/GHC/Utils.hi
+%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/GhcUtils.hi
%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/InterfaceFile.hi
%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/Types.hi
%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/Utils.hi
@@ -21,7 +19,6 @@
@dirrm %%DATADIR_REL%%/html
@dirrm %%DATADIR_REL%%
@dirrmtry %%DOCSDIR%%
- at dirrm %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/GHC
@dirrm %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock
@dirrm %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution
@dirrm %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
--- patch-hs-haddock ends here ---
--- patch-hs-haddock-docs begins here ---
diff -uNr hs-haddock-docs.orig/Makefile hs-haddock-docs/Makefile
--- hs-haddock-docs.orig/Makefile 2009-12-06 20:56:51.000000000 +0000
+++ hs-haddock-docs/Makefile 2009-12-27 11:04:08.000000000 +0000
@@ -2,17 +2,16 @@
# Date created: February 22 2008
# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula at gmail.com>
#
-# $FreeBSD: ports/devel/hs-haddock-docs/Makefile,v 1.9 2009/12/06 20:56:51 pgj Exp $
+# $FreeBSD: ports/devel/hs-haddock-docs/Makefile,v 1.8 2009/09/02 15:38:35 pgj Exp $
#
PORTNAME= haddock
-PORTVERSION= 2.4.2
-PORTREVISION= 1
+PORTVERSION= 2.5.0
CATEGORIES= devel haskell
MASTER_SITES= http://www.haskell.org/haddock/dist/ \
http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
PKGNAMEPREFIX= hs-
-PKGNAMESUFFIX= -doc
+PKGNAMESUFFIX= -docs
MAINTAINER= haskell at FreeBSD.org
COMMENT= Documentation for Haddock
@@ -55,13 +54,14 @@
@${REINPLACE_CMD} -e 's|/usr/local/share/sgml/catalog|| ; \
s|/usr/local/share/xsl/docbook|${LOCALBASE}/share/xsl/docbook|' \
${WRKSRC}/doc/configure.ac
+ @${RM} ${WRKSRC}/src/Haddock/Utils/FastMutInt2.hs
do-configure:
cd ${WRKSRC} && ${CABAL_CMD} configure --ghc --haddock-options=-w ${CONFIGURE_ARGS}
cd ${WRKSRC}/doc && ${AUTOCONF} && ./configure ${CONFIGURE_ARGS}
do-build:
- cd ${WRKSRC} && ${CABAL_CMD} haddock --executables --hyperlink-source --executables \
+ cd ${WRKSRC} && ${CABAL_CMD} haddock --executables --hyperlink-source \
--hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
cd ${WRKSRC}/doc && \
${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} html
diff -uNr hs-haddock-docs.orig/distinfo hs-haddock-docs/distinfo
--- hs-haddock-docs.orig/distinfo 2009-09-02 15:38:35.000000000 +0000
+++ hs-haddock-docs/distinfo 2009-12-17 15:43:52.000000000 +0000
@@ -1,3 +1,3 @@
-MD5 (haddock-2.4.2.tar.gz) = c1d5238faac72727921130eb792041a2
-SHA256 (haddock-2.4.2.tar.gz) = dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547
-SIZE (haddock-2.4.2.tar.gz) = 103033
+MD5 (haddock-2.5.0.tar.gz) = ec674a6854667f6e6fcb3d0cc3d784bb
+SHA256 (haddock-2.5.0.tar.gz) = 038ebe46d3565903e6133284ba4588d51cd90c29185519f034198142a828646c
+SIZE (haddock-2.5.0.tar.gz) = 104639
diff -uNr hs-haddock-docs.orig/files/patch-haddock.cabal hs-haddock-docs/files/patch-haddock.cabal
--- hs-haddock-docs.orig/files/patch-haddock.cabal 1970-01-01 00:00:00.000000000 +0000
+++ hs-haddock-docs/files/patch-haddock.cabal 2009-12-17 17:07:39.000000000 +0000
@@ -0,0 +1,10 @@
+--- haddock.cabal.orig 2009-12-17 17:07:09.000000000 +0000
++++ haddock.cabal 2009-12-17 17:07:18.000000000 +0000
+@@ -92,7 +92,6 @@
+ Haddock.Interface.Rename
+ Haddock.Interface.Create
+ Haddock.Interface.AttachInstances
+- Haddock.Utils.FastMutInt2
+ Haddock.Utils.BlockTable
+ Haddock.Utils.Html
+ Haddock.Utils
diff -uNr hs-haddock-docs.orig/pkg-plist hs-haddock-docs/pkg-plist
--- hs-haddock-docs.orig/pkg-plist 2009-09-02 15:38:35.000000000 +0000
+++ hs-haddock-docs/pkg-plist 2009-12-17 17:14:48.000000000 +0000
@@ -11,9 +11,6 @@
%%DOCSDIR%%/html/haddock/Haddock-Backends-HaddockDB.html
%%DOCSDIR%%/html/haddock/Haddock-Backends-Hoogle.html
%%DOCSDIR%%/html/haddock/Haddock-Backends-Html.html
-%%DOCSDIR%%/html/haddock/Haddock-Exception.html
-%%DOCSDIR%%/html/haddock/Haddock-GHC-Typecheck.html
-%%DOCSDIR%%/html/haddock/Haddock-GHC.html
%%DOCSDIR%%/html/haddock/Haddock-Interface-AttachInstances.html
%%DOCSDIR%%/html/haddock/Haddock-Interface-Create.html
%%DOCSDIR%%/html/haddock/Haddock-Interface-Rename.html
@@ -22,12 +19,37 @@
%%DOCSDIR%%/html/haddock/Haddock-ModuleTree.html
%%DOCSDIR%%/html/haddock/Haddock-Options.html
%%DOCSDIR%%/html/haddock/Haddock-Utils-BlockTable.html
-%%DOCSDIR%%/html/haddock/Haddock-Utils-FastMutInt2.html
%%DOCSDIR%%/html/haddock/Haddock-Utils-Html.html
%%DOCSDIR%%/html/haddock/Haddock-Utils.html
%%DOCSDIR%%/html/haddock/Haddock-Version.html
%%DOCSDIR%%/html/haddock/Main.html
%%DOCSDIR%%/html/haddock/Paths_haddock.html
+%%DOCSDIR%%/html/haddock/doc-index-33.html
+%%DOCSDIR%%/html/haddock/doc-index-43.html
+%%DOCSDIR%%/html/haddock/doc-index-60.html
+%%DOCSDIR%%/html/haddock/doc-index-A.html
+%%DOCSDIR%%/html/haddock/doc-index-B.html
+%%DOCSDIR%%/html/haddock/doc-index-C.html
+%%DOCSDIR%%/html/haddock/doc-index-D.html
+%%DOCSDIR%%/html/haddock/doc-index-E.html
+%%DOCSDIR%%/html/haddock/doc-index-F.html
+%%DOCSDIR%%/html/haddock/doc-index-G.html
+%%DOCSDIR%%/html/haddock/doc-index-H.html
+%%DOCSDIR%%/html/haddock/doc-index-I.html
+%%DOCSDIR%%/html/haddock/doc-index-J.html
+%%DOCSDIR%%/html/haddock/doc-index-K.html
+%%DOCSDIR%%/html/haddock/doc-index-L.html
+%%DOCSDIR%%/html/haddock/doc-index-M.html
+%%DOCSDIR%%/html/haddock/doc-index-N.html
+%%DOCSDIR%%/html/haddock/doc-index-O.html
+%%DOCSDIR%%/html/haddock/doc-index-P.html
+%%DOCSDIR%%/html/haddock/doc-index-R.html
+%%DOCSDIR%%/html/haddock/doc-index-S.html
+%%DOCSDIR%%/html/haddock/doc-index-T.html
+%%DOCSDIR%%/html/haddock/doc-index-U.html
+%%DOCSDIR%%/html/haddock/doc-index-V.html
+%%DOCSDIR%%/html/haddock/doc-index-W.html
+%%DOCSDIR%%/html/haddock/doc-index-Y.html
%%DOCSDIR%%/html/haddock/doc-index.html
%%DOCSDIR%%/html/haddock/frames.html
%%DOCSDIR%%/html/haddock/haddock-util.js
@@ -41,9 +63,6 @@
%%DOCSDIR%%/html/haddock/mini_Haddock-Backends-HaddockDB.html
%%DOCSDIR%%/html/haddock/mini_Haddock-Backends-Hoogle.html
%%DOCSDIR%%/html/haddock/mini_Haddock-Backends-Html.html
-%%DOCSDIR%%/html/haddock/mini_Haddock-Exception.html
-%%DOCSDIR%%/html/haddock/mini_Haddock-GHC-Typecheck.html
-%%DOCSDIR%%/html/haddock/mini_Haddock-GHC.html
%%DOCSDIR%%/html/haddock/mini_Haddock-Interface-AttachInstances.html
%%DOCSDIR%%/html/haddock/mini_Haddock-Interface-Create.html
%%DOCSDIR%%/html/haddock/mini_Haddock-Interface-Rename.html
@@ -52,7 +71,6 @@
%%DOCSDIR%%/html/haddock/mini_Haddock-ModuleTree.html
%%DOCSDIR%%/html/haddock/mini_Haddock-Options.html
%%DOCSDIR%%/html/haddock/mini_Haddock-Utils-BlockTable.html
-%%DOCSDIR%%/html/haddock/mini_Haddock-Utils-FastMutInt2.html
%%DOCSDIR%%/html/haddock/mini_Haddock-Utils-Html.html
%%DOCSDIR%%/html/haddock/mini_Haddock-Utils.html
%%DOCSDIR%%/html/haddock/mini_Haddock-Version.html
@@ -66,11 +84,7 @@
%%DOCSDIR%%/html/haddock/src/Haddock-Backends-HaddockDB.html
%%DOCSDIR%%/html/haddock/src/Haddock-Backends-Hoogle.html
%%DOCSDIR%%/html/haddock/src/Haddock-Backends-Html.html
-%%DOCSDIR%%/html/haddock/src/Haddock-DocName.html
-%%DOCSDIR%%/html/haddock/src/Haddock-Exception.html
-%%DOCSDIR%%/html/haddock/src/Haddock-GHC-Typecheck.html
-%%DOCSDIR%%/html/haddock/src/Haddock-GHC-Utils.html
-%%DOCSDIR%%/html/haddock/src/Haddock-GHC.html
+%%DOCSDIR%%/html/haddock/src/Haddock-GhcUtils.html
%%DOCSDIR%%/html/haddock/src/Haddock-Interface-AttachInstances.html
%%DOCSDIR%%/html/haddock/src/Haddock-Interface-Create.html
%%DOCSDIR%%/html/haddock/src/Haddock-Interface-Rename.html
@@ -80,7 +94,6 @@
%%DOCSDIR%%/html/haddock/src/Haddock-Options.html
%%DOCSDIR%%/html/haddock/src/Haddock-Types.html
%%DOCSDIR%%/html/haddock/src/Haddock-Utils-BlockTable.html
-%%DOCSDIR%%/html/haddock/src/Haddock-Utils-FastMutInt2.html
%%DOCSDIR%%/html/haddock/src/Haddock-Utils-Html.html
%%DOCSDIR%%/html/haddock/src/Haddock-Utils.html
%%DOCSDIR%%/html/haddock/src/Haddock-Version.html
@@ -93,9 +106,7 @@
%%DOCSDIR%%/html/minus.gif
%%DOCSDIR%%/html/plus.gif
%%DOCSDIR%%/html/src/Distribution-Haddock.html
-%%DOCSDIR%%/html/src/Haddock-DocName.html
-%%DOCSDIR%%/html/src/Haddock-Exception.html
-%%DOCSDIR%%/html/src/Haddock-GHC-Utils.html
+%%DOCSDIR%%/html/src/Haddock-GhcUtils.html
%%DOCSDIR%%/html/src/Haddock-InterfaceFile.html
%%DOCSDIR%%/html/src/Haddock-Types.html
%%DOCSDIR%%/html/src/Haddock-Utils.html
--- patch-hs-haddock-docs ends here ---
--- patch-hs-hscolour begins here ---
diff -uNr hs-hscolour.orig/Makefile hs-hscolour/Makefile
--- hs-hscolour.orig/Makefile 2009-12-27 10:27:32.000000000 +0000
+++ hs-hscolour/Makefile 2009-12-27 11:33:36.000000000 +0000
@@ -8,6 +8,7 @@
PORTNAME= hscolour
PORTVERSION= 1.15
PORTEPOCH= 1
+PORTREVISION= 1
CATEGORIES= print haskell
MASTER_SITES= ftp://ftp.cs.york.ac.uk/pub/haskell/contrib/ \
http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
@@ -54,8 +55,9 @@
post-install:
${STRIP_CMD} ${PREFIX}/bin/HsColour
.if !defined(SLAVE)
- cd ${WRKSRC} && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${HSCOLOUR_LIBDIR_REL}/register.sh && \
- ${INSTALL_DATA} README ${DOCSDIR}/README
+ cd ${WRKSRC} && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${HSCOLOUR_LIBDIR_REL}/register.sh \
+ && ${INSTALL_DATA} README ${DOCSDIR}/README \
+ && ${INSTALL_DATA} index.html ${DOCSDIR}/index.html
.endif
@${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
diff -uNr hs-hscolour.orig/pkg-plist hs-hscolour/pkg-plist
--- hs-hscolour.orig/pkg-plist 2009-09-02 15:38:41.000000000 +0000
+++ hs-hscolour/pkg-plist 2009-12-27 11:35:37.000000000 +0000
@@ -20,6 +20,7 @@
%%HSCOLOUR_LIBDIR_REL%%/register.sh
%%DOCSDIR%%/LICENCE-GPL
%%DOCSDIR%%/README
+%%DOCSDIR%%/index.html
%%DATADIR%%/hscolour.css
@dirrm %%DATADIR%%
@dirrmtry %%DOCSDIR%%
--- patch-hs-hscolour ends here ---
--- patch-hs-hscolour-docs begins here ---
diff -uNr hs-hscolour-docs.orig/Makefile hs-hscolour-docs/Makefile
--- hs-hscolour-docs.orig/Makefile 2009-12-06 20:56:53.000000000 +0000
+++ hs-hscolour-docs/Makefile 2009-12-27 11:07:56.000000000 +0000
@@ -8,11 +8,12 @@
PORTNAME= hscolour
PORTVERSION= 1.15
PORTEPOCH= 1
+PORTREVISION= 1
CATEGORIES= print haskell
MASTER_SITES= ftp://ftp.cs.york.ac.uk/pub/haskell/contrib/ \
http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
PKGNAMEPREFIX= hs-
-PKGNAMESUFFIX= -doc
+PKGNAMESUFFIX= -docs
MAINTAINER= jacula at gmail.com
COMMENT= Documentation for HsColour
--- patch-hs-hscolour-docs ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list