- Update to 0.5

PR:		ports/142099
Submitted by:	Jacula Modyun <jacula(at)gmail.com>

8 files changed, 26 insertions, 40 deletions

diff --git a/devel/hs-lazysmallcheck-ghc/Makefile b/devel/hs-lazysmallcheck-ghc/Makefile
index 5d963244a230..986be90629e0 100644
--- a/devel/hs-lazysmallcheck-ghc/Makefile
+++ b/devel/hs-lazysmallcheck-ghc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	lazysmallcheck
-PORTVERSION=	0.3
-PORTREVISION=	2
+PORTVERSION=	0.5
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -16,8 +15,8 @@ PKGNAMESUFFIX=	-ghc
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	A library for demand-driven testing of Haskell programs
 
-BUILD_DEPENDS=	ghc>=6.8:${PORTSDIR}/lang/ghc
-RUN_DEPENDS=	ghc>=6.8:${PORTSDIR}/lang/ghc
+BUILD_DEPENDS=	ghc>=6.10:${PORTSDIR}/lang/ghc
+RUN_DEPENDS=	ghc>=6.10:${PORTSDIR}/lang/ghc
 
 GHC_VERSION=		6.10.4
 LAZYSMALLCHECK_VERSION=	${PORTVERSION}
@@ -25,6 +24,7 @@ LAZYSMALLCHECK_VERSION=	${PORTVERSION}
 GHC_CMD=	${LOCALBASE}/bin/ghc
 SETUP_CMD=	./setup
 
+EXAMPLESDIR=	${PREFIX}/share/examples/${DISTNAME}
 DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
 LAZYSMALLCHECK_LIBDIR_REL=	lib/${DISTNAME}
 
@@ -52,6 +52,8 @@ HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
 PORTDOCS=	*
 .endif
 
+PORTEXAMPLES=	*
+
 .SILENT:
 
 do-configure:
@@ -71,6 +73,10 @@ do-install:
 	cd ${WRKSRC} && ${SETUP_CMD} install \
 		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${LAZYSMALLCHECK_LIBDIR_REL}/register.sh
 
+.if !defined(NOPORTEXAMPLES)
+	${MKDIR} ${EXAMPLESDIR} && cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
+.endif
+
 post-install:
 	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
diff --git a/devel/hs-lazysmallcheck-ghc/distinfo b/devel/hs-lazysmallcheck-ghc/distinfo
index 8f2201977d14..cd032429b343 100644
--- a/devel/hs-lazysmallcheck-ghc/distinfo
+++ b/devel/hs-lazysmallcheck-ghc/distinfo
@@ -1,3 +1,3 @@
-MD5 (lazysmallcheck-0.3.tar.gz) = 75f2495a391571013c1d10bad226e6ff
-SHA256 (lazysmallcheck-0.3.tar.gz) = f311abfe36e54a8d366db356da3daad52b607c24511ffc494fe1115eeb033cfa
-SIZE (lazysmallcheck-0.3.tar.gz) = 16834
+MD5 (lazysmallcheck-0.5.tar.gz) = f14dc0b5e2e2df93bfc3ced9e040d98f
+SHA256 (lazysmallcheck-0.5.tar.gz) = 981d48118e02501cf5c7fe726ebe01428c99d94c19005dd7f4b55e1ad414faed
+SIZE (lazysmallcheck-0.5.tar.gz) = 17059
diff --git a/devel/hs-lazysmallcheck-ghc/files/patch-lazysmallcheck.cabal b/devel/hs-lazysmallcheck-ghc/files/patch-lazysmallcheck.cabal
deleted file mode 100644
index 55446d2616cd..000000000000
--- a/devel/hs-lazysmallcheck-ghc/files/patch-lazysmallcheck.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- lazysmallcheck.cabal.orig	2009-07-15 09:45:12.000000000 +0000
-+++ lazysmallcheck.cabal	2009-07-15 09:45:44.000000000 +0000
-@@ -16,7 +16,7 @@
-   significantly fewer test-cases to verify a property for all inputs up 
-   to a given depth.
- Category:           Testing
--Build-Depends:      base, haskell98
-+Build-Depends:      base < 4, haskell98
- Build-Type:         Simple
- Extra-Source-Files:
-   examples/Catch.hs
diff --git a/devel/hs-lazysmallcheck-ghc/pkg-plist b/devel/hs-lazysmallcheck-ghc/pkg-plist
index 1ab46c70ca5c..43086f041d18 100644
--- a/devel/hs-lazysmallcheck-ghc/pkg-plist
+++ b/devel/hs-lazysmallcheck-ghc/pkg-plist
@@ -1,12 +1,10 @@
 @comment $FreeBSD$
 %%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSlazysmallcheck-%%LAZYSMALLCHECK_VERSION%%.o
 %%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/LazySmallCheck.hi
-%%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/LazySmallCheck/Generic.hi
 %%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSlazysmallcheck-%%LAZYSMALLCHECK_VERSION%%.a
 %%LAZYSMALLCHECK_LIBDIR_REL%%/register.sh
 %%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
 %%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/LazySmallCheck
 @dirrm %%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test
 @dirrm %%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
 @dirrm %%LAZYSMALLCHECK_LIBDIR_REL%%
