- migrated port
- standardized pkg-descr
---
devel/hs-uulib/Makefile | 35 ++----------
devel/hs-uulib/pkg-descr | 27 ++++-----
devel/hs-uulib/pkg-plist | 137 +++++++++++++++++++++++++++++-----------------
3 files changed, 104 insertions(+), 95 deletions(-)
diff --git a/devel/hs-uulib/Makefile b/devel/hs-uulib/Makefile
index b5e321c..fcd265d 100644
--- a/devel/hs-uulib/Makefile
+++ b/devel/hs-uulib/Makefile
@@ -7,44 +7,19 @@
PORTNAME= uulib
PORTVERSION= 0.9.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
-MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
+MASTER_SITES= ${MASTER_SITE_HACKAGE}
PKGNAMEPREFIX= hs-
MAINTAINER= jacula@gmail.com
COMMENT= Haskell Utrecht Tools Library
-BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
+USE_CABAL= distrsimple:full hc:bothdep profile:all:full
-GHC_VERSION= 6.8.3
-UULIB_VERSION= ${PORTVERSION}
-
-GHC_CMD= ${LOCALBASE}/bin/ghc
-SETUP_CMD= ./setup
-
-DOCSDIR= ${PREFIX}/share/doc/${DISTNAME}
-UULIB_LIBDIR_REL= lib/${DISTNAME}
-
-PLIST_SUB= GHC_VERSION=${GHC_VERSION} \
- UULIB_VERSION=${UULIB_VERSION} \
- UULIB_LIBDIR_REL=${UULIB_LIBDIR_REL}
+HADDOCK_HTML=
+HADDOCK_INTERFACE=
.SILENT:
-do-configure:
- cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \
- && ${SETUP_CMD} configure --prefix=${PREFIX}
-
-do-build:
- cd ${WRKSRC} && ${SETUP_CMD} build \
- && ${SETUP_CMD} register --gen-script
-
-do-install:
- cd ${WRKSRC} && ${SETUP_CMD} install \
- && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${UULIB_LIBDIR_REL}/register.sh
-
-post-install:
- ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
-
.include
diff --git a/devel/hs-uulib/pkg-descr b/devel/hs-uulib/pkg-descr
index 05502b0..8e06edd 100644
--- a/devel/hs-uulib/pkg-descr
+++ b/devel/hs-uulib/pkg-descr
@@ -1,24 +1,23 @@
Fast Parser Combinators and Pretty Printing Combinators
libraries by the Utrecht University.
-author:
-maintainer: Arie Middelkoop
-license: LGPL-2.1
+Maintainer: Arie Middelkoop
+License: LGPL-2.1
WWW: http://www.cs.uu.nl/wiki/HUT/AttributeGrammarSystem
-package-url: http://nix.cs.uu.nl/dist/hut/
+Package-url: http://nix.cs.uu.nl/dist/hut/
-exposed-modules:
+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.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
+ 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 --git a/devel/hs-uulib/pkg-plist b/devel/hs-uulib/pkg-plist
index c1c1196..ebfc6aa 100644
--- a/devel/hs-uulib/pkg-plist
+++ b/devel/hs-uulib/pkg-plist
@@ -1,53 +1,88 @@
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSuulib-%%UULIB_VERSION%%.o
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/DData/IntBag.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/DData/IntMap.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/DData/IntSet.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/DData/Map.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/DData/MultiSet.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/DData/Queue.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/DData/Scc.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/DData/Seq.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/DData/Set.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/PPrint.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Parsing.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Parsing/CharParser.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Parsing/Derived.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Parsing/Interface.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Parsing/Machine.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Parsing/MachineInterface.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Parsing/Merge.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Parsing/Offside.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Parsing/Perms.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Parsing/StateParser.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Pretty.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Pretty/Basic.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Pretty/Ext.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Scanner.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Scanner/GenToken.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Scanner/GenTokenOrd.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Scanner/GenTokenParser.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Scanner/GenTokenSymbol.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Scanner/Position.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Scanner/Scanner.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Scanner/Token.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Scanner/TokenParser.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Scanner/TokenShow.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Util/BinaryTrees.hi
-%%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Util/PermTree.hi
-%%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
+%%D_LIBSUBDIR_REL%%/HSuulib-%%D_VERSION%%.o
+%%D_LIBSUBDIR_REL%%/UU/DData/IntBag.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/DData/IntBag.p_hi
+%%D_LIBSUBDIR_REL%%/UU/DData/IntMap.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/DData/IntMap.p_hi
+%%D_LIBSUBDIR_REL%%/UU/DData/IntSet.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/DData/IntSet.p_hi
+%%D_LIBSUBDIR_REL%%/UU/DData/Map.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/DData/Map.p_hi
+%%D_LIBSUBDIR_REL%%/UU/DData/MultiSet.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/DData/MultiSet.p_hi
+%%D_LIBSUBDIR_REL%%/UU/DData/Queue.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/DData/Queue.p_hi
+%%D_LIBSUBDIR_REL%%/UU/DData/Scc.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/DData/Scc.p_hi
+%%D_LIBSUBDIR_REL%%/UU/DData/Seq.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/DData/Seq.p_hi
+%%D_LIBSUBDIR_REL%%/UU/DData/Set.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/DData/Set.p_hi
+%%D_LIBSUBDIR_REL%%/UU/PPrint.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/PPrint.p_hi
+%%D_LIBSUBDIR_REL%%/UU/Parsing.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/Parsing.p_hi
+%%D_LIBSUBDIR_REL%%/UU/Parsing/CharParser.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/Parsing/CharParser.p_hi
+%%D_LIBSUBDIR_REL%%/UU/Parsing/Derived.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/Parsing/Derived.p_hi
+%%D_LIBSUBDIR_REL%%/UU/Parsing/Interface.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/Parsing/Interface.p_hi
+%%D_LIBSUBDIR_REL%%/UU/Parsing/Machine.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/Parsing/Machine.p_hi
+%%D_LIBSUBDIR_REL%%/UU/Parsing/MachineInterface.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/Parsing/MachineInterface.p_hi
+%%D_LIBSUBDIR_REL%%/UU/Parsing/Merge.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/Parsing/Merge.p_hi
+%%D_LIBSUBDIR_REL%%/UU/Parsing/Offside.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/Parsing/Offside.p_hi
+%%D_LIBSUBDIR_REL%%/UU/Parsing/Perms.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/Parsing/Perms.p_hi
+%%D_LIBSUBDIR_REL%%/UU/Parsing/StateParser.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/Parsing/StateParser.p_hi
+%%D_LIBSUBDIR_REL%%/UU/Pretty.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/Pretty.p_hi
+%%D_LIBSUBDIR_REL%%/UU/Pretty/Basic.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/Pretty/Basic.p_hi
+%%D_LIBSUBDIR_REL%%/UU/Pretty/Ext.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/Pretty/Ext.p_hi
+%%D_LIBSUBDIR_REL%%/UU/Scanner.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/Scanner.p_hi
+%%D_LIBSUBDIR_REL%%/UU/Scanner/GenToken.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/Scanner/GenToken.p_hi
+%%D_LIBSUBDIR_REL%%/UU/Scanner/GenTokenOrd.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/Scanner/GenTokenOrd.p_hi
+%%D_LIBSUBDIR_REL%%/UU/Scanner/GenTokenParser.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/Scanner/GenTokenParser.p_hi
+%%D_LIBSUBDIR_REL%%/UU/Scanner/GenTokenSymbol.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/Scanner/GenTokenSymbol.p_hi
+%%D_LIBSUBDIR_REL%%/UU/Scanner/Position.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/Scanner/Position.p_hi
+%%D_LIBSUBDIR_REL%%/UU/Scanner/Scanner.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/Scanner/Scanner.p_hi
+%%D_LIBSUBDIR_REL%%/UU/Scanner/Token.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/Scanner/Token.p_hi
+%%D_LIBSUBDIR_REL%%/UU/Scanner/TokenParser.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/Scanner/TokenParser.p_hi
+%%D_LIBSUBDIR_REL%%/UU/Scanner/TokenShow.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/Scanner/TokenShow.p_hi
+%%D_LIBSUBDIR_REL%%/UU/Util/BinaryTrees.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/Util/BinaryTrees.p_hi
+%%D_LIBSUBDIR_REL%%/UU/Util/PermTree.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/Util/PermTree.p_hi
+%%D_LIBSUBDIR_REL%%/UU/Util/Utils.hi
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/UU/Util/Utils.p_hi
+%%D_LIBSUBDIR_REL%%/libHSuulib-%%D_VERSION%%.a
+%%PROFILE%%%%D_LIBSUBDIR_REL%%/libHSuulib-%%D_VERSION%%_p.a
+%%D_LIBDIR_REL%%/%%D_REG%%
%%DOCSDIR%%/COPYRIGHT
@dirrm %%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
-@dirrm %%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Parsing
-@dirrm %%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/DData
-@dirrm %%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU
-@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
+@dirrm %%D_LIBSUBDIR_REL%%/UU/Util
+@dirrm %%D_LIBSUBDIR_REL%%/UU/Scanner
+@dirrm %%D_LIBSUBDIR_REL%%/UU/Pretty
+@dirrm %%D_LIBSUBDIR_REL%%/UU/Parsing
+@dirrm %%D_LIBSUBDIR_REL%%/UU/DData
+@dirrm %%D_LIBSUBDIR_REL%%/UU
+@dirrm %%D_LIBSUBDIR_REL%%
+@dirrm %%D_LIBDIR_REL%%
+@exec %%REG_CMD%%
+@unexec %%UNREG_CMD%%
--
1.6.1.3
