ports/137071: [patch]: update of devel/hs-cpphs from the 1.6 version to the 1.7 version

Fri Jul 24 17:20:06 UTC 2009

>Number:         137071
>Category:       ports
>Synopsis:       [patch]: update of devel/hs-cpphs from the 1.6 version to the 1.7 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:20:06 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-cpphs.diff begins here ---
diff -uNr hs-cpphs.orig/Makefile hs-cpphs/Makefile
--- hs-cpphs.orig/Makefile	2009-05-13 09:45:49.000000000 +0000
+++ hs-cpphs/Makefile	2009-07-22 06:21:43.000000000 +0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cpphs
-PORTVERSION=	1.6
-PORTREVISION=	1
+PORTVERSION=	1.7
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://www.cs.york.ac.uk/fp/cpphs/
 PKGNAMEPREFIX=	hs-
@@ -16,17 +15,68 @@
 COMMENT=	A simplified re-implementation of cpp in Haskell
 
 BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
+RUN_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
 LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4
 
-PLIST_FILES=	bin/cpphs
+GHC_VERSION=	6.10.4
+CPPHS_VERSION=	${PORTVERSION}
+
+GHC_CMD=	${LOCALBASE}/bin/ghc
+SETUP_CMD=	./setup
+
+DATADIR=	${PREFIX}/share/${DISTNAME}
+DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
+CPPHS_LIBDIR_REL=	lib/${DISTNAME}
+
+PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
+		CPPHS_VERSION=${CPPHS_VERSION} \
+		CPPHS_LIBDIR_REL=${CPPHS_LIBDIR_REL}
 
 MAN1=	cpphs.1
 
+.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} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \
+		     && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
+
 do-build:
-	@(cd ${WRKSRC} && ghc -o cpphs --make cpphs)
+	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:
-	@${INSTALL_PROGRAM} ${WRKSRC}/cpphs ${PREFIX}/bin/cpphs
+	cd ${WRKSRC} && ${SETUP_CMD} install \
+		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${CPPHS_LIBDIR_REL}/register.sh
 	@${INSTALL_MAN} ${WRKSRC}/docs/cpphs.1 ${PREFIX}/man/man1
+	@${MKDIR} ${DATADIR} && ${INSTALL_DATA} ${WRKSRC}/docs/index.html ${DATADIR} \
+			     && ${INSTALL_DATA} ${WRKSRC}/docs/design ${DATADIR}
+
+post-install:
+	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
 .include <bsd.port.mk>
diff -uNr hs-cpphs.orig/distinfo hs-cpphs/distinfo
--- hs-cpphs.orig/distinfo	2009-01-24 00:13:28.000000000 +0000
+++ hs-cpphs/distinfo	2009-07-14 08:29:46.000000000 +0000
@@ -1,3 +1,3 @@
-MD5 (cpphs-1.6.tar.gz) = 8a7565ff3b2d7bdb594af4c10c594951
-SHA256 (cpphs-1.6.tar.gz) = 2e7c430fde17adbb3905e6d2a3c3845a40349c61a53fcfa40c733e8b43e73295
-SIZE (cpphs-1.6.tar.gz) = 110723
+MD5 (cpphs-1.7.tar.gz) = e76cba8387e7f4747b21fbca4881a78a
+SHA256 (cpphs-1.7.tar.gz) = 5c8c94f7a8f6c8441b908532288339196e02141dac1d7c69ea045fd4ac3a6944
+SIZE (cpphs-1.7.tar.gz) = 113724
diff -uNr hs-cpphs.orig/pkg-descr hs-cpphs/pkg-descr
--- hs-cpphs.orig/pkg-descr	2004-06-14 18:28:55.000000000 +0000
+++ hs-cpphs/pkg-descr	2009-07-14 09:14:29.000000000 +0000
@@ -7,4 +7,11 @@
     * conditional compilation only (--nomacro),
     * and full macro-expansion (default).
 
-WWW: http://www.cs.york.ac.uk/fp/cpphs/
+Author:		Malcolm Wallace <Malcolm.Wallace at cs.york.ac.uk>
+Maintainer:	Malcolm Wallace <Malcolm.Wallace at cs.york.ac.uk>
+License:	LGPL
+URL:		http://haskell.org/cpphs/
+WWW:		http://www.cs.york.ac.uk/fp/cpphs/
+
+Exposed-Modules: Language.Preprocessor.Cpphs
+		 Language.Preprocessor.Unlit
diff -uNr hs-cpphs.orig/pkg-plist hs-cpphs/pkg-plist
--- hs-cpphs.orig/pkg-plist	1970-01-01 00:00:00.000000000 +0000
+++ hs-cpphs/pkg-plist	2009-07-20 19:05:03.000000000 +0000
@@ -0,0 +1,32 @@
+bin/cpphs
+%%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HScpphs-%%CPPHS_VERSION%%.o
+%%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs.hi
+%%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs/CppIfdef.hi
+%%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs/HashDefine.hi
+%%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs/MacroPass.hi
+%%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs/Options.hi
+%%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs/Position.hi
+%%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs/ReadFirst.hi
+%%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs/RunCpphs.hi
+%%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs/SymTab.hi
+%%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs/Tokenise.hi
+%%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Unlit.hi
+%%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/HuttonMeijer.hi
+%%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHScpphs-%%CPPHS_VERSION%%.a
+%%CPPHS_LIBDIR_REL%%/register.sh
+%%DATADIR%%/design
+%%DATADIR%%/index.html
+%%NOPORTDOCS%%%%DOCSDIR%%/LICENCE-LGPL
+%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
+ at dirrm %%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators
+ at dirrm %%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text
+ at dirrm %%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs
+ at dirrm %%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor
+ at dirrm %%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language
+ at dirrm %%CPPHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+ at dirrm %%CPPHS_LIBDIR_REL%%
+ at dirrmtry %%DATADIR%%
+ at exec /bin/sh %D/%%CPPHS_LIBDIR_REL%%/register.sh
+ at exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
+ at unexec %D/bin/ghc-pkg unregister cpphs
+ at unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
--- patch-hs-cpphs.diff ends here ---


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

