wip/cabal update
Marko Schütz <[email protected]>
| Newsgroups | gmane.os.netbsd.devel.pkgsrc.wip.review |
|---|---|
| Message-ID | <87tzbo1afy.wl%[email protected]> |
Dear All, I'd like to update wip/cabal to the current version (1.4.0.2) A patch is appended below. Best regards, Marko ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ pkgsrc-wip-review mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/pkgsrc-wip-review
cabal.patch
(application/octet-stream, 14.4 KB)
Index: INSTALL
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/cabal/INSTALL,v
retrieving revision 1.4
diff -u -r1.4 INSTALL
--- INSTALL 10 Dec 2007 16:43:58 -0000 1.4
+++ INSTALL 7 Oct 2008 19:11:33 -0000
@@ -4,10 +4,11 @@
case ${STAGE} in
POST-INSTALL)
- echo 'name: Cabal
+ echo "name: Cabal
version: ${PKGVERSION}
license: BSD3
copyright: 2003-2006, Isaac Jones
+ 2005-2008, Duncan Coutts
maintainer: [email protected]
stability:
homepage: http://www.haskell.org/cabal/
@@ -22,27 +23,51 @@
category: Distribution
author: Isaac Jones <[email protected]>
exposed: True
-exposed-modules: Distribution.Compiler Distribution.Extension
- Distribution.Setup Distribution.InstalledPackageInfo
- Distribution.License Distribution.Make Distribution.Package
- Distribution.PackageDescription Distribution.Configuration
- Distribution.ParseUtils Distribution.Simple
- Distribution.Simple.Build Distribution.Simple.Compiler
- Distribution.Simple.Configure Distribution.Simple.GHC
- Distribution.Simple.GHC.Makefile
- Distribution.Simple.GHC.PackageConfig Distribution.Simple.Haddock
- Distribution.Simple.Hugs Distribution.Simple.Install
- Distribution.Simple.InstallDirs Distribution.Simple.JHC
- Distribution.Simple.LocalBuildInfo Distribution.Simple.NHC
- Distribution.Simple.PreProcess Distribution.Simple.PreProcess.Unlit
- Distribution.Simple.Program Distribution.Simple.Register
- Distribution.Simple.Setup Distribution.Simple.SetupWrapper
- Distribution.Simple.SrcDist Distribution.Simple.Utils
- Distribution.System Distribution.Verbosity Distribution.Version
- Distribution.Compat.ReadP Language.Haskell.Extension
-hidden-modules: Distribution.GetOpt Distribution.Compat.Map
- Distribution.Compat.Directory Distribution.Compat.Exception
- Distribution.Compat.RawSystem Distribution.Compat.TempFile
+exposed-modules: Distribution.Compiler
+ Distribution.Extension
+ Distribution.Setup
+ Distribution.InstalledPackageInfo
+ Distribution.License
+ Distribution.Make
+ Distribution.Package
+ Distribution.PackageDescription
+ Distribution.PackageDescription.Configuration
+ Distribution.PackageDescription.Check
+ Distribution.ParseUtils
+ Distribution.ReadE
+ Distribution.Simple
+ Distribution.Simple.Build
+ Distribution.Simple.BuildPaths
+ Distribution.Simple.Command
+ Distribution.Simple.Compiler
+ Distribution.Simple.Configure
+ Distribution.Simple.GHC
+ Distribution.Simple.Haddock
+ Distribution.Simple.Hugs
+ Distribution.Simple.Install
+ Distribution.Simple.InstallDirs
+ Distribution.Simple.JHC
+ Distribution.Simple.LocalBuildInfo
+ Distribution.Simple.NHC
+ Distribution.Simple.PackageIndex
+ Distribution.Simple.PreProcess
+ Distribution.Simple.PreProcess.Unlit
+ Distribution.Simple.Program
+ Distribution.Simple.Register
+ Distribution.Simple.Setup
+ Distribution.Simple.SetupWrapper
+ Distribution.Simple.SrcDist
+ Distribution.Simple.UserHooks
+ Distribution.Simple.Utils
+ Distribution.System
+ Distribution.Text
+ Distribution.Verbosity
+ Distribution.Version
+ Distribution.Compat.ReadP
+ Language.Haskell.Extension
+hidden-modules: Distribution.GetOpt
+ Distribution.Compat.TempFile
+ Distribution.Simple.GHC.Makefile
import-dirs: ${PREFIX}/lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}
library-dirs: ${PREFIX}/lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}
hs-libraries: HSCabal-${PKGVERSION}
@@ -50,13 +75,13 @@
extra-ghci-libraries:
include-dirs:
includes:
-depends: base-2.1.1 filepath-1.0
+depends: base-3.0.2.0 filepath-1.1.0.0
hugs-options:
cc-options:
ld-options:
framework-dirs:
frameworks:
haddock-interfaces: ${PREFIX}/share/doc/Cabal-${PKGVERSION}/html/Cabal.haddock
-haddock-html: ${PREFIX}/share/doc/Cabal-${PKGVERSION}/html' | ghc-pkg update -
+haddock-html: ${PREFIX}/share/doc/Cabal-${PKGVERSION}/html" | ghc-pkg update -
;;
esac
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/cabal/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile 10 Dec 2007 16:43:58 -0000 1.6
+++ Makefile 7 Oct 2008 19:11:34 -0000
@@ -1,12 +1,13 @@
# $NetBSD$
#
-DISTNAME= cabal-1.2.2.0
+DISTNAME= Cabal-1.4.0.2
+PKGNAME= cabal-1.4.0.2
CATEGORIES= devel
-MASTER_SITES= http://www.haskell.org/cabal/release/${DISTNAME}/
+MASTER_SITES= http://www.haskell.org/cabal/release/${PKGNAME}/
MAINTAINER= [email protected]
-HOMEPAGE= http://www.haskell.org/cabal/release/${DISTNAME}/
+HOMEPAGE= http://www.haskell.org/cabal/release/${PKGNAME}/
COMMENT= Haskell common architecture for building applications and libraries
USE_TOOLS+= gmake
@@ -31,19 +32,19 @@
do-configure:
cd ${WRKSRC} && \
- ${SETENV} ${CONFIGURE_ENV} runhaskell -cpp Setup.lhs configure ${CONFIGURE_ARGS}
+ ${SETENV} ${CONFIGURE_ENV} runhaskell -cpp Setup.hs configure ${CONFIGURE_ARGS}
do-build:
- cd ${WRKSRC} && runhaskell -cpp Setup.lhs build
+ cd ${WRKSRC} && runhaskell -cpp Setup.hs build
do-install:
- cd ${WRKSRC} && runhaskell -cpp Setup.lhs install
+ cd ${WRKSRC} && runhaskell -cpp Setup.hs install
post-install:
- ${INSTALL_DATA_DIR} ${DOCDIR}/pkg-spec-html
+ ${INSTALL_DATA_DIR} ${DOCDIR}/API
${INSTALL_DATA_DIR} ${DOCDIR}/users-guide
- cd ${WRKSRC}/doc/pkg-spec-html && \
- ${INSTALL_DATA} *.html ${DOCDIR}/pkg-spec-html
+ cd ${WRKSRC}/doc/API/Cabal && \
+ ${INSTALL_DATA} *.html ${DOCDIR}/API
cd ${WRKSRC}/doc/users-guide && \
${INSTALL_DATA} *.html ${DOCDIR}/users-guide
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/cabal/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- PLIST 10 Dec 2007 16:43:58 -0000 1.3
+++ PLIST 7 Oct 2008 19:11:36 -0000
@@ -1,12 +1,7 @@
@comment $NetBSD$
-lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Compat/Directory.hi
-lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Compat/Exception.hi
-lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Compat/Map.hi
-lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Compat/RawSystem.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Compat/ReadP.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Compat/TempFile.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Compiler.hi
-lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Configuration.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Extension.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/GetOpt.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/InstalledPackageInfo.hi
@@ -14,15 +9,19 @@
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Make.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Package.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/PackageDescription.hi
+lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/PackageDescription/Check.hi
+lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/PackageDescription/Configuration.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/ParseUtils.hi
+lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/ReadE.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Setup.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Simple.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Simple/Build.hi
+lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Simple/BuildPaths.hi
+lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Simple/Command.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Simple/Compiler.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Simple/Configure.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Simple/GHC.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Simple/GHC/Makefile.hi
-lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Simple/GHC/PackageConfig.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Simple/Haddock.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Simple/Hugs.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Simple/Install.hi
@@ -30,6 +29,7 @@
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Simple/JHC.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Simple/LocalBuildInfo.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Simple/NHC.hi
+lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Simple/PackageIndex.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Simple/PreProcess.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Simple/PreProcess/Unlit.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Simple/Program.hi
@@ -38,32 +38,66 @@
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Simple/SetupWrapper.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Simple/SrcDist.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Simple/Utils.hi
+lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Simple/UserHooks.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/System.hi
+lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Text.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Verbosity.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Distribution/Version.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/HSCabal-${PKGVERSION}.o
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Language/Haskell/Extension.hi
lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/libHSCabal-${PKGVERSION}.a
share/doc/Cabal-${PKGVERSION}/LICENSE
-share/doc/cabal/pkg-spec-html/a818.html
-share/doc/cabal/pkg-spec-html/a825.html
-share/doc/cabal/pkg-spec-html/index.html
-share/doc/cabal/pkg-spec-html/x138.html
-share/doc/cabal/pkg-spec-html/x272.html
-share/doc/cabal/pkg-spec-html/x444.html
-share/doc/cabal/pkg-spec-html/x611.html
-share/doc/cabal/pkg-spec-html/x853.html
-share/doc/cabal/pkg-spec-html/x863.html
-share/doc/cabal/pkg-spec-html/x881.html
-share/doc/cabal/pkg-spec-html/x886.html
-share/doc/cabal/pkg-spec-html/x895.html
-share/doc/cabal/pkg-spec-html/x904.html
+share/doc/cabal/API/Distribution-Compat-ReadP.html
+share/doc/cabal/API/Distribution-Compiler.html
+share/doc/cabal/API/Distribution-Extension.html
+share/doc/cabal/API/Distribution-InstalledPackageInfo.html
+share/doc/cabal/API/Distribution-License.html
+share/doc/cabal/API/Distribution-Make.html
+share/doc/cabal/API/Distribution-Package.html
+share/doc/cabal/API/Distribution-PackageDescription-Check.html
+share/doc/cabal/API/Distribution-PackageDescription-Configuration.html
+share/doc/cabal/API/Distribution-PackageDescription.html
+share/doc/cabal/API/Distribution-ReadE.html
+share/doc/cabal/API/Distribution-Setup.html
+share/doc/cabal/API/Distribution-Simple-Build.html
+share/doc/cabal/API/Distribution-Simple-BuildPaths.html
+share/doc/cabal/API/Distribution-Simple-Command.html
+share/doc/cabal/API/Distribution-Simple-Compiler.html
+share/doc/cabal/API/Distribution-Simple-Configure.html
+share/doc/cabal/API/Distribution-Simple-GHC.html
+share/doc/cabal/API/Distribution-Simple-Haddock.html
+share/doc/cabal/API/Distribution-Simple-Hugs.html
+share/doc/cabal/API/Distribution-Simple-Install.html
+share/doc/cabal/API/Distribution-Simple-InstallDirs.html
+share/doc/cabal/API/Distribution-Simple-JHC.html
+share/doc/cabal/API/Distribution-Simple-LocalBuildInfo.html
+share/doc/cabal/API/Distribution-Simple-NHC.html
+share/doc/cabal/API/Distribution-Simple-PackageIndex.html
+share/doc/cabal/API/Distribution-Simple-PreProcess-Unlit.html
+share/doc/cabal/API/Distribution-Simple-PreProcess.html
+share/doc/cabal/API/Distribution-Simple-Program.html
+share/doc/cabal/API/Distribution-Simple-Register.html
+share/doc/cabal/API/Distribution-Simple-Setup.html
+share/doc/cabal/API/Distribution-Simple-SetupWrapper.html
+share/doc/cabal/API/Distribution-Simple-SrcDist.html
+share/doc/cabal/API/Distribution-Simple-UserHooks.html
+share/doc/cabal/API/Distribution-Simple-Utils.html
+share/doc/cabal/API/Distribution-Simple.html
+share/doc/cabal/API/Distribution-System.html
+share/doc/cabal/API/Distribution-Text.html
+share/doc/cabal/API/Distribution-Verbosity.html
+share/doc/cabal/API/Distribution-Version.html
+share/doc/cabal/API/Language-Haskell-Extension.html
+share/doc/cabal/API/doc-index.html
+share/doc/cabal/API/index.html
+share/doc/cabal/users-guide/authors.html
+share/doc/cabal/users-guide/bugs.html
+share/doc/cabal/users-guide/builders.html
share/doc/cabal/users-guide/index.html
-share/doc/cabal/users-guide/x1722.html
-share/doc/cabal/users-guide/x30.html
-share/doc/cabal/users-guide/x800.html
+share/doc/cabal/users-guide/packages.html
+share/doc/cabal/users-guide/stability.html
@dirrm share/doc/cabal/users-guide
-@dirrm share/doc/cabal/pkg-spec-html
+@dirrm share/doc/cabal/API
@dirrm share/doc/cabal
@dirrm share/doc/Cabal-${PKGVERSION}
@dirrm lib/Cabal-${PKGVERSION}/ghc-${GHCVERSION}/Language/Haskell
Index: buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/cabal/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- buildlink3.mk 6 Mar 2008 11:25:00 -0000 1.4
+++ buildlink3.mk 7 Oct 2008 19:11:36 -0000
@@ -13,7 +13,7 @@
.if ${CABAL_BUILDLINK3_MK} == "+"
BUILDLINK_DEPMETHOD.cabal?= build
-BUILDLINK_API_DEPENDS.cabal+= cabal>=1.2.2.0
+BUILDLINK_API_DEPENDS.cabal+= cabal>=1.4.0.2
BUILDLINK_PKGSRCDIR.cabal?= ../../wip/cabal
.endif # CABAL_BUILDLINK3_MK
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/cabal/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo 10 Dec 2007 16:43:58 -0000 1.3
+++ distinfo 7 Oct 2008 19:11:36 -0000
@@ -1,5 +1,5 @@
$NetBSD$
-SHA1 (cabal-1.2.2.0.tar.gz) = d987e471ea711798c40435f1eb1c3bc5f75d4eb5
-RMD160 (cabal-1.2.2.0.tar.gz) = 3743d35967d0c8d3daabcd6ba3cf7bbf922d4ef7
-Size (cabal-1.2.2.0.tar.gz) = 617757 bytes
+SHA1 (Cabal-1.4.0.2.tar.gz) = 5ccae8754130178d476c7f613519d36c5f4fd30d
+RMD160 (Cabal-1.4.0.2.tar.gz) = 00b00491dcb3d09df40d115ae981732715c5286b
+Size (Cabal-1.4.0.2.tar.gz) = 310105 bytes
signature.asc
(application/pgp-signature, 194 B)
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (NetBSD) iEYEABECAAYFAkjrteEACgkQOrTq/v3ACNonmACglKiGcpubSbkcXwHQUbE2bzuZ m5QAnjylD8Y7+HKHGMJpDsC7AyAtoUTT =Rz5G -----END PGP SIGNATURE-----