ports/137107: [patch]: update of ports-mgmt/porte to ghc-6.10.4

[Jacula Modyun]

>Number:         137107
>Category:       ports
>Synopsis:       [patch]: update of ports-mgmt/porte 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 21:20:05 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-porte begins here ---
diff -uNr porte.orig/Makefile porte/Makefile
--- porte.orig/Makefile	2009-05-13 09:46:00.000000000 +0000
+++ porte/Makefile	2009-07-23 10:53:50.000000000 +0000
@@ -6,7 +6,7 @@
 
 PORTNAME=	porte
 PORTVERSION=	0.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ports-mgmt haskell
 MASTER_SITES=	http://carte.repnop.org/releases/
 
@@ -15,23 +15,64 @@
 
 BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc					\
 		hs-stringsearch>=0.2.1.1:${PORTSDIR}/textproc/hs-stringsearch
+BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc					\
+		hs-stringsearch>=0.2.1.1:${PORTSDIR}/textproc/hs-stringsearch
 LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4
 
-CABAL=		${LOCALBASE}/bin/runghc Setup.hs
-GHC_VERSION=	`${LOCALBASE}/bin/ghc --numeric-version`
-SUBDIR=		lib/${PORTNAME}-${PORTVERSION}
-PLIST_SUB=	GHC_VERSION="${GHC_VERSION}"		\
-		PORTVERSION=${PORTVERSION}		\
-		SUBDIR=${SUBDIR}
+GHC_VERSION=	6.10.4
+PORTE_VERSION=	${PORTVERSION}
+
+GHC_CMD=	${LOCALBASE}/bin/ghc
+SETUP_CMD=	./setup
+
+DATADIR=	${PREFIX}/share/${DISTNAME}
+DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
+PORTE_LIBDIR_REL=	lib/${DISTNAME}
+
+PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
+		PORTE_VERSION=${PORTE_VERSION} \
+		PORTE_LIBDIR_REL=${PORTE_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
+.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} && ${CABAL} configure --prefix=${PREFIX} --ghc
+	cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \
+		     && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
 
 do-build:
-	cd ${WRKSRC} && ${CABAL} build && ${CABAL} register --gen-script
+	cd ${WRKSRC} && ${SETUP_CMD} build \
+		     && ${SETUP_CMD} register --gen-script
+
+.if !defined(NOPORTDOCS)
+	cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source --executables \
+					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
+.endif
 
 do-install:
-	cd ${WRKSRC} && ${CABAL} install
-	${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${SUBDIR}/register.sh
+	cd ${WRKSRC} && ${SETUP_CMD} install \
+		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${PORTE_LIBDIR_REL}/register.sh
+
+post-install:
+	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
 .include <bsd.port.mk>
diff -uNr porte.orig/pkg-descr porte/pkg-descr
--- porte.orig/pkg-descr	2008-11-05 01:46:11.000000000 +0000
+++ porte/pkg-descr	2009-07-23 10:34:45.000000000 +0000
@@ -2,4 +2,9 @@
 FreeBSD ports index fields. It also has a simple statistics mode which
 allows collecting frequency statistics for these fields.
 
-WWW: http://www.kerneled.org/
+Author:		Samy Al Bahra
+Maintainer:	sbahra at kerneled.org
+License:	BSD3
+WWW:		http://www.kerneled.org/
+
+Exposed-Modules: Porte.Tool Porte.Statistics Porte.Ports
diff -uNr porte.orig/pkg-plist porte/pkg-plist
--- porte.orig/pkg-plist	2008-11-05 23:36:46.000000000 +0000
+++ porte/pkg-plist	2009-07-23 10:52:16.000000000 +0000
@@ -1,16 +1,16 @@
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/libHSporte-%%PORTVERSION%%.a
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/HSporte-%%PORTVERSION%%.o
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/Porte/Ports.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/Porte/Statistics.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/Porte/Tool.hi
 bin/porte
-%%SUBDIR%%/register.sh
-share/doc/porte-%%PORTVERSION%%/LICENSE
- at dirrm share/doc/porte-%%PORTVERSION%%
- at dirrm lib/porte-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Porte
- at dirrm lib/porte-%%PORTVERSION%%/ghc-%%GHC_VERSION%%
- at dirrm lib/porte-%%PORTVERSION%%
- at exec /bin/sh %D/%%SUBDIR%%/register.sh
+%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSporte-%%PORTE_VERSION%%.o
+%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte/Ports.hi
+%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte/Statistics.hi
+%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte/Tool.hi
+%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSporte-%%PORTE_VERSION%%.a
+%%PORTE_LIBDIR_REL%%/register.sh
+%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
+%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
+ at dirrm %%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte
+ at dirrm %%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+ at dirrm %%PORTE_LIBDIR_REL%%
+ at exec /bin/sh %D/%%PORTE_LIBDIR_REL%%/register.sh
 @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
 @unexec %D/bin/ghc-pkg unregister porte
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
--- patch-porte ends here ---


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