ports/137077: [patch]: update of x11-toolkits/hs-glut-ghc from the 2.1.1.2 version to the 2.1.2.1 version

Jacula Modyun jacula at gmail.com
Fri Jul 24 17:50:05 UTC 2009 

>Number:         137077
>Category:       ports
>Synopsis:       [patch]: update of x11-toolkits/hs-glut-ghc from the 2.1.1.2 version to the 2.1.2.1 version
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 24 17:50:04 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-glut-ghc.diff begins here ---
diff -uNr hs-glut-ghc.orig/Makefile hs-glut-ghc/Makefile
--- hs-glut-ghc.orig/Makefile	2009-05-13 09:45:59.000000000 +0000
+++ hs-glut-ghc/Makefile	2009-07-22 06:27:08.000000000 +0000
@@ -5,8 +5,7 @@
 # $FreeBSD: ports/x11-toolkits/hs-glut-ghc/Makefile,v 1.6 2009/05/13 09:45:59 ale Exp $
 
 PORTNAME=	glut
-PORTVERSION=	2.1.1.2
-PORTREVISION=	1
+PORTVERSION=	2.1.2.1
 CATEGORIES=	x11-toolkits haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/GLUT/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -18,46 +17,65 @@
 
 USE_GL=		glut
 
-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/${DISTNAME}
-PORTDOCS=	LICENSE html
-
-.include <bsd.port.pre.mk>
-
 BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
-		${LOCALBASE}/lib/ghc-${GHC_VERSION}/cabal/opengl-register.sh:${PORTSDIR}/x11-toolkits/hs-opengl-ghc
+		hs-opengl-ghc>=2.2:${PORTSDIR}/x11-toolkits/hs-opengl-ghc
+RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
+		hs-opengl-ghc>=2.2:${PORTSDIR}/x11-toolkits/hs-opengl-ghc
 LIB_DEPENDS+=	gmp.8:${PORTSDIR}/math/libgmp4
-RUN_DEPENDS+=	${LOCALBASE}/lib/ghc-${GHC_VERSION}/cabal/opengl-register.sh:${PORTSDIR}/x11-toolkits/hs-opengl-ghc
 
-# 'owned' by lang/ghc:
-CABALDIR=	${PREFIX}/lib/ghc-${GHC_VERSION}/cabal
-CABALCMD=	${LOCALBASE}/bin/runghc Setup.hs
-SUBDIR=		${PORTNAME}${PKGNAMESUFFIX}
+GHC_VERSION=	6.10.4
+HSGLUT_VERSION=	${PORTVERSION}
+
+GHC_CMD=	${LOCALBASE}/bin/ghc
+SETUP_CMD=	./setup
+
+DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
+HSGLUT_LIBDIR_REL=	lib/${DISTNAME}
+
+PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
+		HSGLUT_VERSION=${HSGLUT_VERSION} \
+		HSGLUT_LIBDIR_REL=${HSGLUT_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
-PLIST_SUB+=	RMLIC="@comment "
-.else
-PLIST_SUB+=	RMLIC=""
 .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 --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}/${HSGLUT_LIBDIR_REL}/register.sh
+
+post-install:
+	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -uNr hs-glut-ghc.orig/distinfo hs-glut-ghc/distinfo
--- hs-glut-ghc.orig/distinfo	2009-01-26 21:07:08.000000000 +0000
+++ hs-glut-ghc/distinfo	2009-07-15 07:30:42.000000000 +0000
@@ -1,3 +1,3 @@
-MD5 (GLUT-2.1.1.2.tar.gz) = 67e5996a7fe56af764393f1cf80b9a43
-SHA256 (GLUT-2.1.1.2.tar.gz) = d5ecf4b6bacc5e68ade00710df04fa158c6ed322c74362954716a0baba6bd3fb
-SIZE (GLUT-2.1.1.2.tar.gz) = 121228
+MD5 (GLUT-2.1.2.1.tar.gz) = b97f476a04098701e330e86c1f89ed52
+SHA256 (GLUT-2.1.2.1.tar.gz) = 0230bfacbfb85c126f1fba45fcd8d02f20da9ee19180b5ada698224362d17264
+SIZE (GLUT-2.1.2.1.tar.gz) = 720222
diff -uNr hs-glut-ghc.orig/pkg-descr hs-glut-ghc/pkg-descr
--- hs-glut-ghc.orig/pkg-descr	2008-01-05 06:53:51.000000000 +0000
+++ hs-glut-ghc/pkg-descr	2009-07-15 09:07:58.000000000 +0000
@@ -3,4 +3,15 @@
 information about the C library on which this binding is based, please see:
 <http://www.opengl.org/resources/libraries/glut/>.
 
