From e82a340efb639b0f62d8b0f6185c75575fe91531 Mon Sep 17 00:00:00 2001 From: kili Date: Sat, 21 Jul 2007 17:20:57 +0000 Subject: [PATCH] Update to 1.16 to make it build with ghc-6.6.1. --- devel/happy/Makefile | 89 ++++++++++++++---------- devel/happy/distinfo | 15 ++-- devel/happy/patches/patch-Makefile | 27 ------- devel/happy/patches/patch-configure | 21 ------ devel/happy/patches/patch-tests_Makefile | 26 +++++++ devel/happy/pkg/PLIST | 56 +++++++-------- 6 files changed, 111 insertions(+), 123 deletions(-) delete mode 100644 devel/happy/patches/patch-Makefile delete mode 100644 devel/happy/patches/patch-configure create mode 100644 devel/happy/patches/patch-tests_Makefile diff --git a/devel/happy/Makefile b/devel/happy/Makefile index e98eda5744b..64f786fdb13 100644 --- a/devel/happy/Makefile +++ b/devel/happy/Makefile @@ -1,47 +1,64 @@ -# $OpenBSD: Makefile,v 1.8 2007/05/04 09:56:02 bernd Exp $ +# $OpenBSD: Makefile,v 1.9 2007/07/21 17:20:57 kili Exp $ -COMMENT= "parser generator for the functional language Haskell" +COMMENT= parser generator for the functional language Haskell -V= 1.14 -DISTNAME= happy-${V} -PKGNAME= ${DISTNAME}p0 -CATEGORIES= devel +V= 1.16 +DISTNAME= happy-${V} +CATEGORIES= devel -HOMEPAGE= http://www.haskell.org/ghc/ -MAINTAINER= Don Stewart - -MODULES= lang/ghc - -MASTER_SITES= http://www.haskell.org/happy/dist/${V}/ -MASTER_SITES0= ftp://ftp.cse.unsw.edu.au/pub/users/dons/happy/ - -DISTFILES= happy-${V}-src.tar.gz \ - happy-regress-${V}.tar.bz2:0 - -BUILD_DEPENDS+= ::textproc/docbook ::textproc/docbook-dsssl\ - ::textproc/sgmlformat ::textproc/openjade \ - ::textproc/iso8879 ::textproc/linuxdoc \ - ::textproc/html ::print/jadetex - -USE_GMAKE= Yes -CONFIGURE_STYLE=gnu dest -CONFIGURE_ENV= SGML_CATALOG_FILES=${LOCALBASE}/share/sgml/catalog -MAKE_ENV= SGML_CATALOG_FILES=${LOCALBASE}/share/sgml/catalog - -DOC_DIR= ${PREFIX}/share/doc/happy - -post-build: - @cd ${WRKSRC}/happy/doc ; ${MAKE_ENV} ${GMAKE} html - -post-install: - ${INSTALL_DATA_DIR} ${DOC_DIR} - @cp -R ${WRKSRC}/happy/doc/happy/* ${DOC_DIR} +HOMEPAGE= http://www.haskell.org/ghc/ +MAINTAINER= Matthias Kilian # BSD style w/o advertising clause PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c gmp m + +WANTLIB= c m + +MODULES= lang/ghc +MODGHC_RUNTIME= No + +MASTER_SITES= ${HOMEPAGE}/dist/${V}/ + +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} +SUBST_VARS= V + +# Required for building the documentation and for the regression tests: +USE_GMAKE= Yes +CONFIGURE_STYLE= autoconf no-autoheader +AUTOCONF_VERSION= 2.61 +AUTOCONF_DIR= ${WRKSRC}/doc +WRKCONF= ${AUTOCONF_DIR} + +post-configure: + @cd ${WRKSRC} && exec ${SETENV} ${SETUP_CONF_ENV} \ + runhaskell Setup.lhs ${SETUP_CONF_ARGS} + +do-build: + @cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} \ + runhaskell Setup.lhs build + @cd ${WRKSRC}/doc && exec ${SETENV} ${MAKE_ENV} \ + ${MAKE_PROGRAM} html + +do-install: + @cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} \ + runhaskell Setup.lhs copy --destdir=${DESTDIR} + +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc + cd ${WRKSRC}/doc && umask 022 && pax -rw happy ${PREFIX}/share/doc + +do-regress: + @cd ${WRKSRC}/tests && exec ${SETENV} ${MAKE_ENV} \ + gmake HAPPY=${WRKBUILD}/dist/build/happy/happy \ + TEST_HAPPY_OPTS="-t ${WRKBUILD}/templates --strict" .include diff --git a/devel/happy/distinfo b/devel/happy/distinfo index 27b173ef575..bdcb023e326 100644 --- a/devel/happy/distinfo +++ b/devel/happy/distinfo @@ -1,10 +1,5 @@ -MD5 (happy-1.14-src.tar.gz) = UBtbY1M7Lig43hgIXoxEkg== -MD5 (happy-regress-1.14.tar.bz2) = YJ+oWQ9fcjcTmSZeAL4tRQ== -RMD160 (happy-1.14-src.tar.gz) = VQv1PBxcbynDCHrBWjBvw/DcNq4= -RMD160 (happy-regress-1.14.tar.bz2) = vAoKduWcf+bHcxy7NuCgd4dI/N0= -SHA1 (happy-1.14-src.tar.gz) = kFcejvGQby/T2qD4S36ZSSBMhjs= -SHA1 (happy-regress-1.14.tar.bz2) = NEWOzZ9/2Kgoe3Or50jpkpOB8z0= -SHA256 (happy-1.14-src.tar.gz) = 7EJZbEI5QujGMimA5YkCfcD8h4jnUqU+4FuFxWCWrWg= -SHA256 (happy-regress-1.14.tar.bz2) = 4mWttmJsIbUcnyJ7/mVR7hz6Hvs2690U7h6qYlp5CcM= -SIZE (happy-1.14-src.tar.gz) = 473967 -SIZE (happy-regress-1.14.tar.bz2) = 1688 +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 diff --git a/devel/happy/patches/patch-Makefile b/devel/happy/patches/patch-Makefile deleted file mode 100644 index e7ee45c9596..00000000000 --- a/devel/happy/patches/patch-Makefile +++ /dev/null @@ -1,27 +0,0 @@ -$OpenBSD: patch-Makefile,v 1.2 2004/04/23 03:00:07 dons Exp $ -Add a nice regress target - ---- Makefile.orig Wed Jun 19 23:48:31 2002 -+++ Makefile Wed Jul 23 12:45:05 2003 -@@ -368,3 +368,21 @@ - - # ----------------------------------------------------------------------------- - -+TEST_RESULT=actual.result -+ -+check:: -+ @( cd happy/tests/ ; ${MAKE} | tee ../../${TEST_RESULT}.raw ) -+ @( sed '1d;$$d' ${TEST_RESULT}.raw > ${TEST_RESULT} ) -+ @(if cmp -s expected.result ${TEST_RESULT} ; then \ -+ echo ;\ -+ echo "All is good!" ; \ -+ echo ;\ -+ else \ -+ echo ;\ -+ echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@";\ -+ echo "Unexpected regress results!" ;\ -+ echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@";\ -+ echo ;\ -+ echo "here is a diff:" ;\ -+ diff -u expected.result ${TEST_RESULT} ;\ -+ fi ; exit 0 ) diff --git a/devel/happy/patches/patch-configure b/devel/happy/patches/patch-configure deleted file mode 100644 index 163a4afff49..00000000000 --- a/devel/happy/patches/patch-configure +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-configure,v 1.4 2004/05/17 03:39:53 dons Exp $ -Let Happy know about the amd64. - ---- configure.orig Thu Apr 22 13:30:36 2004 -+++ configure Thu Apr 22 13:30:54 2004 -@@ -1487,6 +1487,15 @@ - HostVendor_CPP='unknown' - HostOS_CPP='freebsd' - ;; -+amd64*-*-openbsd*|x86_64-*-openbsd*) -+ HostPlatform=x86_64-unknown-openbsd -+ TargetPlatform=x86_64-unknown-openbsd -+ BuildPlatform=x86_64-unknown-openbsd -+ HostPlatform_CPP='x86_64_unknown_openbsd' -+ HostArch_CPP='x86_64' -+ HostVendor_CPP='unknown' -+ HostOS_CPP='openbsd' -+ ;; - arm*-linux*) - HostPlatform=arm-unknown-linux # hack again - TargetPlatform=arm-unknown-linux diff --git a/devel/happy/patches/patch-tests_Makefile b/devel/happy/patches/patch-tests_Makefile new file mode 100644 index 00000000000..f3332675086 --- /dev/null +++ b/devel/happy/patches/patch-tests_Makefile @@ -0,0 +1,26 @@ +$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 = 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 + + 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 + diff --git a/devel/happy/pkg/PLIST b/devel/happy/pkg/PLIST index f27a7cba563..6e166b3de94 100644 --- a/devel/happy/pkg/PLIST +++ b/devel/happy/pkg/PLIST @@ -1,26 +1,24 @@ -@comment $OpenBSD: PLIST,v 1.3 2004/09/14 23:43:55 espie Exp $ +@comment $OpenBSD: PLIST,v 1.4 2007/07/21 17:20:57 kili Exp $ bin/happy -bin/happy-1.14 -lib/happy-1.14/ -lib/happy-1.14/HappyTemplate -lib/happy-1.14/HappyTemplate-arrays -lib/happy-1.14/HappyTemplate-arrays-coerce -lib/happy-1.14/HappyTemplate-arrays-coerce-debug -lib/happy-1.14/HappyTemplate-arrays-debug -lib/happy-1.14/HappyTemplate-arrays-ghc -lib/happy-1.14/HappyTemplate-arrays-ghc-debug -lib/happy-1.14/HappyTemplate-coerce -lib/happy-1.14/HappyTemplate-ghc -lib/happy-1.14/happy.bin share/doc/happy/ -share/doc/happy/docbook.css +share/doc/happy/fptools.css share/doc/happy/happy-introduction.html -share/doc/happy/happy.html +share/doc/happy/index.html +share/doc/happy/ix01.html +share/doc/happy/sec-AtrributeGrammarsInHappy.html +share/doc/happy/sec-AttrGrammarLimits.html +share/doc/happy/sec-AttributeGrammar.html +share/doc/happy/sec-AttributeGrammarExample.html +share/doc/happy/sec-Precedences.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-glr-misc.html +share/doc/happy/sec-glr-semantics.html +share/doc/happy/sec-glr-using.html +share/doc/happy/sec-glr.html share/doc/happy/sec-grammar-files.html share/doc/happy/sec-grammar.html share/doc/happy/sec-happy-ghci.html @@ -32,22 +30,22 @@ 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/stylesheet-images/ -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 +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