Update to happy-1.18.4, which is part of the Haskell Platform.
Please test if you're using this.
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/happy/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile 19 Sep 2008 21:23:19 -0000 1.12
+++ Makefile 8 Apr 2010 10:35:10 -0000
@@ -1,36 +1,26 @@
# $OpenBSD: Makefile,v 1.12 2008/09/19 21:23:19 kili Exp $
-COMMENT= parser generator for the functional language Haskell
+COMMENT= parser generator for Haskell
-V= 1.16
-DISTNAME= happy-${V}
-PKGNAME= ${DISTNAME}p0
+DISTNAME= happy-1.18.4
CATEGORIES= devel
HOMEPAGE= http://www.haskell.org/happy/
-# BSD style w/o advertising clause
+# BSD3
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c m
+WANTLIB= c m pthread util
-MODULES= lang/ghc
-MODGHC_RUNTIME= No
-
-MASTER_SITES= ${HOMEPAGE}dist/${V}/
+MODULES= lang/ghc converters/libiconv
+MODGHC_BUILD= cabal hackage nort
BUILD_DEPENDS+= ::textproc/docbook \
::textproc/docbook-xsl \
::textproc/libxslt
-LIB_DEPENDS= gmp::devel/gmp
-
-SETUP_CONF_ARGS= configure -g --prefix=${PREFIX}
-SETUP_CONF_ENV= HOME=${PORTHOME} ${CONFIGURE_ENV}
-SETUP_PROG= ${WRKSRC}/Setup
-SUBST_VARS= V
# Required for building the documentation and for the regression tests:
USE_GMAKE= Yes
@@ -39,28 +29,17 @@ AUTOCONF_VERSION= 2.61
AUTOCONF_DIR= ${WRKSRC}/doc
WRKCONF= ${AUTOCONF_DIR}
-post-configure:
- @cd ${WRKSRC} && ghc --make -o ${SETUP_PROG} Setup.lhs
- @cd ${WRKBUILD} && exec ${SETENV} ${SETUP_CONF_ENV} \
- ${SETUP_PROG} ${SETUP_CONF_ARGS}
-
-do-build:
- @cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} \
- ${SETUP_PROG} build
+post-build:
@cd ${WRKBUILD}/doc && exec ${SETENV} ${MAKE_ENV} \
${MAKE_PROGRAM} html
-do-install:
- @cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} \
- ${SETUP_PROG} copy --destdir=${DESTDIR}
-
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc
cd ${WRKBUILD}/doc && umask 022 && pax -rw happy ${PREFIX}/share/doc
do-regress:
@cd ${WRKBUILD}/tests && exec ${SETENV} ${MAKE_ENV} \
- gmake HAPPY=${WRKBUILD}/dist/build/happy/happy \
- TEST_HAPPY_OPTS="-t ${WRKBUILD}/templates --strict"
+ ${MAKE_PROGRAM} HAPPY=${WRKBUILD}/dist/build/happy/happy \
+ TEST_HAPPY_OPTS="-t ${WRKBUILD} --strict"
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/happy/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 21 Jul 2007 17:20:57 -0000 1.6
+++ distinfo 8 Apr 2010 10:35:10 -0000
@@ -1,5 +1,5 @@
-MD5 (happy-1.16.tar.gz) = uf0vXrphl02rjhKHPK3ubw==
-RMD160 (happy-1.16.tar.gz) = 6+VLHD7nYj3pbla8aSmd0jYyN4E=
-SHA1 (happy-1.16.tar.gz) = X79dYfBg77Q+/q4EjvHjerC7HJc=
-SHA256 (happy-1.16.tar.gz) = TaR/SQTb3d+1gUDtsDlTg/66ct/Hd1nldYelJt2UlsU=
-SIZE (happy-1.16.tar.gz) = 226566
+MD5 (happy-1.18.4.tar.gz) = YU4++WI9vu/EyMppmRLvtA==
+RMD160 (happy-1.18.4.tar.gz) = hG2Q4pYsYFOsrgOs6Q3jZWzicbU=
+SHA1 (happy-1.18.4.tar.gz) = hsamHtizkJxHbCc0P0HLEpcdUr0=
+SHA256 (happy-1.18.4.tar.gz) = kJvsRUGpLTdl50dW91JRTS0D7HpdPnTBgmilf+f/qDI=
+SIZE (happy-1.18.4.tar.gz) = 157585
Index: patches/patch-tests_Makefile
===================================================================
RCS file: /cvs/ports/devel/happy/patches/patch-tests_Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-tests_Makefile
--- patches/patch-tests_Makefile 21 Jul 2007 17:20:57 -0000 1.1
+++ patches/patch-tests_Makefile 8 Apr 2010 10:35:10 -0000
@@ -1,26 +1,17 @@
$OpenBSD: patch-tests_Makefile,v 1.1 2007/07/21 17:20:57 kili Exp $
AttrGrammer stuff doesn't exist.
-The lang package is dead.
---- tests/Makefile.orig Mon Jan 8 13:06:03 2007
-+++ tests/Makefile Tue Jun 19 20:44:36 2007
-@@ -3,8 +3,7 @@ HC=ghc
+--- tests/Makefile.orig Thu Apr 23 15:29:07 2009
++++ tests/Makefile Thu Apr 8 12:31:17 2010
+@@ -3,9 +3,7 @@ HC=ghc
TESTS = Test.ly TestMulti.ly TestPrecedence.ly bug001.ly \
monad001.y monad002.ly precedence001.ly precedence002.y \
- bogus-token.y bug002.y Partial.ly \
-- AttrGrammar001.y AttrGrammar002.y
-+ bogus-token.y bug002.y Partial.ly
+- AttrGrammar001.y AttrGrammar002.y \
+- test_rules.y
++ bogus-token.y bug002.y Partial.ly test_rules.y
- TEST_HAPPY_OPTS = --strict
-
-@@ -59,7 +58,7 @@ ALL_TEST_HS = $(shell echo $(TESTS) | sed -e 's/\([^\.
-
- ALL_TESTS = $(patsubst %.hs, %.run, $(ALL_TEST_HS))
-
--HC_OPTS += -fglasgow-exts -package lang
-+HC_OPTS += -fglasgow-exts
-
- .PRECIOUS: *.hs *.o *.bin *.exe
+ ERROR_TESTS = error001.y
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/happy/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 21 Jul 2007 17:20:57 -0000 1.4
+++ pkg/PLIST 8 Apr 2010 10:35:10 -0000
@@ -1,6 +1,8 @@
@comment $OpenBSD: PLIST,v 1.4 2007/07/21 17:20:57 kili Exp $
-bin/happy
+...@bin bin/happy
share/doc/happy/
+...@comment share/doc/${DISTNAME}/
+...@comment share/doc/${DISTNAME}/LICENSE
share/doc/happy/fptools.css
share/doc/happy/happy-introduction.html
share/doc/happy/index.html
@@ -35,17 +37,17 @@ 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/happy-${V}/
-share/happy-${V}/GLR_Base
-share/happy-${V}/GLR_Lib
-share/happy-${V}/GLR_Lib-ghc
-share/happy-${V}/GLR_Lib-ghc-debug
-share/happy-${V}/HappyTemplate
-share/happy-${V}/HappyTemplate-arrays
-share/happy-${V}/HappyTemplate-arrays-coerce
-share/happy-${V}/HappyTemplate-arrays-coerce-debug
-share/happy-${V}/HappyTemplate-arrays-debug
-share/happy-${V}/HappyTemplate-arrays-ghc
-share/happy-${V}/HappyTemplate-arrays-ghc-debug
-share/happy-${V}/HappyTemplate-coerce
-share/happy-${V}/HappyTemplate-ghc
+share/${DISTNAME}/
+share/${DISTNAME}/GLR_Base
+share/${DISTNAME}/GLR_Lib
+share/${DISTNAME}/GLR_Lib-ghc
+share/${DISTNAME}/GLR_Lib-ghc-debug
+share/${DISTNAME}/HappyTemplate
+share/${DISTNAME}/HappyTemplate-arrays
+share/${DISTNAME}/HappyTemplate-arrays-coerce
+share/${DISTNAME}/HappyTemplate-arrays-coerce-debug
+share/${DISTNAME}/HappyTemplate-arrays-debug
+share/${DISTNAME}/HappyTemplate-arrays-ghc
+share/${DISTNAME}/HappyTemplate-arrays-ghc-debug
+share/${DISTNAME}/HappyTemplate-coerce
+share/${DISTNAME}/HappyTemplate-ghc
