8 files changed, 32 insertions, 68 deletions

diff --git a/devel/happy/Makefile b/devel/happy/Makefile
index 01cb3079a69c..02d432b7a0f9 100644
--- a/devel/happy/Makefile
+++ b/devel/happy/Makefile
@@ -5,9 +5,9 @@
 # $FreeBSD$
 
 PORTNAME=	happy
-PORTVERSION=	1.10
+PORTVERSION=	1.11
 CATEGORIES=	devel
-MASTER_SITES=	http://www.haskell.org/happy/dist/1.10/
+MASTER_SITES=	http://www.haskell.org/happy/dist/1.11/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	simonmar@microsoft.com
diff --git a/devel/happy/distinfo b/devel/happy/distinfo
index f15f1e3cfe2b..7a2fcc684cc9 100644
--- a/devel/happy/distinfo
+++ b/devel/happy/distinfo
@@ -1 +1 @@
-MD5 (happy-1.10-src.tar.gz) = 8d16464d0273e0d69de75011ec933d43
+MD5 (happy-1.11-src.tar.gz) = 35fc40b31b6f97445ddd4493c3114ce9
diff --git a/devel/happy/files/patch-aa b/devel/happy/files/patch-aa
deleted file mode 100644
index a905b6b2cdad..000000000000
--- a/devel/happy/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-*** happy/src/Makefile~	Fri Feb  9 17:54:46 2001
---- happy/src/Makefile	Sat May  5 12:23:03 2001
-***************
-*** 68,74 ****
-  ifeq "$(INSTALLING)" "1"
-  TOP_PWD 	:= $(prefix)
-  SCRIPT_PROG 	=  $(INSTALLED_SCRIPT_PROG)
-! SCRIPT_LINK 	=  happy
-  else
-  TOP_PWD 	:= $(FPTOOLS_TOP_ABS)
-  SCRIPT_PROG 	=  $(INPLACE_SCRIPT_PROG)
---- 68,74 ----
-  ifeq "$(INSTALLING)" "1"
-  TOP_PWD 	:= $(prefix)
-  SCRIPT_PROG 	=  $(INSTALLED_SCRIPT_PROG)
-! LINK	 	=  happy
-  else
-  TOP_PWD 	:= $(FPTOOLS_TOP_ABS)
-  SCRIPT_PROG 	=  $(INPLACE_SCRIPT_PROG)
diff --git a/devel/happy/pkg-plist b/devel/happy/pkg-plist
index c8ef19245276..c02b5ce17379 100644
--- a/devel/happy/pkg-plist
+++ b/devel/happy/pkg-plist
@@ -1,15 +1,15 @@
 bin/happy
-bin/happy-1.10
-lib/happy.bin
-lib/happy/HappyTemplate
-lib/happy/HappyTemplate-arrays
-lib/happy/HappyTemplate-arrays-coerce
-lib/happy/HappyTemplate-arrays-coerce-debug
-lib/happy/HappyTemplate-arrays-debug
-lib/happy/HappyTemplate-arrays-ghc
-lib/happy/HappyTemplate-arrays-ghc-debug
-lib/happy/HappyTemplate-coerce
-lib/happy/HappyTemplate-ghc
+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
 share/doc/happy/docbook.css
 share/doc/happy/happy-introduction.html
 share/doc/happy/happy.html
@@ -46,6 +46,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
+@dirrm lib/happy-1.11/happy
+@dirrm lib/happy-1.11
 @dirrm share/doc/happy/stylesheet-images
 @dirrm share/doc/happy
diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile
index 01cb3079a69c..02d432b7a0f9 100644
--- a/devel/hs-happy/Makefile
+++ b/devel/hs-happy/Makefile
@@ -5,9 +5,9 @@
 # $FreeBSD$
 
 PORTNAME=	happy
-PORTVERSION=	1.10
+PORTVERSION=	1.11
 CATEGORIES=	devel
-MASTER_SITES=	http://www.haskell.org/happy/dist/1.10/
+MASTER_SITES=	http://www.haskell.org/happy/dist/1.11/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	simonmar@microsoft.com
diff --git a/devel/hs-happy/distinfo b/devel/hs-happy/distinfo
index f15f1e3cfe2b..7a2fcc684cc9 100644
--- a/devel/hs-happy/distinfo
+++ b/devel/hs-happy/distinfo
@@ -1 +1 @@
-MD5 (happy-1.10-src.tar.gz) = 8d16464d0273e0d69de75011ec933d43
+MD5 (happy-1.11-src.tar.gz) = 35fc40b31b6f97445ddd4493c3114ce9
diff --git a/devel/hs-happy/files/patch-aa b/devel/hs-happy/files/patch-aa
deleted file mode 100644
index a905b6b2cdad..000000000000
--- a/devel/hs-happy/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-*** happy/src/Makefile~	Fri Feb  9 17:54:46 2001
---- happy/src/Makefile	Sat May  5 12:23:03 2001
-***************
-*** 68,74 ****
-  ifeq "$(INSTALLING)" "1"
-  TOP_PWD 	:= $(prefix)
-  SCRIPT_PROG 	=  $(INSTALLED_SCRIPT_PROG)
-! SCRIPT_LINK 	=  happy
-  else
-  TOP_PWD 	:= $(FPTOOLS_TOP_ABS)
-  SCRIPT_PROG 	=  $(INPLACE_SCRIPT_PROG)
---- 68,74 ----
-  ifeq "$(INSTALLING)" "1"
-  TOP_PWD 	:= $(prefix)
-  SCRIPT_PROG 	=  $(INSTALLED_SCRIPT_PROG)
-! LINK	 	=  happy
-  else
-  TOP_PWD 	:= $(FPTOOLS_TOP_ABS)
-  SCRIPT_PROG 	=  $(INPLACE_SCRIPT_PROG)
diff --git a/devel/hs-happy/pkg-plist b/devel/hs-happy/pkg-plist
index c8ef19245276..c02b5ce17379 100644
--- a/devel/hs-happy/pkg-plist
+++ b/devel/hs-happy/pkg-plist
@@ -1,15 +1,15 @@
 bin/happy
-bin/happy-1.10
-lib/happy.bin
-lib/happy/HappyTemplate
-lib/happy/HappyTemplate-arrays
-lib/happy/HappyTemplate-arrays-coerce
-lib/happy/HappyTemplate-arrays-coerce-debug
-lib/happy/HappyTemplate-arrays-debug
-lib/happy/HappyTemplate-arrays-ghc
-lib/happy/HappyTemplate-arrays-ghc-debug
-lib/happy/HappyTemplate-coerce
-lib/happy/HappyTemplate-ghc
+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
 share/doc/happy/docbook.css
 share/doc/happy/happy-introduction.html
 share/doc/happy/happy.html
@@ -46,6 +46,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
+@dirrm lib/happy-1.11/happy
+@dirrm lib/happy-1.11
 @dirrm share/doc/happy/stylesheet-images
 @dirrm share/doc/happy