Date: Fri, 24 Jul 2009 11:23:48 -0700 (PDT) From: Jacula Modyun <jacula@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/137086: [maintainer update]: update of devel/hs-uulib from the 0.9.5 version to the 0.9.10 version Message-ID: <200907241823.n6OINlOe004242@splork.wirewater.yow> Resent-Message-ID: <200907241830.n6OIU7Pi009732@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 137086 >Category: ports >Synopsis: [maintainer update]: update of devel/hs-uulib from the 0.9.5 version to the 0.9.10 version >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Jul 24 18:30:06 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@splork.wirewater.yow:/usr/obj/usr/src/sys/JACULA i386 >Description: See the PR: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/137055 >How-To-Repeat: >Fix: --- patch-hs-uulib.diff begins here --- diff -uNr hs-uulib.orig/Makefile hs-uulib/Makefile --- hs-uulib.orig/Makefile 2008-07-18 20:05:15.000000000 +0000 +++ hs-uulib/Makefile 2009-07-22 06:25:10.000000000 +0000 @@ -6,8 +6,7 @@ # PORTNAME= uulib -PORTVERSION= 0.9.5 -PORTREVISION= 1 +PORTVERSION= 0.9.10 CATEGORIES= devel haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -16,8 +15,9 @@ COMMENT= Haskell Utrecht Tools Library BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc +RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc -GHC_VERSION= 6.8.3 +GHC_VERSION= 6.10.4 UULIB_VERSION= ${PORTVERSION} GHC_CMD= ${LOCALBASE}/bin/ghc @@ -30,16 +30,41 @@ UULIB_VERSION=${UULIB_VERSION} \ UULIB_LIBDIR_REL=${UULIB_LIBDIR_REL} +.if defined(NOPORTDOCS) +PLIST_SUB+= NOPORTDOCS="" +.else +PLIST_SUB+= NOPORTDOCS="@comment " +.endif + +.if !defined(NOPORTDOCS) + +PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK) +.if !empty(PORT_HADDOCK:M?0) +BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock +.endif +BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour + +HSCOLOUR_VERSION= 1.13 +HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION} + +PORTDOCS= * +.endif + .SILENT: do-configure: cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \ - && ${SETUP_CMD} configure --prefix=${PREFIX} + && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} do-build: cd ${WRKSRC} && ${SETUP_CMD} build \ && ${SETUP_CMD} register --gen-script +.if !defined(NOPORTDOCS) + cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \ + --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css +.endif + do-install: cd ${WRKSRC} && ${SETUP_CMD} install \ && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${UULIB_LIBDIR_REL}/register.sh diff -uNr hs-uulib.orig/distinfo hs-uulib/distinfo --- hs-uulib.orig/distinfo 2008-02-28 20:10:17.000000000 +0000 +++ hs-uulib/distinfo 2009-07-13 12:28:53.000000000 +0000 @@ -1,3 +1,3 @@ -MD5 (uulib-0.9.5.tar.gz) = 606dec3a8ea8797421e795336392f02f -SHA256 (uulib-0.9.5.tar.gz) = 38415725133af464de582dadc7d7e60b1aeb96344b18b239d176bf2181f98563 -SIZE (uulib-0.9.5.tar.gz) = 93618 +MD5 (uulib-0.9.10.tar.gz) = 5db835e7ee4accd902a54eb26c4762d8 +SHA256 (uulib-0.9.10.tar.gz) = 1df7336ed76c278323c2e25ab53ec1afc9eba6a7c918c826e9f783e84479e08f +SIZE (uulib-0.9.10.tar.gz) = 96312 diff -uNr hs-uulib.orig/pkg-descr hs-uulib/pkg-descr --- hs-uulib.orig/pkg-descr 2008-02-28 20:10:17.000000000 +0000 +++ hs-uulib/pkg-descr 2009-07-13 12:14:59.000000000 +0000 @@ -7,18 +7,15 @@ WWW: http://www.cs.uu.nl/wiki/HUT/AttributeGrammarSystem package-url: http://nix.cs.uu.nl/dist/hut/ -exposed-modules: - UU.Parsing.CharParser UU.Parsing.Derived - UU.Parsing.Interface UU.Parsing.MachineInterface - UU.Parsing.Merge UU.Parsing.Offside UU.Parsing.Perms - UU.Parsing.StateParser UU.Parsing UU.DData.IntBag - UU.DData.Map UU.DData.MultiSet UU.DData.Queue - UU.DData.Scc UU.DData.Seq UU.DData.Set UU.PPrint - UU.Pretty.Ext UU.Pretty UU.Scanner.GenToken UU.Scanner.GenTokenOrd - UU.Scanner.GenTokenParser UU.Scanner.GenTokenSymbol - UU.Scanner.Position UU.Scanner.Scanner - UU.Scanner.Token UU.Scanner.TokenParser UU.Scanner.TokenShow - UU.Scanner UU.Util.BinaryTrees UU.Util.PermTree UU.Util.Utils - UU.Pretty.Basic UU.Parsing.Machine - UU.DData.IntMap - UU.DData.IntSet +exposed-modules: UU.Parsing.CharParser UU.Parsing.Derived + UU.Parsing.Interface UU.Parsing.MachineInterface + UU.Parsing.Merge UU.Parsing.Offside UU.Parsing.Perms + UU.Parsing.StateParser UU.Parsing UU.DData.IntBag + UU.DData.Map UU.DData.MultiSet UU.DData.Queue + UU.DData.Scc UU.DData.Seq UU.DData.Set UU.PPrint + UU.Pretty.Ext UU.Pretty UU.Scanner.GenToken + UU.Scanner.GenTokenOrd UU.Scanner.GenTokenParser + UU.Scanner.GenTokenSymbol UU.Scanner.Position UU.Scanner.Scanner + UU.Scanner.Token UU.Scanner.TokenParser UU.Scanner.TokenShow + UU.Scanner UU.Util.BinaryTrees UU.Util.PermTree UU.Util.Utils + UU.Pretty.Basic UU.Parsing.Machine UU.DData.IntMap UU.DData.IntSet diff -uNr hs-uulib.orig/pkg-plist hs-uulib/pkg-plist --- hs-uulib.orig/pkg-plist 2008-02-28 20:10:17.000000000 +0000 +++ hs-uulib/pkg-plist 2009-07-13 13:11:14.000000000 +0000 @@ -37,8 +37,8 @@ %%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Util/Utils.hi %%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSuulib-%%UULIB_VERSION%%.a %%UULIB_LIBDIR_REL%%/register.sh -%%DOCSDIR%%/COPYRIGHT -@dirrm %%DOCSDIR%% +%%NOPORTDOCS%%%%DOCSDIR%%/COPYRIGHT +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% @dirrm %%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Util @dirrm %%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Scanner @dirrm %%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Pretty @@ -48,6 +48,6 @@ @dirrm %%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%% @dirrm %%UULIB_LIBDIR_REL%% @exec /bin/sh %D/%%UULIB_LIBDIR_REL%%/register.sh -@exec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old -@unexec if [ -x %D/bin/ghc-pkg ]; then %D/bin/ghc-pkg unregister uulib || /usr/bin/true; fi -@unexec if [ -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old ]; then rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old || /usr/bin/true; fi +@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +@unexec %D/bin/ghc-pkg unregister uulib +@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old --- patch-hs-uulib.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907241823.n6OINlOe004242>