From 602acd7af7baaa68ccd8f44513431e877c39e552 Mon Sep 17 00:00:00 2001 From: obraun Date: Sun, 28 Aug 2005 11:01:54 +0000 Subject: Upgrade to 0.7. --- devel/hs-haddock/Makefile | 3 +- devel/hs-haddock/distinfo | 4 +-- devel/hs-haddock/files/patch-src::HaddockUtil.hs | 16 ---------- .../hs-haddock/files/patch-src::HaddockVersion.hs | 9 ------ devel/hs-haddock/files/patch-src::Main.hs | 12 -------- devel/hs-haddock/files/patch-src::Makefile | 11 ------- devel/hs-haddock/pkg-plist | 35 ++++++++-------------- 7 files changed, 16 insertions(+), 74 deletions(-) delete mode 100644 devel/hs-haddock/files/patch-src::HaddockUtil.hs delete mode 100644 devel/hs-haddock/files/patch-src::HaddockVersion.hs delete mode 100644 devel/hs-haddock/files/patch-src::Main.hs delete mode 100644 devel/hs-haddock/files/patch-src::Makefile diff --git a/devel/hs-haddock/Makefile b/devel/hs-haddock/Makefile index b706796..4a2db59 100644 --- a/devel/hs-haddock/Makefile +++ b/devel/hs-haddock/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= haddock -PORTVERSION= 0.6 -PORTREVISION= 1 +PORTVERSION= 0.7 CATEGORIES= devel haskell MASTER_SITES= http://www.haskell.org/haddock/ PKGNAMEPREFIX= hs- diff --git a/devel/hs-haddock/distinfo b/devel/hs-haddock/distinfo index 758dd71..580dd7c 100644 --- a/devel/hs-haddock/distinfo +++ b/devel/hs-haddock/distinfo @@ -1,2 +1,2 @@ -MD5 (haddock-0.6-src.tar.gz) = 6f15d15a3e4352f77f003fb133b1d9b2 -SIZE (haddock-0.6-src.tar.gz) = 429708 +MD5 (haddock-0.7-src.tar.gz) = 759419e78416d5f093190968a4dc18f5 +SIZE (haddock-0.7-src.tar.gz) = 424745 diff --git a/devel/hs-haddock/files/patch-src::HaddockUtil.hs b/devel/hs-haddock/files/patch-src::HaddockUtil.hs deleted file mode 100644 index 36f465d..0000000 --- a/devel/hs-haddock/files/patch-src::HaddockUtil.hs +++ /dev/null @@ -1,16 +0,0 @@ ---- haddock/src/HaddockUtil.hs.orig Tue Feb 1 22:15:52 2005 -+++ haddock/src/HaddockUtil.hs Tue Feb 1 22:35:29 2005 -@@ -188,12 +188,7 @@ - - moduleHeaderRE :: Regex - moduleHeaderRE = mkRegexWithOpts -- "^([ \t\n]*Module[ \t]*:.*\n)?\ -- \([ \t\n]*Copyright[ \t]*:.*\n)?\ -- \([ \t\n]*License[ \t]*:.*\n)?\ -- \[ \t\n]*Maintainer[ \t]*:(.*)\n\ -- \[ \t\n]*Stability[ \t]*:(.*)\n\ -- \[ \t\n]*Portability[ \t]*:([^\n]*)\n" -+ "^([ \t\n]*Module[ \t]*:.*\n)?([ \t\n]*Copyright[ \t]*:.*\n)?([ \t\n]*License[ \t]*:.*\n)?[ \t\n]*Maintainer[ \t]*:(.*)\n[ \t\n]*Stability[ \t]*:(.*)\n[ \t\n]*Portability[ \t]*:([^\n]*)\n" - True -- match "\n" with "." - False -- not case sensitive - -- All fields except the last (Portability) may be multi-line. diff --git a/devel/hs-haddock/files/patch-src::HaddockVersion.hs b/devel/hs-haddock/files/patch-src::HaddockVersion.hs deleted file mode 100644 index af35a26..0000000 --- a/devel/hs-haddock/files/patch-src::HaddockVersion.hs +++ /dev/null @@ -1,9 +0,0 @@ ---- haddock/src/HaddockVersion.hs.orig Tue Feb 1 22:39:03 2005 -+++ haddock/src/HaddockVersion.hs Tue Feb 1 22:39:27 2005 -@@ -14,5 +14,4 @@ - - -- The version comes in via CPP from mk/version.mk - projectVersion :: String --projectVersion = tail "\ -- \ HADDOCK_VERSION" -+projectVersion = tail "HADDOCK_VERSION" diff --git a/devel/hs-haddock/files/patch-src::Main.hs b/devel/hs-haddock/files/patch-src::Main.hs deleted file mode 100644 index 90df1ca..0000000 --- a/devel/hs-haddock/files/patch-src::Main.hs +++ /dev/null @@ -1,12 +0,0 @@ ---- haddock/src/Main.hs.orig Tue Feb 1 22:42:31 2005 -+++ haddock/src/Main.hs Tue Feb 1 22:42:50 2005 -@@ -460,8 +460,7 @@ - - when (not (null name_strings)) $ - tell ["Warning: " ++ show mdl ++ -- ": the following names could not be resolved:\n\ -- \ " ++ concat (map (' ':) name_strings) -+ ": the following names could not be resolved:\n" ++ concat (map (' ':) name_strings) - ] - - return (mdl, Interface { diff --git a/devel/hs-haddock/files/patch-src::Makefile b/devel/hs-haddock/files/patch-src::Makefile deleted file mode 100644 index 69f1958..0000000 --- a/devel/hs-haddock/files/patch-src::Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- haddock/src/Makefile.orig Thu Mar 24 15:35:17 2005 -+++ haddock/src/Makefile Thu Mar 24 15:35:46 2005 -@@ -7,7 +7,7 @@ - - # Don't use any hslibs packages in GHC >= 5.04 - ifeq "$(ghc_ge_504)" "YES" --SRC_HC_OPTS += -package network -fglasgow-exts -cpp -+SRC_HC_OPTS += -package mtl -package network -fglasgow-exts -cpp - else - SRC_HC_OPTS += -package data -package text -package util -package net -fglasgow-exts -cpp - endif diff --git a/devel/hs-haddock/pkg-plist b/devel/hs-haddock/pkg-plist index 8b5b804..1339a44 100644 --- a/devel/hs-haddock/pkg-plist +++ b/devel/hs-haddock/pkg-plist @@ -2,34 +2,25 @@ bin/haddock bin/haddock-%%HADDOCK_VERSION%% lib/haddock-%%HADDOCK_VERSION%%/haddock.bin share/haddock-%%HADDOCK_VERSION%%/haddock.css +share/haddock-%%HADDOCK_VERSION%%/haddock.js share/haddock-%%HADDOCK_VERSION%%/haskell_icon.gif -%%PORTDOCS%%%%DOCSDIR%%/docbook.css -%%PORTDOCS%%%%DOCSDIR%%/haddock.html +share/haddock-%%HADDOCK_VERSION%%/minus.gif +share/haddock-%%HADDOCK_VERSION%%/plus.gif +%%PORTDOCS%%%%DOCSDIR%%/ch01s03.html +%%PORTDOCS%%%%DOCSDIR%%/ch03s02.html +%%PORTDOCS%%%%DOCSDIR%%/ch03s03.html +%%PORTDOCS%%%%DOCSDIR%%/ch03s04.html +%%PORTDOCS%%%%DOCSDIR%%/ch03s05.html +%%PORTDOCS%%%%DOCSDIR%%/ch03s08.html +%%PORTDOCS%%%%DOCSDIR%%/fptools.css +%%PORTDOCS%%%%DOCSDIR%%/hyperlinking.html +%%PORTDOCS%%%%DOCSDIR%%/index.html %%PORTDOCS%%%%DOCSDIR%%/introduction.html %%PORTDOCS%%%%DOCSDIR%%/invoking.html +%%PORTDOCS%%%%DOCSDIR%%/ix01.html %%PORTDOCS%%%%DOCSDIR%%/license.html %%PORTDOCS%%%%DOCSDIR%%/markup.html %%PORTDOCS%%%%DOCSDIR%%/module-attributes.html -%%PORTDOCS%%%%DOCSDIR%%/x57.html -%%PORTDOCS%%%%DOCSDIR%%/x444.html -%%PORTDOCS%%%%DOCSDIR%%/x468.html -%%PORTDOCS%%%%DOCSDIR%%/x473.html -%%PORTDOCS%%%%DOCSDIR%%/x516.html -%%PORTDOCS%%%%DOCSDIR%%/x531.html -%%PORTDOCS%%%%DOCSDIR%%/x599.html -%%PORTDOCS%%%%DOCSDIR%%/stylesheet-images/caution.gif -%%PORTDOCS%%%%DOCSDIR%%/stylesheet-images/home.gif -%%PORTDOCS%%%%DOCSDIR%%/stylesheet-images/important.gif -%%PORTDOCS%%%%DOCSDIR%%/stylesheet-images/next.gif -%%PORTDOCS%%%%DOCSDIR%%/stylesheet-images/note.gif -%%PORTDOCS%%%%DOCSDIR%%/stylesheet-images/prev.gif -%%PORTDOCS%%%%DOCSDIR%%/stylesheet-images/tip.gif -%%PORTDOCS%%%%DOCSDIR%%/stylesheet-images/toc-blank.gif -%%PORTDOCS%%%%DOCSDIR%%/stylesheet-images/toc-minus.gif -%%PORTDOCS%%%%DOCSDIR%%/stylesheet-images/toc-plus.gif -%%PORTDOCS%%%%DOCSDIR%%/stylesheet-images/up.gif -%%PORTDOCS%%%%DOCSDIR%%/stylesheet-images/warning.gif @dirrm lib/haddock-%%HADDOCK_VERSION%% @dirrm share/haddock-%%HADDOCK_VERSION%% -%%PORTDOCS%%@dirrm %%DOCSDIR%%/stylesheet-images %%PORTDOCS%%@dirrm %%DOCSDIR%% -- cgit v1.1