diff options
author | pgj <pgj@FreeBSD.org> | 2009-09-02 23:38:45 +0800 |
---|---|---|
committer | pgj <pgj@FreeBSD.org> | 2009-09-02 23:38:45 +0800 |
commit | 287f50302a59b3a75af8cd8263480951b70ad176 (patch) | |
tree | 14860ef0ad1ca08c47d77a5ed1d140cbef657d2a /ports-mgmt | |
parent | f095667176485d73e004654a71204b209d48fb1f (diff) | |
download | freebsd-ports-gnome-287f50302a59b3a75af8cd8263480951b70ad176.tar.gz freebsd-ports-gnome-287f50302a59b3a75af8cd8263480951b70ad176.tar.zst freebsd-ports-gnome-287f50302a59b3a75af8cd8263480951b70ad176.zip |
- Update GHC and Haskell ports to 6.10.4 (for both i386 and amd64), bump
port revision where appropriate
- Add devel/hs-ghc-paths
- Add devel/hs-QuickCheck
- Add devel/hs-readline
- Add devel/hs-haskeline
- Add devel/hs-mmap
- Remove lang/ghc-doc
- Mark devel/lhs2TeX broken as it does not compile with GHC 6.10.4
- Set NHC98 as default compiler for devel/hs-hat as it does not compile
with GHC 6.10.4
PR: ports/137055, ports/137058, ports/137059, ports/137060, ports/137061,
ports/137062, ports/137063, ports/137063, ports/137064, ports/137065,
ports/137066, ports/137067, ports/137068, ports/137069, ports/137070,
ports/137071, ports/137072, ports/137074, ports/137075, ports/137076,
ports/137077, ports/137078, ports/137079, ports/137080, ports/137081,
ports/137082, ports/137083, ports/137084, ports/137085, ports/137086,
ports/137087, ports/137088, ports/137090, ports/137091, ports/137092,
ports/137093, ports/137094, ports/137095, ports/137096, ports/137097,
ports/137098, ports/137099, ports/137102, ports/137103, ports/137104,
ports/137107, ports/137108, ports/137109, ports/137110, ports/137111
Submitted by: Jacula Modyun (jacula (at) gmail (dot) com),
Ashish Shukla (wahjava (at) gmail (dot) com) (amd64 support)
Supported by: wxs (review, amd64 testing), tabthorpe (8.x testing)
Approved by: tabthorpe (mentor), respective maintainers
Diffstat (limited to 'ports-mgmt')
-rw-r--r-- | ports-mgmt/hs-porte/Makefile | 65 | ||||
-rw-r--r-- | ports-mgmt/hs-porte/pkg-plist | 25 | ||||
-rw-r--r-- | ports-mgmt/porte/Makefile | 65 | ||||
-rw-r--r-- | ports-mgmt/porte/pkg-plist | 25 |
4 files changed, 132 insertions, 48 deletions
diff --git a/ports-mgmt/hs-porte/Makefile b/ports-mgmt/hs-porte/Makefile index 5b4995ef820d..98b68f25c95a 100644 --- a/ports-mgmt/hs-porte/Makefile +++ b/ports-mgmt/hs-porte/Makefile @@ -6,32 +6,73 @@ PORTNAME= porte PORTVERSION= 0.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ports-mgmt haskell MASTER_SITES= http://carte.repnop.org/releases/ MAINTAINER= sbahra@kerneled.org COMMENT= FreeBSD ports index search and statistical analysis tool -BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ +BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ + hs-stringsearch>=0.2.1.1:${PORTSDIR}/textproc/hs-stringsearch +BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ hs-stringsearch>=0.2.1.1:${PORTSDIR}/textproc/hs-stringsearch LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 -CABAL= ${LOCALBASE}/bin/runghc Setup.hs -GHC_VERSION= `${LOCALBASE}/bin/ghc --numeric-version` -SUBDIR= lib/${PORTNAME}-${PORTVERSION} -PLIST_SUB= GHC_VERSION="${GHC_VERSION}" \ - PORTVERSION=${PORTVERSION} \ - SUBDIR=${SUBDIR} +GHC_VERSION= 6.10.4 +PORTE_VERSION= ${PORTVERSION} + +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup + +DATADIR= ${PREFIX}/share/${DISTNAME} +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +PORTE_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + PORTE_VERSION=${PORTE_VERSION} \ + PORTE_LIBDIR_REL=${PORTE_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 +.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} && ${CABAL} configure --prefix=${PREFIX} --ghc + cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \ + && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} do-build: - cd ${WRKSRC} && ${CABAL} build && ${CABAL} register --gen-script + cd ${WRKSRC} && ${SETUP_CMD} build \ + && ${SETUP_CMD} register --gen-script + +.if !defined(NOPORTDOCS) + cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source --executables \ + --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css +.endif do-install: - cd ${WRKSRC} && ${CABAL} install - ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${SUBDIR}/register.sh + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${PORTE_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include <bsd.port.mk> diff --git a/ports-mgmt/hs-porte/pkg-plist b/ports-mgmt/hs-porte/pkg-plist index e3c3a2e8a25d..f66d5c9d185f 100644 --- a/ports-mgmt/hs-porte/pkg-plist +++ b/ports-mgmt/hs-porte/pkg-plist @@ -1,16 +1,17 @@ -%%SUBDIR%%/ghc-%%GHC_VERSION%%/libHSporte-%%PORTVERSION%%.a -%%SUBDIR%%/ghc-%%GHC_VERSION%%/HSporte-%%PORTVERSION%%.o -%%SUBDIR%%/ghc-%%GHC_VERSION%%/Porte/Ports.hi -%%SUBDIR%%/ghc-%%GHC_VERSION%%/Porte/Statistics.hi -%%SUBDIR%%/ghc-%%GHC_VERSION%%/Porte/Tool.hi +@comment $FreeBSD$ bin/porte -%%SUBDIR%%/register.sh -share/doc/porte-%%PORTVERSION%%/LICENSE -@dirrm share/doc/porte-%%PORTVERSION%% -@dirrm lib/porte-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Porte -@dirrm lib/porte-%%PORTVERSION%%/ghc-%%GHC_VERSION%% -@dirrm lib/porte-%%PORTVERSION%% -@exec /bin/sh %D/%%SUBDIR%%/register.sh +%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSporte-%%PORTE_VERSION%%.o +%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte/Ports.hi +%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte/Statistics.hi +%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte/Tool.hi +%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSporte-%%PORTE_VERSION%%.a +%%PORTE_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte +@dirrm %%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%PORTE_LIBDIR_REL%% +@exec /bin/sh %D/%%PORTE_LIBDIR_REL%%/register.sh @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old @unexec %D/bin/ghc-pkg unregister porte @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old diff --git a/ports-mgmt/porte/Makefile b/ports-mgmt/porte/Makefile index 5b4995ef820d..98b68f25c95a 100644 --- a/ports-mgmt/porte/Makefile +++ b/ports-mgmt/porte/Makefile @@ -6,32 +6,73 @@ PORTNAME= porte PORTVERSION= 0.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ports-mgmt haskell MASTER_SITES= http://carte.repnop.org/releases/ MAINTAINER= sbahra@kerneled.org COMMENT= FreeBSD ports index search and statistical analysis tool -BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ +BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ + hs-stringsearch>=0.2.1.1:${PORTSDIR}/textproc/hs-stringsearch +BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ hs-stringsearch>=0.2.1.1:${PORTSDIR}/textproc/hs-stringsearch LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 -CABAL= ${LOCALBASE}/bin/runghc Setup.hs -GHC_VERSION= `${LOCALBASE}/bin/ghc --numeric-version` -SUBDIR= lib/${PORTNAME}-${PORTVERSION} -PLIST_SUB= GHC_VERSION="${GHC_VERSION}" \ - PORTVERSION=${PORTVERSION} \ - SUBDIR=${SUBDIR} +GHC_VERSION= 6.10.4 +PORTE_VERSION= ${PORTVERSION} + +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup + +DATADIR= ${PREFIX}/share/${DISTNAME} +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +PORTE_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + PORTE_VERSION=${PORTE_VERSION} \ + PORTE_LIBDIR_REL=${PORTE_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 +.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} && ${CABAL} configure --prefix=${PREFIX} --ghc + cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \ + && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} do-build: - cd ${WRKSRC} && ${CABAL} build && ${CABAL} register --gen-script + cd ${WRKSRC} && ${SETUP_CMD} build \ + && ${SETUP_CMD} register --gen-script + +.if !defined(NOPORTDOCS) + cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source --executables \ + --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css +.endif do-install: - cd ${WRKSRC} && ${CABAL} install - ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${SUBDIR}/register.sh + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${PORTE_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include <bsd.port.mk> diff --git a/ports-mgmt/porte/pkg-plist b/ports-mgmt/porte/pkg-plist index e3c3a2e8a25d..f66d5c9d185f 100644 --- a/ports-mgmt/porte/pkg-plist +++ b/ports-mgmt/porte/pkg-plist @@ -1,16 +1,17 @@ -%%SUBDIR%%/ghc-%%GHC_VERSION%%/libHSporte-%%PORTVERSION%%.a -%%SUBDIR%%/ghc-%%GHC_VERSION%%/HSporte-%%PORTVERSION%%.o -%%SUBDIR%%/ghc-%%GHC_VERSION%%/Porte/Ports.hi -%%SUBDIR%%/ghc-%%GHC_VERSION%%/Porte/Statistics.hi -%%SUBDIR%%/ghc-%%GHC_VERSION%%/Porte/Tool.hi +@comment $FreeBSD$ bin/porte -%%SUBDIR%%/register.sh -share/doc/porte-%%PORTVERSION%%/LICENSE -@dirrm share/doc/porte-%%PORTVERSION%% -@dirrm lib/porte-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Porte -@dirrm lib/porte-%%PORTVERSION%%/ghc-%%GHC_VERSION%% -@dirrm lib/porte-%%PORTVERSION%% -@exec /bin/sh %D/%%SUBDIR%%/register.sh +%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSporte-%%PORTE_VERSION%%.o +%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte/Ports.hi +%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte/Statistics.hi +%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte/Tool.hi +%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSporte-%%PORTE_VERSION%%.a +%%PORTE_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte +@dirrm %%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%PORTE_LIBDIR_REL%% +@exec /bin/sh %D/%%PORTE_LIBDIR_REL%%/register.sh @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old @unexec %D/bin/ghc-pkg unregister porte @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old |