Update port to version 1.13.

PR:		40172
Submitted by:	Simon Marlow <simon@smarlow.com>

6 files changed, 38 insertions, 32 deletions

diff --git a/devel/happy/Makefile b/devel/happy/Makefile
index 2f19c084309..934a54c98d5 100644
--- a/devel/happy/Makefile
+++ b/devel/happy/Makefile
@@ -5,9 +5,9 @@
 # $FreeBSD$
 
 PORTNAME=	happy
-PORTVERSION=	1.11
+PORTVERSION=	1.13
 CATEGORIES=	devel
-MASTER_SITES=	http://www.haskell.org/happy/dist/1.11/
+MASTER_SITES=	http://www.haskell.org/happy/dist/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	simonmar@microsoft.com
@@ -25,6 +25,8 @@ WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//g}
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
+PLIST_SUB=	HAPPY_VERSION=${PORTVERSION}
+
 BOOT_COOKIE = ${WRKDIR}/.boot_done
 
 ${BOOT_COOKIE}:
diff --git a/devel/happy/distinfo b/devel/happy/distinfo
index 7a2fcc684cc..dba23ab2e62 100644
--- a/devel/happy/distinfo
+++ b/devel/happy/distinfo
@@ -1 +1 @@
-MD5 (happy-1.11-src.tar.gz) = 35fc40b31b6f97445ddd4493c3114ce9
+MD5 (happy-1.13-src.tar.gz) = d17619ae6e2caf883651d88be38dfd8a
diff --git a/devel/happy/pkg-plist b/devel/happy/pkg-plist
index c02b5ce1737..ae31ebf8ce7 100644
--- a/devel/happy/pkg-plist
+++ b/devel/happy/pkg-plist
@@ -1,15 +1,15 @@
 bin/happy
-bin/happy-1.11
-lib/happy-1.11/happy.bin
-lib/happy-1.11/happy/HappyTemplate
-lib/happy-1.11/happy/HappyTemplate-arrays
-lib/happy-1.11/happy/HappyTemplate-arrays-coerce
-lib/happy-1.11/happy/HappyTemplate-arrays-coerce-debug
-lib/happy-1.11/happy/HappyTemplate-arrays-debug
-lib/happy-1.11/happy/HappyTemplate-arrays-ghc
-lib/happy-1.11/happy/HappyTemplate-arrays-ghc-debug
-lib/happy-1.11/happy/HappyTemplate-coerce
-lib/happy-1.11/happy/HappyTemplate-ghc
+bin/happy-%%HAPPY_VERSION%%
+lib/happy-%%HAPPY_VERSION%%/happy.bin
+lib/happy-%%HAPPY_VERSION%%/happy/HappyTemplate
+lib/happy-%%HAPPY_VERSION%%/happy/HappyTemplate-arrays
+lib/happy-%%HAPPY_VERSION%%/happy/HappyTemplate-arrays-coerce
+lib/happy-%%HAPPY_VERSION%%/happy/HappyTemplate-arrays-coerce-debug
+lib/happy-%%HAPPY_VERSION%%/happy/HappyTemplate-arrays-debug
+lib/happy-%%HAPPY_VERSION%%/happy/HappyTemplate-arrays-ghc
+lib/happy-%%HAPPY_VERSION%%/happy/HappyTemplate-arrays-ghc-debug
+lib/happy-%%HAPPY_VERSION%%/happy/HappyTemplate-coerce
+lib/happy-%%HAPPY_VERSION%%/happy/HappyTemplate-ghc
 share/doc/happy/docbook.css
 share/doc/happy/happy-introduction.html
 share/doc/happy/happy.html
@@ -34,6 +34,7 @@ share/doc/happy/sec-sequences.html
 share/doc/happy/sec-tips.html
 share/doc/happy/sec-type-signatures.html
 share/doc/happy/sec-using.html
+share/doc/happy/sec-happy-ghci.html
 share/doc/happy/stylesheet-images/caution.gif
 share/doc/happy/stylesheet-images/home.gif
 share/doc/happy/stylesheet-images/important.gif
@@ -46,7 +47,7 @@ share/doc/happy/stylesheet-images/toc-minus.gif
 share/doc/happy/stylesheet-images/toc-plus.gif
 share/doc/happy/stylesheet-images/up.gif
 share/doc/happy/stylesheet-images/warning.gif
-@dirrm lib/happy-1.11/happy
-@dirrm lib/happy-1.11
+@dirrm lib/happy-%%HAPPY_VERSION%%/happy
+@dirrm lib/happy-%%HAPPY_VERSION%%
 @dirrm share/doc/happy/stylesheet-images
 @dirrm share/doc/happy
diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile
index 2f19c084309..934a54c98d5 100644
--- a/devel/hs-happy/Makefile
+++ b/devel/hs-happy/Makefile
@@ -5,9 +5,9 @@
 # $FreeBSD$
 
 PORTNAME=	happy
-PORTVERSION=	1.11
+PORTVERSION=	1.13
 CATEGORIES=	devel
-MASTER_SITES=	http://www.haskell.org/happy/dist/1.11/
+MASTER_SITES=	http://www.haskell.org/happy/dist/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	simonmar@microsoft.com
@@ -25,6 +25,8 @@ WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//g}
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
+PLIST_SUB=	HAPPY_VERSION=${PORTVERSION}
+
 BOOT_COOKIE = ${WRKDIR}/.boot_done
 
 ${BOOT_COOKIE}:
diff --git a/devel/hs-happy/distinfo b/devel/hs-happy/distinfo
index 7a2fcc684cc..dba23ab2e62 100644
--- a/devel/hs-happy/distinfo
+++ b/devel/hs-happy/distinfo
@@ -1 +1 @@
-MD5 (happy-1.11-src.tar.gz) = 35fc40b31b6f97445ddd4493c3114ce9
+MD5 (happy-1.13-src.tar.gz) = d17619ae6e2caf883651d88be38dfd8a
diff --git a/devel/hs-happy/pkg-plist b/devel/hs-happy/pkg-plist
index c02b5ce1737..ae31ebf8ce7 100644
--- a/devel/hs-happy/pkg-plist
+++ b/devel/hs-happy/pkg-plist
@@ -1,15 +1,15 @@
 bin/happy
-bin/happy-1.11
-lib/happy-1.11/happy.bin
-lib/happy-1.11/happy/HappyTemplate
-lib/happy-1.11/happy/HappyTemplate-arrays
-lib/happy-1.11/happy/HappyTemplate-arrays-coerce
-lib/happy-1.11/happy/HappyTemplate-arrays-coerce-debug
-lib/happy-1.11/happy/HappyTemplate-arrays-debug
-lib/happy-1.11/happy/HappyTemplate-arrays-ghc
-lib/happy-1.11/happy/HappyTemplate-arrays-ghc-debug
-lib/happy-1.11/happy/HappyTemplate-coerce
-lib/happy-1.11/happy/HappyTemplate-ghc
+bin/happy-%%HAPPY_VERSION%%
+lib/happy-%%HAPPY_VERSION%%/happy.bin
+lib/happy-%%HAPPY_VERSION%%/happy/HappyTemplate
+lib/happy-%%HAPPY_VERSION%%/happy/HappyTemplate-arrays
+lib/happy-%%HAPPY_VERSION%%/happy/HappyTemplate-arrays-coerce
+lib/happy-%%HAPPY_VERSION%%/happy/HappyTemplate-arrays-coerce-debug
+lib/happy-%%HAPPY_VERSION%%/happy/HappyTemplate-arrays-debug
+lib/happy-%%HAPPY_VERSION%%/happy/HappyTemplate-arrays-ghc
+lib/happy-%%HAPPY_VERSION%%/happy/HappyTemplate-arrays-ghc-debug
+lib/happy-%%HAPPY_VERSION%%/happy/HappyTemplate-coerce
+lib/happy-%%HAPPY_VERSION%%/happy/HappyTemplate-ghc
 share/doc/happy/docbook.css
 share/doc/happy/happy-introduction.html
 share/doc/happy/happy.html
@@ -34,6 +34,7 @@ share/doc/happy/sec-sequences.html
 share/doc/happy/sec-tips.html
 share/doc/happy/sec-type-signatures.html
 share/doc/happy/sec-using.html
+share/doc/happy/sec-happy-ghci.html
 share/doc/happy/stylesheet-images/caution.gif
 share/doc/happy/stylesheet-images/home.gif
 share/doc/happy/stylesheet-images/important.gif
@@ -46,7 +47,7 @@ share/doc/happy/stylesheet-images/toc-minus.gif
 share/doc/happy/stylesheet-images/toc-plus.gif
 share/doc/happy/stylesheet-images/up.gif
 share/doc/happy/stylesheet-images/warning.gif
-@dirrm lib/happy-1.11/happy
-@dirrm lib/happy-1.11
+@dirrm lib/happy-%%HAPPY_VERSION%%/happy
+@dirrm lib/happy-%%HAPPY_VERSION%%
 @dirrm share/doc/happy/stylesheet-images
 @dirrm share/doc/happy