4 files changed, 24 insertions, 47 deletions

diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile
index 977b8a73e685..2405ca45e368 100644
--- a/devel/hs-happy/Makefile
+++ b/devel/hs-happy/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	happy
-PORTVERSION=	1.14
+PORTVERSION=	1.15
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://www.haskell.org/happy/dist/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -16,24 +16,26 @@ COMMENT=	An LALR(1) parser generator for the functional language Haskell
 
 BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
 .if !defined(NOPORTDOCS)
-BUILD_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/dsssl/modular:${PORTSDIR}/textproc/dsssl-docbook-modular \
-		${LOCALBASE}/share/sgml/docbook/catalog:${PORTSDIR}/textproc/docbook \
-		${LOCALBASE}/share/sgml/iso8879:${PORTSDIR}/textproc/iso8879 \
-		${LOCALBASE}/share/sgml/docbook/3.1:${PORTSDIR}/textproc/docbook-310 \
-		jade:${PORTSDIR}/textproc/jade
+BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/html:${PORTSDIR}/textproc/docbook-xsl \
+		${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt
 .endif
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//g}
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 PLIST_SUB=	HAPPY_VERSION=${PORTVERSION}
+PORTDOCS=	*
 
 BOOT_COOKIE = ${WRKDIR}/.boot_done
 
 ${BOOT_COOKIE}:
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} boot)
 
+post-patch:
+	@${REINPLACE_CMD} -e 's+%%LOCALBASE%%+${LOCALBASE}+' ${WRKSRC}/configure
+
 pre-build: ${BOOT_COOKIE}
 
 post-build:
diff --git a/devel/hs-happy/distinfo b/devel/hs-happy/distinfo
index 4b52aa278941..0e84485cfeba 100644
--- a/devel/hs-happy/distinfo
+++ b/devel/hs-happy/distinfo
@@ -1,2 +1,2 @@
-MD5 (happy-1.14-src.tar.gz) = 501b5b63533b2e2838de18085e8c4492
-SIZE (happy-1.14-src.tar.gz) = 473967
+MD5 (happy-1.15-src.tar.gz) = 02ceb122b904fa4a4290e6ea1072d59e
+SIZE (happy-1.15-src.tar.gz) = 510037
diff --git a/devel/hs-happy/files/patch-configure b/devel/hs-happy/files/patch-configure
new file mode 100644
index 000000000000..5481877ae8bb
--- /dev/null
+++ b/devel/hs-happy/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Wed Jan 26 18:01:50 2005
++++ configure	Wed Jan 26 18:02:28 2005
+@@ -4403,7 +4403,7 @@
+ EOF
+ 
+   fp_cv_dir_docbook_xsl=no
+-  for fp_var in /usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/xml/docbook/stylesheet/nwalsh /usr/share/sgml/docbook/docbook-xsl-stylesheets* /usr/share/sgml/docbook/xsl-stylesheets* /opt/kde?/share/apps/ksgmltools2/docbook/xsl /usr/share/docbook-xsl /usr/share/sgml/docbkxsl; do
++  for fp_var in %%LOCALBASE%%/share/xsl/docbook /usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/xml/docbook/stylesheet/nwalsh /usr/share/sgml/docbook/docbook-xsl-stylesheets* /usr/share/sgml/docbook/xsl-stylesheets* /opt/kde?/share/apps/ksgmltools2/docbook/xsl /usr/share/docbook-xsl /usr/share/sgml/docbkxsl; do
+      if $XsltprocCmd ${fp_var}/html/docbook.xsl conftest.xml > /dev/null 2>&1; then
+         fp_cv_dir_docbook_xsl=$fp_var
+         break
diff --git a/devel/hs-happy/pkg-plist b/devel/hs-happy/pkg-plist
index 6a46cc2cc5db..2a9c9a10d523 100644
--- a/devel/hs-happy/pkg-plist
+++ b/devel/hs-happy/pkg-plist
@@ -1,6 +1,9 @@
 bin/happy
 bin/happy-%%HAPPY_VERSION%%
 lib/happy-%%HAPPY_VERSION%%/happy.bin
+lib/happy-%%HAPPY_VERSION%%/GLR_Base
+lib/happy-%%HAPPY_VERSION%%/GLR_Lib
+lib/happy-%%HAPPY_VERSION%%/GLR_Lib-ghc
 lib/happy-%%HAPPY_VERSION%%/HappyTemplate
 lib/happy-%%HAPPY_VERSION%%/HappyTemplate-arrays
 lib/happy-%%HAPPY_VERSION%%/HappyTemplate-arrays-coerce
@@ -10,43 +13,4 @@ lib/happy-%%HAPPY_VERSION%%/HappyTemplate-arrays-ghc
 lib/happy-%%HAPPY_VERSION%%/HappyTemplate-arrays-ghc-debug
 lib/happy-%%HAPPY_VERSION%%/HappyTemplate-coerce
 lib/happy-%%HAPPY_VERSION%%/HappyTemplate-ghc
-share/doc/happy/docbook.css
-share/doc/happy/happy-introduction.html
-share/doc/happy/happy.html
-share/doc/happy/sec-compilation-time.html
-share/doc/happy/sec-conflict-tips.html
-share/doc/happy/sec-directives.html
-share/doc/happy/sec-error.html
-share/doc/happy/sec-finding-errors.html
-share/doc/happy/sec-grammar-files.html
-share/doc/happy/sec-grammar.html
-share/doc/happy/sec-info-files.html
-share/doc/happy/sec-invoking.html
-share/doc/happy/sec-license.html
-share/doc/happy/sec-module-header.html
-share/doc/happy/sec-module-trailer.html
-share/doc/happy/sec-monads.html
-share/doc/happy/sec-multiple-parsers.html
-share/doc/happy/sec-obtaining.html
-share/doc/happy/sec-precedences.html
-share/doc/happy/sec-reporting-bugs.html
-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
-share/doc/happy/stylesheet-images/next.gif
-share/doc/happy/stylesheet-images/note.gif
-share/doc/happy/stylesheet-images/prev.gif
-share/doc/happy/stylesheet-images/tip.gif
-share/doc/happy/stylesheet-images/toc-blank.gif
-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-%%HAPPY_VERSION%%
-@dirrm share/doc/happy/stylesheet-images
-@dirrm share/doc/happy