ports/117486: [PATCH] x11/hs-x11-ghc: upgrading to 1.2.3

[Matthieu GUEGAN]

>Number:         117486
>Category:       ports
>Synopsis:       [PATCH] x11/hs-x11-ghc: upgrading to 1.2.3
>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:   Thu Oct 25 13:30:01 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Matthieu GUEGAN
>Release:        FreeBSD 7.0-BETA1 i386
>Organization:
>Environment:
FreeBSD 7.0-BETA1 #0: Tue Oct 23 11:56:06 CEST 2007
>Description:
Updating from version 1.2.1 to 1.2.3

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN --exclude=CVS /usr/ports/x11/hs-x11-ghc.orig/Makefile /usr/ports/x11/hs-x11-ghc/Makefile
--- /usr/ports/x11/hs-x11-ghc.orig/Makefile	2007-10-25 14:43:01.000000000 +0200
+++ /usr/ports/x11/hs-x11-ghc/Makefile	2007-10-25 15:20:32.000000000 +0200
@@ -5,20 +5,17 @@
 # $FreeBSD: ports/x11/hs-x11-ghc/Makefile,v 1.1 2007/09/17 05:56:38 vs Exp $
 
 PORTNAME=	x11
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	x11 haskell
-MASTER_SITES=	http://www.haskell.org/ghc/dist/${GHC_VERSION}/
+MASTER_SITES=	http://hackage.haskell.org/packages/archive/X11/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
 PKGNAMESUFFIX=	-ghc
-DISTNAME=	ghc-${GHC_VERSION}-src-extralibs
-
-PATCH_SITES=	http://lambda.foldr.org/~vs/FreeBSD/ghc-cabal-${GHC_VERSION}/
-PATCHFILES=	patch-cabal-${GHC_VERSION}-Setup.hs
+DISTNAME=	X11-${PORTVERSION}
 
 MAINTAINER=	haskell at FreeBSD.org
 COMMENT=	X11 bindings for Haskell programs
 
-USE_BZIP2=	yes
 USE_XLIB=	yes
 
 # include the version verbatim. This will require a revision bump
@@ -41,8 +38,6 @@
 CABALCMD=	${LOCALBASE}/bin/runghc Setup.hs
 SUBDIR=		${PORTNAME}${PKGNAMESUFFIX}
 
-WRKSRC=	${WRKDIR}/ghc-${GHC_VERSION}/libraries/X11
-
 do-configure:
 	cd ${WRKSRC} && ${CABALCMD} configure --ghc --prefix=${PREFIX} --libdir=${CABALDIR} \
 	 --libsubdir='' --datasubdir=''
diff -ruN --exclude=CVS /usr/ports/x11/hs-x11-ghc.orig/distinfo /usr/ports/x11/hs-x11-ghc/distinfo
--- /usr/ports/x11/hs-x11-ghc.orig/distinfo	2007-10-25 14:43:01.000000000 +0200
+++ /usr/ports/x11/hs-x11-ghc/distinfo	2007-10-25 14:48:14.000000000 +0200
@@ -1,6 +1,3 @@
-MD5 (ghc-6.6.1-src-extralibs.tar.bz2) = 43a26b81608b206c056adc3032f7da2a
-SHA256 (ghc-6.6.1-src-extralibs.tar.bz2) = d162a82fc388fdd48c327b09bb6d778f2313d12d5282f3b120ac08a5d4e78902
-SIZE (ghc-6.6.1-src-extralibs.tar.bz2) = 1928527
-MD5 (patch-cabal-6.6.1-Setup.hs) = 060eea0c5871bbe67a2b96e60a5b2e91
-SHA256 (patch-cabal-6.6.1-Setup.hs) = d88a54c1edda7a07d331a60d5c26335c1de1efce4a4433fff21f89ab3070e8ea
-SIZE (patch-cabal-6.6.1-Setup.hs) = 371
+MD5 (X11-1.2.3.tar.gz) = b0d9211f390729e08d38ce68294a8e14
+SHA256 (X11-1.2.3.tar.gz) = fd3c82b5ee6826506bdaf688afbb3793be6ea54081f29bb74bcc9177214a9ccf
+SIZE (X11-1.2.3.tar.gz) = 70415
diff -ruN --exclude=CVS /usr/ports/x11/hs-x11-ghc.orig/pkg-plist /usr/ports/x11/hs-x11-ghc/pkg-plist
--- /usr/ports/x11/hs-x11-ghc.orig/pkg-plist	2007-10-25 14:43:01.000000000 +0200
+++ /usr/ports/x11/hs-x11-ghc/pkg-plist	2007-10-25 14:53:29.000000000 +0200
@@ -1,27 +1,25 @@
-%%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/Font.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%%/Graphics/X11/Xlib/Image.hi
-%%SUBDIR%%/Graphics/X11/Types.hi
-%%SUBDIR%%/Graphics/X11/Xlib.hi
-%%SUBDIR%%/Graphics/X11.hi
-%%SUBDIR%%/libHSX11-%%PORTVERSION%%.a
-%%SUBDIR%%/HSX11-%%PORTVERSION%%.o
-%%SUBDIR%%/include/HsXlib.h
-%%SUBDIR%%/%%PORTNAME%%-register.sh
- at dirrm %%SUBDIR%%/Graphics/X11/Xlib
- at dirrm %%SUBDIR%%/Graphics/X11
- at dirrmtry %%SUBDIR%%/Graphics
- at dirrmtry %%SUBDIR%%/include
- at exec /bin/sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh
- at exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
- at unexec %D/bin/ghc-pkg unregister X11
- at unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
+lib/ghc-6.6.1/cabal/Graphics/X11.hi
+lib/ghc-6.6.1/cabal/Graphics/X11/Types.hi
+lib/ghc-6.6.1/cabal/Graphics/X11/Xlib.hi
+lib/ghc-6.6.1/cabal/Graphics/X11/Xlib/Atom.hi
+lib/ghc-6.6.1/cabal/Graphics/X11/Xlib/Color.hi
+lib/ghc-6.6.1/cabal/Graphics/X11/Xlib/Context.hi
+lib/ghc-6.6.1/cabal/Graphics/X11/Xlib/Display.hi
+lib/ghc-6.6.1/cabal/Graphics/X11/Xlib/Event.hi
+lib/ghc-6.6.1/cabal/Graphics/X11/Xlib/Font.hi
+lib/ghc-6.6.1/cabal/Graphics/X11/Xlib/Image.hi
+lib/ghc-6.6.1/cabal/Graphics/X11/Xlib/Misc.hi
+lib/ghc-6.6.1/cabal/Graphics/X11/Xlib/Region.hi
+lib/ghc-6.6.1/cabal/Graphics/X11/Xlib/Screen.hi
+lib/ghc-6.6.1/cabal/Graphics/X11/Xlib/Types.hi
+lib/ghc-6.6.1/cabal/Graphics/X11/Xlib/Window.hi
+lib/ghc-6.6.1/cabal/HSX11-1.2.3.o
+lib/ghc-6.6.1/cabal/include/HsXlib.h
+lib/ghc-6.6.1/cabal/libHSX11-1.2.3.a
+lib/ghc-6.6.1/cabal/x11-register.sh
+ at dirrm lib/ghc-6.6.1/cabal/include
+ at dirrm lib/ghc-6.6.1/cabal/Graphics/X11/Xlib
+ at dirrm lib/ghc-6.6.1/cabal/Graphics/X11
+ at dirrm lib/ghc-6.6.1/cabal/Graphics
+ at dirrm lib/ghc-6.6.1/cabal
+ at dirrm lib/ghc-6.6.1


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