ports/137081: [patch]: update of devel/hs-utf8-string-ghc from the 0.3.4 version to the 0.3.5 version

Jacula Modyun jacula at gmail.com
Fri Jul 24 18:10:01 UTC 2009 

>Number:         137081
>Category:       ports
>Synopsis:       [patch]: update of devel/hs-utf8-string-ghc from the 0.3.4 version to the 0.3.5 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 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 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-utf8-string-ghc.diff begins here ---
diff -uNr hs-utf8-string-ghc.orig/Makefile hs-utf8-string-ghc/Makefile
--- hs-utf8-string-ghc.orig/Makefile	2009-01-30 09:54:34.000000000 +0000
+++ hs-utf8-string-ghc/Makefile	2009-07-22 06:24:55.000000000 +0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	utf8-string
-PORTVERSION=	0.3.4
+PORTVERSION=	0.3.5
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -18,37 +18,59 @@
 BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
 RUN_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
 
-CABALCMD=	${LOCALBASE}/bin/runghc Setup.lhs
-CABALDIR=	${PREFIX}/lib/ghc-${GHC_VERSION}/cabal
-GHC_VERSION=	6.8.3
-SUBDIR=		lib/${PORTNAME}-${PORTVERSION}
-PLIST_SUB+=	GHC_VERSION=${GHC_VERSION} \
-		PORTVERSION=${PORTVERSION} \
-		PORTNAME=${PORTNAME} \
-		SUBDIR=lib/ghc-${GHC_VERSION}/cabal
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
-PORTDOCS=	LICENSE html
+GHC_VERSION=		6.10.4
+UTF8STR_VERSION=	${PORTVERSION}
 
-CONFIGURE_ARGS=	--ghc --prefix=${PREFIX} --libdir=${CABALDIR} --libsubdir='' --datasubdir=''
+GHC_CMD=	${LOCALBASE}/bin/ghc
+SETUP_CMD=	./setup
+
+DOCSDIR=		${PREFIX}/share/doc/${DISTNAME}
+UTF8STR_LIBDIR_REL=	lib/${DISTNAME}
+
+PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
+		UTF8STR_VERSION=${UTF8STR_VERSION} \
+		UTF8STR_LIBDIR_REL=${UTF8STR_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}/${UTF8STR_LIBDIR_REL}/register.sh
+
+post-install:
+	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
 .include <bsd.port.mk>
diff -uNr hs-utf8-string-ghc.orig/distinfo hs-utf8-string-ghc/distinfo
--- hs-utf8-string-ghc.orig/distinfo	2009-01-30 09:54:34.000000000 +0000
+++ hs-utf8-string-ghc/distinfo	2009-07-14 15:54:24.000000000 +0000
@@ -1,3 +1,3 @@
-MD5 (utf8-string-0.3.4.tar.gz) = 72d13d9453cdf721dd95bc18144a120a
-SHA256 (utf8-string-0.3.4.tar.gz) = f97027354f0b88af9bf3638aee0eb3bb72c05ec44f4af4c1abe070597059a5bd
-SIZE (utf8-string-0.3.4.tar.gz) = 8063
+MD5 (utf8-string-0.3.5.tar.gz) = d5198209bd81ea4f8af7692e2467336c
+SHA256 (utf8-string-0.3.5.tar.gz) = 41f99b3e9f61ab5309c93f98d45f1ba2e475a8504c5202a350720c27fb82d07a
+SIZE (utf8-string-0.3.5.tar.gz) = 8758
diff -uNr hs-utf8-string-ghc.orig/pkg-descr hs-utf8-string-ghc/pkg-descr
--- hs-utf8-string-ghc.orig/pkg-descr	2008-12-23 12:50:23.000000000 +0000
+++ hs-utf8-string-ghc/pkg-descr	2009-07-14 16:02:03.000000000 +0000
@@ -2,4 +2,15 @@
 provides operations for encoding UTF8 strings to Word8 lists 
 and back, and for reading and writing UTF8 without truncation.
 
-WWW:	http://github.com/glguy/utf8-string/
+Author:		Eric Mertens
+Maintainer:	emertens at galois.com
+License:	BSD3
+WWW:		http://github.com/glguy/utf8-string/
+
+Exposed-modules: Codec.Binary.UTF8.String
+		 Codec.Binary.UTF8.Generic
+		 System.IO.UTF8
+		 System.Environment.UTF8
+		 Data.String.UTF8
+		 Data.ByteString.UTF8
+		 Data.ByteString.Lazy.UTF8
diff -uNr hs-utf8-string-ghc.orig/pkg-plist hs-utf8-string-ghc/pkg-plist
--- hs-utf8-string-ghc.orig/pkg-plist	2009-01-30 09:54:34.000000000 +0000
+++ hs-utf8-string-ghc/pkg-plist	2009-07-20 19:35:50.000000000 +0000
@@ -1,22 +1,28 @@
-%%SUBDIR%%/Codec/Binary/UTF8/Generic.hi
-%%SUBDIR%%/Codec/Binary/UTF8/String.hi
-%%SUBDIR%%/Data/ByteString/Lazy/UTF8.hi
-%%SUBDIR%%/Data/ByteString/UTF8.hi
-%%SUBDIR%%/Data/String/UTF8.hi
-%%SUBDIR%%/System/IO/UTF8.hi
-%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%SUBDIR%%/%%PORTNAME%%-register.sh
- at dirrmtry %%SUBDIR%%/System/IO
- at dirrmtry %%SUBDIR%%/System
- at dirrmtry %%SUBDIR%%/Data/String
- at dirrmtry %%SUBDIR%%/Data/ByteString/Lazy
- at dirrmtry %%SUBDIR%%/Data/ByteString
- at dirrmtry %%SUBDIR%%/Data
- at dirrmtry %%SUBDIR%%/Codec/Binary/UTF8
- at dirrmtry %%SUBDIR%%/Codec/Binary
- at dirrmtry %%SUBDIR%%/Codec
- at exec /bin/sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh
+%%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Binary/UTF8/Generic.hi
+%%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Binary/UTF8/String.hi
+%%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Lazy/UTF8.hi
+%%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/UTF8.hi
+%%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/String/UTF8.hi
+%%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSutf8-string-%%UTF8STR_VERSION%%.o
+%%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Environment/UTF8.hi
+%%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/IO/UTF8.hi
+%%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSutf8-string-%%UTF8STR_VERSION%%.a
+%%UTF8STR_LIBDIR_REL%%/register.sh
+%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
+%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
+ at dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/IO
+ at dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Environment
+ at dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System
+ at dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/String
+ at dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Lazy
+ at dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString
+ at dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
+ at dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Binary/UTF8
+ at dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Binary
+ at dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec
+ at dirrm %%UTF8STR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+ at dirrm %%UTF8STR_LIBDIR_REL%%
+ at exec /bin/sh %D/%%UTF8STR_LIBDIR_REL%%/register.sh
 @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
- at unexec %D/bin/ghc-pkg unregister %%PORTNAME%%
+ at unexec %D/bin/ghc-pkg unregister utf8-string
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
--- patch-hs-utf8-string-ghc.diff ends here ---


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

More information about the freebsd-ports-bugs mailing list