ports/137079: [patch]: update of x11/hs-x11-ghc to ghc-6.10.4

Jacula Modyun jacula at gmail.com
Fri Jul 24 18:00:09 UTC 2009 

>Number:         137079
>Category:       ports
>Synopsis:       [patch]: update of x11/hs-x11-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:00:08 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-x11-ghc.diff begins here ---
diff -uNr hs-x11-ghc.orig/Makefile hs-x11-ghc/Makefile
--- hs-x11-ghc.orig/Makefile	2009-07-10 07:11:12.000000000 +0000
+++ hs-x11-ghc/Makefile	2009-07-22 06:27:48.000000000 +0000
@@ -2,11 +2,11 @@
 # Date created:				2007-09-03
 # Whom:					Volker Stolz <vs at FreeBSD.org>
 #
-# $FreeBSD: ports/x11/hs-x11-ghc/Makefile,v 1.10 2009/07/10 07:11:12 pgj Exp $
+# $FreeBSD: ports/x11/hs-x11-ghc/Makefile,v 1.9 2009/05/13 09:46:00 ale Exp $
 
 PORTNAME=	x11
 PORTVERSION=	1.4.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/X11/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -16,60 +16,73 @@
 MAINTAINER=	haskell at FreeBSD.org
 COMMENT=	X11 bindings for Haskell programs
 
-# include the version verbatim. This will require a revision bump
-# on updates, but the correct quoting of `ghc --numeric-version` in the various
-# places is a real nightmare.
-GHC_VERSION=	6.8.3
-PLIST_SUB+=	GHC_VERSION=${GHC_VERSION} \
-		PORTVERSION=${PORTVERSION} \
-		PORTNAME=${PORTNAME} \
-		SUBDIR=lib/ghc-${GHC_VERSION}/cabal
-
-OPTIONS=	XINERAMA "Build with Xinerama support" off
-
-.include <bsd.port.pre.mk>
-
 BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
 LIB_DEPENDS+=	gmp.8:${PORTSDIR}/math/libgmp4
 RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
 
 USE_XORG=	x11 xext sm
 
+GHC_VERSION=	6.10.4
+HSX11_VERSION=	${PORTVERSION}
+
+GHC_CMD=	${LOCALBASE}/bin/ghc
+SETUP_CMD=	./setup
+
+DOCSDIR=		${PREFIX}/share/doc/${DISTNAME}
+HSX11_LIBDIR_REL=	lib/${DISTNAME}
+
+PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
+		HSX11_VERSION=${HSX11_VERSION} \
+		HSX11_LIBDIR_REL=${HSX11_LIBDIR_REL}
+
+OPTIONS=	XINERAMA "Build with Xinerama support" off
+
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_XINERAMA)
 USE_XORG+=	xinerama
 .endif
 
-# 'owned' by lang/ghc:
-CABALDIR=	${PREFIX}/lib/ghc-${GHC_VERSION}/cabal
-CABALCMD=	${LOCALBASE}/bin/runghc Setup.hs
-DOCSDIR=	${PREFIX}/share/doc/X11-${PORTVERSION}
-PORTDOCS=	LICENSE html
-SUBDIR=		${PORTNAME}${PKGNAMESUFFIX}
+.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
-PLIST_SUB+=	RMLIC="@comment "
-.else
-PLIST_SUB+=	RMLIC=""
 .endif
+BUILD_DEPENDS+=	HsColour:${PORTSDIR}/print/hs-hscolour
 
-post-patch:
-	@${REINPLACE_CMD} 's|/usr/local/include|${LOCALBASE}/include|g' \
-		${WRKSRC}/configure
+HSCOLOUR_VERSION=	1.13
+HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
+
+PORTDOCS=	*
+.endif
+
+.SILENT:
 
 do-configure:
-	cd ${WRKSRC} && ${CABALCMD} configure --ghc --prefix=${PREFIX} --libdir=${CABALDIR} \
-	 --libsubdir='' --datasubdir=''
+	cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -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}/${HSX11_LIBDIR_REL}/register.sh
+
+post-install:
+	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
 .include <bsd.port.post.mk>
diff -uNr hs-x11-ghc.orig/pkg-descr hs-x11-ghc/pkg-descr
--- hs-x11-ghc.orig/pkg-descr	2007-09-17 05:56:38.000000000 +0000
+++ hs-x11-ghc/pkg-descr	2009-07-18 15:59:29.000000000 +0000
@@ -4,4 +4,21 @@
 for documentation of these calls, refer to /The Xlib Programming Manual/,
 available online at <http://tronche.com/gui/x/xlib/>.
 