-WWW: http://www.haskell.org/HOpenGL/
+Maintainer:	Sven Panne <sven.panne at aedion.de>
+License:	BSD3
+WWW:		http://www.haskell.org/HOpenGL/
+
+exposed-modules: Graphics.UI.GLUT Graphics.UI.GLUT.Begin
+		 Graphics.UI.GLUT.Callbacks Graphics.UI.GLUT.Callbacks.Global
+		 Graphics.UI.GLUT.Callbacks.Window Graphics.UI.GLUT.Colormap
+		 Graphics.UI.GLUT.Debugging Graphics.UI.GLUT.DeviceControl
+		 Graphics.UI.GLUT.Fonts Graphics.UI.GLUT.GameMode
+		 Graphics.UI.GLUT.Initialization Graphics.UI.GLUT.Menu
+		 Graphics.UI.GLUT.Objects Graphics.UI.GLUT.Overlay
+		 Graphics.UI.GLUT.State Graphics.UI.GLUT.Window
diff -uNr hs-glut-ghc.orig/pkg-plist hs-glut-ghc/pkg-plist
--- hs-glut-ghc.orig/pkg-plist	2009-01-26 21:07:08.000000000 +0000
+++ hs-glut-ghc/pkg-plist	2009-07-20 20:17:10.000000000 +0000
@@ -1,36 +1,38 @@
-%%SUBDIR%%/Graphics/UI/GLUT/Callbacks/Global.hi
-%%SUBDIR%%/Graphics/UI/GLUT/Callbacks/Window.hi
-%%SUBDIR%%/Graphics/UI/GLUT/Callbacks/Registration.hi
-%%SUBDIR%%/Graphics/UI/GLUT/Begin.hi
-%%SUBDIR%%/Graphics/UI/GLUT/Callbacks.hi
-%%SUBDIR%%/Graphics/UI/GLUT/Colormap.hi
-%%SUBDIR%%/Graphics/UI/GLUT/Debugging.hi
-%%SUBDIR%%/Graphics/UI/GLUT/DeviceControl.hi
-%%SUBDIR%%/Graphics/UI/GLUT/Fonts.hi
-%%SUBDIR%%/Graphics/UI/GLUT/GameMode.hi
-%%SUBDIR%%/Graphics/UI/GLUT/Initialization.hi
-%%SUBDIR%%/Graphics/UI/GLUT/Menu.hi
-%%SUBDIR%%/Graphics/UI/GLUT/Objects.hi
-%%SUBDIR%%/Graphics/UI/GLUT/Overlay.hi
-%%SUBDIR%%/Graphics/UI/GLUT/State.hi
-%%SUBDIR%%/Graphics/UI/GLUT/Window.hi
-%%SUBDIR%%/Graphics/UI/GLUT/Constants.hi
-%%SUBDIR%%/Graphics/UI/GLUT/Extensions.hi
-%%SUBDIR%%/Graphics/UI/GLUT/QueryUtils.hi
-%%SUBDIR%%/Graphics/UI/GLUT/Types.hi
-%%SUBDIR%%/Graphics/UI/GLUT.hi
-%%SUBDIR%%/libHSGLUT-%%PORTVERSION%%.a
-%%SUBDIR%%/HSGLUT-%%PORTVERSION%%.o
-%%SUBDIR%%/include/HsGLUT.h
-%%SUBDIR%%/%%PORTNAME%%-register.sh
-%%RMLIC%%%%DOCSDIR%%/LICENSE
-%%RMLIC%%@dirrm %%DOCSDIR%%
- at dirrm %%SUBDIR%%/Graphics/UI/GLUT/Callbacks
- at dirrm %%SUBDIR%%/Graphics/UI/GLUT
- at dirrmtry %%SUBDIR%%/Graphics/UI
- at dirrmtry %%SUBDIR%%/Graphics
- at dirrmtry %%SUBDIR%%/include
- at exec /bin/sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT.hi
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Begin.hi
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Callbacks.hi
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Callbacks/Global.hi
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Callbacks/Registration.hi
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Callbacks/Window.hi
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Colormap.hi
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Constants.hi
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Debugging.hi
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/DeviceControl.hi
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Extensions.hi
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Fonts.hi
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/GameMode.hi
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Initialization.hi
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Menu.hi
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Objects.hi
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Overlay.hi
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/QueryUtils.hi
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/State.hi
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Types.hi
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Window.hi
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSGLUT-%%HSGLUT_VERSION%%.o
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/HsGLUT.h
+%%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSGLUT-%%HSGLUT_VERSION%%.a
+%%HSGLUT_LIBDIR_REL%%/register.sh
+%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
+%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
+ at dirrm %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include
+ at dirrm %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Callbacks
+ at dirrm %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT
+ at dirrm %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI
+ at dirrm %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics
+ at dirrm %%HSGLUT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+ at dirrm %%HSGLUT_LIBDIR_REL%%
+ at exec /bin/sh %D/%%HSGLUT_LIBDIR_REL%%/register.sh
 @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
 @unexec %D/bin/ghc-pkg unregister GLUT
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
--- patch-hs-glut-ghc.diff ends here ---


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

More information about the freebsd-ports-bugs mailing list