This pulls the xhtml library out of the ghc-package and pulls
www/hs-xhtml out of the attic (with a newer version, of course).
But there's some ugliness: hs-xhtml (as any normal haskell library)
build_depends on devel/haddock, but devel/haddock build_depends on
hs-xhtml. We already had the same for devel/haddock and devel/hs-ghc-paths
and I solved this by not building the haddock documentation for it.
However, for hs-xhtml I think the documentation should be built.
To solve this, www/hs-xhtml has a flavor `no_haddock' which doesn't
depend on haddock and which will create a package without the haddock
documentation. I changed devel/hs-ghc-paths to match this behaviour.
Now devel/haddock build_depends on the no_haddock flavors of
www/hs-xhtml and devel/hs-ghc-paths, but (the library, i.e. hs-haddock)
run_depends the non-flavored packages. So there are two packages
(hs-xhtml-*-no_haddock and hs-ghc-paths-*-no_haddock) which are
only used to break the dependency cycle and which no normal person
would install ever.
Is this ok? If not, I'll have to spend some more time on it.
Ciao,
Kili
Index: lang/ghc/Makefile
===================================================================
RCS file: /cvs/ports/lang/ghc/Makefile,v
retrieving revision 1.62
diff -u -p -r1.62 Makefile
--- lang/ghc/Makefile 27 Dec 2011 20:53:01 -0000 1.62
+++ lang/ghc/Makefile 10 Jan 2012 18:47:19 -0000
@@ -5,8 +5,9 @@ COMMENT-doc = documentation for GHC
DISTNAME = ghc-${MODGHC_VER}
PKGNAME-main = ghc-${MODGHC_VER}
-REVISION-main = 2
+REVISION-main = 3
PKGNAME-doc = ghc-doc-${MODGHC_VER}
+REVISION-doc = 0
CATEGORIES = lang devel
HOMEPAGE = http://www.haskell.org/ghc/
Index: lang/ghc/patches/patch-ghc_mk
===================================================================
RCS file: /cvs/ports/lang/ghc/patches/patch-ghc_mk,v
retrieving revision 1.6
diff -u -p -r1.6 patch-ghc_mk
--- lang/ghc/patches/patch-ghc_mk 21 Aug 2011 21:38:04 -0000 1.6
+++ lang/ghc/patches/patch-ghc_mk 10 Jan 2012 18:47:19 -0000
@@ -1,22 +1,21 @@
$OpenBSD: patch-ghc_mk,v 1.6 2011/08/21 21:38:04 kili Exp $
-Include utf8-string and xhtml for now, because of dependencies.
+Include utf8-string for now, because of dependencies.
Including *any* of those INTREE_ONLY_PACKAGES in the ghc packages
-wasn't the brightest idea I had (see mtl library hell). The two
-libraries left can and will be replaced by separate ports when
-needed.
+wasn't the brightest idea I had (see mtl library hell). The one
+library left can and will be replaced by a separate port when needed.
Fix the bindist-list (for building the bootstrapper); without this,
gtar creates an archive which our tar can't extract.
--- ghc.mk.orig Mon Jun 13 19:10:05 2011
-+++ ghc.mk Sat Aug 20 20:14:19 2011
++++ ghc.mk Sat Jan 7 20:25:25 2012
@@ -290,7 +290,7 @@ include rules/bindist.mk
# They do not say "this package will be built"; see $(PACKAGES_xx) for that
# Packages that are built but not installed
-INTREE_ONLY_PACKAGES := haskeline mtl terminfo utf8-string xhtml
-+INTREE_ONLY_PACKAGES := haskeline mtl terminfo
++INTREE_ONLY_PACKAGES := haskeline mtl terminfo xhtml
# Packages that, if present, must be built by the stage2 compiler,
# because they use TH and/or annotations, or depend on other stage2
Index: lang/ghc/pkg/PLIST-doc
===================================================================
RCS file: /cvs/ports/lang/ghc/pkg/PLIST-doc,v
retrieving revision 1.15
diff -u -p -r1.15 PLIST-doc
--- lang/ghc/pkg/PLIST-doc 30 Jun 2011 21:26:15 -0000 1.15
+++ lang/ghc/pkg/PLIST-doc 10 Jan 2012 18:47:19 -0000
@@ -2221,59 +2221,6 @@ share/doc/ghc/html/libraries/utf8-string
share/doc/ghc/html/libraries/utf8-string-0.3.6/synopsis.png
share/doc/ghc/html/libraries/utf8-string-0.3.6/utf8-string.haddock
share/doc/ghc/html/libraries/utf8-string-0.3.6/utf8-string.txt
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/LICENSE
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/Text-XHtml-Debug.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/Text-XHtml-Frameset.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/Text-XHtml-Strict.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/Text-XHtml-Table.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/Text-XHtml-Transitional.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/Text-XHtml.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/doc-index-33.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/doc-index-43.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/doc-index-60.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/doc-index-A.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/doc-index-All.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/doc-index-B.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/doc-index-C.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/doc-index-D.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/doc-index-E.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/doc-index-F.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/doc-index-G.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/doc-index-H.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/doc-index-I.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/doc-index-K.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/doc-index-L.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/doc-index-M.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/doc-index-N.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/doc-index-O.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/doc-index-P.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/doc-index-Q.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/doc-index-R.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/doc-index-S.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/doc-index-T.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/doc-index-U.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/doc-index-V.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/doc-index-W.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/doc-index-Y.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/doc-index.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/frames.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/haddock-util.js
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/hslogo-16.png
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/index-frames.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/index.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/mini_Text-XHtml-Debug.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/mini_Text-XHtml-Frameset.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/mini_Text-XHtml-Strict.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/mini_Text-XHtml-Table.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/mini_Text-XHtml-Transitional.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/mini_Text-XHtml.html
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/minus.gif
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/ocean.css
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/plus.gif
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/synopsis.png
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/xhtml.haddock
-share/doc/ghc/html/libraries/xhtml-3000.2.0.1/xhtml.txt
share/doc/ghc/html/users_guide/
share/doc/ghc/html/users_guide/License.html
share/doc/ghc/html/users_guide/arrow-notation.html
Index: lang/ghc/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/ghc/pkg/PLIST-main,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST-main
--- lang/ghc/pkg/PLIST-main 30 Jun 2011 21:26:16 -0000 1.10
+++ lang/ghc/pkg/PLIST-main 10 Jan 2012 18:47:20 -0000
@@ -1,7 +1,6 @@
@comment $OpenBSD: PLIST-main,v 1.10 2011/06/30 21:26:16 kili Exp $
-@conflict hs-xhtml-*
+@conflict hs-xhtml-<=3000.2.0.1
@pkgpath lang/ghc
-@pkgpath www/hs-xhtml
bin/ghc
bin/ghc-${MODGHC_VER}
bin/ghc-pkg
@@ -2021,43 +2020,4 @@ lib/ghc/utf8-string-0.3.6/System/IO/UTF8
lib/ghc/utf8-string-0.3.6/libHSutf8-string-0.3.6.a
lib/ghc/utf8-string-0.3.6/libHSutf8-string-0.3.6_p.a
@exec /usr/bin/env HOME=/nonexistent %D/lib/ghc/register.sh
-lib/ghc/xhtml-3000.2.0.1/
-lib/ghc/xhtml-3000.2.0.1/HSxhtml-3000.2.0.1.o
-lib/ghc/xhtml-3000.2.0.1/Text/
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml.hi
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml.p_hi
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/BlockTable.hi
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/BlockTable.p_hi
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/Debug.hi
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/Debug.p_hi
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/Extras.hi
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/Extras.p_hi
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/Frameset/
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/Frameset.hi
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/Frameset.p_hi
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/Frameset/Attributes.hi
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/Frameset/Attributes.p_hi
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/Frameset/Elements.hi
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/Frameset/Elements.p_hi
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/Internals.hi
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/Internals.p_hi
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/Strict/
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/Strict.hi
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/Strict.p_hi
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/Strict/Attributes.hi
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/Strict/Attributes.p_hi
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/Strict/Elements.hi
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/Strict/Elements.p_hi
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/Table.hi
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/Table.p_hi
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/Transitional/
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/Transitional.hi
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/Transitional.p_hi
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/Transitional/Attributes.hi
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/Transitional/Attributes.p_hi
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/Transitional/Elements.hi
-lib/ghc/xhtml-3000.2.0.1/Text/XHtml/Transitional/Elements.p_hi
-lib/ghc/xhtml-3000.2.0.1/libHSxhtml-3000.2.0.1.a
-lib/ghc/xhtml-3000.2.0.1/libHSxhtml-3000.2.0.1_p.a
@man man/man1/ghc.1
Index: devel/hs-ghc-paths/Makefile
===================================================================
RCS file: /cvs/ports/devel/hs-ghc-paths/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- devel/hs-ghc-paths/Makefile 16 Sep 2011 09:24:50 -0000 1.10
+++ devel/hs-ghc-paths/Makefile 10 Jan 2012 18:47:20 -0000
@@ -3,7 +3,7 @@
COMMENT = knowledge of GHC's installation directories
DISTNAME = ghc-paths-0.1.0.8
-REVISION = 0
+REVISION = 1
CATEGORIES = devel
MAINTAINER = Matthias Kilian <k...@openbsd.org>
@@ -14,9 +14,16 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
+# Special flavor needed for bootstrapping haddock:
+FLAVORS = no_haddock
+FLAVOR ?=
+
MODULES = lang/ghc
-# No haddock by intention, because Haddock depends on this package.
MODGHC_BUILD = cabal hackage register
+
+.if !${FLAVOR:Mno_haddock}
+MODGHC_BUILD += haddock
+.endif
.include <bsd.port.mk>
Index: devel/hs-ghc-paths/pkg/PFRAG.no-no_haddock
===================================================================
RCS file: devel/hs-ghc-paths/pkg/PFRAG.no-no_haddock
diff -N devel/hs-ghc-paths/pkg/PFRAG.no-no_haddock
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/hs-ghc-paths/pkg/PFRAG.no-no_haddock 10 Jan 2012 18:47:20 -0000
@@ -0,0 +1,15 @@
+@comment $OpenBSD$
+share/doc/hs-${DISTNAME}/html/
+share/doc/hs-${DISTNAME}/html/GHC-Paths.html
+share/doc/hs-${DISTNAME}/html/doc-index.html
+share/doc/hs-${DISTNAME}/html/frames.html
+share/doc/hs-${DISTNAME}/html/ghc-paths.haddock
+share/doc/hs-${DISTNAME}/html/haddock-util.js
+share/doc/hs-${DISTNAME}/html/hslogo-16.png
+share/doc/hs-${DISTNAME}/html/index-frames.html
+share/doc/hs-${DISTNAME}/html/index.html
+share/doc/hs-${DISTNAME}/html/mini_GHC-Paths.html
+share/doc/hs-${DISTNAME}/html/minus.gif
+share/doc/hs-${DISTNAME}/html/ocean.css
+share/doc/hs-${DISTNAME}/html/plus.gif
+share/doc/hs-${DISTNAME}/html/synopsis.png
Index: devel/hs-ghc-paths/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/hs-ghc-paths/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- devel/hs-ghc-paths/pkg/PLIST 3 Nov 2010 19:23:05 -0000 1.5
+++ devel/hs-ghc-paths/pkg/PLIST 10 Jan 2012 18:47:20 -0000
@@ -8,5 +8,6 @@ lib/ghc/${DISTNAME}/register.sh
@exec /usr/bin/env HOME=/nonexistent %D/lib/ghc/${DISTNAME}/register.sh -v0
@unexec /usr/bin/env HOME=/nonexistent %D/lib/ghc/${DISTNAME}/unregister.sh
-v0 --force
lib/ghc/${DISTNAME}/unregister.sh
-@comment share/doc/hs-${DISTNAME}/
-@comment share/doc/hs-${DISTNAME}/LICENSE
+share/doc/hs-${DISTNAME}/
+share/doc/hs-${DISTNAME}/LICENSE
+!%%no_haddock%%
Index: www/hs-xhtml/Makefile
===================================================================
RCS file: www/hs-xhtml/Makefile
diff -N www/hs-xhtml/Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hs-xhtml/Makefile 10 Jan 2012 18:47:20 -0000
@@ -0,0 +1,28 @@
+# $OpenBSD$
+
+COMMENT = XHTML combinator library
+
+DISTNAME = xhtml-3000.2.0.4
+CATEGORIES = www devel
+
+MAINTAINER = Matthias Kilian <k...@openbsd.org>
+
+# BSD3
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP = Yes
+
+# Special flavor needed for bootstrapping haddock:
+FLAVORS = no_haddock
+FLAVOR ?=
+
+MODULES = lang/ghc
+
+MODGHC_BUILD = cabal hackage register
+
+.if !${FLAVOR:Mno_haddock}
+MODGHC_BUILD += haddock
+.endif
+
+.include <bsd.port.mk>
Index: www/hs-xhtml/distinfo
===================================================================
RCS file: www/hs-xhtml/distinfo
diff -N www/hs-xhtml/distinfo
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hs-xhtml/distinfo 10 Jan 2012 18:47:20 -0000
@@ -0,0 +1,5 @@
+MD5 (ghc/xhtml-3000.2.0.4.tar.gz) = GniEgZuGi9yE9uTKtQUJjA==
+RMD160 (ghc/xhtml-3000.2.0.4.tar.gz) = Rrde3TDN7GgaJYzd3KJlsEG6sOs=
+SHA1 (ghc/xhtml-3000.2.0.4.tar.gz) = 3tiV5vdv/+s2bFSSxZgCaOlp8vo=
+SHA256 (ghc/xhtml-3000.2.0.4.tar.gz) =
fKkTwoE4XBRLvnJJIrLWHX5IaaIpTOINcao53UqMeB4=
+SIZE (ghc/xhtml-3000.2.0.4.tar.gz) = 14273
Index: www/hs-xhtml/pkg/DESCR
===================================================================
RCS file: www/hs-xhtml/pkg/DESCR
diff -N www/hs-xhtml/pkg/DESCR
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hs-xhtml/pkg/DESCR 10 Jan 2012 18:47:20 -0000
@@ -0,0 +1,2 @@
+This package provides combinators for producing XHTML 1.0, including
+the Strict, Transitional and Frameset variants.
Index: www/hs-xhtml/pkg/PFRAG.no-no_haddock
===================================================================
RCS file: www/hs-xhtml/pkg/PFRAG.no-no_haddock
diff -N www/hs-xhtml/pkg/PFRAG.no-no_haddock
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hs-xhtml/pkg/PFRAG.no-no_haddock 10 Jan 2012 18:47:20 -0000
@@ -0,0 +1,50 @@
+@comment $OpenBSD$
+share/doc/hs-${DISTNAME}/html/
+share/doc/hs-${DISTNAME}/html/Text-XHtml-Frameset.html
+share/doc/hs-${DISTNAME}/html/Text-XHtml-Strict.html
+share/doc/hs-${DISTNAME}/html/Text-XHtml-Table.html
+share/doc/hs-${DISTNAME}/html/Text-XHtml-Transitional.html
+share/doc/hs-${DISTNAME}/html/Text-XHtml.html
+share/doc/hs-${DISTNAME}/html/doc-index-33.html
+share/doc/hs-${DISTNAME}/html/doc-index-43.html
+share/doc/hs-${DISTNAME}/html/doc-index-60.html
+share/doc/hs-${DISTNAME}/html/doc-index-A.html
+share/doc/hs-${DISTNAME}/html/doc-index-All.html
+share/doc/hs-${DISTNAME}/html/doc-index-B.html
+share/doc/hs-${DISTNAME}/html/doc-index-C.html
+share/doc/hs-${DISTNAME}/html/doc-index-D.html
+share/doc/hs-${DISTNAME}/html/doc-index-E.html
+share/doc/hs-${DISTNAME}/html/doc-index-F.html
+share/doc/hs-${DISTNAME}/html/doc-index-G.html
+share/doc/hs-${DISTNAME}/html/doc-index-H.html
+share/doc/hs-${DISTNAME}/html/doc-index-I.html
+share/doc/hs-${DISTNAME}/html/doc-index-K.html
+share/doc/hs-${DISTNAME}/html/doc-index-L.html
+share/doc/hs-${DISTNAME}/html/doc-index-M.html
+share/doc/hs-${DISTNAME}/html/doc-index-N.html
+share/doc/hs-${DISTNAME}/html/doc-index-O.html
+share/doc/hs-${DISTNAME}/html/doc-index-P.html
+share/doc/hs-${DISTNAME}/html/doc-index-Q.html
+share/doc/hs-${DISTNAME}/html/doc-index-R.html
+share/doc/hs-${DISTNAME}/html/doc-index-S.html
+share/doc/hs-${DISTNAME}/html/doc-index-T.html
+share/doc/hs-${DISTNAME}/html/doc-index-U.html
+share/doc/hs-${DISTNAME}/html/doc-index-V.html
+share/doc/hs-${DISTNAME}/html/doc-index-W.html
+share/doc/hs-${DISTNAME}/html/doc-index-Y.html
+share/doc/hs-${DISTNAME}/html/doc-index.html
+share/doc/hs-${DISTNAME}/html/frames.html
+share/doc/hs-${DISTNAME}/html/haddock-util.js
+share/doc/hs-${DISTNAME}/html/hslogo-16.png
+share/doc/hs-${DISTNAME}/html/index-frames.html
+share/doc/hs-${DISTNAME}/html/index.html
+share/doc/hs-${DISTNAME}/html/mini_Text-XHtml-Frameset.html
+share/doc/hs-${DISTNAME}/html/mini_Text-XHtml-Strict.html
+share/doc/hs-${DISTNAME}/html/mini_Text-XHtml-Table.html
+share/doc/hs-${DISTNAME}/html/mini_Text-XHtml-Transitional.html
+share/doc/hs-${DISTNAME}/html/mini_Text-XHtml.html
+share/doc/hs-${DISTNAME}/html/minus.gif
+share/doc/hs-${DISTNAME}/html/ocean.css
+share/doc/hs-${DISTNAME}/html/plus.gif
+share/doc/hs-${DISTNAME}/html/synopsis.png
+share/doc/hs-${DISTNAME}/html/xhtml.haddock
Index: www/hs-xhtml/pkg/PLIST
===================================================================
RCS file: www/hs-xhtml/pkg/PLIST
diff -N www/hs-xhtml/pkg/PLIST
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hs-xhtml/pkg/PLIST 10 Jan 2012 18:47:20 -0000
@@ -0,0 +1,31 @@
+@comment $OpenBSD$
+lib/ghc/${DISTNAME}/
+lib/ghc/${DISTNAME}/HS${DISTNAME}.o
+lib/ghc/${DISTNAME}/Text/
+lib/ghc/${DISTNAME}/Text/XHtml/
+lib/ghc/${DISTNAME}/Text/XHtml.hi
+lib/ghc/${DISTNAME}/Text/XHtml/BlockTable.hi
+lib/ghc/${DISTNAME}/Text/XHtml/Debug.hi
+lib/ghc/${DISTNAME}/Text/XHtml/Extras.hi
+lib/ghc/${DISTNAME}/Text/XHtml/Frameset/
+lib/ghc/${DISTNAME}/Text/XHtml/Frameset.hi
+lib/ghc/${DISTNAME}/Text/XHtml/Frameset/Attributes.hi
+lib/ghc/${DISTNAME}/Text/XHtml/Frameset/Elements.hi
+lib/ghc/${DISTNAME}/Text/XHtml/Internals.hi
+lib/ghc/${DISTNAME}/Text/XHtml/Strict/
+lib/ghc/${DISTNAME}/Text/XHtml/Strict.hi
+lib/ghc/${DISTNAME}/Text/XHtml/Strict/Attributes.hi
+lib/ghc/${DISTNAME}/Text/XHtml/Strict/Elements.hi
+lib/ghc/${DISTNAME}/Text/XHtml/Table.hi
+lib/ghc/${DISTNAME}/Text/XHtml/Transitional/
+lib/ghc/${DISTNAME}/Text/XHtml/Transitional.hi
+lib/ghc/${DISTNAME}/Text/XHtml/Transitional/Attributes.hi
+lib/ghc/${DISTNAME}/Text/XHtml/Transitional/Elements.hi
+lib/ghc/${DISTNAME}/libHS${DISTNAME}.a
+lib/ghc/${DISTNAME}/register.sh
+@exec /usr/bin/env HOME=/nonexistent %D/lib/ghc/${DISTNAME}/register.sh -v0
+@unexec /usr/bin/env HOME=/nonexistent %D/lib/ghc/${DISTNAME}/unregister.sh
-v0 --force
+lib/ghc/${DISTNAME}/unregister.sh
+share/doc/hs-${DISTNAME}/
+share/doc/hs-${DISTNAME}/LICENSE
+!%%no_haddock%%
Index: devel/haddock/Makefile
===================================================================
RCS file: /cvs/ports/devel/haddock/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- devel/haddock/Makefile 27 Dec 2011 21:17:36 -0000 1.35
+++ devel/haddock/Makefile 10 Jan 2012 18:47:20 -0000
@@ -5,9 +5,9 @@ COMMENT-lib = haddock library
DISTNAME = haddock-2.9.2
PKGNAME-main = ${DISTNAME}
-REVISION-main = 2
+REVISION-main = 3
PKGNAME-lib = hs-${DISTNAME}
-REVISION-lib = 1
+REVISION-lib = 2
CATEGORIES = devel
HOMEPAGE = http://www.haskell.org/haddock/
@@ -38,15 +38,23 @@ WANTLIB-lib =
WANTLIB-main = ${WANTLIB} \
c gmp m pthread util
-BUILD_DEPENDS += devel/hs-ghc-paths \
+# During building, depend on the no_haddock flavors of hs-ghc-paths
+# and hs-xhtml. At runtime, the library (hs-haddock) explicitely
+# depends on the non-no_haddock flavors. Still missing: when building
+# the documentation for hs-haddock, force it to create links for
+# hs-ghc-paths and hs-xhtml even if the documentation of those packages
+# isn't yet installed.
+BUILD_DEPENDS += devel/hs-ghc-paths,no_haddock \
lang/ghc,-doc \
textproc/docbook \
textproc/docbook-xsl \
textproc/libxslt \
+ www/hs-xhtml,no_haddock>=3000.2.0.4 \
${RUN_DEPENDS}
RUN_DEPENDS-lib = ${RUN_DEPENDS} \
- devel/hs-ghc-paths
+ hs-ghc-paths-*-!no_haddock:devel/hs-ghc-paths \
+ hs-xhtml->=3000.2.0.4-!no_haddock:www/hs-xhtml
USE_GMAKE = Yes
CONFIGURE_STYLE = autoconf no-autoheader
Index: meta/haskell-platform/Makefile
===================================================================
RCS file: /cvs/ports/meta/haskell-platform/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- meta/haskell-platform/Makefile 31 Dec 2011 22:25:29 -0000 1.2
+++ meta/haskell-platform/Makefile 10 Jan 2012 18:47:20 -0000
@@ -4,6 +4,7 @@ COMMENT = Haskell platform meta-package
V = 2011.4.0.0
PKGNAME = haskell-platform-${V}
+REVISION = 0
HOMEPAGE = http://hackage.haskell.org/platform/
@@ -21,8 +22,6 @@ RUN_DEPENDS += lang/ghc>=7.0.0,<7.1 \
lang/ghc,-doc>=7.0.0,<7.1
# Additional libraries:
-# xhtml-3000.2.0.4 required, but xhtml-3000.2.0.1 included in our
-# ghc. This will be fixed soon.
RUN_DEPENDS += www/hs-cgi=3001.1.7.4 \
devel/hs-fgl=5.4.2.4 \
graphics/hs-GLUT=2.1.2.1 \
@@ -39,6 +38,7 @@ RUN_DEPENDS += www/hs-cgi=3001.1.7.4 \
devel/hs-regex-posix=0.95.1 \
devel/hs-stm=2.2.0.1 \
devel/hs-syb=0.3.3 \
+ hs-xhtml-3000.2.0.4-!no_haddock:www/hs-xhtml \
archivers/hs-zlib=0.5.3.1 \
net/hs-HTTP=4000.1.2 \
devel/hs-deepseq=1.1.0.2