-WWW: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11
+Copyright:	Alastair Reid, 1999-2003, libraries at haskell.org 2003-2007
+Maintainer:	Don Stewart <dons at galois.com>
+license:	BSD3
+URL:		http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11
+WWW:		http://darcs.haskell.org/X11
+
+exposed-modules: Graphics.X11 Graphics.X11.Types Graphics.X11.Xlib
+                 Graphics.X11.Xlib.Atom Graphics.X11.Xlib.Color
+                 Graphics.X11.Xlib.Context Graphics.X11.Xlib.Display
+                 Graphics.X11.Xlib.Event Graphics.X11.Xlib.Font
+                 Graphics.X11.Xlib.Misc Graphics.X11.Xlib.Region
+                 Graphics.X11.Xlib.Screen Graphics.X11.Xlib.Types
+                 Graphics.X11.Xlib.Window Graphics.X11.Xlib.Image
+                 Graphics.X11.Xlib.Extras Graphics.X11.Xinerama
+                 Graphics.X11.ExtraTypes Graphics.X11.ExtraTypes.AP
+                 Graphics.X11.ExtraTypes.DEC Graphics.X11.ExtraTypes.HP
+                 Graphics.X11.ExtraTypes.Sun Graphics.X11.ExtraTypes.XF86
+                 Graphics.X11.ExtraTypes.XorgDefault
diff -uNr hs-x11-ghc.orig/pkg-plist hs-x11-ghc/pkg-plist
--- hs-x11-ghc.orig/pkg-plist	2009-01-26 21:32:28.000000000 +0000
+++ hs-x11-ghc/pkg-plist	2009-07-18 16:09:16.000000000 +0000
@@ -1,41 +1,43 @@
-%%SUBDIR%%/Graphics/X11.hi
-%%SUBDIR%%/Graphics/X11/ExtraTypes.hi
-%%SUBDIR%%/Graphics/X11/ExtraTypes/AP.hi
-%%SUBDIR%%/Graphics/X11/ExtraTypes/DEC.hi
-%%SUBDIR%%/Graphics/X11/ExtraTypes/HP.hi
-%%SUBDIR%%/Graphics/X11/ExtraTypes/Sun.hi
-%%SUBDIR%%/Graphics/X11/ExtraTypes/XF86.hi
-%%SUBDIR%%/Graphics/X11/ExtraTypes/XorgDefault.hi
-%%SUBDIR%%/Graphics/X11/Types.hi
-%%SUBDIR%%/Graphics/X11/Xinerama.hi
-%%SUBDIR%%/Graphics/X11/Xlib.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Atom.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Color.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Context.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Display.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Event.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Extras.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Font.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Image.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Misc.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Region.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Screen.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Types.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Window.hi
-%%SUBDIR%%/HSX11-%%PORTVERSION%%.o
-%%SUBDIR%%/include/HsAllKeysyms.h
-%%SUBDIR%%/include/HsXlib.h
-%%SUBDIR%%/include/XlibExtras.h
-%%SUBDIR%%/libHSX11-%%PORTVERSION%%.a
-%%SUBDIR%%/%%PORTNAME%%-register.sh
-%%RMLIC%%%%DOCSDIR%%/LICENSE
-%%RMLIC%%@dirrm %%DOCSDIR%%
- at dirrmtry %%SUBDIR%%/include
- at dirrm %%SUBDIR%%/Graphics/X11/ExtraTypes
- at dirrm %%SUBDIR%%/Graphics/X11/Xlib
- at dirrm %%SUBDIR%%/Graphics/X11
- at dirrmtry %%SUBDIR%%/Graphics
- at exec /bin/sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/AP.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/DEC.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/HP.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/Sun.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/XF86.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/XorgDefault.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Types.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xinerama.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Atom.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Color.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Context.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Display.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Event.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Extras.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Font.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Image.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Misc.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Region.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Screen.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Types.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Window.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSX11-%%HSX11_VERSION%%.o
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/HsAllKeysyms.h
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/HsXlib.h
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/XlibExtras.h
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSX11-%%HSX11_VERSION%%.a
+%%HSX11_LIBDIR_REL%%/register.sh
+%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
+%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
+ at dirrm %%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include
+ at dirrm %%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib
+ at dirrm %%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes
+ at dirrm %%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11
+ at dirrm %%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics
+ at dirrm %%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+ at dirrm %%HSX11_LIBDIR_REL%%
+ at exec /bin/sh %D/%%HSX11_LIBDIR_REL%%/register.sh
 @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
- at unexec ghc-pkg unregister X11
+ at unexec %D/bin/ghc-pkg unregister X11
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
--- patch-hs-x11-ghc.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list