diff --git a/devel/hs-lazysmallcheck/Makefile b/devel/hs-lazysmallcheck/Makefile
index 5d963244a230..986be90629e0 100644
--- a/devel/hs-lazysmallcheck/Makefile
+++ b/devel/hs-lazysmallcheck/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	lazysmallcheck
-PORTVERSION=	0.3
-PORTREVISION=	2
+PORTVERSION=	0.5
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -16,8 +15,8 @@ PKGNAMESUFFIX=	-ghc
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	A library for demand-driven testing of Haskell programs
 
-BUILD_DEPENDS=	ghc>=6.8:${PORTSDIR}/lang/ghc
-RUN_DEPENDS=	ghc>=6.8:${PORTSDIR}/lang/ghc
+BUILD_DEPENDS=	ghc>=6.10:${PORTSDIR}/lang/ghc
+RUN_DEPENDS=	ghc>=6.10:${PORTSDIR}/lang/ghc
 
 GHC_VERSION=		6.10.4
 LAZYSMALLCHECK_VERSION=	${PORTVERSION}
@@ -25,6 +24,7 @@ LAZYSMALLCHECK_VERSION=	${PORTVERSION}
 GHC_CMD=	${LOCALBASE}/bin/ghc
 SETUP_CMD=	./setup
 
+EXAMPLESDIR=	${PREFIX}/share/examples/${DISTNAME}
 DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
 LAZYSMALLCHECK_LIBDIR_REL=	lib/${DISTNAME}
 
@@ -52,6 +52,8 @@ HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
 PORTDOCS=	*
 .endif
 
+PORTEXAMPLES=	*
+
 .SILENT:
 
 do-configure:
@@ -71,6 +73,10 @@ do-install:
 	cd ${WRKSRC} && ${SETUP_CMD} install \
 		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${LAZYSMALLCHECK_LIBDIR_REL}/register.sh
 
+.if !defined(NOPORTEXAMPLES)
+	${MKDIR} ${EXAMPLESDIR} && cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
+.endif
+
 post-install:
 	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
diff --git a/devel/hs-lazysmallcheck/distinfo b/devel/hs-lazysmallcheck/distinfo
index 8f2201977d14..cd032429b343 100644
--- a/devel/hs-lazysmallcheck/distinfo
+++ b/devel/hs-lazysmallcheck/distinfo
@@ -1,3 +1,3 @@
-MD5 (lazysmallcheck-0.3.tar.gz) = 75f2495a391571013c1d10bad226e6ff
-SHA256 (lazysmallcheck-0.3.tar.gz) = f311abfe36e54a8d366db356da3daad52b607c24511ffc494fe1115eeb033cfa
-SIZE (lazysmallcheck-0.3.tar.gz) = 16834
+MD5 (lazysmallcheck-0.5.tar.gz) = f14dc0b5e2e2df93bfc3ced9e040d98f
+SHA256 (lazysmallcheck-0.5.tar.gz) = 981d48118e02501cf5c7fe726ebe01428c99d94c19005dd7f4b55e1ad414faed
+SIZE (lazysmallcheck-0.5.tar.gz) = 17059
diff --git a/devel/hs-lazysmallcheck/files/patch-lazysmallcheck.cabal b/devel/hs-lazysmallcheck/files/patch-lazysmallcheck.cabal
deleted file mode 100644
index 55446d2616cd..000000000000
--- a/devel/hs-lazysmallcheck/files/patch-lazysmallcheck.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- lazysmallcheck.cabal.orig	2009-07-15 09:45:12.000000000 +0000
-+++ lazysmallcheck.cabal	2009-07-15 09:45:44.000000000 +0000
-@@ -16,7 +16,7 @@
-   significantly fewer test-cases to verify a property for all inputs up 
-   to a given depth.
- Category:           Testing
--Build-Depends:      base, haskell98
-+Build-Depends:      base < 4, haskell98
- Build-Type:         Simple
- Extra-Source-Files:
-   examples/Catch.hs
diff --git a/devel/hs-lazysmallcheck/pkg-plist b/devel/hs-lazysmallcheck/pkg-plist
index 1ab46c70ca5c..43086f041d18 100644
--- a/devel/hs-lazysmallcheck/pkg-plist
+++ b/devel/hs-lazysmallcheck/pkg-plist
@@ -1,12 +1,10 @@
 @comment $FreeBSD$
 %%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSlazysmallcheck-%%LAZYSMALLCHECK_VERSION%%.o
 %%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/LazySmallCheck.hi
-%%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/LazySmallCheck/Generic.hi
 %%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSlazysmallcheck-%%LAZYSMALLCHECK_VERSION%%.a
 %%LAZYSMALLCHECK_LIBDIR_REL%%/register.sh
 %%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
 %%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/LazySmallCheck
 @dirrm %%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test
 @dirrm %%LAZYSMALLCHECK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
 @dirrm %%LAZYSMALLCHECK_LIBDIR_REL%%