Update to alex-2.3.2, which is part of the Haskell Platform.

If you're using this, please give it a test. You need a current
ports tree and the ghc update I mentioned earlier.

Ciao,
        Kili


Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/alex/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile    19 Sep 2008 21:19:15 -0000      1.10
+++ Makefile    8 Apr 2010 10:10:37 -0000
@@ -1,61 +1,42 @@
 # $OpenBSD: Makefile,v 1.10 2008/09/19 21:19:15 kili Exp $
 
-COMMENT=       lexical analyser generator for Haskell
+COMMENT =      lexical analyser generator for Haskell
 
-V=             2.1.0
-DISTNAME=      alex-${V}
-PKGNAME=               ${DISTNAME}p0
-CATEGORIES=    devel
+DISTNAME =     alex-2.3.2
+CATEGORIES =   devel
 
-HOMEPAGE=      http://www.haskell.org/alex/
+HOMEPAGE =     http://www.haskell.org/alex/
 
-# BSD style w/o advertising clause
-PERMIT_PACKAGE_CDROM=  Yes
-PERMIT_PACKAGE_FTP=    Yes
-PERMIT_DISTFILES_CDROM=        Yes
-PERMIT_DISTFILES_FTP=  Yes
+# 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}/
-
-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
-
-NO_REGRESS=            Yes
+MODULES =              lang/ghc converters/libiconv
+MODGHC_BUILD =          cabal hackage nort
 
 # Required for building the documentation:
-USE_GMAKE=             Yes
-CONFIGURE_STYLE=       autoconf no-autoheader
-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}
+USE_GMAKE =            Yes
+CONFIGURE_STYLE =      autoconf no-autoheader
+AUTOCONF_VERSION =     2.61
+AUTOCONF_DIR =         ${WRKSRC}/doc
+WRKCONF =              ${AUTOCONF_DIR}
+
+BUILD_DEPENDS +=       ::textproc/docbook \
+                       ::textproc/docbook-xsl \
+                       ::textproc/libxslt
 
-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 alex ${PREFIX}/share/doc
+
+do-regress:
+       cd ${WRKBUILD}/tests && exec ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} all
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/alex/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo    21 Jul 2007 17:19:49 -0000      1.5
+++ distinfo    8 Apr 2010 10:10:37 -0000
@@ -1,5 +1,5 @@
-MD5 (alex-2.1.0.tar.gz) = F+gNOcw/Groo3OoONYyB6Q==
-RMD160 (alex-2.1.0.tar.gz) = LyxoVuEFTZ6ZbZK6+g5g9r7Xva0=
-SHA1 (alex-2.1.0.tar.gz) = N1mbe+UknWObOlo/3GGQfcTa1mA=
-SHA256 (alex-2.1.0.tar.gz) = C5wSRspu8n30v8sW0Tz3Ul2UO6LtyJfWKGBeHJvX1Ys=
-SIZE (alex-2.1.0.tar.gz) = 67619
+MD5 (alex-2.3.2.tar.gz) = TsCJdEkXEp1zVPVskB4sdg==
+RMD160 (alex-2.3.2.tar.gz) = hkYWotJAbaR1r4x0c3Q+LtRa4kQ=
+SHA1 (alex-2.3.2.tar.gz) = /msj+JTT4MApqOPm8mqMwQb/HR4=
+SHA256 (alex-2.3.2.tar.gz) = ZxWkwnsVp02PMcu2p9ZUuctnZtdJgMdbZd7nxicEn0M=
+SIZE (alex-2.3.2.tar.gz) = 79373
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/alex/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   21 Jul 2007 17:19:50 -0000      1.3
+++ pkg/PLIST   8 Apr 2010 10:10:37 -0000
@@ -1,15 +1,23 @@
 @comment $OpenBSD: PLIST,v 1.3 2007/07/21 17:19:50 kili Exp $
-bin/alex
-share/alex-${V}/
-share/alex-${V}/AlexTemplate
-share/alex-${V}/AlexTemplate-debug
-share/alex-${V}/AlexTemplate-ghc
-share/alex-${V}/AlexTemplate-ghc-debug
-share/alex-${V}/AlexWrapper-basic
-share/alex-${V}/AlexWrapper-gscan
-share/alex-${V}/AlexWrapper-monad
-share/alex-${V}/AlexWrapper-posn
+...@bin bin/alex
+share/${DISTNAME}/
+share/${DISTNAME}/AlexTemplate
+share/${DISTNAME}/AlexTemplate-debug
+share/${DISTNAME}/AlexTemplate-ghc
+share/${DISTNAME}/AlexTemplate-ghc-debug
+share/${DISTNAME}/AlexWrapper-basic
+share/${DISTNAME}/AlexWrapper-basic-bytestring
+share/${DISTNAME}/AlexWrapper-gscan
+share/${DISTNAME}/AlexWrapper-monad
+share/${DISTNAME}/AlexWrapper-monad-bytestring
+share/${DISTNAME}/AlexWrapper-monadUserState
+share/${DISTNAME}/AlexWrapper-monadUserState-bytestring
+share/${DISTNAME}/AlexWrapper-posn
+share/${DISTNAME}/AlexWrapper-posn-bytestring
+share/${DISTNAME}/AlexWrapper-strict-bytestring
 share/doc/alex/
+...@comment share/doc/${DISTNAME}/
+...@comment share/doc/${DISTNAME}/LICENSE
 share/doc/alex/about.html
 share/doc/alex/alex-files.html
 share/doc/alex/api.html
@@ -22,5 +30,6 @@ share/doc/alex/invoking.html
 share/doc/alex/license.html
 share/doc/alex/regexps.html
 share/doc/alex/relnotes-20.html
+share/doc/alex/relnotes-210.html
 share/doc/alex/syntax.html
 share/doc/alex/wrappers.html

Reply via email to