ports/137098: [patch]: update of devel/hs-pcre-light-ghc to ghc-6.10.4
Jacula Modyun
jacula at gmail.com
Fri Jul 24 19:10:06 UTC 2009
>Number: 137098
>Category: ports
>Synopsis: [patch]: update of devel/hs-pcre-light-ghc to ghc-6.10.4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Jul 24 19:10:06 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Jacula Modyun
>Release: FreeBSD 7.1-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD splork.wirewater.yow 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #0: Sat Oct 18 11:22:07 UTC 2008 root at splork.wirewater.yow:/usr/obj/usr/src/sys/JACULA i386
>Description:
See the PR: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/137055
>How-To-Repeat:
>Fix:
--- patch-hs-pcre-light-ghc.diff begins here ---
diff -uNr hs-pcre-light-ghc.orig/Makefile hs-pcre-light-ghc/Makefile
--- hs-pcre-light-ghc.orig/Makefile 2009-01-30 10:07:44.000000000 +0000
+++ hs-pcre-light-ghc/Makefile 2009-07-22 06:24:35.000000000 +0000
@@ -7,7 +7,7 @@
PORTNAME= pcre-light
PORTVERSION= 0.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
PKGNAMEPREFIX= hs-
@@ -20,38 +20,61 @@
LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre
RUN_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc
-GHC_VERSION= 6.8.3
-CABALCMD= ${LOCALBASE}/bin/runghc Setup.lhs
-CABALDIR= lib/ghc-${GHC_VERSION}/cabal
-
-SUBDIR= lib/${PORTNAME}-${PORTVERSION}
-PLIST_SUB= GHC_VERSION=${GHC_VERSION} \
- PORTNAME=${PORTNAME} \
- PORTVERSION=${PORTVERSION} \
- SUBDIR=${CABALDIR}
-DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
-PORTDOCS= LICENSE html
+GHC_VERSION= 6.10.4
+PCRELIGHT_VERSION= ${PORTVERSION}
-CONFIGURE_ARGS= --ghc --prefix=${PREFIX} --libdir=${PREFIX}/${CABALDIR} --libsubdir='' --datasubdir=''
+GHC_CMD= ${LOCALBASE}/bin/ghc
+SETUP_CMD= ./setup
+
+DOCSDIR= ${PREFIX}/share/doc/${DISTNAME}
+PCRELIGHT_LIBDIR_REL= lib/${DISTNAME}
+
+PLIST_SUB= GHC_VERSION=${GHC_VERSION} \
+ PCRELIGHT_VERSION=${PCRELIGHT_VERSION} \
+ PCRELIGHT_LIBDIR_REL=${PCRELIGHT_LIBDIR_REL}
+
+.if defined(NOPORTDOCS)
+PLIST_SUB+= NOPORTDOCS=""
+.else
+PLIST_SUB+= NOPORTDOCS="@comment "
+.endif
.if !defined(NOPORTDOCS)
+
+PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
+.if !empty(PORT_HADDOCK:M?0)
BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock
-.else
-PLIST_DIRS+= %%DOCSDIR%%
-PLIST_FILES+= %%DOCSDIR%%/LICENSE
.endif
+BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour
+
+HSCOLOUR_VERSION= 1.13
+HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
+
+PORTDOCS= *
+.endif
+
+.SILENT:
do-configure:
- cd ${WRKSRC} && ${CABALCMD} configure ${CONFIGURE_ARGS}
+ cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal \
+ && ${SETUP_CMD} configure --haddock-options=-w \
+ --extra-include-dirs=${LOCALBASE}/include \
+ --extra-lib-dirs=${LOCALBASE}/lib --prefix=${PREFIX}
do-build:
- cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} --gen-script register
+ cd ${WRKSRC} && ${SETUP_CMD} build \
+ && ${SETUP_CMD} register --gen-script
+
.if !defined(NOPORTDOCS)
- cd ${WRKSRC} && ${CABALCMD} haddock
+ cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
+ --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
.endif
do-install:
- cd ${WRKSRC} && ${CABALCMD} install
- ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${CABALDIR}/${PORTNAME}-register.sh
+ cd ${WRKSRC} && ${SETUP_CMD} install \
+ && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${PCRELIGHT_LIBDIR_REL}/register.sh
+
+post-install:
+ ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
.include <bsd.port.mk>
diff -uNr hs-pcre-light-ghc.orig/pkg-descr hs-pcre-light-ghc/pkg-descr
--- hs-pcre-light-ghc.orig/pkg-descr 2008-12-21 11:41:49.000000000 +0000
+++ hs-pcre-light-ghc/pkg-descr 2009-07-20 19:28:33.000000000 +0000
@@ -4,4 +4,11 @@
The PCRE library is a set of functions that implement regular expression
pattern matching using the same syntax and semantics as Perl 5.
-WWW: http://code.haskell.org/~dons/code/pcre-light
+author: Don Stewart
+maintainer: Don Stewart <dons at galois.com>
+license: BSD3
+WWW: http://code.haskell.org/~dons/code/pcre-light
+
+exposed-modules: Text.Regex.PCRE.Light
+ Text.Regex.PCRE.Light.Char8
+ Text.Regex.PCRE.Light.Base
diff -uNr hs-pcre-light-ghc.orig/pkg-plist hs-pcre-light-ghc/pkg-plist
--- hs-pcre-light-ghc.orig/pkg-plist 2009-01-30 10:07:44.000000000 +0000
+++ hs-pcre-light-ghc/pkg-plist 2009-07-20 19:28:20.000000000 +0000
@@ -1,14 +1,18 @@
-%%SUBDIR%%/Text/Regex/PCRE/Light.hi
-%%SUBDIR%%/Text/Regex/PCRE/Light/Base.hi
-%%SUBDIR%%/Text/Regex/PCRE/Light/Char8.hi
-%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%SUBDIR%%/%%PORTNAME%%-register.sh
- at dirrmtry %%SUBDIR%%/Text/Regex/PCRE/Light
- at dirrmtry %%SUBDIR%%/Text/Regex/PCRE
- at dirrmtry %%SUBDIR%%/Text/Regex
- at dirrmtry %%SUBDIR%%/Text
- at exec sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh
- at exec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
- at unexec ghc-pkg unregister %%PORTNAME%%
- at unexec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
+%%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSpcre-light-%%PCRELIGHT_VERSION%%.o
+%%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Regex/PCRE/Light.hi
+%%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Regex/PCRE/Light/Base.hi
+%%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Regex/PCRE/Light/Char8.hi
+%%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSpcre-light-%%PCRELIGHT_VERSION%%.a
+%%PCRELIGHT_LIBDIR_REL%%/register.sh
+%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
+%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
+ at dirrm %%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Regex/PCRE/Light
+ at dirrm %%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Regex/PCRE
+ at dirrm %%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Regex
+ at dirrm %%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text
+ at dirrm %%PCRELIGHT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+ at dirrm %%PCRELIGHT_LIBDIR_REL%%
+ at exec /bin/sh %D/%%PCRELIGHT_LIBDIR_REL%%/register.sh
+ at exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
+ at unexec %D/bin/ghc-pkg unregister pcre-light
+ at unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
--- patch-hs-pcre-light-ghc.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list