Attachment 98235 Details for Bug 137102 – patch-hs-stringsearch.diff

[patch] patch-hs-stringsearch.diff

patch-hs-stringsearch.diff (text/plain), 5.24 KB, created by Jacula Modyun on 2009-07-24 22:00:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jacula Modyun

Created: 2009-07-24 22:00:14 UTC

Size: 5.24 KB

patch

obsolete

>diff -uNr hs-stringsearch.orig/Makefile hs-stringsearch/Makefile
>--- hs-stringsearch.orig/Makefile	2009-05-13 09:45:59.000000000 +0000
>+++ hs-stringsearch/Makefile	2009-07-22 06:26:55.000000000 +0000
>@@ -6,7 +6,7 @@
> 
> PORTNAME=	stringsearch
> PORTVERSION=	0.2.1.1
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	textproc haskell
> MASTER_SITES=	http://hackage.haskell.org/packages/archive/stringsearch/${PORTVERSION}/ \
> 		http://kerneled.org/tmp/
>@@ -16,23 +16,61 @@
> COMMENT=	Boyer-Moore/Knuth-Morris-Pratt string search library
> 
> BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
>-LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4
>+RUN_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
> 
>-CABAL=		${LOCALBASE}/bin/runghc Setup.lhs
>-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
>+STRINGSEARCH_VERSION=	${PORTVERSION}
>+
>+GHC_CMD=	${LOCALBASE}/bin/ghc
>+SETUP_CMD=	./setup
>+
>+DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
>+STRINGSEARCH_LIBDIR_REL=	lib/${DISTNAME}
>+
>+PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
>+		STRINGSEARCH_VERSION=${STRINGSEARCH_VERSION} \
>+		STRINGSEARCH_LIBDIR_REL=${STRINGSEARCH_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.lhs -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 \
>+					     --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}/${STRINGSEARCH_LIBDIR_REL}/register.sh
>+
>+post-install:
>+	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
> 
> .include <bsd.port.mk>
>diff -uNr hs-stringsearch.orig/pkg-descr hs-stringsearch/pkg-descr
>--- hs-stringsearch.orig/pkg-descr	2008-11-02 01:32:14.000000000 +0000
>+++ hs-stringsearch/pkg-descr	2009-07-16 14:06:24.000000000 +0000
>@@ -2,4 +2,10 @@
> implementations for Haskell bytestrings (with support for all strict and
> lazy ByteString permutations).
> 
>-WWW: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/stringsearch
>+Author:		Daniel Fischer, Chris Kuklewicz, Justin Bailey
>+Maintainer:	bos@serpentine.com
>+License:	BSD3
>+WWW:		http://hackage.haskell.org/cgi-bin/hackage-scripts/package/stringsearch
>+
>+Exposed-modules: Data.ByteString.Search.BoyerMoore,
>+		 Data.ByteString.Search.KnuthMorrisPratt
>diff -uNr hs-stringsearch.orig/pkg-plist hs-stringsearch/pkg-plist
>--- hs-stringsearch.orig/pkg-plist	2008-11-05 23:36:46.000000000 +0000
>+++ hs-stringsearch/pkg-plist	2009-07-20 20:05:48.000000000 +0000
>@@ -1,16 +1,16 @@
>-%%SUBDIR%%/ghc-%%GHC_VERSION%%/libHSstringsearch-%%PORTVERSION%%.a
>-%%SUBDIR%%/ghc-%%GHC_VERSION%%/HSstringsearch-%%PORTVERSION%%.o
>-%%SUBDIR%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search/BoyerMoore.hi
>-%%SUBDIR%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search/KnuthMorrisPratt.hi
>-%%SUBDIR%%/register.sh
>-share/doc/stringsearch-%%PORTVERSION%%/LICENSE
>-@dirrm share/doc/stringsearch-%%PORTVERSION%%
>-@dirrm lib/stringsearch-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search
>-@dirrm lib/stringsearch-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Data/ByteString
>-@dirrm lib/stringsearch-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Data
>-@dirrm lib/stringsearch-%%PORTVERSION%%/ghc-%%GHC_VERSION%%
>-@dirrm lib/stringsearch-%%PORTVERSION%%
>-@exec /bin/sh %D/%%SUBDIR%%/register.sh
>+%%STRINGSEARCH_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search/BoyerMoore.hi
>+%%STRINGSEARCH_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search/KnuthMorrisPratt.hi
>+%%STRINGSEARCH_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSstringsearch-%%STRINGSEARCH_VERSION%%.o
>+%%STRINGSEARCH_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSstringsearch-%%STRINGSEARCH_VERSION%%.a
>+%%STRINGSEARCH_LIBDIR_REL%%/register.sh
>+%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
>+%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
>+@dirrm %%STRINGSEARCH_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search
>+@dirrm %%STRINGSEARCH_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString
>+@dirrm %%STRINGSEARCH_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
>+@dirrm %%STRINGSEARCH_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
>+@dirrm %%STRINGSEARCH_LIBDIR_REL%%
>+@exec /bin/sh %D/%%STRINGSEARCH_LIBDIR_REL%%/register.sh
> @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
>-@unexec %D/bin/ghc-pkg unregister stringsearch 
>+@unexec %D/bin/ghc-pkg unregister stringsearch
> @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old

Actions: View | Diff

Attachments on bug 137102: 98235