Date: Fri, 24 Jul 2009 11:00:54 -0700 (PDT) From: Jacula Modyun <jacula@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/137080: [patch]: update of x11/hs-x11-xft-ghc to ghc-6.10.4 Message-ID: <200907241800.n6OI0rhu098256@splork.wirewater.yow> Resent-Message-ID: <200907241810.n6OIA0fx092830@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 137080 >Category: ports >Synopsis: [patch]: update of x11/hs-x11-xft-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 18:10:00 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@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-x11-xft-ghc.diff begins here --- diff -uNr hs-x11-xft-ghc.orig/Makefile hs-x11-xft-ghc/Makefile --- hs-x11-xft-ghc.orig/Makefile 2009-01-30 09:57:08.000000000 +0000 +++ hs-x11-xft-ghc/Makefile 2009-07-22 06:27:57.000000000 +0000 @@ -7,7 +7,7 @@ PORTNAME= x11-xft PORTVERSION= 0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/X11-xft/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -26,36 +26,59 @@ USE_XORG= xft xrender -CABALCMD= ${LOCALBASE}/bin/runghc Setup.lhs -CABALDIR= ${PREFIX}/lib/ghc-${GHC_VERSION}/cabal -GHC_VERSION= 6.8.3 -PLIST_SUB+= GHC_VERSION=${GHC_VERSION} \ - PORTVERSION=${PORTVERSION} \ - PORTNAME=${PORTNAME} \ - SUBDIR=lib/ghc-${GHC_VERSION}/cabal -DOCSDIR= ${PREFIX}/share/doc/X11-xft-${PORTVERSION} -PORTDOCS= LICENSE html +GHC_VERSION= 6.10.4 +HSX11XFT_VERSION= ${PORTVERSION} -CONFIGURE_ARGS= --ghc --prefix=${PREFIX} --libdir=${CABALDIR} --libsubdir='' --datasubdir='' +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup + +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +HSX11XFT_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + HSX11XFT_VERSION=${HSX11XFT_VERSION} \ + HSX11XFT_LIBDIR_REL=${HSX11XFT_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 --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 ${CABALDIR}/${PORTNAME}-register.sh + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${HSX11XFT_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include <bsd.port.mk> diff -uNr hs-x11-xft-ghc.orig/pkg-descr hs-x11-xft-ghc/pkg-descr --- hs-x11-xft-ghc.orig/pkg-descr 2008-11-23 08:22:31.000000000 +0000 +++ hs-x11-xft-ghc/pkg-descr 2009-07-18 16:06:52.000000000 +0000 @@ -1,4 +1,9 @@ Bindings to the Xft, X Free Type interface library, and some Xrender parts. -WWW: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11-xft +Maintainer: clemens@endorphin.org +license: LGPL +WWW: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11-xft + +exposed-modules: Graphics.X11.Xft, + Graphics.X11.Xrender diff -uNr hs-x11-xft-ghc.orig/pkg-plist hs-x11-xft-ghc/pkg-plist --- hs-x11-xft-ghc.orig/pkg-plist 2009-01-30 09:57:08.000000000 +0000 +++ hs-x11-xft-ghc/pkg-plist 2009-07-18 16:09:40.000000000 +0000 @@ -1,11 +1,15 @@ -%%SUBDIR%%/Graphics/X11/Xft.hi -%%SUBDIR%%/Graphics/X11/Xrender.hi -%%SUBDIR%%/HSX11-xft-0.3.o -%%SUBDIR%%/libHSX11-xft-0.3.a -%%SUBDIR%%/x11-xft-register.sh -@dirrmtry %%SUBDIR%%/Graphics/X11 -@dirrmtry %%SUBDIR%%/Graphics -@exec /bin/sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh +%%HSX11XFT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xft.hi +%%HSX11XFT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xrender.hi +%%HSX11XFT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSX11-xft-%%HSX11XFT_VERSION%%.o +%%HSX11XFT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSX11-xft-%%HSX11XFT_VERSION%%.a +%%HSX11XFT_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%HSX11XFT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11 +@dirrm %%HSX11XFT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics +@dirrm %%HSX11XFT_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%HSX11XFT_LIBDIR_REL%% +@exec /bin/sh %D/%%HSX11XFT_LIBDIR_REL%%/register.sh @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old -@unexec ghc-pkg unregister X11-xft +@unexec %D/bin/ghc-pkg unregister X11-xft @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old --- patch-hs-x11-xft-ghc.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907241800.n6OI0rhu098256>